Added token-bridge-contracts submodule

ScopeLift · Dec 21, 2022 · 92978fe · 92978fe
1 parent 0e5df15
commit 92978fe
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 4,270 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -95,10 +95,10 @@ jobs:
           cp ./.env-sample ./.env
       
       - name: Compile contracts
-        run: npx hardhat compile
+        run: yarn build
 
       - name: Generate network file
-        run: make gen-network
+        run: yarn gen:network
 
       - name: Generate nova network file
         run: yarn gen:nova:network
@@ -138,8 +138,11 @@ jobs:
         run: |
           cp ./.env-sample ./.env
 
+      - name: Compile contracts
+        run: yarn build
+
       - name: Generate network file
-        run: make gen-network
+        run: yarn gen:network
 
       - name: Run integration tests
-        run: make test-integration
+        run: yarn test:integration
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "token-bridge-contracts"]
+	path = token-bridge-contracts
+	url = https://github.com/OffchainLabs/token-bridge-contracts.git
+	branch = reverse-bridge-2
diff --git a/README.md b/README.md
@@ -5,6 +5,11 @@ This project contains smart contracts for Arbitrum token and governance. Please
 
 ## Run Foundry unit tests
 
+Install dependencies
+```
+yarn
+```
+
 If not already installed, install [Foundry](https://github.com/foundry-rs/foundry#installation).
 
 Make sure Foundry is up-to-date
@@ -64,15 +69,25 @@ Set the env variables (you can use the ones from .env-sample)
 cp .env-sample .env
 ```
 
+Install dependencies
+```
+yarn
+```
+
+Compile contracts
+```
+yarn build
+```
+
 Deploy Nitro contracts to the local node
 ```
-make gen-network
+yarn gen:network
 ```
 
 Addresses for deployed contracts are stored to `localNetwork.json`
 
 Finally run integration tests against local node
 ```
-make test-integration
+yarn test-integration
 ```
 
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/package.json b/package.json
@@ -6,6 +6,9 @@
   "author": "Offchain Labs",
   "license": "MIT",
   "scripts": {
+    "build": "yarn build:governance && yarn build:token-bridge-types",
+    "build:governance": "hardhat compile",
+    "build:token-bridge-types": "cd token-bridge-contracts && yarn && yarn build",
     "gen:network": "ts-node ./scripts/genNetwork.ts",
     "gen:nova:network": "ts-node ./scripts/genNetworkNova.ts",
     "gen:recipients": "ts-node ./scripts/genRecipients.ts",

diff --git a/scripts/governanceDeployer.ts b/scripts/governanceDeployer.ts
@@ -32,8 +32,8 @@ import {
   L1ForceOnlyReverseCustomGateway__factory,
   L2CustomGatewayToken,
   L2CustomGatewayToken__factory,
-  L2ReverseCustomGateway__factory,
-} from "../typechain-types-imported/index";
+  L2ReverseCustomGateway__factory
+} from "../lib/token-bridge-contracts/build/types"
 import {
   DeployedEventObject as L1DeployedEventObject,
   L1GovernanceFactory,

diff --git a/scripts/governanceDeploymentVerifier.ts b/scripts/governanceDeploymentVerifier.ts
@@ -33,8 +33,8 @@ import {
   L2CustomGatewayToken,
   L2CustomGatewayToken__factory,
   L2ReverseCustomGateway,
-  L2ReverseCustomGateway__factory,
-} from "../typechain-types-imported";
+  L2ReverseCustomGateway__factory
+} from "../lib/token-bridge-contracts/build/types"
 import { getDeployerAddresses, getProviders, isDeployingToNova } from "./providerSetup";
 import { Address, L2Network } from "@arbitrum/sdk";
 import { parseEther } from "ethers/lib/utils";

diff --git a/token-bridge-contracts b/token-bridge-contracts
+92 −0		.github/workflows/ci.yml
+0 −27		.github/workflows/tests.yml
+1 −1		.gitignore
+1 −1		LICENSE-APACHE
+1 −1		LICENSE-MIT
+8 −4		README.md
+19 −0		foundry.toml
+1 −1		lib/ds-test
+3 −3		package.json
+31 −0		src/Base.sol
+23 −41		src/Script.sol
+209 −0		src/StdAssertions.sol
+189 −0		src/StdChains.sol
+565 −0		src/StdCheats.sol
+15 −0		src/StdError.sol
+116 −55		src/StdJson.sol
+43 −0		src/StdMath.sol
+327 −0		src/StdStorage.sol
+123 −0		src/StdUtils.sol
+26 −1,136		src/Test.sol
+326 −190		src/Vm.sol
+14 −6		src/console2.sol
+105 −0		src/interfaces/IERC1155.sol
+12 −0		src/interfaces/IERC165.sol
+43 −0		src/interfaces/IERC20.sol
+190 −0		src/interfaces/IERC4626.sol
+164 −0		src/interfaces/IERC721.sol
+0 −20		src/test/Script.t.sol
+0 −200		src/test/StdMath.t.sol
+65 −80		test/StdAssertions.t.sol
+123 −0		test/StdChains.t.sol
+101 −78		test/StdCheats.t.sol
+5 −11		test/StdError.t.sol
+197 −0		test/StdMath.t.sol
+46 −84		test/StdStorage.t.sol
+191 −0		test/StdUtils.t.sol
+10 −0		test/compilation/CompilationScript.sol
+10 −0		test/compilation/CompilationScriptBase.sol
+10 −0		test/compilation/CompilationTest.sol
+10 −0		test/compilation/CompilationTestBase.sol
+0 −0		test/fixtures/broadcast.log.json