hardhat 2.22.16 → 2.22.17

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.
Files changed (28) hide show
  1. package/README.md +1 -1
  2. package/builtin-tasks/flatten.js +9 -2
  3. package/builtin-tasks/flatten.js.map +1 -1
  4. package/internal/cli/project-creation.d.ts +1 -1
  5. package/internal/cli/project-creation.js +1 -1
  6. package/internal/core/jsonrpc/types/output/block.d.ts +2 -2
  7. package/internal/core/jsonrpc/types/output/block.d.ts.map +1 -1
  8. package/internal/core/jsonrpc/types/output/block.js +2 -1
  9. package/internal/core/jsonrpc/types/output/block.js.map +1 -1
  10. package/internal/hardhat-network/stack-traces/constants.d.ts +1 -1
  11. package/internal/hardhat-network/stack-traces/constants.js +1 -1
  12. package/internal/solidity/compiler/solc-info.d.ts.map +1 -1
  13. package/internal/solidity/compiler/solc-info.js +1 -0
  14. package/internal/solidity/compiler/solc-info.js.map +1 -1
  15. package/package.json +2 -2
  16. package/sample-projects/javascript/contracts/Lock.sol +1 -1
  17. package/sample-projects/javascript/hardhat.config.js +1 -1
  18. package/sample-projects/javascript-esm/contracts/Lock.sol +1 -1
  19. package/sample-projects/javascript-esm/hardhat.config.cjs +1 -1
  20. package/sample-projects/typescript/contracts/Lock.sol +1 -1
  21. package/sample-projects/typescript/hardhat.config.ts +1 -1
  22. package/sample-projects/typescript-viem/contracts/Lock.sol +1 -1
  23. package/sample-projects/typescript-viem/hardhat.config.ts +1 -1
  24. package/src/builtin-tasks/flatten.ts +58 -40
  25. package/src/internal/cli/project-creation.ts +1 -1
  26. package/src/internal/core/jsonrpc/types/output/block.ts +2 -1
  27. package/src/internal/hardhat-network/stack-traces/constants.ts +1 -1
  28. package/src/internal/solidity/compiler/solc-info.ts +1 -0
