apply standardization to hardhat deploy scripts

Consensys · Dec 17, 2024 · d24429c · d24429c
1 parent a358ebd
commit d24429c
Show file tree

Hide file tree

Showing 15 changed files with 119 additions and 67 deletions.
diff --git a/contracts/deploy/01_deploy_PlonkVerifier.ts b/contracts/deploy/01_deploy_PlonkVerifier.ts
@@ -19,16 +19,20 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   }
   const contract = await deployFromFactory(contractName, provider);
   const contractAddress = await contract.getAddress();
-  console.log(`${contractName} deployed at ${contractAddress}`);
 
   process.env.PLONKVERIFIER_ADDRESS = contractAddress;
 
-  const deployTx = contract.deploymentTransaction();
-  if (!deployTx) {
+  const txReceipt = await contract.deploymentTransaction()?.wait();
+  if (!txReceipt) {
     throw "Deployment transaction not found.";
   }
 
-  await tryStoreAddress(hre.network.name, contractName, contractAddress, deployTx.hash);
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
+
+  await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
 
   await tryVerifyContract(contractAddress);
 };

diff --git a/contracts/deploy/02_deploy_Timelock.ts b/contracts/deploy/02_deploy_Timelock.ts
@@ -45,14 +45,18 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   );
   const contractAddress = await contract.getAddress();
 
-  console.log(`${contractName} deployed at ${contractAddress}`);
-
-  const deployTx = contract.deploymentTransaction();
-  if (!deployTx) {
+  const txReceipt = await contract.deploymentTransaction()?.wait();
+  if (!txReceipt) {
     throw "Deployment transaction not found.";
   }
 
-  await tryStoreAddress(hre.network.name, contractName, contractAddress, deployTx.hash);
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
+
+  await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
+
   const args = [minDelay, timeLockProposers?.split(","), timelockExecutors?.split(","), adminAddress];
 
   await tryVerifyContractWithConstructorArgs(

diff --git a/contracts/deploy/03_deploy_LineaRollup.ts b/contracts/deploy/03_deploy_LineaRollup.ts
@@ -16,6 +16,7 @@ import {
   LINEA_ROLLUP_UNPAUSE_TYPES_ROLES,
   OPERATOR_ROLE,
 } from "../common/constants";
+import { ethers } from "hardhat";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments } = hre;
@@ -78,10 +79,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const contractAddress = await contract.getAddress();
   const txReceipt = await contract.deploymentTransaction()?.wait();
   if (!txReceipt) {
-    throw "Contract deployment transaction receipt not found.";
+    throw "Deployment transaction not found.";
   }
 
-  console.log(`${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber}`);
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 
   await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
 

diff --git a/contracts/deploy/03_deploy_LineaRollupV5.ts b/contracts/deploy/03_deploy_LineaRollupV5.ts
@@ -7,6 +7,7 @@ import {
   tryStoreAddress,
   tryVerifyContract,
 } from "contracts/common/helpers";
+import { ethers } from "hardhat";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments } = hre;
@@ -63,10 +64,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const contractAddress = await contract.getAddress();
   const txReceipt = await contract.deploymentTransaction()?.wait();
   if (!txReceipt) {
-    throw "Contract deployment transaction receipt not found.";
+    throw "Deployment transaction not found.";
   }
 
-  console.log(`${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber}`);
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 
   await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
 

diff --git a/contracts/deploy/04_deploy_L2MessageService.ts b/contracts/deploy/04_deploy_L2MessageService.ts
@@ -16,6 +16,7 @@ import {
   L2_MESSAGE_SERVICE_ROLES,
   L2_MESSAGE_SERVICE_UNPAUSE_TYPES_ROLES,
 } from "../common/constants";
+import { ethers } from "hardhat";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments } = hre;
@@ -62,9 +63,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const contractAddress = await contract.getAddress();
   const txReceipt = await contract.deploymentTransaction()?.wait();
   if (!txReceipt) {
-    throw "Contract deployment transaction receipt not found.";
+    throw "Deployment transaction not found.";
   }
-  console.log(`${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber}`);
+
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 
   await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
 

diff --git a/contracts/deploy/04_deploy_L2MessageServiceV1Deployed.ts b/contracts/deploy/04_deploy_L2MessageServiceV1Deployed.ts
@@ -57,10 +57,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const contractAddress = await contract.getAddress();
   const txReceipt = await contract.deploymentTransaction()?.wait();
   if (!txReceipt) {
-    throw "Contract deployment transaction receipt not found.";
+    throw "Deployment transaction not found.";
   }
 
