hardhat 2.12.5 → 2.12.7
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/builtin-tasks/compile.js +10 -1
- package/builtin-tasks/compile.js.map +1 -1
- package/builtin-tasks/flatten.js +1 -1
- package/builtin-tasks/flatten.js.map +1 -1
- package/builtin-tasks/help.js +2 -4
- package/builtin-tasks/help.js.map +1 -1
- package/builtin-tasks/task-names.d.ts +1 -0
- package/builtin-tasks/task-names.d.ts.map +1 -1
- package/builtin-tasks/task-names.js +3 -2
- package/builtin-tasks/task-names.js.map +1 -1
- package/internal/cli/cli.js +0 -7
- package/internal/cli/cli.js.map +1 -1
- package/internal/cli/project-creation.d.ts +0 -1
- package/internal/cli/project-creation.d.ts.map +1 -1
- package/internal/cli/project-creation.js +19 -15
- package/internal/cli/project-creation.js.map +1 -1
- package/internal/cli/prompt.d.ts +2 -2
- package/internal/cli/prompt.d.ts.map +1 -1
- package/internal/cli/prompt.js +1 -2
- package/internal/cli/prompt.js.map +1 -1
- package/internal/cli/types.d.ts +1 -0
- package/internal/cli/types.d.ts.map +1 -1
- package/internal/core/config/config-loading.d.ts.map +1 -1
- package/internal/core/config/config-loading.js +1 -0
- package/internal/core/config/config-loading.js.map +1 -1
- package/internal/core/config/config-validation.d.ts +2 -0
- package/internal/core/config/config-validation.d.ts.map +1 -1
- package/internal/core/config/config-validation.js +18 -1
- package/internal/core/config/config-validation.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 +9 -0
- package/internal/core/errors-list.js.map +1 -1
- package/internal/core/providers/construction.d.ts.map +1 -1
- package/internal/core/providers/construction.js +25 -5
- package/internal/core/providers/construction.js.map +1 -1
- package/internal/core/providers/http.d.ts +2 -2
- package/internal/core/providers/http.d.ts.map +1 -1
- package/internal/core/providers/http.js +29 -5
- package/internal/core/providers/http.js.map +1 -1
- package/internal/core/runtime-environment.d.ts +1 -0
- package/internal/core/runtime-environment.d.ts.map +1 -1
- package/internal/core/runtime-environment.js +2 -0
- package/internal/core/runtime-environment.js.map +1 -1
- package/internal/hardhat-network/jsonrpc/handler.d.ts +1 -0
- package/internal/hardhat-network/jsonrpc/handler.d.ts.map +1 -1
- package/internal/hardhat-network/jsonrpc/handler.js +13 -18
- package/internal/hardhat-network/jsonrpc/handler.js.map +1 -1
- package/internal/hardhat-network/provider/modules/evm.d.ts +2 -1
- package/internal/hardhat-network/provider/modules/evm.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/evm.js +10 -4
- package/internal/hardhat-network/provider/modules/evm.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 +1 -0
- package/internal/hardhat-network/provider/node.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.js +6 -4
- package/internal/hardhat-network/provider/node.js.map +1 -1
- package/internal/hardhat-network/provider/provider.d.ts +25 -21
- package/internal/hardhat-network/provider/provider.d.ts.map +1 -1
- package/internal/hardhat-network/provider/provider.js +25 -42
- package/internal/hardhat-network/provider/provider.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js +4 -2
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.js +4 -2
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.js +4 -2
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeFakeSignature.d.ts +7 -0
- package/internal/hardhat-network/provider/utils/makeFakeSignature.d.ts.map +1 -0
- package/internal/hardhat-network/provider/utils/makeFakeSignature.js +31 -0
- package/internal/hardhat-network/provider/utils/makeFakeSignature.js.map +1 -0
- package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts +1 -1
- package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js +2 -2
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js.map +1 -1
- package/internal/solidity/resolver.d.ts +4 -3
- package/internal/solidity/resolver.d.ts.map +1 -1
- package/internal/solidity/resolver.js +18 -7
- package/internal/solidity/resolver.js.map +1 -1
- package/internal/util/download.d.ts.map +1 -1
- package/internal/util/download.js +13 -10
- package/internal/util/download.js.map +1 -1
- package/internal/util/packageInfo.d.ts +1 -1
- package/internal/util/packageInfo.d.ts.map +1 -1
- package/internal/util/packageInfo.js +4 -10
- package/internal/util/packageInfo.js.map +1 -1
- package/internal/util/proxy.d.ts +2 -0
- package/internal/util/proxy.d.ts.map +1 -0
- package/internal/util/proxy.js +19 -0
- package/internal/util/proxy.js.map +1 -0
- package/package.json +3 -4
- package/src/builtin-tasks/compile.ts +16 -1
- package/src/builtin-tasks/flatten.ts +4 -1
- package/src/builtin-tasks/help.ts +15 -16
- package/src/builtin-tasks/task-names.ts +2 -0
- package/src/internal/cli/cli.ts +1 -11
- package/src/internal/cli/project-creation.ts +20 -20
- package/src/internal/cli/prompt.ts +2 -4
- package/src/internal/cli/types.ts +2 -0
- package/src/internal/core/config/config-loading.ts +3 -1
- package/src/internal/core/config/config-validation.ts +20 -0
- package/src/internal/core/errors-list.ts +10 -0
- package/src/internal/core/providers/construction.ts +29 -24
- package/src/internal/core/providers/http.ts +17 -11
- package/src/internal/core/runtime-environment.ts +3 -0
- package/src/internal/hardhat-network/jsonrpc/handler.ts +31 -28
- package/src/internal/hardhat-network/provider/modules/evm.ts +15 -3
- package/src/internal/hardhat-network/provider/node-types.ts +1 -1
- package/src/internal/hardhat-network/provider/node.ts +5 -1
- package/src/internal/hardhat-network/provider/provider.ts +60 -49
- package/src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts +5 -2
- package/src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts +5 -2
- package/src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts +5 -2
- package/src/internal/hardhat-network/provider/utils/makeFakeSignature.ts +46 -0
- package/src/internal/hardhat-network/provider/utils/putGenesisBlock.ts +2 -2
- package/src/internal/solidity/resolver.ts +28 -11
- package/src/internal/util/download.ts +13 -12
- package/src/internal/util/packageInfo.ts +9 -10
- package/src/internal/util/proxy.ts +18 -0
- package/src/types/artifacts.ts +1 -0
- package/src/types/config.ts +2 -0
- package/src/types/runtime.ts +1 -0
- package/types/artifacts.d.ts +1 -0
- package/types/artifacts.d.ts.map +1 -1
- package/types/config.d.ts +2 -0
- package/types/config.d.ts.map +1 -1
- package/types/runtime.d.ts +1 -0
- package/types/runtime.d.ts.map +1 -1
|
@@ -31,30 +31,11 @@ const PRIVATE_RPC_METHODS = new Set([
|
|
|
31
31
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
32
32
|
exports.DEFAULT_COINBASE = "0xc014ba5ec014ba5ec014ba5ec014ba5ec014ba5e";
|
|
33
33
|
class HardhatNetworkProvider extends events_1.EventEmitter {
|
|
34
|
-
constructor(
|
|
34
|
+
constructor(_config, _logger, _artifacts) {
|
|
35
35
|
super();
|
|
36
|
-
this.
|
|
37
|
-
this._networkName = _networkName;
|
|
38
|
-
this._chainId = _chainId;
|
|
39
|
-
this._networkId = _networkId;
|
|
40
|
-
this._blockGasLimit = _blockGasLimit;
|
|
41
|
-
this._initialBaseFeePerGas = _initialBaseFeePerGas;
|
|
42
|
-
this._minGasPrice = _minGasPrice;
|
|
43
|
-
this._throwOnTransactionFailures = _throwOnTransactionFailures;
|
|
44
|
-
this._throwOnCallFailures = _throwOnCallFailures;
|
|
45
|
-
this._automine = _automine;
|
|
46
|
-
this._intervalMining = _intervalMining;
|
|
47
|
-
this._mempoolOrder = _mempoolOrder;
|
|
48
|
-
this._chains = _chains;
|
|
36
|
+
this._config = _config;
|
|
49
37
|
this._logger = _logger;
|
|
50
|
-
this._genesisAccounts = _genesisAccounts;
|
|
51
38
|
this._artifacts = _artifacts;
|
|
52
|
-
this._allowUnlimitedContractSize = _allowUnlimitedContractSize;
|
|
53
|
-
this._initialDate = _initialDate;
|
|
54
|
-
this._experimentalHardhatNetworkMessageTraceHooks = _experimentalHardhatNetworkMessageTraceHooks;
|
|
55
|
-
this._forkConfig = _forkConfig;
|
|
56
|
-
this._forkCachePath = _forkCachePath;
|
|
57
|
-
this._coinbase = _coinbase;
|
|
58
39
|
this._mutex = new await_semaphore_1.Mutex();
|
|
59
40
|
this._ethEventListener = (payload) => {
|
|
60
41
|
const subscription = `0x${payload.filterId.toString(16)}`;
|
|
@@ -160,35 +141,37 @@ class HardhatNetworkProvider extends events_1.EventEmitter {
|
|
|
160
141
|
return;
|
|
161
142
|
}
|
|
162
143
|
const config = {
|
|
163
|
-
automine: this.
|
|
164
|
-
blockGasLimit: this.
|
|
165
|
-
minGasPrice: this.
|
|
166
|
-
genesisAccounts: this.
|
|
167
|
-
allowUnlimitedContractSize: this.
|
|
144
|
+
automine: this._config.automine,
|
|
145
|
+
blockGasLimit: this._config.blockGasLimit,
|
|
146
|
+
minGasPrice: this._config.minGasPrice,
|
|
147
|
+
genesisAccounts: this._config.genesisAccounts,
|
|
148
|
+
allowUnlimitedContractSize: this._config.allowUnlimitedContractSize,
|
|
168
149
|
tracingConfig: await this._makeTracingConfig(),
|
|
169
|
-
initialBaseFeePerGas: this.
|
|
170
|
-
mempoolOrder: this.
|
|
171
|
-
hardfork: this.
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
150
|
+
initialBaseFeePerGas: this._config.initialBaseFeePerGas,
|
|
151
|
+
mempoolOrder: this._config.mempoolOrder,
|
|
152
|
+
hardfork: this._config.hardfork,
|
|
153
|
+
chainId: this._config.chainId,
|
|
154
|
+
networkId: this._config.networkId,
|
|
155
|
+
initialDate: this._config.initialDate,
|
|
156
|
+
forkConfig: this._config.forkConfig,
|
|
157
|
+
forkCachePath: this._config.forkConfig !== undefined
|
|
158
|
+
? this._config.forkCachePath
|
|
159
|
+
: undefined,
|
|
160
|
+
coinbase: this._config.coinbase ?? exports.DEFAULT_COINBASE,
|
|
161
|
+
chains: this._config.chains,
|
|
162
|
+
allowBlocksWithSameTimestamp: this._config.allowBlocksWithSameTimestamp,
|
|
180
163
|
};
|
|
181
164
|
const [common, node] = await node_1.HardhatNode.create(config);
|
|
182
165
|
this._common = common;
|
|
183
166
|
this._node = node;
|
|
184
|
-
this._ethModule = new eth_1.EthModule(common, node, this.
|
|
167
|
+
this._ethModule = new eth_1.EthModule(common, node, this._config.throwOnTransactionFailures, this._config.throwOnCallFailures, this._logger, this._config.experimentalHardhatNetworkMessageTraceHooks);
|
|
185
168
|
const miningTimer = this._makeMiningTimer();
|
|
186
169
|
this._netModule = new net_1.NetModule(common);
|
|
187
170
|
this._web3Module = new web3_1.Web3Module(node);
|
|
188
|
-
this._evmModule = new evm_1.EvmModule(node, miningTimer, this._logger, this.
|
|
171
|
+
this._evmModule = new evm_1.EvmModule(node, miningTimer, this._logger, this._config.allowBlocksWithSameTimestamp, this._config.experimentalHardhatNetworkMessageTraceHooks);
|
|
189
172
|
this._hardhatModule = new hardhat_1.HardhatModule(node, (forkConfig) => this._reset(miningTimer, forkConfig), (loggingEnabled) => {
|
|
190
173
|
this._logger.setEnabled(loggingEnabled);
|
|
191
|
-
}, this._logger, this.
|
|
174
|
+
}, this._logger, this._config.experimentalHardhatNetworkMessageTraceHooks);
|
|
192
175
|
this._debugModule = new debug_2.DebugModule(node);
|
|
193
176
|
this._personalModule = new personal_1.PersonalModule(node);
|
|
194
177
|
this._forwardNodeEvents(node);
|
|
@@ -215,7 +198,7 @@ class HardhatNetworkProvider extends events_1.EventEmitter {
|
|
|
215
198
|
}
|
|
216
199
|
}
|
|
217
200
|
_makeMiningTimer() {
|
|
218
|
-
const miningTimer = new MiningTimer_1.MiningTimer(this.
|
|
201
|
+
const miningTimer = new MiningTimer_1.MiningTimer(this._config.intervalMining, async () => {
|
|
219
202
|
try {
|
|
220
203
|
await this.request({ method: "hardhat_intervalMine" });
|
|
221
204
|
}
|
|
@@ -227,7 +210,7 @@ class HardhatNetworkProvider extends events_1.EventEmitter {
|
|
|
227
210
|
return miningTimer;
|
|
228
211
|
}
|
|
229
212
|
async _reset(miningTimer, forkConfig) {
|
|
230
|
-
this.
|
|
213
|
+
this._config.forkConfig = forkConfig;
|
|
231
214
|
if (this._node !== undefined) {
|
|
232
215
|
this._stopForwardingNodeEvents(this._node);
|
|
233
216
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/provider.ts"],"names":[],"mappings":";;;;;;AAUA,kDAA0B;AAC1B,kDAA0B;AAC1B,mCAAsC;AACtC,wDAA+B;AAC/B,oDAA4B;AAE5B,+CAGyB;AACzB,wDAKqC;AACrC,kEAAqD;AAErD,yDAAyE;AACzE,+CAA4C;AAC5C,2CAA8C;AAC9C,uCAA0C;AAC1C,uCAA0C;AAC1C,+CAAkD;AAElD,iDAAoD;AACpD,uCAA0C;AAC1C,yCAA4C;AAC5C,iCAAqC;AAUrC,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,uCAAuC,CAAC,CAAC;AAE3D,uCAAuC;AACvC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IAClC,oCAAoC;IACpC,2BAA2B;CAC5B,CAAC,CAAC;AAEH,yEAAyE;AAE5D,QAAA,gBAAgB,GAAG,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSenderAccessListEIP2930Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAE5D,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,SAAS,EACV,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,OAAO,EAGR,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"FakeSenderAccessListEIP2930Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAE5D,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,SAAS,EACV,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,OAAO,EAGR,MAAM,kCAAkC,CAAC;AAU1C;;GAEG;AACH,qBAAa,sCAAuC,SAAQ,4BAA4B;WACxE,UAAU,CACtB,OAAO,EAAE,uBAAuB,EAChC,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,gBAAgB,CAC5B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,mBAAmB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,eAAe,CAC3B,OAAO,EAAE,4BAA4B,EACrC,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,4BAA4B,CACxC,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,SAAS;WAeJ,wBAAwB,CACpC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,4BAA4B,EACpC,IAAI,GAAE,SAAc,GACnB,sCAAsC;IAkCzC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAGhC,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,uBAA4B,EAClC,IAAI,CAAC,EAAE,SAAS;IAkBX,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,kBAAkB,IAAI,KAAK;IAM3B,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,KAAK;IAM5D,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK;IAMhC,gBAAgB,IAAI,KAAK;IAMzB,2BAA2B,IAAI,KAAK;IAMpC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO;IACtC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,EAAE;CAQ7C"}
|
package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js
CHANGED
|
@@ -24,17 +24,19 @@ const rlp = __importStar(require("@nomicfoundation/ethereumjs-rlp"));
|
|
|
24
24
|
const ethereumjs_tx_1 = require("@nomicfoundation/ethereumjs-tx");
|
|
25
25
|
const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
|
|
26
26
|
const errors_1 = require("../../../core/providers/errors");
|
|
27
|
+
const makeFakeSignature_1 = require("../utils/makeFakeSignature");
|
|
27
28
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
28
29
|
/**
|
|
29
30
|
* This class is the EIP-2930 version of FakeSenderTransaction.
|
|
30
31
|
*/
|
|
31
32
|
class FakeSenderAccessListEIP2930Transaction extends ethereumjs_tx_1.AccessListEIP2930Transaction {
|
|
32
33
|
constructor(sender, data = {}, opts) {
|
|
34
|
+
const fakeSignature = (0, makeFakeSignature_1.makeFakeSignature)(data, sender);
|
|
33
35
|
super({
|
|
34
36
|
...data,
|
|
35
37
|
v: data.v ?? 1,
|
|
36
|
-
r: data.r ??
|
|
37
|
-
s: data.s ??
|
|
38
|
+
r: data.r ?? fakeSignature.r,
|
|
39
|
+
s: data.s ?? fakeSignature.s,
|
|
38
40
|
}, { ...opts, freeze: false });
|
|
39
41
|
this.common = this._getCommon(opts?.common);
|
|
40
42
|
this._sender = sender;
|
package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSenderAccessListEIP2930Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,qEAAuD;AACvD,kEAA8E;AAM9E,sEAI0C;AAE1C,2DAGwC;
|
|
1
|
+
{"version":3,"file":"FakeSenderAccessListEIP2930Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts"],"names":[],"mappings":"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"}
|
package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSenderEIP1559Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC3B,SAAS,EACV,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,OAAO,EAGR,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"FakeSenderEIP1559Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC3B,SAAS,EACV,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,OAAO,EAGR,MAAM,kCAAkC,CAAC;AAU1C;;GAEG;AACH,qBAAa,4BAA6B,SAAQ,2BAA2B;WAC7D,UAAU,CACtB,OAAO,EAAE,sBAAsB,EAC/B,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,gBAAgB,CAC5B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,mBAAmB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,eAAe,CAC3B,OAAO,EAAE,2BAA2B,EACpC,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,4BAA4B,CACxC,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,SAAS;WAeJ,wBAAwB,CACpC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,2BAA2B,EACnC,IAAI,GAAE,SAAc,GACnB,4BAA4B;IAoC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAGhC,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,sBAA2B,EACjC,IAAI,CAAC,EAAE,SAAS;IAiBX,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,kBAAkB,IAAI,KAAK;IAM3B,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,KAAK;IAM5D,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK;IAMhC,gBAAgB,IAAI,KAAK;IAMzB,2BAA2B,IAAI,KAAK;IAMpC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO;IACtC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,EAAE;CAQ7C"}
|
|
@@ -24,17 +24,19 @@ const rlp = __importStar(require("@nomicfoundation/ethereumjs-rlp"));
|
|
|
24
24
|
const ethereumjs_tx_1 = require("@nomicfoundation/ethereumjs-tx");
|
|
25
25
|
const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
|
|
26
26
|
const errors_1 = require("../../../core/providers/errors");
|
|
27
|
+
const makeFakeSignature_1 = require("../utils/makeFakeSignature");
|
|
27
28
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
28
29
|
/**
|
|
29
30
|
* This class is the EIP-1559 version of FakeSenderTransaction.
|
|
30
31
|
*/
|
|
31
32
|
class FakeSenderEIP1559Transaction extends ethereumjs_tx_1.FeeMarketEIP1559Transaction {
|
|
32
33
|
constructor(sender, data = {}, opts) {
|
|
34
|
+
const fakeSignature = (0, makeFakeSignature_1.makeFakeSignature)(data, sender);
|
|
33
35
|
super({
|
|
34
36
|
...data,
|
|
35
37
|
v: data.v ?? 1,
|
|
36
|
-
r: data.r ??
|
|
37
|
-
s: data.s ??
|
|
38
|
+
r: data.r ?? fakeSignature.r,
|
|
39
|
+
s: data.s ?? fakeSignature.s,
|
|
38
40
|
}, { ...opts, freeze: false });
|
|
39
41
|
this._sender = sender;
|
|
40
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSenderEIP1559Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,qEAAuD;AACvD,kEAA6E;AAM7E,sEAI0C;AAE1C,2DAGwC;
|
|
1
|
+
{"version":3,"file":"FakeSenderEIP1559Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSenderTransaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAE,OAAO,EAAe,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"FakeSenderTransaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAE,OAAO,EAAe,MAAM,kCAAkC,CAAC;AAUxE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,WAAW;WACtC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,KAAK;WAMrD,gBAAgB,CAC5B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,mBAAmB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,KAAK;WAMM,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,KAAK;WAM5D,4BAA4B,CACxC,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,SAAS;WASJ,wBAAwB,CACpC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,CAAC,EAAE,SAAS;IA2BlB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,MAAM,EAAE,OAAO,EAAE,IAAI,GAAE,MAAW,EAAE,IAAI,CAAC,EAAE,SAAS;IAiBzD,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,IAAI,IAAI,KAAK;IAMb,kBAAkB,IAAI,KAAK;IAM3B,2BAA2B,IAAI,KAAK;IAMpC,gBAAgB,IAAI,KAAK;IAMzB,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO;IACtC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,EAAE;CAQ7C"}
|
|
@@ -24,6 +24,7 @@ const rlp = __importStar(require("@nomicfoundation/ethereumjs-rlp"));
|
|
|
24
24
|
const ethereumjs_tx_1 = require("@nomicfoundation/ethereumjs-tx");
|
|
25
25
|
const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
|
|
26
26
|
const errors_1 = require("../../../core/providers/errors");
|
|
27
|
+
const makeFakeSignature_1 = require("../utils/makeFakeSignature");
|
|
27
28
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
28
29
|
/**
|
|
29
30
|
* This class represents a legacy transaction sent by a sender whose private
|
|
@@ -36,11 +37,12 @@ const errors_1 = require("../../../core/providers/errors");
|
|
|
36
37
|
*/
|
|
37
38
|
class FakeSenderTransaction extends ethereumjs_tx_1.Transaction {
|
|
38
39
|
constructor(sender, data = {}, opts) {
|
|
40
|
+
const fakeSignature = (0, makeFakeSignature_1.makeFakeSignature)(data, sender);
|
|
39
41
|
super({
|
|
40
42
|
...data,
|
|
41
43
|
v: data.v ?? 27,
|
|
42
|
-
r: data.r ??
|
|
43
|
-
s: data.s ??
|
|
44
|
+
r: data.r ?? fakeSignature.r,
|
|
45
|
+
s: data.s ?? fakeSignature.s,
|
|
44
46
|
}, { ...opts, freeze: false });
|
|
45
47
|
this.common = this._getCommon(opts?.common);
|
|
46
48
|
this._sender = sender;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FakeSenderTransaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,qEAAuD;AACvD,kEAAgF;AAChF,sEAAwE;AAExE,2DAGwC;
|
|
1
|
+
{"version":3,"file":"FakeSenderTransaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { AccessListEIP2930Transaction, FeeMarketEIP1559Transaction, TxData } from "@nomicfoundation/ethereumjs-tx";
|
|
2
|
+
import { Address } from "@nomicfoundation/ethereumjs-util";
|
|
3
|
+
export declare function makeFakeSignature(tx: TxData | AccessListEIP2930Transaction | FeeMarketEIP1559Transaction, sender: Address): {
|
|
4
|
+
r: number;
|
|
5
|
+
s: number;
|
|
6
|
+
};
|
|
7
|
+
//# sourceMappingURL=makeFakeSignature.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"makeFakeSignature.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/makeFakeSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,MAAM,EACP,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAK3D,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,MAAM,GAAG,4BAA4B,GAAG,2BAA2B,EACvE,MAAM,EAAE,OAAO,GACd;IACD,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CA6BA"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeFakeSignature = void 0;
|
|
4
|
+
const hash_1 = require("../../../util/hash");
|
|
5
|
+
// Produces a signature with r and s values taken from a hash of the inputs.
|
|
6
|
+
function makeFakeSignature(tx, sender) {
|
|
7
|
+
const hashInputString = [
|
|
8
|
+
sender,
|
|
9
|
+
tx.nonce,
|
|
10
|
+
tx.gasLimit,
|
|
11
|
+
tx.value,
|
|
12
|
+
tx.to,
|
|
13
|
+
tx.data,
|
|
14
|
+
"gasPrice" in tx ? tx.gasPrice : "",
|
|
15
|
+
"chainId" in tx ? tx.chainId : "",
|
|
16
|
+
"maxPriorityFeePerGas" in tx ? tx.maxPriorityFeePerGas : "",
|
|
17
|
+
"maxFeePerGas" in tx ? tx.maxFeePerGas : "",
|
|
18
|
+
"accessList" in tx
|
|
19
|
+
? tx.accessList?.map(([buf, bufs]) => [buf, ...bufs].map((b) => b.toString("hex")).join(";"))
|
|
20
|
+
: "",
|
|
21
|
+
]
|
|
22
|
+
.map((a) => a?.toString() ?? "")
|
|
23
|
+
.join(",");
|
|
24
|
+
const hashDigest = (0, hash_1.createNonCryptographicHashBasedIdentifier)(Buffer.from(hashInputString));
|
|
25
|
+
return {
|
|
26
|
+
r: hashDigest.readUInt32LE(),
|
|
27
|
+
s: hashDigest.readUInt32LE(4),
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
exports.makeFakeSignature = makeFakeSignature;
|
|
31
|
+
//# sourceMappingURL=makeFakeSignature.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"makeFakeSignature.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/makeFakeSignature.ts"],"names":[],"mappings":";;;AAOA,6CAA+E;AAE/E,4EAA4E;AAC5E,SAAgB,iBAAiB,CAC/B,EAAuE,EACvE,MAAe;IAKf,MAAM,eAAe,GAAG;QACtB,MAAM;QACN,EAAE,CAAC,KAAK;QACR,EAAE,CAAC,QAAQ;QACX,EAAE,CAAC,KAAK;QACR,EAAE,CAAC,EAAE;QACL,EAAE,CAAC,IAAI;QACP,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACnC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACjC,sBAAsB,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;QAC3D,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;QAC3C,YAAY,IAAI,EAAE;YAChB,CAAC,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CACjC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACvD;YACH,CAAC,CAAC,EAAE;KACP;SACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC/B,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,MAAM,UAAU,GAAG,IAAA,gDAAyC,EAC1D,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAC7B,CAAC;IAEF,OAAO;QACL,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE;QAC5B,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;KAC9B,CAAC;AACJ,CAAC;AAnCD,8CAmCC"}
|
|
@@ -4,5 +4,5 @@ import { Trie } from "@nomicfoundation/ethereumjs-trie";
|
|
|
4
4
|
import { HardforkName } from "../../../util/hardforks";
|
|
5
5
|
import { HardhatBlockchain } from "../HardhatBlockchain";
|
|
6
6
|
import { LocalNodeConfig } from "../node-types";
|
|
7
|
-
export declare function putGenesisBlock(blockchain: HardhatBlockchain, common: Common, { initialDate, blockGasLimit }: LocalNodeConfig, stateTrie: Trie, hardfork: HardforkName, initialMixHash: Buffer, initialBaseFee?: bigint): Promise<void>;
|
|
7
|
+
export declare function putGenesisBlock(blockchain: HardhatBlockchain, common: Common, { initialDate, blockGasLimit: initialBlockGasLimit }: LocalNodeConfig, stateTrie: Trie, hardfork: HardforkName, initialMixHash: Buffer, initialBaseFee?: bigint): Promise<void>;
|
|
8
8
|
//# sourceMappingURL=putGenesisBlock.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"putGenesisBlock.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/putGenesisBlock.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAIxD,OAAO,EAAe,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,wBAAsB,eAAe,CACnC,UAAU,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,EACd,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"putGenesisBlock.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/putGenesisBlock.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAIxD,OAAO,EAAe,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,wBAAsB,eAAe,CACnC,UAAU,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,EACd,EAAE,WAAW,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,eAAe,EACrE,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,YAAY,EACtB,cAAc,EAAE,MAAM,EACtB,cAAc,CAAC,EAAE,MAAM,iBAqCxB"}
|
|
@@ -6,14 +6,14 @@ const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
|
|
|
6
6
|
const date_1 = require("../../../util/date");
|
|
7
7
|
const hardforks_1 = require("../../../util/hardforks");
|
|
8
8
|
const getCurrentTimestamp_1 = require("./getCurrentTimestamp");
|
|
9
|
-
async function putGenesisBlock(blockchain, common, { initialDate, blockGasLimit }, stateTrie, hardfork, initialMixHash, initialBaseFee) {
|
|
9
|
+
async function putGenesisBlock(blockchain, common, { initialDate, blockGasLimit: initialBlockGasLimit }, stateTrie, hardfork, initialMixHash, initialBaseFee) {
|
|
10
10
|
const initialBlockTimestamp = initialDate !== undefined
|
|
11
11
|
? (0, date_1.dateToTimestampSeconds)(initialDate)
|
|
12
12
|
: (0, getCurrentTimestamp_1.getCurrentTimestamp)();
|
|
13
13
|
const isPostMerge = (0, hardforks_1.hardforkGte)(hardfork, hardforks_1.HardforkName.MERGE);
|
|
14
14
|
const header = {
|
|
15
15
|
timestamp: `0x${initialBlockTimestamp.toString(16)}`,
|
|
16
|
-
gasLimit:
|
|
16
|
+
gasLimit: initialBlockGasLimit,
|
|
17
17
|
difficulty: isPostMerge ? 0 : 1,
|
|
18
18
|
nonce: isPostMerge ? "0x0000000000000000" : "0x0000000000000042",
|
|
19
19
|
extraData: "0x1234",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"putGenesisBlock.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/putGenesisBlock.ts"],"names":[],"mappings":";;;AAAA,wEAAsE;AAGtE,sEAA+D;AAE/D,6CAA4D;AAC5D,uDAAoE;AAGpE,+DAA4D;AAErD,KAAK,UAAU,eAAe,CACnC,UAA6B,EAC7B,MAAc,EACd,EAAE,WAAW,EAAE,aAAa,EAAmB,
|
|
1
|
+
{"version":3,"file":"putGenesisBlock.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/putGenesisBlock.ts"],"names":[],"mappings":";;;AAAA,wEAAsE;AAGtE,sEAA+D;AAE/D,6CAA4D;AAC5D,uDAAoE;AAGpE,+DAA4D;AAErD,KAAK,UAAU,eAAe,CACnC,UAA6B,EAC7B,MAAc,EACd,EAAE,WAAW,EAAE,aAAa,EAAE,oBAAoB,EAAmB,EACrE,SAAe,EACf,QAAsB,EACtB,cAAsB,EACtB,cAAuB;IAEvB,MAAM,qBAAqB,GACzB,WAAW,KAAK,SAAS;QACvB,CAAC,CAAC,IAAA,6BAAsB,EAAC,WAAW,CAAC;QACrC,CAAC,CAAC,IAAA,yCAAmB,GAAE,CAAC;IAE5B,MAAM,WAAW,GAAG,IAAA,uBAAW,EAAC,QAAQ,EAAE,wBAAY,CAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAe;QACzB,SAAS,EAAE,KAAK,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;QACpD,QAAQ,EAAE,oBAAoB;QAC9B,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB;QAChE,SAAS,EAAE,QAAQ;QACnB,SAAS,EAAE,IAAA,6BAAW,EAAC,SAAS,CAAC,IAAI,EAAE,CAAC;KACzC,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC;KACjC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,MAAM,CAAC,aAAa,GAAG,cAAc,CAAC;KACvC;IAED,MAAM,YAAY,GAAG,wBAAK,CAAC,aAAa,CACtC;QACE,MAAM;KACP,EACD;QACE,MAAM;QACN,6BAA6B,EAAE,IAAI;KACpC,CACF,CAAC;IAEF,MAAM,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC1C,CAAC;AA5CD,0CA4CC"}
|
|
@@ -17,8 +17,9 @@ export declare class Resolver {
|
|
|
17
17
|
private readonly _projectRoot;
|
|
18
18
|
private readonly _parser;
|
|
19
19
|
private readonly _readFile;
|
|
20
|
+
private readonly _transformImportName;
|
|
20
21
|
private readonly _cache;
|
|
21
|
-
constructor(_projectRoot: string, _parser: Parser, _readFile: (absolutePath: string) => Promise<string>);
|
|
22
|
+
constructor(_projectRoot: string, _parser: Parser, _readFile: (absolutePath: string) => Promise<string>, _transformImportName: (importName: string) => Promise<string>);
|
|
22
23
|
/**
|
|
23
24
|
* Resolves a source name into a ResolvedFile.
|
|
24
25
|
*
|
|
@@ -28,9 +29,9 @@ export declare class Resolver {
|
|
|
28
29
|
/**
|
|
29
30
|
* Resolves an import from an already resolved file.
|
|
30
31
|
* @param from The file were the import statement is present.
|
|
31
|
-
* @param
|
|
32
|
+
* @param importName The path in the import statement.
|
|
32
33
|
*/
|
|
33
|
-
resolveImport(from: ResolvedFile,
|
|
34
|
+
resolveImport(from: ResolvedFile, importName: string): Promise<ResolvedFile>;
|
|
34
35
|
private _resolveLocalSourceName;
|
|
35
36
|
private _resolveLibrarySourceName;
|
|
36
37
|
private _relativeImportToSourceName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/internal/solidity/resolver.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,WAAW,EACX,WAAW,EACX,YAAY,IAAI,aAAa,EAC9B,MAAM,2BAA2B,CAAC;AAenC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,MAAM,WAAW,gBAAgB;IAC/B,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY,CAAC;CACpC;AAID,qBAAa,YAAa,YAAW,aAAa;aAI9B,UAAU,EAAE,MAAM;aAClB,YAAY,EAAE,MAAM;aACpB,OAAO,EAAE,WAAW;aACpB,WAAW,EAAE,MAAM;aACnB,oBAAoB,EAAE,IAAI;IAP5C,SAAgB,OAAO,CAAC,EAAE,WAAW,CAAC;gBAGpB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,WAAW,EACpB,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,IAAI,EAC1C,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM;IAgBlB,gBAAgB;CAMxB;AAED,qBAAa,QAAQ;IAIjB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/internal/solidity/resolver.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,WAAW,EACX,WAAW,EACX,YAAY,IAAI,aAAa,EAC9B,MAAM,2BAA2B,CAAC;AAenC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,MAAM,WAAW,gBAAgB;IAC/B,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY,CAAC;CACpC;AAID,qBAAa,YAAa,YAAW,aAAa;aAI9B,UAAU,EAAE,MAAM;aAClB,YAAY,EAAE,MAAM;aACpB,OAAO,EAAE,WAAW;aACpB,WAAW,EAAE,MAAM;aACnB,oBAAoB,EAAE,IAAI;IAP5C,SAAgB,OAAO,CAAC,EAAE,WAAW,CAAC;gBAGpB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,WAAW,EACpB,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,IAAI,EAC1C,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM;IAgBlB,gBAAgB;CAMxB;AAED,qBAAa,QAAQ;IAIjB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IANvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAG5C,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACpD,oBAAoB,EAAE,CACrC,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,MAAM,CAAC;IAGtB;;;;OAIG;IACU,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAoBzE;;;;OAIG;IACU,aAAa,CACxB,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,CAAC;YA0IV,uBAAuB;YAavB,yBAAyB;YAsDzB,2BAA2B;YAuC3B,YAAY;IAoC1B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,sCAAsC;IAO9C,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,0BAA0B;IAWlC,OAAO,CAAC,oCAAoC;YAY9B,qCAAqC;CAwCpD"}
|
|
@@ -36,10 +36,11 @@ class ResolvedFile {
|
|
|
36
36
|
}
|
|
37
37
|
exports.ResolvedFile = ResolvedFile;
|
|
38
38
|
class Resolver {
|
|
39
|
-
constructor(_projectRoot, _parser, _readFile) {
|
|
39
|
+
constructor(_projectRoot, _parser, _readFile, _transformImportName) {
|
|
40
40
|
this._projectRoot = _projectRoot;
|
|
41
41
|
this._parser = _parser;
|
|
42
42
|
this._readFile = _readFile;
|
|
43
|
+
this._transformImportName = _transformImportName;
|
|
43
44
|
this._cache = new Map();
|
|
44
45
|
}
|
|
45
46
|
/**
|
|
@@ -66,9 +67,10 @@ class Resolver {
|
|
|
66
67
|
/**
|
|
67
68
|
* Resolves an import from an already resolved file.
|
|
68
69
|
* @param from The file were the import statement is present.
|
|
69
|
-
* @param
|
|
70
|
+
* @param importName The path in the import statement.
|
|
70
71
|
*/
|
|
71
|
-
async resolveImport(from,
|
|
72
|
+
async resolveImport(from, importName) {
|
|
73
|
+
const imported = await this._transformImportName(importName);
|
|
72
74
|
const scheme = this._getUriScheme(imported);
|
|
73
75
|
if (scheme !== undefined) {
|
|
74
76
|
throw new errors_1.HardhatError(errors_list_1.ERRORS.RESOLVER.INVALID_IMPORT_PROTOCOL, {
|
|
@@ -128,10 +130,19 @@ class Resolver {
|
|
|
128
130
|
catch (error) {
|
|
129
131
|
if (errors_1.HardhatError.isHardhatErrorType(error, errors_list_1.ERRORS.RESOLVER.FILE_NOT_FOUND) ||
|
|
130
132
|
errors_1.HardhatError.isHardhatErrorType(error, errors_list_1.ERRORS.RESOLVER.LIBRARY_FILE_NOT_FOUND)) {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
133
|
+
if (imported !== importName) {
|
|
134
|
+
throw new errors_1.HardhatError(errors_list_1.ERRORS.RESOLVER.IMPORTED_MAPPED_FILE_NOT_FOUND, {
|
|
135
|
+
imported,
|
|
136
|
+
importName,
|
|
137
|
+
from: from.sourceName,
|
|
138
|
+
}, error);
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
throw new errors_1.HardhatError(errors_list_1.ERRORS.RESOLVER.IMPORTED_FILE_NOT_FOUND, {
|
|
142
|
+
imported,
|
|
143
|
+
from: from.sourceName,
|
|
144
|
+
}, error);
|
|
145
|
+
}
|
|
135
146
|
}
|
|
136
147
|
if (errors_1.HardhatError.isHardhatErrorType(error, errors_list_1.ERRORS.RESOLVER.WRONG_SOURCE_NAME_CASING)) {
|
|
137
148
|
throw new errors_1.HardhatError(errors_list_1.ERRORS.RESOLVER.INVALID_IMPORT_WRONG_CASING, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/internal/solidity/resolver.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,gDAAwB;AACxB,sDAA8B;AAO9B,2DAQkC;AAClC,2CAAsE;AACtE,qDAA6C;AAC7C,uCAAyE;AAEzE,+CAA+C;AAO/C,MAAM,YAAY,GAAG,cAAc,CAAC;AAEpC,MAAa,YAAY;IAGvB,YACkB,UAAkB,EAClB,YAAoB,EACpB,OAAoB,EACpB,WAAmB,EACnB,oBAA0B,EAC1C,WAAoB,EACpB,cAAuB;QANP,eAAU,GAAV,UAAU,CAAQ;QAClB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,YAAO,GAAP,OAAO,CAAa;QACpB,gBAAW,GAAX,WAAW,CAAQ;QACnB,yBAAoB,GAApB,oBAAoB,CAAM;QAI1C,IAAA,+BAAsB,EACpB,CAAC,WAAW,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,CAAC;YACzD,CAAC,WAAW,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,CAAC,EAC7D,6DAA6D,CAC9D,CAAC;QAEF,IAAI,WAAW,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE;YAC7D,IAAI,CAAC,OAAO,GAAG;gBACb,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,cAAc;aACxB,CAAC;SACH;IACH,CAAC;IAEM,gBAAgB;QACrB,OAAO,CACL,IAAI,CAAC,UAAU;YACf,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAChE,CAAC;IACJ,CAAC;CACF;AAhCD,oCAgCC;AAED,MAAa,QAAQ;IAGnB,YACmB,YAAoB,EACpB,OAAe,EACf,SAAoD;
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/internal/solidity/resolver.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,gDAAwB;AACxB,sDAA8B;AAO9B,2DAQkC;AAClC,2CAAsE;AACtE,qDAA6C;AAC7C,uCAAyE;AAEzE,+CAA+C;AAO/C,MAAM,YAAY,GAAG,cAAc,CAAC;AAEpC,MAAa,YAAY;IAGvB,YACkB,UAAkB,EAClB,YAAoB,EACpB,OAAoB,EACpB,WAAmB,EACnB,oBAA0B,EAC1C,WAAoB,EACpB,cAAuB;QANP,eAAU,GAAV,UAAU,CAAQ;QAClB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,YAAO,GAAP,OAAO,CAAa;QACpB,gBAAW,GAAX,WAAW,CAAQ;QACnB,yBAAoB,GAApB,oBAAoB,CAAM;QAI1C,IAAA,+BAAsB,EACpB,CAAC,WAAW,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,CAAC;YACzD,CAAC,WAAW,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,CAAC,EAC7D,6DAA6D,CAC9D,CAAC;QAEF,IAAI,WAAW,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE;YAC7D,IAAI,CAAC,OAAO,GAAG;gBACb,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,cAAc;aACxB,CAAC;SACH;IACH,CAAC;IAEM,gBAAgB;QACrB,OAAO,CACL,IAAI,CAAC,UAAU;YACf,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAChE,CAAC;IACJ,CAAC;CACF;AAhCD,oCAgCC;AAED,MAAa,QAAQ;IAGnB,YACmB,YAAoB,EACpB,OAAe,EACf,SAAoD,EACpD,oBAEG;QALH,iBAAY,GAAZ,YAAY,CAAQ;QACpB,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAA2C;QACpD,yBAAoB,GAApB,oBAAoB,CAEjB;QARL,WAAM,GAA8B,IAAI,GAAG,EAAE,CAAC;IAS5D,CAAC;IAEJ;;;;OAIG;IACI,KAAK,CAAC,iBAAiB,CAAC,UAAkB;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,OAAO,MAAM,CAAC;SACf;QAED,IAAA,uCAAwB,EAAC,UAAU,CAAC,CAAC;QAErC,IAAI,YAA0B,CAAC;QAE/B,IAAI,MAAM,IAAA,gCAAiB,EAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE;YAC1D,YAAY,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;SAC/D;aAAM;YACL,YAAY,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;SACjE;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAC1C,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,aAAa,CACxB,IAAkB,EAClB,UAAkB;QAElB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,QAAQ,CAAC,uBAAuB,EAAE;gBAC9D,IAAI,EAAE,IAAI,CAAC,UAAU;gBACrB,QAAQ;gBACR,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;SACJ;QAED,IAAI,IAAA,iCAAkB,EAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE;YAC7C,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,QAAQ,CAAC,wBAAwB,EAAE;gBAC/D,IAAI,EAAE,IAAI,CAAC,UAAU;gBACrB,QAAQ;aACT,CAAC,CAAC;SACJ;QAED,IAAI,IAAA,uCAAwB,EAAC,QAAQ,CAAC,EAAE;YACtC,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,QAAQ,CAAC,4BAA4B,EAAE;gBACnE,IAAI,EAAE,IAAI,CAAC,UAAU;gBACrB,QAAQ;aACT,CAAC,CAAC;SACJ;QAED,iFAAiF;QACjF,0EAA0E;QAC1E,IAAI,MAAM,IAAA,qCAAsB,EAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,QAAQ,CAAC,yBAAyB,EAAE;gBAChE,IAAI,EAAE,IAAI,CAAC,UAAU;gBACrB,QAAQ;aACT,CAAC,CAAC;SACJ;QAED,IAAI;YACF,IAAI,UAAkB,CAAC;YAEvB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAE1D,IAAI,gBAAgB,EAAE;gBACpB,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aACrE;iBAAM;gBACL,UAAU,GAAG,IAAA,kCAAmB,EAAC,QAAQ,CAAC,CAAC;aAC5C;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC3C,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,OAAO,MAAM,CAAC;aACf;YAED,IAAI,YAA0B,CAAC;YAE/B,mEAAmE;YACnE,4DAA4D;YAC5D,oDAAoD;YACpD,IACE,IAAI,CAAC,OAAO,KAAK,SAAS;gBAC1B,gBAAgB;gBAChB,CAAC,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,EAChD;gBACA,YAAY,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;aAC/D;iBAAM;gBACL,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;aACzD;YAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAC1C,OAAO,YAAY,CAAC;SACrB;QAAC,OAAO,KAAK,EAAE;YACd,IACE,qBAAY,CAAC,kBAAkB,CAC7B,KAAK,EACL,oBAAM,CAAC,QAAQ,CAAC,cAAc,CAC/B;gBACD,qBAAY,CAAC,kBAAkB,CAC7B,KAAK,EACL,oBAAM,CAAC,QAAQ,CAAC,sBAAsB,CACvC,EACD;gBACA,IAAI,QAAQ,KAAK,UAAU,EAAE;oBAC3B,MAAM,IAAI,qBAAY,CACpB,oBAAM,CAAC,QAAQ,CAAC,8BAA8B,EAC9C;wBACE,QAAQ;wBACR,UAAU;wBACV,IAAI,EAAE,IAAI,CAAC,UAAU;qBACtB,EACD,KAAK,CACN,CAAC;iBACH;qBAAM;oBACL,MAAM,IAAI,qBAAY,CACpB,oBAAM,CAAC,QAAQ,CAAC,uBAAuB,EACvC;wBACE,QAAQ;wBACR,IAAI,EAAE,IAAI,CAAC,UAAU;qBACtB,EACD,KAAK,CACN,CAAC;iBACH;aACF;YAED,IACE,qBAAY,CAAC,kBAAkB,CAC7B,KAAK,EACL,oBAAM,CAAC,QAAQ,CAAC,wBAAwB,CACzC,EACD;gBACA,MAAM,IAAI,qBAAY,CACpB,oBAAM,CAAC,QAAQ,CAAC,2BAA2B,EAC3C;oBACE,QAAQ;oBACR,IAAI,EAAE,IAAI,CAAC,UAAU;iBACtB,EACD,KAAK,CACN,CAAC;aACH;YAED,IACE,qBAAY,CAAC,kBAAkB,CAC7B,KAAK,EACL,oBAAM,CAAC,QAAQ,CAAC,qBAAqB,CACtC,EACD;gBACA,MAAM,IAAI,qBAAY,CACpB,oBAAM,CAAC,QAAQ,CAAC,8BAA8B,EAC9C;oBACE,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO;oBACvC,IAAI,EAAE,IAAI,CAAC,UAAU;iBACtB,EACD,KAAK,CACN,CAAC;aACH;YAED,gFAAgF;YAChF,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAEO,KAAK,CAAC,uBAAuB,CACnC,UAAkB;QAElB,MAAM,IAAI,CAAC,qCAAqC,CAC9C,IAAI,CAAC,YAAY,EACjB,UAAU,EACV,KAAK,CACN,CAAC;QAEF,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,yBAAyB,CACrC,UAAkB;QAElB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAErD,IAAI,eAAe,CAAC;QACpB,IAAI;YACF,eAAe,GAAG,IAAI,CAAC,sCAAsC,CAC3D,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CACvC,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,wEAAwE;YACxE,uEAAuE;YACvE,+CAA+C;YAC/C,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC7B,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACxD,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;aAC7D;iBAAM;gBACL,MAAM,IAAI,qBAAY,CACpB,oBAAM,CAAC,QAAQ,CAAC,qBAAqB,EACrC;oBACE,OAAO,EAAE,WAAW;iBACrB,EACD,KAAc,CACf,CAAC;aACH;SACF;QAED,IAAI,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAClE,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE;YACrC,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;SACjD;QAED,MAAM,IAAI,CAAC,qCAAqC,CAC9C,eAAe,EACf,UAAU,EACV,IAAI,CACL,CAAC;QAEF,MAAM,WAAW,GAGb,MAAM,kBAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC5C,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC;QAE3C,OAAO,IAAI,CAAC,YAAY,CACtB,UAAU;QACV,4EAA4E;QAC5E,MAAM,IAAA,sBAAW,EAAC,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,EACzD,WAAW,EACX,cAAc,CACf,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACvC,IAAkB,EAClB,QAAgB;QAEhB,yEAAyE;QACzE,sEAAsE;QACtE,uDAAuD;QACvD,IAAI,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;YACnD,OAAO,IAAI,CAAC,oCAAoC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAClE;QAED,MAAM,UAAU,GAAG,IAAA,kCAAmB,EACpC,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CACnD,CAAC;QAEF,mEAAmE;QACnE,wEAAwE;QACxE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC9D,MAAM,IAAI,qBAAY,CACpB,oBAAM,CAAC,QAAQ,CAAC,iCAAiC,EACjD,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,CACpC,CAAC;SACH;QAED,IACE,IAAI,CAAC,OAAO,KAAK,SAAS;YAC1B,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,EACnD;YACA,qEAAqE;YACrE,+BAA+B;YAC/B,MAAM,IAAI,qBAAY,CAAC,oBAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;gBACrD,IAAI,EAAE,IAAI,CAAC,UAAU;gBACrB,QAAQ;aACT,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,YAAY,CACxB,UAAkB,EAClB,YAAoB,EACpB,WAAoB,EACpB,cAAuB;QAEvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,kBAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,oBAAoB,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAA,gDAAyC,EAC3D,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CACxB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAElB,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CACtC,UAAU,EACV,YAAY,EACZ,WAAW,CACZ,CAAC;QAEF,MAAM,OAAO,GAAG;YACd,UAAU;YACV,GAAG,aAAa;SACjB,CAAC;QAEF,OAAO,IAAI,YAAY,CACrB,UAAU,EACV,YAAY,EACZ,OAAO,EACP,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,cAAc,CACf,CAAC;IACJ,CAAC;IAEO,iBAAiB,CAAC,QAAgB;QACxC,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC;IAEO,sCAAsC,CAAC,QAAgB;QAC7D,OAAO,iBAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,IAAI,CAAC,YAAY;YAC1B,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,UAAkB;QACxC,IAAI,QAAgB,CAAC;QACrB,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE;YACrC,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACjE;aAAM,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YACzC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC;SAC9B;aAAM;YACL,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;SACpC;QAED,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;IAEO,aAAa,CAAC,CAAS;QAC7B,MAAM,EAAE,GAAG,kBAAkB,CAAC;QAC9B,MAAM,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,KAAK,KAAK,IAAI,EAAE;YAClB,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAEO,gBAAgB,CAAC,eAAuB,EAAE,gBAAwB;QACxE,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,GAAG,GACP,UAAU,KAAK,CAAC,CAAC;YACf,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC;YAC1C,CAAC,CAAC,eAAe,CAAC;QAEtB,OAAO,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC1C,CAAC;IAEO,gBAAgB,CAAC,oBAA4B;QACnD,OAAO,oBAAoB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAEO,0BAA0B,CAChC,IAAkB,EAClB,QAAgB;QAEhB,OAAO,CACL,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;YAChC,IAAI,CAAC,OAAO,KAAK,SAAS;YAC1B,QAAQ,CAAC,QAAQ,CAAC,GAAG,YAAY,GAAG,CAAC,CACtC,CAAC;IACJ,CAAC;IAEO,oCAAoC,CAC1C,IAAkB,EAClB,QAAgB;QAEhB,MAAM,UAAU,GAAG,IAAA,kCAAmB,EACpC,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CACnD,CAAC;QAEF,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC;QACvD,OAAO,UAAU,CAAC,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEO,KAAK,CAAC,qCAAqC,CACjD,OAAe,EACf,UAAkB,EAClB,SAAkB;QAElB,IAAI;YACF,MAAM,IAAA,mDAAoC,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;SACjE;QAAC,OAAO,KAAK,EAAE;YACd,IACE,qBAAY,CAAC,kBAAkB,CAC7B,KAAK,EACL,oBAAM,CAAC,YAAY,CAAC,cAAc,CACnC,EACD;gBACA,MAAM,IAAI,qBAAY,CACpB,SAAS;oBACP,CAAC,CAAC,oBAAM,CAAC,QAAQ,CAAC,sBAAsB;oBACxC,CAAC,CAAC,oBAAM,CAAC,QAAQ,CAAC,cAAc,EAClC,EAAE,IAAI,EAAE,UAAU,EAAE,EACpB,KAAK,CACN,CAAC;aACH;YAED,IACE,qBAAY,CAAC,kBAAkB,CAAC,KAAK,EAAE,oBAAM,CAAC,YAAY,CAAC,YAAY,CAAC,EACxE;gBACA,MAAM,IAAI,qBAAY,CACpB,oBAAM,CAAC,QAAQ,CAAC,wBAAwB,EACxC;oBACE,SAAS,EAAE,UAAU;oBACrB,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO;iBACxC,EACD,KAAK,CACN,CAAC;aACH;YAED,gFAAgF;YAChF,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CACF;AApbD,4BAobC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/internal/util/download.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/internal/util/download.ts"],"names":[],"mappings":"AAsBA,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,aAAa,SAAQ,EACrB,YAAY,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,iBA4C9C"}
|
|
@@ -28,6 +28,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
|
28
28
|
const path_1 = __importDefault(require("path"));
|
|
29
29
|
const util_1 = __importDefault(require("util"));
|
|
30
30
|
const packageInfo_1 = require("./packageInfo");
|
|
31
|
+
const proxy_1 = require("./proxy");
|
|
31
32
|
const TEMP_FILE_PREFIX = "tmp-";
|
|
32
33
|
function resolveTempFileName(filePath) {
|
|
33
34
|
const { dir, ext, name } = path_1.default.parse(filePath);
|
|
@@ -41,25 +42,23 @@ async function download(url, filePath, timeoutMillis = 10000, extraHeaders = {})
|
|
|
41
42
|
const { pipeline } = await Promise.resolve().then(() => __importStar(require("stream")));
|
|
42
43
|
const { getGlobalDispatcher, ProxyAgent, request } = await Promise.resolve().then(() => __importStar(require("undici")));
|
|
43
44
|
const streamPipeline = util_1.default.promisify(pipeline);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
return getGlobalDispatcher();
|
|
45
|
+
let dispatcher;
|
|
46
|
+
if (process.env.http_proxy !== undefined && (0, proxy_1.shouldUseProxy)(url)) {
|
|
47
|
+
dispatcher = new ProxyAgent(process.env.http_proxy);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
dispatcher = getGlobalDispatcher();
|
|
52
51
|
}
|
|
53
52
|
const hardhatVersion = (0, packageInfo_1.getHardhatVersion)();
|
|
54
53
|
// Fetch the url
|
|
55
54
|
const response = await request(url, {
|
|
56
|
-
dispatcher
|
|
55
|
+
dispatcher,
|
|
57
56
|
headersTimeout: timeoutMillis,
|
|
58
57
|
maxRedirections: 10,
|
|
59
58
|
method: "GET",
|
|
60
59
|
headers: {
|
|
61
60
|
...extraHeaders,
|
|
62
|
-
"User-Agent": `hardhat ${hardhatVersion
|
|
61
|
+
"User-Agent": `hardhat ${hardhatVersion}`,
|
|
63
62
|
},
|
|
64
63
|
});
|
|
65
64
|
if (response.statusCode >= 200 && response.statusCode <= 299) {
|
|
@@ -68,6 +67,10 @@ async function download(url, filePath, timeoutMillis = 10000, extraHeaders = {})
|
|
|
68
67
|
await streamPipeline(response.body, fs_1.default.createWriteStream(tmpFilePath));
|
|
69
68
|
return fs_extra_1.default.move(tmpFilePath, filePath, { overwrite: true });
|
|
70
69
|
}
|
|
70
|
+
else {
|
|
71
|
+
// undici's response bodies must always be consumed to prevent leaks
|
|
72
|
+
await response.body.text();
|
|
73
|
+
}
|
|
71
74
|
// eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
|
|
72
75
|
throw new Error(`Failed to download ${url} - ${response.statusCode} received. ${await response.body.text()}`);
|
|
73
76
|
}
|