hardhat 2.8.4 → 2.9.0
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/LICENSE +3 -61
- package/README.md +1 -1
- package/builtin-tasks/compile.js +86 -51
- package/builtin-tasks/compile.js.map +1 -1
- package/builtin-tasks/node.js.map +1 -1
- package/builtin-tasks/test.js +30 -5
- package/builtin-tasks/test.js.map +1 -1
- package/builtin-tasks/utils/solidity-files-cache.d.ts.map +1 -1
- package/builtin-tasks/utils/solidity-files-cache.js.map +1 -1
- package/internal/cli/analytics.js +2 -2
- package/internal/cli/analytics.js.map +1 -1
- package/internal/cli/cli.js +3 -3
- package/internal/cli/project-creation.d.ts.map +1 -1
- package/internal/cli/project-creation.js +23 -0
- package/internal/cli/project-creation.js.map +1 -1
- package/internal/core/config/config-loading.d.ts.map +1 -1
- package/internal/core/config/config-loading.js.map +1 -1
- package/internal/core/config/config-validation.d.ts.map +1 -1
- package/internal/core/config/config-validation.js +2 -2
- package/internal/core/config/config-validation.js.map +1 -1
- package/internal/core/config/default-config.d.ts +2 -0
- package/internal/core/config/default-config.d.ts.map +1 -1
- package/internal/core/config/default-config.js +1 -0
- package/internal/core/config/default-config.js.map +1 -1
- package/internal/core/errors-list.d.ts +7 -0
- package/internal/core/errors-list.d.ts.map +1 -1
- package/internal/core/errors-list.js +13 -0
- package/internal/core/errors-list.js.map +1 -1
- package/internal/core/providers/accounts.d.ts +1 -1
- package/internal/core/providers/accounts.d.ts.map +1 -1
- package/internal/core/providers/accounts.js +2 -2
- package/internal/core/providers/accounts.js.map +1 -1
- package/internal/core/providers/construction.d.ts.map +1 -1
- package/internal/core/providers/construction.js +1 -1
- package/internal/core/providers/construction.js.map +1 -1
- package/internal/core/providers/http.d.ts +5 -1
- package/internal/core/providers/http.d.ts.map +1 -1
- package/internal/core/providers/http.js +35 -31
- package/internal/core/providers/http.js.map +1 -1
- package/internal/core/providers/util.d.ts +1 -1
- package/internal/core/providers/util.d.ts.map +1 -1
- package/internal/core/providers/util.js +3 -3
- package/internal/core/providers/util.js.map +1 -1
- package/internal/hardhat-network/jsonrpc/server.d.ts.map +1 -1
- package/internal/hardhat-network/jsonrpc/server.js +7 -2
- package/internal/hardhat-network/jsonrpc/server.js.map +1 -1
- package/internal/hardhat-network/provider/BlockchainBase.d.ts +26 -0
- package/internal/hardhat-network/provider/BlockchainBase.d.ts.map +1 -0
- package/internal/hardhat-network/provider/BlockchainBase.js +92 -0
- package/internal/hardhat-network/provider/BlockchainBase.js.map +1 -0
- package/internal/hardhat-network/provider/BlockchainData.d.ts +32 -0
- package/internal/hardhat-network/provider/BlockchainData.d.ts.map +1 -1
- package/internal/hardhat-network/provider/BlockchainData.js +78 -1
- package/internal/hardhat-network/provider/BlockchainData.js.map +1 -1
- package/internal/hardhat-network/provider/HardhatBlockchain.d.ts +9 -15
- package/internal/hardhat-network/provider/HardhatBlockchain.d.ts.map +1 -1
- package/internal/hardhat-network/provider/HardhatBlockchain.js +15 -73
- package/internal/hardhat-network/provider/HardhatBlockchain.js.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkBlockchain.d.ts +6 -14
- package/internal/hardhat-network/provider/fork/ForkBlockchain.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkBlockchain.js +23 -73
- package/internal/hardhat-network/provider/fork/ForkBlockchain.js.map +1 -1
- package/internal/hardhat-network/provider/modules/eth.js +2 -2
- package/internal/hardhat-network/provider/modules/eth.js.map +1 -1
- package/internal/hardhat-network/provider/modules/hardhat.d.ts +3 -0
- package/internal/hardhat-network/provider/modules/hardhat.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/hardhat.js +40 -5
- package/internal/hardhat-network/provider/modules/hardhat.js.map +1 -1
- package/internal/hardhat-network/provider/modules/logger.d.ts +4 -2
- package/internal/hardhat-network/provider/modules/logger.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/logger.js +38 -12
- package/internal/hardhat-network/provider/modules/logger.js.map +1 -1
- package/internal/hardhat-network/provider/node-types.d.ts +1 -1
- package/internal/hardhat-network/provider/node-types.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.d.ts +9 -1
- package/internal/hardhat-network/provider/node.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.js +57 -8
- package/internal/hardhat-network/provider/node.js.map +1 -1
- package/internal/hardhat-network/provider/provider.d.ts +1 -1
- package/internal/hardhat-network/provider/provider.d.ts.map +1 -1
- package/internal/hardhat-network/provider/provider.js.map +1 -1
- package/internal/hardhat-network/provider/types/HardhatBlockchainInterface.d.ts +2 -1
- package/internal/hardhat-network/provider/types/HardhatBlockchainInterface.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/makeForkClient.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/makeForkClient.js +2 -1
- package/internal/hardhat-network/provider/utils/makeForkClient.js.map +1 -1
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js +1 -1
- package/internal/hardhat-network/stack-traces/debug.js +1 -1
- package/internal/hardhat-network/stack-traces/debug.js.map +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.js +21 -12
- package/internal/hardhat-network/stack-traces/error-inferrer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.js +2 -2
- package/internal/hardhat-network/stack-traces/solidity-errors.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.d.ts +3 -2
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.d.ts.map +1 -1
- package/internal/solidity/compilation-job.d.ts.map +1 -1
- package/internal/solidity/compilation-job.js.map +1 -1
- package/internal/solidity/compiler/downloader.d.ts +2 -2
- package/internal/solidity/compiler/downloader.d.ts.map +1 -1
- package/internal/solidity/compiler/downloader.js +3 -3
- package/internal/solidity/compiler/downloader.js.map +1 -1
- package/internal/util/download.d.ts.map +1 -1
- package/internal/util/download.js +22 -24
- package/internal/util/download.js.map +1 -1
- package/internal/util/glob.d.ts.map +1 -1
- package/internal/util/glob.js.map +1 -1
- package/internal/util/global-dir.d.ts.map +1 -1
- package/internal/util/global-dir.js.map +1 -1
- package/internal/util/keys-derivation.d.ts +1 -1
- package/internal/util/keys-derivation.d.ts.map +1 -1
- package/internal/util/keys-derivation.js +2 -2
- package/internal/util/keys-derivation.js.map +1 -1
- package/package.json +10 -10
- package/sample-projects/advanced-ts/README.md +1 -1
- package/src/builtin-tasks/compile.ts +94 -76
- package/src/builtin-tasks/node.ts +2 -1
- package/src/builtin-tasks/test.ts +69 -11
- package/src/builtin-tasks/utils/solidity-files-cache.ts +3 -2
- package/src/internal/cli/analytics.ts +2 -2
- package/src/internal/cli/cli.ts +3 -3
- package/src/internal/cli/project-creation.ts +40 -0
- package/src/internal/core/config/config-loading.ts +2 -1
- package/src/internal/core/config/config-validation.ts +2 -0
- package/src/internal/core/config/default-config.ts +1 -0
- package/src/internal/core/errors-list.ts +13 -0
- package/src/internal/core/providers/accounts.ts +4 -2
- package/src/internal/core/providers/construction.ts +3 -1
- package/src/internal/core/providers/http.ts +47 -16
- package/src/internal/core/providers/util.ts +6 -3
- package/src/internal/hardhat-network/jsonrpc/server.ts +16 -3
- package/src/internal/hardhat-network/provider/BlockchainBase.ts +137 -0
- package/src/internal/hardhat-network/provider/BlockchainData.ts +144 -0
- package/src/internal/hardhat-network/provider/HardhatBlockchain.ts +34 -87
- package/src/internal/hardhat-network/provider/fork/ForkBlockchain.ts +45 -90
- package/src/internal/hardhat-network/provider/modules/eth.ts +2 -2
- package/src/internal/hardhat-network/provider/modules/hardhat.ts +51 -5
- package/src/internal/hardhat-network/provider/modules/logger.ts +50 -14
- package/src/internal/hardhat-network/provider/node-types.ts +2 -2
- package/src/internal/hardhat-network/provider/node.ts +81 -8
- package/src/internal/hardhat-network/provider/provider.ts +9 -8
- package/src/internal/hardhat-network/provider/types/HardhatBlockchainInterface.ts +7 -1
- package/src/internal/hardhat-network/provider/utils/makeForkClient.ts +2 -1
- package/src/internal/hardhat-network/provider/utils/putGenesisBlock.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/debug.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/error-inferrer.ts +21 -13
- package/src/internal/hardhat-network/stack-traces/solidity-errors.ts +2 -2
- package/src/internal/hardhat-network/stack-traces/solidity-stack-trace.ts +3 -2
- package/src/internal/solidity/compilation-job.ts +2 -1
- package/src/internal/solidity/compiler/downloader.ts +5 -3
- package/src/internal/util/download.ts +26 -31
- package/src/internal/util/glob.ts +1 -0
- package/src/internal/util/global-dir.ts +2 -1
- package/src/internal/util/keys-derivation.ts +3 -2
- package/src/types/config.ts +4 -0
- package/types/config.d.ts +4 -0
- package/types/config.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HardhatBlockchain.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/HardhatBlockchain.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAS,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"HardhatBlockchain.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/HardhatBlockchain.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAS,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAIhF,qBAAa,iBACX,SAAQ,cACR,YAAW,0BAA0B;IAErC,OAAO,CAAC,OAAO,CAAK;gBAER,MAAM,EAAE,MAAM;IAInB,oBAAoB,IAAI,EAAE;IAIpB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAQ5C,aAAa,CAClB,KAAK,EAAE,EAAE,EACT,QAAQ,EAAE,EAAE,EACZ,sBAAsB,EAAE,MAAM,EAC9B,4BAA4B,EAAE,EAAE;IAW3B,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAS/B,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;IAQlD,cAAc,CACzB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAI3B,yBAAyB,CACpC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAKX,qBAAqB,CAAC,eAAe,EAAE,MAAM;IAI7C,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAIzE,OAAO,CAAC,cAAc;IAqBtB,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,GAAG,IAAI;CAI3C"}
|
|
@@ -2,59 +2,33 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HardhatBlockchain = void 0;
|
|
4
4
|
const ethereumjs_util_1 = require("ethereumjs-util");
|
|
5
|
-
const
|
|
5
|
+
const BlockchainBase_1 = require("./BlockchainBase");
|
|
6
6
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
7
|
-
class HardhatBlockchain {
|
|
8
|
-
constructor() {
|
|
9
|
-
|
|
7
|
+
class HardhatBlockchain extends BlockchainBase_1.BlockchainBase {
|
|
8
|
+
constructor(common) {
|
|
9
|
+
super(common);
|
|
10
10
|
this._length = 0;
|
|
11
11
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
if (block === undefined) {
|
|
15
|
-
throw new Error("No block available");
|
|
16
|
-
}
|
|
17
|
-
return block;
|
|
18
|
-
}
|
|
19
|
-
async getBlock(blockHashOrNumber) {
|
|
20
|
-
var _a, _b, _c;
|
|
21
|
-
if (typeof blockHashOrNumber === "number") {
|
|
22
|
-
return (_a = this._data.getBlockByNumber(new ethereumjs_util_1.BN(blockHashOrNumber))) !== null && _a !== void 0 ? _a : null;
|
|
23
|
-
}
|
|
24
|
-
if (ethereumjs_util_1.BN.isBN(blockHashOrNumber)) {
|
|
25
|
-
return (_b = this._data.getBlockByNumber(blockHashOrNumber)) !== null && _b !== void 0 ? _b : null;
|
|
26
|
-
}
|
|
27
|
-
return (_c = this._data.getBlockByHash(blockHashOrNumber)) !== null && _c !== void 0 ? _c : null;
|
|
12
|
+
getLatestBlockNumber() {
|
|
13
|
+
return new ethereumjs_util_1.BN(this._length - 1);
|
|
28
14
|
}
|
|
29
15
|
async addBlock(block) {
|
|
30
16
|
this._validateBlock(block);
|
|
31
|
-
const totalDifficulty = this._computeTotalDifficulty(block);
|
|
17
|
+
const totalDifficulty = await this._computeTotalDifficulty(block);
|
|
32
18
|
this._data.addBlock(block, totalDifficulty);
|
|
33
19
|
this._length += 1;
|
|
34
20
|
return block;
|
|
35
21
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
deleteBlock(blockHash) {
|
|
40
|
-
const block = this._data.getBlockByHash(blockHash);
|
|
41
|
-
if (block === undefined) {
|
|
42
|
-
throw new Error("Block not found");
|
|
43
|
-
}
|
|
44
|
-
this._delBlock(block);
|
|
45
|
-
}
|
|
46
|
-
async delBlock(blockHash) {
|
|
47
|
-
this.deleteBlock(blockHash);
|
|
22
|
+
reserveBlocks(count, interval, previousBlockStateRoot, previousBlockTotalDifficulty) {
|
|
23
|
+
super.reserveBlocks(count, interval, previousBlockStateRoot, previousBlockTotalDifficulty);
|
|
24
|
+
this._length = this._length + count.toNumber();
|
|
48
25
|
}
|
|
49
26
|
deleteLaterBlocks(block) {
|
|
50
27
|
const actual = this._data.getBlockByHash(block.hash());
|
|
51
28
|
if (actual === undefined) {
|
|
52
29
|
throw new Error("Invalid block");
|
|
53
30
|
}
|
|
54
|
-
|
|
55
|
-
if (nextBlock !== undefined) {
|
|
56
|
-
this._delBlock(nextBlock);
|
|
57
|
-
}
|
|
31
|
+
this._delBlock(actual.header.number.addn(1));
|
|
58
32
|
}
|
|
59
33
|
async getTotalDifficulty(blockHash) {
|
|
60
34
|
const totalDifficulty = this._data.getTotalDifficulty(blockHash);
|
|
@@ -66,9 +40,6 @@ class HardhatBlockchain {
|
|
|
66
40
|
async getTransaction(transactionHash) {
|
|
67
41
|
return this.getLocalTransaction(transactionHash);
|
|
68
42
|
}
|
|
69
|
-
getLocalTransaction(transactionHash) {
|
|
70
|
-
return this._data.getTransaction(transactionHash);
|
|
71
|
-
}
|
|
72
43
|
async getBlockByTransactionHash(transactionHash) {
|
|
73
44
|
const block = this._data.getBlockByTransactionHash(transactionHash);
|
|
74
45
|
return block !== null && block !== void 0 ? block : null;
|
|
@@ -77,27 +48,15 @@ class HardhatBlockchain {
|
|
|
77
48
|
var _a;
|
|
78
49
|
return (_a = this._data.getTransactionReceipt(transactionHash)) !== null && _a !== void 0 ? _a : null;
|
|
79
50
|
}
|
|
80
|
-
addTransactionReceipts(receipts) {
|
|
81
|
-
for (const receipt of receipts) {
|
|
82
|
-
this._data.addTransactionReceipt(receipt);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
51
|
async getLogs(filterParams) {
|
|
86
52
|
return this._data.getLogs(filterParams);
|
|
87
53
|
}
|
|
88
|
-
iterator(_name, _onBlock) {
|
|
89
|
-
throw new Error("Method not implemented.");
|
|
90
|
-
}
|
|
91
|
-
async getBaseFee() {
|
|
92
|
-
const latestBlock = await this.getLatestBlock();
|
|
93
|
-
return latestBlock.header.calcNextBaseFee();
|
|
94
|
-
}
|
|
95
54
|
_validateBlock(block) {
|
|
96
55
|
const blockNumber = block.header.number.toNumber();
|
|
97
56
|
const parentHash = block.header.parentHash;
|
|
98
57
|
const parent = this._data.getBlockByNumber(new ethereumjs_util_1.BN(blockNumber - 1));
|
|
99
58
|
if (this._length !== blockNumber) {
|
|
100
|
-
throw new Error(
|
|
59
|
+
throw new Error(`Invalid block number ${blockNumber}. Expected ${this._length}.`);
|
|
101
60
|
}
|
|
102
61
|
if ((blockNumber === 0 && !parentHash.equals((0, ethereumjs_util_1.zeros)(32))) ||
|
|
103
62
|
(blockNumber > 0 &&
|
|
@@ -106,26 +65,9 @@ class HardhatBlockchain {
|
|
|
106
65
|
throw new Error("Invalid parent hash");
|
|
107
66
|
}
|
|
108
67
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
return difficulty;
|
|
113
|
-
}
|
|
114
|
-
const parentTD = this._data.getTotalDifficulty(block.header.parentHash);
|
|
115
|
-
if (parentTD === undefined) {
|
|
116
|
-
throw new Error("This should never happen");
|
|
117
|
-
}
|
|
118
|
-
return parentTD.add(difficulty);
|
|
119
|
-
}
|
|
120
|
-
_delBlock(block) {
|
|
121
|
-
const blockNumber = block.header.number.toNumber();
|
|
122
|
-
for (let i = blockNumber; i < this._length; i++) {
|
|
123
|
-
const current = this._data.getBlockByNumber(new ethereumjs_util_1.BN(i));
|
|
124
|
-
if (current !== undefined) {
|
|
125
|
-
this._data.removeBlock(current);
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
this._length = blockNumber;
|
|
68
|
+
_delBlock(blockNumber) {
|
|
69
|
+
super._delBlock(blockNumber);
|
|
70
|
+
this._length = blockNumber.toNumber();
|
|
129
71
|
}
|
|
130
72
|
}
|
|
131
73
|
exports.HardhatBlockchain = HardhatBlockchain;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HardhatBlockchain.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/HardhatBlockchain.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"HardhatBlockchain.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/HardhatBlockchain.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,38 +4,30 @@ import Common from "@ethereumjs/common";
|
|
|
4
4
|
import { TypedTransaction } from "@ethereumjs/tx";
|
|
5
5
|
import { BN } from "ethereumjs-util";
|
|
6
6
|
import { JsonRpcClient } from "../../jsonrpc/client";
|
|
7
|
+
import { BlockchainBase } from "../BlockchainBase";
|
|
7
8
|
import { FilterParams } from "../node-types";
|
|
8
9
|
import { RpcLogOutput, RpcReceiptOutput } from "../output";
|
|
9
10
|
import { HardhatBlockchainInterface } from "../types/HardhatBlockchainInterface";
|
|
10
|
-
export declare class ForkBlockchain implements HardhatBlockchainInterface {
|
|
11
|
+
export declare class ForkBlockchain extends BlockchainBase implements HardhatBlockchainInterface {
|
|
11
12
|
private _jsonRpcClient;
|
|
12
13
|
private _forkBlockNumber;
|
|
13
|
-
private _common;
|
|
14
|
-
private _data;
|
|
15
14
|
private _latestBlockNumber;
|
|
16
|
-
constructor(_jsonRpcClient: JsonRpcClient, _forkBlockNumber: BN,
|
|
17
|
-
|
|
15
|
+
constructor(_jsonRpcClient: JsonRpcClient, _forkBlockNumber: BN, common: Common);
|
|
16
|
+
getLatestBlockNumber(): BN;
|
|
18
17
|
getBlock(blockHashOrNumber: Buffer | number | BN): Promise<Block | null>;
|
|
19
18
|
addBlock(block: Block): Promise<Block>;
|
|
20
|
-
|
|
21
|
-
deleteBlock(blockHash: Buffer): void;
|
|
22
|
-
delBlock(blockHash: Buffer): Promise<void>;
|
|
19
|
+
reserveBlocks(count: BN, interval: BN, previousBlockStateRoot: Buffer, previousBlockTotalDifficulty: BN): void;
|
|
23
20
|
deleteLaterBlocks(block: Block): void;
|
|
24
21
|
getTotalDifficulty(blockHash: Buffer): Promise<BN>;
|
|
25
22
|
getTransaction(transactionHash: Buffer): Promise<TypedTransaction | undefined>;
|
|
26
|
-
getLocalTransaction(transactionHash: Buffer): TypedTransaction | undefined;
|
|
27
23
|
getBlockByTransactionHash(transactionHash: Buffer): Promise<Block | null>;
|
|
28
24
|
getTransactionReceipt(transactionHash: Buffer): Promise<RpcReceiptOutput | null>;
|
|
29
|
-
addTransactionReceipts(receipts: RpcReceiptOutput[]): void;
|
|
30
25
|
getForkBlockNumber(): BN;
|
|
31
26
|
getLogs(filterParams: FilterParams): Promise<RpcLogOutput[]>;
|
|
32
|
-
iterator(_name: string, _onBlock: (block: Block, reorg: boolean) => void | Promise<void>): Promise<number | void>;
|
|
33
|
-
getBaseFee(): Promise<BN>;
|
|
34
27
|
private _getBlockByHash;
|
|
35
28
|
private _getBlockByNumber;
|
|
36
29
|
private _processRemoteBlock;
|
|
37
|
-
|
|
38
|
-
private _delBlock;
|
|
30
|
+
protected _delBlock(blockNumber: BN): void;
|
|
39
31
|
private _processRemoteTransaction;
|
|
40
32
|
private _processRemoteReceipt;
|
|
41
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForkBlockchain.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkBlockchain.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAW,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAO9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"ForkBlockchain.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkBlockchain.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAW,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAO9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAEL,YAAY,EACZ,gBAAgB,EAIjB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAQjF,qBAAa,cACX,SAAQ,cACR,YAAW,0BAA0B;IAKnC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,gBAAgB;IAJ1B,OAAO,CAAC,kBAAkB,CAAyB;gBAGzC,cAAc,EAAE,aAAa,EAC7B,gBAAgB,EAAE,EAAE,EAC5B,MAAM,EAAE,MAAM;IAKT,oBAAoB,IAAI,EAAE;IAIpB,QAAQ,CACnB,iBAAiB,EAAE,MAAM,GAAG,MAAM,GAAG,EAAE,GACtC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAkBX,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA0B5C,aAAa,CAClB,KAAK,EAAE,EAAE,EACT,QAAQ,EAAE,EAAE,EACZ,sBAAsB,EAAE,MAAM,EAC9B,4BAA4B,EAAE,EAAE;IAW3B,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAe/B,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;IAgBlD,cAAc,CACzB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAW3B,yBAAyB,CACpC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAeX,qBAAqB,CAChC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAgB5B,kBAAkB;IAIZ,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YAyB3D,eAAe;YASf,iBAAiB;YAejB,mBAAmB;IA+DjC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,GAAG,IAAI;IAQ1C,OAAO,CAAC,yBAAyB;YAmBnB,qBAAqB;CAmBpC"}
|
|
@@ -4,7 +4,7 @@ exports.ForkBlockchain = void 0;
|
|
|
4
4
|
const block_1 = require("@ethereumjs/block");
|
|
5
5
|
const ethereumjs_util_1 = require("ethereumjs-util");
|
|
6
6
|
const errors_1 = require("../../../core/providers/errors");
|
|
7
|
-
const
|
|
7
|
+
const BlockchainBase_1 = require("../BlockchainBase");
|
|
8
8
|
const output_1 = require("../output");
|
|
9
9
|
const ReadOnlyValidEIP2930Transaction_1 = require("../transactions/ReadOnlyValidEIP2930Transaction");
|
|
10
10
|
const ReadOnlyValidTransaction_1 = require("../transactions/ReadOnlyValidTransaction");
|
|
@@ -12,22 +12,21 @@ const ReadOnlyValidEIP1559Transaction_1 = require("../transactions/ReadOnlyValid
|
|
|
12
12
|
const rpcToBlockData_1 = require("./rpcToBlockData");
|
|
13
13
|
const rpcToTxData_1 = require("./rpcToTxData");
|
|
14
14
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
15
|
-
class ForkBlockchain {
|
|
16
|
-
constructor(_jsonRpcClient, _forkBlockNumber,
|
|
15
|
+
class ForkBlockchain extends BlockchainBase_1.BlockchainBase {
|
|
16
|
+
constructor(_jsonRpcClient, _forkBlockNumber, common) {
|
|
17
|
+
super(common);
|
|
17
18
|
this._jsonRpcClient = _jsonRpcClient;
|
|
18
19
|
this._forkBlockNumber = _forkBlockNumber;
|
|
19
|
-
this._common = _common;
|
|
20
|
-
this._data = new BlockchainData_1.BlockchainData();
|
|
21
20
|
this._latestBlockNumber = this._forkBlockNumber;
|
|
22
21
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
if (block === null) {
|
|
26
|
-
throw new Error("Block not found");
|
|
27
|
-
}
|
|
28
|
-
return block;
|
|
22
|
+
getLatestBlockNumber() {
|
|
23
|
+
return this._latestBlockNumber;
|
|
29
24
|
}
|
|
30
25
|
async getBlock(blockHashOrNumber) {
|
|
26
|
+
if ((typeof blockHashOrNumber === "number" || ethereumjs_util_1.BN.isBN(blockHashOrNumber)) &&
|
|
27
|
+
this._data.isReservedBlock(new ethereumjs_util_1.BN(blockHashOrNumber))) {
|
|
28
|
+
this._data.fulfillBlockReservation(new ethereumjs_util_1.BN(blockHashOrNumber));
|
|
29
|
+
}
|
|
31
30
|
let block;
|
|
32
31
|
if (Buffer.isBuffer(blockHashOrNumber)) {
|
|
33
32
|
block = await this._getBlockByHash(blockHashOrNumber);
|
|
@@ -39,7 +38,9 @@ class ForkBlockchain {
|
|
|
39
38
|
async addBlock(block) {
|
|
40
39
|
const blockNumber = new ethereumjs_util_1.BN(block.header.number);
|
|
41
40
|
if (!blockNumber.eq(this._latestBlockNumber.addn(1))) {
|
|
42
|
-
throw new Error(
|
|
41
|
+
throw new Error(`Invalid block number ${blockNumber.toNumber()}. Expected ${this._latestBlockNumber
|
|
42
|
+
.addn(1)
|
|
43
|
+
.toNumber()}`);
|
|
43
44
|
}
|
|
44
45
|
// When forking a network whose consensus is not the classic PoW,
|
|
45
46
|
// we can't calculate the hash correctly.
|
|
@@ -55,18 +56,9 @@ class ForkBlockchain {
|
|
|
55
56
|
this._data.addBlock(block, totalDifficulty);
|
|
56
57
|
return block;
|
|
57
58
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
deleteBlock(blockHash) {
|
|
62
|
-
const block = this._data.getBlockByHash(blockHash);
|
|
63
|
-
if (block === undefined) {
|
|
64
|
-
throw new Error("Block not found");
|
|
65
|
-
}
|
|
66
|
-
this._delBlock(block);
|
|
67
|
-
}
|
|
68
|
-
async delBlock(blockHash) {
|
|
69
|
-
this.deleteBlock(blockHash);
|
|
59
|
+
reserveBlocks(count, interval, previousBlockStateRoot, previousBlockTotalDifficulty) {
|
|
60
|
+
super.reserveBlocks(count, interval, previousBlockStateRoot, previousBlockTotalDifficulty);
|
|
61
|
+
this._latestBlockNumber = this._latestBlockNumber.add(count);
|
|
70
62
|
}
|
|
71
63
|
deleteLaterBlocks(block) {
|
|
72
64
|
const blockNumber = new ethereumjs_util_1.BN(block.header.number);
|
|
@@ -78,10 +70,7 @@ class ForkBlockchain {
|
|
|
78
70
|
if (this._forkBlockNumber.gte(nextBlockNumber)) {
|
|
79
71
|
throw new Error("Cannot delete remote block");
|
|
80
72
|
}
|
|
81
|
-
|
|
82
|
-
if (nextBlock !== undefined) {
|
|
83
|
-
return this._delBlock(nextBlock);
|
|
84
|
-
}
|
|
73
|
+
this._delBlock(nextBlockNumber);
|
|
85
74
|
}
|
|
86
75
|
async getTotalDifficulty(blockHash) {
|
|
87
76
|
let td = this._data.getTotalDifficulty(blockHash);
|
|
@@ -106,9 +95,6 @@ class ForkBlockchain {
|
|
|
106
95
|
}
|
|
107
96
|
return tx;
|
|
108
97
|
}
|
|
109
|
-
getLocalTransaction(transactionHash) {
|
|
110
|
-
return this._data.getTransaction(transactionHash);
|
|
111
|
-
}
|
|
112
98
|
async getBlockByTransactionHash(transactionHash) {
|
|
113
99
|
let block = this._data.getBlockByTransactionHash(transactionHash);
|
|
114
100
|
if (block === undefined) {
|
|
@@ -133,11 +119,6 @@ class ForkBlockchain {
|
|
|
133
119
|
}
|
|
134
120
|
return null;
|
|
135
121
|
}
|
|
136
|
-
addTransactionReceipts(receipts) {
|
|
137
|
-
for (const receipt of receipts) {
|
|
138
|
-
this._data.addTransactionReceipt(receipt);
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
122
|
getForkBlockNumber() {
|
|
142
123
|
return this._forkBlockNumber;
|
|
143
124
|
}
|
|
@@ -161,13 +142,6 @@ class ForkBlockchain {
|
|
|
161
142
|
}
|
|
162
143
|
return this._data.getLogs(filterParams);
|
|
163
144
|
}
|
|
164
|
-
iterator(_name, _onBlock) {
|
|
165
|
-
throw new Error("Method not implemented.");
|
|
166
|
-
}
|
|
167
|
-
async getBaseFee() {
|
|
168
|
-
const latestBlock = await this.getLatestBlock();
|
|
169
|
-
return latestBlock.header.calcNextBaseFee();
|
|
170
|
-
}
|
|
171
145
|
async _getBlockByHash(blockHash) {
|
|
172
146
|
const block = this._data.getBlockByHash(blockHash);
|
|
173
147
|
if (block !== undefined) {
|
|
@@ -180,8 +154,8 @@ class ForkBlockchain {
|
|
|
180
154
|
if (blockNumber.gt(this._latestBlockNumber)) {
|
|
181
155
|
return undefined;
|
|
182
156
|
}
|
|
183
|
-
const block =
|
|
184
|
-
if (block !==
|
|
157
|
+
const block = await super.getBlock(blockNumber);
|
|
158
|
+
if (block !== null) {
|
|
185
159
|
return block;
|
|
186
160
|
}
|
|
187
161
|
const rpcBlock = await this._jsonRpcClient.getBlockByNumber(blockNumber, true);
|
|
@@ -232,36 +206,12 @@ class ForkBlockchain {
|
|
|
232
206
|
this._data.addBlock(block, rpcBlock.totalDifficulty);
|
|
233
207
|
return block;
|
|
234
208
|
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
const difficulty = new ethereumjs_util_1.BN(block.header.difficulty);
|
|
238
|
-
const blockNumber = new ethereumjs_util_1.BN(block.header.number);
|
|
239
|
-
if (blockNumber.eqn(0)) {
|
|
240
|
-
return difficulty;
|
|
241
|
-
}
|
|
242
|
-
const parentBlock = (_a = this._data.getBlockByNumber(blockNumber.subn(1))) !== null && _a !== void 0 ? _a : (await this.getBlock(blockNumber.subn(1)));
|
|
243
|
-
if (parentBlock === null) {
|
|
244
|
-
throw new Error("Block not found");
|
|
245
|
-
}
|
|
246
|
-
const parentHash = parentBlock.hash();
|
|
247
|
-
const parentTD = this._data.getTotalDifficulty(parentHash);
|
|
248
|
-
if (parentTD === undefined) {
|
|
249
|
-
throw new Error("This should never happen");
|
|
250
|
-
}
|
|
251
|
-
return parentTD.add(difficulty);
|
|
252
|
-
}
|
|
253
|
-
_delBlock(block) {
|
|
254
|
-
if (new ethereumjs_util_1.BN(block.header.number).lte(this._forkBlockNumber)) {
|
|
209
|
+
_delBlock(blockNumber) {
|
|
210
|
+
if (blockNumber.lte(this._forkBlockNumber)) {
|
|
255
211
|
throw new Error("Cannot delete remote block");
|
|
256
212
|
}
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
const current = this._data.getBlockByNumber(new ethereumjs_util_1.BN(i));
|
|
260
|
-
if (current !== undefined) {
|
|
261
|
-
this._data.removeBlock(current);
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
this._latestBlockNumber = new ethereumjs_util_1.BN(blockNumber).subn(1);
|
|
213
|
+
super._delBlock(blockNumber);
|
|
214
|
+
this._latestBlockNumber = blockNumber.subn(1);
|
|
265
215
|
}
|
|
266
216
|
_processRemoteTransaction(rpcTransaction) {
|
|
267
217
|
if (rpcTransaction === null ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForkBlockchain.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkBlockchain.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ForkBlockchain.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkBlockchain.ts"],"names":[],"mappings":"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"}
|
|
@@ -179,7 +179,7 @@ class EthModule {
|
|
|
179
179
|
return (0, validation_1.validateParams)(params);
|
|
180
180
|
}
|
|
181
181
|
async _blockNumberAction() {
|
|
182
|
-
const blockNumber =
|
|
182
|
+
const blockNumber = this._node.getLatestBlockNumber();
|
|
183
183
|
return (0, base_types_1.numberToRpcQuantity)(blockNumber);
|
|
184
184
|
}
|
|
185
185
|
// eth_call
|
|
@@ -800,7 +800,7 @@ class EthModule {
|
|
|
800
800
|
block = await this._node.getBlockByHash(newBlockTag.blockHash);
|
|
801
801
|
}
|
|
802
802
|
if (block === undefined) {
|
|
803
|
-
const latestBlock =
|
|
803
|
+
const latestBlock = this._node.getLatestBlockNumber();
|
|
804
804
|
throw new errors_1.InvalidInputError(`Received invalid block tag ${this._newBlockTagToString(newBlockTag)}. Latest block number is ${latestBlock.toString()}`);
|
|
805
805
|
}
|
|
806
806
|
return block.header.number;
|