feat: redeploy spoke pools to support depositExclusive (#587)

Signed-off-by: bennett <[email protected]>

deploy/016_deploy_zksync_spokepool.ts

@@ -33,7 +33,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const proxy = getDeployedAddress("SpokePool", spokeChainId, false);
   const implementationOnly = proxy !== undefined;
   if (implementationOnly) {
-    console.log(`${name} deployment already detected @ ${proxy}, deploying new implementation.`);
+    console.log(`${contractName} deployment already detected @ ${proxy}, deploying new implementation.`);
     const _deployment = await deployer.deploy(artifact, constructorArgs);
     newAddress = _deployment.address;
     console.log(`New ${contractName} implementation deployed @ ${newAddress}`);

deploy/036_deploy_blast_spokepool.ts

@@ -2,6 +2,7 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { deployNewProxy, getSpokePoolDeploymentInfo } from "../utils/utils.hre";
 import { FILL_DEADLINE_BUFFER, L1_ADDRESS_MAP, WETH, QUOTE_TIME_BUFFER, ZERO_ADDRESS } from "./consts";
+import { TOKEN_SYMBOLS_MAP } from "@across-protocol/constants";
 
 const USDB = TOKEN_SYMBOLS_MAP.USDB.addresses;
 

hardhat.config.ts

@@ -84,6 +84,9 @@ const config: HardhatUserConfig = {
       "contracts/Lisk_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
       "contracts/Redstone_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
       "contracts/Zora_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
+      "contracts/Mode_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
+      "contracts/Base_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
+      "contracts/Optimism_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
     },
   },
   zksolc: {
@@ -105,6 +108,7 @@ const config: HardhatUserConfig = {
       accounts: { mnemonic },
       saveDeployments: true,
       chainId: CHAIN_IDs.MAINNET,
+      companionNetworks: { l1: "mainnet" },
     },
     zksync: {
       chainId: CHAIN_IDs.ZK_SYNC,
@@ -117,7 +121,7 @@ const config: HardhatUserConfig = {
       verifyURL: "https://zksync2-mainnet-explorer.zksync.io/contract_verification",
     },
     optimism: {
-      url: getNodeUrl("optimism", true, CHAIN_IDs.OPTIMISM),
+      url: getNodeUrl("optimism-mainnet", true, CHAIN_IDs.OPTIMISM),
       accounts: { mnemonic },
       saveDeployments: true,
       chainId: CHAIN_IDs.OPTIMISM,
@@ -132,7 +136,7 @@ const config: HardhatUserConfig = {
     },
     arbitrum: {
       chainId: CHAIN_IDs.ARBITRUM,
-      url: getNodeUrl("arbitrum", true, CHAIN_IDs.ARBITRUM),
+      url: getNodeUrl("arbitrum-mainnet", true, CHAIN_IDs.ARBITRUM),
       saveDeployments: true,
       accounts: { mnemonic },
       companionNetworks: { l1: "mainnet" },
@@ -149,10 +153,11 @@ const config: HardhatUserConfig = {
       accounts: { mnemonic },
       saveDeployments: true,
       chainId: CHAIN_IDs.SEPOLIA,
+      companionNetworks: { l1: "sepolia" },
     },
     polygon: {
       chainId: CHAIN_IDs.POLYGON,
-      url: getNodeUrl("polygon-matic", true, CHAIN_IDs.POLYGON),
+      url: getNodeUrl("polygon-mainnet", true, CHAIN_IDs.POLYGON),
       saveDeployments: true,
       accounts: { mnemonic },
       companionNetworks: { l1: "mainnet" },
@@ -404,8 +409,8 @@ const config: HardhatUserConfig = {
         network: "mode",
         chainId: CHAIN_IDs.MODE,
         urls: {
-          apiURL: "https://api.routescan.io/v2/network/mainnet/evm/34443/etherscan",
-          browserURL: "https://modescan.io",
+          apiURL: "https://explorer.mode.network/api",
+          browserURL: "https://explorer.mode.network/",
         },
       },
       {

package.json

@@ -32,7 +32,7 @@
     "prepublish": "yarn build && hardhat export --export-all ./cache/massExport.json && ts-node ./scripts/processHardhatExport.ts && prettier --write ./deployments/deployments.json && yarn generate-contract-types"
   },
   "dependencies": {
-    "@across-protocol/constants": "^3.1.13",
+    "@across-protocol/constants": "^3.1.15",
     "@defi-wonderland/smock": "^2.3.4",
     "@eth-optimism/contracts": "^0.5.40",
     "@ethersproject/abstract-provider": "5.7.0",

utils/utils.hre.ts

@@ -90,7 +90,8 @@ export async function deployNewProxy(
   // 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.
   // https://docs.openzeppelin.com/upgrades-plugins/1.x/api-hardhat-upgrades#verify
-  await run("verify:verify", { address: instance, constructorArguments: constructorArgs });
+  const contract = `contracts/${name}.sol:${name}`;
+  await run("verify:verify", { address: instance, constructorArguments: constructorArgs, contract });
 }
 
 export { hre };

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@across-protocol/constants@^3.1.13":
-  version "3.1.13"
-  resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.1.13.tgz#b4caf494e9d9fe50290cca91b7883ea408fdb90a"
-  integrity sha512-EsTJgQL5p+XXs40aBxOSbMOpQr/f4ty+Iyget8Oh6MT/cncCa2+W8a78fbqYqTtSpH6Sm7E8nvT8gPuSS6ef1w==
+"@across-protocol/constants@^3.1.15":
+  version "3.1.15"
+  resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.1.15.tgz#b9fecef46209ad15f3c56c965977e3522b295b07"
+  integrity sha512-3BECNOWQReC/IIuI0a7GenYfdiZv9EyzWFK8n7y3SddcMZ2zW5TQHobfzjuccxOJ9nh+0ogrRw1gXFfESs00fg==
 
 "@across-protocol/contracts@^0.1.4":
   version "0.1.4"