Upgrade to EDR v0.5 and add enableRip7212 option (#5512)

Co-authored-by: Franco Victorio <[email protected]>
NomicFoundation · Jul 18, 2024 · f944cd5 · f944cd5
1 parent 739d593
commit f944cd5
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 34 deletions.
diff --git a/.changeset/great-crabs-hug.md b/.changeset/great-crabs-hug.md
@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Added an `enableRip7212` optional flag to the Hardhat Network config that enables [RIP-7212 (Precompile for secp256r1 Curve Support)](https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md).
diff --git a/.changeset/modern-points-cover.md b/.changeset/modern-points-cover.md
@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Bumped EDR to [v0.5.0](https://github.com/NomicFoundation/edr/releases/tag/%40nomicfoundation%2Fedr%400.5.0).
diff --git a/docs/src/content/hardhat-network/docs/reference/index.md b/docs/src/content/hardhat-network/docs/reference/index.md
@@ -122,6 +122,10 @@ The `baseFeePerGas` of the first block. Note that when forking a remote network,
 
 The address used as coinbase in new blocks. Default value: `"0xc014ba5ec014ba5ec014ba5ec014ba5ec014ba5e"`.
 
+#### `enableRip7212`
+
+A flag indicating whether to enable [RIP-7212 (Precompile for secp256r1 Curve Support)](https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md). Default value: `false`.
+
 ### Mining modes
 
 You can configure the mining behavior under your Hardhat Network settings:

diff --git a/packages/hardhat-core/package.json b/packages/hardhat-core/package.json
@@ -102,7 +102,7 @@
   "dependencies": {
     "@ethersproject/abi": "^5.1.2",
     "@metamask/eth-sig-util": "^4.0.0",
-    "@nomicfoundation/edr": "^0.4.2",
+    "@nomicfoundation/edr": "^0.5.0",
     "@nomicfoundation/ethereumjs-common": "4.0.4",
     "@nomicfoundation/ethereumjs-tx": "5.0.4",
     "@nomicfoundation/ethereumjs-util": "9.0.4",

diff --git a/packages/hardhat-core/src/internal/core/providers/construction.ts b/packages/hardhat-core/src/internal/core/providers/construction.ts
@@ -114,6 +114,7 @@ export async function createProvider(
           paths !== undefined ? getForkCacheDirPath(paths) : undefined,
         enableTransientStorage:
           hardhatNetConfig.enableTransientStorage ?? false,
+        enableRip7212: hardhatNetConfig.enableRip7212 ?? false,
       },
       {
         enabled: hardhatNetConfig.loggingEnabled,

diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/provider.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/provider.ts
@@ -120,6 +120,7 @@ interface HardhatNetworkProviderConfig {
   forkConfig?: ForkConfig;
   forkCachePath?: string;
   enableTransientStorage: boolean;
+  enableRip7212: boolean;
 }
 
 export function getNodeConfig(
@@ -255,6 +256,7 @@ export class EdrProviderWrapper
         }),
         cacheDir: config.forkCachePath,
         coinbase: Buffer.from(coinbase.slice(2), "hex"),
+        enableRip7212: config.enableRip7212,
         fork,
         hardfork: ethereumsjsHardforkToEdrSpecId(hardforkName),
         genesisAccounts: config.genesisAccounts.map((account) => {

diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/vm/exit.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/vm/exit.ts
@@ -24,6 +24,7 @@ export class Exit {
       case SuccessReason.Stop:
       case SuccessReason.Return:
       case SuccessReason.SelfDestruct:
+      case SuccessReason.EofReturnContract:
         return new Exit(ExitCode.SUCCESS);
     }
 

diff --git a/packages/hardhat-core/src/types/config.ts b/packages/hardhat-core/src/types/config.ts
@@ -58,6 +58,7 @@ export interface HardhatNetworkUserConfig {
   coinbase?: string;
   chains?: HardhatNetworkChainsUserConfig;
   enableTransientStorage?: boolean;
+  enableRip7212?: boolean;
 }
 
 export type HardhatNetworkAccountsUserConfig =
@@ -155,6 +156,7 @@ export interface HardhatNetworkConfig {
   chains: HardhatNetworkChainsConfig;
   allowBlocksWithSameTimestamp?: boolean;
   enableTransientStorage?: boolean;
+  enableRip7212?: boolean;
 }
 
 export type HardhatNetworkAccountsConfig =

diff --git a/packages/hardhat-core/test/internal/hardhat-network/helpers/useProvider.ts b/packages/hardhat-core/test/internal/hardhat-network/helpers/useProvider.ts
@@ -101,6 +101,7 @@ export function useProvider({
         coinbase,
         allowBlocksWithSameTimestamp,
         enableTransientStorage: false,
+        enableRip7212: false,
       },
       {
         enabled: loggerEnabled,

diff --git a/packages/hardhat-core/test/internal/hardhat-network/stack-traces/execution.ts b/packages/hardhat-core/test/internal/hardhat-network/stack-traces/execution.ts
@@ -53,6 +53,7 @@ export async function instantiateProvider(
     coinbase: "0x0000000000000000000000000000000000000000",
     initialBaseFeePerGas: 0,
     enableTransientStorage: false,
+    enableRip7212: false,
   };
 
   const provider = await EdrProviderWrapper.create(

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml