Remove ETC-specific DAOForkSupport=false functionality (#7075)

erigontech · Mar 10, 2023 · 3270720 · 3270720
1 parent 2212e21
commit 3270720
Show file tree

Hide file tree

Showing 66 changed files with 22 additions and 96 deletions.
diff --git a/cmd/integration/commands/state_domains.go b/cmd/integration/commands/state_domains.go
@@ -355,7 +355,7 @@ func (b *blockProcessor) applyBlock(
 	b.blockNum = block.NumberU64()
 	b.writer.w.SetTxNum(b.txNum)
 
-	daoFork := b.txNum >= b.startTxNum && b.chainConfig.DAOForkSupport && b.chainConfig.DAOForkBlock != nil && b.chainConfig.DAOForkBlock.Cmp(block.Number()) == 0
+	daoFork := b.txNum >= b.startTxNum && b.chainConfig.DAOForkBlock != nil && b.chainConfig.DAOForkBlock.Cmp(block.Number()) == 0
 	if daoFork {
 		ibs := state.New(b.reader)
 		// TODO Actually add tracing to the DAO related accounts

diff --git a/cmd/state/commands/erigon4.go b/cmd/state/commands/erigon4.go
@@ -399,7 +399,7 @@ func processBlock23(startTxNum uint64, trace bool, txNumStart uint64, rw *Reader
 	rw.blockNum = block.NumberU64()
 	ww.blockNum = block.NumberU64()
 
-	daoFork := txNum >= startTxNum && chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0
+	daoFork := txNum >= startTxNum && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0
 	if daoFork {
 		ibs := state.New(rw)
 		// TODO Actually add tracing to the DAO related accounts

diff --git a/cmd/state/commands/history22.go b/cmd/state/commands/history22.go
@@ -240,7 +240,7 @@ func runHistory22(trace bool, blockNum, txNumStart uint64, hw *state.HistoryRead
 	rules := chainConfig.Rules(block.NumberU64(), block.Time())
 	txNum := txNumStart
 	hw.SetTxNum(txNum)
-	daoFork := chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0
+	daoFork := chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0
 	if daoFork {
 		ibs := state.New(hw)
 		misc.ApplyDAOHardFork(ibs)

diff --git a/cmd/state/commands/opcode_tracer.go b/cmd/state/commands/opcode_tracer.go
@@ -707,7 +707,7 @@ func runBlock(engine consensus.Engine, ibs *state.IntraBlockState, txnWriter sta
 	gp := new(core.GasPool).AddGas(block.GasLimit())
 	usedGas := new(uint64)
 	var receipts types.Receipts
-	if chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0 {
+	if chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 	systemcontracts.UpgradeBuildInSystemContract(chainConfig, header.Number, ibs)

diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go
@@ -140,7 +140,7 @@ func (rw *Worker) RunTxTaskNoLock(txTask *exec22.TxTask) {
 	ibs := rw.ibs
 
 	rules := txTask.Rules
-	daoForkTx := rw.chainConfig.DAOForkSupport && rw.chainConfig.DAOForkBlock != nil && rw.chainConfig.DAOForkBlock.Uint64() == txTask.BlockNum && txTask.TxIndex == -1
+	daoForkTx := rw.chainConfig.DAOForkBlock != nil && rw.chainConfig.DAOForkBlock.Uint64() == txTask.BlockNum && txTask.TxIndex == -1
 	var err error
 	header := txTask.Header
 	if txTask.BlockNum == 0 && txTask.TxIndex == -1 {

diff --git a/cmd/state/exec3/state_recon.go b/cmd/state/exec3/state_recon.go
@@ -292,7 +292,7 @@ func (rw *ReconWorker) runTxTask(txTask *exec22.TxTask) {
 	rw.ibs.Reset()
 	ibs := rw.ibs
 	rules := txTask.Rules
-	daoForkTx := rw.chainConfig.DAOForkSupport && rw.chainConfig.DAOForkBlock != nil && rw.chainConfig.DAOForkBlock.Uint64() == txTask.BlockNum && txTask.TxIndex == -1
+	daoForkTx := rw.chainConfig.DAOForkBlock != nil && rw.chainConfig.DAOForkBlock.Uint64() == txTask.BlockNum && txTask.TxIndex == -1
 	var err error
 	if txTask.BlockNum == 0 && txTask.TxIndex == -1 {
 		//fmt.Printf("txNum=%d, blockNum=%d, Genesis\n", txTask.TxNum, txTask.BlockNum)

diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go
@@ -58,15 +58,8 @@ func VerifyDAOHeaderExtraData(config *chain.Config, header *types.Header) error
 	if header.Number.Cmp(config.DAOForkBlock) < 0 || header.Number.Cmp(limit) >= 0 {
 		return nil
 	}
-	// Depending on whether we support or oppose the fork, validate the extra-data contents
-	if config.DAOForkSupport {
-		if !bytes.Equal(header.Extra, params.DAOForkBlockExtra) {
-			return ErrBadProDAOExtra
-		}
-	} else {
-		if bytes.Equal(header.Extra, params.DAOForkBlockExtra) {
-			return ErrBadNoDAOExtra
-		}
+	if !bytes.Equal(header.Extra, params.DAOForkBlockExtra) {
+		return ErrBadProDAOExtra
 	}
 	// All ok, header has the same extra-data we expect
 	return nil

diff --git a/consensus/parlia/parlia.go b/consensus/parlia/parlia.go
@@ -1248,7 +1248,7 @@ func (p *Parlia) applyTransaction(from libcommon.Address, to libcommon.Address,
 
 func (p *Parlia) systemCall(from, contract libcommon.Address, data []byte, ibs *state.IntraBlockState, header *types.Header, value *uint256.Int) (gasUsed uint64, returnData []byte, err error) {
 	chainConfig := p.chainConfig
-	if chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
+	if chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 	msg := types.NewMessage(

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -103,7 +103,7 @@ func ExecuteBlockEphemerallyForBSC(
 		}
 	}
 
-	if chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0 {
+	if chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 	systemcontracts.UpgradeBuildInSystemContract(chainConfig, header.Number, ibs)
@@ -254,7 +254,7 @@ func ExecuteBlockEphemerally(
 		}
 	}
 
-	if chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0 {
+	if chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 	noop := state.NewNoopWriter()
@@ -365,7 +365,7 @@ func ExecuteBlockEphemerallyBor(
 		}
 	}
 
-	if chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0 {
+	if chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(block.Number()) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 	noop := state.NewNoopWriter()
@@ -468,7 +468,7 @@ func rlpHash(x interface{}) (h libcommon.Hash) {
 }
 
 func SysCallContract(contract libcommon.Address, data []byte, chainConfig chain.Config, ibs *state.IntraBlockState, header *types.Header, engine consensus.EngineReader, constCall bool) (result []byte, err error) {
-	if chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
+	if chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 
@@ -512,7 +512,7 @@ func SysCallContract(contract libcommon.Address, data []byte, chainConfig chain.
 
 // SysCreate is a special (system) contract creation methods for genesis constructors.
 func SysCreate(contract libcommon.Address, data []byte, chainConfig chain.Config, ibs *state.IntraBlockState, header *types.Header) (result []byte, err error) {
-	if chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
+	if chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 
@@ -547,7 +547,7 @@ func CallContract(contract libcommon.Address, data []byte, chainConfig chain.Con
 	gp.AddGas(50_000_000)
 	var gasUsed uint64
 
-	if chainConfig.DAOForkSupport && chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
+	if chainConfig.DAOForkBlock != nil && chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 	noop := state.NewNoopWriter()

diff --git a/core/chain_makers.go b/core/chain_makers.go
@@ -318,13 +318,11 @@ func GenerateChain(config *chain.Config, parent *types.Block, engine consensus.E
 		if daoBlock := config.DAOForkBlock; daoBlock != nil {
 			limit := new(big.Int).Add(daoBlock, params.DAOForkExtraRange)
 			if b.header.Number.Cmp(daoBlock) >= 0 && b.header.Number.Cmp(limit) < 0 {
-				if config.DAOForkSupport {
-					b.header.Extra = common.CopyBytes(params.DAOForkBlockExtra)
-				}
+				b.header.Extra = common.CopyBytes(params.DAOForkBlockExtra)
+			}
+			if daoBlock.Cmp(b.header.Number) == 0 {
+				misc.ApplyDAOHardFork(ibs)
 			}
-		}
-		if config.DAOForkSupport && config.DAOForkBlock != nil && config.DAOForkBlock.Cmp(b.header.Number) == 0 {
-			misc.ApplyDAOHardFork(ibs)
 		}
 		systemcontracts.UpgradeBuildInSystemContract(config, b.header.Number, ibs)
 		// Execute any user modifications to the block

diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
@@ -59,8 +59,6 @@ func setDefaults(cfg *Config) {
 		cfg.ChainConfig = &chain.Config{
 			ChainID:               big.NewInt(1),
 			HomesteadBlock:        new(big.Int),
-			DAOForkBlock:          new(big.Int),
-			DAOForkSupport:        false,
 			TangerineWhistleBlock: new(big.Int),
 			SpuriousDragonBlock:   new(big.Int),
 			ByzantiumBlock:        new(big.Int),

diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go
@@ -192,8 +192,6 @@ func benchmarkEVM_Create(bench *testing.B, code string) {
 			HomesteadBlock:        new(big.Int),
 			ByzantiumBlock:        new(big.Int),
 			ConstantinopleBlock:   new(big.Int),
-			DAOForkBlock:          new(big.Int),
-			DAOForkSupport:        false,
 			TangerineWhistleBlock: new(big.Int),
 			SpuriousDragonBlock:   new(big.Int),
 		},

diff --git a/eth/stagedsync/stage_mining_create_block.go b/eth/stagedsync/stage_mining_create_block.go
@@ -1,7 +1,6 @@
 package stagedsync
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
 	"math/big"
@@ -206,12 +205,7 @@ func SpawnMiningCreateBlockStage(s *StageState, tx kv.RwTx, cfg MiningCreateBloc
 		// Check whether the block is among the fork extra-override range
 		limit := new(big.Int).Add(daoBlock, params.DAOForkExtraRange)
 		if header.Number.Cmp(daoBlock) >= 0 && header.Number.Cmp(limit) < 0 {
-			// Depending whether we support or oppose the fork, override differently
-			if cfg.chainConfig.DAOForkSupport {
-				header.Extra = libcommon.Copy(params.DAOForkBlockExtra)
-			} else if bytes.Equal(header.Extra, params.DAOForkBlockExtra) {
-				header.Extra = []byte{} // If miner opposes, don't let it use the reserved extra-data
-			}
+			header.Extra = libcommon.Copy(params.DAOForkBlockExtra)
 		}
 	}
 

diff --git a/eth/stagedsync/stage_mining_exec.go b/eth/stagedsync/stage_mining_exec.go
@@ -99,7 +99,7 @@ func SpawnMiningExecStage(s *StageState, tx kv.RwTx, cfg MiningExecCfg, quit <-c
 	stateReader := state.NewPlainStateReader(tx)
 	ibs := state.New(stateReader)
 	stateWriter := state.NewPlainStateWriter(tx, tx, current.Header.Number.Uint64())
-	if cfg.chainConfig.DAOForkSupport && cfg.chainConfig.DAOForkBlock != nil && cfg.chainConfig.DAOForkBlock.Cmp(current.Header.Number) == 0 {
+	if cfg.chainConfig.DAOForkBlock != nil && cfg.chainConfig.DAOForkBlock.Cmp(current.Header.Number) == 0 {
 		misc.ApplyDAOHardFork(ibs)
 	}
 	systemcontracts.UpgradeBuildInSystemContract(&cfg.chainConfig, current.Header.Number, ibs)

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/create.json b/eth/tracers/internal/tracetest/testdata/call_tracer/create.json
@@ -24,7 +24,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/deep_calls.json b/eth/tracers/internal/tracetest/testdata/call_tracer/deep_calls.json
@@ -87,7 +87,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/delegatecall.json b/eth/tracers/internal/tracetest/testdata/call_tracer/delegatecall.json
@@ -40,7 +40,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/inner_create_oog_outer_throw.json b/eth/tracers/internal/tracetest/testdata/call_tracer/inner_create_oog_outer_throw.json
@@ -32,7 +32,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/inner_instafail.json b/eth/tracers/internal/tracetest/testdata/call_tracer/inner_instafail.json
@@ -28,7 +28,6 @@
     "config": {
       "chainId": 3,
       "homesteadBlock": 0,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/inner_throw_outer_revert.json b/eth/tracers/internal/tracetest/testdata/call_tracer/inner_throw_outer_revert.json
@@ -35,7 +35,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/oog.json b/eth/tracers/internal/tracetest/testdata/call_tracer/oog.json
@@ -26,7 +26,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/revert.json b/eth/tracers/internal/tracetest/testdata/call_tracer/revert.json
@@ -24,7 +24,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/revert_reason.json b/eth/tracers/internal/tracetest/testdata/call_tracer/revert_reason.json
@@ -29,7 +29,6 @@
       "petersburgBlock": 0,
       "IstanbulBlock":1561651,
       "chainId": 5,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/selfdestruct.json b/eth/tracers/internal/tracetest/testdata/call_tracer/selfdestruct.json
@@ -30,7 +30,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/simple.json b/eth/tracers/internal/tracetest/testdata/call_tracer/simple.json
@@ -35,7 +35,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/simple_onlytop.json b/eth/tracers/internal/tracetest/testdata/call_tracer/simple_onlytop.json
@@ -35,7 +35,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer/throw.json b/eth/tracers/internal/tracetest/testdata/call_tracer/throw.json
@@ -28,7 +28,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/create.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/create.json
@@ -24,7 +24,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/deep_calls.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/deep_calls.json
@@ -87,7 +87,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/delegatecall.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/delegatecall.json
@@ -40,7 +40,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_create_oog_outer_throw.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_create_oog_outer_throw.json
@@ -32,7 +32,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_instafail.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_instafail.json
@@ -28,7 +28,6 @@
     "config": {
       "chainId": 3,
       "homesteadBlock": 0,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_throw_outer_revert.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_throw_outer_revert.json
@@ -35,7 +35,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/oog.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/oog.json
@@ -26,7 +26,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert.json
@@ -24,7 +24,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert_reason.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert_reason.json
@@ -29,7 +29,6 @@
       "petersburgBlock": 0,
       "IstanbulBlock":1561651,
       "chainId": 5,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/selfdestruct.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/selfdestruct.json
@@ -30,7 +30,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/simple.json b/eth/tracers/internal/tracetest/testdata/call_tracer_legacy/simple.json
@@ -35,7 +35,6 @@
     "config": {
       "byzantiumBlock": 1700000,
       "chainId": 3,
-      "daoForkSupport": true,
       "eip150Block": 0,
       "eip155Block": 10,
       "eip158Block": 10,