Merge branch 'ceyonur/acp-226-min-block-delay-builder' of github.com:ava-labs/coreth into ceyonur/acp-226-min-block-delay-builder

Author: ceyonur

.github/workflows/ci.yml

@@ -100,7 +100,7 @@ jobs:
         with:
           go-version-file: "go.mod"
       - name: Run e2e tests
-        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@8b8ac94577fec62b1dbd6636e116452b8b4208a5
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@3f91f67b9b4c0a99e75c572bae7a67334e73a289
         with:
           run: ./scripts/run_task.sh test-e2e-ci
           prometheus_url: ${{ secrets.PROMETHEUS_URL || '' }}
@@ -132,7 +132,7 @@ jobs:
           ref: ${{ github.event.inputs.avalanchegoBranch }}
           path: avalanchego
       - name: Run Warp E2E Tests
-        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@8b8ac94577fec62b1dbd6636e116452b8b4208a5
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@3f91f67b9b4c0a99e75c572bae7a67334e73a289
         with:
           run: ./scripts/run_task.sh test-e2e-warp-ci
           artifact_prefix: warp

accounts/abi/bind/bind_extra_test.go

@@ -6,6 +6,7 @@ package bind_test
 import (
 	"bytes"
 	"math/big"
+	"os"
 	"testing"
 
 	"github.com/ava-labs/libevm/common"
@@ -16,12 +17,21 @@ import (
 	"github.com/ava-labs/coreth/accounts/abi"
 	"github.com/ava-labs/coreth/accounts/abi/bind"
 	"github.com/ava-labs/coreth/accounts/abi/bind/backends"
+	"github.com/ava-labs/coreth/core"
 	"github.com/ava-labs/coreth/eth/ethconfig"
 	"github.com/ava-labs/coreth/ethclient/simulated"
 	"github.com/ava-labs/coreth/node"
 	"github.com/ava-labs/coreth/params"
+	"github.com/ava-labs/coreth/plugin/evm/customtypes"
 )
 
+func TestMain(m *testing.M) {
+	core.RegisterExtras()
+	customtypes.Register()
+	params.RegisterExtras()
+	os.Exit(m.Run())
+}
+
 // TestGetSenderNativeAssetCall checks that the NativeAssetCall proxies the
 // caller address This behavior is disabled on the network and is only to test
 // previous behavior. Note the test uses [params.TestApricotPhase2Config].

accounts/abi/bind/bind_test.go

@@ -2156,10 +2156,21 @@ func golangBindings(t *testing.T, overload bool) {
 
 			import (
 				"testing"
+
+				"github.com/ava-labs/coreth/params"
+				"github.com/ava-labs/coreth/plugin/evm/customtypes"
+				libevmparams "github.com/ava-labs/libevm/params"
+				libevmtypes "github.com/ava-labs/libevm/core/types"
+
 				%s
 			)
 
 			func Test%s(t *testing.T) {
+				customtypes.Register()
+				t.Cleanup(libevmtypes.TestOnlyClearRegisteredExtras)
+				params.RegisterExtras()
+				t.Cleanup(libevmparams.TestOnlyClearRegisteredExtras)
+
 				%s
 			}
 		`, tt.imports, tt.name, tt.tester)

core/evm.go

@@ -45,7 +45,14 @@ import (
 	"github.com/holiman/uint256"
 )
 
-func init() {
+// RegisterExtras registers hooks with libevm to achieve Avalanche behaviour of
+// the EVM. It MUST NOT be called more than once and therefore is only allowed
+// to be used in tests and `package main`, to avoid polluting other packages
+// that transitively depend on this one but don't need registration.
+func RegisterExtras() {
+	// Although the registration function refers to just Hooks (not Extras) this
+	// will be changed in the future to standardise across libevm, hence the
+	// name of the function we're in.
 	vm.RegisterHooks(hooks{})
 }
 

core/extstate/statedb.go

@@ -17,10 +17,14 @@ import (
 	"github.com/ava-labs/coreth/plugin/evm/customtypes"
 )
 
-// Register the state key normalization to libevm's [state.StateDB]. This will
-// normalize all state keys passing through the implementation unless
-// [stateconf.SkipStateKeyTransformation] is provided as an option.
-func init() {
+// RegisterExtras registers hooks with libevm to achieve Avalanche state
+// management. It MUST NOT be called more than once and therefore is only
+// allowed to be used in tests and `package main`, to avoid polluting other
+// packages that transitively depend on this one but don't need registration.
+//
+// Of note, a call to RegisterExtras will result in state-key normalization
+// unless [stateconf.SkipStateKeyTransformation] is used.
+func RegisterExtras() {
 	state.RegisterExtras(normalizeStateKeysHook{})
 }
 

core/extstate/statedb_multicoin_test.go

@@ -5,6 +5,7 @@ package extstate
 
 import (
 	"math/big"
+	"os"
 	"testing"
 
 	"github.com/ava-labs/libevm/common"
@@ -20,6 +21,11 @@ import (
 	"github.com/ava-labs/coreth/plugin/evm/customtypes"
 )
 
+func TestMain(m *testing.M) {
+	customtypes.Register()
+	os.Exit(m.Run())
+}
+
 func TestMultiCoinOperations(t *testing.T) {
 	memdb := rawdb.NewMemoryDatabase()
 	db := state.NewDatabase(memdb)

core/main_test.go

@@ -7,11 +7,21 @@ import (
 	"testing"
 
 	"go.uber.org/goleak"
+
+	"github.com/ava-labs/coreth/core/extstate"
+	"github.com/ava-labs/coreth/params"
+	"github.com/ava-labs/coreth/plugin/evm/customtypes"
 )
 
 // TestMain uses goleak to verify tests in this package do not leak unexpected
 // goroutines.
 func TestMain(m *testing.M) {
+	RegisterExtras()
+
+	customtypes.Register()
+	extstate.RegisterExtras()
+	params.RegisterExtras()
+
 	opts := []goleak.Option{
 		// No good way to shut down these goroutines:
 		goleak.IgnoreTopFunction("github.com/ava-labs/coreth/core/state/snapshot.(*diskLayer).generate"),

core/state/snapshot/generate_test.go

@@ -33,6 +33,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ava-labs/coreth/plugin/evm/customtypes"
 	"github.com/ava-labs/coreth/triedb/hashdb"
 	"github.com/ava-labs/coreth/triedb/pathdb"
 	"github.com/ava-labs/libevm/common"
@@ -48,6 +49,11 @@ import (
 	"golang.org/x/crypto/sha3"
 )
 
+func TestMain(m *testing.M) {
+	customtypes.Register()
+	os.Exit(m.Run())
+}
+
 var testBlockHash = common.HexToHash("0xdeadbeef")
 
 func hashData(input []byte) common.Hash {

core/txpool/blobpool/blobpool_test.go

@@ -73,6 +73,8 @@ var (
 var testChainConfig *params.ChainConfig
 
 func init() {
+	params.RegisterExtras()
+
 	testChainConfig = new(params.ChainConfig)
 	*testChainConfig = params.Copy(params.TestChainConfig)
 

core/txpool/legacypool/legacypool_test.go

@@ -62,6 +62,11 @@ var (
 	eip1559Config *params.ChainConfig
 )
 
+func TestMain(m *testing.M) {
+	params.RegisterExtras()
+	os.Exit(m.Run())
+}
+
 func init() {
 	cpy := *params.TestChainConfig
 	eip1559Config = &cpy