Migrate coreth nits

README.md

@@ -44,6 +44,16 @@ The Subnet EVM is compatible with almost all Ethereum tooling, including [Remix,
 - Removed Atomic Txs and Shared Memory
 - Removed Multicoin Contract and State
 
+## Block Format
+
+To support these changes, there have been a number of changes to the SubnetEVM block format compared to what exists on the C-Chain and Ethereum. Here we list the changes to the block format as compared to Ethereum.
+
+### Block Header
+
+* `BaseFee`: Added by EIP-1559 to represent the base fee of the block (present in Ethereum as of EIP-1559)
+* `BlockGasCost`: surcharge for producing a block faster than the target rate
+
+
 ## Run Local Network
 
 See [Create a Local EVM Subnet](https://docs.avax.network/subnets/create-a-local-subnet).

plugin/evm/config.go

@@ -18,7 +18,6 @@ const (
 	defaultSnapshotAsync                          = true
 	defaultRpcGasCap                              = 50_000_000 // Default to 50M Gas Limit
 	defaultRpcTxFeeCap                            = 100        // 100 AVAX
-	defaultMetricsEnabled                         = true
 	defaultMetricsExpensiveEnabled                = false
 	defaultApiMaxDuration                         = 0 // Default to no maximum API call duration
 	defaultWsCpuRefillRate                        = 0 // Default to no maximum WS CPU usage
@@ -84,7 +83,6 @@ type Config struct {
 	PopulateMissingTriesParallelism int     `json:"populate-missing-tries-parallelism"` // Number of concurrent readers to use when re-populating missing tries on startup.
 
 	// Metric Settings
-	MetricsEnabled          bool `json:"metrics-enabled"`
 	MetricsExpensiveEnabled bool `json:"metrics-expensive-enabled"`
 
 	// API Settings
@@ -139,7 +137,6 @@ func (c *Config) SetDefaults() {
 	c.EnabledEthAPIs = defaultEnabledAPIs
 	c.RPCGasCap = defaultRpcGasCap
 	c.RPCTxFeeCap = defaultRpcTxFeeCap
-	c.MetricsEnabled = defaultMetricsEnabled
 	c.MetricsExpensiveEnabled = defaultMetricsExpensiveEnabled
 	c.APIMaxDuration.Duration = defaultApiMaxDuration
 	c.WSCPURefillRate.Duration = defaultWsCpuRefillRate

plugin/evm/database.go

@@ -9,6 +9,8 @@ import (
 	"github.com/ava-labs/avalanchego/database"
 )
 
+var _ ethdb.Database = &Database{}
+
 // Database implements ethdb.Database
 type Database struct{ database.Database }
 

plugin/evm/message/block_request.go

@@ -39,9 +39,3 @@ func (b BlockRequest) Handle(ctx context.Context, nodeID ids.NodeID, requestID u
 type BlockResponse struct {
 	Blocks [][]byte `serialize:"true"`
 }
-
-// SerializedMap is map of Keys and Vals to track leaf sync progress
-type SerializedMap struct {
-	Keys []common.Hash `serialize:"true"`
-	Vals []common.Hash `serialize:"true"`
-}

plugin/evm/message/codec.go

@@ -33,7 +33,6 @@ func BuildCodec() (codec.Manager, error) {
 		c.RegisterType(LeafsResponse{}),
 		c.RegisterType(CodeRequest{}),
 		c.RegisterType(CodeResponse{}),
-		c.RegisterType(SerializedMap{}),
 
 		codecManager.RegisterCodec(Version, c),
 	)

plugin/evm/vm.go

@@ -238,7 +238,6 @@ func (vm *VM) Initialize(
 		return errUnsupportedFXs
 	}
 
-	metrics.Enabled = vm.config.MetricsEnabled
 	metrics.EnabledExpensive = vm.config.MetricsExpensiveEnabled
 
 	vm.shutdownChan = make(chan struct{}, 1)

plugin/evm/vm_test.go

@@ -104,6 +104,7 @@ func buildGenesisTest(t *testing.T, genesisJSON string) []byte {
 func NewContext() *snow.Context {
 	ctx := snow.DefaultContextTest()
 	ctx.NetworkID = testNetworkID
+	ctx.NodeID = ids.GenerateTestNodeID()
 	ctx.ChainID = testCChainID
 	ctx.AVAXAssetID = testAvaxAssetID
 	ctx.XChainID = testXChainID

trie/iterator.go

@@ -161,8 +161,11 @@ func (e seekError) Error() string {
 }
 
 func newNodeIterator(trie *Trie, start []byte) NodeIterator {
-	if trie.Hash() == emptyState {
-		return new(nodeIterator)
+	if trie.Hash() == emptyRoot {
+		return &nodeIterator{
+			trie: trie,
+			err:  errIteratorEnd,
+		}
 	}
 	it := &nodeIterator{trie: trie}
 	it.err = it.seek(start)

trie/iterator_test.go

@@ -39,6 +39,19 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
+func TestEmptyIterator(t *testing.T) {
+	trie := newEmpty()
+	iter := trie.NodeIterator(nil)
+
+	seen := make(map[string]struct{})
+	for iter.Next(true) {
+		seen[string(iter.Path())] = struct{}{}
+	}
+	if len(seen) != 0 {
+		t.Fatal("Unexpected trie node iterated")
+	}
+}
+
 func TestIterator(t *testing.T) {
 	trie := newEmpty()
 	vals := []struct{ k, v string }{

trie/proof.go

@@ -539,7 +539,7 @@ func VerifyRangeProof(rootHash common.Hash, firstKey []byte, lastKey []byte, key
 	}
 	// todo(rjl493456442) different length edge keys should be supported
 	if len(firstKey) != len(lastKey) {
-		return false, errors.New("inconsistent edge keys")
+		return false, fmt.Errorf("inconsistent edge keys (%d != %d)", len(firstKey), len(lastKey))
 	}
 	// Convert the edge proofs to edge trie paths. Then we can
 	// have the same tree architecture with the original one.

trie/trie.go

@@ -35,17 +35,13 @@ import (
 
 	"github.com/ava-labs/subnet-evm/core/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"
 )
 
 var (
 	// emptyRoot is the known root hash of an empty trie.
 	emptyRoot = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
-
-	// emptyState is the known hash of an empty state trie entry.
-	emptyState = crypto.Keccak256Hash(nil)
 )
 
 // LeafCallback is a callback type invoked when a trie operation reaches a leaf