feat: Deploy Polygon CCTP enabled contracts (#493)

* feat: Deploy Polygon CCTP enabled contracts

* Eth spoke pool

0x08C21b200eD06D2e32cEC91a770C3FcA8aD5F877

* add zksync

* Update 016_deploy_zksync_spokepool.ts

* Update Linea_SpokePool.json

* deploy optimism spoke pool

* Base spoke pool depoyed

* Update 013_deploy_boba_spokepool.ts

* Update 011_deploy_polygon_spokepool.ts

* new arbitrum spoke

* new adapters

* flattened contracts

* fix

* Update polygon adapter

* Add base adapter

* Add arbitrum adapter

* Add optimism adapter

Author: nicholaspai

deploy/002_deploy_optimism_adapter.ts

@@ -1,4 +1,3 @@
-import { ZERO_ADDRESS } from "@uma/common";
 import { L1_ADDRESS_MAP } from "./consts";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
@@ -11,23 +10,21 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const chainId = parseInt(await getChainId());
 
-  await deploy("Optimism_Adapter", {
+  const args = [
+    L1_ADDRESS_MAP[chainId].weth,
+    L1_ADDRESS_MAP[chainId].optimismCrossDomainMessenger,
+    L1_ADDRESS_MAP[chainId].optimismStandardBridge,
+    L1_ADDRESS_MAP[chainId].usdc,
+    L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
+  ];
+  const instance = await deploy("Optimism_Adapter", {
     from: deployer,
     log: true,
     skipIfAlreadyDeployed: true,
-    args: [
-      L1_ADDRESS_MAP[chainId].weth,
-      L1_ADDRESS_MAP[chainId].optimismCrossDomainMessenger,
-      L1_ADDRESS_MAP[chainId].optimismStandardBridge,
-      L1_ADDRESS_MAP[chainId].usdc,
-      // L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
-      // For now, we are not using the CCTP bridge and can disable by setting
-      // the cctpTokenMessenger to the zero address.
-      ZERO_ADDRESS,
-    ],
+    args: args,
   });
+  await run("verify:verify", { address: instance.address, constructorArguments: args });
 };
 
 module.exports = func;
-func.dependencies = ["HubPool"];
 func.tags = ["OptimismAdapter", "mainnet"];

deploy/003_deploy_optimism_spokepool.ts

@@ -2,7 +2,6 @@ import { deployNewProxy, getSpokePoolDeploymentInfo } from "../utils/utils.hre";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { L2_ADDRESS_MAP } from "./consts";
-import { ZERO_ADDRESS } from "@uma/common";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { hubPool, spokeChainId } = await getSpokePoolDeploymentInfo(hre);
@@ -19,18 +18,15 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Construct this spokepool with a:
   //    * A WETH address of the WETH address
   //    * A depositQuoteTimeBuffer of 1 hour
-  //    * A fillDeadlineBuffer of 8 hours
+  //    * A fillDeadlineBuffer of 6 hours
   //    * Native USDC address on L2
   //    * CCTP token messenger address on L2
   const constructorArgs = [
     "0x4200000000000000000000000000000000000006",
     3600,
     21600,
     L2_ADDRESS_MAP[spokeChainId].l2Usdc,
-    // L2_ADDRESS_MAP[spokeChainId].cctpTokenMessenger,
-    // For now, we are not using the CCTP bridge and can disable by setting
-    // the cctpTokenMessenger to the zero address.
-    ZERO_ADDRESS,
+    L2_ADDRESS_MAP[spokeChainId].cctpTokenMessenger,
   ];
   await deployNewProxy("Optimism_SpokePool", constructorArgs, initArgs, spokeChainId === 10);
 };

deploy/004_deploy_arbitrum_adapter.ts

@@ -1,4 +1,3 @@
-import { ZERO_ADDRESS } from "@uma/common";
 import { L1_ADDRESS_MAP } from "./consts";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
@@ -15,7 +14,14 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // set to the Risk Labs relayer address. The deployer should change this if necessary.
   const l2RefundAddress = "0x428AB2BA90Eba0a4Be7aF34C9Ac451ab061AC010";
 
-  await deploy("Arbitrum_Adapter", {
+  const args = [
+    L1_ADDRESS_MAP[chainId].l1ArbitrumInbox,
+    L1_ADDRESS_MAP[chainId].l1ERC20GatewayRouter,
+    l2RefundAddress,
+    L1_ADDRESS_MAP[chainId].usdc,
+    L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
+  ];
+  const instance = await deploy("Arbitrum_Adapter", {
     from: deployer,
     log: true,
     skipIfAlreadyDeployed: true,
@@ -24,14 +30,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       L1_ADDRESS_MAP[chainId].l1ERC20GatewayRouter,
       l2RefundAddress,
       L1_ADDRESS_MAP[chainId].usdc,
-      // L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
-      // For now, we are not using the CCTP bridge and can disable by setting
-      // the cctpTokenMessenger to the zero address.
-      ZERO_ADDRESS,
+      L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
     ],
   });
+  await run("verify:verify", { address: instance.address, constructorArguments: args });
 };
 
 module.exports = func;
-func.dependencies = ["HubPool"];
 func.tags = ["ArbitrumAdapter", "mainnet"];

deploy/005_deploy_arbitrum_spokepool.ts

@@ -2,7 +2,6 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { L2_ADDRESS_MAP } from "./consts";
 import { deployNewProxy, getSpokePoolDeploymentInfo } from "../utils/utils.hre";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
-import { ZERO_ADDRESS } from "@uma/common";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { hubPool, spokeChainId } = await getSpokePoolDeploymentInfo(hre);
@@ -20,18 +19,15 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Construct this spokepool with a:
   //    * A WETH address of the WETH address
   //    * A depositQuoteTimeBuffer of 1 hour
-  //    * A fillDeadlineBuffer of 8 hours
+  //    * A fillDeadlineBuffer of 6 hours
   //    * Native USDC address on L2
   //    * CCTP token messenger address on L2
   const constructorArgs = [
     L2_ADDRESS_MAP[spokeChainId].l2Weth,
     3600,
     21600,
     L2_ADDRESS_MAP[spokeChainId].l2Usdc,
-    // L2_ADDRESS_MAP[spokeChainId].cctpTokenMessenger,
-    // For now, we are not using the CCTP bridge and can disable by setting
-    // the cctpTokenMessenger to the zero address.
-    ZERO_ADDRESS,
+    L2_ADDRESS_MAP[spokeChainId].cctpTokenMessenger,
   ];
   await deployNewProxy("Arbitrum_SpokePool", constructorArgs, initArgs, spokeChainId === 42161);
 };

