format

Author: braden-thompson-cb

evm/src/CustomStablecoin/CustomStablecoin.sol

@@ -89,15 +89,15 @@ contract CustomStablecoin is
         initializer
     {
         // Decimals must be set before granting mint role.
-        MetadataStorage.setDecimals(tokenDecimals);
+        MetadataStorage.setDecimals({value: tokenDecimals});
         __ERC20_init(name, symbol);
         __ERC20Pausable_init();
         __AccessControlDefaultAdminRules_init(adminDelay, admin);
-        _grantRole(MINT_ALLOWANCE_ROLE, admin);
-        _grantRole(MINT_ROLE, admin);
-        _grantRole(BURN_ROLE, admin);
-        _grantRole(PAUSE_ROLE, admin);
-        _grantRole(BLACKLIST_ROLE, admin);
+        _grantRole({role: MINT_ALLOWANCE_ROLE, account: admin});
+        _grantRole({role: MINT_ROLE, account: admin});
+        _grantRole({role: BURN_ROLE, account: admin});
+        _grantRole({role: PAUSE_ROLE, account: admin});
+        _grantRole({role: BLACKLIST_ROLE, account: admin});
     }
 
     /// @notice Mints `amount` tokens to `to`.
@@ -106,7 +106,7 @@ contract CustomStablecoin is
     /// @param amount Number of tokens to mint.
     function mint(address to, uint256 amount) external onlyRole(MINT_ROLE) {
         if (to == address(0)) revert MintToZeroAddress();
-        MintAllowanceStorage.consume(msg.sender, amount);
+        MintAllowanceStorage.consume({minter: msg.sender, amount: amount});
         _mint(to, amount);
         emit Minted({minter: msg.sender, to: to, amount: amount});
     }
@@ -126,17 +126,6 @@ contract CustomStablecoin is
         MintAllowanceStorage.configureMinter(minter, maxAllowance, interval);
     }
 
-    /// @notice Returns the estimated current mint allowance for `caller`.
-    ///
-    /// @dev Includes any pending replenishment that would apply at the current timestamp.
-    ///
-    /// @param caller Address to query.
-    ///
-    /// @return Current allowance including any pending replenishment.
-    function estimatedAllowance(address caller) external view returns (uint256) {
-        return MintAllowanceStorage.estimatedAllowance(caller);
-    }
-
     /// @notice Burns `amount` tokens from the caller's balance.
     ///
     /// @param amount Number of tokens to burn.
@@ -169,6 +158,17 @@ contract CustomStablecoin is
         BlacklistStorage.unBlacklist(account);
     }
 
+    /// @notice Returns the estimated current mint allowance for `caller`.
+    ///
+    /// @dev Includes any pending replenishment that would apply at the current timestamp.
+    ///
+    /// @param caller Address to query.
+    ///
+    /// @return Current allowance including any pending replenishment.
+    function estimatedAllowance(address caller) external view returns (uint256) {
+        return MintAllowanceStorage.estimatedAllowance({minter: caller});
+    }
+
     /// @notice Returns whether `account` is blacklisted.
     ///
     /// @param account Address to query.
@@ -201,7 +201,9 @@ contract CustomStablecoin is
         bool granted = super._grantRole(role, account);
         if (granted && role == MINT_ROLE) {
             uint256 allowance = DEFAULT_MINT_ALLOWANCE * 10 ** decimals();
-            MintAllowanceStorage.configureMinter(account, allowance, DEFAULT_MINT_INTERVAL);
+            MintAllowanceStorage.configureMinter({
+                minter: account, maxAllowance: allowance, interval: DEFAULT_MINT_INTERVAL
+            });
         }
         return granted;
     }
@@ -215,7 +217,7 @@ contract CustomStablecoin is
     function _revokeRole(bytes32 role, address account) internal override returns (bool) {
         bool revoked = super._revokeRole(role, account);
         if (revoked && role == MINT_ROLE) {
-            MintAllowanceStorage.removeMinter(account);
+            MintAllowanceStorage.removeMinter({minter: account});
         }
         return revoked;
     }
@@ -229,9 +231,9 @@ contract CustomStablecoin is
         internal
         override(ERC20Upgradeable, ERC20PausableUpgradeable)
     {
-        BlacklistStorage.requireNotBlacklisted(msg.sender);
-        BlacklistStorage.requireNotBlacklisted(from);
-        BlacklistStorage.requireNotBlacklisted(to);
+        BlacklistStorage.requireNotBlacklisted({account: msg.sender});
+        BlacklistStorage.requireNotBlacklisted({account: from});
+        BlacklistStorage.requireNotBlacklisted({account: to});
         super._update(from, to, value);
     }
 }

evm/src/CustomStablecoin/lib/MintAllowanceStorage.sol

