avoid unnecessary external calls

gnosisguild · Dec 7, 2023 · b1b3137 · b1b3137
1 parent f8dc3cd
commit b1b3137
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/contracts/ERC1155ThresholdMech.sol b/contracts/ERC1155ThresholdMech.sol
@@ -32,7 +32,7 @@ contract ERC1155ThresholdMech is ThresholdMech {
             uint256[] memory tokenIds,
             uint256[] memory minBalances,
             uint256 minTotalBalance
-        ) = this.threshold();
+        ) = threshold();
 
         uint256 balanceSum = 0;
         for (uint256 i = 0; i < tokenIds.length; i++) {

diff --git a/contracts/ERC1155TokenboundMech.sol b/contracts/ERC1155TokenboundMech.sol
@@ -9,8 +9,7 @@ import "./base/TokenboundMech.sol";
  */
 contract ERC1155TokenboundMech is TokenboundMech {
     function isOperator(address signer) public view override returns (bool) {
-        (uint256 chainId, address tokenContract, uint256 tokenId) = this
-            .token();
+        (uint256 chainId, address tokenContract, uint256 tokenId) = token();
         if (chainId != block.chainid) return false;
         return IERC1155(tokenContract).balanceOf(signer, tokenId) > 0;
     }
@@ -26,7 +25,7 @@ contract ERC1155TokenboundMech is TokenboundMech {
             uint256 chainId,
             address boundTokenContract,
             uint256 boundTokenId
-        ) = this.token();
+        ) = token();
 
         if (
             chainId == block.chainid &&
@@ -56,7 +55,7 @@ contract ERC1155TokenboundMech is TokenboundMech {
             uint256 chainId,
             address boundTokenContract,
             uint256 boundTokenId
-        ) = this.token();
+        ) = token();
 
         if (chainId == block.chainid && msg.sender == boundTokenContract) {
             // We block the transfer only if the sender has no balance left after the transfer.

diff --git a/contracts/ERC20ThresholdMech.sol b/contracts/ERC20ThresholdMech.sol
@@ -22,7 +22,7 @@ contract ERC20ThresholdMech is ThresholdMech {
     }
 
     function isOperator(address signer) public view override returns (bool) {
-        (address token, uint256 minBalance) = this.threshold();
+        (address token, uint256 minBalance) = threshold();
 
         return IERC20(token).balanceOf(signer) >= minBalance;
     }

diff --git a/contracts/ERC721TokenboundMech.sol b/contracts/ERC721TokenboundMech.sol
@@ -10,8 +10,7 @@ import "./base/TokenboundMech.sol";
  */
 contract ERC721TokenboundMech is TokenboundMech {
     function isOperator(address signer) public view override returns (bool) {
-        (uint256 chainId, address tokenContract, uint256 tokenId) = this
-            .token();
+        (uint256 chainId, address tokenContract, uint256 tokenId) = token();
         if (chainId != block.chainid) return false;
         return
             IERC721(tokenContract).ownerOf(tokenId) == signer &&
@@ -28,7 +27,7 @@ contract ERC721TokenboundMech is TokenboundMech {
             uint256 chainId,
             address boundTokenContract,
             uint256 boundTokenId
-        ) = this.token();
+        ) = token();
 
         if (
             chainId == block.chainid &&

diff --git a/contracts/base/TokenboundMech.sol b/contracts/base/TokenboundMech.sol
@@ -18,7 +18,7 @@ abstract contract TokenboundMech is Mech, IERC6551Account {
     }
 
     function token()
-        external
+        public
         view
         returns (uint256 chainId, address tokenContract, uint256 tokenId)
     {