rc-v1.0.1-stable proposed bytecode optimization to merge into stable branch

src/circles/DiscountedBalances.sol

@@ -91,10 +91,7 @@ contract DiscountedBalances is Demurrage {
             // revert CirclesDemurrageAmountExceedsMaxUint192(_account, _id, _balance, 0);
             revert CirclesErrorAddressUintArgs(_account, _id, 0x81);
         }
-        DiscountedBalance memory discountedBalance = discountedBalances[_id][_account];
-        discountedBalance.balance = uint192(_balance);
-        discountedBalance.lastUpdatedDay = _day;
-        discountedBalances[_id][_account] = discountedBalance;
+        discountedBalances[_id][_account] = DiscountedBalance({balance: uint192(_balance), lastUpdatedDay: _day});
     }
 
     /**

src/circles/ERC1155.sol

@@ -114,10 +114,7 @@ abstract contract ERC1155 is DiscountedBalances, Context, ERC165, IERC1155, IERC
      * @dev See {IERC1155-safeTransferFrom}.
      */
     function safeTransferFrom(address _from, address _to, uint256 _id, uint256 _value, bytes memory _data) public {
-        address sender = _msgSender();
-        if (_from != sender && !isApprovedForAll(_from, sender)) {
-            revert ERC1155MissingApprovalForAll(sender, _from);
-        }
+        _allowanceCheck(_from);
         _safeTransferFrom(_from, _to, _id, _value, _data);
     }
 
@@ -131,10 +128,7 @@ abstract contract ERC1155 is DiscountedBalances, Context, ERC165, IERC1155, IERC
         uint256[] memory _values,
         bytes memory _data
     ) public virtual {
-        address sender = _msgSender();
-        if (_from != sender && !isApprovedForAll(_from, sender)) {
-            revert ERC1155MissingApprovalForAll(sender, _from);
-        }
+        _allowanceCheck(_from);
         _safeBatchTransferFrom(_from, _to, _ids, _values, _data);
     }
 
@@ -216,6 +210,16 @@ abstract contract ERC1155 is DiscountedBalances, Context, ERC165, IERC1155, IERC
         _acceptanceCheck(from, to, ids, values, data);
     }
 
+    /**
+     * @dev do the ERC1155 token the sender allowance check
+     */
+    function _allowanceCheck(address _from) internal view {
+        address sender = _msgSender();
+        if (_from != sender && !isApprovedForAll(_from, sender)) {
+            revert ERC1155MissingApprovalForAll(sender, _from);
+        }
+    }
+
     /**
      * @dev do the ERC1155 token acceptance check to the receiver
      */

src/hub/Hub.sol

@@ -273,7 +273,7 @@ contract Hub is Circles, TypeDefinitions, IHubErrors {
 
         // store the metadata digest for the avatar metadata
         if (_metadataDigest != bytes32(0)) {
-            nameRegistry.setMetadataDigest(msg.sender, _metadataDigest);
+            _setMetadataDigest(_metadataDigest);
         }
     }
 
@@ -287,16 +287,7 @@ contract Hub is Circles, TypeDefinitions, IHubErrors {
     function registerGroup(address _mint, string calldata _name, string calldata _symbol, bytes32 _metadataDigest)
         external
     {
-        _registerGroup(msg.sender, _mint, standardTreasury, _name, _symbol);
-
-        // for groups register possible custom name and symbol
-        nameRegistry.registerCustomName(msg.sender, _name);
-        nameRegistry.registerCustomSymbol(msg.sender, _symbol);
-
-        // store the IPFS CIDv0 digest for the group metadata
-        nameRegistry.setMetadataDigest(msg.sender, _metadataDigest);
-
-        emit RegisterGroup(msg.sender, _mint, standardTreasury, _name, _symbol);
+        registerCustomGroup(_mint, standardTreasury, _name, _symbol, _metadataDigest);
     }
 
     /**
@@ -313,15 +304,15 @@ contract Hub is Circles, TypeDefinitions, IHubErrors {
         string calldata _name,
         string calldata _symbol,
         bytes32 _metadataDigest
-    ) external {
+    ) public {
         _registerGroup(msg.sender, _mint, _treasury, _name, _symbol);
 
         // for groups register possible custom name and symbol
-        nameRegistry.registerCustomName(msg.sender, _name);
+        _registerCustomName(_name);
         nameRegistry.registerCustomSymbol(msg.sender, _symbol);
 
         // store the metadata digest for the group metadata
-        nameRegistry.setMetadataDigest(msg.sender, _metadataDigest);
+        _setMetadataDigest(_metadataDigest);
 
         emit RegisterGroup(msg.sender, _mint, _treasury, _name, _symbol);
     }
@@ -335,10 +326,10 @@ contract Hub is Circles, TypeDefinitions, IHubErrors {
         _insertAvatar(msg.sender);
 
         // for organizations, only register possible custom name
-        nameRegistry.registerCustomName(msg.sender, _name);
+        _registerCustomName(_name);
 
         // store the IPFS CIDv0 digest for the organization metadata
-        nameRegistry.setMetadataDigest(msg.sender, _metadataDigest);
+        _setMetadataDigest(_metadataDigest);
 
         emit RegisterOrganization(msg.sender, _name);
     }
@@ -1228,4 +1219,20 @@ contract Hub is Circles, TypeDefinitions, IHubErrors {
         // update the expiry; checks must be done by caller
         trustMarker.expiry = _expiry;
     }
+
+    /**
+     * @dev Calls nameRegistry to store the metadata digest.
+     * @param _metadataDigest sha256 metadata digest for the avatar metadata.
+     */
+    function _setMetadataDigest(bytes32 _metadataDigest) private {
+        nameRegistry.setMetadataDigest(msg.sender, _metadataDigest);
+    }
+
+    /**
+     * @dev Calls nameRegistry to register the custom name.
+     * @param _name immutable name of the group Circles or organization.
+     */
+    function _registerCustomName(string calldata _name) private {
+        nameRegistry.registerCustomName(msg.sender, _name);
+    }
 }