Add support for the shanghai hardfork #3767

fvictorio · 2023-03-16T09:27:11Z

Adds support for the shanghai hardfork. The two main changes are:

Syncing our fork of ethereumjs with upstream, and making some changes to make allowUnlimitedContractSize to work with the EIP-3860 initcode limit.
Add withdrawals and withdrawalsRoot fields to RPC blocks if Shanghai is enabled

Some changes to the test setup were also needed here because getHardforkByBlockNumber doesn't work well for Shanghai if the block's timestamp is not passed.

changeset-bot · 2023-03-16T09:27:15Z

🦋 Changeset detected

Latest commit: fcb182d

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
hardhat	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

vercel · 2023-03-16T09:27:17Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated
hardhat	✅ Ready (Inspect)	Visit Preview	💬 Add your feedback	Mar 22, 2023 at 0:22AM (UTC)
hardhat-storybook	✅ Ready (Inspect)	Visit Preview	💬 Add your feedback	Mar 22, 2023 at 0:22AM (UTC)

fvictorio · 2023-03-16T11:09:32Z

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

 - london
 - arrowGlacier
+- grayGlacier


These two hardforks were missing in the list, so I just added them.

fvictorio · 2023-03-16T11:10:15Z

packages/hardhat-core/package.json

+    "@nomicfoundation/ethereumjs-trie": "5.0.4",
+    "@nomicfoundation/ethereumjs-tx": "4.1.1",
+    "@nomicfoundation/ethereumjs-util": "8.0.5",
+    "@nomicfoundation/ethereumjs-vm": "6.4.1",


