refactor(core/types): separate coreth and upstream identifiers

core/types/hashes_ext.go

@@ -0,0 +1,7 @@
+// (c) 2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package types
+
+// EmptyExtDataHash is the known hash of empty extdata bytes.
+var EmptyExtDataHash = rlpHash([]byte(nil))

core/types/imports.go

@@ -8,11 +8,11 @@ import (
 )
 
 // The following types are used directly as their upstream definitions.
-// So we list them all here to avoid having many individual files.
 type (
 	AccessList        = ethtypes.AccessList
 	AccessListTx      = ethtypes.AccessListTx
 	AccessTuple       = ethtypes.AccessTuple
+	Account           = ethtypes.Account
 	BlobTx            = ethtypes.BlobTx
 	BlobTxSidecar     = ethtypes.BlobTxSidecar
 	Block             = ethtypes.Block
@@ -21,9 +21,11 @@ type (
 	Bloom             = ethtypes.Bloom
 	Body              = ethtypes.Body
 	DynamicFeeTx      = ethtypes.DynamicFeeTx
+	GenesisAlloc      = ethtypes.GenesisAlloc
 	Header            = ethtypes.Header
 	HomesteadSigner   = ethtypes.HomesteadSigner
 	LegacyTx          = ethtypes.LegacyTx
+	Log               = ethtypes.Log
 	Receipt           = ethtypes.Receipt
 	ReceiptForStorage = ethtypes.ReceiptForStorage
 	Receipts          = ethtypes.Receipts
@@ -50,6 +52,16 @@ const (
 	LegacyTxType     = ethtypes.LegacyTxType
 )
 
+// The following variables are used directly as their upstream definitions.
+var (
+	EmptyRootHash     = ethtypes.EmptyRootHash
+	EmptyUncleHash    = ethtypes.EmptyUncleHash
+	EmptyCodeHash     = ethtypes.EmptyCodeHash
+	EmptyTxsHash      = ethtypes.EmptyTxsHash
+	EmptyReceiptsHash = ethtypes.EmptyReceiptsHash
+	EmptyVerkleHash   = ethtypes.EmptyVerkleHash
+)
+
 // The following functions are used directly as their upstream definitions.
 var (
 	BloomLookup          = ethtypes.BloomLookup
@@ -67,6 +79,7 @@ var (
 	NewReceipt           = ethtypes.NewReceipt
 	NewTransaction       = ethtypes.NewTransaction
 	SlimAccountRLP       = ethtypes.SlimAccountRLP
+	TrieRootHash         = ethtypes.TrieRootHash
 
 	// Signers
 	LatestSigner           = ethtypes.LatestSigner

core/types/log_ext.go

@@ -0,0 +1,12 @@
+// (c) 2019-2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+package types
+
+// FlattenLogs converts a nested array of logs to a single array of logs.
+func FlattenLogs(list [][]*Log) []*Log {
+	var flat []*Log
+	for _, logs := range list {
+		flat = append(flat, logs...)
+	}
+	return flat
+}

core/types/state_account_ext.go

@@ -0,0 +1,16 @@
+// (c) 2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package types
+
+import (
+	ethtypes "github.com/ava-labs/libevm/core/types"
+)
+
+type isMultiCoin bool
+
+var IsMultiCoinPayloads = extras.StateAccount
+
+func IsMultiCoin(s ethtypes.StateOrSlimAccount) bool {
+	return bool(IsMultiCoinPayloads.Get(s))
+}