diff --git a/contracts/admin/src/lib.rs b/contracts/admin/src/lib.rs
index dc50a07f..ef0f65ef 100644
--- a/contracts/admin/src/lib.rs
+++ b/contracts/admin/src/lib.rs
@@ -608,6 +608,11 @@ pub struct UpgradeProposal {
     /// the pre-quorum clock only: it decides `Pending` to `Expired` and nothing
     /// else. Any post-quorum execution deadline is timelock state owned by #660.
     pub expires_at: u64,
+    /// Unix timestamp (seconds) when the post-quorum execution timelock expires.
+    /// `None` while the proposal has not yet reached quorum; set to
+    /// `env.ledger().timestamp() + TIMELOCK_DELAY_SECS` the moment quorum is
+    /// first reached and never reset by later votes.
+    pub timelock_expires_at: Option<u64>,
 }
 
 /// Strkey of the well-known Stellar "null" account: an ed25519 public key
@@ -1293,6 +1298,18 @@ fn _start_timelock_if_quorate(env: &Env, proposal_id: u64) {
     extend_instance_ttl(env);
 }
 
+/// Records the timelock expiration for an [`UpgradeProposal`] when quorum is first reached.
+///
+/// Sets `timelock_expires_at` to `Some(env.ledger().timestamp() + TIMELOCK_DELAY_SECS)`
+/// the moment quorum is reached (`proposal.status == ProposalStatus::Approved`).
+/// Idempotent: if `timelock_expires_at` is already `Some`, it is never reset by later votes.
+fn _start_upgrade_timelock_if_quorate(env: &Env, proposal: &mut UpgradeProposal) {
+    if proposal.status == ProposalStatus::Approved && proposal.timelock_expires_at.is_none() {
+        proposal.timelock_expires_at =
+            Some(env.ledger().timestamp().saturating_add(TIMELOCK_DELAY_SECS));
+    }
+}
+
 /// Returns the unix timestamp at which `proposal_id`'s timelock expires, if any.
 ///
 /// @notice Returns `Some(unlock_time)` once the proposal has reached quorum, `None` before that.
@@ -3967,24 +3984,26 @@ mod tests {
         ["Approved", "Cancelled", "Executed", "Expired", "Pending"];
 
     /// Encoded field names of [`UpgradeProposal`], frozen the same way.
-    const UPGRADE_PROPOSAL_FIELD_NAMES: [&str; 6] = [
+    const UPGRADE_PROPOSAL_FIELD_NAMES: [&str; 7] = [
         "expires_at",
         "proposer",
         "quorum",
         "status",
         "targets",
+        "timelock_expires_at",
         "votes",
     ];
 
     /// Encoded value kind per [`UpgradeProposal`] field. A width change
     /// (`quorum` from `u64` to `u32`) re-encodes the value and orphans stored
     /// proposals exactly as a rename does, and no name check would catch it.
-    const UPGRADE_PROPOSAL_FIELD_KINDS: [(&str, &str); 6] = [
+    const UPGRADE_PROPOSAL_FIELD_KINDS: [(&str, &str); 7] = [
         ("expires_at", "u64"),
         ("proposer", "address"),
         ("quorum", "u64"),
         ("status", "vec"),
         ("targets", "vec"),
+        ("timelock_expires_at", "option"),
         ("votes", "map"),
     ];
 
@@ -4021,6 +4040,7 @@ mod tests {
             quorum: 2,
             status: ProposalStatus::Pending,
             expires_at: 1_724_000_000,
+            timelock_expires_at: None,
         }
     }
 
@@ -4057,6 +4077,7 @@ mod tests {
             ScVal::Address(_) => "address",
             ScVal::Vec(_) => "vec",
             ScVal::Map(_) => "map",
+            ScVal::Void => "option",
             _ => "unexpected",
         }
     }
@@ -4094,6 +4115,7 @@ mod tests {
             quorum: _,
             status: _,
             expires_at: _,
+            timelock_expires_at: _,
         } = &proposal;
 
         let encoded = encoded_fields(&env, proposal);
@@ -4250,6 +4272,7 @@ mod tests {
             quorum: 2,
             status: ProposalStatus::Pending,
             expires_at: env.ledger().timestamp() + 1_000,
+            timelock_expires_at: None,
         };
         seed_upgrade_proposal(&env, &contract_id, 1, &proposal);
 
@@ -4282,6 +4305,7 @@ mod tests {
             quorum: 2,
             status: ProposalStatus::Pending,
             expires_at: env.ledger().timestamp() + 1_000,
+            timelock_expires_at: None,
         };
         seed_upgrade_proposal(&env, &contract_id, 1, &proposal);
 
@@ -4313,6 +4337,7 @@ mod tests {
             quorum: 1,
             status: ProposalStatus::Pending,
             expires_at: env.ledger().timestamp() + 1_000,
+            timelock_expires_at: None,
         };
         seed_upgrade_proposal(&env, &contract_id, 1, &proposal);
 
@@ -4341,6 +4366,7 @@ mod tests {
             quorum: 2,
             status: ProposalStatus::Pending,
             expires_at: env.ledger().timestamp() + 1_000,
+            timelock_expires_at: None,
         };
         seed_upgrade_proposal(&env, &contract_id, 1, &proposal);
 
@@ -4385,6 +4411,7 @@ mod tests {
             quorum: 1,
             status: ProposalStatus::Approved,
             expires_at: env.ledger().timestamp() + 1_000,
+            timelock_expires_at: None,
         };
         seed_upgrade_proposal(&env, &contract_id, 1, &proposal);
 
@@ -4412,6 +4439,7 @@ mod tests {
             quorum: 1,
             status: ProposalStatus::Pending,
             expires_at: env.ledger().timestamp(),
+            timelock_expires_at: None,
         };
         seed_upgrade_proposal(&env, &contract_id, 1, &proposal);
 
@@ -4473,6 +4501,57 @@ mod tests {
         assert!(result.is_err());
     }
 
+    // ── UpgradeProposal timelock state structure (#660) ─────────────────────────
+
+    #[test]
+    fn test_upgrade_proposal_timelock_expires_at_none_on_creation() {
+        let env = Env::default();
+        let proposal = upgrade_proposal_fixture(&env);
+        assert_eq!(proposal.timelock_expires_at, None);
+    }
+
+    #[test]
+    fn test_upgrade_proposal_timelock_expires_at_set_when_quorum_first_reached() {
+        let env = Env::default();
+        let mut proposal = upgrade_proposal_fixture(&env);
+        assert_eq!(proposal.status, ProposalStatus::Pending);
+        assert_eq!(proposal.timelock_expires_at, None);
+
+        proposal.status = ProposalStatus::Approved;
+        _start_upgrade_timelock_if_quorate(&env, &mut proposal);
+
+        let expected_unlock = env.ledger().timestamp().saturating_add(TIMELOCK_DELAY_SECS);
+        assert_eq!(proposal.timelock_expires_at, Some(expected_unlock));
+    }
+
+    #[test]
+    fn test_upgrade_proposal_timelock_expires_at_not_reset_by_later_votes() {
+        let env = Env::default();
+        let mut proposal = upgrade_proposal_fixture(&env);
+        proposal.status = ProposalStatus::Approved;
+        _start_upgrade_timelock_if_quorate(&env, &mut proposal);
+
+        let initial_timelock = proposal.timelock_expires_at;
+        assert!(initial_timelock.is_some());
+
+        // Advance ledger timestamp by 100 seconds
+        env.ledger().set_timestamp(env.ledger().timestamp() + 100);
+
+        // Subsequent votes/calls on already-quorate proposal must not reset timelock_expires_at
+        _start_upgrade_timelock_if_quorate(&env, &mut proposal);
+        assert_eq!(proposal.timelock_expires_at, initial_timelock);
+    }
+
+    #[test]
+    fn test_upgrade_proposal_timelock_expires_at_remains_none_below_quorum() {
+        let env = Env::default();
+        let mut proposal = upgrade_proposal_fixture(&env);
+        assert_eq!(proposal.status, ProposalStatus::Pending);
+
+        _start_upgrade_timelock_if_quorate(&env, &mut proposal);
+        assert_eq!(proposal.timelock_expires_at, None);
+    }
+
     // ── cancel_proposal (#662) ──────────────────────────────────────────────
 
     /// Writes `proposal` directly into the contract's `UpgradeProposal(id)`
@@ -4516,6 +4595,7 @@ mod tests {
             quorum: 2,
             status,
             expires_at: 1_724_000_000,
+            timelock_expires_at: None,
         }
     }
 
