Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a waitForTransaction to time helpers #51

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extendEnvironment((hre) => {
return ownable(hre)
}),
time: lazyObject(() => {
return time()
return time(hre)
}),
signers: lazyObject(() => {
return signers(hre)
Expand Down
34 changes: 33 additions & 1 deletion src/time.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { HardhatRuntimeEnvironment } from "hardhat/types"
import {
mine,
mineUpTo,
Expand Down Expand Up @@ -30,6 +31,8 @@
* @param {number} blocks
*/
mineBlocksTo(blocks: number): Promise<number>

waitForTransaction(txHash: string, confirmations?: number): Promise<boolean>
}

/**
Expand Down Expand Up @@ -86,12 +89,41 @@
return await timeHelpers.latestBlock()
}

export default function (): HardhatTimeHelpers {
export async function waitForTransaction(
hre: HardhatRuntimeEnvironment,
txHash: string,
confirmations?: number = 1

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.

Check failure on line 95 in src/time.ts

View workflow job for this annotation

GitHub Actions / test

Parameter cannot have question mark and initializer.
): Promise<boolean> {
if (hre.network.name === "hardhat") {
return true
}

const { provider } = hre.ethers
const transaction = await provider.getTransaction(txHash)
if (!transaction) {
throw new Error(`Transaction ${txHash} not found`)
}

let currentConfirmations = await transaction.confirmations()
while (currentConfirmations < confirmations) {
// wait 1s between each check to save API compute units
// eslint-disable-next-line no-await-in-loop, no-promise-executor-return
await new Promise((resolve) => setTimeout(resolve, 1000))
// eslint-disable-next-line no-await-in-loop
currentConfirmations = await transaction.confirmations()
}

return true
}

export default function (hre: HardhatRuntimeEnvironment): HardhatTimeHelpers {
return {
lastBlockNumber: () => lastBlockNumber(),
lastBlockTime: () => lastBlockTime(),
increaseTime: (time: number) => increaseTime(time),
mineBlocks: (blocks: number) => mineBlocks(blocks),
mineBlocksTo: (targetBlock: number) => mineBlocksTo(targetBlock),
waitForTransaction: (txHash: string, confirmations?: number) =>
waitForTransaction(hre, txHash, confirmations),
}
}
58 changes: 58 additions & 0 deletions test/time.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
import { useEnvironment } from "./helpers"

import type { HardhatTimeHelpers } from "../src/time"
import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers"
import type { HardhatEthersHelpers } from "@nomicfoundation/hardhat-ethers/types"
import type { ethers as ethersT } from "ethers"

import { mine } from "@nomicfoundation/hardhat-network-helpers"

import chai from "chai"
chai.use(require("chai-as-promised"))
const { expect } = chai

function timeout(ms: number) {
return new Promise((resolve) => {
setTimeout(() => {
resolve("Timed out after " + ms + " ms")
}, ms)
})
}

describe("time helpers", function () {
context("default hardhat project", function () {
useEnvironment("hardhat-project")
Expand Down Expand Up @@ -114,5 +127,50 @@
)
})
})

describe("waitForTransaction function", function () {
let currentBlockNumber: number

Check failure on line 132 in test/time.test.ts

View workflow job for this annotation

GitHub Actions / format

'currentBlockNumber' is defined but never used
let ethers: typeof ethersT & HardhatEthersHelpers
let signer: HardhatEthersSigner
let transactionResponse: ethersT.TransactionResponse

beforeEach(async function () {
ethers = this.hre.ethers
signer = (await ethers.getSigners())[0]

const tx = {
to: signer.address, // Sending the transaction to the signer's own address
value: ethers.parseEther("0.01"), // Small amount of Ether, can also be 0
}
transactionResponse = await signer.sendTransaction(tx)
})

it("returns immediately on hardhat", async function () {
const waitResult = await Promise.race([
timeHelpers.waitForTransaction(transactionResponse.hash, 5),
timeout(300),
])
expect(waitResult).to.be.true
})

it("does not return immediately on non-hardhat networks", async function () {
this.hre.network.name = "not-hardhat"
const waitResult = await Promise.race([
timeHelpers.waitForTransaction(transactionResponse.hash, 5),
timeout(1000),
])
expect(waitResult).to.equal("Timed out after 1000 ms")
})

it("returns after the transaction is mined", async function () {
this.hre.network.name = "not-hardhat"
await mine(6)
const waitResult = await Promise.race([
timeHelpers.waitForTransaction(transactionResponse.hash, 5),
timeout(1000),
])
expect(waitResult).to.be.true
})
})
})
})
Loading