I used pinned versions this time (I should've done that the previous time). The fork also has pinned versions in their intra-dependencies.

fvictorio · 2023-03-16T11:11:16Z

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

@@ -63,7 +63,7 @@ export abstract class BlockchainBase {

  public async getBlock(
    blockHashOrNumber: Buffer | bigint | number
-  ): Promise<Block | null> {
+  ): Promise<Block> {


BlockchainInterface has this breaking change.

fvictorio · 2023-03-16T11:11:41Z

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

+      if (blockByNumber === undefined) {
+        throw new Error("Block not found");
+      }
+      return blockByNumber;


We now throw instead of returning null when the block doesn't exist.

fvictorio · 2023-03-16T11:12:43Z

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

@@ -48,7 +48,8 @@ export function serializeTransaction(

 export function deserializeTransaction(
  tx: SerializedTransaction,
-  common: Common
+  common: Common,
+  { allowUnlimitedContractSize }: { allowUnlimitedContractSize: boolean }


A lot of the changes in this PR come from the fact that we need to pass the value of allowUnlimitedContractSize to be able to create transactions with the correct disableMaxInitCodeSizeCheck value.

I think this is a validation that is meant to be run only when receiving a new transaction, isn't it?

If that's the case we can run it in the RPC layer / Node, and use true everywhere else. WDYT?

You mean always using disableMaxInitCodeSizeCheck: true, and making the max initcode check ourselves in an upper layer? Makes sense to me, I'll do that.

fvictorio · 2023-03-16T11:17:52Z

...t-core/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts

@@ -68,7 +72,7 @@ export class ReadOnlyValidEIP1559Transaction extends FeeMarketEIP1559Transaction
      }
    );

-    super(data, { freeze: false, common: fakeCommon });
+    super(data, { ...opts, freeze: false, common: fakeCommon });


This kind of change is needed to pass the disableMaxInitCodeSizeCheck flag around.

See https://github.com/NomicFoundation/hardhat/pull/3767/files#r1143996647

fvictorio · 2023-03-16T11:18:37Z

packages/hardhat-core/test/internal/hardhat-network/helpers/contracts.ts

@@ -712,3 +712,38 @@ contract CallSelfDestruct {
  },
  topics: {},
 };
+
+export const EXAMPLE_TOUCH_ADDRESS_CONTRACT = {


This new example contract is used to test EIP-3651 (warm COINBASE)

fvictorio · 2023-03-16T11:19:11Z

packages/hardhat-core/test/internal/hardhat-network/provider/HardhatBlockchain.ts

-      assert.equal(await blockchain.getBlock(0), undefined);
-      assert.equal(await blockchain.getBlock(randomHashBuffer()), undefined);
+    it("throws error for non-existent block", async () => {
+      await assert.isRejected(blockchain.getBlock(0), "Block not found");


Some tests changed because getBlock now throws instead of returning null.

fvictorio · 2023-03-16T11:19:53Z

packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/hardforks.ts

@@ -1532,4 +1537,289 @@ describe("Eth module - hardfork dependant tests", function () {
      });
    });
  });
+
+  describe("shanghai hardfork", function () {


These are the most interesting tests, please review them carefully.

fvictorio · 2023-03-16T11:21:23Z

packages/hardhat-core/test/internal/hardhat-network/provider/node.ts

    ];

    for (const { url, blockToRun, networkName, chainId } of forkedBlocks) {
      const remoteCommon = new Common({ chain: chainId });
-      const hardfork = remoteCommon.getHardforkByBlockNumber(blockToRun);


This doesn't work for shanghai because getHardforkByBlockNumber needs the block timestamp to correctly detect that a block is in that hardfork. Now the hardfork is detected inside runFullBlock because we have fetched the block there and can pass the timestamp.

Not sure if I follow this, but the rest LGTM

fvictorio added 11 commits March 16, 2023 10:25

Upgrade forked ethereumjs dependencies

b04c26c

Adapt blockchain implementations to changed interface

cbf185e

Skip debug module tests

8511d4c

Add shanghai to the list of supported hardforks

05b67f0

Make allowUnlimitedContractSize skip EIP-3860 check

602440a

Add withdrawals and withdrawalsRoot to blocks

3ea0860

Use the right hardfork when processing remote blocks

fbe7235

Skip hardfork validation when running txs

1a5a113

Fix some failing tests after upgrading ethereumjs

878bbb2

Add sepolia shanghai block to tests

e39c7aa

Some changes to the test setup were also needed here because getHardforkByBlockNumber doesn't work well for Shanghai if the block's timestamp is not passed.

Add shanghai tests

7dd1a7d

fvictorio requested a review from alcuadrado March 16, 2023 09:27

github-actions bot added the status:triaging label Mar 16, 2023

vercel bot deployed to Preview – hardhat-storybook March 16, 2023 09:28 View deployment

vercel bot deployed to Preview – hardhat March 16, 2023 09:29 View deployment

Create .changeset/orange-boxes-burn.md

cdd9aa5

vercel bot deployed to Preview – hardhat-storybook March 16, 2023 09:31 View deployment

vercel bot deployed to Preview – hardhat March 16, 2023 09:32 View deployment

Upgrade ethereumjs

5625cfd

vercel bot deployed to Preview – hardhat-storybook March 16, 2023 10:22 View deployment

vercel bot deployed to Preview – hardhat March 16, 2023 10:23 View deployment

fvictorio commented Mar 16, 2023

View reviewed changes

Upgrade ethereumjs versions to next major

02b9625

vercel bot deployed to Preview – hardhat-storybook March 16, 2023 19:42 View deployment

vercel bot deployed to Preview – hardhat March 16, 2023 19:42 View deployment

fvictorio added 3 commits March 22, 2023 13:19

Set disableMaxInitCodeSizeCheck to true by default

0932974

Validate max init code size in the JSON-RPC layer

9f27a75

Add max initcode tests for eth_sendRawTransaction

fcb182d

vercel bot deployed to Preview – hardhat-storybook March 22, 2023 12:21 View deployment

vercel bot deployed to Preview – hardhat March 22, 2023 12:22 View deployment

alcuadrado approved these changes Apr 7, 2023

View reviewed changes

fvictorio merged commit 7645946 into main Apr 10, 2023

fvictorio deleted the shanghai branch April 10, 2023 08:25

github-actions bot locked as resolved and limited conversation to collaborators Jul 10, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for the shanghai hardfork #3767

Add support for the shanghai hardfork #3767

fvictorio commented Mar 16, 2023 •

edited

Loading

changeset-bot bot commented Mar 16, 2023 •

edited

Loading

vercel bot commented Mar 16, 2023 •

edited

Loading

fvictorio Mar 16, 2023

fvictorio Mar 16, 2023

fvictorio Mar 16, 2023

fvictorio Mar 16, 2023

fvictorio Mar 16, 2023

alcuadrado Mar 21, 2023

fvictorio Mar 22, 2023 •

edited

Loading

fvictorio Mar 16, 2023

alcuadrado Mar 21, 2023

fvictorio Mar 16, 2023

fvictorio Mar 16, 2023

fvictorio Mar 16, 2023

fvictorio Mar 16, 2023

alcuadrado Apr 7, 2023

Add support for the shanghai hardfork #3767

Add support for the shanghai hardfork #3767

Conversation

fvictorio commented Mar 16, 2023 • edited Loading

changeset-bot bot commented Mar 16, 2023 • edited Loading

🦋 Changeset detected

vercel bot commented Mar 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fvictorio Mar 22, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fvictorio commented Mar 16, 2023 •

edited

Loading

changeset-bot bot commented Mar 16, 2023 •

edited

Loading

vercel bot commented Mar 16, 2023 •

edited

Loading

fvictorio Mar 22, 2023 •

edited

Loading