Gas optimization

packages/contracts/src/dollar/core/CreditNft.sol

@@ -45,11 +45,15 @@ contract CreditNft is ERC1155Ubiquity, ICreditNft {
 
     /// @notice Modifier checks that the method is called by a user with the "CreditNft manager" role
     modifier onlyCreditNftManager() {
+        _onlyCreditNftManager();
+        _;
+    }
+
+    function _onlyCreditNftManager() internal view {
         require(
             accessControl.hasRole(CREDIT_NFT_MANAGER_ROLE, _msgSender()),
-            "Caller is not a CreditNft manager"
+            "CreditNft: not CreditNft manager"
         );
-        _;
     }
 
     /// @notice Ensures initialize cannot be called on the implementation contract
@@ -120,7 +124,7 @@ contract CreditNft is ERC1155Ubiquity, ICreditNft {
      * @dev Should be called prior to any state changing functions
      */
     function updateTotalDebt() public {
-        bool reachedEndOfExpiredKeys = false;
+        bool reachedEndOfExpiredKeys=false;
         uint256 currentBlockNumber = _sortedBlockNumbers.popFront();
         uint256 outstandingDebt = _totalOutstandingDebt;
         //if list is empty, currentBlockNumber will be 0

packages/contracts/src/dollar/core/ERC1155Ubiquity.sol

@@ -39,38 +39,54 @@ abstract contract ERC1155Ubiquity is
 
     /// @notice Modifier checks that the method is called by a user with the "Governance minter" role
     modifier onlyMinter() virtual {
+        _onlyMinter();
+        _;
+    }
+
+    function _onlyMinter() virtual internal view {
         require(
             accessControl.hasRole(GOVERNANCE_TOKEN_MINTER_ROLE, _msgSender()),
             "ERC1155Ubiquity: not minter"
         );
-        _;
-    }
+    }    
 
     /// @notice Modifier checks that the method is called by a user with the "Governance burner" role
     modifier onlyBurner() virtual {
+        _onlyBurner();
+        _;
+    }
+
+    function _onlyBurner() virtual internal view {
         require(
             accessControl.hasRole(GOVERNANCE_TOKEN_BURNER_ROLE, _msgSender()),
             "ERC1155Ubiquity: not burner"
         );
-        _;
     }
 
     /// @notice Modifier checks that the method is called by a user with the "Pauser" role
     modifier onlyPauser() virtual {
+        _onlyPauser();
+        _;
+    }
+
+    function _onlyPauser() virtual internal view {
         require(
             accessControl.hasRole(PAUSER_ROLE, _msgSender()),
             "ERC1155Ubiquity: not pauser"
         );
-        _;
     }
 
     /// @notice Modifier checks that the method is called by a user with the "Admin" role
     modifier onlyAdmin() {
+        _onlyAdmin();
+        _;
+    }
+
+    function _onlyAdmin() internal view {
         require(
             accessControl.hasRole(DEFAULT_ADMIN_ROLE, _msgSender()),
             "ERC20Ubiquity: not admin"
         );
-        _;
     }
 
     /// @notice Ensures __ERC1155Ubiquity_init cannot be called on the implementation contract
@@ -140,7 +156,7 @@ abstract contract ERC1155Ubiquity is
         bytes memory data
     ) public virtual onlyMinter {
         _mint(to, id, amount, data);
-        totalSupply += amount;
+        totalSupply = totalSupply + amount;
         holderBalances[to].add(id);
     }
 
@@ -159,8 +175,12 @@ abstract contract ERC1155Ubiquity is
     ) public virtual onlyMinter whenNotPaused {
         _mintBatch(to, ids, amounts, data);
         uint256 localTotalSupply = totalSupply;
-        for (uint256 i = 0; i < ids.length; ++i) {
+        uint256 idsLength = ids.length;
+        for (uint256 i; i < idsLength;) {
             localTotalSupply += amounts[i];
+            unchecked{
+                ++i;
+            }
         }
         totalSupply = localTotalSupply;
         holderBalances[to].add(ids);
@@ -249,7 +269,7 @@ abstract contract ERC1155Ubiquity is
         uint256 amount
     ) internal virtual override whenNotPaused {
         super._burn(account, id, amount);
-        totalSupply -= amount;
+        totalSupply = totalSupply - amount;
     }
 
     /**
@@ -267,8 +287,11 @@ abstract contract ERC1155Ubiquity is
         uint256[] memory amounts
     ) internal virtual override whenNotPaused {
         super._burnBatch(account, ids, amounts);
-        for (uint256 i = 0; i < ids.length; ++i) {
-            totalSupply -= amounts[i];
+        for (uint256 i; i < ids.length;) {
+            totalSupply = totalSupply - amounts[i];
+            unchecked {
+                ++i;
+            }
         }
     }
 

packages/contracts/src/dollar/core/ERC20Ubiquity.sol

@@ -43,20 +43,28 @@ abstract contract ERC20Ubiquity is
 
     /// @notice Modifier checks that the method is called by a user with the "pauser" role
     modifier onlyPauser() {
+        _onlyPauser();
+        _;
+    }
+
+    function _onlyPauser() internal view {
         require(
             accessControl.hasRole(PAUSER_ROLE, msg.sender),
             "ERC20Ubiquity: not pauser"
         );
-        _;
     }
 
     /// @notice Modifier checks that the method is called by a user with the "admin" role
     modifier onlyAdmin() {
+        _onlyAdmin();
+        _;
+    }
+
+    function _onlyAdmin() internal view {
         require(
             accessControl.hasRole(DEFAULT_ADMIN_ROLE, msg.sender),
             "ERC20Ubiquity: not admin"
         );
-        _;
     }
 
     /// @notice Ensures __ERC20Ubiquity_init cannot be called on the implementation contract

packages/contracts/src/dollar/core/StakingShare.sol

@@ -41,29 +41,41 @@ contract StakingShare is ERC1155Ubiquity, ERC1155URIStorageUpgradeable {
 
     /// @notice Modifier checks that the method is called by a user with the "Staking share minter" role
     modifier onlyMinter() override {
+        _onlyMinter();
+        _;
+    }
+
+    function _onlyMinter() internal override view {
         require(
             accessControl.hasRole(STAKING_SHARE_MINTER_ROLE, msg.sender),
             "Staking Share: not minter"
         );
-        _;
     }
 
     /// @notice Modifier checks that the method is called by a user with the "Staking share burner" role
     modifier onlyBurner() override {
+        _onlyBurner();
+        _;
+    }
+
+    function _onlyBurner() internal override view {
         require(
             accessControl.hasRole(STAKING_SHARE_BURNER_ROLE, msg.sender),
             "Staking Share: not burner"
         );
-        _;
     }
 
     /// @notice Modifier checks that the method is called by a user with the "Pauser" role
     modifier onlyPauser() override {
+        _onlyPauser();
+        _;
+    }
+
+    function _onlyPauser() internal override view {
         require(
             accessControl.hasRole(PAUSER_ROLE, msg.sender),
             "Staking Share: not pauser"
         );
-        _;
     }
 
     /// @notice Ensures initialize cannot be called on the implementation contract
@@ -124,7 +136,7 @@ contract StakingShare is ERC1155Ubiquity, ERC1155URIStorageUpgradeable {
     ) public virtual onlyMinter whenNotPaused returns (uint256 id) {
         id = totalSupply + 1;
         _mint(to, id, 1, bytes(""));
-        totalSupply += 1;
+        totalSupply = totalSupply + 1;
         holderBalances[to].add(id);
         Stake storage _stake = _stakes[id];
         _stake.minter = to;
@@ -250,7 +262,7 @@ contract StakingShare is ERC1155Ubiquity, ERC1155URIStorageUpgradeable {
         super._burn(account, id, 1);
         Stake storage _stake = _stakes[id];
         require(_stake.lpAmount == 0, "LP <> 0");
-        totalSupply -= 1;
+        totalSupply = totalSupply - 1;
     }
 
     /**

packages/contracts/src/dollar/core/UbiquityCreditToken.sol

@@ -27,20 +27,28 @@ contract UbiquityCreditToken is ERC20Ubiquity {
 
     /// @notice Modifier checks that the method is called by a user with the "Credit minter" role
     modifier onlyCreditMinter() {
+        _onlyCreditMinter();
+        _;
+    }
+
+    function _onlyCreditMinter() internal view {
         require(
             accessControl.hasRole(CREDIT_TOKEN_MINTER_ROLE, _msgSender()),
             "Credit token: not minter"
         );
-        _;
     }
 
     /// @notice Modifier checks that the method is called by a user with the "Credit burner" role
     modifier onlyCreditBurner() {
+        _onlyCreditBurner();
+        _;
+    }
+
+    function _onlyCreditBurner() internal view {
         require(
             accessControl.hasRole(CREDIT_TOKEN_BURNER_ROLE, _msgSender()),
             "Credit token: not burner"
         );
-        _;
     }
 
     /**

packages/contracts/src/dollar/core/UbiquityDollarToken.sol

@@ -39,20 +39,28 @@ contract UbiquityDollarToken is ERC20Ubiquity {
 
     /// @notice Modifier checks that the method is called by a user with the "Dollar minter" role
     modifier onlyDollarMinter() {
+        _onlyDollarMinter();
+        _;
+    }
+
+    function _onlyDollarMinter() internal view {
         require(
             accessControl.hasRole(DOLLAR_TOKEN_MINTER_ROLE, _msgSender()),
             "Dollar token: not minter"
         );
-        _;
     }
 
     /// @notice Modifier checks that the method is called by a user with the "Dollar burner" role
     modifier onlyDollarBurner() {
+        _onlyDollarBurner();
+        _;
+    }
+
+    function _onlyDollarBurner() internal view {
         require(
             accessControl.hasRole(DOLLAR_TOKEN_BURNER_ROLE, _msgSender()),
             "Dollar token: not burner"
         );
-        _;
     }
 
     /**

packages/contracts/src/dollar/core/UbiquityGovernanceToken.sol

@@ -27,20 +27,28 @@ contract UbiquityGovernanceToken is ERC20Ubiquity {
 
     /// @notice Modifier checks that the method is called by a user with the "Governance minter" role
     modifier onlyGovernanceMinter() {
+        _onlyGovernanceMinter();
+        _;
+    }
+
+    function _onlyGovernanceMinter() internal view {
         require(
             accessControl.hasRole(GOVERNANCE_TOKEN_MINTER_ROLE, _msgSender()),
             "Governance token: not minter"
         );
-        _;
     }
 
     /// @notice Modifier checks that the method is called by a user with the "Governance burner" role
     modifier onlyGovernanceBurner() {
+        _onlyGovernanceBurner();
+        _;
+    }
+
+    function _onlyGovernanceBurner() internal view {
         require(
             accessControl.hasRole(GOVERNANCE_TOKEN_BURNER_ROLE, _msgSender()),
             "Governance token: not burner"
         );
-        _;
     }
 
     /**

packages/contracts/src/dollar/facets/DiamondLoupeFacet.sol

@@ -18,14 +18,14 @@ contract DiamondLoupeFacet is IDiamondLoupe, IERC165 {
         LibDiamond.DiamondStorage storage ds = LibDiamond.diamondStorage();
         uint256 numFacets = ds.facetAddresses.length;
         facets_ = new Facet[](numFacets);
-        for (uint256 i = 0; i < numFacets; ) {
+        for (uint256 i; i < numFacets; ) {
             address facetAddress_ = ds.facetAddresses[i];
             facets_[i].facetAddress = facetAddress_;
             facets_[i].functionSelectors = ds
                 .facetFunctionSelectors[facetAddress_]
                 .functionSelectors;
             unchecked {
-                i++;
+                ++i;
             }
         }
     }

packages/contracts/src/dollar/facets/OwnershipFacet.sol

@@ -10,7 +10,7 @@ contract OwnershipFacet is IERC173 {
     function transferOwnership(address _newOwner) external override {
         require(
             (_newOwner != address(0)),
-            "OwnershipFacet: New owner cannot be the zero address"
+            "OwnershipFacet: Can't address(0)"
         );
         LibDiamond.enforceIsContractOwner();
         LibDiamond.setContractOwner(_newOwner);

packages/contracts/src/dollar/libraries/Constants.sol

@@ -61,7 +61,7 @@ bytes32 constant CREDIT_NFT_MANAGER_ROLE = keccak256("CREDIT_NFT_MANAGER_ROLE");
 bytes32 constant STAKING_MANAGER_ROLE = keccak256("STAKING_MANAGER_ROLE");
 
 /// @dev Role name for inventive manager
-bytes32 constant INCENTIVE_MANAGER_ROLE = keccak256("INCENTIVE_MANAGER");
+bytes32 constant INCENTIVE_MANAGER_ROLE = keccak256("INCENTIVE_MANAGER_ROLE");
 
 /// @dev Role name for Governance token manager
 bytes32 constant GOVERNANCE_TOKEN_MANAGER_ROLE = keccak256(