[WIP - DO NOT MERGE] Prague support

docs/src/content/hardhat-network/docs/reference/index.md

@@ -14,6 +14,7 @@
 - merge
 - shanghai
 - cancun
+- prague
 
 ## Config
 
@@ -66,7 +67,7 @@ The block gas limit to use in Hardhat Network's blockchain. Default value: `30_0
 
 #### `hardfork`
 
-This setting changes how Hardhat Network works, to mimic Ethereum's mainnet at a given hardfork. It must be one of `"byzantium"`, `"constantinople"`, `"petersburg"`, `"istanbul"`, `"muirGlacier"`, `"berlin"`, `"london"`, `"arrowGlacier"`, `"grayGlacier"`, `"merge"`, `"shanghai"` and `"cancun"`. Default value: `"cancun"`
+This setting changes how Hardhat Network works, to mimic Ethereum's mainnet at a given hardfork. It must be one of `"byzantium"`, `"constantinople"`, `"petersburg"`, `"istanbul"`, `"muirGlacier"`, `"berlin"`, `"london"`, `"arrowGlacier"`, `"grayGlacier"`, `"merge"`, `"shanghai"`, `"cancun"` and `"prague"`. Default value: `"cancun"`
 
 #### `throwOnTransactionFailures`
 

packages/hardhat-core/package.json

@@ -59,7 +59,6 @@
   "devDependencies": {
     "@nomicfoundation/eslint-plugin-hardhat-internal-rules": "workspace:^",
     "@nomicfoundation/eslint-plugin-slow-imports": "workspace:^",
-    "@nomicfoundation/ethereumjs-block": "5.0.4",
     "@types/async-eventemitter": "^0.2.1",
     "@types/bn.js": "^5.1.0",
     "@types/chai": "^4.2.0",
@@ -98,12 +97,12 @@
     "typescript": "~5.0.0"
   },
   "dependencies": {
+    "@ethereumjs/common": "^4.4.0",
+    "@ethereumjs/tx": "^5.4.0",
+    "@ethereumjs/util": "^9.1.0",
     "@ethersproject/abi": "^5.1.2",
     "@metamask/eth-sig-util": "^4.0.0",
     "@nomicfoundation/edr": "^0.8.0",
-    "@nomicfoundation/ethereumjs-common": "4.0.4",
-    "@nomicfoundation/ethereumjs-tx": "5.0.4",
-    "@nomicfoundation/ethereumjs-util": "9.0.4",
     "@nomicfoundation/solidity-analyzer": "^0.1.0",
     "@sentry/node": "^5.18.1",
     "@types/bn.js": "^5.1.0",
@@ -118,7 +117,6 @@
     "enquirer": "^2.3.0",
     "env-paths": "^2.2.0",
     "ethereum-cryptography": "^1.0.3",
-    "ethereumjs-abi": "^0.6.8",
     "find-up": "^5.0.0",
     "fp-ts": "1.19.3",
     "fs-extra": "^7.0.1",

packages/hardhat-core/src/builtin-tasks/node.ts

@@ -1,4 +1,4 @@
-import type EthereumjsUtilT from "@nomicfoundation/ethereumjs-util";
+import type EthereumjsUtilT from "@ethereumjs/util";
 
 import picocolors from "picocolors";
 import debug from "debug";
@@ -56,7 +56,7 @@ function logHardhatNetworkAccounts(networkConfig: HardhatNetworkConfig) {
     privateToAddress,
     toBytes,
     toChecksumAddress,
-  } = require("@nomicfoundation/ethereumjs-util") as typeof EthereumjsUtilT;
+  } = require("@ethereumjs/util") as typeof EthereumjsUtilT;
 
   console.log("Accounts");
   console.log("========");

packages/hardhat-core/src/internal/constants.ts

@@ -23,6 +23,7 @@ export const HARDHAT_NETWORK_SUPPORTED_HARDFORKS = [
   "merge",
   "shanghai",
   "cancun",
+  "prague",
 ];
 
 export const HARDHAT_MEMPOOL_SUPPORTED_ORDERS = ["fifo", "priority"] as const;

packages/hardhat-core/src/internal/core/config/config-resolution.ts

@@ -238,19 +238,6 @@ function resolveHardhatNetworkConfig(
     delete config.initialBaseFeePerGas;
   }
 
-  if (
-    hardhatNetworkConfig.enableTransientStorage === true &&
-    hardhatNetworkConfig.hardfork === undefined
-  ) {
-    config.hardfork = "cancun";
-  }
-  if (
-    hardhatNetworkConfig.enableTransientStorage === false &&
-    hardhatNetworkConfig.hardfork === undefined
-  ) {
-    config.hardfork = "shanghai";
-  }
-
   return config;
 }
 

