bring in gethparams.ChainConfig (wip)

accounts/abi/bind/bind_test.go

@@ -2179,7 +2179,7 @@ func golangBindings(t *testing.T, overload bool) {
 	if out, err := replacer.CombinedOutput(); err != nil {
 		t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)
 	}
-	replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/go-ethereum@v0.0.0", "-replace", "github.com/ethereum/go-ethereum=github.com/ava-labs/go-ethereum@v0.0.0-20240909202038-fdd63effd030")
+	replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/go-ethereum@v0.0.0", "-replace", "github.com/ethereum/go-ethereum=github.com/ava-labs/go-ethereum@v0.0.0-20240910195743-bc476fea4692")
 	replacer.Dir = pkg
 	if out, err := replacer.CombinedOutput(); err != nil {
 		t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)

accounts/abi/bind/precompilebind/precompile_bind_test.go

@@ -695,7 +695,7 @@ func TestPrecompileBind(t *testing.T) {
 	if out, err := replacer.CombinedOutput(); err != nil {
 		t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)
 	}
-	replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/go-ethereum@v0.0.0", "-replace", "github.com/ethereum/go-ethereum=github.com/ava-labs/go-ethereum@v0.0.0-20240909202038-fdd63effd030")
+	replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/go-ethereum@v0.0.0", "-replace", "github.com/ethereum/go-ethereum=github.com/ava-labs/go-ethereum@v0.0.0-20240910195743-bc476fea4692")
 	replacer.Dir = pkg
 	if out, err := replacer.CombinedOutput(); err != nil {
 		t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)

core/blockchain_repair_test.go

@@ -527,7 +527,7 @@ func testRepairWithScheme(t *testing.T, tt *rewindTest, snapshots bool, scheme s
 	defer db.Close() // Might double close, should be fine
 
 	// Initialize a fresh chain
-	chainConfig := *params.TestChainConfig
+	chainConfig := params.Copy(params.TestChainConfig)
 	params.GetExtra(&chainConfig).FeeConfig.MinBaseFee = big.NewInt(1)
 	var (
 		require = require.New(t)

core/blockchain_test.go

@@ -313,8 +313,11 @@ func testRepopulateMissingTriesParallel(t *testing.T, parallelism int) {
 	// Ensure that key1 has some funds in the genesis block.
 	genesisBalance := big.NewInt(1000000)
 	gspec := &Genesis{
-		Config: &params.ChainConfig{HomesteadBlock: new(big.Int), ChainConfigExtra: params.ChainConfigExtra{FeeConfig: params.DefaultFeeConfig}},
-		Alloc:  types.GenesisAlloc{addr1: {Balance: genesisBalance}},
+		Config: params.WithExtra(
+			&params.ChainConfig{HomesteadBlock: new(big.Int)},
+			&params.ChainConfigExtra{FeeConfig: params.DefaultFeeConfig},
+		),
+		Alloc: types.GenesisAlloc{addr1: {Balance: genesisBalance}},
 	}
 
 	blockchain, err := createBlockChain(chainDB, pruningConfig, gspec, common.Hash{})
@@ -426,8 +429,11 @@ func TestUngracefulAsyncShutdown(t *testing.T) {
 	// Ensure that key1 has some funds in the genesis block.
 	genesisBalance := big.NewInt(1000000)
 	gspec := &Genesis{
-		Config: &params.ChainConfig{HomesteadBlock: new(big.Int), ChainConfigExtra: params.ChainConfigExtra{FeeConfig: params.DefaultFeeConfig}},
-		Alloc:  types.GenesisAlloc{addr1: {Balance: genesisBalance}},
+		Config: params.WithExtra(
+			&params.ChainConfig{HomesteadBlock: new(big.Int)},
+			&params.ChainConfigExtra{FeeConfig: params.DefaultFeeConfig},
+		),
+		Alloc: types.GenesisAlloc{addr1: {Balance: genesisBalance}},
 	}
 
 	blockchain, err := create(chainDB, gspec, common.Hash{})

core/genesis.go

@@ -92,7 +92,6 @@ type Genesis struct {
 
 // field type overrides for gencodec
 type genesisSpecMarshaling struct {
-	Config        *ChainConfig
 	Nonce         math.HexOrDecimal64
 	Timestamp     math.HexOrDecimal64
 	ExtraData     hexutil.Bytes

core/genesis_test.go

@@ -70,7 +70,7 @@ func TestSetupGenesis(t *testing.T) {
 }
 
 func testSetupGenesis(t *testing.T, scheme string) {
-	preSubnetConfig := *params.TestPreSubnetEVMChainConfig
+	preSubnetConfig := params.Copy(params.TestPreSubnetEVMChainConfig)
 	params.GetExtra(&preSubnetConfig).SubnetEVMTimestamp = utils.NewUint64(100)
 	var (
 		customghash = common.HexToHash("0x4a12fe7bf8d40d152d7e9de22337b115186a4662aa3a97217b36146202bbfc66")
@@ -84,7 +84,7 @@ func testSetupGenesis(t *testing.T, scheme string) {
 		oldcustomg = customg
 	)
 
-	rollbackpreSubnetConfig := preSubnetConfig
+	rollbackpreSubnetConfig := params.Copy(&preSubnetConfig)
 	params.GetExtra(&rollbackpreSubnetConfig).SubnetEVMTimestamp = utils.NewUint64(90)
 	oldcustomg.Config = &rollbackpreSubnetConfig
 
@@ -208,7 +208,7 @@ func TestStatefulPrecompilesConfigure(t *testing.T) {
 	for name, test := range map[string]test{
 		"allow list enabled in genesis": {
 			getConfig: func() *params.ChainConfig {
-				config := *params.TestChainConfig
+				config := params.Copy(params.TestChainConfig)
 				params.GetExtra(&config).GenesisPrecompiles = params.Precompiles{
 					deployerallowlist.ConfigKey: deployerallowlist.NewConfig(utils.NewUint64(0), []common.Address{addr}, nil, nil),
 				}
@@ -283,7 +283,7 @@ func TestPrecompileActivationAfterHeaderBlock(t *testing.T) {
 	// header must be bigger than last accepted
 	require.Greater(block.Time, bc.lastAccepted.Time())
 
-	activatedGenesisConfig := *customg.Config
+	activatedGenesisConfig := params.Copy(customg.Config)
 	contractDeployerConfig := deployerallowlist.NewConfig(utils.NewUint64(51), nil, nil, nil)
 	params.GetExtra(&activatedGenesisConfig).UpgradeConfig.PrecompileUpgrades = []params.PrecompileUpgrade{
 		{
@@ -307,7 +307,7 @@ func TestPrecompileActivationAfterHeaderBlock(t *testing.T) {
 
 func TestGenesisWriteUpgradesRegression(t *testing.T) {
 	require := require.New(t)
-	config := *params.TestChainConfig
+	config := params.Copy(params.TestChainConfig)
 	genesis := &Genesis{
 		Config: &config,
 		Alloc: types.GenesisAlloc{
@@ -367,6 +367,7 @@ func TestVerkleGenesisCommit(t *testing.T) {
 		PetersburgBlock:     big.NewInt(0),
 		IstanbulBlock:       big.NewInt(0),
 		MuirGlacierBlock:    big.NewInt(0),
+		LondonBlock:         big.NewInt(0),
 		CancunTime:          &verkleTime,
 		VerkleTime:          &verkleTime,
 	}

core/state_processor.go

@@ -214,8 +214,9 @@ func ApplyPrecompileActivations(c *params.ChainConfig, parentTimestamp *uint64,
 	// This ensures that the order we call Configure for each precompile is consistent.
 	// This ensures even if precompiles read/write state other than their own they will observe
 	// an identical global state in a deterministic order when they are configured.
+	extra := params.GetExtra(c)
 	for _, module := range modules.RegisteredModules() {
-		for _, activatingConfig := range params.GetExtra(c).GetActivatingPrecompileConfigs(module.Address, parentTimestamp, blockTimestamp, params.GetExtra(c).PrecompileUpgrades) {
+		for _, activatingConfig := range extra.GetActivatingPrecompileConfigs(module.Address, parentTimestamp, blockTimestamp, extra.PrecompileUpgrades) {
 			// If this transition activates the upgrade, configure the stateful precompile.
 			// (or deconfigure it if it is being disabled.)
 			if activatingConfig.IsDisabled() {

core/state_processor_test.go

@@ -55,7 +55,7 @@ func u64(val uint64) *uint64 { return &val }
 // blockchain imports bad blocks, meaning blocks which have valid headers but
 // contain invalid transactions
 func TestStateProcessorErrors(t *testing.T) {
-	cpcfg := *params.TestChainConfig
+	cpcfg := params.Copy(params.TestChainConfig)
 	config := &cpcfg
 	config.CancunTime = u64(0)
 	params.GetExtra(config).FeeConfig.MinBaseFee = big.NewInt(params.TestMaxBaseFee)
@@ -257,21 +257,21 @@ func TestStateProcessorErrors(t *testing.T) {
 		var (
 			db    = rawdb.NewMemoryDatabase()
 			gspec = &Genesis{
-				Config: &params.ChainConfig{
-					ChainID:             big.NewInt(1),
-					HomesteadBlock:      big.NewInt(0),
-					EIP150Block:         big.NewInt(0),
-					EIP155Block:         big.NewInt(0),
-					EIP158Block:         big.NewInt(0),
-					ByzantiumBlock:      big.NewInt(0),
-					ConstantinopleBlock: big.NewInt(0),
-					PetersburgBlock:     big.NewInt(0),
-					IstanbulBlock:       big.NewInt(0),
-					MuirGlacierBlock:    big.NewInt(0),
-					ChainConfigExtra: params.ChainConfigExtra{
-						FeeConfig: params.DefaultFeeConfig,
+				Config: params.WithExtra(
+					&params.ChainConfig{
+						ChainID:             big.NewInt(1),
+						HomesteadBlock:      big.NewInt(0),
+						EIP150Block:         big.NewInt(0),
+						EIP155Block:         big.NewInt(0),
+						EIP158Block:         big.NewInt(0),
+						ByzantiumBlock:      big.NewInt(0),
+						ConstantinopleBlock: big.NewInt(0),
+						PetersburgBlock:     big.NewInt(0),
+						IstanbulBlock:       big.NewInt(0),
+						MuirGlacierBlock:    big.NewInt(0),
 					},
-				},
+					&params.ChainConfigExtra{FeeConfig: params.DefaultFeeConfig},
+				),
 				Alloc: types.GenesisAlloc{
 					common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7"): types.Account{
 						Balance: big.NewInt(1000000000000000000), // 1 ether
@@ -354,18 +354,20 @@ func TestBadTxAllowListBlock(t *testing.T) {
 		db       = rawdb.NewMemoryDatabase()
 		testAddr = common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7")
 
-		config = &params.ChainConfig{
-			ChainID:             big.NewInt(1),
-			HomesteadBlock:      big.NewInt(0),
-			EIP150Block:         big.NewInt(0),
-			EIP155Block:         big.NewInt(0),
-			EIP158Block:         big.NewInt(0),
-			ByzantiumBlock:      big.NewInt(0),
-			ConstantinopleBlock: big.NewInt(0),
-			PetersburgBlock:     big.NewInt(0),
-			IstanbulBlock:       big.NewInt(0),
-			MuirGlacierBlock:    big.NewInt(0),
-			ChainConfigExtra: params.ChainConfigExtra{
+		config = params.WithExtra(
+			&params.ChainConfig{
+				ChainID:             big.NewInt(1),
+				HomesteadBlock:      big.NewInt(0),
+				EIP150Block:         big.NewInt(0),
+				EIP155Block:         big.NewInt(0),
+				EIP158Block:         big.NewInt(0),
+				ByzantiumBlock:      big.NewInt(0),
+				ConstantinopleBlock: big.NewInt(0),
+				PetersburgBlock:     big.NewInt(0),
+				IstanbulBlock:       big.NewInt(0),
+				MuirGlacierBlock:    big.NewInt(0),
+			},
+			&params.ChainConfigExtra{
 				FeeConfig: params.DefaultFeeConfig,
 				NetworkUpgrades: params.NetworkUpgrades{
 					SubnetEVMTimestamp: utils.NewUint64(0),
@@ -374,7 +376,7 @@ func TestBadTxAllowListBlock(t *testing.T) {
 					txallowlist.ConfigKey: txallowlist.NewConfig(utils.NewUint64(0), nil, nil, nil),
 				},
 			},
-		}
+		)
 		signer     = types.LatestSigner(config)
 		testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
 

core/test_blockchain.go

@@ -1483,7 +1483,7 @@ func TestStatefulPrecompiles(t *testing.T, create func(db ethdb.Database, gspec
 
 	// Ensure that key1 has sufficient funds in the genesis block for all of the tests.
 	genesisBalance := new(big.Int).Mul(big.NewInt(1000000), big.NewInt(params.Ether))
-	config := *params.TestChainConfig
+	config := params.Copy(params.TestChainConfig)
 	// Set all of the required config parameters
 	params.GetExtra(&config).GenesisPrecompiles = params.Precompiles{
 		deployerallowlist.ConfigKey: deployerallowlist.NewConfig(utils.NewUint64(0), []common.Address{addr1}, nil, nil),

core/txpool/blobpool/blobpool_test.go

@@ -72,7 +72,7 @@ var testChainConfig *params.ChainConfig
 
 func init() {
 	testChainConfig = new(params.ChainConfig)
-	*testChainConfig = *params.TestChainConfig
+	*testChainConfig = params.Copy(params.TestChainConfig)
 	params.GetExtra(testChainConfig).FeeConfig.MinBaseFee = new(big.Int).SetUint64(1)
 
 	testChainConfig.CancunTime = new(uint64)

core/vm/runtime/runtime.go

@@ -67,23 +67,25 @@ type Config struct {
 // sets defaults on the config
 func setDefaults(cfg *Config) {
 	if cfg.ChainConfig == nil {
-		cfg.ChainConfig = &params.ChainConfig{
-			ChainID:             big.NewInt(1),
-			HomesteadBlock:      new(big.Int),
-			EIP150Block:         new(big.Int),
-			EIP155Block:         new(big.Int),
-			EIP158Block:         new(big.Int),
-			ByzantiumBlock:      new(big.Int),
-			ConstantinopleBlock: new(big.Int),
-			PetersburgBlock:     new(big.Int),
-			IstanbulBlock:       new(big.Int),
-			MuirGlacierBlock:    new(big.Int),
-			ChainConfigExtra: params.ChainConfigExtra{
+		cfg.ChainConfig = params.WithExtra(
+			&params.ChainConfig{
+				ChainID:             big.NewInt(1),
+				HomesteadBlock:      new(big.Int),
+				EIP150Block:         new(big.Int),
+				EIP155Block:         new(big.Int),
+				EIP158Block:         new(big.Int),
+				ByzantiumBlock:      new(big.Int),
+				ConstantinopleBlock: new(big.Int),
+				PetersburgBlock:     new(big.Int),
+				IstanbulBlock:       new(big.Int),
+				MuirGlacierBlock:    new(big.Int),
+			},
+			&params.ChainConfigExtra{
 				NetworkUpgrades: params.NetworkUpgrades{
 					SubnetEVMTimestamp: new(uint64),
 				},
 			},
-		}
+		)
 	}
 
 	if cfg.Difficulty == nil {

eth/gasprice/gasprice_test.go

@@ -390,7 +390,7 @@ func TestSuggestGasPriceAfterFeeConfigUpdate(t *testing.T) {
 	}
 
 	// create a chain config with fee manager enabled at genesis with [addr] as the admin
-	chainConfig := *params.TestChainConfig
+	chainConfig := params.Copy(params.TestChainConfig)
 	params.GetExtra(&chainConfig).GenesisPrecompiles = params.Precompiles{
 		feemanager.ConfigKey: feemanager.NewConfig(utils.NewUint64(0), []common.Address{addr}, nil, nil, nil),
 	}

eth/tracers/api.go

@@ -1056,7 +1056,7 @@ func APIs(backend Backend) []rpc.API {
 // along with a boolean that indicates whether the copy is canonical (equivalent to the original).
 func overrideConfig(original *params.ChainConfig, override *params.ChainConfig) (*params.ChainConfig, bool) {
 	copy := new(params.ChainConfig)
-	*copy = *original
+	*copy = params.Copy(original)
 	canon := true
 
 	if timestamp := params.GetExtra(override).SubnetEVMTimestamp; timestamp != nil {

eth/tracers/api_extra_test.go

@@ -30,7 +30,7 @@ func TestTraceBlockPrecompileActivation(t *testing.T) {
 
 	// Initialize test accounts
 	accounts := newAccounts(3)
-	copyConfig := *params.TestChainConfig
+	copyConfig := params.Copy(params.TestChainConfig)
 	genesis := &core.Genesis{
 		Config: &copyConfig,
 		Alloc: types.GenesisAlloc{
@@ -136,7 +136,7 @@ func TestTraceTransactionPrecompileActivation(t *testing.T) {
 
 	// Initialize test accounts
 	accounts := newAccounts(3)
-	copyConfig := *params.TestChainConfig
+	copyConfig := params.Copy(params.TestChainConfig)
 	genesis := &core.Genesis{
 		Config: &copyConfig,
 		Alloc: types.GenesisAlloc{
@@ -200,7 +200,7 @@ func TestTraceChainPrecompileActivation(t *testing.T) {
 	// Initialize test accounts
 	// Note: the balances in this test have been increased compared to go-ethereum.
 	accounts := newAccounts(3)
-	copyConfig := *params.TestChainConfig
+	copyConfig := params.Copy(params.TestChainConfig)
 	genesis := &core.Genesis{
 		Config: &copyConfig,
 		Alloc: types.GenesisAlloc{
@@ -297,7 +297,7 @@ func TestTraceCallWithOverridesStateUpgrade(t *testing.T) {
 
 	// Initialize test accounts
 	accounts := newAccounts(3)
-	copyConfig := *params.TestChainConfig
+	copyConfig := params.Copy(params.TestChainConfig)
 	genesis := &core.Genesis{
 		Config: &copyConfig,
 		Alloc: types.GenesisAlloc{