cmd/geth, cmd/evm, params: implement Arrow Glacier (EIP 4345) (ethere…

…um#23810)

This PR adds support for ArrowGlacier, as defined by

    https:/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/arrow-glacier.md
    https://eips.ethereum.org/EIPS/eip-4345

> Starting with FORK_BLOCK_NUMBER the client will calculate the difficulty based on a fake block number suggesting to the client that the difficulty bomb is adjusting 10,700,000 blocks later than the actual block number.

This also adds support for evm t8n to return the calculated difficulty, so it can be used to construct test.

cmd/evm/t8n_test.go

@@ -171,13 +171,45 @@ func TestT8n(t *testing.T) {
  output: t8nOutput{result: true},
  expOut: "exp2.json",
  },
+ { // Difficulty calculation - with uncles + Berlin
+ base: "./testdata/14",
+ input: t8nInput{
+ "alloc.json", "txs.json", "env.uncles.json", "Berlin", "",
+ },
+ output: t8nOutput{result: true},
+ expOut: "exp_berlin.json",
+ },
+ { // Difficulty calculation on arrow glacier
+ base: "./testdata/19",
+ input: t8nInput{
+ "alloc.json", "txs.json", "env.json", "London", "",
+ },
+ output: t8nOutput{result: true},
+ expOut: "exp_london.json",
+ },
+ { // Difficulty calculation on arrow glacier
+ base: "./testdata/19",
+ input: t8nInput{
+ "alloc.json", "txs.json", "env.json", "ArrowGlacier", "",
+ },
+ output: t8nOutput{result: true},
+ expOut: "exp_arrowglacier.json",
+ },
  } {
 
  args := []string{"t8n"}
  args = append(args, tc.output.get()...)
  args = append(args, tc.input.get(tc.base)...)
+ var qArgs []string // quoted args for debugging purposes
+ for _, arg := range args {
+ if len(arg) == 0 {
+ qArgs = append(qArgs, `""`)
+ } else {
+ qArgs = append(qArgs, arg)
+ }
+ }
+ tt.Logf("args: %v\n", strings.Join(qArgs, " "))
  tt.Run("evm-test", args...)
- tt.Logf("args: %v\n", strings.Join(args, " "))
  // Compare the expected output, if provided
  if tc.expOut != "" {
  want, err := os.ReadFile(fmt.Sprintf("%v/%v", tc.base, tc.expOut))

cmd/evm/testdata/14/exp_berlin.json

@@ -0,0 +1,11 @@
+{
+ "result": {
+ "stateRoot": "0x6f058887ca01549716789c380ede95aecc510e6d1fdc4dbf67d053c7c07f4bdc",
+ "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "receiptRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "receipts": [],
+ "currentDifficulty": "0x1ff9000000000"
+ }
+}

cmd/evm/testdata/19/alloc.json

@@ -0,0 +1,12 @@
+{
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "balance": "0x5ffd4878be161d74",
+ "code": "0x",
+ "nonce": "0xac",
+ "storage": {}
+ },
+ "0x8a8eafb1cf62bfbeb1741769dae1a9dd47996192":{
+ "balance": "0xfeedbead",
+ "nonce" : "0x00"
+ }
+}

cmd/evm/testdata/19/env.json

@@ -0,0 +1,9 @@
+{
+ "currentCoinbase": "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+ "currentGasLimit": "0x750a163df65e8a",
+ "currentBaseFee": "0x500",
+ "currentNumber": "13000000",
+ "currentTimestamp": "100015",
+ "parentTimestamp" : "99999",
+ "parentDifficulty" : "0x2000000000000"
+}

cmd/evm/testdata/19/exp_arrowglacier.json

@@ -0,0 +1,11 @@
+{
+ "result": {
+ "stateRoot": "0x6f058887ca01549716789c380ede95aecc510e6d1fdc4dbf67d053c7c07f4bdc",
+ "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "receiptRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "currentDifficulty": "0x2000000200000",
+ "receipts": []
+ }
+}

cmd/evm/testdata/19/exp_london.json

@@ -0,0 +1,11 @@
+{
+ "result": {
+ "stateRoot": "0x6f058887ca01549716789c380ede95aecc510e6d1fdc4dbf67d053c7c07f4bdc",
+ "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "receiptRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "currentDifficulty": "0x2000080000000",
+ "receipts": []
+ }
+}

cmd/evm/testdata/19/readme.md

@@ -0,0 +1,9 @@
+## Difficulty calculation
+
+This test shows how the `evm t8n` can be used to calculate the (ethash) difficulty, if none is provided by the caller, 
+this time on `ArrowGlacier` (Eip 4345).
+
+Calculating it (with an empty set of txs) using `ArrowGlacier` rules (and no provided unclehash for the parent block):
+```
+[user@work evm]$ ./evm t8n --input.alloc=./testdata/14/alloc.json --input.txs=./testdata/14/txs.json --input.env=./testdata/14/env.json --output.result=stdout --state.fork=ArrowGlacier
+```

cmd/evm/testdata/19/txs.json

@@ -0,0 +1 @@
+[]

cmd/geth/config.go

@@ -156,8 +156,8 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 // makeFullNode loads geth configuration and creates the Ethereum backend.
 func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
  stack, cfg := makeConfigNode(ctx)
- if ctx.GlobalIsSet(utils.OverrideLondonFlag.Name) {
- cfg.Eth.OverrideLondon = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideLondonFlag.Name))
+ if ctx.GlobalIsSet(utils.OverrideArrowGlacierFlag.Name) {
+ cfg.Eth.OverrideArrowGlacier = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideArrowGlacierFlag.Name))
  }
  backend, eth := utils.RegisterEthService(stack, &cfg.Eth)
 