packages/hardhat-core/src/internal/core/config/default-config.ts

@@ -77,6 +77,7 @@ export const defaultHardhatNetworkParams: Omit<
           [HardforkName.MERGE, 15_537_394],
           [HardforkName.SHANGHAI, 17_034_870],
           [HardforkName.CANCUN, 19_426_589],
+          [HardforkName.PRAGUE, -1], // TBD
         ]),
       },
     ],
@@ -138,6 +139,7 @@ export const defaultHardhatNetworkParams: Omit<
           [HardforkName.MERGE, 1_450_409],
           [HardforkName.SHANGHAI, 2_990_908],
           [HardforkName.CANCUN, 5_187_023],
+          [HardforkName.PRAGUE, -1], // TBD
         ]),
       },
     ],

packages/hardhat-core/src/internal/core/jsonrpc/types/base-types.ts

@@ -2,7 +2,7 @@ import {
   bytesToHex as bufferToHex,
   isValidAddress,
   toBytes,
-} from "@nomicfoundation/ethereumjs-util";
+} from "@ethereumjs/util";
 import * as t from "io-ts";
 
 import * as BigIntUtils from "../../../util/bigint";

packages/hardhat-core/src/internal/core/providers/accounts.ts

@@ -1,7 +1,7 @@
 import * as t from "io-ts";
 
 import { signTypedData, SignTypedDataVersion } from "@metamask/eth-sig-util";
-import { FeeMarketEIP1559Transaction } from "@nomicfoundation/ethereumjs-tx";
+import { FeeMarketEIP1559Transaction } from "@ethereumjs/tx";
 import { EIP1193Provider, RequestArguments } from "../../../types";
 import { HardhatError } from "../errors";
 import { ERRORS } from "../errors-list";
