Use upgrade executor from npm package

jwbda · Aug 18, 2023 · d5998c2 · d5998c2
1 parent 3ca96b2
commit d5998c2
Show file tree

Hide file tree

Showing 8 changed files with 271 additions and 194 deletions.
diff --git a/contracts/tokenbridge/arbitrum/L2AtomicTokenBridgeFactory.sol b/contracts/tokenbridge/arbitrum/L2AtomicTokenBridgeFactory.sol
@@ -6,7 +6,7 @@ import {L2ERC20Gateway} from "./gateway/L2ERC20Gateway.sol";
 import {L2CustomGateway} from "./gateway/L2CustomGateway.sol";
 import {L2WethGateway} from "./gateway/L2WethGateway.sol";
 import {StandardArbERC20} from "./StandardArbERC20.sol";
-import {UpgradeExecutor} from "../libraries/UpgradeExecutor.sol";
+import {IUpgradeExecutor} from "@offchainlabs/upgrade-executor/src/IUpgradeExecutor.sol";
 import {BeaconProxyFactory} from "../libraries/ClonableBeaconProxy.sol";
 import {aeWETH} from "../libraries/aeWETH.sol";
 import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
@@ -87,7 +87,7 @@ contract L2AtomicTokenBridgeFactory {
         address[] memory executors = new address[](2);
         executors[0] = rollupOwner;
         executors[1] = aliasedL1UpgradeExecutor;
-        UpgradeExecutor(canonicalUpgradeExecutor).initialize(canonicalUpgradeExecutor, executors);
+        IUpgradeExecutor(canonicalUpgradeExecutor).initialize(canonicalUpgradeExecutor, executors);
 
         return canonicalUpgradeExecutor;
     }

diff --git a/contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol b/contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol
@@ -17,7 +17,6 @@ import {L1WethGateway} from "./gateway/L1WethGateway.sol";
 import {L1OrbitGatewayRouter} from "./gateway/L1OrbitGatewayRouter.sol";
 import {L1OrbitERC20Gateway} from "./gateway/L1OrbitERC20Gateway.sol";
 import {L1OrbitCustomGateway} from "./gateway/L1OrbitCustomGateway.sol";
-
 import {TransparentUpgradeableProxy} from
     "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {
@@ -28,7 +27,7 @@ import {
     ProxyAdmin
 } from "../arbitrum/L2AtomicTokenBridgeFactory.sol";
 import {BytesLib} from "../libraries/BytesLib.sol";
-import {UpgradeExecutor} from "../libraries/UpgradeExecutor.sol";
+import {IUpgradeExecutor} from "@offchainlabs/upgrade-executor/src/IUpgradeExecutor.sol";
 import {AddressAliasHelper} from "../libraries/AddressAliasHelper.sol";
 import {IInbox, IBridge, IOwnable} from "@arbitrum/nitro-contracts/src/bridge/IInbox.sol";
 import {AddressAliasHelper} from "../libraries/AddressAliasHelper.sol";
@@ -73,7 +72,7 @@ contract L1AtomicTokenBridgeCreator is Initializable, OwnableUpgradeable {
         L1OrbitGatewayRouter feeTokenBasedRouterTemplate;
         L1OrbitERC20Gateway feeTokenBasedStandardGatewayTemplate;
         L1OrbitCustomGateway feeTokenBasedCustomGatewayTemplate;
-        UpgradeExecutor upgradeExecutor;
+        IUpgradeExecutor upgradeExecutor;
     }
 
     // non-canonical router registry

diff --git a/contracts/tokenbridge/libraries/UpgradeExecutor.sol b/contracts/tokenbridge/libraries/UpgradeExecutor.sol
diff --git a/lib/nitro-contracts b/lib/nitro-contracts
diff --git a/package.json b/package.json
@@ -40,7 +40,8 @@
     "@arbitrum/nitro-contracts": "^1.0.0-beta.8",
     "@arbitrum/sdk": "^3.1.5",
     "@openzeppelin/contracts": "4.8.3",