cmd/geth/main.go

@@ -66,7 +66,7 @@ var (
  utils.NoUSBFlag,
  utils.USBFlag,
  utils.SmartCardDaemonPathFlag,
- utils.OverrideLondonFlag,
+ utils.OverrideArrowGlacierFlag,
  utils.EthashCacheDirFlag,
  utils.EthashCachesInMemoryFlag,
  utils.EthashCachesOnDiskFlag,

cmd/utils/flags.go

@@ -235,9 +235,9 @@ var (
  Usage: "Megabytes of memory allocated to bloom-filter for pruning",
  Value: 2048,
  }
- OverrideLondonFlag = cli.Uint64Flag{
- Name: "override.london",
- Usage: "Manually specify London fork-block, overriding the bundled setting",
+ OverrideArrowGlacierFlag = cli.Uint64Flag{
+ Name: "override.arrowglacier",
+ Usage: "Manually specify Arrow Glacier fork-block, overriding the bundled setting",
  }
  // Light server and client settings
  LightServeFlag = cli.IntFlag{

consensus/ethash/consensus.go

@@ -45,6 +45,11 @@ var (
  maxUncles = 2 // Maximum number of uncles allowed in a single block
  allowedFutureBlockTimeSeconds = int64(15) // Max seconds from current time allowed for blocks, before they're considered future blocks
 
+ // calcDifficultyEip4345 is the difficulty adjustment algorithm as specified by EIP 4345.
+ // It offsets the bomb a total of 10.7M blocks.
+ // Specification EIP-4345: https://eips.ethereum.org/EIPS/eip-4345
+ calcDifficultyEip4345 = makeDifficultyCalculator(big.NewInt(10_700_000))
+
  // calcDifficultyEip3554 is the difficulty adjustment algorithm as specified by EIP 3554.
  // It offsets the bomb a total of 9.7M blocks.
  // Specification EIP-3554: https://eips.ethereum.org/EIPS/eip-3554
@@ -330,6 +335,8 @@ func (ethash *Ethash) CalcDifficulty(chain consensus.ChainHeaderReader, time uin
 func CalcDifficulty(config *params.ChainConfig, time uint64, parent *types.Header) *big.Int {
  next := new(big.Int).Add(parent.Number, big1)
  switch {
+ case config.IsArrowGlacier(next):
+ return calcDifficultyEip4345(time, parent)
  case config.IsLondon(next):
  return calcDifficultyEip3554(time, parent)
  case config.IsMuirGlacier(next):

core/forkid/forkid_test.go

@@ -63,8 +63,10 @@ func TestCreation(t *testing.T) {
  {12243999, ID{Hash: checksumToBytes(0xe029e991), Next: 12244000}}, // Last Muir Glacier block
  {12244000, ID{Hash: checksumToBytes(0x0eb440f6), Next: 12965000}}, // First Berlin block
  {12964999, ID{Hash: checksumToBytes(0x0eb440f6), Next: 12965000}}, // Last Berlin block
- {12965000, ID{Hash: checksumToBytes(0xb715077d), Next: 0}}, // First London block
- {20000000, ID{Hash: checksumToBytes(0xb715077d), Next: 0}}, // Future London block
+ {12965000, ID{Hash: checksumToBytes(0xb715077d), Next: 13773000}}, // First London block
+ {13772999, ID{Hash: checksumToBytes(0xb715077d), Next: 13773000}}, // Last London block
+ {13773000, ID{Hash: checksumToBytes(0x20c327fc), Next: 0}}, /// First Arrow Glacier block
+ {20000000, ID{Hash: checksumToBytes(0x20c327fc), Next: 0}}, // Future Arrow Glacier block
  },
  },
  // Ropsten test cases
@@ -205,11 +207,11 @@ func TestValidation(t *testing.T) {
  // Local is mainnet Petersburg, remote is Rinkeby Petersburg.
  {7987396, ID{Hash: checksumToBytes(0xafec6b27), Next: 0}, ErrLocalIncompatibleOrStale},
 
- // Local is mainnet London, far in the future. Remote announces Gopherium (non existing fork)
+ // Local is mainnet Arrow Glacier, far in the future. Remote announces Gopherium (non existing fork)
  // at some future block 88888888, for itself, but past block for local. Local is incompatible.
  //
  // This case detects non-upgraded nodes with majority hash power (typical Ropsten mess).
- {88888888, ID{Hash: checksumToBytes(0xb715077d), Next: 88888888}, ErrLocalIncompatibleOrStale},
+ {88888888, ID{Hash: checksumToBytes(0x20c327fc), Next: 88888888}, ErrLocalIncompatibleOrStale},
 
  // Local is mainnet Byzantium. Remote is also in Byzantium, but announces Gopherium (non existing
  // fork) at block 7279999, before Petersburg. Local is incompatible.

core/genesis.go

@@ -158,7 +158,7 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig
  return SetupGenesisBlockWithOverride(db, genesis, nil)
 }
 
-func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, overrideLondon *big.Int) (*params.ChainConfig, common.Hash, error) {
+func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, overrideArrowGlacier *big.Int) (*params.ChainConfig, common.Hash, error) {
  if genesis != nil && genesis.Config == nil {
  return params.AllEthashProtocolChanges, common.Hash{}, errGenesisNoConfig
  }
@@ -204,8 +204,8 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, override
  }
  // Get the existing chain configuration.
  newcfg := genesis.configOrDefault(stored)
- if overrideLondon != nil {
- newcfg.LondonBlock = overrideLondon
+ if overrideArrowGlacier != nil {
+ newcfg.ArrowGlacierBlock = overrideArrowGlacier
  }
  if err := newcfg.CheckConfigForkOrder(); err != nil {
  return newcfg, common.Hash{}, err

eth/backend.go

@@ -131,7 +131,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
  if err != nil {
  return nil, err
  }
- chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideLondon)
+ chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideArrowGlacier)
  if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
  return nil, genesisErr
  }

eth/ethconfig/config.go

@@ -202,8 +202,8 @@ type Config struct {
  // CheckpointOracle is the configuration for checkpoint oracle.
  CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"`
 
- // Berlin block override (TODO: remove after the fork)
- OverrideLondon *big.Int `toml:",omitempty"`
+ // Arrow Glacier block override (TODO: remove after the fork)
+ OverrideArrowGlacier *big.Int `toml:",omitempty"`
 }
 
 // CreateConsensusEngine creates a consensus engine for the given chain configuration.

eth/gasprice/gasprice_test.go

@@ -107,10 +107,13 @@ func newTestBackend(t *testing.T, londonBlock *big.Int, pending bool) *testBacke
  signer = types.LatestSigner(gspec.Config)
  )
  config.LondonBlock = londonBlock
+ config.ArrowGlacierBlock = londonBlock
  engine := ethash.NewFaker()
  db := rawdb.NewMemoryDatabase()
- genesis, _ := gspec.Commit(db)
-
+ genesis, err := gspec.Commit(db)
+ if err != nil {
+ t.Fatal(err)
+ }
  // Generate testing blocks
  blocks, _ := core.GenerateChain(gspec.Config, genesis, engine, db, testHead+1, func(i int, b *core.BlockGen) {
  b.SetCoinbase(common.Address{1})

les/client.go

@@ -88,7 +88,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) {
  if err != nil {
  return nil, err
  }
- chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideLondon)
+ chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideArrowGlacier)
  if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat {
  return nil, genesisErr
  }