remove chainId checks

we have no cross-chain capabilities anyways. it would lead to bricked mechs in case of network forks
gnosisguild · Dec 13, 2023 · cf79eea · cf79eea
1 parent f9f0f68
commit cf79eea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
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) = token();
-        if (chainId != block.chainid) return false;
+        (, address tokenContract, uint256 tokenId) = token();
         return IERC1155(tokenContract).balanceOf(signer, tokenId) > 0;
     }
 
@@ -21,16 +20,10 @@ contract ERC1155TokenboundMech is TokenboundMech {
         uint256,
         bytes calldata
     ) external view override returns (bytes4) {
-        (
-            uint256 chainId,
-            address boundTokenContract,
-            uint256 boundTokenId
-        ) = token();
+        (, address boundTokenContract, uint256 boundTokenId) = token();
 
         if (
-            chainId == block.chainid &&
-            msg.sender == boundTokenContract &&
-            receivedTokenId == boundTokenId
+            msg.sender == boundTokenContract && receivedTokenId == boundTokenId
         ) {
             // We block the transfer only if the sender has no balance left after the transfer.
             // Note: ERC-1155 prescribes that balances are updated BEFORE the call to onERC1155Received.
@@ -51,13 +44,9 @@ contract ERC1155TokenboundMech is TokenboundMech {
         uint256[] calldata,
         bytes calldata
     ) external view override returns (bytes4) {
-        (
-            uint256 chainId,
-            address boundTokenContract,
-            uint256 boundTokenId
-        ) = token();
+        (, address boundTokenContract, uint256 boundTokenId) = token();
 
-        if (chainId == block.chainid && msg.sender == boundTokenContract) {
+        if (msg.sender == boundTokenContract) {
             // We block the transfer only if the sender has no balance left after the transfer.
             // Note: ERC-1155 prescribes that balances are updated BEFORE the call to onERC1155BatchReceived.
             for (uint256 i = 0; i < ids.length; i++) {

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) = token();
-        if (chainId != block.chainid) return false;
+        (, address tokenContract, uint256 tokenId) = token();
         return
             IERC721(tokenContract).ownerOf(tokenId) == signer &&
             signer != address(0);
@@ -23,16 +22,10 @@ contract ERC721TokenboundMech is TokenboundMech {
         uint256 receivedTokenId,
         bytes calldata
     ) external view override returns (bytes4) {
-        (
-            uint256 chainId,
-            address boundTokenContract,
-            uint256 boundTokenId
-        ) = token();
+        (, address boundTokenContract, uint256 boundTokenId) = token();
 
         if (
-            chainId == block.chainid &&
-            msg.sender == boundTokenContract &&
-            receivedTokenId == boundTokenId
+            msg.sender == boundTokenContract && receivedTokenId == boundTokenId
         ) {
             revert OwnershipCycle();
         }