@@ -21,10 +21,10 @@ library MintAllowanceStorage {
         uint256 maxAllowance;
         /// @dev The current available allowance.
         uint256 allowance;
-        /// @dev The replenishment interval in seconds.
-        uint256 interval;
-        /// @dev The unix timestamp of the last replenishment.
-        uint256 lastReplenished;
+        /// @dev The replenishment interval in seconds. Packed with `lastReplenished`.
+        uint40 interval;
+        /// @dev The unix timestamp (seconds) of the last replenishment. Packed with `interval`.
+        uint40 lastReplenished;
     }
 
     /// @notice Storage layout for mint allowances.
@@ -89,7 +89,10 @@ library MintAllowanceStorage {
     function configureMinter(address minter, uint256 maxAllowance, uint256 interval) internal {
         if (maxAllowance == 0 || interval == 0) revert InvalidMinterConfig();
         layout().minters[minter] = MinterConfig({
-            maxAllowance: maxAllowance, allowance: maxAllowance, interval: interval, lastReplenished: block.timestamp
+            maxAllowance: maxAllowance,
+            allowance: maxAllowance,
+            interval: uint40(interval),
+            lastReplenished: uint40(block.timestamp)
         });
         emit MinterConfigured({minter: minter, maxAllowance: maxAllowance, interval: interval});
     }
@@ -146,13 +149,13 @@ library MintAllowanceStorage {
     function _replenish(address minter) private {
         MinterConfig storage config = layout().minters[minter];
         if (config.allowance == config.maxAllowance) {
-            config.lastReplenished = block.timestamp;
+            config.lastReplenished = uint40(block.timestamp);
             return;
         }
         uint256 amount = _replenishAmount(config);
         if (amount == 0) return;
         config.allowance += amount;
-        config.lastReplenished = block.timestamp;
+        config.lastReplenished = uint40(block.timestamp);
         emit AllowanceReplenished({minter: minter, allowance: config.allowance, amountReplenished: amount});
     }
 

evm/src/OverrideableBeaconProxy.sol

@@ -123,13 +123,6 @@ contract OverrideableBeaconProxy is BeaconProxy {
         emit ImplementationOverrideSet({implementation: implementation});
     }
 
-    /// @notice Returns the current implementation override, or `address(0)` if using the beacon.
-    ///
-    /// @return The override implementation address.
-    function implementationOverride() external view returns (address) {
-        return ERC1967Utils.getImplementation();
-    }
-
     /// @notice Starts a two-step transfer of the proxy admin role to `newAdmin`.
     ///
     /// @dev Setting `newAdmin` to `address(0)` cancels a pending transfer.
@@ -150,6 +143,13 @@ contract OverrideableBeaconProxy is BeaconProxy {
         emit ProxyAdminTransferred({previousAdmin: oldAdmin, newAdmin: msg.sender});
     }
 
+    /// @notice Returns the current implementation override, or `address(0)` if using the beacon.
+    ///
+    /// @return The override implementation address.
+    function implementationOverride() external view returns (address) {
+        return ERC1967Utils.getImplementation();
+    }
+
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                      PUBLIC FUNCTIONS                      */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/

evm/src/OverrideableBeaconProxyFactory.sol

@@ -76,7 +76,7 @@ contract OverrideableBeaconProxyFactory is Initializable, AccessControlDefaultAd
     function initialize(address admin, uint48 adminDelay, address beacon_) external initializer {
         if (beacon_ == address(0)) revert BeaconNotSet();
         __AccessControlDefaultAdminRules_init(adminDelay, admin);
-        _grantRole(DEPLOYER_ROLE, admin);
+        _grantRole({role: DEPLOYER_ROLE, account: admin});
         _getFactoryStorage().beacon = beacon_;
     }
 
@@ -86,14 +86,15 @@ contract OverrideableBeaconProxyFactory is Initializable, AccessControlDefaultAd
     /// @param admin  The admin of the new proxy (controls implementation override).
     /// @param data   Optional initializer calldata forwarded via delegatecall.
     ///
-    /// @return proxy The address of the newly deployed proxy.
+    /// @return The address of the newly deployed proxy.
     function deploy(bytes32 salt, address admin, bytes calldata data)
         external
         onlyRole(DEPLOYER_ROLE)
-        returns (address proxy)
+        returns (address)
     {
-        proxy = address(new OverrideableBeaconProxy{salt: salt}(_getFactoryStorage().beacon, admin, data));
+        address proxy = address(new OverrideableBeaconProxy{salt: salt}(_getFactoryStorage().beacon, admin, data));
         emit ProxyDeployed({proxy: proxy, admin: admin, salt: salt});
+        return proxy;
     }
 
     /// @notice Returns the deterministic address for a proxy deployed with the given