-    "@openzeppelin/contracts-upgradeable": "4.8.3"
+    "@openzeppelin/contracts-upgradeable": "4.8.3",
+    "@offchainlabs/upgrade-executor": "^1.0.0-beta.2"
   },
   "devDependencies": {
     "@arbitrum/sdk": "^3.1.3",

diff --git a/scripts/atomicTokenBridgeDeployer.ts b/scripts/atomicTokenBridgeDeployer.ts
@@ -21,8 +21,11 @@ import {
   IInbox__factory,
   IERC20Bridge__factory,
   IERC20__factory,
-  UpgradeExecutor__factory,
 } from '../build/types'
+import {
+  abi as UpgradeExecutorABI,
+  bytecode as UpgradeExecutorBytecode,
+} from '@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json'
 import { JsonRpcProvider } from '@ethersproject/providers'
 import {
   L1ToL2MessageGasEstimator,
@@ -75,7 +78,7 @@ export const createTokenBridge = async (
     customGateway: L2CustomGateway__factory.bytecode,
     wethGateway: L2WethGateway__factory.bytecode,
     aeWeth: AeWETH__factory.bytecode,
-    upgradeExecutor: UpgradeExecutor__factory.bytecode,
+    upgradeExecutor: UpgradeExecutorBytecode,
   }
   const gasEstimateToDeployContracts =
     await l2FactoryTemplate.estimateGas.deployL2Contracts(
@@ -304,10 +307,12 @@ export const deployL1TokenBridgeCreator = async (
     await new L1OrbitCustomGateway__factory(l1Deployer).deploy()
   await feeTokenBasedCustomGatewayTemplate.deployed()
 
-  const upgradeExecutor = await new UpgradeExecutor__factory(
+  const upgradeExecutor = new ethers.ContractFactory(
+    UpgradeExecutorABI,
+    UpgradeExecutorBytecode,
     l1Deployer
-  ).deploy()
-  await upgradeExecutor.deployed()
+  )
+  await upgradeExecutor.deploy()
 
   const l1Templates = {
     routerTemplate: routerTemplate.address,

diff --git a/test-e2e/tokenBridgeDeploymentTest.ts b/test-e2e/tokenBridgeDeploymentTest.ts
@@ -21,15 +21,15 @@ import {
   L2GatewayRouter__factory,
   L2WethGateway,
   L2WethGateway__factory,
-  UpgradeExecutor,
-  UpgradeExecutor__factory,
 } from '../build/types'
+import { abi as UpgradeExecutorABI } from '@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json'
 import { RollupCore__factory } from '@arbitrum/sdk/dist/lib/abi/factories/RollupCore__factory'
 import { applyAlias } from '../test/testhelper'
 import path from 'path'
 import fs from 'fs'
 import { expect } from 'chai'
 import { ethers } from 'hardhat'
+import { Contract } from 'ethers'
 
 const config = {
   l1Url: process.env.BASECHAIN_RPC || 'http://localhost:8545',
@@ -125,10 +125,12 @@ describe('tokenBridge', () => {
       )
     }
 
-    await checkL2UpgradeExecutorInitialization(
-      UpgradeExecutor__factory.connect(l2.upgradeExecutor, l2Provider),
-      l1
+    const upgExecutor = new ethers.Contract(
+      l2.upgradeExecutor,
+      UpgradeExecutorABI,
+      l2Provider
     )
+    await checkL2UpgradeExecutorInitialization(upgExecutor, l1)
 
     await checkL1Ownership(l1)
     await checkL2Ownership(l2)
@@ -248,7 +250,7 @@ async function checkL1WethGatewayInitialization(
 }
 
 async function checkL2UpgradeExecutorInitialization(
-  l2Executor: UpgradeExecutor,
+  l2Executor: Contract,
   l1: L1
 ) {
   console.log('checkL2UpgradeExecutorInitialization')
+7 −0		.env.sample.goerli
+2 −0		.prettierignore
+3 −0		hardhat.config.ts
+4 −1		package.json
+2 −1		remappings.txt
+44 −0		scripts/createERC20Rollup.ts
+13 −0		scripts/createEthRollup.ts
+6 −0		scripts/deployment.ts
+8 −10		scripts/rollupCreation.ts
+25 −14		src/bridge/AbsInbox.sol
+3 −3		src/bridge/ERC20Inbox.sol
+2 −2		src/bridge/IERC20Inbox.sol
+0 −133		src/bridge/IEthInbox.sol
+97 −47		src/bridge/IInbox.sol
+84 −0		src/bridge/IInboxBase.sol
+14 −14		src/bridge/Inbox.sol
+7 −2		src/bridge/SequencerInbox.sol
+6 −2		src/mocks/InboxStub.sol
+61 −0		src/mocks/UpgradeExecutorMock.sol
+8 −0		src/precompiles/ArbGasInfo.sol
+6 −6		src/rollup/AbsBridgeCreator.sol
+1 −1		src/rollup/BridgeCreator.sol
+2 −2		src/rollup/Config.sol
+1 −1		src/rollup/ERC20BridgeCreator.sol
+3 −3		src/rollup/IBridgeCreator.sol
+1 −1		src/rollup/IRollupCore.sol
+1 −1		src/rollup/RollupAdminLogic.sol
+1 −1		src/rollup/RollupCore.sol
+24 −5		src/rollup/RollupCreator.sol
+1 −1		src/rollup/RollupLib.sol
+1 −1		src/test-helpers/InterfaceCompatibilityTester.sol
+115 −54		test/contract/arbRollup.spec.ts
+5 −1		test/foundry/AbsInbox.t.sol
+1 −1		test/foundry/ERC20BridgeCreator.t.sol
+1 −1		test/foundry/ERC20Inbox.t.sol
+4 −4		test/foundry/Inbox.t.sol
+214 −6		test/foundry/RollupCreator.t.sol
+1 −1		test/storage/RollupAdminLogic.dot
+1 −1		test/storage/RollupCore.dot
+1 −1		test/storage/RollupUserLogic.dot
+23 −0		yarn.lock