deploy/007_deploy_ethereum_spokepool.ts

@@ -16,7 +16,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Construct this spokepool with a:
   //    * A WETH address of the WETH address
   //    * A depositQuoteTimeBuffer of 1 hour
-  //    * A fillDeadlineBuffer of 8 hours
+  //    * A fillDeadlineBuffer of 6 hours
   const constructorArgs = [L1_ADDRESS_MAP[chainId].weth, 3600, 21600];
   await deployNewProxy("Ethereum_SpokePool", constructorArgs, initArgs, chainId === "1");
 

deploy/009_deploy_polygon_adapter.ts

@@ -1,7 +1,6 @@
 import { DeployFunction } from "hardhat-deploy/types";
 import { L1_ADDRESS_MAP } from "./consts";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
-import { ZERO_ADDRESS } from "@uma/common";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments, getNamedAccounts, getChainId } = hre;
@@ -11,24 +10,23 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const chainId = parseInt(await getChainId());
 
-  await deploy("Polygon_Adapter", {
+  const args = [
+    L1_ADDRESS_MAP[chainId].polygonRootChainManager,
+    L1_ADDRESS_MAP[chainId].polygonFxRoot,
+    L1_ADDRESS_MAP[chainId].polygonDepositManager,
+    L1_ADDRESS_MAP[chainId].polygonERC20Predicate,
+    L1_ADDRESS_MAP[chainId].matic,
+    L1_ADDRESS_MAP[chainId].weth,
+    L1_ADDRESS_MAP[chainId].usdc,
+    L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
+  ];
+  const instance = await deploy("Polygon_Adapter", {
     from: deployer,
     log: true,
     skipIfAlreadyDeployed: false,
-    args: [
-      L1_ADDRESS_MAP[chainId].polygonRootChainManager,
-      L1_ADDRESS_MAP[chainId].polygonFxRoot,
-      L1_ADDRESS_MAP[chainId].polygonDepositManager,
-      L1_ADDRESS_MAP[chainId].polygonERC20Predicate,
-      L1_ADDRESS_MAP[chainId].matic,
-      L1_ADDRESS_MAP[chainId].weth,
-      L1_ADDRESS_MAP[chainId].usdc,
-      // L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
-      // For now, we are not using the CCTP bridge and can disable by setting
-      // the cctpTokenMessenger to the zero address.
-      ZERO_ADDRESS,
-    ],
+    args,
   });
+  await run("verify:verify", { address: instance.address, constructorArguments: args });
 };
 
 module.exports = func;

deploy/011_deploy_polygon_spokepool.ts

@@ -2,7 +2,6 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { L2_ADDRESS_MAP } from "./consts";
 import { deployNewProxy, getSpokePoolDeploymentInfo } from "../utils/utils.hre";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
-import { ZERO_ADDRESS } from "@uma/common";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { hubPool, spokeChainId } = await getSpokePoolDeploymentInfo(hre);
@@ -23,18 +22,15 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Construct this spokepool with a:
   //    * A WETH address of the WETH address
   //    * A depositQuoteTimeBuffer of 1 hour
-  //    * A fillDeadlineBuffer of 8 hours
+  //    * A fillDeadlineBuffer of 6 hours
   //    * Native USDC address on L2
   //    * CCTP token messenger address on L2
   const constructorArgs = [
     L2_ADDRESS_MAP[spokeChainId].wMatic,
     3600,
     21600,
     L2_ADDRESS_MAP[spokeChainId].l2Usdc,
-    // L2_ADDRESS_MAP[spokeChainId].cctpTokenMessenger,
-    // For now, we are not using the CCTP bridge and can disable by setting
-    // the cctpTokenMessenger to the zero address.
-    ZERO_ADDRESS,
+    L2_ADDRESS_MAP[spokeChainId].cctpTokenMessenger,
   ];
   await deployNewProxy("Polygon_SpokePool", constructorArgs, initArgs, spokeChainId === 137);
 };