diff --git a/contracts/admin/src/tests/proptest.rs b/contracts/admin/src/tests/proptest.rs
index c2bde083..c678ed64 100644
--- a/contracts/admin/src/tests/proptest.rs
+++ b/contracts/admin/src/tests/proptest.rs
@@ -51,6 +51,7 @@ fn seed_upgrade_proposal(env: &Env, contract_id: &Address, id: u64, proposer: &A
         quorum: 2,
         status: ProposalStatus::Pending,
         expires_at: u64::MAX,
+        timelock_expires_at: None,
     };
     env.as_contract(contract_id, || {
         env.storage()
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.38.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.38.json
index e3d76722..b6cf261d 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.38.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.38.json
@@ -4,6 +4,7 @@
     "nonce": 0
   },
   "auth": [
+    [],
     [],
     [],
     [
@@ -259,7 +260,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.54.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.54.json
index e30ff926..b6cf261d 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.54.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.54.json
@@ -260,7 +260,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "SuperAdmin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.68.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.68.json
index b6cf261d..e3d76722 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.68.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.68.json
@@ -4,7 +4,6 @@
     "nonce": 0
   },
   "auth": [
-    [],
     [],
     [],
     [
@@ -260,7 +259,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Minter"
+                      "symbol": "Admin"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.80.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.80.json
index b6cf261d..e3d76722 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.80.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.80.json
@@ -4,7 +4,6 @@
     "nonce": 0
   },
   "auth": [
-    [],
     [],
     [],
     [
@@ -260,7 +259,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Minter"
+                      "symbol": "Admin"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.14.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.14.json
index b344a423..071736d7 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.14.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.14.json
@@ -21,7 +21,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "SuperAdmin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -127,7 +127,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 4
+                  "u32": 8
                 }
               }
             },
@@ -292,7 +292,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "SuperAdmin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.38.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.38.json
index 071736d7..627a6cd3 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.38.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.38.json
@@ -21,7 +21,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Pauser"
+                      "symbol": "Admin"
                     }
                   ]
                 },
@@ -127,7 +127,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 8
+                  "u32": 1
                 }
               }
             },
@@ -292,7 +292,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Pauser"
+                      "symbol": "Admin"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.9.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.9.json
index 65d23388..b344a423 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.9.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.9.json
@@ -21,7 +21,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Minter"
+                      "symbol": "SuperAdmin"
                     }
                   ]
                 },
@@ -127,7 +127,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 2
+                  "u32": 4
                 }
               }
             },
@@ -292,7 +292,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Minter"
+                      "symbol": "SuperAdmin"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_every_variant.46.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_every_variant.46.json
index e3d76722..eaba25f5 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_every_variant.46.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_every_variant.46.json
@@ -21,7 +21,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -128,7 +128,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -259,7 +259,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_every_variant.99.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_every_variant.99.json
index e3d76722..75d05075 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_every_variant.99.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_every_variant.99.json
@@ -21,7 +21,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -128,7 +128,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 8
                 }
               }
             },
@@ -259,7 +259,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_idempotent.21.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_idempotent.21.json
index 4ab42271..45667743 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_idempotent.21.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_idempotent.21.json
@@ -21,7 +21,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "SuperAdmin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -50,7 +50,268 @@
                 {
                   "vec": [
                     {
-                      "symbol": "SuperAdmin"
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -186,7 +447,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 4
+                  "u32": 8
                 }
               }
             },
@@ -383,7 +644,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "SuperAdmin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_idempotent.59.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_idempotent.59.json
index 109cd481..115154cf 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_idempotent.59.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_idempotent.59.json
@@ -21,7 +21,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -50,7 +50,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -79,7 +79,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -108,7 +108,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -137,7 +137,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -166,7 +166,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -195,7 +195,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -224,7 +224,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -592,7 +592,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1251,7 +1251,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Minter"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_many_holders.14.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_many_holders.14.json
index 45ff618a..f99238f2 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_many_holders.14.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_many_holders.14.json
@@ -28,7 +28,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -57,7 +57,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -86,7 +86,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -115,7 +115,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -144,7 +144,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -173,7 +173,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
@@ -315,7 +315,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 8
                 }
               }
             },
