Unify trusted forwarder checks

gelatodigital · Aug 28, 2023 · b98f882 · b98f882
1 parent b2974a5
commit b98f882
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 50 deletions.
diff --git a/contracts/__mocks__/MockGelatoRelayContextERC2771.sol b/contracts/__mocks__/MockGelatoRelayContextERC2771.sol
@@ -32,12 +32,4 @@ contract MockGelatoRelayContextERC2771 is GelatoRelayContextERC2771 {
 
     // solhint-disable-next-line no-empty-blocks
     function testOnlyGelatoRelayERC2771() external onlyGelatoRelayERC2771 {}
-
-    function testOnlyGelatoRelayConcurrentERC2771()
-        external
-        onlyGelatoRelayConcurrentERC2771
-    // solhint-disable-next-line no-empty-blocks
-    {
-
-    }
 }
diff --git a/contracts/__mocks__/MockGelatoRelayFeeCollectorERC2771.sol b/contracts/__mocks__/MockGelatoRelayFeeCollectorERC2771.sol
@@ -19,12 +19,4 @@ contract MockGelatoRelayFeeCollectorERC2771 is GelatoRelayFeeCollectorERC2771 {
 
     // solhint-disable-next-line no-empty-blocks
     function testOnlyGelatoRelayERC2771() external onlyGelatoRelayERC2771 {}
-
-    function testOnlyGelatoRelayConcurrentERC2771()
-        external
-        onlyGelatoRelayConcurrentERC2771
-    // solhint-disable-next-line no-empty-blocks
-    {
-
-    }
 }
diff --git a/contracts/base/GelatoRelayERC2771Base.sol b/contracts/base/GelatoRelayERC2771Base.sol
@@ -14,35 +14,17 @@ abstract contract GelatoRelayERC2771Base {
         _;
     }
 
-    modifier onlyGelatoRelayConcurrentERC2771() {
-        require(
-            _isGelatoRelayConcurrentERC2771(msg.sender),
-            "onlyGelatoRelayConcurrentERC2771"
-        );
-        _;
-    }
-
     function _isGelatoRelayERC2771(address _forwarder)
         internal
         view
         returns (bool)
     {
         // Use another address on zkSync
         if (block.chainid == 324 || block.chainid == 280) {
-            return _forwarder == GELATO_RELAY_ERC2771_ZKSYNC;
-        }
-        return _forwarder == GELATO_RELAY_ERC2771;
-    }
-
-    function _isGelatoRelayConcurrentERC2771(address _forwarder)
-        internal
-        view
-        returns (bool)
-    {
-        // Use another address on zkSync
-        if (block.chainid == 324 || block.chainid == 280) {
-            return _forwarder == GELATO_RELAY_CONCURRENT_ERC2771_ZKSYNC;
+            return (_forwarder == GELATO_RELAY_ERC2771_ZKSYNC ||
+                _forwarder == GELATO_RELAY_CONCURRENT_ERC2771_ZKSYNC);
         }
-        return _forwarder == GELATO_RELAY_CONCURRENT_ERC2771;
+        return (_forwarder == GELATO_RELAY_ERC2771 ||
+            _forwarder == GELATO_RELAY_CONCURRENT_ERC2771);
     }
 }
diff --git a/test/MockRelayContextERC2771.test.ts b/test/MockRelayContextERC2771.test.ts
@@ -262,10 +262,4 @@ describe("Test MockGelatoRelayContextERC2771 Smart Contract", function () {
       mockRelayContextERC2771.testOnlyGelatoRelayERC2771()
     ).to.be.revertedWith("onlyGelatoRelayERC2771");
   });
-
-  it("#7: testOnlyGelatoRelayConcurrentERC2771 reverts if not GelatoRelay", async () => {
-    await expect(
-      mockRelayContextERC2771.testOnlyGelatoRelayConcurrentERC2771()
-    ).to.be.revertedWith("onlyGelatoRelayConcurrentERC2771");
-  });
 });
diff --git a/test/MockRelayFeeCollectorERC2771.test.ts b/test/MockRelayFeeCollectorERC2771.test.ts
@@ -135,10 +135,4 @@ describe("Test MockGelatoRelayFeeCollectorERC2771 Smart Contract", function () {
       mockRelayFeeCollectorERC2771.testOnlyGelatoRelayERC2771()
     ).to.be.revertedWith("onlyGelatoRelayERC2771");
   });
-
-  it("#3: testOnlyGelatoRelayConcurrentERC2771 reverts if not GelatoRelay", async () => {
-    await expect(
-      mockRelayFeeCollectorERC2771.testOnlyGelatoRelayConcurrentERC2771()
-    ).to.be.revertedWith("onlyGelatoRelayConcurrentERC2771");
-  });
 });