deploy/013_deploy_boba_spokepool.ts

@@ -13,7 +13,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Construct this spokepool with a:
   //    * A WETH address of the WETH address
   //    * A depositQuoteTimeBuffer of 1 hour
-  //    * A fillDeadlineBuffer of 9 hours
+  //    * A fillDeadlineBuffer of 6 hours
   const constructorArgs = ["0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000", 3600, 21600];
   await deployNewProxy("Boba_SpokePool", constructorArgs, initArgs);
 };

deploy/016_deploy_zksync_spokepool.ts

@@ -26,7 +26,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Construct this spokepool with a:
   //    * A WETH address of the WETH address
   //    * A depositQuoteTimeBuffer of 1 hour
-  //    * A fillDeadlineBuffer of 8 hours
+  //    * A fillDeadlineBuffer of 6 hours
   const constructorArgs = [L2_ADDRESS_MAP[spokeChainId].l2Weth, 3600, 21600];
 
   let newAddress;

deploy/024_deploy_base_adapter.ts

@@ -1,33 +1,30 @@
-import { ZERO_ADDRESS } from "@uma/common";
 import { L1_ADDRESS_MAP } from "./consts";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts, getChainId, network } = hre;
+  const { deployments, getNamedAccounts, getChainId } = hre;
   const { deploy } = deployments;
 
   const { deployer } = await getNamedAccounts();
 
   const chainId = parseInt(await getChainId());
 
-  await deploy("Base_Adapter", {
+  const args = [
+    L1_ADDRESS_MAP[chainId].weth,
+    L1_ADDRESS_MAP[chainId].baseCrossDomainMessenger,
+    L1_ADDRESS_MAP[chainId].baseStandardBridge,
+    L1_ADDRESS_MAP[chainId].usdc,
+    L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
+  ];
+  const instance = await deploy("Base_Adapter", {
     from: deployer,
     log: true,
     skipIfAlreadyDeployed: true,
-    args: [
-      L1_ADDRESS_MAP[chainId].weth,
-      L1_ADDRESS_MAP[chainId].baseCrossDomainMessenger,
-      L1_ADDRESS_MAP[chainId].baseStandardBridge,
-      L1_ADDRESS_MAP[chainId].usdc,
-      // L1_ADDRESS_MAP[chainId].cctpTokenMessenger,
-      // For now, we are not using the CCTP bridge and can disable by setting
-      // the cctpTokenMessenger to the zero address.
-      ZERO_ADDRESS,
-    ],
+    args,
   });
+  await run("verify:verify", { address: instance.address, constructorArguments: args });
 };
 
 module.exports = func;
-func.dependencies = ["HubPool"];
 func.tags = ["BaseAdapter", "mainnet"];