remove WithExtras hack

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/[email protected]", "-replace", "github.com/ethereum/go-ethereum=github.com/ava-labs/[email protected]20240927183738-d8757174b3f0")
+	replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ethereum/[email protected]", "-replace", "github.com/ethereum/go-ethereum=github.com/ava-labs/[email protected]20241001233245-6e652ebfd8b6")
 	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)

go.mod

@@ -138,6 +138,6 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum => github.com/ava-labs/go-ethereum v0.0.0-20240927183738-d8757174b3f0
+replace github.com/ethereum/go-ethereum => github.com/ava-labs/go-ethereum v0.0.0-20241001233245-6e652ebfd8b6
 
 // replace github.com/ethereum/go-ethereum => ../../git2/go-ethereum

go.sum

@@ -58,8 +58,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/ava-labs/avalanchego v1.11.12-rc.2 h1:H1C0gsTOtwMD3qrouEqry0hfoBIC//9lEiDh/AvpaaY=
 github.com/ava-labs/avalanchego v1.11.12-rc.2/go.mod h1:yFx3V31Jy9NFa8GZlgGnwiVf8KGjeF2+Uc99l9Scd/8=
-github.com/ava-labs/go-ethereum v0.0.0-20240927183738-d8757174b3f0 h1:ReturG2I8TilGLZvRdFlNVbFgs0L1Vy4P7rNL8hQkHg=
-github.com/ava-labs/go-ethereum v0.0.0-20240927183738-d8757174b3f0/go.mod h1:TN8ZiHrdJwSe8Cb6x+p0hs5CxhJZPbqB7hHkaUXcmIU=
+github.com/ava-labs/go-ethereum v0.0.0-20241001233245-6e652ebfd8b6 h1:5oYs7hFWHtpqHi8CL1Ymy9ESGP7ajvd4vcSZ5EM+VDc=
+github.com/ava-labs/go-ethereum v0.0.0-20241001233245-6e652ebfd8b6/go.mod h1:TN8ZiHrdJwSe8Cb6x+p0hs5CxhJZPbqB7hHkaUXcmIU=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

params/config_extra.go

@@ -255,16 +255,6 @@ func IsForkTransition(fork *uint64, parent *uint64, current uint64) bool {
 }
 
 func WithExtra(c *ChainConfig, extra *ChainConfigExtra) *ChainConfig {
-	// XXX: Hack to initialize the ChainConfigExtra pointer in the ChainConfig.
-	jsonBytes, err := json.Marshal(c)
-	if err != nil {
-		panic(err)
-	}
-	var newCfg ChainConfig
-	if err := json.Unmarshal(jsonBytes, &newCfg); err != nil {
-		panic(err)
-	}
-
-	*GetExtra(&newCfg) = *extra
-	return &newCfg
+	extras.SetOnChainConfig(c, extra)
+	return c
 }

params/config_libevm.go

@@ -13,14 +13,14 @@ import (
 )
 
 func do_init() any {
-	getter = gethparams.RegisterExtras(gethparams.Extras[*ChainConfigExtra, RulesExtra]{
+	extras = gethparams.RegisterExtras(gethparams.Extras[*ChainConfigExtra, RulesExtra]{
 		ReuseJSONRoot: true, // Reuse the root JSON input when unmarshalling the extra payload.
 		NewRules:      constructRulesExtra,
 	})
 	return nil
 }
 
-var getter gethparams.ExtraPayloads[*ChainConfigExtra, RulesExtra]
+var extras gethparams.ExtraPayloads[*ChainConfigExtra, RulesExtra]
 
 // constructRulesExtra acts as an adjunct to the [params.ChainConfig.Rules]
 // method. Its primary purpose is to construct the extra payload for the
@@ -55,10 +55,10 @@ func constructRulesExtra(c *gethparams.ChainConfig, r *gethparams.Rules, cEx *Ch
 
 // FromChainConfig returns the extra payload carried by the ChainConfig.
 func FromChainConfig(c *gethparams.ChainConfig) *ChainConfigExtra {
-	return getter.FromChainConfig(c)
+	return extras.FromChainConfig(c)
 }
 
 // FromRules returns the extra payload carried by the Rules.
 func FromRules(r *gethparams.Rules) RulesExtra {
-	return getter.FromRules(r)
+	return extras.FromRules(r)
 }