@@ -49,7 +49,7 @@ export class LocalAccountsProvider extends ProviderWrapperWithChainId {
       toRpcSig,
       toBytes,
       bytesToHex: bufferToHex,
-    } = await import("@nomicfoundation/ethereumjs-util");
+    } = await import("@ethereumjs/util");
 
     if (
       args.method === "eth_accounts" ||
@@ -197,7 +197,7 @@ export class LocalAccountsProvider extends ProviderWrapperWithChainId {
       bytesToHex: bufferToHex,
       toBytes,
       privateToAddress,
-    } = require("@nomicfoundation/ethereumjs-util");
+    } = require("@ethereumjs/util");
 
     const privateKeys: Buffer[] = localAccountsHexPrivateKeys.map((h) =>
       toBytes(h)
@@ -210,9 +210,7 @@ export class LocalAccountsProvider extends ProviderWrapperWithChainId {
   }
 
   private _getPrivateKeyForAddress(address: Buffer): Buffer {
-    const {
-      bytesToHex: bufferToHex,
-    } = require("@nomicfoundation/ethereumjs-util");
+    const { bytesToHex: bufferToHex } = require("@ethereumjs/util");
     const pk = this._addressToPrivateKey.get(bufferToHex(address));
     if (pk === undefined) {
       throw new HardhatError(ERRORS.NETWORK.NOT_LOCAL_ACCOUNT, {
@@ -232,9 +230,7 @@ export class LocalAccountsProvider extends ProviderWrapperWithChainId {
   }
 
   private async _getNonce(address: Buffer): Promise<bigint> {
-    const { bytesToHex: bufferToHex } = await import(
-      "@nomicfoundation/ethereumjs-util"
-    );
+    const { bytesToHex: bufferToHex } = await import("@ethereumjs/util");
 
     const response = (await this._wrappedProvider.request({
       method: "eth_getTransactionCount",
@@ -250,10 +246,10 @@ export class LocalAccountsProvider extends ProviderWrapperWithChainId {
     privateKey: Buffer
   ): Promise<Uint8Array> {
     const { AccessListEIP2930Transaction, LegacyTransaction } = await import(
-      "@nomicfoundation/ethereumjs-tx"
+      "@ethereumjs/tx"
     );
 
-    const { Common } = await import("@nomicfoundation/ethereumjs-common");
+    const { Common } = await import("@ethereumjs/common");
 
     const txData = {
       ...transactionRequest,
@@ -320,9 +316,7 @@ export class HDWalletProvider extends LocalAccountsProvider {
       passphrase
     );
 
-    const {
-      bytesToHex: bufferToHex,
-    } = require("@nomicfoundation/ethereumjs-util");
+    const { bytesToHex: bufferToHex } = require("@ethereumjs/util");
     const privateKeysAsHex = privateKeys.map((pk) => bufferToHex(pk));
     super(provider, privateKeysAsHex);
   }

packages/hardhat-core/src/internal/core/providers/util.ts

@@ -53,7 +53,7 @@ export function normalizeHardhatNetworkAccountsConfig(
     return accountsConfig;
   }
 
-  const { bytesToHex } = require("@nomicfoundation/ethereumjs-util");
+  const { bytesToHex } = require("@ethereumjs/util");
 
   return derivePrivateKeys(
     accountsConfig.mnemonic,

packages/hardhat-core/src/internal/hardhat-network/jsonrpc/client.ts

@@ -1,7 +1,4 @@
-import {
-  Address,
-  bytesToHex as bufferToHex,
-} from "@nomicfoundation/ethereumjs-util";
+import { Address, bytesToHex as bufferToHex } from "@ethereumjs/util";
 import fsExtra from "fs-extra";
 import * as t from "io-ts";
 import path from "path";

packages/hardhat-core/src/internal/hardhat-network/provider/node-types.ts

@@ -72,7 +72,7 @@ export interface LegacyTransactionParams extends BaseTransactionParams {
 
 export interface AccessListTransactionParams extends BaseTransactionParams {
   gasPrice: bigint;
-  // We use this access list format because @nomicfoundation/ethereumjs-tx access list data
+  // We use this access list format because @ethereumjs/tx access list data
   // forces us to use it or stringify them
   accessList: AccessListBufferItem[];
   // We don't include chainId as it's not necessary, the node

packages/hardhat-core/src/internal/hardhat-network/provider/provider.ts

@@ -14,7 +14,7 @@ import type {
   HttpHeader,
   TracingConfigWithBuffers,
 } from "@nomicfoundation/edr";
-import { Common } from "@nomicfoundation/ethereumjs-common";
+import { Common } from "@ethereumjs/common";
 import picocolors from "picocolors";
 import debug from "debug";
 import { EventEmitter } from "events";

packages/hardhat-core/src/internal/hardhat-network/provider/utils/convertToEdr.ts

@@ -7,7 +7,7 @@ import type {
   TracingMessageResult,
   TracingStep,
 } from "@nomicfoundation/edr";
-import { Address } from "@nomicfoundation/ethereumjs-util";
+import { Address } from "@ethereumjs/util";
 
 import { requireNapiRsModule } from "../../../../common/napi-rs";
 import { HardforkName } from "../../../util/hardforks";
@@ -61,6 +61,9 @@ export function ethereumsjsHardforkToEdrSpecId(hardfork: HardforkName): SpecId {
       return SpecId.Shanghai;
     case HardforkName.CANCUN:
       return SpecId.Cancun;
+    case HardforkName.PRAGUE:
+      // TODO: update the value when Prague is added to EDR
+      return SpecId.Cancun;
     default:
       const _exhaustiveCheck: never = hardfork;
       throw new Error(
@@ -107,9 +110,11 @@ export function edrSpecIdToEthereumHardfork(specId: SpecId): HardforkName {
       return HardforkName.MERGE;
     case SpecId.Shanghai:
       return HardforkName.SHANGHAI;
-    // HACK: EthereumJS doesn't support Cancun, so report Shanghai
     case SpecId.Cancun:
-      return HardforkName.SHANGHAI;
+      return HardforkName.CANCUN;
+    // TODO: uncomment when Prague is added to EDR
+    /*     case SpecId.Prague:
+      return HardforkName.PRAGUE; */
 
     default:
       throw new Error(`Unknown spec id '${specId}', this shouldn't happen`);

packages/hardhat-core/src/internal/hardhat-network/provider/utils/makeAccount.ts

@@ -1,9 +1,4 @@
-import {
-  Account,
-  Address,
-  privateToAddress,
-  toBytes,
-} from "@nomicfoundation/ethereumjs-util";
+import { Account, Address, privateToAddress, toBytes } from "@ethereumjs/util";
 
 import { GenesisAccount } from "../node-types";
 

packages/hardhat-core/src/internal/hardhat-network/provider/utils/makeCommon.ts

@@ -1,4 +1,4 @@
-import { Common } from "@nomicfoundation/ethereumjs-common";
+import { Common } from "@ethereumjs/common";
 
 import { LocalNodeConfig } from "../node-types";
 import { HardforkName } from "../../../util/hardforks";

packages/hardhat-core/src/internal/hardhat-network/provider/utils/random.ts

@@ -1,4 +1,4 @@
-import type EthereumjsUtilT from "@nomicfoundation/ethereumjs-util";
+import type EthereumjsUtilT from "@ethereumjs/util";
 import type * as UtilKeccakT from "../../../util/keccak";
 
 export class RandomBufferGenerator {
@@ -37,7 +37,7 @@ export class RandomBufferGenerator {
 
 export const randomHash = () => {
   const { bytesToHex: bufferToHex } =
-    require("@nomicfoundation/ethereumjs-util") as typeof EthereumjsUtilT;
+    require("@ethereumjs/util") as typeof EthereumjsUtilT;
   return bufferToHex(randomHashBuffer());
 };
 
@@ -47,14 +47,13 @@ export const randomHashBuffer = (): Uint8Array => {
 };
 
 export const randomAddress = () => {
-  const { Address } =
-    require("@nomicfoundation/ethereumjs-util") as typeof EthereumjsUtilT;
+  const { Address } = require("@ethereumjs/util") as typeof EthereumjsUtilT;
   return new Address(randomAddressBuffer());
 };
 
 export const randomAddressString = () => {
   const { bytesToHex: bufferToHex } =
-    require("@nomicfoundation/ethereumjs-util") as typeof EthereumjsUtilT;
+    require("@ethereumjs/util") as typeof EthereumjsUtilT;
   return bufferToHex(randomAddressBuffer());
 };
 

packages/hardhat-core/src/internal/hardhat-network/provider/vm/minimal-vm.ts

@@ -1,12 +1,12 @@
 import type { Provider as EdrProviderT } from "@nomicfoundation/edr";
-import type { Address } from "@nomicfoundation/ethereumjs-util";
+import type { Address } from "@ethereumjs/util";
 import type {
   MinimalEVMResult,
   MinimalInterpreterStep,
   MinimalMessage,
 } from "./types";
 
-import { AsyncEventEmitter } from "@nomicfoundation/ethereumjs-util";
+import { AsyncEventEmitter } from "@ethereumjs/util";
 
 /**
  * Used by the provider to keep the `_vm` variable used by some plugins. This

packages/hardhat-core/src/internal/hardhat-network/provider/vm/types.ts

@@ -1,5 +1,5 @@
 import type { ExceptionalHalt, SuccessReason } from "@nomicfoundation/edr";
-import type { Address } from "@nomicfoundation/ethereumjs-util";
+import type { Address } from "@ethereumjs/util";
 
 /**
  * These types are minimal versions of the values returned by ethereumjs

packages/hardhat-core/src/internal/hardhat-network/stack-traces/consoleLogger.ts

@@ -3,7 +3,7 @@ import {
   bytesToHex as bufferToHex,
   bytesToInt,
   fromSigned,
-} from "@nomicfoundation/ethereumjs-util";
+} from "@ethereumjs/util";
 import util from "util";
 
 import {

packages/hardhat-core/src/internal/hardhat-network/stack-traces/solidity-errors.ts

@@ -1,4 +1,4 @@
-import { bytesToHex as bufferToHex } from "@nomicfoundation/ethereumjs-util";
+import { bytesToHex as bufferToHex } from "@ethereumjs/util";
 
 import { ReturnData } from "../provider/return-data";
 import { panicErrorCodeToMessage } from "./panic-errors";

packages/hardhat-core/src/internal/solidity/compiler/downloader.ts

@@ -317,7 +317,7 @@ export class CompilerDownloader implements ICompilerDownloader {
     downloadPath: string
   ): Promise<boolean> {
     const { bytesToHex } =
-      require("@nomicfoundation/ethereumjs-util") as typeof import("@nomicfoundation/ethereumjs-util");
+      require("@ethereumjs/util") as typeof import("@ethereumjs/util");
     const { keccak256 } = await import("../../util/keccak");
 
     const expectedKeccak256 = build.keccak256;

packages/hardhat-core/src/internal/util/hardforks.ts

@@ -23,6 +23,7 @@ export enum HardforkName {
   MERGE = "merge",
   SHANGHAI = "shanghai",
   CANCUN = "cancun",
+  PRAGUE = "prague",
 }
 
 const HARDFORKS_ORDER: HardforkName[] = [
@@ -43,6 +44,7 @@ const HARDFORKS_ORDER: HardforkName[] = [
   HardforkName.MERGE,
   HardforkName.SHANGHAI,
   HardforkName.CANCUN,
+  HardforkName.PRAGUE,
 ];
 
 export function getHardforkName(name: string): HardforkName {