@nomicfoundation/hardhat-ethers-chai-matchers 3.0.0-next.3 → 3.0.0-next.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -26
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +2 -7
- package/dist/src/index.js.map +1 -1
- package/dist/src/internal/add-chai-matchers.d.ts.map +1 -1
- package/dist/src/internal/add-chai-matchers.js +4 -2
- package/dist/src/internal/add-chai-matchers.js.map +1 -1
- package/dist/src/internal/constants.d.ts +2 -1
- package/dist/src/internal/constants.d.ts.map +1 -1
- package/dist/src/internal/constants.js +2 -1
- package/dist/src/internal/constants.js.map +1 -1
- package/dist/src/internal/matchers/big-number.js +2 -2
- package/dist/src/internal/matchers/big-number.js.map +1 -1
- package/dist/src/internal/matchers/changeEtherBalance.d.ts +2 -2
- package/dist/src/internal/matchers/changeEtherBalance.d.ts.map +1 -1
- package/dist/src/internal/matchers/changeEtherBalance.js +7 -16
- package/dist/src/internal/matchers/changeEtherBalance.js.map +1 -1
- package/dist/src/internal/matchers/changeEtherBalances.d.ts +2 -2
- package/dist/src/internal/matchers/changeEtherBalances.d.ts.map +1 -1
- package/dist/src/internal/matchers/changeEtherBalances.js +6 -6
- package/dist/src/internal/matchers/changeEtherBalances.js.map +1 -1
- package/dist/src/internal/matchers/changeTokenBalance.d.ts +2 -2
- package/dist/src/internal/matchers/changeTokenBalance.d.ts.map +1 -1
- package/dist/src/internal/matchers/changeTokenBalance.js +13 -17
- package/dist/src/internal/matchers/changeTokenBalance.js.map +1 -1
- package/dist/src/internal/matchers/emit.js +4 -4
- package/dist/src/internal/matchers/emit.js.map +1 -1
- package/dist/src/internal/matchers/reverted/legacyReverted.d.ts +2 -0
- package/dist/src/internal/matchers/reverted/legacyReverted.d.ts.map +1 -0
- package/dist/src/internal/matchers/reverted/legacyReverted.js +12 -0
- package/dist/src/internal/matchers/reverted/legacyReverted.js.map +1 -0
- package/dist/src/internal/matchers/reverted/revert.d.ts +2 -0
- package/dist/src/internal/matchers/reverted/revert.d.ts.map +1 -0
- package/dist/src/internal/matchers/reverted/{reverted.js → revert.js} +9 -9
- package/dist/src/internal/matchers/reverted/revert.js.map +1 -0
- package/dist/src/internal/matchers/reverted/revertedWith.js +1 -1
- package/dist/src/internal/matchers/reverted/revertedWith.js.map +1 -1
- package/dist/src/internal/matchers/reverted/revertedWithCustomError.js +5 -5
- package/dist/src/internal/matchers/reverted/revertedWithCustomError.js.map +1 -1
- package/dist/src/internal/matchers/reverted/revertedWithPanic.js +1 -1
- package/dist/src/internal/matchers/reverted/revertedWithPanic.js.map +1 -1
- package/dist/src/internal/matchers/reverted/utils.d.ts.map +1 -1
- package/dist/src/internal/matchers/reverted/utils.js +2 -2
- package/dist/src/internal/matchers/reverted/utils.js.map +1 -1
- package/dist/src/internal/matchers/withArgs.js +3 -3
- package/dist/src/internal/matchers/withArgs.js.map +1 -1
- package/dist/src/internal/utils/account.js +1 -1
- package/dist/src/internal/utils/account.js.map +1 -1
- package/dist/src/internal/utils/asserts.js +1 -1
- package/dist/src/internal/utils/asserts.js.map +1 -1
- package/dist/src/internal/utils/balance.d.ts +2 -2
- package/dist/src/internal/utils/balance.d.ts.map +1 -1
- package/dist/src/internal/utils/balance.js +2 -6
- package/dist/src/internal/utils/balance.js.map +1 -1
- package/dist/src/internal/utils/build-assert.d.ts.map +1 -1
- package/dist/src/internal/utils/build-assert.js +2 -2
- package/dist/src/internal/utils/build-assert.js.map +1 -1
- package/dist/src/internal/utils/prevent-chaining.js +1 -1
- package/dist/src/internal/utils/prevent-chaining.js.map +1 -1
- package/dist/src/type-extensions.d.ts +6 -6
- package/dist/src/type-extensions.d.ts.map +1 -1
- package/package.json +12 -20
- package/src/index.ts +2 -9
- package/src/internal/add-chai-matchers.ts +4 -2
- package/src/internal/constants.ts +2 -1
- package/src/internal/matchers/big-number.ts +2 -2
- package/src/internal/matchers/changeEtherBalance.ts +15 -17
- package/src/internal/matchers/changeEtherBalances.ts +7 -11
- package/src/internal/matchers/changeTokenBalance.ts +15 -18
- package/src/internal/matchers/emit.ts +4 -4
- package/src/internal/matchers/reverted/legacyReverted.ts +19 -0
- package/src/internal/matchers/reverted/{reverted.ts → revert.ts} +8 -8
- package/src/internal/matchers/reverted/revertedWith.ts +1 -1
- package/src/internal/matchers/reverted/revertedWithCustomError.ts +5 -5
- package/src/internal/matchers/reverted/revertedWithPanic.ts +1 -1
- package/src/internal/matchers/reverted/utils.ts +16 -10
- package/src/internal/matchers/withArgs.ts +3 -3
- package/src/internal/utils/account.ts +1 -1
- package/src/internal/utils/asserts.ts +1 -1
- package/src/internal/utils/balance.ts +4 -9
- package/src/internal/utils/build-assert.ts +2 -2
- package/src/internal/utils/prevent-chaining.ts +1 -1
- package/src/type-extensions.ts +6 -7
- package/dist/src/internal/matchers/reverted/reverted.d.ts +0 -2
- package/dist/src/internal/matchers/reverted/reverted.d.ts.map +0 -1
- package/dist/src/internal/matchers/reverted/reverted.js.map +0 -1
package/README.md
CHANGED
|
@@ -1,31 +1,24 @@
|
|
|
1
|
-
#
|
|
1
|
+
# hardhat-ethers-chai-matchers
|
|
2
2
|
|
|
3
3
|
This plugin adds Ethereum-specific matchers to the [Chai](https://chaijs.com/) assertion library that integrate with [ethers.js](https://ethers.org/), making your smart contract tests easy to write and read.
|
|
4
4
|
|
|
5
5
|
## Installation
|
|
6
6
|
|
|
7
|
+
> This plugin is part of the [Ethers+Mocha Hardhat Toolbox](/v-next/hardhat-toolbox-mocha-ethers/). If you are using that toolbox, there's nothing else you need to do.
|
|
8
|
+
|
|
7
9
|
To install this plugin, run the following command:
|
|
8
10
|
|
|
9
11
|
```bash
|
|
10
|
-
npm install --save-dev @nomicfoundation/hardhat-ethers-chai-matchers
|
|
12
|
+
npm install --save-dev @nomicfoundation/hardhat-ethers-chai-matchers
|
|
11
13
|
```
|
|
12
14
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
```typescript
|
|
16
|
-
// ...
|
|
17
|
-
import ethersChaiMatchersPlugin from "@nomicfoundation/hardhat-ethers-chai-matchers";
|
|
15
|
+
In your `hardhat.config.ts` file, import the plugin and add it to the `plugins` array:
|
|
18
16
|
|
|
19
|
-
|
|
17
|
+
```ts
|
|
18
|
+
import hardhatEthersChaiMatchers from "@nomicfoundation/hardhat-ethers-chai-matchers";
|
|
20
19
|
|
|
21
20
|
export default {
|
|
22
|
-
|
|
23
|
-
plugins: [
|
|
24
|
-
// ...
|
|
25
|
-
ethersChaiMatchersPlugin,
|
|
26
|
-
],
|
|
27
|
-
|
|
28
|
-
// ...
|
|
21
|
+
plugins: [hardhatEthersChaiMatchers],
|
|
29
22
|
};
|
|
30
23
|
```
|
|
31
24
|
|
|
@@ -33,20 +26,16 @@ export default {
|
|
|
33
26
|
|
|
34
27
|
You don't need to do anything else to use this plugin. Whenever you run your tests with Hardhat, it will automatically add the matchers.
|
|
35
28
|
|
|
36
|
-
Here is an example of using the `
|
|
29
|
+
Here is an example of using the `emit` matcher:
|
|
37
30
|
|
|
38
31
|
```ts
|
|
39
32
|
import { expect } from "chai";
|
|
40
33
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
const amount = ethers.utils.parseEther("1");
|
|
34
|
+
it("some test", async function () {
|
|
35
|
+
const contract = await ethers.deployContract("SomeContract");
|
|
45
36
|
|
|
46
|
-
await expect(()
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}),
|
|
51
|
-
).to.changeEtherBalances(provider, [sender, contract], [-AMOUNT, AMOUNT]);
|
|
37
|
+
await expect(contract.someFunction())
|
|
38
|
+
.to.emit(contract, "SomeEvent")
|
|
39
|
+
.withArgs("0x...", 3);
|
|
40
|
+
});
|
|
52
41
|
```
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,sBAAsB,CAAC;AAE9B,QAAA,MAAM,yBAAyB,EAAE,aAOhC,CAAC;AAEF,eAAe,yBAAyB,CAAC"}
|
package/dist/src/index.js
CHANGED
|
@@ -2,15 +2,10 @@ import "./type-extensions.js";
|
|
|
2
2
|
const hardhatChaiMatchersPlugin = {
|
|
3
3
|
id: "hardhat-ethers-chai-matchers",
|
|
4
4
|
hookHandlers: {
|
|
5
|
-
network: import
|
|
5
|
+
network: () => import("./internal/hook-handlers/network.js"),
|
|
6
6
|
},
|
|
7
7
|
npmPackage: "@nomicfoundation/hardhat-ethers-chai-matchers",
|
|
8
|
-
dependencies: [
|
|
9
|
-
async () => {
|
|
10
|
-
const { default: hardhatEthersPlugin } = await import("@nomicfoundation/hardhat-ethers");
|
|
11
|
-
return hardhatEthersPlugin;
|
|
12
|
-
},
|
|
13
|
-
],
|
|
8
|
+
dependencies: () => [import("@nomicfoundation/hardhat-ethers")],
|
|
14
9
|
};
|
|
15
10
|
export default hardhatChaiMatchersPlugin;
|
|
16
11
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,CAAC;AAE9B,MAAM,yBAAyB,GAAkB;IAC/C,EAAE,EAAE,8BAA8B;IAClC,YAAY,EAAE;QACZ,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,CAAC;AAE9B,MAAM,yBAAyB,GAAkB;IAC/C,EAAE,EAAE,8BAA8B;IAClC,YAAY,EAAE;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,qCAAqC,CAAC;KAC7D;IACD,UAAU,EAAE,+CAA+C;IAC3D,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC;CAChE,CAAC;AAEF,eAAe,yBAAyB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-chai-matchers.d.ts","sourceRoot":"","sources":["../../../src/internal/add-chai-matchers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-chai-matchers.d.ts","sourceRoot":"","sources":["../../../src/internal/add-chai-matchers.ts"],"names":[],"mappings":"AAqBA,wBAAgB,eAAe,IAAI,IAAI,CAGtC"}
|
|
@@ -10,7 +10,8 @@ import { supportHexEqual } from "./matchers/hexEqual.js";
|
|
|
10
10
|
import { supportProperAddress } from "./matchers/properAddress.js";
|
|
11
11
|
import { supportProperHex } from "./matchers/properHex.js";
|
|
12
12
|
import { supportProperPrivateKey } from "./matchers/properPrivateKey.js";
|
|
13
|
-
import {
|
|
13
|
+
import { supportLegacyReverted } from "./matchers/reverted/legacyReverted.js";
|
|
14
|
+
import { supportRevert } from "./matchers/reverted/revert.js";
|
|
14
15
|
import { supportRevertedWith } from "./matchers/reverted/revertedWith.js";
|
|
15
16
|
import { supportRevertedWithCustomError } from "./matchers/reverted/revertedWithCustomError.js";
|
|
16
17
|
import { supportRevertedWithPanic } from "./matchers/reverted/revertedWithPanic.js";
|
|
@@ -31,7 +32,8 @@ function hardhatChaiMatchers(chai, chaiUtils) {
|
|
|
31
32
|
supportChangeEtherBalance(chai.Assertion, chaiUtils);
|
|
32
33
|
supportChangeEtherBalances(chai.Assertion, chaiUtils);
|
|
33
34
|
supportChangeTokenBalance(chai.Assertion, chaiUtils);
|
|
34
|
-
|
|
35
|
+
supportLegacyReverted(chai.Assertion, chaiUtils);
|
|
36
|
+
supportRevert(chai.Assertion, chaiUtils);
|
|
35
37
|
supportRevertedWith(chai.Assertion, chaiUtils);
|
|
36
38
|
supportRevertedWithCustomError(chai.Assertion, chaiUtils);
|
|
37
39
|
supportRevertedWithPanic(chai.Assertion, chaiUtils);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-chai-matchers.js","sourceRoot":"","sources":["../../../src/internal/add-chai-matchers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAC3B,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"add-chai-matchers.js","sourceRoot":"","sources":["../../../src/internal/add-chai-matchers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAC3B,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,UAAU,eAAe;IAC7B,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACzB,GAAG,CAAC,cAAc,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAqB,EACrB,SAAyB;IAEzB,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9C,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC5C,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACxC,yBAAyB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACrD,0BAA0B,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,yBAAyB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACrD,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACjD,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACzC,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC/C,8BAA8B,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC1D,wBAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACpD,4BAA4B,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACxD,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -5,7 +5,8 @@ export declare const CHANGE_ETHER_BALANCES_MATCHER = "changeEtherBalances";
|
|
|
5
5
|
export declare const CHANGE_TOKEN_BALANCE_MATCHER = "changeTokenBalance";
|
|
6
6
|
export declare const CHANGE_TOKEN_BALANCES_MATCHER = "changeTokenBalances";
|
|
7
7
|
export declare const EMIT_MATCHER = "emit";
|
|
8
|
-
export declare const
|
|
8
|
+
export declare const LEGACY_REVERTED_MATCHER = "reverted";
|
|
9
|
+
export declare const REVERT_MATCHER = "revert";
|
|
9
10
|
export declare const REVERTED_WITH_MATCHER = "revertedWith";
|
|
10
11
|
export declare const REVERTED_WITH_CUSTOM_ERROR_MATCHER = "revertedWithCustomError";
|
|
11
12
|
export declare const REVERTED_WITH_PANIC_MATCHER = "revertedWithPanic";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/internal/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,8CAA8C,CAAC;AAC7E,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAE3D,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AACjE,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AACnE,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AACjE,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AACnE,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/internal/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,8CAA8C,CAAC;AAC7E,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAE3D,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AACjE,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AACnE,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AACjE,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AACnE,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,uBAAuB,aAAa,CAAC;AAClD,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,qBAAqB,iBAAiB,CAAC;AACpD,eAAO,MAAM,kCAAkC,4BAA4B,CAAC;AAC5E,eAAO,MAAM,2BAA2B,sBAAsB,CAAC;AAC/D,eAAO,MAAM,+BAA+B,0BAA0B,CAAC"}
|
|
@@ -5,7 +5,8 @@ export const CHANGE_ETHER_BALANCES_MATCHER = "changeEtherBalances";
|
|
|
5
5
|
export const CHANGE_TOKEN_BALANCE_MATCHER = "changeTokenBalance";
|
|
6
6
|
export const CHANGE_TOKEN_BALANCES_MATCHER = "changeTokenBalances";
|
|
7
7
|
export const EMIT_MATCHER = "emit";
|
|
8
|
-
export const
|
|
8
|
+
export const LEGACY_REVERTED_MATCHER = "reverted";
|
|
9
|
+
export const REVERT_MATCHER = "revert";
|
|
9
10
|
export const REVERTED_WITH_MATCHER = "revertedWith";
|
|
10
11
|
export const REVERTED_WITH_CUSTOM_ERROR_MATCHER = "revertedWithCustomError";
|
|
11
12
|
export const REVERTED_WITH_PANIC_MATCHER = "revertedWithPanic";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/internal/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,2CAA2C,CAAC;AAC7E,MAAM,CAAC,MAAM,qBAAqB,GAAG,qBAAqB,CAAC;AAE3D,MAAM,CAAC,MAAM,4BAA4B,GAAG,oBAAoB,CAAC;AACjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC;AACnE,MAAM,CAAC,MAAM,4BAA4B,GAAG,oBAAoB,CAAC;AACjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC;AACnE,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC;AACnC,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/internal/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,2CAA2C,CAAC;AAC7E,MAAM,CAAC,MAAM,qBAAqB,GAAG,qBAAqB,CAAC;AAE3D,MAAM,CAAC,MAAM,4BAA4B,GAAG,oBAAoB,CAAC;AACjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC;AACnE,MAAM,CAAC,MAAM,4BAA4B,GAAG,oBAAoB,CAAC;AACjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC;AACnE,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC;AACnC,MAAM,CAAC,MAAM,uBAAuB,GAAG,UAAU,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC;AACvC,MAAM,CAAC,MAAM,qBAAqB,GAAG,cAAc,CAAC;AACpD,MAAM,CAAC,MAAM,kCAAkC,GAAG,yBAAyB,CAAC;AAC5E,MAAM,CAAC,MAAM,2BAA2B,GAAG,mBAAmB,CAAC;AAC/D,MAAM,CAAC,MAAM,+BAA+B,GAAG,uBAAuB,CAAC"}
|
|
@@ -82,7 +82,7 @@ function overwriteBigNumberFunction(functionName, readableName, readableNegative
|
|
|
82
82
|
return lhs <= rhs;
|
|
83
83
|
}
|
|
84
84
|
else {
|
|
85
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.UNKNOWN_COMPARISON_OPERATION, {
|
|
85
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.UNKNOWN_COMPARISON_OPERATION, {
|
|
86
86
|
method,
|
|
87
87
|
});
|
|
88
88
|
}
|
|
@@ -170,7 +170,7 @@ function deepEqualComparator(a, b) {
|
|
|
170
170
|
const normalizedB = toBigInt(b);
|
|
171
171
|
return normalizedA === normalizedB;
|
|
172
172
|
}
|
|
173
|
-
catch (
|
|
173
|
+
catch (_error) {
|
|
174
174
|
// use default comparator
|
|
175
175
|
return null;
|
|
176
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"big-number.js","sourceRoot":"","sources":["../../../../src/internal/matchers/big-number.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"big-number.js","sourceRoot":"","sources":["../../../../src/internal/matchers/big-number.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { BalanceChangeOptions } from "../utils/balance.js";
|
|
2
|
+
import type { HardhatEthers } from "@nomicfoundation/hardhat-ethers/types";
|
|
2
3
|
import type { Addressable } from "ethers/address";
|
|
3
4
|
import type { TransactionResponse } from "ethers/providers";
|
|
4
|
-
import type { EthereumProvider } from "hardhat/types/providers";
|
|
5
5
|
export declare function supportChangeEtherBalance(Assertion: Chai.AssertionStatic, chaiUtils: Chai.ChaiUtils): void;
|
|
6
|
-
export declare function getBalanceChange(
|
|
6
|
+
export declare function getBalanceChange(ethers: HardhatEthers, transaction: TransactionResponse | Promise<TransactionResponse> | (() => Promise<TransactionResponse> | TransactionResponse), account: Addressable | string, options?: BalanceChangeOptions): Promise<bigint>;
|
|
7
7
|
//# sourceMappingURL=changeEtherBalance.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeEtherBalance.d.ts","sourceRoot":"","sources":["../../../../src/internal/matchers/changeEtherBalance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"changeEtherBalance.d.ts","sourceRoot":"","sources":["../../../../src/internal/matchers/changeEtherBalance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgB5D,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,IAAI,CAAC,eAAe,EAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,GACxB,IAAI,CAoDN;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,WAAW,EACP,mBAAmB,GACnB,OAAO,CAAC,mBAAmB,CAAC,GAC5B,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAAC,EAC9D,OAAO,EAAE,WAAW,GAAG,MAAM,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAmDjB"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors";
|
|
2
|
-
import { numberToHexString } from "@nomicfoundation/hardhat-utils/hex";
|
|
3
2
|
import { isObject } from "@nomicfoundation/hardhat-utils/lang";
|
|
4
3
|
import { toBigInt } from "ethers/utils";
|
|
5
4
|
import { CHANGE_ETHER_BALANCE_MATCHER } from "../constants.js";
|
|
@@ -8,7 +7,7 @@ import { assertCanBeConvertedToBigint, assertIsNotNull, } from "../utils/asserts
|
|
|
8
7
|
import { buildAssert } from "../utils/build-assert.js";
|
|
9
8
|
import { preventAsyncMatcherChaining } from "../utils/prevent-chaining.js";
|
|
10
9
|
export function supportChangeEtherBalance(Assertion, chaiUtils) {
|
|
11
|
-
Assertion.addMethod(CHANGE_ETHER_BALANCE_MATCHER, function (
|
|
10
|
+
Assertion.addMethod(CHANGE_ETHER_BALANCE_MATCHER, function (ethers, account, balanceChange, options) {
|
|
12
11
|
// capture negated flag before async code executes; see buildAssert's jsdoc
|
|
13
12
|
const negated = this.__flags.negate;
|
|
14
13
|
const subject = this._obj;
|
|
@@ -24,7 +23,7 @@ export function supportChangeEtherBalance(Assertion, chaiUtils) {
|
|
|
24
23
|
}
|
|
25
24
|
};
|
|
26
25
|
const derivedPromise = Promise.all([
|
|
27
|
-
getBalanceChange(
|
|
26
|
+
getBalanceChange(ethers, subject, account, options),
|
|
28
27
|
getAddressOf(account),
|
|
29
28
|
]).then(checkBalanceChange);
|
|
30
29
|
this.then = derivedPromise.then.bind(derivedPromise);
|
|
@@ -33,7 +32,7 @@ export function supportChangeEtherBalance(Assertion, chaiUtils) {
|
|
|
33
32
|
return this;
|
|
34
33
|
});
|
|
35
34
|
}
|
|
36
|
-
export async function getBalanceChange(
|
|
35
|
+
export async function getBalanceChange(ethers, transaction, account, options) {
|
|
37
36
|
let txResponse;
|
|
38
37
|
if (typeof transaction === "function") {
|
|
39
38
|
txResponse = await transaction();
|
|
@@ -44,22 +43,14 @@ export async function getBalanceChange(provider, transaction, account, options)
|
|
|
44
43
|
const txReceipt = await txResponse.wait();
|
|
45
44
|
assertIsNotNull(txReceipt, "txReceipt");
|
|
46
45
|
const txBlockNumber = txReceipt.blockNumber;
|
|
47
|
-
const block = await provider.
|
|
48
|
-
|
|
49
|
-
params: [txReceipt.blockHash, false],
|
|
50
|
-
});
|
|
46
|
+
const block = await ethers.provider.getBlock(txReceipt.blockHash, false);
|
|
47
|
+
assertHardhatInvariant(block !== null, "The block doesn't exist");
|
|
51
48
|
assertHardhatInvariant(isObject(block) &&
|
|
52
49
|
Array.isArray(block.transactions) &&
|
|
53
50
|
block.transactions.length === 1, "There should be only 1 transaction in the block");
|
|
54
51
|
const address = await getAddressOf(account);
|
|
55
|
-
const balanceAfterHex = await provider.
|
|
56
|
-
|
|
57
|
-
params: [address, numberToHexString(txBlockNumber)],
|
|
58
|
-
});
|
|
59
|
-
const balanceBeforeHex = await provider.request({
|
|
60
|
-
method: "eth_getBalance",
|
|
61
|
-
params: [address, numberToHexString(txBlockNumber - 1)],
|
|
62
|
-
});
|
|
52
|
+
const balanceAfterHex = await ethers.provider.getBalance(address, txBlockNumber);
|
|
53
|
+
const balanceBeforeHex = await ethers.provider.getBalance(address, txBlockNumber - 1);
|
|
63
54
|
assertCanBeConvertedToBigint(balanceAfterHex);
|
|
64
55
|
assertCanBeConvertedToBigint(balanceBeforeHex);
|
|
65
56
|
const balanceAfter = BigInt(balanceAfterHex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeEtherBalance.js","sourceRoot":"","sources":["../../../../src/internal/matchers/changeEtherBalance.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"changeEtherBalance.js","sourceRoot":"","sources":["../../../../src/internal/matchers/changeEtherBalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { BalanceChangeOptions } from "../utils/balance.js";
|
|
2
|
+
import type { HardhatEthers } from "@nomicfoundation/hardhat-ethers/types";
|
|
2
3
|
import type { Addressable } from "ethers/address";
|
|
3
4
|
import type { TransactionResponse } from "ethers/providers";
|
|
4
|
-
import type { EthereumProvider } from "hardhat/types/providers";
|
|
5
5
|
export declare function supportChangeEtherBalances(Assertion: Chai.AssertionStatic, chaiUtils: Chai.ChaiUtils): void;
|
|
6
|
-
export declare function getBalanceChanges(
|
|
6
|
+
export declare function getBalanceChanges(ethers: HardhatEthers, transaction: TransactionResponse | Promise<TransactionResponse>, accounts: Array<Addressable | string>, options?: BalanceChangeOptions): Promise<bigint[]>;
|
|
7
7
|
//# sourceMappingURL=changeEtherBalances.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeEtherBalances.d.ts","sourceRoot":"","sources":["../../../../src/internal/matchers/changeEtherBalances.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"changeEtherBalances.d.ts","sourceRoot":"","sources":["../../../../src/internal/matchers/changeEtherBalances.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAa5D,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,IAAI,CAAC,eAAe,EAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,GACxB,IAAI,CA2FN;AA4BD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,EAC/D,QAAQ,EAAE,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,EACrC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,MAAM,EAAE,CAAC,CAenB"}
|
|
@@ -8,7 +8,7 @@ import { buildAssert } from "../utils/build-assert.js";
|
|
|
8
8
|
import { ordinal } from "../utils/ordinal.js";
|
|
9
9
|
import { preventAsyncMatcherChaining } from "../utils/prevent-chaining.js";
|
|
10
10
|
export function supportChangeEtherBalances(Assertion, chaiUtils) {
|
|
11
|
-
Assertion.addMethod(CHANGE_ETHER_BALANCES_MATCHER, function (
|
|
11
|
+
Assertion.addMethod(CHANGE_ETHER_BALANCES_MATCHER, function (ethers, accounts, balanceChanges, options) {
|
|
12
12
|
// capture negated flag before async code executes; see buildAssert's jsdoc
|
|
13
13
|
const negated = this.__flags.negate;
|
|
14
14
|
let subject = this._obj;
|
|
@@ -43,7 +43,7 @@ export function supportChangeEtherBalances(Assertion, chaiUtils) {
|
|
|
43
43
|
}
|
|
44
44
|
};
|
|
45
45
|
const derivedPromise = Promise.all([
|
|
46
|
-
getBalanceChanges(
|
|
46
|
+
getBalanceChanges(ethers, subject, accounts, options),
|
|
47
47
|
getAddresses(accounts),
|
|
48
48
|
]).then(checkBalanceChanges);
|
|
49
49
|
this.then = derivedPromise.then.bind(derivedPromise);
|
|
@@ -56,7 +56,7 @@ function validateInput(obj, accounts, balanceChanges) {
|
|
|
56
56
|
try {
|
|
57
57
|
if (Array.isArray(balanceChanges) &&
|
|
58
58
|
accounts.length !== balanceChanges.length) {
|
|
59
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.ACCOUNTS_NUMBER_DIFFERENT_FROM_BALANCE_CHANGES, {
|
|
59
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.ACCOUNTS_NUMBER_DIFFERENT_FROM_BALANCE_CHANGES, {
|
|
60
60
|
accounts: accounts.length,
|
|
61
61
|
balanceChanges: balanceChanges.length,
|
|
62
62
|
});
|
|
@@ -69,13 +69,13 @@ function validateInput(obj, accounts, balanceChanges) {
|
|
|
69
69
|
throw e;
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
|
-
export async function getBalanceChanges(
|
|
72
|
+
export async function getBalanceChanges(ethers, transaction, accounts, options) {
|
|
73
73
|
const txResponse = await transaction;
|
|
74
74
|
const txReceipt = await txResponse.wait();
|
|
75
75
|
assertIsNotNull(txReceipt, "txReceipt");
|
|
76
76
|
const txBlockNumber = txReceipt.blockNumber;
|
|
77
|
-
const balancesAfter = await getBalances(
|
|
78
|
-
const balancesBefore = await getBalances(
|
|
77
|
+
const balancesAfter = await getBalances(ethers, accounts, txBlockNumber);
|
|
78
|
+
const balancesBefore = await getBalances(ethers, accounts, txBlockNumber - 1);
|
|
79
79
|
const txFees = await getTxFees(accounts, txResponse, options);
|
|
80
80
|
return balancesAfter.map((balance, ind) => balance + txFees[ind] - balancesBefore[ind]);
|
|
81
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeEtherBalances.js","sourceRoot":"","sources":["../../../../src/internal/matchers/changeEtherBalances.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAE3E,MAAM,UAAU,0BAA0B,CACxC,SAA+B,EAC/B,SAAyB;IAEzB,SAAS,CAAC,SAAS,CACjB,6BAA6B,EAC7B,UAEE,
|
|
1
|
+
{"version":3,"file":"changeEtherBalances.js","sourceRoot":"","sources":["../../../../src/internal/matchers/changeEtherBalances.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAE3E,MAAM,UAAU,0BAA0B,CACxC,SAA+B,EAC/B,SAAyB;IAEzB,SAAS,CAAC,SAAS,CACjB,6BAA6B,EAC7B,UAEE,MAAqB,EACrB,QAAqC,EACrC,cAA2D,EAC3D,OAA8B;QAE9B,2EAA2E;QAC3E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAEpC,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;QACxB,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;YAClC,OAAO,GAAG,OAAO,EAAE,CAAC;QACtB,CAAC;QAED,2BAA2B,CACzB,IAAI,EACJ,6BAA6B,EAC7B,SAAS,CACV,CAAC;QAEF,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEnD,MAAM,mBAAmB,GAAG,CAAC,CAAC,aAAa,EAAE,gBAAgB,CAG5D,EAAE,EAAE;YACH,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;YAEzD,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE,CAAC;gBACzC,MAAM,CACJ,cAAc,CAAC,aAAa,CAAC,EAC7B,wFAAwF,EACxF,yFAAyF,CAC1F,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CACJ,aAAa,CAAC,KAAK,CACjB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,KAAK,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAC1D,EACD,GAAG,EAAE;oBACH,MAAM,KAAK,GAAa,EAAE,CAAC;oBAC3B,aAAa,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,CAAC,EAAE,EAAE;wBAC1C,IAAI,MAAM,KAAK,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;4BAC3C,KAAK,CAAC,IAAI,CACR,iCACE,gBAAgB,CAAC,CAAC,CACpB,SAAS,OAAO,CACd,CAAC,GAAG,CAAC,CACN,sCAAsC,cAAc,CACnD,CAAC,CACF,CAAC,QAAQ,EAAE,2BAA2B,MAAM,CAAC,QAAQ,EAAE,MAAM,CAC/D,CAAC;wBACJ,CAAC;oBACH,CAAC,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC,EACD,GAAG,EAAE;oBACH,MAAM,KAAK,GAAa,EAAE,CAAC;oBAC3B,aAAa,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,CAAC,EAAE,EAAE;wBAC1C,IAAI,MAAM,KAAK,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;4BAC3C,KAAK,CAAC,IAAI,CACR,iCACE,gBAAgB,CAAC,CAAC,CACpB,SAAS,OAAO,CACd,CAAC,GAAG,CAAC,CACN,0CAA0C,cAAc,CACvD,CAAC,CACF,CAAC,QAAQ,EAAE,kBAAkB,CAC/B,CAAC;wBACJ,CAAC;oBACH,CAAC,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;YACjC,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC;YACrD,YAAY,CAAC,QAAQ,CAAC;SACvB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACrD,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,GAAQ,EACR,QAAqC,EACrC,cAA2D;IAE3D,IAAI,CAAC;QACH,IACE,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;YAC7B,QAAQ,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,EACzC,CAAC;YACD,MAAM,IAAI,YAAY,CACpB,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,8CAA8C,EACxF;gBACE,QAAQ,EAAE,QAAQ,CAAC,MAAM;gBACzB,cAAc,EAAE,cAAc,CAAC,MAAM;aACtC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,uEAAuE;QACvE,oCAAoC;QACpC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAqB,EACrB,WAA+D,EAC/D,QAAqC,EACrC,OAA8B;IAE9B,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC;IAErC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IAC1C,eAAe,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC;IAE5C,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC;IAE9E,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAE9D,OAAO,aAAa,CAAC,GAAG,CACtB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAC9D,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,QAAqC,EACrC,UAA+B,EAC/B,OAA8B;IAE9B,OAAO,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QAC7B,IACE,OAAO,EAAE,UAAU,KAAK,IAAI;YAC5B,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,UAAU,CAAC,IAAI,EACjD,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;YAC1C,eAAe,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC;YAC3D,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;YAClC,MAAM,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC;YAEjC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import type { HardhatEthers } from "@nomicfoundation/hardhat-ethers/types";
|
|
1
2
|
import type { Addressable, BaseContract, BaseContractMethod, BigNumberish, ContractTransactionResponse } from "ethers";
|
|
2
3
|
import type { TransactionResponse } from "ethers/providers";
|
|
3
|
-
import type { EthereumProvider } from "hardhat/types/providers";
|
|
4
4
|
export type Token = BaseContract & {
|
|
5
5
|
balanceOf: BaseContractMethod<[string], bigint, bigint>;
|
|
6
6
|
name: BaseContractMethod<[], string, string>;
|
|
@@ -11,6 +11,6 @@ export type Token = BaseContract & {
|
|
|
11
11
|
symbol: BaseContractMethod<[], string, string>;
|
|
12
12
|
};
|
|
13
13
|
export declare function supportChangeTokenBalance(Assertion: Chai.AssertionStatic, chaiUtils: Chai.ChaiUtils): void;
|
|
14
|
-
export declare function getBalanceChange(
|
|
14
|
+
export declare function getBalanceChange(ethers: HardhatEthers, transaction: TransactionResponse | Promise<TransactionResponse>, token: Token, account: Addressable | string): Promise<bigint>;
|
|
15
15
|
export declare function clearTokenDescriptionsCache(): void;
|
|
16
16
|
//# sourceMappingURL=changeTokenBalance.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeTokenBalance.d.ts","sourceRoot":"","sources":["../../../../src/internal/matchers/changeTokenBalance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,2BAA2B,EAC5B,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"changeTokenBalance.d.ts","sourceRoot":"","sources":["../../../../src/internal/matchers/changeTokenBalance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,2BAA2B,EAC5B,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAkB5D,MAAM,MAAM,KAAK,GAAG,YAAY,GAAG;IACjC,SAAS,EAAE,kBAAkB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,IAAI,EAAE,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,QAAQ,EAAE,kBAAkB,CAC1B;QAAC,MAAM;QAAE,YAAY;KAAC,EACtB,OAAO,EACP,2BAA2B,CAC5B,CAAC;IACF,MAAM,EAAE,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,IAAI,CAAC,eAAe,EAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,GACxB,IAAI,CAyIN;AAqDD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,EAC/D,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,GAAG,MAAM,GAC5B,OAAO,CAAC,MAAM,CAAC,CA2BjB;AA2BD,wBAAgB,2BAA2B,IAAI,IAAI,CAElD"}
|
|
@@ -7,7 +7,7 @@ import { assertIsNotNull } from "../utils/asserts.js";
|
|
|
7
7
|
import { buildAssert } from "../utils/build-assert.js";
|
|
8
8
|
import { preventAsyncMatcherChaining } from "../utils/prevent-chaining.js";
|
|
9
9
|
export function supportChangeTokenBalance(Assertion, chaiUtils) {
|
|
10
|
-
Assertion.addMethod(CHANGE_TOKEN_BALANCE_MATCHER, function (
|
|
10
|
+
Assertion.addMethod(CHANGE_TOKEN_BALANCE_MATCHER, function (ethers, token, account, balanceChange) {
|
|
11
11
|
// capture negated flag before async code executes; see buildAssert's jsdoc
|
|
12
12
|
const negated = this.__flags.negate;
|
|
13
13
|
let subject = this._obj;
|
|
@@ -26,7 +26,7 @@ export function supportChangeTokenBalance(Assertion, chaiUtils) {
|
|
|
26
26
|
}
|
|
27
27
|
};
|
|
28
28
|
const derivedPromise = Promise.all([
|
|
29
|
-
getBalanceChange(
|
|
29
|
+
getBalanceChange(ethers, subject, token, account),
|
|
30
30
|
getAddressOf(account),
|
|
31
31
|
getTokenDescription(token),
|
|
32
32
|
]).then(checkBalanceChange);
|
|
@@ -34,7 +34,7 @@ export function supportChangeTokenBalance(Assertion, chaiUtils) {
|
|
|
34
34
|
this.catch = derivedPromise.catch.bind(derivedPromise);
|
|
35
35
|
return this;
|
|
36
36
|
});
|
|
37
|
-
Assertion.addMethod(CHANGE_TOKEN_BALANCES_MATCHER, function (
|
|
37
|
+
Assertion.addMethod(CHANGE_TOKEN_BALANCES_MATCHER, function (ethers, token, accounts, balanceChanges) {
|
|
38
38
|
// capture negated flag before async code executes; see buildAssert's jsdoc
|
|
39
39
|
const negated = this.__flags.negate;
|
|
40
40
|
let subject = this._obj;
|
|
@@ -43,7 +43,7 @@ export function supportChangeTokenBalance(Assertion, chaiUtils) {
|
|
|
43
43
|
}
|
|
44
44
|
preventAsyncMatcherChaining(this, CHANGE_TOKEN_BALANCES_MATCHER, chaiUtils);
|
|
45
45
|
validateInput(this._obj, token, accounts, balanceChanges);
|
|
46
|
-
const balanceChangesPromise = Promise.all(accounts.map((account) => getBalanceChange(
|
|
46
|
+
const balanceChangesPromise = Promise.all(accounts.map((account) => getBalanceChange(ethers, subject, token, account)));
|
|
47
47
|
const addressesPromise = Promise.all(accounts.map(getAddressOf));
|
|
48
48
|
const checkBalanceChanges = ([actualChanges, addresses, tokenDescription,]) => {
|
|
49
49
|
const assert = buildAssert(negated, checkBalanceChanges);
|
|
@@ -69,7 +69,7 @@ function validateInput(obj, token, accounts, balanceChanges) {
|
|
|
69
69
|
checkToken(token, CHANGE_TOKEN_BALANCES_MATCHER);
|
|
70
70
|
if (Array.isArray(balanceChanges) &&
|
|
71
71
|
accounts.length !== balanceChanges.length) {
|
|
72
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.ACCOUNTS_NUMBER_DIFFERENT_FROM_BALANCE_CHANGES, {
|
|
72
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.ACCOUNTS_NUMBER_DIFFERENT_FROM_BALANCE_CHANGES, {
|
|
73
73
|
accounts: accounts.length,
|
|
74
74
|
balanceChanges: balanceChanges.length,
|
|
75
75
|
});
|
|
@@ -84,7 +84,7 @@ function validateInput(obj, token, accounts, balanceChanges) {
|
|
|
84
84
|
}
|
|
85
85
|
function checkToken(token, method) {
|
|
86
86
|
if (!isObject(token) || token === null || !("interface" in token)) {
|
|
87
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.FIRST_ARGUMENT_MUST_BE_A_CONTRACT_INSTANCE, {
|
|
87
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.FIRST_ARGUMENT_MUST_BE_A_CONTRACT_INSTANCE, {
|
|
88
88
|
method,
|
|
89
89
|
});
|
|
90
90
|
}
|
|
@@ -94,21 +94,17 @@ function checkToken(token, method) {
|
|
|
94
94
|
"getFunction" in token.interface &&
|
|
95
95
|
typeof token.interface.getFunction === "function" &&
|
|
96
96
|
token.interface.getFunction("balanceOf") === null) {
|
|
97
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.CONTRACT_IS_NOT_AN_ERC20_TOKEN);
|
|
97
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.CONTRACT_IS_NOT_AN_ERC20_TOKEN);
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
|
-
export async function getBalanceChange(
|
|
100
|
+
export async function getBalanceChange(ethers, transaction, token, account) {
|
|
101
101
|
const txResponse = await transaction;
|
|
102
102
|
const txReceipt = await txResponse.wait();
|
|
103
103
|
assertIsNotNull(txReceipt, "txReceipt");
|
|
104
104
|
const txBlockNumber = txReceipt.blockNumber;
|
|
105
|
-
const block = await provider.
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
});
|
|
109
|
-
assertHardhatInvariant(isObject(block) &&
|
|
110
|
-
Array.isArray(block.transactions) &&
|
|
111
|
-
block.transactions.length === 1, "There should be only 1 transaction in the block");
|
|
105
|
+
const block = await ethers.provider.getBlock(txReceipt.blockHash, false);
|
|
106
|
+
assertHardhatInvariant(block !== null, "The block doesn't exist");
|
|
107
|
+
assertHardhatInvariant(Array.isArray(block.transactions) && block.transactions.length === 1, "There should be only 1 transaction in the block");
|
|
112
108
|
const address = await getAddressOf(account);
|
|
113
109
|
const balanceAfter = await token.balanceOf(address, {
|
|
114
110
|
blockTag: txBlockNumber,
|
|
@@ -131,11 +127,11 @@ async function getTokenDescription(token) {
|
|
|
131
127
|
try {
|
|
132
128
|
tokenDescription = await token.symbol();
|
|
133
129
|
}
|
|
134
|
-
catch (
|
|
130
|
+
catch (_error) {
|
|
135
131
|
try {
|
|
136
132
|
tokenDescription = await token.name();
|
|
137
133
|
}
|
|
138
|
-
catch (
|
|
134
|
+
catch (_error2) { }
|
|
139
135
|
}
|
|
140
136
|
tokenDescriptionsCache[tokenAddress] = tokenDescription;
|
|
141
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changeTokenBalance.js","sourceRoot":"","sources":["../../../../src/internal/matchers/changeTokenBalance.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,sBAAsB,EACtB,YAAY,GACb,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EACL,6BAA6B,EAC7B,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAa3E,MAAM,UAAU,yBAAyB,CACvC,SAA+B,EAC/B,SAAyB;IAEzB,SAAS,CAAC,SAAS,CACjB,4BAA4B,EAC5B,UAEE,
|
|
1
|
+
{"version":3,"file":"changeTokenBalance.js","sourceRoot":"","sources":["../../../../src/internal/matchers/changeTokenBalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ async function waitForPendingTransaction(tx, provider) {
|
|
|
18
18
|
({ hash } = tx);
|
|
19
19
|
}
|
|
20
20
|
if (hash === null) {
|
|
21
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.INVALID_TRANSACTION, { transaction: JSON.stringify(tx) });
|
|
21
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.INVALID_TRANSACTION, { transaction: JSON.stringify(tx) });
|
|
22
22
|
}
|
|
23
23
|
return provider.getTransactionReceipt(hash);
|
|
24
24
|
}
|
|
@@ -54,10 +54,10 @@ export function supportEmit(Assertion, chaiUtils) {
|
|
|
54
54
|
const topic = eventFragment.topicHash;
|
|
55
55
|
const contractAddress = contract.target;
|
|
56
56
|
if (typeof contractAddress !== "string") {
|
|
57
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.CONTRACT_TARGET_MUST_BE_A_STRING);
|
|
57
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.CONTRACT_TARGET_MUST_BE_A_STRING);
|
|
58
58
|
}
|
|
59
59
|
if (args.length > 0) {
|
|
60
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.EMIT_EXPECTS_TWO_ARGUMENTS);
|
|
60
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.EMIT_EXPECTS_TWO_ARGUMENTS);
|
|
61
61
|
}
|
|
62
62
|
this.logs = receipt.logs
|
|
63
63
|
.filter((log) => log.topics.includes(topic))
|
|
@@ -73,7 +73,7 @@ export function supportEmit(Assertion, chaiUtils) {
|
|
|
73
73
|
return;
|
|
74
74
|
}
|
|
75
75
|
if (contract.runner === null || contract.runner.provider === null) {
|
|
76
|
-
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.CONTRACT_RUNNER_PROVIDER_NOT_NULL);
|
|
76
|
+
throw new HardhatError(HardhatError.ERRORS.CHAI_MATCHERS.GENERAL.CONTRACT_RUNNER_PROVIDER_NOT_NULL);
|
|
77
77
|
}
|
|
78
78
|
return waitForPendingTransaction(tx, contract.runner.provider).then((receipt) => {
|
|
79
79
|
assertIsNotNull(receipt, "receipt");
|