package/README.md CHANGED
@@ -40,7 +40,7 @@ On [Hardhat's website](https://hardhat.org) you will find:
40
40
 
41
41
  Contributions are always welcome! Feel free to open any issue or send a pull request.
42
42
 
43
- Go to [CONTRIBUTING.md](./CONTRIBUTING.md) to learn about how to set up Hardhat's development environment.
43
+ Go to [CONTRIBUTING.md](https://github.com/NomicFoundation/hardhat/blob/main/CONTRIBUTING.md) to learn about how to set up Hardhat's development environment.
44
44
 
45
45
  ## Feedback, help and news
46
46
 
package/builtin-tasks/flatten.js CHANGED
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const picocolors_1 = __importDefault(require("picocolors"));
7
+ const node_fs_1 = require("node:fs");
7
8
  const config_env_1 = require("../internal/core/config/config-env");
8
9
  const errors_1 = require("../internal/core/errors");
9
10
  const errors_list_1 = require("../internal/core/errors-list");
@@ -191,9 +192,15 @@ function replacePragmaAbicoderDirectives(file) {
191
192
  });
192
193
  (0, config_env_1.task)(task_names_1.TASK_FLATTEN, "Flattens and prints contracts and their dependencies. If no file is passed, all the contracts in the project will be flattened.")
193
194
  .addOptionalVariadicPositionalParam("files", "The files to flatten", undefined, config_env_1.types.inputFile)
194
- .setAction(async ({ files }, { run }) => {
195
+ .addOptionalParam("output", "The output file containing the flattened contracts", undefined, config_env_1.types.string)
196
+ .setAction(async ({ files, output, }, { run }) => {
195
197
  const [flattenedFile, metadata] = await run(task_names_1.TASK_FLATTEN_GET_FLATTENED_SOURCE_AND_METADATA, { files });
196
- console.log(flattenedFile);
198
+ if (output !== undefined) {
199
+ (0, node_fs_1.writeFileSync)(output, flattenedFile, { encoding: "utf-8" });
200
+ }
201
+ else {
202
+ console.log(flattenedFile);
203
+ }
197
204
  if (metadata === null)
198
205
  return;
199
206
  if (metadata.filesWithoutLicenses.length > 0) {
package/builtin-tasks/flatten.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"flatten.js","sourceRoot":"","sources":["../src/builtin-tasks/flatten.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"flatten.js","sourceRoot":"","sources":["../src/builtin-tasks/flatten.ts"],"names":[],"mappings":"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"}
package/internal/cli/project-creation.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const EMPTY_HARDHAT_CONFIG = "/** @type import('hardhat/config').HardhatUserConfig */\nmodule.exports = {\n solidity: \"0.8.27\",\n};\n";
1
+ export declare const EMPTY_HARDHAT_CONFIG = "/** @type import('hardhat/config').HardhatUserConfig */\nmodule.exports = {\n solidity: \"0.8.28\",\n};\n";
2
2
  export declare function showSoliditySurveyMessage(): void;
3
3
  export declare function createProject(): Promise<void>;
4
4
  //# sourceMappingURL=project-creation.d.ts.map
package/internal/cli/project-creation.js CHANGED
@@ -190,7 +190,7 @@ async function printRecommendedDepsInstallationInstructions(projectType) {
190
190
  // exported so we can test that it uses the latest supported version of solidity
191
191
  exports.EMPTY_HARDHAT_CONFIG = `/** @type import('hardhat/config').HardhatUserConfig */
192
192
  module.exports = {
193
- solidity: "0.8.27",
193
+ solidity: "0.8.28",
194
194
  };
195
195
  `;
196
196
  async function writeEmptyHardhatConfig(isEsm) {
package/internal/core/jsonrpc/types/output/block.d.ts CHANGED
@@ -13,7 +13,7 @@ export declare const rpcBlock: t.TypeC<{
13
13
  receiptsRoot: t.Type<Buffer, Buffer, unknown>;
14
14
  miner: t.Type<Buffer, Buffer, unknown>;
15
15
  difficulty: t.Type<bigint, bigint, unknown>;
16
- totalDifficulty: t.Type<bigint, bigint, unknown>;
16
+ totalDifficulty: t.Type<bigint | undefined, bigint | undefined, unknown>;
17
17
  extraData: t.Type<Buffer, Buffer, unknown>;
18
18
  size: t.Type<bigint, bigint, unknown>;
19
19
  gasLimit: t.Type<bigint, bigint, unknown>;
@@ -78,7 +78,7 @@ export declare const rpcBlockWithTransactions: t.TypeC<{
78
78
  receiptsRoot: t.Type<Buffer, Buffer, unknown>;
79
79
  miner: t.Type<Buffer, Buffer, unknown>;
80
80
  difficulty: t.Type<bigint, bigint, unknown>;
81
- totalDifficulty: t.Type<bigint, bigint, unknown>;
81
+ totalDifficulty: t.Type<bigint | undefined, bigint | undefined, unknown>;
82
82
  extraData: t.Type<Buffer, Buffer, unknown>;
83
83
  size: t.Type<bigint, bigint, unknown>;
84
84
  gasLimit: t.Type<bigint, bigint, unknown>;
package/internal/core/jsonrpc/types/output/block.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../../src/internal/core/jsonrpc/types/output/block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AA6C3B,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,QAAQ,CAAC,CAAC;AAEjD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAC7C,OAAO,wBAAwB,CAChC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMpC,CAAC"}
1
+ {"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../../src/internal/core/jsonrpc/types/output/block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AA8C3B,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,QAAQ,CAAC,CAAC;AAEjD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAC7C,OAAO,wBAAwB,CAChC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMpC,CAAC"}
package/internal/core/jsonrpc/types/output/block.js CHANGED
@@ -46,7 +46,8 @@ const baseBlockResponse = {
46
46
  receiptsRoot: base_types_1.rpcHash,
47
47
  miner: base_types_1.rpcAddress,
48
48
  difficulty: base_types_1.rpcQuantity,
49
- totalDifficulty: base_types_1.rpcQuantity,
49
+ // now optional since https://github.com/ethereum/execution-apis/pull/570
50
+ totalDifficulty: (0, io_ts_1.optional)(base_types_1.rpcQuantity),
50
51
  extraData: base_types_1.rpcData,
51
52
  size: base_types_1.rpcQuantity,
52
53
  gasLimit: base_types_1.rpcQuantity,
package/internal/core/jsonrpc/types/output/block.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/internal/core/jsonrpc/types/output/block.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA2B;AAE3B,kDAA4D;AAC5D,8CAA0E;AAE1E,+CAA+C;AAE/C,MAAM,iBAAiB,GAAG,CAAC,CAAC,IAAI,CAC9B;IACE,KAAK,EAAE,wBAAW;IAClB,cAAc,EAAE,wBAAW;IAC3B,OAAO,EAAE,uBAAU;IACnB,MAAM,EAAE,wBAAW;CACpB,EACD,wBAAwB,CACzB,CAAC;AAEF,MAAM,iBAAiB,GAAG;IACxB,MAAM,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;IAC7B,IAAI,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IACvB,UAAU,EAAE,oBAAO;IACnB,KAAK,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IACxB,UAAU,EAAE,oBAAO;IACnB,SAAS,EAAE,oBAAO;IAClB,gBAAgB,EAAE,oBAAO;IACzB,SAAS,EAAE,oBAAO;IAClB,YAAY,EAAE,oBAAO;IACrB,KAAK,EAAE,uBAAU;IACjB,UAAU,EAAE,wBAAW;IACvB,eAAe,EAAE,wBAAW;IAC5B,SAAS,EAAE,oBAAO;IAClB,IAAI,EAAE,wBAAW;IACjB,QAAQ,EAAE,wBAAW;IACrB,OAAO,EAAE,wBAAW;IACpB,SAAS,EAAE,wBAAW;IACtB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAO,EAAE,YAAY,CAAC;IACtC,OAAO,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IAC1B,aAAa,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;IACpC,WAAW,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjD,eAAe,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IAClC,qBAAqB,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IACxC,WAAW,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;IAClC,aAAa,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;CACrC,CAAC;AAIW,QAAA,QAAQ,GAAG,CAAC,CAAC,IAAI,CAC5B;IACE,GAAG,iBAAiB;IACpB,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAO,EAAE,YAAY,CAAC;CAC7C,EACD,UAAU,CACX,CAAC;AAMW,QAAA,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAC5C;IACE,GAAG,iBAAiB;IACpB,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,4BAAc,EAAE,sBAAsB,CAAC;CAC9D,EACD,0BAA0B,CAC3B,CAAC"}
1
+ {"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/internal/core/jsonrpc/types/output/block.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA2B;AAE3B,kDAA4D;AAC5D,8CAA0E;AAE1E,+CAA+C;AAE/C,MAAM,iBAAiB,GAAG,CAAC,CAAC,IAAI,CAC9B;IACE,KAAK,EAAE,wBAAW;IAClB,cAAc,EAAE,wBAAW;IAC3B,OAAO,EAAE,uBAAU;IACnB,MAAM,EAAE,wBAAW;CACpB,EACD,wBAAwB,CACzB,CAAC;AAEF,MAAM,iBAAiB,GAAG;IACxB,MAAM,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;IAC7B,IAAI,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IACvB,UAAU,EAAE,oBAAO;IACnB,KAAK,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IACxB,UAAU,EAAE,oBAAO;IACnB,SAAS,EAAE,oBAAO;IAClB,gBAAgB,EAAE,oBAAO;IACzB,SAAS,EAAE,oBAAO;IAClB,YAAY,EAAE,oBAAO;IACrB,KAAK,EAAE,uBAAU;IACjB,UAAU,EAAE,wBAAW;IACvB,yEAAyE;IACzE,eAAe,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;IACtC,SAAS,EAAE,oBAAO;IAClB,IAAI,EAAE,wBAAW;IACjB,QAAQ,EAAE,wBAAW;IACrB,OAAO,EAAE,wBAAW;IACpB,SAAS,EAAE,wBAAW;IACtB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAO,EAAE,YAAY,CAAC;IACtC,OAAO,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IAC1B,aAAa,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;IACpC,WAAW,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjD,eAAe,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IAClC,qBAAqB,EAAE,IAAA,gBAAQ,EAAC,oBAAO,CAAC;IACxC,WAAW,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;IAClC,aAAa,EAAE,IAAA,gBAAQ,EAAC,wBAAW,CAAC;CACrC,CAAC;AAIW,QAAA,QAAQ,GAAG,CAAC,CAAC,IAAI,CAC5B;IACE,GAAG,iBAAiB;IACpB,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAO,EAAE,YAAY,CAAC;CAC7C,EACD,UAAU,CACX,CAAC;AAMW,QAAA,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAC5C;IACE,GAAG,iBAAiB;IACpB,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,4BAAc,EAAE,sBAAsB,CAAC;CAC9D,EACD,0BAA0B,CAC3B,CAAC"}
package/internal/hardhat-network/stack-traces/constants.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- export declare const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.27";
1
+ export declare const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.28";
2
2
  export declare const FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
3
3
  //# sourceMappingURL=constants.d.ts.map
package/internal/hardhat-network/stack-traces/constants.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.FIRST_SOLC_VERSION_SUPPORTED = exports.SUPPORTED_SOLIDITY_VERSION_RANGE = void 0;
4
- exports.SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.27";
4
+ exports.SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.28";
5
5
  exports.FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
6
6
  //# sourceMappingURL=constants.js.map
package/internal/solidity/compiler/solc-info.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solc-info.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":"AAoEA,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAEpB"}
1
+ {"version":3,"file":"solc-info.d.ts","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":"AAqEA,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAEpB"}
package/internal/solidity/compiler/solc-info.js CHANGED
@@ -67,6 +67,7 @@ const defaultEvmTargets = {
67
67
  "0.8.25": "cancun",
68
68
  "0.8.26": "cancun",
69
69
  "0.8.27": "cancun",
70
+ "0.8.28": "cancun",
70
71
  };
71
72
  function getEvmVersionFromSolcVersion(solcVersion) {
72
73
  return defaultEvmTargets[solcVersion];
package/internal/solidity/compiler/solc-info.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solc-info.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GAA8B;IACnD,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;CACnB,CAAC;AAEF,SAAgB,4BAA4B,CAC1C,WAAmB;IAEnB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;AACxC,CAAC;AAJD,oEAIC"}
1
+ {"version":3,"file":"solc-info.js","sourceRoot":"","sources":["../../../src/internal/solidity/compiler/solc-info.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GAA8B;IACnD,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;CACnB,CAAC;AAEF,SAAgB,4BAA4B,CAC1C,WAAmB;IAEnB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;AACxC,CAAC;AAJD,oEAIC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hardhat",
3
- "version": "2.22.16",
3
+ "version": "2.22.17",
4
4
  "author": "Nomic Labs LLC",
5
5
  "license": "MIT",
6
6
  "homepage": "https://hardhat.org",
@@ -83,7 +83,7 @@
83
83
  "dependencies": {
84
84
  "@ethersproject/abi": "^5.1.2",
85
85
  "@metamask/eth-sig-util": "^4.0.0",
86
- "@nomicfoundation/edr": "^0.6.4",
86
+ "@nomicfoundation/edr": "^0.6.5",
87
87
  "@nomicfoundation/ethereumjs-common": "4.0.4",
88
88
  "@nomicfoundation/ethereumjs-tx": "5.0.4",
89
89
  "@nomicfoundation/ethereumjs-util": "9.0.4",
package/sample-projects/javascript/contracts/Lock.sol CHANGED
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: UNLICENSED
2
- pragma solidity ^0.8.27;
2
+ pragma solidity ^0.8.28;
3
3
 
4
4
  // Uncomment this line to use console.log
5
5
  // import "hardhat/console.sol";
package/sample-projects/javascript/hardhat.config.js CHANGED
@@ -2,5 +2,5 @@ require("@nomicfoundation/hardhat-toolbox");
2
2
 
3
3
  /** @type import('hardhat/config').HardhatUserConfig */
4
4
  module.exports = {
5
- solidity: "0.8.27",
5
+ solidity: "0.8.28",
6
6
  };
package/sample-projects/javascript-esm/contracts/Lock.sol CHANGED
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: UNLICENSED
2
- pragma solidity ^0.8.27;
2
+ pragma solidity ^0.8.28;
3
3
 
4
4
  // Uncomment this line to use console.log
5
5
  // import "hardhat/console.sol";
package/sample-projects/javascript-esm/hardhat.config.cjs CHANGED
@@ -2,5 +2,5 @@ require("@nomicfoundation/hardhat-toolbox");
2
2
 
3
3
  /** @type import('hardhat/config').HardhatUserConfig */
4
4
  module.exports = {
5
- solidity: "0.8.27",
5
+ solidity: "0.8.28",
6
6
  };
package/sample-projects/typescript/contracts/Lock.sol CHANGED
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: UNLICENSED
2
- pragma solidity ^0.8.27;
2
+ pragma solidity ^0.8.28;
3
3
 
4
4
  // Uncomment this line to use console.log
5
5
  // import "hardhat/console.sol";
package/sample-projects/typescript/hardhat.config.ts CHANGED
@@ -2,7 +2,7 @@ import { HardhatUserConfig } from "hardhat/config";
2
2
  import "@nomicfoundation/hardhat-toolbox";
3
3
 
4
4
  const config: HardhatUserConfig = {
5
- solidity: "0.8.27",
5
+ solidity: "0.8.28",
6
6
  };
7
7
 
8
8
  export default config;
package/sample-projects/typescript-viem/contracts/Lock.sol CHANGED
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: UNLICENSED
2
- pragma solidity ^0.8.27;
2
+ pragma solidity ^0.8.28;
3
3
 
4
4
  // Uncomment this line to use console.log
5
5
  // import "hardhat/console.sol";
package/sample-projects/typescript-viem/hardhat.config.ts CHANGED
@@ -2,7 +2,7 @@ import type { HardhatUserConfig } from "hardhat/config";
2
2
  import "@nomicfoundation/hardhat-toolbox-viem";
3
3
 
4
4
  const config: HardhatUserConfig = {
5
- solidity: "0.8.27",
5
+ solidity: "0.8.28",
6
6
  };
7
7
 
8
8
  export default config;
package/src/builtin-tasks/flatten.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import picocolors from "picocolors";
2
+ import { writeFileSync } from "node:fs";
2
3
  import { subtask, task, types } from "../internal/core/config/config-env";
3
4
  import { HardhatError } from "../internal/core/errors";
4
5
  import { ERRORS } from "../internal/core/errors-list";
@@ -303,46 +304,63 @@ task(
303
304
  undefined,
304
305
  types.inputFile
305
306
  )
306
- .setAction(async ({ files }: { files: string[] | undefined }, { run }) => {
307
- const [flattenedFile, metadata]: [string, FlattenMetadata | null] =
308
- await run(TASK_FLATTEN_GET_FLATTENED_SOURCE_AND_METADATA, { files });
309
-
310
- console.log(flattenedFile);
311
-
312
- if (metadata === null) return;
313
-
314
- if (metadata.filesWithoutLicenses.length > 0) {
315
- console.warn(
316
- picocolors.yellow(
317
- `\nThe following file(s) do NOT specify SPDX licenses: ${metadata.filesWithoutLicenses.join(
318
- ", "
319
- )}`
320
- )
321
- );
322
- }
307
+ .addOptionalParam(
308
+ "output",
309
+ "The output file containing the flattened contracts",
310
+ undefined,
311
+ types.string
312
+ )
313
+ .setAction(
314
+ async (
315
+ {
316
+ files,
317
+ output,
318
+ }: { files: string[] | undefined; output: string | undefined },
319
+ { run }
320
+ ) => {
321
+ const [flattenedFile, metadata]: [string, FlattenMetadata | null] =
322
+ await run(TASK_FLATTEN_GET_FLATTENED_SOURCE_AND_METADATA, { files });
323
+
324
+ if (output !== undefined) {
325
+ writeFileSync(output, flattenedFile, { encoding: "utf-8" });
326
+ } else {
327
+ console.log(flattenedFile);
328
+ }
329
+ if (metadata === null) return;
330
+
331
+ if (metadata.filesWithoutLicenses.length > 0) {
332
+ console.warn(
333
+ picocolors.yellow(
334
+ `\nThe following file(s) do NOT specify SPDX licenses: ${metadata.filesWithoutLicenses.join(
335
+ ", "
336
+ )}`
337
+ )
338
+ );
339
+ }
323
340
 
324
- if (
325
- metadata.pragmaDirective !== "" &&
326
- metadata.filesWithoutPragmaDirectives.length > 0
327
- ) {
328
- console.warn(
329
- picocolors.yellow(
330
- `\nPragma abicoder directives are defined in some files, but they are not defined in the following ones: ${metadata.filesWithoutPragmaDirectives.join(
331
- ", "
332
- )}`
333
- )
334
- );
335
- }
341
+ if (
342
+ metadata.pragmaDirective !== "" &&
343
+ metadata.filesWithoutPragmaDirectives.length > 0
344
+ ) {
345
+ console.warn(
346
+ picocolors.yellow(
347
+ `\nPragma abicoder directives are defined in some files, but they are not defined in the following ones: ${metadata.filesWithoutPragmaDirectives.join(
348
+ ", "
349
+ )}`
350
+ )
351
+ );
352
+ }
336
353
 
337
- if (metadata.filesWithDifferentPragmaDirectives.length > 0) {
338
- console.warn(
339
- picocolors.yellow(
340
- `\nThe flattened file is using the pragma abicoder directive '${
341
- metadata.pragmaDirective
342
- }' but these files have a different pragma abicoder directive: ${metadata.filesWithDifferentPragmaDirectives.join(
343
- ", "
344
- )}`
345
- )
346
- );
354
+ if (metadata.filesWithDifferentPragmaDirectives.length > 0) {
355
+ console.warn(
356
+ picocolors.yellow(
357
+ `\nThe flattened file is using the pragma abicoder directive '${
358
+ metadata.pragmaDirective
359
+ }' but these files have a different pragma abicoder directive: ${metadata.filesWithDifferentPragmaDirectives.join(
360
+ ", "
361
+ )}`
362
+ )
363
+ );
364
+ }
347
365
  }
348
- });
366
+ );
package/src/internal/cli/project-creation.ts CHANGED
@@ -260,7 +260,7 @@ async function printRecommendedDepsInstallationInstructions(
260
260
  // exported so we can test that it uses the latest supported version of solidity
261
261
  export const EMPTY_HARDHAT_CONFIG = `/** @type import('hardhat/config').HardhatUserConfig */
262
262
  module.exports = {
263
- solidity: "0.8.27",
263
+ solidity: "0.8.28",
264
264
  };
265
265
  `;
266
266
 
package/src/internal/core/jsonrpc/types/output/block.ts CHANGED
@@ -27,7 +27,8 @@ const baseBlockResponse = {
27
27
  receiptsRoot: rpcHash,
28
28
  miner: rpcAddress,
29
29
  difficulty: rpcQuantity,
30
- totalDifficulty: rpcQuantity,
30
+ // now optional since https://github.com/ethereum/execution-apis/pull/570
31
+ totalDifficulty: optional(rpcQuantity),
31
32
  extraData: rpcData,
32
33
  size: rpcQuantity,
33
34
  gasLimit: rpcQuantity,
package/src/internal/hardhat-network/stack-traces/constants.ts CHANGED
@@ -1,2 +1,2 @@
1
- export const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.27";
1
+ export const SUPPORTED_SOLIDITY_VERSION_RANGE = "<=0.8.28";
2
2
  export const FIRST_SOLC_VERSION_SUPPORTED = "0.5.1";
package/src/internal/solidity/compiler/solc-info.ts CHANGED
@@ -64,6 +64,7 @@ const defaultEvmTargets: { [key: string]: string } = {
64
64
  "0.8.25": "cancun",
65
65
  "0.8.26": "cancun",
66
66
  "0.8.27": "cancun",
67
+ "0.8.28": "cancun",
67
68
  };
68
69
 
69
70
  export function getEvmVersionFromSolcVersion(