feat: deploy scripts should default to deploying Implementation, not Proxy, contracts in production (#448)

Also, update deployments with the v3 upgrades!

Co-authored-by: nicholaspai <[email protected]>

Author: pxrl

deploy/003_deploy_optimism_spokepool.ts

@@ -19,20 +19,20 @@ 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 8 hours
   //    * Native USDC address on L2
   //    * CCTP token messenger address on L2
   const constructorArgs = [
     "0x4200000000000000000000000000000000000006",
     3600,
-    32400,
+    28800,
     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,
   ];
-  await deployNewProxy("Optimism_SpokePool", constructorArgs, initArgs);
+  await deployNewProxy("Optimism_SpokePool", constructorArgs, initArgs, spokeChainId === 10);
 };
 module.exports = func;
 func.tags = ["OptimismSpokePool", "optimism"];

deploy/005_deploy_arbitrum_spokepool.ts

@@ -20,20 +20,20 @@ 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 8 hours
   //    * Native USDC address on L2
   //    * CCTP token messenger address on L2
   const constructorArgs = [
     L2_ADDRESS_MAP[spokeChainId].l2Weth,
     3600,
-    32400,
+    28800,
     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,
   ];
-  await deployNewProxy("Arbitrum_SpokePool", constructorArgs, initArgs);
+  await deployNewProxy("Arbitrum_SpokePool", constructorArgs, initArgs, spokeChainId === 42161);
 };
 module.exports = func;
 func.tags = ["ArbitrumSpokePool", "arbitrum"];

deploy/007_deploy_ethereum_spokepool.ts

@@ -16,9 +16,9 @@ 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
-  const constructorArgs = [L1_ADDRESS_MAP[chainId].weth, 3600, 32400];
-  await deployNewProxy("Ethereum_SpokePool", constructorArgs, initArgs);
+  //    * A fillDeadlineBuffer of 8 hours
+  const constructorArgs = [L1_ADDRESS_MAP[chainId].weth, 3600, 28800];
+  await deployNewProxy("Ethereum_SpokePool", constructorArgs, initArgs, chainId === "1");
 
   // Transfer ownership to hub pool.
 };

deploy/011_deploy_polygon_spokepool.ts

@@ -23,20 +23,20 @@ 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 8 hours
   //    * Native USDC address on L2
   //    * CCTP token messenger address on L2
   const constructorArgs = [
     L2_ADDRESS_MAP[spokeChainId].wMatic,
     3600,
-    32400,
+    28800,
     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,
   ];
-  await deployNewProxy("Polygon_SpokePool", constructorArgs, initArgs);
+  await deployNewProxy("Polygon_SpokePool", constructorArgs, initArgs, spokeChainId === 137);
 };
 
 module.exports = func;

deploy/016_deploy_zksync_spokepool.ts

@@ -26,30 +26,40 @@ 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
-  const constructorArgs = [L2_ADDRESS_MAP[spokeChainId].l2Weth, 3600, 32400];
-
-  const proxy = await zkUpgrades.deployProxy(deployer.zkWallet, artifact, initArgs, {
-    initializer: "initialize",
-    kind: "uups",
-    constructorArgs,
-    unsafeAllow: ["delegatecall"], // Remove after upgrading openzeppelin-contracts-upgradeable post v4.9.3.
-  });
-  console.log(`Deployment transaction hash: ${proxy.deployTransaction.hash}.`);
-  await proxy.deployed();
-  console.log(`${contractName} deployed to chain ID ${spokeChainId} @ ${proxy.address}.`);
+  //    * A fillDeadlineBuffer of 8 hours
+  const constructorArgs = [L2_ADDRESS_MAP[spokeChainId].l2Weth, 3600, 28800];
+
+  let newAddress;
+  // On production, we'll rarely want to deploy a new proxy contract so we'll default to deploying a new implementation
+  // contract.
+  if (spokeChainId === 324) {
+    const _deployment = await deployer.deploy(artifact, constructorArgs);
+    newAddress = _deployment.address;
+    console.log(`New ${contractName} implementation deployed @ ${newAddress}`);
+  } else {
+    const proxy = await zkUpgrades.deployProxy(deployer.zkWallet, artifact, initArgs, {
+      initializer: "initialize",
+      kind: "uups",
+      constructorArgs,
+      unsafeAllow: ["delegatecall"], // Remove after upgrading openzeppelin-contracts-upgradeable post v4.9.3.
+    });
+    console.log(`Deployment transaction hash: ${proxy.deployTransaction.hash}.`);
+    await proxy.deployed();
+    console.log(`${contractName} deployed to chain ID ${spokeChainId} @ ${proxy.address}.`);
+    newAddress = proxy.address;
+  }
 
   // Save the deployment manually because OZ's hardhat-upgrades packages bypasses hardhat-deploy.
   // See also: https://stackoverflow.com/questions/74870472
   const extendedArtifact = await deployments.getExtendedArtifact(contractName);
   const deployment: DeploymentSubmission = {
-    address: proxy.address,
+    address: newAddress,
     ...extendedArtifact,
   };
   await deployments.save(contractName, deployment);
 
   // Verify the proxy + implementation contract.
-  await hre.run("verify:verify", { address: proxy.address });
+  await hre.run("verify:verify", { address: newAddress, constructorArguments: constructorArgs });
 };
 
 module.exports = func;

deploy/025_deploy_base_spokepool.ts

@@ -18,20 +18,20 @@ 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 8 hours
   //    * Native USDC address on L2
   //    * CCTP token messenger address on L2
   const constructorArgs = [
     "0x4200000000000000000000000000000000000006",
     3600,
-    32400,
+    28800,
     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,
   ];
-  await deployNewProxy("Base_SpokePool", constructorArgs, initArgs);
+  await deployNewProxy("Base_SpokePool", constructorArgs, initArgs, spokeChainId === 8453);
 };
 module.exports = func;
 func.tags = ["BaseSpokePool", "base"];