Merge pull request #12 from OffchainLabs/address-calc-update

Calculate properly canonical address of L1 router

Author: gzeoneth

contracts/tokenbridge/arbitrum/L2AtomicTokenBridgeFactory.sol

@@ -333,7 +333,6 @@ struct L2RuntimeCode {
  * Collection of salts used in CREATE2 deployment of L2 token bridge contracts.
  */
 library OrbitSalts {
-    bytes public constant L1_PROXY_ADMIN = bytes("OrbitL1ProxyAdmin");
     bytes public constant L1_ROUTER = bytes("OrbitL1GatewayRouterProxy");
     bytes public constant L1_STANDARD_GATEWAY = bytes("OrbitL1StandardGatewayProxy");
     bytes public constant L1_CUSTOM_GATEWAY = bytes("OrbitL1CustomGatewayProxy");

contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol

@@ -518,11 +518,7 @@ contract L1AtomicTokenBridgeCreator is Initializable, OwnableUpgradeable {
     }
 
     function getCanonicalL1RouterAddress(address inbox) public view returns (address) {
-        address expectedL1ProxyAdminAddress = Create2.computeAddress(
-            _getL1Salt(OrbitSalts.L1_PROXY_ADMIN, inbox),
-            keccak256(type(ProxyAdmin).creationCode),
-            address(this)
-        );
+        address proxyAdminAddress = IInbox_ProxyAdmin(inbox).getProxyAdmin();
 
         bool isUsingFeeToken = _getFeeToken(inbox) != address(0);
         address template = isUsingFeeToken
@@ -534,7 +530,7 @@ contract L1AtomicTokenBridgeCreator is Initializable, OwnableUpgradeable {
             keccak256(
                 abi.encodePacked(
                     type(TransparentUpgradeableProxy).creationCode,
-                    abi.encode(template, expectedL1ProxyAdminAddress, bytes(""))
+                    abi.encode(template, proxyAdminAddress, bytes(""))
                 )
             ),
             address(this)

scripts/local-deployment/deployCreatorAndCreateTokenBridge.ts

@@ -110,14 +110,14 @@ export const setupTokenBridgeInLocalEnv = async () => {
 
   //// run retryable estimate for deploying L2 factory
   const deployFactoryGasParams = await getEstimateForDeployingFactory(
-    l1Deployer,
-    l2Deployer.provider!
+    parentDeployer,
+    childDeployer.provider!
   )
   const gasLimitForL2FactoryDeployment = deployFactoryGasParams.gasLimit
 
   const { l1TokenBridgeCreator, retryableSender } =
     await deployL1TokenBridgeCreator(
-      l1Deployer,
+      parentDeployer,
       l1Weth,
       gasLimitForL2FactoryDeployment
     )

test-e2e/tokenBridgeDeploymentTest.ts

@@ -5,6 +5,7 @@ import {
   IInbox__factory,
   IOwnable__factory,
   IRollupCore__factory,
+  L1AtomicTokenBridgeCreator,
   L1AtomicTokenBridgeCreator__factory,
   L1CustomGateway,
   L1CustomGateway__factory,
@@ -85,10 +86,15 @@ describe('tokenBridge', () => {
       l1RetryableSender.toLowerCase()
     )
 
+    const creator = L1AtomicTokenBridgeCreator__factory.connect(
+      l1TokenBridgeCreator,
+      l1Provider
+    )
     await checkL1RouterInitialization(
       L1GatewayRouter__factory.connect(l1.router, l1Provider),
       l1,
-      l2
+      l2,
+      creator
     )
 
     await checkL1StandardGatewayInitialization(
@@ -156,10 +162,15 @@ describe('tokenBridge', () => {
 async function checkL1RouterInitialization(
   l1Router: L1GatewayRouter,
   l1: L1,
-  l2: L2
+  l2: L2,
+  creator: L1AtomicTokenBridgeCreator
 ) {
   console.log('checkL1RouterInitialization')
 
+  expect(l1.router.toLowerCase()).to.be.eq(
+    (await creator.getCanonicalL1RouterAddress(l1.inbox)).toLowerCase()
+  )
+
   expect((await l1Router.defaultGateway()).toLowerCase()).to.be.eq(
     l1.standardGateway.toLowerCase()
   )
@@ -379,6 +390,7 @@ async function checkL1Ownership(l1: L1) {
   console.log('checkL1Ownership')
 
   // check proxyAdmins
+
   expect(await _getProxyAdmin(l1.router, l1Provider)).to.be.eq(l1.proxyAdmin)
   expect(await _getProxyAdmin(l1.standardGateway, l1Provider)).to.be.eq(
     l1.proxyAdmin