diff --git a/modules/contracts/deploy/deploy.ts b/modules/contracts/deploy/deploy.ts index a2453d7d2..a0dc1e2fc 100644 --- a/modules/contracts/deploy/deploy.ts +++ b/modules/contracts/deploy/deploy.ts @@ -3,6 +3,7 @@ import { EtherSymbol, Zero } from "@ethersproject/constants"; import { formatEther, parseEther } from "@ethersproject/units"; import { deployments, ethers, getNamedAccounts, getChainId, network } from "hardhat"; import { DeployFunction } from "hardhat-deploy/types"; +import { BIG_GAS_LIMIT } from "../src.ts/services/ethService"; import { registerTransfer } from "../src.ts/utils"; import { logger } from "../src.ts/constants"; @@ -40,20 +41,22 @@ const func: DeployFunction = async () => { ), ); log.info(`Deploying ${name} with args [${processedArgs.join(", ")}]`); + log.info("await deployments.deploy(name"); await deployments.deploy(name, { from: deployer, args: processedArgs, - /* - gasLimit: deployTx.gasLimit && BigNumber.from(deployTx.gasLimit).lt(MIN_GAS_LIMIT) - ? MIN_GAS_LIMIT - : undefined, - */ + gasLimit: BIG_GAS_LIMIT, }); + log.info("await deployments.get"); const deployment = await deployments.get(name); + log.info("if !deployment.transactionHash"); if (!deployment.transactionHash) { throw new Error(`Failed to deploy ${name}`); } + + log.info("await ethers.provider.getTransaction"); const tx = await ethers.provider.getTransaction(deployment.transactionHash!); + log.info("ethers.provider.getTransactionReceipt"); const receipt = await ethers.provider.getTransactionReceipt(deployment.transactionHash!); log.info(`Sent transaction to deploy ${name}, txHash: ${deployment.transactionHash}`); log.info( diff --git a/modules/contracts/src.ts/tasks/registerTransfer.spec.ts b/modules/contracts/src.ts/tasks/registerTransfer.spec.ts index 5dcca697c..d7db9b776 100644 --- a/modules/contracts/src.ts/tasks/registerTransfer.spec.ts +++ b/modules/contracts/src.ts/tasks/registerTransfer.spec.ts @@ -6,7 +6,7 @@ import { deployments } from "hardhat"; import { alice } from "../constants"; import { getContract, registerTransfer } from "../utils"; -describe("registerTransfer", function() { +describe("registerTransfer", function () { this.timeout(120_000); let registry: Contract; @@ -15,7 +15,7 @@ describe("registerTransfer", function() { registry = await getContract("TransferRegistry", alice); }); - it("should registry a new transfer", async () => { + it("should register a new transfer", async () => { expect(registry.address).to.be.a("string"); await expect(registerTransfer(TransferNames.HashlockTransfer, alice.address)).to.be.fulfilled; }); diff --git a/package.json b/package.json index 021432672..4e7de17aa 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ }, "homepage": "https://github.com/connext/vector#readme", "devDependencies": { + "@types/uuid": "^8.3.0", "@typescript-eslint/eslint-plugin": "4.16.1", "@typescript-eslint/parser": "4.16.1", "cypress": "^6.5.0",