fixed rebase error

Author: aalavandhan

helpers/contracts.js

@@ -55,7 +55,7 @@ const getCompiledContractFactory = (ethers, contract) => {
   );
 };
 
-const deployContract = async (ethers, contractName, signer, args, txParams) => {
+const deployContract = async (ethers, contractName, signer, args, txParams, waitBlocks=0) => {
   // console.log('Deploying', contractName);
   const Factory = await getCompiledContractFactory(ethers, contractName);
   const contract = await Factory.connect(signer).deploy(...args, txParams);
@@ -77,6 +77,7 @@ const deployProxyContract = async (
   args,
   initializerDef,
   txParams,
+  waitBlocks=0
 ) => {
   // console.log('Deploying proxy', contractName);
   const ProxyAdminFactory = await getCompiledContractFactory(