Merge pull request #230 from 0xPolygonHermez/feat/origin-check-override

Add possibility to override origin check for the native token on sovereign chains
0xPolygonHermez · Apr 19, 2024 · 65f9481 · 65f9481
2 parents 54f58c8 + b297fd5
commit 65f9481
Showing 1 changed file with 27 additions and 22 deletions.
diff --git a/contracts/v2/lib/PolygonRollupBaseEtrog.sol b/contracts/v2/lib/PolygonRollupBaseEtrog.sol
@@ -302,29 +302,8 @@ abstract contract PolygonRollupBaseEtrog is
         string memory sequencerURL,
         string memory _networkName
     ) external virtual onlyRollupManager initializer {
-        bytes memory gasTokenMetadata;
+        bytes memory gasTokenMetadata = _verifyOrigin(_gasTokenAddress);
 
-        if (_gasTokenAddress != address(0)) {
-            // Ask for token metadata, the same way is enconded in the bridge
-            // Note that this function will revert if the token is not in this network
-            // Note that this could be a possible reentrant call, but cannot make changes on the state since are static call
-            gasTokenMetadata = bridgeAddress.getTokenMetadata(_gasTokenAddress);
-
-            // Check gas token address on the bridge
-            (
-                uint32 originWrappedNetwork,
-                address originWrappedAddress
-            ) = bridgeAddress.wrappedTokenToTokenInfo(_gasTokenAddress);
-
-            if (originWrappedNetwork != 0) {
-                // It's a wrapped token, get the wrapped parameters
-                gasTokenAddress = originWrappedAddress;
-                gasTokenNetwork = originWrappedNetwork;
-            } else {
-                // gasTokenNetwork will be mainnet, for instance 0
-                gasTokenAddress = _gasTokenAddress;
-            }
-        }
         // Sequence transaction to initilize the bridge
 
         // Calculate transaction to initialize the bridge
@@ -948,4 +927,30 @@ abstract contract PolygonRollupBaseEtrog is
 
         return transaction;
     }
+
+    function _verifyOrigin(
+        address _gasTokenAddress
+    ) internal virtual returns (bytes memory gasTokenMetadata) {
+        if (_gasTokenAddress != address(0)) {
+            // Ask for token metadata, the same way is enconded in the bridge
+            // Note that this function will revert if the token is not in this network
+            // Note that this could be a possible reentrant call, but cannot make changes on the state since are static call
+            gasTokenMetadata = bridgeAddress.getTokenMetadata(_gasTokenAddress);
+
+            // Check gas token address on the bridge
+            (
+                uint32 originWrappedNetwork,
+                address originWrappedAddress
+            ) = bridgeAddress.wrappedTokenToTokenInfo(_gasTokenAddress);
+
+            if (originWrappedNetwork != 0) {
+                // It's a wrapped token, get the wrapped parameters
+                gasTokenAddress = originWrappedAddress;
+                gasTokenNetwork = originWrappedNetwork;
+            } else {
+                // gasTokenNetwork will be mainnet, for instance 0
+                gasTokenAddress = _gasTokenAddress;
+            }
+        }
+    }
 }