@@ -360,7 +360,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 8
                 }
               }
             },
@@ -405,7 +405,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 8
                 }
               }
             },
@@ -450,7 +450,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 8
                 }
               }
             },
@@ -495,7 +495,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 8
                 }
               }
             },
@@ -540,7 +540,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 8
                 }
               }
             },
@@ -914,7 +914,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "Pauser"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_multiple_roles.18.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_multiple_roles.18.json
index 5e97f86a..46d58f62 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_multiple_roles.18.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_multiple_roles.18.json
@@ -6,6 +6,93 @@
   "auth": [
     [],
     [],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Minter"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "SuperAdmin"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
     [],
     [],
     []
@@ -65,6 +152,51 @@
           4095
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "RoleMask"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "RoleMask"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "u32": 14
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          4095
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -110,6 +242,105 @@
           4095
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": 801925984706572462
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": 801925984706572462
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": 1033654523790656264
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": 1033654523790656264
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": 5541220902715666415
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": 5541220902715666415
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_code": {
@@ -159,7 +390,7 @@
                   ]
                 },
                 {
-                  "bool": false
+                  "bool": true
                 }
               ]
             }
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_multiple_roles.52.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_multiple_roles.52.json
index 5e97f86a..46d58f62 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_multiple_roles.52.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_multiple_roles.52.json
@@ -6,6 +6,93 @@
   "auth": [
     [],
     [],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Minter"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "SuperAdmin"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+              "function_name": "grant_role",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                },
+                {
+                  "vec": [
+                    {
+                      "symbol": "Pauser"
+                    }
+                  ]
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
     [],
     [],
     []
@@ -65,6 +152,51 @@
           4095
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "RoleMask"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "RoleMask"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "u32": 14
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          4095
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -110,6 +242,105 @@
           4095
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": 801925984706572462
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": 801925984706572462
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": 1033654523790656264
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": 1033654523790656264
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": 5541220902715666415
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": 5541220902715666415
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_code": {
@@ -159,7 +390,7 @@
                   ]
                 },
                 {
-                  "bool": false
+                  "bool": true
                 }
               ]
             }
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.41.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.41.json
index 3e48b172..50d0a072 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.41.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.41.json
@@ -50,7 +50,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Pauser"
+                      "symbol": "SuperAdmin"
                     }
                   ]
                 },
@@ -157,7 +157,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 12
+                  "u32": 4
                 }
               }
             },
@@ -321,7 +321,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Pauser"
+                      "symbol": "SuperAdmin"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.47.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.47.json
index 75b151cb..ac3991c5 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.47.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.47.json
@@ -50,7 +50,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Minter"
+                      "symbol": "Admin"
                     }
                   ]
                 },
@@ -157,7 +157,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 6
+                  "u32": 5
                 }
               }
             },
@@ -321,7 +321,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Minter"
+                      "symbol": "Admin"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.51.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.51.json
index ac3991c5..50d0a072 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.51.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.51.json
@@ -50,7 +50,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "SuperAdmin"
                     }
                   ]
                 },
@@ -157,7 +157,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 5
+                  "u32": 4
                 }
               }
             },
@@ -321,7 +321,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Admin"
+                      "symbol": "SuperAdmin"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.77.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.77.json
index 75b151cb..ac3991c5 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.77.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_self_grant.77.json
@@ -50,7 +50,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Minter"
+                      "symbol": "Admin"
                     }
                   ]
                 },
@@ -157,7 +157,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 6
+                  "u32": 5
                 }
               }
             },
@@ -321,7 +321,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Minter"
+                      "symbol": "Admin"
                     }
                   ]
                 },
diff --git a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_via_super_admin.62.json b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_via_super_admin.62.json
index c63c60ac..693074d6 100644
--- a/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_via_super_admin.62.json
+++ b/contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_via_super_admin.62.json
@@ -51,7 +51,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Pauser"
+                      "symbol": "Minter"
                     }
                   ]
                 },
@@ -203,7 +203,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 8
+                  "u32": 2
                 }
               }
             },
@@ -367,7 +367,7 @@
                 {
                   "vec": [
                     {
-                      "symbol": "Pauser"
+                      "symbol": "Minter"
                     }
                   ]
                 },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.1.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.1.json