-  console.log(`${contractName} deployed at ${contractAddress}`);
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 
   await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
 

diff --git a/contracts/deploy/05_deploy_BridgedToken.ts b/contracts/deploy/05_deploy_BridgedToken.ts
@@ -23,19 +23,21 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const BridgedToken = await ethers.getContractFactory(contractName);
 
   const bridgedToken = (await upgrades.deployBeacon(BridgedToken)) as unknown as BridgedToken;
-  await bridgedToken.waitForDeployment();
 
   const bridgedTokenAddress = await bridgedToken.getAddress();
   process.env.BRIDGED_TOKEN_ADDRESS = bridgedTokenAddress;
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  const deployTx = bridgedToken.deployTransaction;
-  if (!deployTx) {
-    throw "Contract deployment transaction receipt not found.";
+  const txReceipt = await bridgedToken.deploymentTransaction()?.wait();
+  if (!txReceipt) {
+    throw "Deployment transaction not found.";
   }
 
-  await tryStoreAddress(network.name, contractName, bridgedTokenAddress, deployTx.hash);
+  const contractAddress = await bridgedToken.getAddress();
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
+
+  await tryStoreAddress(network.name, contractName, bridgedTokenAddress, txReceipt.hash);
 
   if (process.env.TOKEN_BRIDGE_L1 === "true") {
     console.log(`L1 BridgedToken beacon deployed on ${network.name}, at address:`, bridgedTokenAddress);

diff --git a/contracts/deploy/06_deploy_TokenBridge.ts b/contracts/deploy/06_deploy_TokenBridge.ts
@@ -103,12 +103,18 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await tokenBridge.waitForDeployment();
   const tokenBridgeAddress = await tokenBridge.getAddress();
 
-  const deployTx = tokenBridge.deploymentTransaction();
-  if (!deployTx) {
-    throw "Contract deployment transaction receipt not found.";
+  const txReceipt = await tokenBridge.deploymentTransaction()?.wait();
+  if (!txReceipt) {
+    throw "Deployment transaction not found.";
   }
 
-  await tryStoreAddress(network.name, contractName, tokenBridgeAddress, deployTx.hash);
+  const contractAddress = await tokenBridge.getAddress();
+
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
+
+  await tryStoreAddress(network.name, contractName, tokenBridgeAddress, txReceipt.hash);
 
   const proxyAdminAddress = await upgrades.erc1967.getAdminAddress(tokenBridgeAddress);
 

diff --git a/contracts/deploy/07_deploy_LXPToken.ts b/contracts/deploy/07_deploy_LXPToken.ts
@@ -25,16 +25,19 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     console.log(`Deploying new version, NB: ${existingContractAddress} will be overwritten if env SAVE_ADDRESS=true.`);
   }
   const contract = await deployFromFactory(contractName, provider, adminAddress, await get1559Fees(provider));
-  const contractAddress = await contract.getAddress();
+  const txReceipt = await contract.deploymentTransaction()?.wait();
+  if (!txReceipt) {
+    throw "Deployment transaction not found.";
+  }
 
-  console.log(`${contractName} deployed at ${contractAddress}`);
+  const contractAddress = await contract.getAddress();
 
-  const deployTx = contract.deploymentTransaction();
-  if (!deployTx) {
-    throw "Contract deployment transaction receipt not found.";
-  }
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 
-  await tryStoreAddress(hre.network.name, contractName, contractAddress, deployTx.hash);
+  await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
 
   const args = [adminAddress];
 

diff --git a/contracts/deploy/07_deploy_SurgeXPToken.ts b/contracts/deploy/07_deploy_SurgeXPToken.ts
@@ -35,19 +35,22 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     transferAddresses,
     await get1559Fees(provider),
   );
-  const contractAddress = await contract.getAddress();
-
-  console.log(`${contractName} deployed at ${contractAddress}`);
 
-  const deployTx = contract.deploymentTransaction();
-  if (!deployTx) {
-    throw "Contract deployment transaction receipt not found.";
+  const txReceipt = await contract.deploymentTransaction()?.wait();
+  if (!txReceipt) {
+    throw "Deployment transaction not found.";
   }
 
-  await tryStoreAddress(hre.network.name, contractName, contractAddress, deployTx.hash);
+  const contractAddress = await contract.getAddress();
 
-  const args = [adminAddress, minterAddress, transferAddresses];
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
+
+  await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
 
+  const args = [adminAddress, minterAddress, transferAddresses];
   await tryVerifyContractWithConstructorArgs(contractAddress, "contracts/token/LineaSurgeXP.sol:LineaSurgeXP", args);
 };
 export default func;

diff --git a/contracts/deploy/08_deploy_CustomBridgedToken.ts b/contracts/deploy/08_deploy_CustomBridgedToken.ts
@@ -34,19 +34,20 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     },
   );
 
