feat: allow configuring confirmations for contract deployments (#98)

axelarnetwork · Oct 12, 2023 · af8eeca · af8eeca
1 parent 1d3dd9a
commit af8eeca
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/scripts/create2Deployer.js b/scripts/create2Deployer.js
@@ -44,6 +44,7 @@ const create2DeployContract = async (
   key,
   args = [],
   txOptions = null,
+  confirmations = null,
 ) => {
   if (txOptions && !Number.isNaN(Number(txOptions))) {
     txOptions = {
@@ -55,8 +56,10 @@ const create2DeployContract = async (
   const salt = getSaltFromKey(key);
   const factory = new ContractFactory(contractJson.abi, contractJson.bytecode);
   const bytecode = factory.getDeployTransaction(...args).data;
-  const tx = await deployer.connect(wallet).deploy(bytecode, salt, txOptions);
-  await tx.wait();
+
+  const tx = await deployer.deploy(bytecode, salt, txOptions);
+  await tx.wait(confirmations);
+
   const address = await deployer.deployedAddress(
     bytecode,
     wallet.address,
@@ -73,6 +76,7 @@ const create2DeployAndInitContract = async (
   args = [],
   initArgs = [],
   txOptions = null,
+  confirmations = null,
 ) => {
   if (txOptions && !Number.isNaN(Number(txOptions))) {
     txOptions = {
@@ -91,10 +95,11 @@ const create2DeployAndInitContract = async (
   );
   const contract = new Contract(address, contractJson.abi, wallet);
   const initData = (await contract.populateTransaction.init(...initArgs)).data;
+
   const tx = await deployer
-    .connect(wallet)
     .deployAndInit(bytecode, salt, initData, txOptions);
-  await tx.wait();
+  await tx.wait(confirmations);
+
   return contract;
 };
 

diff --git a/scripts/create3Deployer.js b/scripts/create3Deployer.js
@@ -40,6 +40,7 @@ const create3DeployContract = async (
   key,
   args = [],
   txOptions = null,
+  confirmations = null,
 ) => {
   if (txOptions && !Number.isNaN(Number(txOptions))) {
     txOptions = {
@@ -51,9 +52,12 @@ const create3DeployContract = async (
   const salt = getSaltFromKey(key);
   const factory = new ContractFactory(contractJson.abi, contractJson.bytecode);
   const bytecode = factory.getDeployTransaction(...args).data;
-  const tx = await deployer.connect(wallet).deploy(bytecode, salt, txOptions);
-  await tx.wait();
+
+  const tx = await deployer.deploy(bytecode, salt, txOptions);
+  await tx.wait(confirmations);
+
   const address = await deployer.deployedAddress('0x', wallet.address, salt);
+
   return new Contract(address, contractJson.abi, wallet);
 };
 
@@ -65,6 +69,7 @@ const create3DeployAndInitContract = async (
   args = [],
   initArgs = [],
   txOptions = null,
+  confirmations = null,
 ) => {
   if (txOptions && !Number.isNaN(Number(txOptions))) {
     txOptions = {
@@ -79,10 +84,11 @@ const create3DeployAndInitContract = async (
   const address = await deployer.deployedAddress('0x', wallet.address, salt);
   const contract = new Contract(address, contractJson.abi, wallet);
   const initData = (await contract.populateTransaction.init(...initArgs)).data;
+
   const tx = await deployer
-    .connect(wallet)
     .deployAndInit(bytecode, salt, initData, txOptions);
-  await tx.wait();
+  await tx.wait(confirmations);
+
   return contract;
 };