index d0936575..0c0e7e0c 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.1.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.1.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1620321054253009512,
-                    "lo": 6398333447196474612
+                    "hi": 2130137280609840720,
+                    "lo": 10492948456470762608
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1620321054253009512,
-                    "lo": 6398333447196474612
+                    "hi": 2130137280609840720,
+                    "lo": 10492948456470762608
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1620321054253009512,
-                            "lo": 6398333447196474612
+                            "hi": 2130137280609840720,
+                            "lo": 10492948456470762608
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.10.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.10.json
index 5ed97de2..a8ea86a2 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.10.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.10.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1193228169801777278,
-                    "lo": 14749714896967491035
+                    "hi": 1191206008566698045,
+                    "lo": 10777777588585682138
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1193228169801777278,
-                    "lo": 14749714896967491035
+                    "hi": 1191206008566698045,
+                    "lo": 10777777588585682138
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1193228169801777278,
-                            "lo": 14749714896967491035
+                            "hi": 1191206008566698045,
+                            "lo": 10777777588585682138
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.11.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.11.json
index b7fdc899..61c5f131 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.11.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.11.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 127838739808677202,
-                    "lo": 13734955816944613743
+                    "hi": 1473547995451886480,
+                    "lo": 9549438867882036037
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 127838739808677202,
-                    "lo": 13734955816944613743
+                    "hi": 1473547995451886480,
+                    "lo": 9549438867882036037
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 127838739808677202,
-                            "lo": 13734955816944613743
+                            "hi": 1473547995451886480,
+                            "lo": 9549438867882036037
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.12.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.12.json
index 1a7c0997..24c5fbfd 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.12.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.12.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1985897524014671507,
-                    "lo": 12189033588739719360
+                    "hi": 1275684210228255660,
+                    "lo": 13699656490276736703
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1985897524014671507,
-                    "lo": 12189033588739719360
+                    "hi": 1275684210228255660,
+                    "lo": 13699656490276736703
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1985897524014671507,
-                            "lo": 12189033588739719360
+                            "hi": 1275684210228255660,
+                            "lo": 13699656490276736703
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.13.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.13.json
index c0dd43be..634f1c8d 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.13.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.13.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 524437123003951013,
-                    "lo": 8181771642333214117
+                    "hi": 2069188288813823145,
+                    "lo": 14544069710743448060
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 524437123003951013,
-                    "lo": 8181771642333214117
+                    "hi": 2069188288813823145,
+                    "lo": 14544069710743448060
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 524437123003951013,
-                            "lo": 8181771642333214117
+                            "hi": 2069188288813823145,
+                            "lo": 14544069710743448060
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.14.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.14.json
index d7d90290..552df0f5 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.14.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.14.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 806890991316001924,
-                    "lo": 14227734800493500332
+                    "hi": 1373858150140217136,
+                    "lo": 5227854577551763008
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 806890991316001924,
-                    "lo": 14227734800493500332
+                    "hi": 1373858150140217136,
+                    "lo": 5227854577551763008
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 806890991316001924,
-                            "lo": 14227734800493500332
+                            "hi": 1373858150140217136,
+                            "lo": 5227854577551763008
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.15.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.15.json
index a4c41ec2..a74ba52e 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.15.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.15.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1399372220957820313,
-                    "lo": 7509187920965830186
+                    "hi": 1647678137401846776,
+                    "lo": 14516469009412075990
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1399372220957820313,
-                    "lo": 7509187920965830186
+                    "hi": 1647678137401846776,
+                    "lo": 14516469009412075990
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1399372220957820313,
-                            "lo": 7509187920965830186
+                            "hi": 1647678137401846776,
+                            "lo": 14516469009412075990
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.16.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.16.json
index a9d59890..1ba867f9 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.16.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.16.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1896907200835531468,
-                    "lo": 3738439935559438178
+                    "hi": 2122265893425949983,
+                    "lo": 5003823670699857650
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1896907200835531468,
-                    "lo": 3738439935559438178
+                    "hi": 2122265893425949983,
+                    "lo": 5003823670699857650
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1896907200835531468,
-                            "lo": 3738439935559438178
+                            "hi": 2122265893425949983,
+                            "lo": 5003823670699857650
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.17.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.17.json
index bb64b6c3..7b4c5398 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.17.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.17.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1159509894630756265,
-                    "lo": 8857294140047234969
+                    "hi": 212144607370778148,
+                    "lo": 2747010905712958090
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1159509894630756265,
-                    "lo": 8857294140047234969
+                    "hi": 212144607370778148,
+                    "lo": 2747010905712958090
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1159509894630756265,
-                            "lo": 8857294140047234969
+                            "hi": 212144607370778148,
+                            "lo": 2747010905712958090
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.18.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.18.json
index 9d71836d..8bcbff40 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.18.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.18.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 914162232764170894,
-                    "lo": 2668237883281024437
+                    "hi": 225957656954757599,
+                    "lo": 13166114684988585925
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 914162232764170894,
-                    "lo": 2668237883281024437
+                    "hi": 225957656954757599,
+                    "lo": 13166114684988585925
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 914162232764170894,
-                            "lo": 2668237883281024437
+                            "hi": 225957656954757599,
+                            "lo": 13166114684988585925
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.19.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.19.json
index 938906e3..a4735b46 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.19.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.19.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2266277429428454687,
-                    "lo": 11231758218686010397
+                    "hi": 2156116426087203341,
+                    "lo": 6636249358962247685
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2266277429428454687,
-                    "lo": 11231758218686010397
+                    "hi": 2156116426087203341,
+                    "lo": 6636249358962247685
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2266277429428454687,
-                            "lo": 11231758218686010397
+                            "hi": 2156116426087203341,
+                            "lo": 6636249358962247685
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.2.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.2.json
index 70d7f6cc..d98dcc18 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.2.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.2.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1351857018792064629,
-                    "lo": 6308464706159695790
+                    "hi": 2028177368731853592,
+                    "lo": 16736080183448478032
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1351857018792064629,
-                    "lo": 6308464706159695790
+                    "hi": 2028177368731853592,
+                    "lo": 16736080183448478032
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1351857018792064629,
-                            "lo": 6308464706159695790
+                            "hi": 2028177368731853592,
+                            "lo": 16736080183448478032
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.20.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.20.json
index 5fa53da0..e1e38bdc 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.20.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.20.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 917713189558878432,
-                    "lo": 8101508763985756129
+                    "hi": 695136990001295505,
+                    "lo": 6034332645366527846
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 917713189558878432,
-                    "lo": 8101508763985756129
+                    "hi": 695136990001295505,
+                    "lo": 6034332645366527846
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 917713189558878432,
-                            "lo": 8101508763985756129
+                            "hi": 695136990001295505,
+                            "lo": 6034332645366527846
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.21.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.21.json
index 55f41edb..db694c69 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.21.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.21.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 295703594216405991,
-                    "lo": 17330995169983997880
+                    "hi": 1635579332821181935,
+                    "lo": 15824108674523697022
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 295703594216405991,
-                    "lo": 17330995169983997880
+                    "hi": 1635579332821181935,
+                    "lo": 15824108674523697022
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 295703594216405991,
-                            "lo": 17330995169983997880
+                            "hi": 1635579332821181935,
+                            "lo": 15824108674523697022
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.22.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.22.json
index 9ff7c18c..cbe225a7 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.22.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.22.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1381154458825501431,
-                    "lo": 1687849839697393381
+                    "hi": 332103006709222263,
+                    "lo": 7643879463867631148
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1381154458825501431,
-                    "lo": 1687849839697393381
+                    "hi": 332103006709222263,
+                    "lo": 7643879463867631148
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1381154458825501431,
-                            "lo": 1687849839697393381
+                            "hi": 332103006709222263,
+                            "lo": 7643879463867631148
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.23.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.23.json
index f6d29c60..1add7856 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.23.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.23.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2080738230127515938,
-                    "lo": 11785161642829725261
+                    "hi": 2110692820489314778,
+                    "lo": 8878769178228709411
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2080738230127515938,
-                    "lo": 11785161642829725261
+                    "hi": 2110692820489314778,
+                    "lo": 8878769178228709411
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2080738230127515938,
-                            "lo": 11785161642829725261
+                            "hi": 2110692820489314778,
+                            "lo": 8878769178228709411
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.24.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.24.json
index 5ec48500..2593dc78 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.24.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.24.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 536330612733872722,
-                    "lo": 16942703279919399828
+                    "hi": 1071033358720911643,
+                    "lo": 10785131192391356133
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 536330612733872722,
-                    "lo": 16942703279919399828
+                    "hi": 1071033358720911643,
+                    "lo": 10785131192391356133
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 536330612733872722,
-                            "lo": 16942703279919399828
+                            "hi": 1071033358720911643,
+                            "lo": 10785131192391356133
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.25.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.25.json
index 3b6ddfaa..cad43fa8 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.25.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.25.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1609676779534716492,
-                    "lo": 623256334715774088
+                    "hi": 2022868719477574026,
+                    "lo": 5325061382726439786
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1609676779534716492,
-                    "lo": 623256334715774088
+                    "hi": 2022868719477574026,
+                    "lo": 5325061382726439786
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1609676779534716492,
-                            "lo": 623256334715774088
+                            "hi": 2022868719477574026,
+                            "lo": 5325061382726439786
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.26.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.26.json
index 57aa1ee2..187932d2 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.26.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.26.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1777621498758533159,
-                    "lo": 365864820723598562
+                    "hi": 943861027694322813,
+                    "lo": 16742739942273489715
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1777621498758533159,
-                    "lo": 365864820723598562
+                    "hi": 943861027694322813,
+                    "lo": 16742739942273489715
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1777621498758533159,
-                            "lo": 365864820723598562
+                            "hi": 943861027694322813,
+                            "lo": 16742739942273489715
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.27.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.27.json
index 8e9c9292..6f81ba90 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.27.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.27.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1025301792903509905,
-                    "lo": 3941410462049078340
+                    "hi": 2004670595758773130,
+                    "lo": 5546245888277798092
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1025301792903509905,
-                    "lo": 3941410462049078340
+                    "hi": 2004670595758773130,
+                    "lo": 5546245888277798092
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1025301792903509905,
-                            "lo": 3941410462049078340
+                            "hi": 2004670595758773130,
+                            "lo": 5546245888277798092
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.28.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.28.json
index 36125b6f..a91ba419 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.28.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.28.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 134810662086474870,
-                    "lo": 3337884071344851231
+                    "hi": 400795182592362131,
+                    "lo": 16177488719895294308
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 134810662086474870,
-                    "lo": 3337884071344851231
+                    "hi": 400795182592362131,
+                    "lo": 16177488719895294308
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 134810662086474870,
-                            "lo": 3337884071344851231
+                            "hi": 400795182592362131,
+                            "lo": 16177488719895294308
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.29.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.29.json
index 76e84f8a..72bce360 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.29.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.29.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1171055385267922314,
-                    "lo": 8532975018205512278
+                    "hi": 366870558147680005,
+                    "lo": 1519842188253505048
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1171055385267922314,
-                    "lo": 8532975018205512278
+                    "hi": 366870558147680005,
+                    "lo": 1519842188253505048
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1171055385267922314,
-                            "lo": 8532975018205512278
+                            "hi": 366870558147680005,
+                            "lo": 1519842188253505048
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.3.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.3.json
index d4e219c9..25e30841 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.3.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.3.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 377596355128030493,
-                    "lo": 18095526345539112561
+                    "hi": 1454805938970459501,
+                    "lo": 15421576427438029968
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 377596355128030493,
-                    "lo": 18095526345539112561
+                    "hi": 1454805938970459501,
+                    "lo": 15421576427438029968
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 377596355128030493,
-                            "lo": 18095526345539112561
+                            "hi": 1454805938970459501,
+                            "lo": 15421576427438029968
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.30.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.30.json
index 3d73c88d..342ac135 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.30.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.30.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1431390312780526467,
-                    "lo": 16136476797485164363
+                    "hi": 941662107538263215,
+                    "lo": 946312876312986896
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1431390312780526467,
-                    "lo": 16136476797485164363
+                    "hi": 941662107538263215,
+                    "lo": 946312876312986896
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1431390312780526467,
-                            "lo": 16136476797485164363
+                            "hi": 941662107538263215,
+                            "lo": 946312876312986896
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.31.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.31.json
index 802c58aa..ce063a2c 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.31.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.31.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2064467874979158478,
-                    "lo": 394169989314643768
+                    "hi": 74527554836459508,
+                    "lo": 2485391533734526648
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2064467874979158478,
-                    "lo": 394169989314643768
+                    "hi": 74527554836459508,
+                    "lo": 2485391533734526648
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2064467874979158478,
-                            "lo": 394169989314643768
+                            "hi": 74527554836459508,
+                            "lo": 2485391533734526648
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.32.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.32.json
index 5bdc1752..f14520a4 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.32.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.32.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 882232300602531759,
-                    "lo": 79630717818675295
+                    "hi": 1003294065424925995,
+                    "lo": 5182283774204535682
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 882232300602531759,
-                    "lo": 79630717818675295
+                    "hi": 1003294065424925995,
+                    "lo": 5182283774204535682
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 882232300602531759,
-                            "lo": 79630717818675295
+                            "hi": 1003294065424925995,
+                            "lo": 5182283774204535682
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.33.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.33.json
index 96ff9f7c..585873ac 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.33.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.33.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 904375098802973989,
-                    "lo": 4795952965132889573
+                    "hi": 951791689333188925,
+                    "lo": 6547788724398431462
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 904375098802973989,
-                    "lo": 4795952965132889573
+                    "hi": 951791689333188925,
+                    "lo": 6547788724398431462
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 904375098802973989,
-                            "lo": 4795952965132889573
+                            "hi": 951791689333188925,
+                            "lo": 6547788724398431462
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.34.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.34.json
index 437b5ad2..f3237d7c 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.34.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.34.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1927998440000281732,
-                    "lo": 14447358728890976505
+                    "hi": 1536604682839904037,
+                    "lo": 2961337843002790613
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1927998440000281732,
-                    "lo": 14447358728890976505
+                    "hi": 1536604682839904037,
+                    "lo": 2961337843002790613
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1927998440000281732,
-                            "lo": 14447358728890976505
+                            "hi": 1536604682839904037,
+                            "lo": 2961337843002790613
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.35.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.35.json
index 1b32d411..966bcbbb 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.35.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.35.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 722292648259943856,
-                    "lo": 5305408407545946684
+                    "hi": 1522973859311048431,
+                    "lo": 4674314350787018263
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 722292648259943856,
-                    "lo": 5305408407545946684
+                    "hi": 1522973859311048431,
+                    "lo": 4674314350787018263
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 722292648259943856,
-                            "lo": 5305408407545946684
+                            "hi": 1522973859311048431,
+                            "lo": 4674314350787018263
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.36.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.36.json
index 51e0884d..06d68063 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.36.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.36.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 957374731465752327,
-                    "lo": 5793405453920707551
+                    "hi": 1267234880266280011,
+                    "lo": 13355576038595088117
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 957374731465752327,
-                    "lo": 5793405453920707551
+                    "hi": 1267234880266280011,
+                    "lo": 13355576038595088117
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 957374731465752327,
-                            "lo": 5793405453920707551
+                            "hi": 1267234880266280011,
+                            "lo": 13355576038595088117
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.37.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.37.json
index 010baa0a..a6a2f64c 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.37.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.37.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1234072013575641578,
-                    "lo": 2865837964272021268
+                    "hi": 1190345649505466367,
+                    "lo": 9986047150052840204
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1234072013575641578,
-                    "lo": 2865837964272021268
+                    "hi": 1190345649505466367,
+                    "lo": 9986047150052840204
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1234072013575641578,
-                            "lo": 2865837964272021268
+                            "hi": 1190345649505466367,
+                            "lo": 9986047150052840204
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.38.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.38.json
index 489a95bc..cbcceecb 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.38.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.38.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1830419887601710749,
-                    "lo": 14559061670402530659
+                    "hi": 1745170471614569722,
+                    "lo": 7007152623164288340
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1830419887601710749,
-                    "lo": 14559061670402530659
+                    "hi": 1745170471614569722,
+                    "lo": 7007152623164288340
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1830419887601710749,
-                            "lo": 14559061670402530659
+                            "hi": 1745170471614569722,
+                            "lo": 7007152623164288340
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.39.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.39.json
index 3d8e5dc1..9213906a 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.39.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.39.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 261150146147723890,
-                    "lo": 10901321807505333061
+                    "hi": 1686920005686170940,
+                    "lo": 17676369017585546842
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 261150146147723890,
-                    "lo": 10901321807505333061
+                    "hi": 1686920005686170940,
+                    "lo": 17676369017585546842
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 261150146147723890,
-                            "lo": 10901321807505333061
+                            "hi": 1686920005686170940,
+                            "lo": 17676369017585546842
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.4.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.4.json
index 981ec027..28b18782 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.4.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.4.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2264607718543010755,
-                    "lo": 14283056642674286563
+                    "hi": 313399493855312951,
+                    "lo": 8622017231397284626
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2264607718543010755,
-                    "lo": 14283056642674286563
+                    "hi": 313399493855312951,
+                    "lo": 8622017231397284626
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2264607718543010755,
-                            "lo": 14283056642674286563
+                            "hi": 313399493855312951,
+                            "lo": 8622017231397284626
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.40.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.40.json
index 0c7ffee4..b4794f6b 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.40.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.40.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2149984414990410337,
-                    "lo": 9515478620520664961
+                    "hi": 1917322385446121616,
+                    "lo": 2399332908100540501
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2149984414990410337,
-                    "lo": 9515478620520664961
+                    "hi": 1917322385446121616,
+                    "lo": 2399332908100540501
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2149984414990410337,
-                            "lo": 9515478620520664961
+                            "hi": 1917322385446121616,
+                            "lo": 2399332908100540501
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.41.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.41.json
index 232add28..362a42e3 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.41.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.41.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 350486367893178039,
-                    "lo": 17990240614081172832
+                    "hi": 1133331405340535954,
+                    "lo": 14549963515450552248
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 350486367893178039,
-                    "lo": 17990240614081172832
+                    "hi": 1133331405340535954,
+                    "lo": 14549963515450552248
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 350486367893178039,
-                            "lo": 17990240614081172832
+                            "hi": 1133331405340535954,
+                            "lo": 14549963515450552248
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.42.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.42.json
index 800d01ac..89730eaa 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.42.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.42.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1862043283724775165,
-                    "lo": 9571722094598511743
+                    "hi": 274616686739094019,
+                    "lo": 10903503766201910341
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1862043283724775165,
-                    "lo": 9571722094598511743
+                    "hi": 274616686739094019,
+                    "lo": 10903503766201910341
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1862043283724775165,
-                            "lo": 9571722094598511743
+                            "hi": 274616686739094019,
+                            "lo": 10903503766201910341
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.43.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.43.json
index 16e1149a..be72a9bf 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.43.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.43.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2059587840985564743,
-                    "lo": 9197384220113184113
+                    "hi": 1914259474505979866,
+                    "lo": 17876022810595046096
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2059587840985564743,
-                    "lo": 9197384220113184113
+                    "hi": 1914259474505979866,
+                    "lo": 17876022810595046096
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2059587840985564743,
-                            "lo": 9197384220113184113
+                            "hi": 1914259474505979866,
+                            "lo": 17876022810595046096
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.44.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.44.json
index 82d306f7..74bba341 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.44.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.44.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 291815778843150007,
-                    "lo": 9750644103868676123
+                    "hi": 2172877548559114289,
+                    "lo": 4969095028053767693
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 291815778843150007,
-                    "lo": 9750644103868676123
+                    "hi": 2172877548559114289,
+                    "lo": 4969095028053767693
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 291815778843150007,
-                            "lo": 9750644103868676123
+                            "hi": 2172877548559114289,
+                            "lo": 4969095028053767693
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.45.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.45.json
index 18115132..eacdcdd7 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.45.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.45.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 682178199418816163,
-                    "lo": 656137174135823984
+                    "hi": 1460164582634446519,
+                    "lo": 600528649099448365
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 682178199418816163,
-                    "lo": 656137174135823984
+                    "hi": 1460164582634446519,
+                    "lo": 600528649099448365
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 682178199418816163,
-                            "lo": 656137174135823984
+                            "hi": 1460164582634446519,
+                            "lo": 600528649099448365
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.46.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.46.json
index 6cb0aae5..c6ce7ec7 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.46.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.46.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1681072552704148942,
-                    "lo": 12507472202078516413
+                    "hi": 1723301479545132388,
+                    "lo": 15634313838131119931
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1681072552704148942,
-                    "lo": 12507472202078516413
+                    "hi": 1723301479545132388,
+                    "lo": 15634313838131119931
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1681072552704148942,
-                            "lo": 12507472202078516413
+                            "hi": 1723301479545132388,
+                            "lo": 15634313838131119931
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.47.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.47.json
index b67fe050..dc511961 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.47.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.47.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2101866717512170427,
-                    "lo": 13664223825973968016
+                    "hi": 1976397352888807469,
+                    "lo": 3790809205015623656
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2101866717512170427,
-                    "lo": 13664223825973968016
+                    "hi": 1976397352888807469,
+                    "lo": 3790809205015623656
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2101866717512170427,
-                            "lo": 13664223825973968016
+                            "hi": 1976397352888807469,
+                            "lo": 3790809205015623656
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.48.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.48.json
index 6ac48143..ac8a6448 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.48.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.48.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 913838380964208875,
-                    "lo": 4010564206488375018
+                    "hi": 2109260062358085267,
+                    "lo": 16217083234169885695
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 913838380964208875,
-                    "lo": 4010564206488375018
+                    "hi": 2109260062358085267,
+                    "lo": 16217083234169885695
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 913838380964208875,
-                            "lo": 4010564206488375018
+                            "hi": 2109260062358085267,
+                            "lo": 16217083234169885695
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.49.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.49.json
index ff118a17..2534be8b 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.49.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.49.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1788651114474904523,
-                    "lo": 2893952758929887757
+                    "hi": 23137103337649397,
+                    "lo": 17646841068351098415
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1788651114474904523,
-                    "lo": 2893952758929887757
+                    "hi": 23137103337649397,
+                    "lo": 17646841068351098415
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1788651114474904523,
-                            "lo": 2893952758929887757
+                            "hi": 23137103337649397,
+                            "lo": 17646841068351098415
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.5.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.5.json
index 55cbbf27..ce0f4b5b 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.5.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.5.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2009555871358808796,
-                    "lo": 1978876667866122694
+                    "hi": 519089845899935289,
+                    "lo": 13604887918958539481
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2009555871358808796,
-                    "lo": 1978876667866122694
+                    "hi": 519089845899935289,
+                    "lo": 13604887918958539481
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2009555871358808796,
-                            "lo": 1978876667866122694
+                            "hi": 519089845899935289,
+                            "lo": 13604887918958539481
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.50.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.50.json
index 0c1f2e97..9381b1be 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.50.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.50.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1004133388904427710,
-                    "lo": 11149344789920885882
+                    "hi": 263764104871009364,
+                    "lo": 5239176160575038963
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1004133388904427710,
-                    "lo": 11149344789920885882
+                    "hi": 263764104871009364,
+                    "lo": 5239176160575038963
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1004133388904427710,
-                            "lo": 11149344789920885882
+                            "hi": 263764104871009364,
+                            "lo": 5239176160575038963
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.51.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.51.json
index ef571ab3..730ee797 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.51.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.51.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 94489009756869379,
-                    "lo": 5926507996068240450
+                    "hi": 2197481322022580841,
+                    "lo": 545517270291596228
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 94489009756869379,
-                    "lo": 5926507996068240450
+                    "hi": 2197481322022580841,
+                    "lo": 545517270291596228
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 94489009756869379,
-                            "lo": 5926507996068240450
+                            "hi": 2197481322022580841,
+                            "lo": 545517270291596228
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.52.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.52.json
index 6fb63631..360ef5f9 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.52.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.52.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 999443340361607518,
-                    "lo": 15072598379616538030
+                    "hi": 1469173694001255898,
+                    "lo": 5258866205248509064
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 999443340361607518,
-                    "lo": 15072598379616538030
+                    "hi": 1469173694001255898,
+                    "lo": 5258866205248509064
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 999443340361607518,
-                            "lo": 15072598379616538030
+                            "hi": 1469173694001255898,
+                            "lo": 5258866205248509064
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.53.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.53.json
index 7735777f..d3c27dbb 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.53.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.53.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1285216744552841200,
-                    "lo": 7305293946657195160
+                    "hi": 553303002960640034,
+                    "lo": 7067912837552083373
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1285216744552841200,
-                    "lo": 7305293946657195160
+                    "hi": 553303002960640034,
+                    "lo": 7067912837552083373
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1285216744552841200,
-                            "lo": 7305293946657195160
+                            "hi": 553303002960640034,
+                            "lo": 7067912837552083373
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.54.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.54.json
index c866a97f..ae29f4d6 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.54.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.54.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1320849227295932425,
-                    "lo": 6806529658920999605
+                    "hi": 993609061849622642,
+                    "lo": 16707447711332749238
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1320849227295932425,
-                    "lo": 6806529658920999605
+                    "hi": 993609061849622642,
+                    "lo": 16707447711332749238
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1320849227295932425,
-                            "lo": 6806529658920999605
+                            "hi": 993609061849622642,
+                            "lo": 16707447711332749238
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.55.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.55.json
index fdc439bf..76bd5519 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.55.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.55.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1290157397499320093,
-                    "lo": 7749954070968746779
+                    "hi": 1933155421737519594,
+                    "lo": 1286197068788821186
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1290157397499320093,
-                    "lo": 7749954070968746779
+                    "hi": 1933155421737519594,
+                    "lo": 1286197068788821186
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1290157397499320093,
-                            "lo": 7749954070968746779
+                            "hi": 1933155421737519594,
+                            "lo": 1286197068788821186
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.56.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.56.json
index c9f507ee..1ee98e29 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.56.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.56.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 866430946508009683,
-                    "lo": 10429218922055106541
+                    "hi": 1015835170915405234,
+                    "lo": 10786284486696661128
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 866430946508009683,
-                    "lo": 10429218922055106541
+                    "hi": 1015835170915405234,
+                    "lo": 10786284486696661128
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 866430946508009683,
-                            "lo": 10429218922055106541
+                            "hi": 1015835170915405234,
+                            "lo": 10786284486696661128
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.57.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.57.json
index d0856a9a..7169dcfc 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.57.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.57.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 170927363131773572,
-                    "lo": 8894444357012961518
+                    "hi": 442682816746422271,
+                    "lo": 7237403628327597106
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 170927363131773572,
-                    "lo": 8894444357012961518
+                    "hi": 442682816746422271,
+                    "lo": 7237403628327597106
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 170927363131773572,
-                            "lo": 8894444357012961518
+                            "hi": 442682816746422271,
+                            "lo": 7237403628327597106
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.58.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.58.json
index af609773..7a9c907f 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.58.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.58.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 978956330715276887,
-                    "lo": 13373726727932593148
+                    "hi": 456940863644159340,
+                    "lo": 5069062676237264596
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 978956330715276887,
-                    "lo": 13373726727932593148
+                    "hi": 456940863644159340,
+                    "lo": 5069062676237264596
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 978956330715276887,
-                            "lo": 13373726727932593148
+                            "hi": 456940863644159340,
+                            "lo": 5069062676237264596
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.59.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.59.json
index 325c6c3e..40e99edd 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.59.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.59.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1971493408816799091,
-                    "lo": 16392437118879027106
+                    "hi": 1777780113813943547,
+                    "lo": 1096643748893900305
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1971493408816799091,
-                    "lo": 16392437118879027106
+                    "hi": 1777780113813943547,
+                    "lo": 1096643748893900305
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1971493408816799091,
-                            "lo": 16392437118879027106
+                            "hi": 1777780113813943547,
+                            "lo": 1096643748893900305
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.6.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.6.json
index 53a2dfeb..7197755d 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.6.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.6.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 652589727215012012,
-                    "lo": 3226770260611624655
+                    "hi": 1304785607773865466,
+                    "lo": 138108471871590751
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 652589727215012012,
-                    "lo": 3226770260611624655
+                    "hi": 1304785607773865466,
+                    "lo": 138108471871590751
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 652589727215012012,
-                            "lo": 3226770260611624655
+                            "hi": 1304785607773865466,
+                            "lo": 138108471871590751
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.60.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.60.json
index 775d73fc..29f26c7a 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.60.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.60.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 778559634500840672,
-                    "lo": 8326117386205879213
+                    "hi": 2015392147905341792,
+                    "lo": 14546817752969436245
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 778559634500840672,
-                    "lo": 8326117386205879213
+                    "hi": 2015392147905341792,
+                    "lo": 14546817752969436245
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 778559634500840672,
-                            "lo": 8326117386205879213
+                            "hi": 2015392147905341792,
+                            "lo": 14546817752969436245
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.61.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.61.json
index 9a58b7ea..357b366c 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.61.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.61.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 207052521987250225,
-                    "lo": 5785898312289164295
+                    "hi": 658912755568625488,
+                    "lo": 15326863446665057688
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 207052521987250225,
-                    "lo": 5785898312289164295
+                    "hi": 658912755568625488,
+                    "lo": 15326863446665057688
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 207052521987250225,
-                            "lo": 5785898312289164295
+                            "hi": 658912755568625488,
+                            "lo": 15326863446665057688
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.62.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.62.json
index 1c3ad8b1..92104b2f 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.62.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.62.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1721361356857027648,
-                    "lo": 2192150877042187229
+                    "hi": 1201683745015165569,
+                    "lo": 14957073904745158475
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1721361356857027648,
-                    "lo": 2192150877042187229
+                    "hi": 1201683745015165569,
+                    "lo": 14957073904745158475
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1721361356857027648,
-                            "lo": 2192150877042187229
+                            "hi": 1201683745015165569,
+                            "lo": 14957073904745158475
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.63.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.63.json
index e8d7fff7..cbbfa8e8 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.63.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.63.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1366114051513323564,
-                    "lo": 9713769309411731452
+                    "hi": 720575806779946940,
+                    "lo": 11261257659949942909
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1366114051513323564,
-                    "lo": 9713769309411731452
+                    "hi": 720575806779946940,
+                    "lo": 11261257659949942909
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1366114051513323564,
-                            "lo": 9713769309411731452
+                            "hi": 720575806779946940,
+                            "lo": 11261257659949942909
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.64.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.64.json
index f6c6eedd..fa79af69 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.64.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.64.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1772744598783268920,
-                    "lo": 6533924828369402307
+                    "hi": 1570609885815231898,
+                    "lo": 7944752007590090984
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1772744598783268920,
-                    "lo": 6533924828369402307
+                    "hi": 1570609885815231898,
+                    "lo": 7944752007590090984
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1772744598783268920,
-                            "lo": 6533924828369402307
+                            "hi": 1570609885815231898,
+                            "lo": 7944752007590090984
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.7.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.7.json
index 3e244f23..599ba087 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.7.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.7.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2303493882360198894,
-                    "lo": 14638557957506513393
+                    "hi": 2217414821058282838,
+                    "lo": 7021890664581204545
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 2303493882360198894,
-                    "lo": 14638557957506513393
+                    "hi": 2217414821058282838,
+                    "lo": 7021890664581204545
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2303493882360198894,
-                            "lo": 14638557957506513393
+                            "hi": 2217414821058282838,
+                            "lo": 7021890664581204545
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.8.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.8.json
index f2ed2024..81d77744 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.8.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.8.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1415165176664286739,
-                    "lo": 5411753119373242795
+                    "hi": 496944961715081473,
+                    "lo": 1532854269592469972
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 1415165176664286739,
-                    "lo": 5411753119373242795
+                    "hi": 496944961715081473,
+                    "lo": 1532854269592469972
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1415165176664286739,
-                            "lo": 5411753119373242795
+                            "hi": 496944961715081473,
+                            "lo": 1532854269592469972
                           }
                         }
                       },
diff --git a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.9.json b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.9.json
index d764a179..ff2469f9 100644
--- a/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.9.json
+++ b/contracts/token/test_snapshots/fuzz_mint/test_fuzz_invalid_minter_rejected_while_valid_minter_succeeds.9.json
@@ -23,8 +23,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 907651276378001170,
-                    "lo": 1997303726593202513
+                    "hi": 1528691493422453539,
+                    "lo": 11501517512204132238
                   }
                 }
               ]
@@ -122,8 +122,8 @@
                 "durability": "persistent",
                 "val": {
                   "i128": {
-                    "hi": 907651276378001170,
-                    "lo": 1997303726593202513
+                    "hi": 1528691493422453539,
+                    "lo": 11501517512204132238
                   }
                 }
               }
@@ -262,8 +262,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 907651276378001170,
-                            "lo": 1997303726593202513
+                            "hi": 1528691493422453539,
+                            "lo": 11501517512204132238
                           }
                         }
                       },