diff --git a/script/utils.js b/script/utils.js index d9bfd76..8ee50aa 100644 --- a/script/utils.js +++ b/script/utils.js @@ -34,8 +34,7 @@ async function getDeployTx(contract) { return await contract.deployTransaction.wait(); } else if (contract.deploymentTransaction !== undefined) { // ethers v6 - const deploymentTransaction = await contract.deploymentTransaction(); - return await deploymentTransaction.getTransaction(); + return contract.deploymentTransaction().wait(); } else { return undefined; } @@ -120,15 +119,6 @@ class ChainContractDeployer { console.log('deployer balance', this.hardhat.ethers.formatEther(balance)); } - // To avoid proxy name conflict with '@openzeppelin/contracts/proxy/Proxy.sol:Proxy' - getProxyContractName() { - if (this.zksync) { - return "cache-zk/solpp-generated-contracts/zksync/Proxy.sol:Proxy"; - } else { - return "cache/solpp-generated-contracts/zksync/Proxy.sol:Proxy"; - } - } - async deployContract(contractName, deployArgs) { let contract; if (this.zksync) {