hardhat 2.9.1 → 2.9.2

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.
@@ -57,7 +57,7 @@ Private Key: ${privateKey}`;
57
57
  .addOptionalParam("forkUrl", undefined, undefined, config_env_1.types.string)
58
58
  .addOptionalParam("forkBlockNumber", undefined, undefined, config_env_1.types.int)
59
59
  .setAction(async ({ forkBlockNumber: forkBlockNumberParam, forkUrl: forkUrlParam, }, { artifacts, config, network }) => {
60
- var _a, _b;
60
+ var _a, _b, _c;
61
61
  let provider = network.provider;
62
62
  if (network.name !== constants_1.HARDHAT_NETWORK_NAME) {
63
63
  const networkConfig = config.networks[constants_1.HARDHAT_NETWORK_NAME];
@@ -93,7 +93,7 @@ Private Key: ${privateKey}`;
93
93
  // enable logging
94
94
  await provider.request({
95
95
  method: "hardhat_setLoggingEnabled",
96
- params: [true],
96
+ params: [(_c = hardhatNetworkConfig.loggingEnabled) !== null && _c !== void 0 ? _c : true],
97
97
  });
98
98
  return provider;
99
99
  });
@@ -1 +1 @@
1
- {"version":3,"file":"node.js","sourceRoot":"","sources":["../src/builtin-tasks/node.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"node.js","sourceRoot":"","sources":["../src/builtin-tasks/node.ts"],"names":[],"mappings":"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"}
@@ -55,7 +55,10 @@ const task_names_1 = require("./task-names");
55
55
  .setAction(async (taskArgs, { config }) => {
56
56
  var _a;
57
57
  const { default: Mocha } = await Promise.resolve().then(() => __importStar(require("mocha")));
58
- const mochaConfig = Object.assign(Object.assign({}, config.mocha), { grep: taskArgs.grep });
58
+ const mochaConfig = Object.assign({}, config.mocha);
59
+ if (taskArgs.grep !== undefined) {
60
+ mochaConfig.grep = taskArgs.grep;
61
+ }
59
62
  if (taskArgs.bail) {
60
63
  mochaConfig.bail = true;
61
64
  }
@@ -1 +1 @@
1
- {"version":3,"file":"test.js","sourceRoot":"","sources":["../src/builtin-tasks/test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test.js","sourceRoot":"","sources":["../src/builtin-tasks/test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ReadOnlyValidEIP1559Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAM,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAKlC;;GAEG;AACH,qBAAa,+BAAgC,SAAQ,2BAA2B;WAChE,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;IAMR,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,MAAM,EAAE,OAAO,EAAE,IAAI,GAAE,sBAA2B;IAsCvD,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,IAAI,IAAI,KAAK;IAMb,UAAU,IAAI,KAAK;IAMnB,UAAU,IAAI,KAAK;IAMnB,cAAc,IAAI,KAAK;IAMvB,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK;IACpC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,KAAK;IAOlC,iBAAiB,IAAI,KAAK;IAM1B,kBAAkB,IAAI,KAAK;IAM3B,2BAA2B,IAAI,KAAK;IAMpC,gBAAgB,IAAI,KAAK;CAKjC"}
1
+ {"version":3,"file":"ReadOnlyValidEIP1559Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAM,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAMlC;;GAEG;AACH,qBAAa,+BAAgC,SAAQ,2BAA2B;WAChE,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;IAMR,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,MAAM,EAAE,OAAO,EAAE,IAAI,GAAE,sBAA2B;IA4BvD,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,IAAI,IAAI,KAAK;IAMb,UAAU,IAAI,KAAK;IAMnB,UAAU,IAAI,KAAK;IAMnB,cAAc,IAAI,KAAK;IAMvB,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK;IACpC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,KAAK;IAOlC,iBAAiB,IAAI,KAAK;IAM1B,kBAAkB,IAAI,KAAK;IAM3B,2BAA2B,IAAI,KAAK;IAMpC,gBAAgB,IAAI,KAAK;CAKjC"}
@@ -8,6 +8,7 @@ const common_1 = __importDefault(require("@ethereumjs/common"));
8
8
  const tx_1 = require("@ethereumjs/tx");
9
9
  const ethereumjs_util_1 = require("ethereumjs-util");
10
10
  const errors_1 = require("../../../core/providers/errors");
11
+ const hardforks_1 = require("../../../util/hardforks");
11
12
  /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
12
13
  /**
13
14
  * This class is like `ReadOnlyValidTransaction` but for EIP-1559 transactions.
@@ -21,13 +22,7 @@ class ReadOnlyValidEIP1559Transaction extends tx_1.FeeMarketEIP1559Transaction {
21
22
  // this class should only be used with txs in a hardfork that
22
23
  // supports EIP-1559
23
24
  fakeCommon.isActivatedEIP = (eip) => {
24
- if (eip === 2930) {
25
- return true;
26
- }
27
- if (eip === 1559) {
28
- return true;
29
- }
30
- throw new Error("Expected `isActivatedEIP` to only be called with 2930 or 1559");
25
+ return hardforks_1.LONDON_EIPS.has(eip);
31
26
  };
32
27
  // this class should only be used with EIP-1559 txs,
33
28
  // which always have a `chainId` value
@@ -1 +1 @@
1
- {"version":3,"file":"ReadOnlyValidEIP1559Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ReadOnlyValidEIP1559Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AACxC,uCAAwE;AACxE,qDAA8C;AAM9C,2DAA+D;AAC/D,uDAAsD;AAEtD,yEAAyE;AAEzE;;GAEG;AACH,MAAa,+BAAgC,SAAQ,gCAA2B;IAyC9E,YAAY,MAAe,EAAE,OAA+B,EAAE;QAC5D,MAAM,UAAU,GAAG,IAAI,gBAAM,CAAC;YAC5B,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,QAAQ,EAAE,qDAAqD;SAC1E,CAAC,CAAC;QAEH,6DAA6D;QAC7D,oBAAoB;QACnB,UAAkB,CAAC,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE;YACnD,OAAO,uBAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,oDAAoD;QACpD,sCAAsC;QACrC,UAAkB,CAAC,SAAS,GAAG,GAAG,EAAE;YACnC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,OAAO,IAAI,oBAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC7B;YAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAlEM,MAAM,CAAC,UAAU,CACtB,OAA+B,EAC/B,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAC5B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAC/B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,eAAe,CAC3B,OAAoC,EACpC,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAkCM,eAAe;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,IAAI;QACT,MAAM,IAAI,sBAAa,CACrB,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,cAAc;QACnB,MAAM,IAAI,sBAAa,CACrB,wEAAwE,CACzE,CAAC;IACJ,CAAC;IAIM,QAAQ,CAAC,eAAwB,KAAK;QAC3C,MAAM,IAAI,sBAAa,CACrB,kEAAkE,CACnE,CAAC;IACJ,CAAC;IAEM,iBAAiB;QACtB,MAAM,IAAI,sBAAa,CACrB,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IAEM,kBAAkB;QACvB,MAAM,IAAI,sBAAa,CACrB,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAEM,2BAA2B;QAChC,MAAM,IAAI,sBAAa,CACrB,qFAAqF,CACtF,CAAC;IACJ,CAAC;IAEM,gBAAgB;QACrB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;CACF;AApID,0EAoIC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ReadOnlyValidEIP2930Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,EACvB,4BAA4B,EAC5B,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAM,MAAM,iBAAiB,CAAC;AAM9C;;;GAGG;AACH,qBAAa,+BAAgC,SAAQ,4BAA4B;WACjE,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;IAMR,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,MAAM,EAAE,OAAO,EAAE,IAAI,GAAE,uBAA4B;IA+BxD,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,IAAI,IAAI,KAAK;IAMb,UAAU,IAAI,KAAK;IAMnB,UAAU,IAAI,KAAK;IAMnB,cAAc,IAAI,KAAK;IAMvB,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK;IACpC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,KAAK;IAOlC,iBAAiB,IAAI,KAAK;IAM1B,kBAAkB,IAAI,KAAK;IAM3B,2BAA2B,IAAI,KAAK;IAMpC,gBAAgB,IAAI,KAAK;CAKjC"}
1
+ {"version":3,"file":"ReadOnlyValidEIP2930Transaction.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,EACvB,4BAA4B,EAC5B,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAM,MAAM,iBAAiB,CAAC;AAO9C;;;GAGG;AACH,qBAAa,+BAAgC,SAAQ,4BAA4B;WACjE,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;IAMR,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,MAAM,EAAE,OAAO,EAAE,IAAI,GAAE,uBAA4B;IA2BxD,eAAe,IAAI,OAAO;IAI1B,gBAAgB,IAAI,OAAO;IAI3B,IAAI,IAAI,KAAK;IAMb,UAAU,IAAI,KAAK;IAMnB,UAAU,IAAI,KAAK;IAMnB,cAAc,IAAI,KAAK;IAMvB,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK;IACpC,QAAQ,CAAC,WAAW,EAAE,IAAI,GAAG,KAAK;IAOlC,iBAAiB,IAAI,KAAK;IAM1B,kBAAkB,IAAI,KAAK;IAM3B,2BAA2B,IAAI,KAAK;IAMpC,gBAAgB,IAAI,KAAK;CAKjC"}
@@ -8,6 +8,7 @@ const common_1 = __importDefault(require("@ethereumjs/common"));
8
8
  const tx_1 = require("@ethereumjs/tx");
9
9
  const ethereumjs_util_1 = require("ethereumjs-util");
10
10
  const errors_1 = require("../../../core/providers/errors");
11
+ const hardforks_1 = require("../../../util/hardforks");
11
12
  /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
12
13
  /**
13
14
  * This class is like `ReadOnlyValidTransaction` but for
@@ -21,10 +22,7 @@ class ReadOnlyValidEIP2930Transaction extends tx_1.AccessListEIP2930Transaction
21
22
  // this class should only be used with txs in a hardfork that
22
23
  // supports EIP-2930
23
24
  fakeCommon.isActivatedEIP = (eip) => {
24
- if (eip === 2930) {
25
- return true;
26
- }
27
- throw new Error("Expected `isActivatedEIP` to only be called with 2930");
25
+ return hardforks_1.BERLIN_EIPS.has(eip);
28
26
  };
29
27
  // this class should only be used with EIP-2930 txs,
30
28
  // which (we assume) always have a defined `chainId` value
@@ -1 +1 @@
1
- {"version":3,"file":"ReadOnlyValidEIP2930Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AACxC,uCAKwB;AACxB,qDAA8C;AAE9C,2DAA+D;AAE/D,yEAAyE;AAEzE;;;GAGG;AACH,MAAa,+BAAgC,SAAQ,iCAA4B;IAyC/E,YAAY,MAAe,EAAE,OAAgC,EAAE;QAC7D,MAAM,UAAU,GAAG,IAAI,gBAAM,CAAC;YAC5B,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,6DAA6D;QAC7D,oBAAoB;QACnB,UAAkB,CAAC,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE;YACnD,IAAI,GAAG,KAAK,IAAI,EAAE;gBAChB,OAAO,IAAI,CAAC;aACb;YAED,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC,CAAC;QAEF,oDAAoD;QACpD,0DAA0D;QACzD,UAAkB,CAAC,SAAS,GAAG,GAAG,EAAE;YACnC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,OAAO,IAAI,oBAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC7B;YAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IArEM,MAAM,CAAC,UAAU,CACtB,OAAgC,EAChC,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAC5B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAC/B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,eAAe,CAC3B,OAAqC,EACrC,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAqCM,eAAe;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,IAAI;QACT,MAAM,IAAI,sBAAa,CACrB,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,cAAc;QACnB,MAAM,IAAI,sBAAa,CACrB,wEAAwE,CACzE,CAAC;IACJ,CAAC;IAIM,QAAQ,CAAC,eAAwB,KAAK;QAC3C,MAAM,IAAI,sBAAa,CACrB,kEAAkE,CACnE,CAAC;IACJ,CAAC;IAEM,iBAAiB;QACtB,MAAM,IAAI,sBAAa,CACrB,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IAEM,kBAAkB;QACvB,MAAM,IAAI,sBAAa,CACrB,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAEM,2BAA2B;QAChC,MAAM,IAAI,sBAAa,CACrB,qFAAqF,CACtF,CAAC;IACJ,CAAC;IAEM,gBAAgB;QACrB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;CACF;AAvID,0EAuIC"}
1
+ {"version":3,"file":"ReadOnlyValidEIP2930Transaction.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAwC;AACxC,uCAKwB;AACxB,qDAA8C;AAE9C,2DAA+D;AAC/D,uDAAsD;AAEtD,yEAAyE;AAEzE;;;GAGG;AACH,MAAa,+BAAgC,SAAQ,iCAA4B;IAyC/E,YAAY,MAAe,EAAE,OAAgC,EAAE;QAC7D,MAAM,UAAU,GAAG,IAAI,gBAAM,CAAC;YAC5B,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,6DAA6D;QAC7D,oBAAoB;QACnB,UAAkB,CAAC,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE;YACnD,OAAO,uBAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,oDAAoD;QACpD,0DAA0D;QACzD,UAAkB,CAAC,SAAS,GAAG,GAAG,EAAE;YACnC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,OAAO,IAAI,oBAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC7B;YAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAjEM,MAAM,CAAC,UAAU,CACtB,OAAgC,EAChC,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAC5B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAC/B,WAAmB,EACnB,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,eAAe,CAC3B,OAAqC,EACrC,KAAiB;QAEjB,MAAM,IAAI,sBAAa,CACrB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAiCM,eAAe;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,IAAI;QACT,MAAM,IAAI,sBAAa,CACrB,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,MAAM,IAAI,sBAAa,CACrB,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAEM,cAAc;QACnB,MAAM,IAAI,sBAAa,CACrB,wEAAwE,CACzE,CAAC;IACJ,CAAC;IAIM,QAAQ,CAAC,eAAwB,KAAK;QAC3C,MAAM,IAAI,sBAAa,CACrB,kEAAkE,CACnE,CAAC;IACJ,CAAC;IAEM,iBAAiB;QACtB,MAAM,IAAI,sBAAa,CACrB,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IAEM,kBAAkB;QACvB,MAAM,IAAI,sBAAa,CACrB,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAEM,2BAA2B;QAChC,MAAM,IAAI,sBAAa,CACrB,qFAAqF,CACtF,CAAC;IACJ,CAAC;IAEM,gBAAgB;QACrB,MAAM,IAAI,sBAAa,CACrB,0EAA0E,CAC3E,CAAC;IACJ,CAAC;CACF;AAnID,0EAmIC"}
@@ -1,3 +1,5 @@
1
+ export declare const BERLIN_EIPS: Set<number>;
2
+ export declare const LONDON_EIPS: Set<number>;
1
3
  export declare enum HardforkName {
2
4
  FRONTIER = "chainstart",
3
5
  HOMESTEAD = "homestead",
@@ -1 +1 @@
1
- {"version":3,"file":"hardforks.d.ts","sourceRoot":"","sources":["../../src/internal/util/hardforks.ts"],"names":[],"mappings":"AAEA,oBAAY,YAAY;IACtB,QAAQ,eAAe;IACvB,SAAS,cAAc;IACvB,GAAG,QAAQ;IACX,iBAAiB,qBAAqB;IACtC,eAAe,mBAAmB;IAClC,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,YAAY,gBAAgB;IAC5B,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,aAAa,iBAAiB;CAC/B;AAkBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAY1D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,YAAY,GACtB,OAAO,CAOT"}
1
+ {"version":3,"file":"hardforks.d.ts","sourceRoot":"","sources":["../../src/internal/util/hardforks.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,aAiBtB,CAAC;AAEH,eAAO,MAAM,WAAW,aAQtB,CAAC;AAEH,oBAAY,YAAY;IACtB,QAAQ,eAAe;IACvB,SAAS,cAAc;IACvB,GAAG,QAAQ;IACX,iBAAiB,qBAAqB;IACtC,eAAe,mBAAmB;IAClC,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,YAAY,gBAAgB;IAC5B,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,aAAa,iBAAiB;CAC/B;AAkBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAY1D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,YAAY,GACtB,OAAO,CAOT"}
@@ -1,7 +1,34 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.hardforkGte = exports.getHardforkName = exports.HardforkName = void 0;
3
+ exports.hardforkGte = exports.getHardforkName = exports.HardforkName = exports.LONDON_EIPS = exports.BERLIN_EIPS = void 0;
4
4
  const errors_1 = require("../core/errors");
5
+ exports.BERLIN_EIPS = new Set([
6
+ // Homestead
7
+ 2, 7, 8,
8
+ // Tangerine Whistle
9
+ 150, 158,
10
+ // Spurious Dragon
11
+ 155, 160, 161, 170,
12
+ // Byzantium
13
+ 100, 140, 196, 197, 198, 211, 214, 649, 658,
14
+ // Constantinople
15
+ 1014, 1052, 1234, 145,
16
+ // Istanbul
17
+ 1108, 1344, 152, 1884, 2028, 2200,
18
+ // Muir Glacier
19
+ 2384,
20
+ // Berlin
21
+ 2565, 2718, 2929, 2930,
22
+ ]);
23
+ exports.LONDON_EIPS = new Set([
24
+ ...exports.BERLIN_EIPS,
25
+ // London
26
+ 1559,
27
+ 3198,
28
+ 3529,
29
+ 3541,
30
+ 3554,
31
+ ]);
5
32
  var HardforkName;
6
33
  (function (HardforkName) {
7
34
  HardforkName["FRONTIER"] = "chainstart";
@@ -1 +1 @@
1
- {"version":3,"file":"hardforks.js","sourceRoot":"","sources":["../../src/internal/util/hardforks.ts"],"names":[],"mappings":";;;AAAA,2CAAwD;AAExD,IAAY,YAcX;AAdD,WAAY,YAAY;IACtB,uCAAuB,CAAA;IACvB,uCAAuB,CAAA;IACvB,2BAAW,CAAA;IACX,sDAAsC,CAAA;IACtC,kDAAkC,CAAA;IAClC,uCAAuB,CAAA;IACvB,iDAAiC,CAAA;IACjC,yCAAyB,CAAA;IACzB,qCAAqB,CAAA;IACrB,4CAA4B,CAAA;IAC5B,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,8CAA8B,CAAA;AAChC,CAAC,EAdW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAcvB;AAED,MAAM,eAAe,GAAmB;IACtC,YAAY,CAAC,QAAQ;IACrB,YAAY,CAAC,SAAS;IACtB,YAAY,CAAC,GAAG;IAChB,YAAY,CAAC,iBAAiB;IAC9B,YAAY,CAAC,eAAe;IAC5B,YAAY,CAAC,SAAS;IACtB,YAAY,CAAC,cAAc;IAC3B,YAAY,CAAC,UAAU;IACvB,YAAY,CAAC,QAAQ;IACrB,YAAY,CAAC,YAAY;IACzB,YAAY,CAAC,MAAM;IACnB,YAAY,CAAC,MAAM;IACnB,YAAY,CAAC,aAAa;CAC3B,CAAC;AAEF,SAAgB,eAAe,CAAC,IAAY;IAC1C,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CACzB,MAAM,CAAC,MAAM,CAAS,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAClD,CAAC;IAEJ,IAAA,+BAAsB,EACpB,YAAY,KAAK,SAAS,EAC1B,wBAAwB,IAAI,EAAE,CAC/B,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC;AAZD,0CAYC;AAED;;;GAGG;AACH,SAAgB,WAAW,CACzB,SAAuB,EACvB,SAAuB;IAEvB,4EAA4E;IAC5E,+DAA+D;IAC/D,MAAM,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtD,OAAO,MAAM,IAAI,MAAM,CAAC;AAC1B,CAAC;AAVD,kCAUC"}
1
+ {"version":3,"file":"hardforks.js","sourceRoot":"","sources":["../../src/internal/util/hardforks.ts"],"names":[],"mappings":";;;AAAA,2CAAwD;AAE3C,QAAA,WAAW,GAAG,IAAI,GAAG,CAAC;IACjC,YAAY;IACZ,CAAC,EAAE,CAAC,EAAE,CAAC;IACP,oBAAoB;IACpB,GAAG,EAAE,GAAG;IACR,kBAAkB;IAClB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAClB,YAAY;IACZ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC3C,iBAAiB;IACjB,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG;IACrB,WAAW;IACX,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IACjC,eAAe;IACf,IAAI;IACJ,SAAS;IACT,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;CACvB,CAAC,CAAC;AAEU,QAAA,WAAW,GAAG,IAAI,GAAG,CAAC;IACjC,GAAG,mBAAW;IACd,SAAS;IACT,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;CACL,CAAC,CAAC;AAEH,IAAY,YAcX;AAdD,WAAY,YAAY;IACtB,uCAAuB,CAAA;IACvB,uCAAuB,CAAA;IACvB,2BAAW,CAAA;IACX,sDAAsC,CAAA;IACtC,kDAAkC,CAAA;IAClC,uCAAuB,CAAA;IACvB,iDAAiC,CAAA;IACjC,yCAAyB,CAAA;IACzB,qCAAqB,CAAA;IACrB,4CAA4B,CAAA;IAC5B,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,8CAA8B,CAAA;AAChC,CAAC,EAdW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAcvB;AAED,MAAM,eAAe,GAAmB;IACtC,YAAY,CAAC,QAAQ;IACrB,YAAY,CAAC,SAAS;IACtB,YAAY,CAAC,GAAG;IAChB,YAAY,CAAC,iBAAiB;IAC9B,YAAY,CAAC,eAAe;IAC5B,YAAY,CAAC,SAAS;IACtB,YAAY,CAAC,cAAc;IAC3B,YAAY,CAAC,UAAU;IACvB,YAAY,CAAC,QAAQ;IACrB,YAAY,CAAC,YAAY;IACzB,YAAY,CAAC,MAAM;IACnB,YAAY,CAAC,MAAM;IACnB,YAAY,CAAC,aAAa;CAC3B,CAAC;AAEF,SAAgB,eAAe,CAAC,IAAY;IAC1C,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CACzB,MAAM,CAAC,MAAM,CAAS,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAClD,CAAC;IAEJ,IAAA,+BAAsB,EACpB,YAAY,KAAK,SAAS,EAC1B,wBAAwB,IAAI,EAAE,CAC/B,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC;AAZD,0CAYC;AAED;;;GAGG;AACH,SAAgB,WAAW,CACzB,SAAuB,EACvB,SAAuB;IAEvB,4EAA4E;IAC5E,+DAA+D;IAC/D,MAAM,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtD,OAAO,MAAM,IAAI,MAAM,CAAC;AAC1B,CAAC;AAVD,kCAUC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hardhat",
3
- "version": "2.9.1",
3
+ "version": "2.9.2",
4
4
  "author": "Nomic Labs LLC",
5
5
  "license": "MIT",
6
6
  "homepage": "https://hardhat.org",
@@ -32,8 +32,8 @@
32
32
  "prettier": "prettier \"**/*.{js,md,json}\"",
33
33
  "test": "mocha --recursive \"test/**/*.ts\"",
34
34
  "test:except-tracing": "mocha --recursive \"test/**/*.ts\" --invert --grep \"Stack traces\"",
35
- "test:tracing": "mocha --recursive \"test/internal/hardhat-network/{helpers,stack-traces}/*.ts\"",
36
- "test:forking": "mocha --recursive \"test/internal/hardhat-network/{helpers,jsonrpc,provider}/*.ts\"",
35
+ "test:tracing": "mocha --recursive \"test/internal/hardhat-network/{helpers,stack-traces}/**/*.ts\"",
36
+ "test:forking": "mocha --recursive \"test/internal/hardhat-network/{helpers,jsonrpc,provider}/**/*.ts\"",
37
37
  "build": "tsc --build .",
38
38
  "clean": "rimraf builtin-tasks internal types utils *.d.ts *.map *.js build-test tsconfig.tsbuildinfo test/internal/hardhat-network/provider/.hardhat_node_test_cache"
39
39
  },
@@ -158,7 +158,7 @@ subtask(TASK_NODE_GET_PROVIDER)
158
158
  // enable logging
159
159
  await provider.request({
160
160
  method: "hardhat_setLoggingEnabled",
161
- params: [true],
161
+ params: [hardhatNetworkConfig.loggingEnabled ?? true],
162
162
  });
163
163
 
164
164
  return provider;
@@ -72,11 +72,11 @@ subtask(TASK_TEST_RUN_MOCHA_TESTS)
72
72
  ) => {
73
73
  const { default: Mocha } = await import("mocha");
74
74
 
75
- const mochaConfig: MochaOptions = {
76
- ...config.mocha,
77
- grep: taskArgs.grep,
78
- };
75
+ const mochaConfig: MochaOptions = { ...config.mocha };
79
76
 
77
+ if (taskArgs.grep !== undefined) {
78
+ mochaConfig.grep = taskArgs.grep;
79
+ }
80
80
  if (taskArgs.bail) {
81
81
  mochaConfig.bail = true;
82
82
  }
@@ -7,6 +7,7 @@ import {
7
7
  FeeMarketEIP1559ValuesArray,
8
8
  } from "@ethereumjs/tx/src/types";
9
9
  import { InternalError } from "../../../core/providers/errors";
10
+ import { LONDON_EIPS } from "../../../util/hardforks";
10
11
 
11
12
  /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
12
13
 
@@ -63,17 +64,7 @@ export class ReadOnlyValidEIP1559Transaction extends FeeMarketEIP1559Transaction
63
64
  // this class should only be used with txs in a hardfork that
64
65
  // supports EIP-1559
65
66
  (fakeCommon as any).isActivatedEIP = (eip: number) => {
66
- if (eip === 2930) {
67
- return true;
68
- }
69
-
70
- if (eip === 1559) {
71
- return true;
72
- }
73
-
74
- throw new Error(
75
- "Expected `isActivatedEIP` to only be called with 2930 or 1559"
76
- );
67
+ return LONDON_EIPS.has(eip);
77
68
  };
78
69
 
79
70
  // this class should only be used with EIP-1559 txs,
@@ -8,6 +8,7 @@ import {
8
8
  import { Address, BN } from "ethereumjs-util";
9
9
 
10
10
  import { InternalError } from "../../../core/providers/errors";
11
+ import { BERLIN_EIPS } from "../../../util/hardforks";
11
12
 
12
13
  /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
13
14
 
@@ -64,11 +65,7 @@ export class ReadOnlyValidEIP2930Transaction extends AccessListEIP2930Transactio
64
65
  // this class should only be used with txs in a hardfork that
65
66
  // supports EIP-2930
66
67
  (fakeCommon as any).isActivatedEIP = (eip: number) => {
67
- if (eip === 2930) {
68
- return true;
69
- }
70
-
71
- throw new Error("Expected `isActivatedEIP` to only be called with 2930");
68
+ return BERLIN_EIPS.has(eip);
72
69
  };
73
70
 
74
71
  // this class should only be used with EIP-2930 txs,
@@ -1,5 +1,34 @@
1
1
  import { assertHardhatInvariant } from "../core/errors";
2
2
 
3
+ export const BERLIN_EIPS = new Set([
4
+ // Homestead
5
+ 2, 7, 8,
6
+ // Tangerine Whistle
7
+ 150, 158,
8
+ // Spurious Dragon
9
+ 155, 160, 161, 170,
10
+ // Byzantium
11
+ 100, 140, 196, 197, 198, 211, 214, 649, 658,
12
+ // Constantinople
13
+ 1014, 1052, 1234, 145,
14
+ // Istanbul
15
+ 1108, 1344, 152, 1884, 2028, 2200,
16
+ // Muir Glacier
17
+ 2384,
18
+ // Berlin
19
+ 2565, 2718, 2929, 2930,
20
+ ]);
21
+
22
+ export const LONDON_EIPS = new Set([
23
+ ...BERLIN_EIPS,
24
+ // London
25
+ 1559,
26
+ 3198,
27
+ 3529,
28
+ 3541,
29
+ 3554,
30
+ ]);
31
+
3
32
  export enum HardforkName {
4
33
  FRONTIER = "chainstart",
5
34
  HOMESTEAD = "homestead",