WIP

Author: nicholaspai

.github/workflows/publish.yml

@@ -23,16 +23,16 @@ jobs:
         id: release
         uses: manovotny/[email protected]
 
-      # Perform installs, run tests, run a build step, etc. here, as needed.
-      - run: yarn
-
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v3
         with:
           node-version: "16.x"
           always-auth: true
           registry-url: "https://registry.npmjs.org"
 
+      # Perform installs, run tests, run a build step, etc. here, as needed.
+      - run: yarn
+
       # The last two steps will publish the package. Note that we're using
       # information from the `release` step above (I told you we'd use it
       # later). Notice the `if` statements on both steps...

deploy/003_deploy_optimism_spokepool.ts

@@ -1,6 +1,6 @@
 import "hardhat-deploy";
 import hre from "hardhat";
-import { getContractFactory } from "../test/utils";
+import { getContractFactory } from "../utils";
 
 const func = async function () {
   const { upgrades, companionNetworks, run } = hre;

deploy/005_deploy_arbitrum_spokepool.ts

@@ -1,7 +1,7 @@
 import "hardhat-deploy";
 import hre from "hardhat";
 import { L2_ADDRESS_MAP } from "./consts";
-import { getContractFactory } from "../test/utils";
+import { getContractFactory } from "../utils";
 
 const func = async function () {
   const { upgrades, companionNetworks, run, getChainId } = hre;
@@ -31,6 +31,13 @@ const func = async function () {
   const implementationAddress = await upgrades.erc1967.getImplementationAddress(instance.address);
   console.log(`Implementation deployed @ ${implementationAddress}`);
 
+  // Deploy new implementation and validate that it can be used in upgrade.
+  const newImplementation = await upgrades.prepareUpgrade(
+    instance.address,
+    await getContractFactory("Arbitrum_SpokePool")
+  );
+  console.log(`Can upgrade to new implementation @ ${newImplementation}`);
+
   // hardhat-upgrades overrides the `verify` task that ships with `hardhat` so that if the address passed
   // is a proxy, hardhat will first verify the implementation and then the proxy and also link the proxy
   // to the implementation's ABI on etherscan.

deploy/007_deploy_ethereum_spokepool.ts

@@ -1,7 +1,7 @@
 import "hardhat-deploy";
 
 import hre from "hardhat";
-import { getContractFactory } from "../test/utils";
+import { getContractFactory } from "../utils";
 
 import { L1_ADDRESS_MAP } from "./consts";
 

deploy/011_deploy_polygon_spokepool.ts

@@ -1,7 +1,7 @@
 import "hardhat-deploy";
 import hre from "hardhat";
 import { L2_ADDRESS_MAP } from "./consts";
-import { getContractFactory } from "../test/utils";
+import { getContractFactory } from "../utils";
 
 const func = async function () {
   const { upgrades, run, getChainId, deployments } = hre;

deploy/013_deploy_boba_spokepool.ts

@@ -1,6 +1,6 @@
 import "hardhat-deploy";
 import hre from "hardhat";
-import { getContractFactory } from "../test/utils";
+import { getContractFactory } from "../utils";
 
 const func = async function () {
   const { upgrades, companionNetworks, run } = hre;

deploy/016_deploy_zksync_spokepool.ts

@@ -1,7 +1,7 @@
 import "hardhat-deploy";
 import hre from "hardhat";
 import { L2_ADDRESS_MAP } from "./consts";
-import { getContractFactory } from "../test/utils";
+import { getContractFactory } from "../utils";
 
 const func = async function () {
   const { upgrades, companionNetworks, run, getChainId } = hre;

utils/index.ts

@@ -0,0 +1,2 @@
+export * from "./utils";
+export * from "./MerkleTree";