-  await customBridgedToken.waitForDeployment();
-  const customBridgedTokenAddress = await customBridgedToken.getAddress();
-
-  const deployTx = customBridgedToken.deploymentTransaction();
-  if (!deployTx) {
-    throw "Contract deployment transaction receipt not found.";
+  const txReceipt = await customBridgedToken.deploymentTransaction()?.wait();
+  if (!txReceipt) {
+    throw "Deployment transaction not found.";
   }
 
-  await tryStoreAddress(network.name, contractName, customBridgedTokenAddress, deployTx.hash);
+  const contractAddress = await customBridgedToken.getAddress();
 
-  console.log(`CustomBridgedToken deployed on ${network.name}, at address:`, customBridgedTokenAddress);
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 
-  await tryVerifyContract(customBridgedTokenAddress);
+  await tryStoreAddress(network.name, contractName, contractAddress, txReceipt.hash);
+  await tryVerifyContract(contractAddress);
 };
+
 export default func;
 func.tags = ["CustomBridgedToken"];
diff --git a/contracts/deploy/09_deploy_TestEIP4844.ts b/contracts/deploy/09_deploy_TestEIP4844.ts
@@ -11,12 +11,15 @@ const func: DeployFunction = async function () {
   const contract = await deployFromFactory(contractName, provider, await get1559Fees(provider));
   const contractAddress = await contract.getAddress();
 
-  console.log(`${contractName} deployed at ${contractAddress}`);
-
-  const deployTx = contract.deploymentTransaction();
-  if (!deployTx) {
-    throw "Contract deployment transaction receipt not found.";
+  const txReceipt = await contract.deploymentTransaction()?.wait();
+  if (!txReceipt) {
+    throw "Deployment transaction not found.";
   }
+
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 };
 export default func;
 func.tags = ["TestEIP4844"];
diff --git a/contracts/deploy/10_deploy_RecoverFunds.ts b/contracts/deploy/10_deploy_RecoverFunds.ts
@@ -2,6 +2,7 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { deployUpgradableFromFactory } from "../scripts/hardhat/utils";
 import { tryVerifyContract, getDeployedContractAddress, tryStoreAddress, getRequiredEnvVar } from "../common/helpers";
+import { ethers } from "hardhat";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments } = hre;
@@ -36,7 +37,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     throw "Contract deployment transaction receipt not found.";
   }
 
-  console.log(`${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber}`);
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 
   await tryStoreAddress(hre.network.name, contractName, contractAddress, txReceipt.hash);
 

diff --git a/contracts/deploy/11_deploy_TestERC20.ts b/contracts/deploy/11_deploy_TestERC20.ts
@@ -25,15 +25,18 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await contract.waitForDeployment();
   const contractAddress = await contract.getAddress();
 
-  const deployTx = contract.deploymentTransaction();
-  if (!deployTx) {
+  const txReceipt = await contract.deploymentTransaction()?.wait();
+  if (!txReceipt) {
     throw "Deployment transaction not found.";
   }
 
-  await tryStoreAddress(network.name, contractName, contractAddress, deployTx.hash);
+  await tryStoreAddress(network.name, contractName, contractAddress, txReceipt.hash);
+
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
 
-  const chainId = (await ethers.provider.getNetwork()).chainId;
-  console.log(`${contractName} deployed on ${network.name}, chainId=${chainId}, at address: ${contractAddress}`);
   await tryVerifyContract(contractAddress);
 };
 

diff --git a/contracts/deploy/12_deploy_CallForwardingProxy.ts b/contracts/deploy/12_deploy_CallForwardingProxy.ts
@@ -14,13 +14,16 @@ const func: DeployFunction = async function () {
   const contract = await deployFromFactory(contractName, provider, targetAddress);
   const contractAddress = await contract.getAddress();
 
-  console.log(`${contractName} deployed at ${contractAddress}`);
-
-  const deployTx = contract.deploymentTransaction();
-  if (!deployTx) {
+  const txReceipt = await contract.deploymentTransaction()?.wait();
+  if (!txReceipt) {
     throw "Deployment transaction not found.";
   }
 
+  const chainId = (await ethers.provider!.getNetwork()).chainId;
+  console.log(
+    `contract=${contractName} deployed: address=${contractAddress} blockNumber=${txReceipt.blockNumber} chainId=${chainId}`,
+  );
+
   const args = [targetAddress];
 
   await tryVerifyContractWithConstructorArgs(