diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 5de9741d05..a724adb174 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -33,11 +33,11 @@ import ( "io" "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/accounts" "github.com/ava-labs/libevm/accounts/external" "github.com/ava-labs/libevm/accounts/keystore" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" ) diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index 1aaf78161b..9f7c1e8d58 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -31,9 +31,9 @@ import ( "errors" "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 9dadf11482..d3413b0160 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -30,10 +30,10 @@ import ( "context" "github.com/ava-labs/coreth/accounts/abi/bind" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/ethclient/simulated" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // Verify that SimulatedBackend implements required interfaces diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index 92da2b79ac..da42b59877 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -35,11 +35,11 @@ import ( "sync" "github.com/ava-labs/coreth/accounts/abi" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/nativeasset" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/event" ) diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index d6c0a50e6e..a93abc52f3 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -37,11 +37,11 @@ import ( "github.com/ava-labs/coreth/accounts/abi" "github.com/ava-labs/coreth/accounts/abi/bind" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/nativeasset" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" "github.com/stretchr/testify/assert" diff --git a/accounts/abi/bind/bind_extra_test.go b/accounts/abi/bind/bind_extra_test.go index 80e5932648..aa78b672ae 100644 --- a/accounts/abi/bind/bind_extra_test.go +++ b/accounts/abi/bind/bind_extra_test.go @@ -11,12 +11,12 @@ 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/types" "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/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" ) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index d4f6ff6216..162180c3f7 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -299,7 +299,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -355,7 +355,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -401,7 +401,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -459,7 +459,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" "github.com/ava-labs/libevm/common" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -507,7 +507,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -574,7 +574,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -620,7 +620,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" "github.com/ava-labs/libevm/common" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" `, ` // Create a simulator and wrap a non-deployed contract @@ -659,7 +659,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" "github.com/ava-labs/libevm/common" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" `, ` // Create a simulator and wrap a non-deployed contract @@ -706,7 +706,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -756,7 +756,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" "github.com/ava-labs/libevm/common" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -831,7 +831,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -925,7 +925,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" "github.com/ava-labs/libevm/common" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -1115,7 +1115,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -1250,7 +1250,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, @@ -1392,7 +1392,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -1458,7 +1458,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -1568,7 +1568,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" "github.com/ava-labs/libevm/crypto" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" `, ` // Initialize test accounts @@ -1631,7 +1631,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" "github.com/ava-labs/libevm/crypto" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" `, ` key, _ := crypto.GenerateKey() @@ -1692,7 +1692,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -1753,7 +1753,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -1841,7 +1841,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -1911,7 +1911,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, ` @@ -1963,7 +1963,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, tester: ` @@ -2011,7 +2011,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, tester: ` @@ -2052,7 +2052,7 @@ var bindTests = []struct { "github.com/ava-labs/coreth/accounts/abi/bind" "github.com/ava-labs/coreth/accounts/abi/bind/backends" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" `, tester: ` diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index aa1de7f913..7856a02fe7 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -103,7 +103,7 @@ import ( "github.com/ava-labs/coreth/accounts/abi" "github.com/ava-labs/coreth/accounts/abi/bind" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/event" diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index 508caf7cf2..22ad1f768e 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -31,9 +31,9 @@ import ( "errors" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/log" ) diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index e1311c47d9..874e91314a 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -34,10 +34,10 @@ import ( "time" "github.com/ava-labs/coreth/accounts/abi/bind" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/ethclient/simulated" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" ) diff --git a/consensus/consensus.go b/consensus/consensus.go index 19252097c7..9b1230dbea 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -31,9 +31,9 @@ import ( "math/big" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // ChainHeaderReader defines a small collection of methods needed to access the local diff --git a/consensus/dummy/consensus.go b/consensus/dummy/consensus.go index a06d15bdf7..d9bcbc2750 100644 --- a/consensus/dummy/consensus.go +++ b/consensus/dummy/consensus.go @@ -14,11 +14,12 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/misc/eip4844" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/trie" customheader "github.com/ava-labs/coreth/plugin/evm/header" @@ -167,7 +168,7 @@ func verifyHeaderGasFields(configExtra *extras.ChainConfig, header *types.Header return fmt.Errorf("expected base fee %d, found %d", expectedBaseFee, header.BaseFee) } - headerExtra := types.GetHeaderExtra(header) + headerExtra := customtypes.GetHeaderExtra(header) // Enforce BlockGasCost constraints expectedBlockGasCost := customheader.BlockGasCost( @@ -379,7 +380,7 @@ func (eng *DummyEngine) Finalize(chain consensus.ChainHeaderReader, block *types configExtra := params.GetExtra(chain.Config()) timestamp := block.Time() // Verify the BlockGasCost set in the header matches the expected value. - blockGasCost := types.BlockGasCost(block) + blockGasCost := customtypes.BlockGasCost(block) expectedBlockGasCost := customheader.BlockGasCost( configExtra, parent, @@ -396,7 +397,7 @@ func (eng *DummyEngine) Finalize(chain consensus.ChainHeaderReader, block *types if extDataGasUsed == nil { extDataGasUsed = new(big.Int).Set(common.Big0) } - if blockExtDataGasUsed := types.BlockExtDataGasUsed(block); blockExtDataGasUsed == nil || !blockExtDataGasUsed.IsUint64() || blockExtDataGasUsed.Cmp(extDataGasUsed) != 0 { + if blockExtDataGasUsed := customtypes.BlockExtDataGasUsed(block); blockExtDataGasUsed == nil || !blockExtDataGasUsed.IsUint64() || blockExtDataGasUsed.Cmp(extDataGasUsed) != 0 { return fmt.Errorf("invalid extDataGasUsed: have %d, want %d", blockExtDataGasUsed, extDataGasUsed) } @@ -431,7 +432,7 @@ func (eng *DummyEngine) FinalizeAndAssemble(chain consensus.ChainHeaderReader, h } configExtra := params.GetExtra(chain.Config()) - headerExtra := types.GetHeaderExtra(header) + headerExtra := customtypes.GetHeaderExtra(header) // Calculate the required block gas cost for this block. headerExtra.BlockGasCost = customheader.BlockGasCost( configExtra, @@ -439,7 +440,7 @@ func (eng *DummyEngine) FinalizeAndAssemble(chain consensus.ChainHeaderReader, h header.Time, ) if configExtra.IsApricotPhase4(header.Time) { - ext := types.GetHeaderExtra(header) + ext := customtypes.GetHeaderExtra(header) ext.ExtDataGasUsed = extDataGasUsed if ext.ExtDataGasUsed == nil { ext.ExtDataGasUsed = new(big.Int).Set(common.Big0) @@ -468,7 +469,7 @@ func (eng *DummyEngine) FinalizeAndAssemble(chain consensus.ChainHeaderReader, h header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number)) // Header seems complete, assemble into a block and return - return types.NewBlockWithExtData( + return customtypes.NewBlockWithExtData( header, txs, uncles, receipts, trie.NewStackTrie(nil), extraData, configExtra.IsApricotPhase1(header.Time), ), nil diff --git a/consensus/dummy/consensus_test.go b/consensus/dummy/consensus_test.go index 91f24f9509..3e8429528a 100644 --- a/consensus/dummy/consensus_test.go +++ b/consensus/dummy/consensus_test.go @@ -8,10 +8,10 @@ import ( "math/big" "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap4" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) func TestVerifyBlockFee(t *testing.T) { diff --git a/consensus/misc/eip4844/eip4844.go b/consensus/misc/eip4844/eip4844.go index 4d57af555c..5b78fa9e61 100644 --- a/consensus/misc/eip4844/eip4844.go +++ b/consensus/misc/eip4844/eip4844.go @@ -31,8 +31,8 @@ import ( "fmt" "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" + "github.com/ava-labs/libevm/core/types" ) var ( diff --git a/core/bench_test.go b/core/bench_test.go index a126ce6ee1..ba25ae991e 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -32,11 +32,11 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/math" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" diff --git a/core/block_validator.go b/core/block_validator.go index 8547570848..66911ce2cc 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -32,9 +32,9 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/trie" ) diff --git a/core/blockchain.go b/core/blockchain.go index 75f7967dc2..a675c4fae7 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -43,7 +43,7 @@ import ( "github.com/ava-labs/coreth/consensus/misc/eip4844" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/version" "github.com/ava-labs/coreth/params" customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" @@ -52,6 +52,7 @@ import ( "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/lru" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" @@ -585,7 +586,7 @@ func (bc *BlockChain) startAcceptor() { bc.acceptorTipLock.Unlock() // Update accepted feeds - flattenedLogs := types.FlattenLogs(logs) + flattenedLogs := customtypes.FlattenLogs(logs) bc.chainAcceptedFeed.Send(ChainEvent{Block: next, Hash: next.Hash(), Logs: flattenedLogs}) if len(flattenedLogs) > 0 { bc.logsAcceptedFeed.Send(flattenedLogs) @@ -1380,7 +1381,7 @@ func (bc *BlockChain) insertBlock(block *types.Block, writes bool) error { "parentHash", block.ParentHash(), "uncles", len(block.Uncles()), "txs", len(block.Transactions()), "gas", block.GasUsed(), "elapsed", common.PrettyDuration(time.Since(start)), - "root", block.Root(), "baseFeePerGas", block.BaseFee(), "blockGasCost", types.BlockGasCost(block), + "root", block.Root(), "baseFeePerGas", block.BaseFee(), "blockGasCost", customtypes.BlockGasCost(block), ) processedBlockGasUsedCounter.Inc(int64(block.GasUsed())) @@ -1423,7 +1424,7 @@ func (bc *BlockChain) collectUnflattenedLogs(b *types.Block, removed bool) [][]* // the processing of a block. These logs are later announced as deleted or reborn. func (bc *BlockChain) collectLogs(b *types.Block, removed bool) []*types.Log { unflattenedLogs := bc.collectUnflattenedLogs(b, removed) - return types.FlattenLogs(unflattenedLogs) + return customtypes.FlattenLogs(unflattenedLogs) } // reorg takes two blocks, an old chain and a new chain and will reconstruct the diff --git a/core/blockchain_iterator.go b/core/blockchain_iterator.go index e81d4a5761..e453720c7b 100644 --- a/core/blockchain_iterator.go +++ b/core/blockchain_iterator.go @@ -33,7 +33,7 @@ import ( "fmt" "sync" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" ) type blockAndState struct { diff --git a/core/blockchain_log_test.go b/core/blockchain_log_test.go index 909424d8b4..dcda9349f7 100644 --- a/core/blockchain_log_test.go +++ b/core/blockchain_log_test.go @@ -10,11 +10,11 @@ import ( "github.com/ava-labs/coreth/accounts/abi" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/stretchr/testify/require" diff --git a/core/blockchain_reader.go b/core/blockchain_reader.go index 3dcdd24e7e..c01660192d 100644 --- a/core/blockchain_reader.go +++ b/core/blockchain_reader.go @@ -30,10 +30,10 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/triedb" diff --git a/core/blockchain_repair_test.go b/core/blockchain_repair_test.go index 6315e50c67..202f8e9fc8 100644 --- a/core/blockchain_repair_test.go +++ b/core/blockchain_repair_test.go @@ -35,11 +35,11 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/triedb" diff --git a/core/blockchain_sethead_test.go b/core/blockchain_sethead_test.go index 6695ea0464..9bf245b092 100644 --- a/core/blockchain_sethead_test.go +++ b/core/blockchain_sethead_test.go @@ -32,7 +32,7 @@ package core import ( "testing" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" ) // verifyNoGaps checks that there are no gaps after the initial set of blocks in diff --git a/core/blockchain_snapshot_test.go b/core/blockchain_snapshot_test.go index b891de80ac..30a0516002 100644 --- a/core/blockchain_snapshot_test.go +++ b/core/blockchain_snapshot_test.go @@ -40,11 +40,11 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 0d412b25d1..98911451b1 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -13,13 +13,13 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/state/pruner" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/eth/tracers/logger" diff --git a/core/bloom_indexer.go b/core/bloom_indexer.go index e21c3dcf55..16e78ec83c 100644 --- a/core/bloom_indexer.go +++ b/core/bloom_indexer.go @@ -21,10 +21,10 @@ import ( "time" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/bitutil" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index c0422caad5..9acabe35b8 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -29,7 +29,7 @@ package bloombits import ( "errors" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index 40a4749c15..c07a5d2b9c 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -32,7 +32,7 @@ import ( "math/rand" "testing" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/chain_indexer.go b/core/chain_indexer.go index 53c0812b24..1dd532f885 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -35,9 +35,9 @@ import ( "sync/atomic" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/log" diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index afd394a01e..97d7f479ec 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -35,9 +35,9 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index a1f218d19b..8dcc3c69dc 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -33,11 +33,11 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/misc/eip4844" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/triedb" diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 95f4b860b7..695ae96d25 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -31,10 +31,10 @@ import ( "math/big" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/triedb" diff --git a/core/error.go b/core/error.go index e00fbd83f7..e321e07d69 100644 --- a/core/error.go +++ b/core/error.go @@ -29,7 +29,7 @@ package core import ( "errors" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" ) var ( diff --git a/core/events.go b/core/events.go index 5a04f9b0ad..90345c67de 100644 --- a/core/events.go +++ b/core/events.go @@ -27,8 +27,8 @@ package core import ( - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index f154d15302..079b39f495 100644 --- a/core/evm.go +++ b/core/evm.go @@ -34,12 +34,11 @@ import ( "github.com/ava-labs/coreth/consensus/misc/eip4844" "github.com/ava-labs/coreth/core/extstate" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" customheader "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/libevm/common" - ethtypes "github.com/ava-labs/libevm/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/holiman/uint256" ) @@ -134,7 +133,7 @@ func NewEVMBlockContext(header *types.Header, chain ChainContext, author *common BaseFee: baseFee, BlobBaseFee: blobBaseFee, GasLimit: header.GasLimit, - Header: ðtypes.Header{ + Header: &types.Header{ Number: new(big.Int).Set(header.Number), Time: header.Time, Extra: header.Extra, diff --git a/core/extstate/statedb.go b/core/extstate/statedb.go index 1c81601064..21b1586052 100644 --- a/core/extstate/statedb.go +++ b/core/extstate/statedb.go @@ -6,10 +6,10 @@ package extstate import ( "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/predicate" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" ) diff --git a/core/gen_genesis.go b/core/gen_genesis.go index f95761980c..553a499a24 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,11 +7,11 @@ import ( "errors" "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/common/math" + "github.com/ava-labs/libevm/core/types" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 51b08f106b..ee2059f2db 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -34,7 +34,6 @@ import ( "math/big" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/coreth/triedb/pathdb" @@ -42,6 +41,7 @@ import ( "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/common/math" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie" diff --git a/core/genesis_extra_test.go b/core/genesis_extra_test.go index 462586537e..e37d395783 100644 --- a/core/genesis_extra_test.go +++ b/core/genesis_extra_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/triedb" "github.com/stretchr/testify/require" ) diff --git a/core/genesis_test.go b/core/genesis_test.go index 6fe90b3404..857f6115c7 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -34,7 +34,6 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" @@ -43,6 +42,7 @@ import ( "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/trie" diff --git a/core/headerchain.go b/core/headerchain.go index 1ac23eadc4..dda4a6f948 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -34,11 +34,11 @@ import ( "sync/atomic" "github.com/ava-labs/coreth/consensus" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/lru" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/headerchain_test.go b/core/headerchain_test.go index c6c7463b44..b3bc553a9e 100644 --- a/core/headerchain_test.go +++ b/core/headerchain_test.go @@ -34,11 +34,11 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" ) diff --git a/core/predicate_check.go b/core/predicate_check.go index 00671bcda6..ed01e58b8f 100644 --- a/core/predicate_check.go +++ b/core/predicate_check.go @@ -8,11 +8,11 @@ import ( "fmt" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/precompile/precompileconfig" "github.com/ava-labs/coreth/predicate" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/log" ) diff --git a/core/predicate_check_test.go b/core/predicate_check_test.go index de942c1a70..9fdb6120f5 100644 --- a/core/predicate_check_test.go +++ b/core/predicate_check_test.go @@ -9,10 +9,10 @@ import ( "github.com/ava-labs/avalanchego/snow/engine/snowman/block" "github.com/ava-labs/avalanchego/utils/set" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/precompile/precompileconfig" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/core/rlp_test.go b/core/rlp_test.go index f43f487aab..37116ac648 100644 --- a/core/rlp_test.go +++ b/core/rlp_test.go @@ -32,9 +32,9 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" "golang.org/x/crypto/sha3" diff --git a/core/sender_cacher.go b/core/sender_cacher.go index a1c09ec362..0693d3c424 100644 --- a/core/sender_cacher.go +++ b/core/sender_cacher.go @@ -29,7 +29,7 @@ package core import ( "sync" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" ) // txSenderCacherRequest is a request for recovering transaction senders with a diff --git a/core/state/pruner/pruner.go b/core/state/pruner/pruner.go index 0f22628d42..eda7bfd7d4 100644 --- a/core/state/pruner/pruner.go +++ b/core/state/pruner/pruner.go @@ -38,10 +38,10 @@ import ( "time" "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/core/state/snapshot/conversion.go b/core/state/snapshot/conversion.go index 80e01f0764..46da66cbaa 100644 --- a/core/state/snapshot/conversion.go +++ b/core/state/snapshot/conversion.go @@ -35,9 +35,9 @@ import ( "sync" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/core/state/snapshot/difflayer.go b/core/state/snapshot/difflayer.go index 0e3b38d509..e6a9ce8328 100644 --- a/core/state/snapshot/difflayer.go +++ b/core/state/snapshot/difflayer.go @@ -35,8 +35,8 @@ import ( "sync/atomic" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/rlp" bloomfilter "github.com/holiman/bloomfilter/v2" "golang.org/x/exp/slices" diff --git a/core/state/snapshot/disklayer.go b/core/state/snapshot/disklayer.go index bb962df5d1..9ae076b84c 100644 --- a/core/state/snapshot/disklayer.go +++ b/core/state/snapshot/disklayer.go @@ -31,10 +31,10 @@ import ( "sync" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/triedb" diff --git a/core/state/snapshot/generate.go b/core/state/snapshot/generate.go index a4cc64d790..523683ec60 100644 --- a/core/state/snapshot/generate.go +++ b/core/state/snapshot/generate.go @@ -31,11 +31,11 @@ import ( "fmt" "time" - "github.com/ava-labs/coreth/core/types" customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/core/state/snapshot/generate_test.go b/core/state/snapshot/generate_test.go index eb1a47b6a5..94549d1f49 100644 --- a/core/state/snapshot/generate_test.go +++ b/core/state/snapshot/generate_test.go @@ -32,11 +32,11 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/coreth/triedb/pathdb" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/core/state/snapshot/snapshot_test.go b/core/state/snapshot/snapshot_test.go index 4fb1fdecee..06e6d5a1a1 100644 --- a/core/state/snapshot/snapshot_test.go +++ b/core/state/snapshot/snapshot_test.go @@ -33,9 +33,9 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/rlp" "github.com/holiman/uint256" ) diff --git a/core/state/state_test.go b/core/state/state_test.go index a78197bf63..6bf027ae52 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -29,9 +29,9 @@ package state import ( "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/state/statedb_multicoin_test.go b/core/state/statedb_multicoin_test.go index 127e260861..d59efd8150 100644 --- a/core/state/statedb_multicoin_test.go +++ b/core/state/statedb_multicoin_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" "github.com/ava-labs/libevm/crypto" @@ -150,7 +150,7 @@ func TestGenerateMultiCoinAccounts(t *testing.T) { if err != nil { t.Fatal(err) } - if !types.IsMultiCoin(snapAccount) { + if !customtypes.IsMultiCoin(snapAccount) { t.Fatalf("Expected SnapAccount to return IsMultiCoin: true, found: false") } diff --git a/core/state_manager.go b/core/state_manager.go index 30b20be86a..805c3ffd38 100644 --- a/core/state_manager.go +++ b/core/state_manager.go @@ -31,8 +31,8 @@ import ( "math/rand" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" ) diff --git a/core/state_manager_test.go b/core/state_manager_test.go index ea91e0d113..13033358fc 100644 --- a/core/state_manager_test.go +++ b/core/state_manager_test.go @@ -7,7 +7,7 @@ import ( "math/big" "testing" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/common" "github.com/stretchr/testify/assert" diff --git a/core/state_processor.go b/core/state_processor.go index 563485f67e..b3c4c32d3f 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -32,9 +32,9 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" diff --git a/core/state_processor_test.go b/core/state_processor_test.go index fb78dc5d6b..1019d883cd 100644 --- a/core/state_processor_test.go +++ b/core/state_processor_test.go @@ -35,7 +35,7 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/consensus/misc/eip4844" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" customheader "github.com/ava-labs/coreth/plugin/evm/header" @@ -46,6 +46,7 @@ import ( "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/trie" @@ -385,7 +386,7 @@ func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Tr BaseFee: baseFee, } if configExtra.IsApricotPhase4(header.Time) { - headerExtra := types.GetHeaderExtra(header) + headerExtra := customtypes.GetHeaderExtra(header) headerExtra.BlockGasCost = big.NewInt(0) headerExtra.ExtDataGasUsed = big.NewInt(0) } diff --git a/core/state_transition.go b/core/state_transition.go index 8c6ea23787..31c5758454 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -31,11 +31,11 @@ import ( "math" "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" cmath "github.com/ava-labs/libevm/common/math" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto/kzg4844" "github.com/holiman/uint256" diff --git a/core/state_transition_test.go b/core/state_transition_test.go index 0aba925a7c..c2fd593a0a 100644 --- a/core/state_transition_test.go +++ b/core/state_transition_test.go @@ -33,13 +33,13 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/nativeasset" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap1" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/stretchr/testify/require" diff --git a/core/test_blockchain.go b/core/test_blockchain.go index b12e00038b..a5dc5be6ce 100644 --- a/core/test_blockchain.go +++ b/core/test_blockchain.go @@ -11,11 +11,11 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap4" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/holiman/uint256" diff --git a/core/txindexer_test.go b/core/txindexer_test.go index 53eb6a2fe5..347bac340a 100644 --- a/core/txindexer_test.go +++ b/core/txindexer_test.go @@ -22,10 +22,10 @@ import ( "testing" "github.com/ava-labs/coreth/consensus/dummy" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/stretchr/testify/require" diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go index 89a26f375c..b947649ccc 100644 --- a/core/txpool/blobpool/blobpool.go +++ b/core/txpool/blobpool/blobpool.go @@ -43,10 +43,10 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/metrics" diff --git a/core/txpool/blobpool/blobpool_test.go b/core/txpool/blobpool/blobpool_test.go index d245105b4a..fb44f041e1 100644 --- a/core/txpool/blobpool/blobpool_test.go +++ b/core/txpool/blobpool/blobpool_test.go @@ -43,12 +43,12 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/crypto/kzg4844" "github.com/ava-labs/libevm/ethdb/memorydb" diff --git a/core/txpool/blobpool/interface.go b/core/txpool/blobpool/interface.go index d25250e887..42cd916817 100644 --- a/core/txpool/blobpool/interface.go +++ b/core/txpool/blobpool/interface.go @@ -28,9 +28,9 @@ package blobpool import ( "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // BlockChain defines the minimal set of methods needed to back a blob pool with diff --git a/core/txpool/blobpool/limbo.go b/core/txpool/blobpool/limbo.go index 541b1309e8..bf133f7a3b 100644 --- a/core/txpool/blobpool/limbo.go +++ b/core/txpool/blobpool/limbo.go @@ -29,8 +29,8 @@ package blobpool import ( "errors" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" "github.com/holiman/billy" diff --git a/core/txpool/legacypool/journal.go b/core/txpool/legacypool/journal.go index f29d4f2855..cc5e900947 100644 --- a/core/txpool/legacypool/journal.go +++ b/core/txpool/legacypool/journal.go @@ -32,8 +32,8 @@ import ( "io/fs" "os" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" ) diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go index 2a026a0f16..c72936f075 100644 --- a/core/txpool/legacypool/legacypool.go +++ b/core/txpool/legacypool/legacypool.go @@ -39,12 +39,12 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/prque" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/metrics" diff --git a/core/txpool/legacypool/legacypool2_test.go b/core/txpool/legacypool/legacypool2_test.go index baf094273c..e478d9f554 100644 --- a/core/txpool/legacypool/legacypool2_test.go +++ b/core/txpool/legacypool/legacypool2_test.go @@ -31,9 +31,9 @@ import ( "testing" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/event" "github.com/holiman/uint256" diff --git a/core/txpool/legacypool/legacypool_test.go b/core/txpool/legacypool/legacypool_test.go index 8f754a2ce8..2dca13c70b 100644 --- a/core/txpool/legacypool/legacypool_test.go +++ b/core/txpool/legacypool/legacypool_test.go @@ -42,10 +42,10 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/trie" diff --git a/core/txpool/legacypool/list.go b/core/txpool/legacypool/list.go index be458113b2..89ababa830 100644 --- a/core/txpool/legacypool/list.go +++ b/core/txpool/legacypool/list.go @@ -35,8 +35,8 @@ import ( "sync/atomic" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/holiman/uint256" "golang.org/x/exp/slices" ) diff --git a/core/txpool/legacypool/list_test.go b/core/txpool/legacypool/list_test.go index d94dc5c683..f0eea8c8ea 100644 --- a/core/txpool/legacypool/list_test.go +++ b/core/txpool/legacypool/list_test.go @@ -31,8 +31,8 @@ import ( "math/rand" "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/holiman/uint256" ) diff --git a/core/txpool/subpool.go b/core/txpool/subpool.go index 9059556094..b1c3ef7556 100644 --- a/core/txpool/subpool.go +++ b/core/txpool/subpool.go @@ -31,8 +31,8 @@ import ( "time" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/event" "github.com/holiman/uint256" ) diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go index de7ed76955..d99c08fb15 100644 --- a/core/txpool/txpool.go +++ b/core/txpool/txpool.go @@ -34,8 +34,8 @@ import ( "sync/atomic" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/metrics" diff --git a/core/txpool/validation.go b/core/txpool/validation.go index 32ab16594c..fabcda6bb3 100644 --- a/core/txpool/validation.go +++ b/core/txpool/validation.go @@ -33,9 +33,9 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto/kzg4844" "github.com/ava-labs/libevm/log" diff --git a/core/types.go b/core/types.go index 6339d7578b..dc03e7905f 100644 --- a/core/types.go +++ b/core/types.go @@ -28,7 +28,7 @@ package core import ( "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" ) diff --git a/core/types/block_ext.go b/core/types/block_ext.go index bf2b1ecd90..73d5bc29e6 100644 --- a/core/types/block_ext.go +++ b/core/types/block_ext.go @@ -13,7 +13,7 @@ import ( ) // SetBlockExtra sets the [BlockBodyExtra] `extra` in the [Block] `b`. -func SetBlockExtra(b *Block, extra *BlockBodyExtra) { +func SetBlockExtra(b *ethtypes.Block, extra *BlockBodyExtra) { extras.Block.Set(b, extra) } @@ -45,7 +45,7 @@ func (b *BlockBodyExtra) Copy() *BlockBodyExtra { // - (-) [ethtypes.Body] `Withdrawals` field // - (+) [BlockBodyExtra] `Version` field // - (+) [BlockBodyExtra] `ExtData` field -func (b *BlockBodyExtra) BodyRLPFieldsForEncoding(body *Body) *rlp.Fields { +func (b *BlockBodyExtra) BodyRLPFieldsForEncoding(body *ethtypes.Body) *rlp.Fields { return &rlp.Fields{ Required: []any{ body.Transactions, @@ -58,7 +58,7 @@ func (b *BlockBodyExtra) BodyRLPFieldsForEncoding(body *Body) *rlp.Fields { // BodyRLPFieldPointersForDecoding returns the fields that should be decoded to // for the [Body] and [BlockBodyExtra]. -func (b *BlockBodyExtra) BodyRLPFieldPointersForDecoding(body *Body) *rlp.Fields { +func (b *BlockBodyExtra) BodyRLPFieldPointersForDecoding(body *ethtypes.Body) *rlp.Fields { return &rlp.Fields{ Required: []any{ &body.Transactions, @@ -101,18 +101,18 @@ func (b *BlockBodyExtra) BlockRLPFieldPointersForDecoding(block *ethtypes.BlockR } } -func BlockExtData(b *Block) []byte { +func BlockExtData(b *ethtypes.Block) []byte { if data := extras.Block.Get(b).ExtData; data != nil { return *data } return nil } -func BlockVersion(b *Block) uint32 { +func BlockVersion(b *ethtypes.Block) uint32 { return extras.Block.Get(b).Version } -func BlockExtDataGasUsed(b *Block) *big.Int { +func BlockExtDataGasUsed(b *ethtypes.Block) *big.Int { used := GetHeaderExtra(b.Header()).ExtDataGasUsed if used == nil { return nil @@ -120,7 +120,7 @@ func BlockExtDataGasUsed(b *Block) *big.Int { return new(big.Int).Set(used) } -func BlockGasCost(b *Block) *big.Int { +func BlockGasCost(b *ethtypes.Block) *big.Int { cost := GetHeaderExtra(b.Header()).BlockGasCost if cost == nil { return nil @@ -136,14 +136,14 @@ func CalcExtDataHash(extdata []byte) common.Hash { } func NewBlockWithExtData( - header *Header, txs []*Transaction, uncles []*Header, receipts []*Receipt, - hasher TrieHasher, extdata []byte, recalc bool, -) *Block { + header *ethtypes.Header, txs []*ethtypes.Transaction, uncles []*ethtypes.Header, receipts []*ethtypes.Receipt, + hasher ethtypes.TrieHasher, extdata []byte, recalc bool, +) *ethtypes.Block { if recalc { headerExtra := GetHeaderExtra(header) headerExtra.ExtDataHash = CalcExtDataHash(extdata) } - block := NewBlock(header, txs, uncles, receipts, hasher) + block := ethtypes.NewBlock(header, txs, uncles, receipts, hasher) extdataCopy := make([]byte, len(extdata)) copy(extdataCopy, extdata) extra := &BlockBodyExtra{ diff --git a/core/types/block_ext_test.go b/core/types/block_ext_test.go index bcc44d9db6..2ad82a7cab 100644 --- a/core/types/block_ext_test.go +++ b/core/types/block_ext_test.go @@ -11,12 +11,16 @@ import ( "unsafe" "github.com/ava-labs/libevm/common" - ethtypes "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/rlp" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + // TODO(arr4n) These tests were originally part of the `coreth/core/types` + // package so assume the presence of identifiers. A dot-import reduces PR + // noise during the refactoring. + . "github.com/ava-labs/libevm/core/types" ) func TestCopyHeader(t *testing.T) { @@ -150,7 +154,7 @@ func blockWithNonZeroFields() (*Block, *BlockBodyExtra) { receipts := []*Receipt{{PostState: []byte{11}}} block := NewBlock(header, txs, uncles, receipts, stubHasher{}) - withdrawals := []*ethtypes.Withdrawal{{Index: 12}} + withdrawals := []*Withdrawal{{Index: 12}} block = block.WithWithdrawals(withdrawals) extra := &BlockBodyExtra{ Version: 13, @@ -174,7 +178,7 @@ func TestBlockWithNonZeroFields(t *testing.T) { // bodyWithNonZeroFields returns a [Body] and a [BlockBodyExtra], // each with all fields set to non-zero values. // The [BlockBodyExtra] extra payload is set in the [Body] via `extras.Block.Set` -// and the extra copying done in [ethtypes.Block.Body]. +// and the extra copying done in `Block.Body()`. // // NOTE: They can be used to demonstrate that RLP round-trip encoding // can recover all fields, but not that the encoded format is correct. This is diff --git a/core/types/block_test.go b/core/types/block_test.go index 317a1761ff..50cf21b7ef 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -40,6 +40,11 @@ import ( "github.com/ava-labs/libevm/rlp" . "github.com/ava-labs/coreth/core/types" + + // TODO(arr4n) These tests were originally part of the `coreth/core/types` + // package so assume the presence of identifiers. A dot-import reduces PR + // noise during the refactoring. + . "github.com/ava-labs/libevm/core/types" ) // This test has been modified from https://github.com/ethereum/go-ethereum/blob/v1.9.21/core/types/block_test.go#L35 to fit diff --git a/core/types/gen_header_serializable_json.go b/core/types/gen_header_serializable_json.go index eb4e7957a7..a584331b8b 100644 --- a/core/types/gen_header_serializable_json.go +++ b/core/types/gen_header_serializable_json.go @@ -9,6 +9,7 @@ import ( "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/types" ) var _ = (*headerMarshaling)(nil) @@ -16,29 +17,29 @@ var _ = (*headerMarshaling)(nil) // MarshalJSON marshals as JSON. func (h HeaderSerializable) MarshalJSON() ([]byte, error) { type HeaderSerializable struct { - ParentHash common.Hash `json:"parentHash" gencodec:"required"` - UncleHash common.Hash `json:"sha3Uncles" gencodec:"required"` - Coinbase common.Address `json:"miner" gencodec:"required"` - Root common.Hash `json:"stateRoot" gencodec:"required"` - TxHash common.Hash `json:"transactionsRoot" gencodec:"required"` - ReceiptHash common.Hash `json:"receiptsRoot" gencodec:"required"` - Bloom Bloom `json:"logsBloom" gencodec:"required"` - Difficulty *hexutil.Big `json:"difficulty" gencodec:"required"` - Number *hexutil.Big `json:"number" gencodec:"required"` - GasLimit hexutil.Uint64 `json:"gasLimit" gencodec:"required"` - GasUsed hexutil.Uint64 `json:"gasUsed" gencodec:"required"` - Time hexutil.Uint64 `json:"timestamp" gencodec:"required"` - Extra hexutil.Bytes `json:"extraData" gencodec:"required"` - MixDigest common.Hash `json:"mixHash"` - Nonce BlockNonce `json:"nonce"` - ExtDataHash common.Hash `json:"extDataHash" gencodec:"required"` - BaseFee *hexutil.Big `json:"baseFeePerGas" rlp:"optional"` - ExtDataGasUsed *hexutil.Big `json:"extDataGasUsed" rlp:"optional"` - BlockGasCost *hexutil.Big `json:"blockGasCost" rlp:"optional"` - BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed" rlp:"optional"` - ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas" rlp:"optional"` - ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"` - Hash common.Hash `json:"hash"` + ParentHash common.Hash `json:"parentHash" gencodec:"required"` + UncleHash common.Hash `json:"sha3Uncles" gencodec:"required"` + Coinbase common.Address `json:"miner" gencodec:"required"` + Root common.Hash `json:"stateRoot" gencodec:"required"` + TxHash common.Hash `json:"transactionsRoot" gencodec:"required"` + ReceiptHash common.Hash `json:"receiptsRoot" gencodec:"required"` + Bloom types.Bloom `json:"logsBloom" gencodec:"required"` + Difficulty *hexutil.Big `json:"difficulty" gencodec:"required"` + Number *hexutil.Big `json:"number" gencodec:"required"` + GasLimit hexutil.Uint64 `json:"gasLimit" gencodec:"required"` + GasUsed hexutil.Uint64 `json:"gasUsed" gencodec:"required"` + Time hexutil.Uint64 `json:"timestamp" gencodec:"required"` + Extra hexutil.Bytes `json:"extraData" gencodec:"required"` + MixDigest common.Hash `json:"mixHash"` + Nonce types.BlockNonce `json:"nonce"` + ExtDataHash common.Hash `json:"extDataHash" gencodec:"required"` + BaseFee *hexutil.Big `json:"baseFeePerGas" rlp:"optional"` + ExtDataGasUsed *hexutil.Big `json:"extDataGasUsed" rlp:"optional"` + BlockGasCost *hexutil.Big `json:"blockGasCost" rlp:"optional"` + BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed" rlp:"optional"` + ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas" rlp:"optional"` + ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"` + Hash common.Hash `json:"hash"` } var enc HeaderSerializable enc.ParentHash = h.ParentHash @@ -70,28 +71,28 @@ func (h HeaderSerializable) MarshalJSON() ([]byte, error) { // UnmarshalJSON unmarshals from JSON. func (h *HeaderSerializable) UnmarshalJSON(input []byte) error { type HeaderSerializable struct { - ParentHash *common.Hash `json:"parentHash" gencodec:"required"` - UncleHash *common.Hash `json:"sha3Uncles" gencodec:"required"` - Coinbase *common.Address `json:"miner" gencodec:"required"` - Root *common.Hash `json:"stateRoot" gencodec:"required"` - TxHash *common.Hash `json:"transactionsRoot" gencodec:"required"` - ReceiptHash *common.Hash `json:"receiptsRoot" gencodec:"required"` - Bloom *Bloom `json:"logsBloom" gencodec:"required"` - Difficulty *hexutil.Big `json:"difficulty" gencodec:"required"` - Number *hexutil.Big `json:"number" gencodec:"required"` - GasLimit *hexutil.Uint64 `json:"gasLimit" gencodec:"required"` - GasUsed *hexutil.Uint64 `json:"gasUsed" gencodec:"required"` - Time *hexutil.Uint64 `json:"timestamp" gencodec:"required"` - Extra *hexutil.Bytes `json:"extraData" gencodec:"required"` - MixDigest *common.Hash `json:"mixHash"` - Nonce *BlockNonce `json:"nonce"` - ExtDataHash *common.Hash `json:"extDataHash" gencodec:"required"` - BaseFee *hexutil.Big `json:"baseFeePerGas" rlp:"optional"` - ExtDataGasUsed *hexutil.Big `json:"extDataGasUsed" rlp:"optional"` - BlockGasCost *hexutil.Big `json:"blockGasCost" rlp:"optional"` - BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed" rlp:"optional"` - ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas" rlp:"optional"` - ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"` + ParentHash *common.Hash `json:"parentHash" gencodec:"required"` + UncleHash *common.Hash `json:"sha3Uncles" gencodec:"required"` + Coinbase *common.Address `json:"miner" gencodec:"required"` + Root *common.Hash `json:"stateRoot" gencodec:"required"` + TxHash *common.Hash `json:"transactionsRoot" gencodec:"required"` + ReceiptHash *common.Hash `json:"receiptsRoot" gencodec:"required"` + Bloom *types.Bloom `json:"logsBloom" gencodec:"required"` + Difficulty *hexutil.Big `json:"difficulty" gencodec:"required"` + Number *hexutil.Big `json:"number" gencodec:"required"` + GasLimit *hexutil.Uint64 `json:"gasLimit" gencodec:"required"` + GasUsed *hexutil.Uint64 `json:"gasUsed" gencodec:"required"` + Time *hexutil.Uint64 `json:"timestamp" gencodec:"required"` + Extra *hexutil.Bytes `json:"extraData" gencodec:"required"` + MixDigest *common.Hash `json:"mixHash"` + Nonce *types.BlockNonce `json:"nonce"` + ExtDataHash *common.Hash `json:"extDataHash" gencodec:"required"` + BaseFee *hexutil.Big `json:"baseFeePerGas" rlp:"optional"` + ExtDataGasUsed *hexutil.Big `json:"extDataGasUsed" rlp:"optional"` + BlockGasCost *hexutil.Big `json:"blockGasCost" rlp:"optional"` + BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed" rlp:"optional"` + ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas" rlp:"optional"` + ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"` } var dec HeaderSerializable if err := json.Unmarshal(input, &dec); err != nil { diff --git a/core/types/hashing_test.go b/core/types/hashing_test.go index b4063265cc..035814d414 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -34,10 +34,10 @@ import ( mrand "math/rand" "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/trie" diff --git a/core/types/header_ext.go b/core/types/header_ext.go index a9f89d3ed7..12589a3cde 100644 --- a/core/types/header_ext.go +++ b/core/types/header_ext.go @@ -14,18 +14,18 @@ import ( ) // GetHeaderExtra returns the [HeaderExtra] from the given [Header]. -func GetHeaderExtra(h *Header) *HeaderExtra { +func GetHeaderExtra(h *ethtypes.Header) *HeaderExtra { return extras.Header.Get(h) } // SetHeaderExtra sets the given [HeaderExtra] on the [Header]. -func SetHeaderExtra(h *Header, extra *HeaderExtra) { +func SetHeaderExtra(h *ethtypes.Header, extra *HeaderExtra) { extras.Header.Set(h, extra) } // WithHeaderExtra sets the given [HeaderExtra] on the [Header] // and returns the [Header] for chaining. -func WithHeaderExtra(h *Header, extra *HeaderExtra) *Header { +func WithHeaderExtra(h *ethtypes.Header, extra *HeaderExtra) *ethtypes.Header { SetHeaderExtra(h, extra) return h } @@ -169,22 +169,22 @@ func (h *HeaderSerializable) updateToExtras(extras *HeaderExtra) { // as it is to be serialized into RLP and JSON. Note it must be exported so that // rlpgen can generate the serialization code from it. type HeaderSerializable struct { - ParentHash common.Hash `json:"parentHash" gencodec:"required"` - UncleHash common.Hash `json:"sha3Uncles" gencodec:"required"` - Coinbase common.Address `json:"miner" gencodec:"required"` - Root common.Hash `json:"stateRoot" gencodec:"required"` - TxHash common.Hash `json:"transactionsRoot" gencodec:"required"` - ReceiptHash common.Hash `json:"receiptsRoot" gencodec:"required"` - Bloom Bloom `json:"logsBloom" gencodec:"required"` - Difficulty *big.Int `json:"difficulty" gencodec:"required"` - Number *big.Int `json:"number" gencodec:"required"` - GasLimit uint64 `json:"gasLimit" gencodec:"required"` - GasUsed uint64 `json:"gasUsed" gencodec:"required"` - Time uint64 `json:"timestamp" gencodec:"required"` - Extra []byte `json:"extraData" gencodec:"required"` - MixDigest common.Hash `json:"mixHash"` - Nonce BlockNonce `json:"nonce"` - ExtDataHash common.Hash `json:"extDataHash" gencodec:"required"` + ParentHash common.Hash `json:"parentHash" gencodec:"required"` + UncleHash common.Hash `json:"sha3Uncles" gencodec:"required"` + Coinbase common.Address `json:"miner" gencodec:"required"` + Root common.Hash `json:"stateRoot" gencodec:"required"` + TxHash common.Hash `json:"transactionsRoot" gencodec:"required"` + ReceiptHash common.Hash `json:"receiptsRoot" gencodec:"required"` + Bloom ethtypes.Bloom `json:"logsBloom" gencodec:"required"` + Difficulty *big.Int `json:"difficulty" gencodec:"required"` + Number *big.Int `json:"number" gencodec:"required"` + GasLimit uint64 `json:"gasLimit" gencodec:"required"` + GasUsed uint64 `json:"gasUsed" gencodec:"required"` + Time uint64 `json:"timestamp" gencodec:"required"` + Extra []byte `json:"extraData" gencodec:"required"` + MixDigest common.Hash `json:"mixHash"` + Nonce ethtypes.BlockNonce `json:"nonce"` + ExtDataHash common.Hash `json:"extDataHash" gencodec:"required"` // BaseFee was added by EIP-1559 and is ignored in legacy headers. BaseFee *big.Int `json:"baseFeePerGas" rlp:"optional"` diff --git a/core/types/header_ext_test.go b/core/types/header_ext_test.go index 279e1a17ba..49b5f78972 100644 --- a/core/types/header_ext_test.go +++ b/core/types/header_ext_test.go @@ -13,10 +13,14 @@ import ( "unsafe" "github.com/ava-labs/libevm/common" - ethtypes "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + // TODO(arr4n) These tests were originally part of the `coreth/core/types` + // package so assume the presence of identifiers. A dot-import reduces PR + // noise during the refactoring. + . "github.com/ava-labs/libevm/core/types" ) func TestHeaderRLP(t *testing.T) { @@ -87,7 +91,7 @@ func TestHeaderWithNonZeroFields(t *testing.T) { // can recover all fields, but not that the encoded format is correct. This is // very important as the RLP encoding of a [Header] defines its hash. func headerWithNonZeroFields() (*Header, *HeaderExtra) { - header := ðtypes.Header{ + header := &Header{ ParentHash: common.Hash{1}, UncleHash: common.Hash{2}, Coinbase: common.Address{3}, @@ -164,7 +168,7 @@ func allFieldsSet[T interface { assertNonZero(t, f) case *Header: assertNonZero(t, f) - case []uint8, []*Header, Transactions, []*Transaction, ethtypes.Withdrawals, []*ethtypes.Withdrawal: + case []uint8, []*Header, Transactions, []*Transaction, Withdrawals, []*Withdrawal: assert.NotEmpty(t, f) default: t.Errorf("Field %q has unsupported type %T", field.Name, f) diff --git a/core/types/imports.go b/core/types/imports.go deleted file mode 100644 index 9af78fe8ea..0000000000 --- a/core/types/imports.go +++ /dev/null @@ -1,107 +0,0 @@ -// (c) 2024, Ava Labs, Inc. All rights reserved. -// See the file LICENSE for licensing terms. - -package types - -import ( - ethtypes "github.com/ava-labs/libevm/core/types" -) - -// The following types are used directly as their upstream definitions. -type ( - AccessList = ethtypes.AccessList - AccessListTx = ethtypes.AccessListTx - AccessTuple = ethtypes.AccessTuple - Account = ethtypes.Account - BlobTx = ethtypes.BlobTx - BlobTxSidecar = ethtypes.BlobTxSidecar - Block = ethtypes.Block - BlockNonce = ethtypes.BlockNonce - Blocks = ethtypes.Blocks - Bloom = ethtypes.Bloom - Body = ethtypes.Body - DerivableList = ethtypes.DerivableList - 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 - Signer = ethtypes.Signer - SlimAccount = ethtypes.SlimAccount - StateAccount = ethtypes.StateAccount - Transaction = ethtypes.Transaction - Transactions = ethtypes.Transactions - TrieHasher = ethtypes.TrieHasher - TxByNonce = ethtypes.TxByNonce - TxData = ethtypes.TxData -) - -// The following constants are used directly as their upstream definitions. -const ( - BloomBitLength = ethtypes.BloomBitLength - BloomByteLength = ethtypes.BloomByteLength - ReceiptStatusFailed = ethtypes.ReceiptStatusFailed - ReceiptStatusSuccessful = ethtypes.ReceiptStatusSuccessful - - // Transaction types. - AccessListTxType = ethtypes.AccessListTxType - BlobTxType = ethtypes.BlobTxType - DynamicFeeTxType = ethtypes.DynamicFeeTxType - 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 - BytesToBloom = ethtypes.BytesToBloom - CalcUncleHash = ethtypes.CalcUncleHash - CopyHeader = ethtypes.CopyHeader - CreateBloom = ethtypes.CreateBloom - DeriveSha = ethtypes.DeriveSha - EncodeNonce = ethtypes.EncodeNonce - FullAccount = ethtypes.FullAccount - FullAccountRLP = ethtypes.FullAccountRLP - NewBlock = ethtypes.NewBlock - NewBlockWithHeader = ethtypes.NewBlockWithHeader - NewContractCreation = ethtypes.NewContractCreation - NewEmptyStateAccount = ethtypes.NewEmptyStateAccount - NewReceipt = ethtypes.NewReceipt - NewTransaction = ethtypes.NewTransaction - SlimAccountRLP = ethtypes.SlimAccountRLP - TrieRootHash = ethtypes.TrieRootHash - - // Signers - LatestSigner = ethtypes.LatestSigner - LatestSignerForChainID = ethtypes.LatestSignerForChainID - MakeSigner = ethtypes.MakeSigner - MustSignNewTx = ethtypes.MustSignNewTx - NewCancunSigner = ethtypes.NewCancunSigner - NewEIP155Signer = ethtypes.NewEIP155Signer - NewEIP2930Signer = ethtypes.NewEIP2930Signer - NewLondonSigner = ethtypes.NewLondonSigner - Sender = ethtypes.Sender - SignNewTx = ethtypes.SignNewTx - SignTx = ethtypes.SignTx - - // Transactions - NewTx = ethtypes.NewTx - TxDifference = ethtypes.TxDifference - - // Errors - ErrGasFeeCapTooLow = ethtypes.ErrGasFeeCapTooLow - ErrTxTypeNotSupported = ethtypes.ErrTxTypeNotSupported -) diff --git a/core/types/log_ext.go b/core/types/log_ext.go index ca0958257b..db03d71715 100644 --- a/core/types/log_ext.go +++ b/core/types/log_ext.go @@ -2,9 +2,11 @@ // See the file LICENSE for licensing terms. package types +import ethtypes "github.com/ava-labs/libevm/core/types" + // FlattenLogs converts a nested array of logs to a single array of logs. -func FlattenLogs(list [][]*Log) []*Log { - var flat []*Log +func FlattenLogs(list [][]*ethtypes.Log) []*ethtypes.Log { + var flat []*ethtypes.Log for _, logs := range list { flat = append(flat, logs...) } diff --git a/core/types/rlp_fuzzer_test.go b/core/types/rlp_fuzzer_test.go index 4e3645874a..baccb41b64 100644 --- a/core/types/rlp_fuzzer_test.go +++ b/core/types/rlp_fuzzer_test.go @@ -24,6 +24,11 @@ import ( "github.com/ava-labs/libevm/rlp" "github.com/holiman/uint256" + + // TODO(arr4n) These tests were originally part of the `coreth/core/types` + // package so assume the presence of identifiers. A dot-import reduces PR + // noise during the refactoring. + . "github.com/ava-labs/libevm/core/types" ) func decodeEncode(input []byte, val interface{}) error { diff --git a/core/types/types_test.go b/core/types/types_test.go index 7620aafb7f..4fdec60078 100644 --- a/core/types/types_test.go +++ b/core/types/types_test.go @@ -33,6 +33,11 @@ import ( "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" + + // TODO(arr4n) These tests were originally part of the `coreth/core/types` + // package so assume the presence of identifiers. A dot-import reduces PR + // noise during the refactoring. + . "github.com/ava-labs/libevm/core/types" ) type devnull struct{ len int } diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 3e6a45130b..9f7b4f36f9 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -31,12 +31,12 @@ import ( "math/big" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/holiman/uint256" diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 33f8e265e7..c29e0886da 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -37,12 +37,12 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/asm" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/eth/tracers/logger" diff --git a/eth/api_admin.go b/eth/api_admin.go index 1531af6427..c821d5de9b 100644 --- a/eth/api_admin.go +++ b/eth/api_admin.go @@ -35,7 +35,7 @@ import ( "strings" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/rlp" ) diff --git a/eth/api_backend.go b/eth/api_backend.go index 0c4d0e3ced..bf284eddf8 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -37,7 +37,6 @@ import ( "github.com/ava-labs/coreth/core/bloombits" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/gasprice" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/coreth/internal/ethapi" @@ -46,6 +45,7 @@ import ( "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/accounts" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" diff --git a/eth/api_backend_test.go b/eth/api_backend_test.go index e8fc92b569..b4cef1abd8 100644 --- a/eth/api_backend_test.go +++ b/eth/api_backend_test.go @@ -30,8 +30,8 @@ import ( "fmt" "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/eth/api_debug.go b/eth/api_debug.go index e018072829..fb8c34431d 100644 --- a/eth/api_debug.go +++ b/eth/api_debug.go @@ -33,12 +33,12 @@ import ( "time" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/ethapi" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/eth/api_debug_test.go b/eth/api_debug_test.go index 7eff3a47b5..b1e6a6eba0 100644 --- a/eth/api_debug_test.go +++ b/eth/api_debug_test.go @@ -34,8 +34,8 @@ import ( "testing" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/triedb" "github.com/holiman/uint256" diff --git a/eth/backend.go b/eth/backend.go index 8e53574a9e..161f7897e3 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -41,7 +41,6 @@ import ( "github.com/ava-labs/coreth/core/state/pruner" "github.com/ava-labs/coreth/core/txpool" "github.com/ava-labs/coreth/core/txpool/legacypool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/ethconfig" "github.com/ava-labs/coreth/eth/filters" "github.com/ava-labs/coreth/eth/gasprice" @@ -56,6 +55,7 @@ import ( "github.com/ava-labs/libevm/accounts" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" diff --git a/eth/chain_with_final_block.go b/eth/chain_with_final_block.go index 6e2afba475..0806388cd0 100644 --- a/eth/chain_with_final_block.go +++ b/eth/chain_with_final_block.go @@ -3,7 +3,7 @@ package eth import ( "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" ) const blocksToKeep = 604_800 // Approx. 2 weeks worth of blocks assuming 2s block time diff --git a/eth/filters/api.go b/eth/filters/api.go index 1ed17ec6db..fc43efb910 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -35,12 +35,12 @@ import ( "sync" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/internal/ethapi" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/event" ) diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 46d0da3545..4dc33dd4b9 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -33,10 +33,10 @@ import ( "time" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/bitutil" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" ) diff --git a/eth/filters/filter.go b/eth/filters/filter.go index f58db13a5c..ffa6f6f7d5 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -33,9 +33,10 @@ import ( "math/big" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // Filter can be used to retrieve and filter logs. @@ -341,7 +342,7 @@ func (f *Filter) checkMatches(ctx context.Context, header *types.Header) ([]*typ return nil, err } - unfiltered := types.FlattenLogs(logsList) + unfiltered := customtypes.FlattenLogs(logsList) logs := filterLogs(unfiltered, nil, nil, f.addresses, f.topics) if len(logs) == 0 { return nil, nil diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 425617b899..30e3f35b9d 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -36,11 +36,11 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/log" diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 9117a6a351..e57d82dae5 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -40,7 +40,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/bloombits" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/internal/ethapi" "github.com/ava-labs/coreth/params" @@ -48,6 +47,7 @@ import ( "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" "github.com/stretchr/testify/require" diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index b43a97f101..1439b3cfda 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -37,12 +37,12 @@ import ( "github.com/ava-labs/coreth/accounts/abi" "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/triedb" diff --git a/eth/gasestimator/gasestimator.go b/eth/gasestimator/gasestimator.go index 3b57bb4cc0..b97f1b6747 100644 --- a/eth/gasestimator/gasestimator.go +++ b/eth/gasestimator/gasestimator.go @@ -35,9 +35,9 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/log" ) diff --git a/eth/gasprice/fee_info_provider.go b/eth/gasprice/fee_info_provider.go index 718b2d969e..b5d515f37d 100644 --- a/eth/gasprice/fee_info_provider.go +++ b/eth/gasprice/fee_info_provider.go @@ -31,8 +31,9 @@ import ( "math/big" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/rpc" + "github.com/ava-labs/libevm/core/types" lru "github.com/hashicorp/golang-lru" ) @@ -94,7 +95,7 @@ func (f *feeInfoProvider) addHeader(ctx context.Context, header *types.Header) ( } totalGasUsed := new(big.Int).SetUint64(header.GasUsed) - if used := types.GetHeaderExtra(header).ExtDataGasUsed; used != nil { + if used := customtypes.GetHeaderExtra(header).ExtDataGasUsed; used != nil { totalGasUsed.Add(totalGasUsed, used) } minGasUsed := new(big.Int).SetUint64(f.minGasUsed) diff --git a/eth/gasprice/fee_info_provider_test.go b/eth/gasprice/fee_info_provider_test.go index 16f0b02dc1..b851a4430d 100644 --- a/eth/gasprice/fee_info_provider_test.go +++ b/eth/gasprice/fee_info_provider_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/stretchr/testify/require" ) diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go index 1a922797e9..a619b8e005 100644 --- a/eth/gasprice/feehistory.go +++ b/eth/gasprice/feehistory.go @@ -33,9 +33,9 @@ import ( "math/big" "slices" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/log" ) diff --git a/eth/gasprice/feehistory_test.go b/eth/gasprice/feehistory_test.go index f4ef530415..2e2d1cc8c0 100644 --- a/eth/gasprice/feehistory_test.go +++ b/eth/gasprice/feehistory_test.go @@ -33,7 +33,7 @@ import ( "testing" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/stretchr/testify/require" "github.com/ava-labs/coreth/params" diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 6e7399e749..f236715056 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -33,13 +33,13 @@ import ( "github.com/ava-labs/avalanchego/utils/timer/mockable" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" customheader "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/plugin/evm/upgrade/acp176" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/lru" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/log" "golang.org/x/exp/slices" diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go index 1d5d284541..5dcc3c02e0 100644 --- a/eth/gasprice/gasprice_test.go +++ b/eth/gasprice/gasprice_test.go @@ -35,7 +35,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" customheader "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/plugin/evm/upgrade/acp176" @@ -44,6 +43,7 @@ import ( "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/event" diff --git a/eth/state_accessor.go b/eth/state_accessor.go index 29eea5f425..494d457b5d 100644 --- a/eth/state_accessor.go +++ b/eth/state_accessor.go @@ -34,10 +34,10 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie" diff --git a/eth/tracers/api.go b/eth/tracers/api.go index c22c26a54b..66eb98fa43 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -40,12 +40,12 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/ethapi" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/eth/tracers/logger" "github.com/ava-labs/libevm/ethdb" diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go index cab08f9222..053953d09e 100644 --- a/eth/tracers/api_test.go +++ b/eth/tracers/api_test.go @@ -41,13 +41,13 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/ethapi" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/eth/tracers/logger" diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index 311613fecc..f463d4bdee 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -31,11 +31,11 @@ import ( "testing" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/tests" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/eth/tracers/logger" diff --git a/ethclient/corethclient/corethclient.go b/ethclient/corethclient/corethclient.go index 47f8dcb987..fddb366f28 100644 --- a/ethclient/corethclient/corethclient.go +++ b/ethclient/corethclient/corethclient.go @@ -33,12 +33,12 @@ import ( "runtime" "runtime/debug" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/ethclient" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/types" ) // Client is a wrapper around rpc.Client that implements geth-specific functionality. diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 5ffb722096..57a7dba050 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -35,11 +35,12 @@ import ( "math/big" "github.com/ava-labs/coreth/accounts/abi/bind" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/types" // Force-load precompiles to trigger registration _ "github.com/ava-labs/coreth/precompile/registry" @@ -271,11 +272,11 @@ func (ec *client) getBlock(ctx context.Context, method string, args ...interface Transactions: txs, Uncles: uncles, }) - extra := &types.BlockBodyExtra{ + extra := &customtypes.BlockBodyExtra{ Version: body.Version, ExtData: (*[]byte)(body.BlockExtraData), } - types.SetBlockExtra(block, extra) + customtypes.SetBlockExtra(block, extra) return block, nil } diff --git a/ethclient/signer.go b/ethclient/signer.go index 82b8ee48ca..b570896a35 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -30,8 +30,8 @@ import ( "errors" "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // senderFromServer is a types.Signer that remembers the sender address returned by the RPC diff --git a/ethclient/simulated/backend.go b/ethclient/simulated/backend.go index 8971b3704c..3e8f968276 100644 --- a/ethclient/simulated/backend.go +++ b/ethclient/simulated/backend.go @@ -25,7 +25,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/constants" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth" "github.com/ava-labs/coreth/eth/ethconfig" "github.com/ava-labs/coreth/ethclient" @@ -35,6 +34,7 @@ import ( "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" ) var _ eth.PushGossiper = (*fakePushGossiper)(nil) diff --git a/ethclient/simulated/backend_test.go b/ethclient/simulated/backend_test.go index 99b37b8996..5afb2cb96c 100644 --- a/ethclient/simulated/backend_test.go +++ b/ethclient/simulated/backend_test.go @@ -25,10 +25,10 @@ import ( "time" "github.com/ava-labs/coreth/accounts/abi/bind" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/stretchr/testify/require" ) diff --git a/ethclient/simulated/options_test.go b/ethclient/simulated/options_test.go index cabf038eba..9de9b4bb0b 100644 --- a/ethclient/simulated/options_test.go +++ b/ethclient/simulated/options_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/interfaces" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/acp176" + "github.com/ava-labs/libevm/core/types" ) // Tests that the simulator starts with the initial gas limit in the genesis block, diff --git a/go.mod b/go.mod index 2dcd3bf8e2..4034c23760 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.23.6 require ( github.com/VictoriaMetrics/fastcache v1.12.1 - github.com/ava-labs/avalanchego v1.12.3-0.20250305093940-1fa2bf198956 + github.com/ava-labs/avalanchego v1.12.3-0.20250314173032-a3d150e0aad0 github.com/ava-labs/libevm v1.13.14-0.2.0.rc.3 github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 github.com/davecgh/go-spew v1.1.1 @@ -25,23 +25,24 @@ require ( github.com/spf13/cast v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.12.0 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 github.com/tyler-smith/go-bip39 v1.1.0 github.com/urfave/cli/v2 v2.25.7 go.uber.org/goleak v1.3.0 go.uber.org/mock v0.5.0 golang.org/x/crypto v0.32.0 - golang.org/x/exp v0.0.0-20231127185646-65229373498e + golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e golang.org/x/sync v0.10.0 golang.org/x/time v0.3.0 golang.org/x/tools v0.29.0 - google.golang.org/protobuf v1.34.2 + google.golang.org/protobuf v1.35.2 gopkg.in/natefinch/lumberjack.v2 v2.0.0 ) require ( github.com/DataDog/zstd v1.5.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/StephenButtolph/canoto v0.10.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.10.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect @@ -55,7 +56,7 @@ require ( github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.12.1 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/dlclark/regexp2 v1.7.0 // indirect diff --git a/go.sum b/go.sum index 9960f4807a..201ea521ad 100644 --- a/go.sum +++ b/go.sum @@ -49,6 +49,8 @@ github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKz github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= +github.com/StephenButtolph/canoto v0.10.0 h1:KdW85TYQXH+gwR8vOxfOUf28TRpkLU+X06Kycg1IR7s= +github.com/StephenButtolph/canoto v0.10.0/go.mod h1:MxppdgKRApRBvIg4ZgO2e14m/NSBjFMuydy97OB/gYY= github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40= github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= @@ -56,8 +58,8 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/ava-labs/avalanchego v1.12.3-0.20250305093940-1fa2bf198956 h1:cEUtlcKRpUudoEjm1DCi3SqV8oOVViDFnJEXU+FtCvs= -github.com/ava-labs/avalanchego v1.12.3-0.20250305093940-1fa2bf198956/go.mod h1:8vcHEENKLu6cBSSNTM6Ix6ahGp5oGjufdpWcKYgC0Cg= +github.com/ava-labs/avalanchego v1.12.3-0.20250314173032-a3d150e0aad0 h1:hpj9PYsuZ6EmCIrzDntfi8NJG6yd2UGH8QQS+4A2ZDE= +github.com/ava-labs/avalanchego v1.12.3-0.20250314173032-a3d150e0aad0/go.mod h1:SScmofd4T6zDl6YeerdWa83q0+2Cf/V6eVmPITxf1Tc= github.com/ava-labs/libevm v1.13.14-0.2.0.rc.3 h1:1CWGo2icnX9dRqGQl7CFywYGIZWxe+ucy0w8NAsVTWE= github.com/ava-labs/libevm v1.13.14-0.2.0.rc.3/go.mod h1:+Iol+sVQ1KyoBsHf3veyrBmHCXr3xXRWq6ZXkgVfNLU= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= @@ -130,8 +132,8 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ= github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= @@ -521,8 +523,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= @@ -530,8 +532,8 @@ github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a h1:1ur3QoCqvE5fl+nylMaIr9PVV1w343YRDtsy+Rwu7XI= github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= -github.com/thepudds/fzgen v0.4.2 h1:HlEHl5hk2/cqEomf2uK5SA/FeJc12s/vIHmOG+FbACw= -github.com/thepudds/fzgen v0.4.2/go.mod h1:kHCWdsv5tdnt32NIHYDdgq083m6bMtaY0M+ipiO9xWE= +github.com/thepudds/fzgen v0.4.3 h1:srUP/34BulQaEwPP/uHZkdjUcUjIzL7Jkf4CBVryiP8= +github.com/thepudds/fzgen v0.4.3/go.mod h1:BhhwtRhzgvLWAjjcHDJ9pEiLD2Z9hrVIFjBCHJ//zJ4= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= @@ -623,8 +625,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No= -golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e h1:4qufH0hlUYs6AO6XmZC3GqfDPGSXHVXUFR6OND+iJX4= +golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -976,8 +978,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/interfaces/interfaces.go b/interfaces/interfaces.go index d980d915ff..2e3a3c6189 100644 --- a/interfaces/interfaces.go +++ b/interfaces/interfaces.go @@ -32,9 +32,9 @@ import ( "errors" "math/big" - "github.com/ava-labs/coreth/core/types" ethereum "github.com/ava-labs/libevm" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 4f883f457b..a5da214e9a 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -38,7 +38,7 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/gasestimator" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" @@ -48,6 +48,7 @@ import ( "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/common/math" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/eth/tracers/logger" @@ -1232,7 +1233,7 @@ func (s *BlockChainAPI) EstimateGas(ctx context.Context, args TransactionArgs, b // RPCMarshalHeader converts the given header to the RPC output . func RPCMarshalHeader(head *types.Header) map[string]interface{} { - headExtra := types.GetHeaderExtra(head) + headExtra := customtypes.GetHeaderExtra(head) result := map[string]interface{}{ "number": (*hexutil.Big)(head.Number), "hash": head.Hash(), @@ -1279,7 +1280,7 @@ func RPCMarshalHeader(head *types.Header) map[string]interface{} { func RPCMarshalBlock(block *types.Block, inclTx bool, fullTx bool, config *params.ChainConfig) map[string]interface{} { fields := RPCMarshalHeader(block.Header()) fields["size"] = hexutil.Uint64(block.Size()) - fields["blockExtraData"] = hexutil.Bytes(types.BlockExtData(block)) + fields["blockExtraData"] = hexutil.Bytes(customtypes.BlockExtData(block)) if inclTx { formatTx := func(idx int, tx *types.Transaction) interface{} { diff --git a/internal/ethapi/api_extra_test.go b/internal/ethapi/api_extra_test.go index 45ac7085dd..2d0b07d601 100644 --- a/internal/ethapi/api_extra_test.go +++ b/internal/ethapi/api_extra_test.go @@ -8,9 +8,9 @@ import ( "math/big" "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index da4e36eb61..3155805247 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -46,7 +46,6 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/bloombits" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/internal/blocktest" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" @@ -57,6 +56,7 @@ import ( "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/crypto/kzg4844" diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index 4dd121152c..f94c0955a6 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -36,11 +36,11 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/bloombits" "github.com/ava-labs/coreth/core/state" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/accounts" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/event" diff --git a/internal/ethapi/mocks_test.go b/internal/ethapi/mocks_test.go index 9a6db4987e..06466f05d6 100644 --- a/internal/ethapi/mocks_test.go +++ b/internal/ethapi/mocks_test.go @@ -19,11 +19,11 @@ import ( core "github.com/ava-labs/coreth/core" bloombits "github.com/ava-labs/coreth/core/bloombits" state "github.com/ava-labs/coreth/core/state" - types "github.com/ava-labs/coreth/core/types" params "github.com/ava-labs/coreth/params" rpc "github.com/ava-labs/coreth/rpc" accounts "github.com/ava-labs/libevm/accounts" common "github.com/ava-labs/libevm/common" + types "github.com/ava-labs/libevm/core/types" vm "github.com/ava-labs/libevm/core/vm" ethdb "github.com/ava-labs/libevm/ethdb" event "github.com/ava-labs/libevm/event" diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go index 85d3804e67..30e7d25234 100644 --- a/internal/ethapi/transaction_args.go +++ b/internal/ethapi/transaction_args.go @@ -36,12 +36,12 @@ import ( "github.com/ava-labs/coreth/consensus/misc/eip4844" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" "github.com/ava-labs/libevm/common/math" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto/kzg4844" "github.com/ava-labs/libevm/log" "github.com/holiman/uint256" diff --git a/internal/ethapi/transaction_args_test.go b/internal/ethapi/transaction_args_test.go index 9cbef3f329..db754d1f87 100644 --- a/internal/ethapi/transaction_args_test.go +++ b/internal/ethapi/transaction_args_test.go @@ -33,10 +33,10 @@ import ( "reflect" "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/types" ) var _ feeBackend = &backendMock{} diff --git a/miner/miner.go b/miner/miner.go index a20bb85b14..487ea3bcf9 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -32,10 +32,10 @@ import ( "github.com/ava-labs/coreth/consensus" "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/precompile/precompileconfig" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/event" ) diff --git a/miner/ordering.go b/miner/ordering.go index 2131e2e658..364d3ee8c3 100644 --- a/miner/ordering.go +++ b/miner/ordering.go @@ -31,8 +31,8 @@ import ( "math/big" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/holiman/uint256" ) diff --git a/miner/ordering_test.go b/miner/ordering_test.go index 6fa4797700..17af88d709 100644 --- a/miner/ordering_test.go +++ b/miner/ordering_test.go @@ -34,8 +34,8 @@ import ( "time" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/holiman/uint256" ) diff --git a/miner/worker.go b/miner/worker.go index fa497a673f..ab36654927 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -43,12 +43,12 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" customheader "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/precompile/precompileconfig" "github.com/ava-labs/coreth/predicate" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/event" "github.com/ava-labs/libevm/log" diff --git a/plugin/evm/atomic_trie.go b/plugin/evm/atomic_trie.go index c7e77dd694..9fa4a81a46 100644 --- a/plugin/evm/atomic_trie.go +++ b/plugin/evm/atomic_trie.go @@ -14,12 +14,12 @@ import ( "github.com/ava-labs/avalanchego/utils/units" "github.com/ava-labs/avalanchego/utils/wrappers" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/atomic" "github.com/ava-labs/coreth/plugin/evm/database" "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie" diff --git a/plugin/evm/atomic_trie_test.go b/plugin/evm/atomic_trie_test.go index 7387374b9b..03c2c20d2f 100644 --- a/plugin/evm/atomic_trie_test.go +++ b/plugin/evm/atomic_trie_test.go @@ -22,8 +22,8 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/wrappers" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/atomic" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/rlp" diff --git a/plugin/evm/block.go b/plugin/evm/block.go index c6938bfd59..7497fe9555 100644 --- a/plugin/evm/block.go +++ b/plugin/evm/block.go @@ -15,7 +15,7 @@ import ( "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/atomic" @@ -23,6 +23,7 @@ import ( "github.com/ava-labs/coreth/precompile/precompileconfig" "github.com/ava-labs/coreth/predicate" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/snow/consensus/snowman" @@ -121,7 +122,7 @@ type Block struct { // newBlock returns a new Block wrapping the ethBlock type and implementing the snowman.Block interface func (vm *VM) newBlock(ethBlock *types.Block) (*Block, error) { isApricotPhase5 := vm.chainConfigExtra().IsApricotPhase5(ethBlock.Time()) - atomicTxs, err := atomic.ExtractAtomicTxs(types.BlockExtData(ethBlock), isApricotPhase5, atomic.Codec) + atomicTxs, err := atomic.ExtractAtomicTxs(customtypes.BlockExtData(ethBlock), isApricotPhase5, atomic.Codec) if err != nil { return nil, err } diff --git a/plugin/evm/block_verification.go b/plugin/evm/block_verification.go index 5330ed334d..c64f7dbd1c 100644 --- a/plugin/evm/block_verification.go +++ b/plugin/evm/block_verification.go @@ -14,13 +14,14 @@ import ( safemath "github.com/ava-labs/avalanchego/utils/math" "github.com/ava-labs/coreth/constants" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/header" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap1" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap5" "github.com/ava-labs/coreth/utils" + "github.com/ava-labs/libevm/core/types" ) var ( @@ -53,8 +54,8 @@ func (v blockValidator) SyntacticVerify(b *Block, rules params.Rules) error { if !rulesExtra.IsApricotPhase1 { if v.extDataHashes != nil { - extData := types.BlockExtData(b.ethBlock) - extDataHash := types.CalcExtDataHash(extData) + extData := customtypes.BlockExtData(b.ethBlock) + extDataHash := customtypes.CalcExtDataHash(extData) // If there is no extra data, check that there is no extra data in the hash map either to ensure we do not // have a block that is unexpectedly missing extra data. expectedExtDataHash, ok := v.extDataHashes[blockHash] @@ -78,10 +79,10 @@ func (v blockValidator) SyntacticVerify(b *Block, rules params.Rules) error { } // Verify the ExtDataHash field - headerExtra := types.GetHeaderExtra(ethHeader) + headerExtra := customtypes.GetHeaderExtra(ethHeader) if rulesExtra.IsApricotPhase1 { - extraData := types.BlockExtData(b.ethBlock) - hash := types.CalcExtDataHash(extraData) + extraData := customtypes.BlockExtData(b.ethBlock) + hash := customtypes.CalcExtDataHash(extraData) if headerExtra.ExtDataHash != hash { return fmt.Errorf("extra data hash mismatch: have %x, want %x", headerExtra.ExtDataHash, hash) } @@ -117,7 +118,7 @@ func (v blockValidator) SyntacticVerify(b *Block, rules params.Rules) error { return err } - if version := types.BlockVersion(b.ethBlock); version != 0 { + if version := customtypes.BlockVersion(b.ethBlock); version != 0 { return fmt.Errorf("invalid version: %d", version) } diff --git a/plugin/evm/gossip.go b/plugin/evm/gossip.go index 2f0bfb1821..327e8d30b5 100644 --- a/plugin/evm/gossip.go +++ b/plugin/evm/gossip.go @@ -24,9 +24,9 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth" "github.com/ava-labs/coreth/plugin/evm/config" + "github.com/ava-labs/libevm/core/types" ) const pendingTxsBuffer = 10 diff --git a/plugin/evm/gossip_test.go b/plugin/evm/gossip_test.go index 678bcaaf40..5d5df6eec2 100644 --- a/plugin/evm/gossip_test.go +++ b/plugin/evm/gossip_test.go @@ -14,11 +14,11 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/txpool" "github.com/ava-labs/coreth/core/txpool/legacypool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/prometheus/client_golang/prometheus" diff --git a/plugin/evm/gossiper_eth_gossiping_test.go b/plugin/evm/gossiper_eth_gossiping_test.go index e323308a58..28a0b62e98 100644 --- a/plugin/evm/gossiper_eth_gossiping_test.go +++ b/plugin/evm/gossiper_eth_gossiping_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" + "github.com/ava-labs/libevm/core/types" ) func fundAddressByGenesis(addrs []common.Address) (string, error) { diff --git a/plugin/evm/header/base_fee.go b/plugin/evm/header/base_fee.go index 77ff6e5c8b..73494217c1 100644 --- a/plugin/evm/header/base_fee.go +++ b/plugin/evm/header/base_fee.go @@ -8,8 +8,8 @@ import ( "fmt" "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" + "github.com/ava-labs/libevm/core/types" ) var errEstimateBaseFeeWithoutActivation = errors.New("cannot estimate base fee for chain without apricot phase 3 scheduled") diff --git a/plugin/evm/header/base_fee_test.go b/plugin/evm/header/base_fee_test.go index ee7d1196d7..ee1bd5dbe7 100644 --- a/plugin/evm/header/base_fee_test.go +++ b/plugin/evm/header/base_fee_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/ava-labs/avalanchego/vms/components/gas" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/acp176" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" @@ -17,6 +17,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/upgrade/etna" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/stretchr/testify/require" ) @@ -180,13 +181,13 @@ func TestBaseFee(t *testing.T) { { name: "ap4_decrease", upgrades: extras.TestApricotPhase4Config.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), Extra: (&ap3.Window{}).Bytes(), BaseFee: big.NewInt(ap4.MaxBaseFee), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ BlockGasCost: big.NewInt(ap4.MinBlockGasCost), }, ), @@ -208,14 +209,14 @@ func TestBaseFee(t *testing.T) { { name: "ap4_increase", upgrades: extras.TestApricotPhase4Config.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), GasUsed: ap3.TargetGas, Extra: (&ap3.Window{}).Bytes(), BaseFee: big.NewInt(ap4.MinBaseFee), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(ap3.TargetGas), BlockGasCost: big.NewInt(ap4.MinBlockGasCost), }, @@ -269,14 +270,14 @@ func TestBaseFee(t *testing.T) { { name: "ap5_increase", upgrades: extras.TestApricotPhase5Config.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), GasUsed: ap5.TargetGas, Extra: (&ap3.Window{}).Bytes(), BaseFee: big.NewInt(ap4.MinBaseFee), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(ap5.TargetGas), }, ), @@ -306,14 +307,14 @@ func TestBaseFee(t *testing.T) { { name: "etna_increase", upgrades: extras.TestEtnaChainConfig.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), GasUsed: ap5.TargetGas, Extra: (&ap3.Window{}).Bytes(), BaseFee: big.NewInt(etna.MinBaseFee), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(ap5.TargetGas), }, ), diff --git a/plugin/evm/header/block_gas_cost.go b/plugin/evm/header/block_gas_cost.go index 0b4b6dd201..524d26d707 100644 --- a/plugin/evm/header/block_gas_cost.go +++ b/plugin/evm/header/block_gas_cost.go @@ -7,11 +7,12 @@ import ( "errors" "math/big" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap4" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap5" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) var ( @@ -45,7 +46,7 @@ func BlockGasCost( timeElapsed = timestamp - parent.Time } return new(big.Int).SetUint64(BlockGasCostWithStep( - types.GetHeaderExtra(parent).BlockGasCost, + customtypes.GetHeaderExtra(parent).BlockGasCost, step, timeElapsed, )) @@ -88,7 +89,7 @@ func EstimateRequiredTip( config *extras.ChainConfig, header *types.Header, ) (*big.Int, error) { - extra := types.GetHeaderExtra(header) + extra := customtypes.GetHeaderExtra(header) switch { case !config.IsApricotPhase4(header.Time): return nil, nil @@ -101,7 +102,7 @@ func EstimateRequiredTip( } // totalGasUsed = GasUsed + ExtDataGasUsed - headerExtra := types.GetHeaderExtra(header) + headerExtra := customtypes.GetHeaderExtra(header) totalGasUsed := new(big.Int).SetUint64(header.GasUsed) totalGasUsed.Add(totalGasUsed, headerExtra.ExtDataGasUsed) if totalGasUsed.Sign() == 0 { diff --git a/plugin/evm/header/block_gas_cost_test.go b/plugin/evm/header/block_gas_cost_test.go index f41cb4cfca..5bb5240f45 100644 --- a/plugin/evm/header/block_gas_cost_test.go +++ b/plugin/evm/header/block_gas_cost_test.go @@ -7,11 +7,12 @@ import ( "math/big" "testing" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap4" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap5" "github.com/ava-labs/coreth/utils" + "github.com/ava-labs/libevm/core/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -64,11 +65,11 @@ func TestBlockGasCost(t *testing.T) { config := &extras.ChainConfig{ NetworkUpgrades: test.upgrades, } - parent := types.WithHeaderExtra( + parent := customtypes.WithHeaderExtra( &types.Header{ Time: test.parentTime, }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ BlockGasCost: test.parentCost, }, ) @@ -190,9 +191,9 @@ func TestEstimateRequiredTip(t *testing.T) { { name: "nil_base_fee", ap4Timestamp: utils.NewUint64(0), - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{}, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(1), BlockGasCost: big.NewInt(1), }, @@ -202,11 +203,11 @@ func TestEstimateRequiredTip(t *testing.T) { { name: "nil_block_gas_cost", ap4Timestamp: utils.NewUint64(0), - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ BaseFee: big.NewInt(1), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(1), }, ), @@ -215,11 +216,11 @@ func TestEstimateRequiredTip(t *testing.T) { { name: "nil_extra_data_gas_used", ap4Timestamp: utils.NewUint64(0), - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ BaseFee: big.NewInt(1), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ BlockGasCost: big.NewInt(1), }, ), @@ -228,12 +229,12 @@ func TestEstimateRequiredTip(t *testing.T) { { name: "no_gas_used", ap4Timestamp: utils.NewUint64(0), - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ GasUsed: 0, BaseFee: big.NewInt(1), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(0), BlockGasCost: big.NewInt(1), }, @@ -243,12 +244,12 @@ func TestEstimateRequiredTip(t *testing.T) { { name: "success", ap4Timestamp: utils.NewUint64(0), - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ GasUsed: 123, BaseFee: big.NewInt(456), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(789), BlockGasCost: big.NewInt(101112), }, @@ -261,12 +262,12 @@ func TestEstimateRequiredTip(t *testing.T) { { name: "success_rounds_up", ap4Timestamp: utils.NewUint64(0), - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ GasUsed: 124, BaseFee: big.NewInt(456), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(789), BlockGasCost: big.NewInt(101112), }, diff --git a/plugin/evm/header/dynamic_fee_state.go b/plugin/evm/header/dynamic_fee_state.go index ee056198a0..051ea35a5d 100644 --- a/plugin/evm/header/dynamic_fee_state.go +++ b/plugin/evm/header/dynamic_fee_state.go @@ -7,10 +7,11 @@ import ( "fmt" "github.com/ava-labs/avalanchego/vms/components/gas" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/acp176" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // feeStateBeforeBlock takes the previous header and the timestamp of its child @@ -60,7 +61,7 @@ func feeStateAfterBlock( } // Consume the gas used by the block - extDataGasUsed := types.GetHeaderExtra(header).ExtDataGasUsed + extDataGasUsed := customtypes.GetHeaderExtra(header).ExtDataGasUsed if err := state.ConsumeGas(header.GasUsed, extDataGasUsed); err != nil { return acp176.State{}, fmt.Errorf("advancing the fee state: %w", err) } diff --git a/plugin/evm/header/dynamic_fee_windower.go b/plugin/evm/header/dynamic_fee_windower.go index c60c3c8bb3..7e81580927 100644 --- a/plugin/evm/header/dynamic_fee_windower.go +++ b/plugin/evm/header/dynamic_fee_windower.go @@ -8,7 +8,7 @@ import ( "fmt" "math/big" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap4" @@ -16,6 +16,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/upgrade/etna" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/math" + "github.com/ava-labs/libevm/core/types" ) var ( @@ -178,7 +179,7 @@ func feeWindow( // At the start of a new network, the parent may not have a populated // ExtDataGasUsed. - if used := types.GetHeaderExtra(parent).ExtDataGasUsed; used != nil { + if used := customtypes.GetHeaderExtra(parent).ExtDataGasUsed; used != nil { parentExtraStateGasUsed = used.Uint64() } case config.IsApricotPhase4(parent.Time): @@ -189,7 +190,7 @@ func feeWindow( // still calculated using the AP4 step. This is different than the // actual BlockGasCost calculation used for the child block. This // behavior is kept to preserve the original behavior of this function. - parentExtra := types.GetHeaderExtra(parent) + parentExtra := customtypes.GetHeaderExtra(parent) blockGasCost = BlockGasCostWithStep( parentExtra.BlockGasCost, ap4.BlockGasCostStep, diff --git a/plugin/evm/header/extra.go b/plugin/evm/header/extra.go index 108e293621..119cf34113 100644 --- a/plugin/evm/header/extra.go +++ b/plugin/evm/header/extra.go @@ -9,11 +9,11 @@ import ( "fmt" "github.com/ava-labs/avalanchego/vms/components/gas" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/acp176" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap3" + "github.com/ava-labs/libevm/core/types" ) var ( diff --git a/plugin/evm/header/extra_test.go b/plugin/evm/header/extra_test.go index 82af9a954a..058dcbb33f 100644 --- a/plugin/evm/header/extra_test.go +++ b/plugin/evm/header/extra_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/ava-labs/avalanchego/vms/components/gas" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/acp176" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" @@ -16,6 +16,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/upgrade/ap4" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap5" "github.com/ava-labs/coreth/utils" + "github.com/ava-labs/libevm/core/types" "github.com/stretchr/testify/require" ) @@ -132,13 +133,13 @@ func TestExtraPrefix(t *testing.T) { { name: "ap4_with_block_gas_cost", upgrades: extras.TestApricotPhase4Config.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), GasUsed: ap3.TargetGas, Extra: (&ap3.Window{}).Bytes(), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ BlockGasCost: big.NewInt(ap4.MinBlockGasCost), }, ), @@ -158,13 +159,13 @@ func TestExtraPrefix(t *testing.T) { { name: "ap4_with_extra_data_gas", upgrades: extras.TestApricotPhase4Config.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), GasUsed: ap3.TargetGas, Extra: (&ap3.Window{}).Bytes(), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(5), }, ), @@ -184,7 +185,7 @@ func TestExtraPrefix(t *testing.T) { { name: "ap4_normal", upgrades: extras.TestApricotPhase4Config.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), GasUsed: ap3.TargetGas, @@ -192,7 +193,7 @@ func TestExtraPrefix(t *testing.T) { 1, 2, 3, 4, }).Bytes(), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(5), BlockGasCost: big.NewInt(ap4.MinBlockGasCost), }, @@ -216,13 +217,13 @@ func TestExtraPrefix(t *testing.T) { { name: "ap5_no_extra_data_gas", upgrades: extras.TestApricotPhase5Config.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), GasUsed: ap5.TargetGas, Extra: (&ap3.Window{}).Bytes(), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ BlockGasCost: big.NewInt(ap4.MinBlockGasCost), }, ), @@ -239,7 +240,7 @@ func TestExtraPrefix(t *testing.T) { { name: "ap5_normal", upgrades: extras.TestApricotPhase5Config.NetworkUpgrades, - parent: types.WithHeaderExtra( + parent: customtypes.WithHeaderExtra( &types.Header{ Number: big.NewInt(1), GasUsed: ap5.TargetGas, @@ -247,7 +248,7 @@ func TestExtraPrefix(t *testing.T) { 1, 2, 3, 4, }).Bytes(), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(5), BlockGasCost: big.NewInt(ap4.MinBlockGasCost), }, @@ -275,12 +276,12 @@ func TestExtraPrefix(t *testing.T) { parent: &types.Header{ Number: big.NewInt(1), }, - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ Time: 1, GasUsed: 1, }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(5), }, ), @@ -298,12 +299,12 @@ func TestExtraPrefix(t *testing.T) { parent: &types.Header{ Number: big.NewInt(0), }, - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ Time: 1, GasUsed: 2, }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(1), }, ), @@ -350,11 +351,11 @@ func TestExtraPrefix(t *testing.T) { TargetExcess: 2 * acp176.MaxTargetExcessDiff, }).Bytes(), }, - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ GasUsed: 2, }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: big.NewInt(1), }, ), diff --git a/plugin/evm/header/gas_limit.go b/plugin/evm/header/gas_limit.go index 0bc0f2eaee..c13a1c294e 100644 --- a/plugin/evm/header/gas_limit.go +++ b/plugin/evm/header/gas_limit.go @@ -8,12 +8,13 @@ import ( "fmt" "github.com/ava-labs/avalanchego/utils/math" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap1" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap5" "github.com/ava-labs/coreth/plugin/evm/upgrade/cortina" + "github.com/ava-labs/libevm/core/types" ) var ( @@ -63,7 +64,7 @@ func VerifyGasUsed( header *types.Header, ) error { gasUsed := header.GasUsed - extDataGasUsed := types.GetHeaderExtra(header).ExtDataGasUsed + extDataGasUsed := customtypes.GetHeaderExtra(header).ExtDataGasUsed if config.IsFortuna(header.Time) && extDataGasUsed != nil { if !extDataGasUsed.IsUint64() { return fmt.Errorf("%w: %d is not a uint64", diff --git a/plugin/evm/header/gas_limit_test.go b/plugin/evm/header/gas_limit_test.go index 81d8adbe18..e901029987 100644 --- a/plugin/evm/header/gas_limit_test.go +++ b/plugin/evm/header/gas_limit_test.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/avalanchego/utils/math" "github.com/ava-labs/avalanchego/vms/components/gas" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params/extras" "github.com/ava-labs/coreth/plugin/evm/upgrade/acp176" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" @@ -17,6 +17,7 @@ import ( "github.com/ava-labs/coreth/plugin/evm/upgrade/ap5" "github.com/ava-labs/coreth/plugin/evm/upgrade/cortina" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/stretchr/testify/require" ) @@ -89,9 +90,9 @@ func TestVerifyGasUsed(t *testing.T) { { name: "fortuna_massive_extra_gas_used", upgrades: extras.TestFortunaChainConfig.NetworkUpgrades, - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{}, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: new(big.Int).Lsh(common.Big1, 64), }, ), @@ -100,11 +101,11 @@ func TestVerifyGasUsed(t *testing.T) { { name: "fortuna_gas_used_overflow", upgrades: extras.TestFortunaChainConfig.NetworkUpgrades, - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ GasUsed: math.MaxUint[uint64](), }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: common.Big1, }, ), @@ -152,11 +153,11 @@ func TestVerifyGasUsed(t *testing.T) { parent: &types.Header{ Number: big.NewInt(0), }, - header: types.WithHeaderExtra( + header: customtypes.WithHeaderExtra( &types.Header{ GasUsed: cortina.GasLimit, }, - &types.HeaderExtra{ + &customtypes.HeaderExtra{ ExtDataGasUsed: common.Big1, }, ), diff --git a/plugin/evm/prestate_tracer_test.go b/plugin/evm/prestate_tracer_test.go index 6d9fa353bb..ae53294e30 100644 --- a/plugin/evm/prestate_tracer_test.go +++ b/plugin/evm/prestate_tracer_test.go @@ -13,12 +13,12 @@ import ( "unicode" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/coreth/tests" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/math" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" ethtypes "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" ) diff --git a/plugin/evm/syncervm_test.go b/plugin/evm/syncervm_test.go index b4422eae10..84b901c7b4 100644 --- a/plugin/evm/syncervm_test.go +++ b/plugin/evm/syncervm_test.go @@ -31,7 +31,7 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/constants" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/atomic" "github.com/ava-labs/coreth/plugin/evm/database" @@ -42,6 +42,7 @@ import ( "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" @@ -605,8 +606,8 @@ func patchBlock(blk *types.Block, root common.Hash, db ethdb.Database) *types.Bl header := blk.Header() header.Root = root receipts := rawdb.ReadRawReceipts(db, blk.Hash(), blk.NumberU64()) - newBlk := types.NewBlockWithExtData( - header, blk.Transactions(), blk.Uncles(), receipts, trie.NewStackTrie(nil), types.BlockExtData(blk), true, + newBlk := customtypes.NewBlockWithExtData( + header, blk.Transactions(), blk.Uncles(), receipts, trie.NewStackTrie(nil), customtypes.BlockExtData(blk), true, ) rawdb.WriteBlock(db, newBlk) rawdb.WriteCanonicalHash(db, newBlk.Hash(), newBlk.NumberU64()) diff --git a/plugin/evm/tx_gossip_test.go b/plugin/evm/tx_gossip_test.go index cf39d62515..96e6b21449 100644 --- a/plugin/evm/tx_gossip_test.go +++ b/plugin/evm/tx_gossip_test.go @@ -33,11 +33,11 @@ import ( "google.golang.org/protobuf/proto" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/atomic" "github.com/ava-labs/coreth/plugin/evm/config" "github.com/ava-labs/coreth/plugin/evm/upgrade/ap0" "github.com/ava-labs/coreth/utils" + "github.com/ava-labs/libevm/core/types" ) func TestEthTxGossip(t *testing.T) { diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go index 41b7722ab5..ba663884bb 100644 --- a/plugin/evm/vm.go +++ b/plugin/evm/vm.go @@ -23,6 +23,7 @@ import ( "github.com/ava-labs/avalanchego/network/p2p/gossip" "github.com/ava-labs/avalanchego/upgrade" avalanchegoConstants "github.com/ava-labs/avalanchego/utils/constants" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/prometheus/client_golang/prometheus" "github.com/ava-labs/coreth/consensus/dummy" @@ -30,7 +31,6 @@ import ( "github.com/ava-labs/coreth/core" "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/txpool" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth" "github.com/ava-labs/coreth/eth/ethconfig" corethprometheus "github.com/ava-labs/coreth/metrics/prometheus" @@ -48,6 +48,7 @@ import ( "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/metrics" ethparams "github.com/ava-labs/libevm/params" "github.com/ava-labs/libevm/triedb" @@ -975,7 +976,7 @@ func (vm *VM) onExtraStateChange(block *types.Block, parent *types.Header, state rulesExtra = *params.GetRulesExtra(rules) ) - txs, err := atomic.ExtractAtomicTxs(types.BlockExtData(block), rulesExtra.IsApricotPhase5, atomic.Codec) + txs, err := atomic.ExtractAtomicTxs(customtypes.BlockExtData(block), rulesExtra.IsApricotPhase5, atomic.Codec) if err != nil { return nil, nil, err } diff --git a/plugin/evm/vm_test.go b/plugin/evm/vm_test.go index 551106d275..d9c59d2e9a 100644 --- a/plugin/evm/vm_test.go +++ b/plugin/evm/vm_test.go @@ -61,10 +61,11 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" + customtypes "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/rpc" + "github.com/ava-labs/libevm/core/types" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" ) @@ -946,7 +947,7 @@ func testConflictingImportTxs(t *testing.T, genesis string) { t.Fatal(err) } - conflictingAtomicTxBlock := types.NewBlockWithExtData( + conflictingAtomicTxBlock := customtypes.NewBlockWithExtData( types.CopyHeader(validEthBlock.Header()), nil, nil, @@ -980,10 +981,10 @@ func testConflictingImportTxs(t *testing.T, genesis string) { } header := types.CopyHeader(validEthBlock.Header()) - headerExtra := types.GetHeaderExtra(header) + headerExtra := customtypes.GetHeaderExtra(header) headerExtra.ExtDataGasUsed.Mul(common.Big2, headerExtra.ExtDataGasUsed) - internalConflictBlock := types.NewBlockWithExtData( + internalConflictBlock := customtypes.NewBlockWithExtData( header, nil, nil, @@ -2383,13 +2384,13 @@ func TestUncleBlock(t *testing.T) { uncleBlockHeader := types.CopyHeader(blkDEthBlock.Header()) uncleBlockHeader.UncleHash = types.CalcUncleHash(uncles) - uncleEthBlock := types.NewBlockWithExtData( + uncleEthBlock := customtypes.NewBlockWithExtData( uncleBlockHeader, blkDEthBlock.Transactions(), uncles, nil, trie.NewStackTrie(nil), - types.BlockExtData(blkDEthBlock), + customtypes.BlockExtData(blkDEthBlock), false, ) uncleBlock, err := vm2.newBlock(uncleEthBlock) @@ -2440,7 +2441,7 @@ func TestEmptyBlock(t *testing.T) { // Create empty block from blkA ethBlock := blk.(*chain.BlockWrapper).Block.(*Block).ethBlock - emptyEthBlock := types.NewBlockWithExtData( + emptyEthBlock := customtypes.NewBlockWithExtData( types.CopyHeader(ethBlock.Header()), nil, nil, @@ -2450,7 +2451,7 @@ func TestEmptyBlock(t *testing.T) { false, ) - if len(types.BlockExtData(emptyEthBlock)) != 0 || types.GetHeaderExtra(emptyEthBlock.Header()).ExtDataHash != (common.Hash{}) { + if len(customtypes.BlockExtData(emptyEthBlock)) != 0 || customtypes.GetHeaderExtra(emptyEthBlock.Header()).ExtDataHash != (common.Hash{}) { t.Fatalf("emptyEthBlock should not have any extra data") } @@ -2710,13 +2711,13 @@ func TestFutureBlock(t *testing.T) { // Set the modified time to exceed the allowed future time modifiedTime := modifiedHeader.Time + uint64(maxFutureBlockTime.Seconds()+1) modifiedHeader.Time = modifiedTime - modifiedBlock := types.NewBlockWithExtData( + modifiedBlock := customtypes.NewBlockWithExtData( modifiedHeader, nil, nil, nil, new(trie.Trie), - types.BlockExtData(internalBlkA.ethBlock), + customtypes.BlockExtData(internalBlkA.ethBlock), false, ) @@ -3271,10 +3272,10 @@ func TestBuildApricotPhase4Block(t *testing.T) { } ethBlk := blk.(*chain.BlockWrapper).Block.(*Block).ethBlock - if eBlockGasCost := types.BlockGasCost(ethBlk); eBlockGasCost == nil || eBlockGasCost.Cmp(common.Big0) != 0 { + if eBlockGasCost := customtypes.BlockGasCost(ethBlk); eBlockGasCost == nil || eBlockGasCost.Cmp(common.Big0) != 0 { t.Fatalf("expected blockGasCost to be 0 but got %d", eBlockGasCost) } - if eExtDataGasUsed := types.BlockExtDataGasUsed(ethBlk); eExtDataGasUsed == nil || eExtDataGasUsed.Cmp(big.NewInt(1230)) != 0 { + if eExtDataGasUsed := customtypes.BlockExtDataGasUsed(ethBlk); eExtDataGasUsed == nil || eExtDataGasUsed.Cmp(big.NewInt(1230)) != 0 { t.Fatalf("expected extDataGasUsed to be 1000 but got %d", eExtDataGasUsed) } minRequiredTip, err := header.EstimateRequiredTip(vm.chainConfigExtra(), ethBlk.Header()) @@ -3330,11 +3331,11 @@ func TestBuildApricotPhase4Block(t *testing.T) { } ethBlk = blk.(*chain.BlockWrapper).Block.(*Block).ethBlock - if types.BlockGasCost(ethBlk) == nil || types.BlockGasCost(ethBlk).Cmp(big.NewInt(100)) < 0 { - t.Fatalf("expected blockGasCost to be at least 100 but got %d", types.BlockGasCost(ethBlk)) + if customtypes.BlockGasCost(ethBlk) == nil || customtypes.BlockGasCost(ethBlk).Cmp(big.NewInt(100)) < 0 { + t.Fatalf("expected blockGasCost to be at least 100 but got %d", customtypes.BlockGasCost(ethBlk)) } - if types.BlockExtDataGasUsed(ethBlk) == nil || types.BlockExtDataGasUsed(ethBlk).Cmp(common.Big0) != 0 { - t.Fatalf("expected extDataGasUsed to be 0 but got %d", types.BlockExtDataGasUsed(ethBlk)) + if customtypes.BlockExtDataGasUsed(ethBlk) == nil || customtypes.BlockExtDataGasUsed(ethBlk).Cmp(common.Big0) != 0 { + t.Fatalf("expected extDataGasUsed to be 0 but got %d", customtypes.BlockExtDataGasUsed(ethBlk)) } minRequiredTip, err = header.EstimateRequiredTip(vm.chainConfigExtra(), ethBlk.Header()) if err != nil { @@ -3441,10 +3442,10 @@ func TestBuildApricotPhase5Block(t *testing.T) { } ethBlk := blk.(*chain.BlockWrapper).Block.(*Block).ethBlock - if eBlockGasCost := types.BlockGasCost(ethBlk); eBlockGasCost == nil || eBlockGasCost.Cmp(common.Big0) != 0 { + if eBlockGasCost := customtypes.BlockGasCost(ethBlk); eBlockGasCost == nil || eBlockGasCost.Cmp(common.Big0) != 0 { t.Fatalf("expected blockGasCost to be 0 but got %d", eBlockGasCost) } - if eExtDataGasUsed := types.BlockExtDataGasUsed(ethBlk); eExtDataGasUsed == nil || eExtDataGasUsed.Cmp(big.NewInt(11230)) != 0 { + if eExtDataGasUsed := customtypes.BlockExtDataGasUsed(ethBlk); eExtDataGasUsed == nil || eExtDataGasUsed.Cmp(big.NewInt(11230)) != 0 { t.Fatalf("expected extDataGasUsed to be 11230 but got %d", eExtDataGasUsed) } minRequiredTip, err := header.EstimateRequiredTip(vm.chainConfigExtra(), ethBlk.Header()) @@ -3492,11 +3493,11 @@ func TestBuildApricotPhase5Block(t *testing.T) { } ethBlk = blk.(*chain.BlockWrapper).Block.(*Block).ethBlock - if types.BlockGasCost(ethBlk) == nil || types.BlockGasCost(ethBlk).Cmp(big.NewInt(100)) < 0 { - t.Fatalf("expected blockGasCost to be at least 100 but got %d", types.BlockGasCost(ethBlk)) + if customtypes.BlockGasCost(ethBlk) == nil || customtypes.BlockGasCost(ethBlk).Cmp(big.NewInt(100)) < 0 { + t.Fatalf("expected blockGasCost to be at least 100 but got %d", customtypes.BlockGasCost(ethBlk)) } - if types.BlockExtDataGasUsed(ethBlk) == nil || types.BlockExtDataGasUsed(ethBlk).Cmp(common.Big0) != 0 { - t.Fatalf("expected extDataGasUsed to be 0 but got %d", types.BlockExtDataGasUsed(ethBlk)) + if customtypes.BlockExtDataGasUsed(ethBlk) == nil || customtypes.BlockExtDataGasUsed(ethBlk).Cmp(common.Big0) != 0 { + t.Fatalf("expected extDataGasUsed to be 0 but got %d", customtypes.BlockExtDataGasUsed(ethBlk)) } minRequiredTip, err = header.EstimateRequiredTip(vm.chainConfigExtra(), ethBlk.Header()) if err != nil { @@ -3756,7 +3757,7 @@ func TestExtraStateChangeAtomicGasLimitExceeded(t *testing.T) { } // Construct the new block with the extra data in the new format (slice of atomic transactions). - ethBlk2 := types.NewBlockWithExtData( + ethBlk2 := customtypes.NewBlockWithExtData( types.CopyHeader(validEthBlock.Header()), nil, nil, @@ -3903,13 +3904,13 @@ func TestParentBeaconRootBlock(t *testing.T) { ethBlock := blk.(*chain.BlockWrapper).Block.(*Block).ethBlock header := types.CopyHeader(ethBlock.Header()) header.ParentBeaconRoot = test.beaconRoot - parentBeaconEthBlock := types.NewBlockWithExtData( + parentBeaconEthBlock := customtypes.NewBlockWithExtData( header, nil, nil, nil, new(trie.Trie), - types.BlockExtData(ethBlock), + customtypes.BlockExtData(ethBlock), false, ) diff --git a/plugin/evm/vm_warp_test.go b/plugin/evm/vm_warp_test.go index dccf79dbeb..b478ab147a 100644 --- a/plugin/evm/vm_warp_test.go +++ b/plugin/evm/vm_warp_test.go @@ -27,7 +27,6 @@ import ( "github.com/ava-labs/avalanchego/vms/components/chain" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/eth/tracers" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/params/extras" @@ -41,6 +40,7 @@ import ( "github.com/ava-labs/coreth/warp" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/stretchr/testify/require" ) diff --git a/predicate/predicate_slots.go b/predicate/predicate_slots.go index f71145fbdd..10ecd0d179 100644 --- a/predicate/predicate_slots.go +++ b/predicate/predicate_slots.go @@ -4,9 +4,9 @@ package predicate import ( - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) type predicaters interface { diff --git a/predicate/predicate_tx.go b/predicate/predicate_tx.go index f2b101bb67..9f7f215e3d 100644 --- a/predicate/predicate_tx.go +++ b/predicate/predicate_tx.go @@ -6,9 +6,9 @@ package predicate import ( "math/big" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) // NewPredicateTx returns a transaction with the predicateAddress/predicateBytes tuple diff --git a/rpc/subscription_test.go b/rpc/subscription_test.go index 06a2bb0660..19eae03615 100644 --- a/rpc/subscription_test.go +++ b/rpc/subscription_test.go @@ -38,8 +38,11 @@ import ( "testing" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" + + // Side effect: registration of libevm extras. + _ "github.com/ava-labs/coreth/core/types" ) func TestNewID(t *testing.T) { diff --git a/scripts/eth-allowed-packages.txt b/scripts/eth-allowed-packages.txt index 2a583bbd29..e8d62708db 100644 --- a/scripts/eth-allowed-packages.txt +++ b/scripts/eth-allowed-packages.txt @@ -11,6 +11,7 @@ "github.com/ava-labs/libevm/common/prque" "github.com/ava-labs/libevm/core/asm" "github.com/ava-labs/libevm/core/rawdb" +"github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/core/vm" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/crypto/blake2b" diff --git a/signer/core/apitypes/types.go b/signer/core/apitypes/types.go index 8ea190cbb5..325f5f72a5 100644 --- a/signer/core/apitypes/types.go +++ b/signer/core/apitypes/types.go @@ -32,9 +32,9 @@ import ( "math/big" "strings" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/common/hexutil" + "github.com/ava-labs/libevm/core/types" ) type ValidationInfo struct { diff --git a/sync/client/client.go b/sync/client/client.go index a8a2c8de63..351c83ab16 100644 --- a/sync/client/client.go +++ b/sync/client/client.go @@ -23,10 +23,10 @@ import ( "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/peer" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/trie" ) diff --git a/sync/client/client_test.go b/sync/client/client_test.go index 56ff1585c2..39c554a6bb 100644 --- a/sync/client/client_test.go +++ b/sync/client/client_test.go @@ -17,7 +17,6 @@ import ( "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/message" clientstats "github.com/ava-labs/coreth/sync/client/stats" @@ -26,6 +25,7 @@ import ( "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/triedb" ) diff --git a/sync/client/mock_client.go b/sync/client/mock_client.go index 2d2b5180f7..dbb30aab35 100644 --- a/sync/client/mock_client.go +++ b/sync/client/mock_client.go @@ -10,10 +10,10 @@ import ( "github.com/ava-labs/avalanchego/codec" "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/coreth/sync/handlers" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/rlp" ) diff --git a/sync/handlers/block_request_test.go b/sync/handlers/block_request_test.go index 4b0bc3720d..f5f053d7ca 100644 --- a/sync/handlers/block_request_test.go +++ b/sync/handlers/block_request_test.go @@ -12,12 +12,12 @@ import ( "github.com/ava-labs/avalanchego/utils/units" "github.com/ava-labs/coreth/consensus/dummy" "github.com/ava-labs/coreth/core" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/triedb" diff --git a/sync/handlers/handler.go b/sync/handlers/handler.go index eece20e4d0..221cd8433e 100644 --- a/sync/handlers/handler.go +++ b/sync/handlers/handler.go @@ -5,8 +5,8 @@ package handlers import ( "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) type BlockProvider interface { diff --git a/sync/handlers/leafs_request.go b/sync/handlers/leafs_request.go index c9df10ef10..604e046eb5 100644 --- a/sync/handlers/leafs_request.go +++ b/sync/handlers/leafs_request.go @@ -14,12 +14,12 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/wrappers" "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/ethdb/memorydb" "github.com/ava-labs/libevm/log" diff --git a/sync/handlers/leafs_request_test.go b/sync/handlers/leafs_request_test.go index c6888dad4d..39c2d1addb 100644 --- a/sync/handlers/leafs_request_test.go +++ b/sync/handlers/leafs_request_test.go @@ -11,12 +11,12 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/message" "github.com/ava-labs/coreth/sync/handlers/stats" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/trie" diff --git a/sync/handlers/test_providers.go b/sync/handlers/test_providers.go index a16410d71a..f60da2c61f 100644 --- a/sync/handlers/test_providers.go +++ b/sync/handlers/test_providers.go @@ -5,8 +5,8 @@ package handlers import ( "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" ) var ( diff --git a/sync/statesync/sync_helpers.go b/sync/statesync/sync_helpers.go index f23104aa77..2d506cf17e 100644 --- a/sync/statesync/sync_helpers.go +++ b/sync/statesync/sync_helpers.go @@ -4,9 +4,9 @@ package statesync import ( - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/trie" ) diff --git a/sync/statesync/sync_test.go b/sync/statesync/sync_test.go index fde8584404..833e0b089e 100644 --- a/sync/statesync/sync_test.go +++ b/sync/statesync/sync_test.go @@ -14,7 +14,6 @@ import ( "time" "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/plugin/evm/message" statesyncclient "github.com/ava-labs/coreth/sync/client" "github.com/ava-labs/coreth/sync/handlers" @@ -22,6 +21,7 @@ import ( "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/rlp" diff --git a/sync/statesync/test_sync.go b/sync/statesync/test_sync.go index efd0cf3260..8edd8f87f6 100644 --- a/sync/statesync/test_sync.go +++ b/sync/statesync/test_sync.go @@ -8,12 +8,12 @@ import ( "math/rand" "testing" - "github.com/ava-labs/coreth/core/types" customrawdb "github.com/ava-labs/coreth/plugin/evm/rawdb" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/rlp" diff --git a/sync/statesync/trie_sync_tasks.go b/sync/statesync/trie_sync_tasks.go index 928287cc1e..83adf5e802 100644 --- a/sync/statesync/trie_sync_tasks.go +++ b/sync/statesync/trie_sync_tasks.go @@ -6,10 +6,10 @@ package statesync import ( "fmt" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/sync/syncutils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/sync/syncutils/iterators.go b/sync/syncutils/iterators.go index c15409d96e..d83c56c298 100644 --- a/sync/syncutils/iterators.go +++ b/sync/syncutils/iterators.go @@ -5,7 +5,7 @@ package syncutils import ( "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" ) diff --git a/sync/syncutils/test_trie.go b/sync/syncutils/test_trie.go index c244d7bb1c..e2f3e57f99 100644 --- a/sync/syncutils/test_trie.go +++ b/sync/syncutils/test_trie.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/ava-labs/avalanchego/utils/wrappers" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/utils" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/trie" "github.com/ava-labs/libevm/trie/trienode" "github.com/ava-labs/libevm/triedb" diff --git a/tests/state_test_util.go b/tests/state_test_util.go index ca820456a4..bc6dab84f0 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -29,11 +29,11 @@ package tests import ( "github.com/ava-labs/coreth/core/state" "github.com/ava-labs/coreth/core/state/snapshot" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/triedb/hashdb" "github.com/ava-labs/coreth/triedb/pathdb" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/triedb" "github.com/holiman/uint256" diff --git a/triedb/hashdb/database.go b/triedb/hashdb/database.go index 2a2652fa26..a614cb08ce 100644 --- a/triedb/hashdb/database.go +++ b/triedb/hashdb/database.go @@ -33,10 +33,10 @@ import ( "sync" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/utils" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/metrics" diff --git a/triedb/pathdb/database.go b/triedb/pathdb/database.go index 5bbf83cf29..6d4d0403f9 100644 --- a/triedb/pathdb/database.go +++ b/triedb/pathdb/database.go @@ -32,10 +32,10 @@ import ( "io" "sync" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/coreth/params" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/ethdb" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/trie/trienode" diff --git a/triedb/pathdb/database_test.go b/triedb/pathdb/database_test.go index 1f079279e6..8479d05b83 100644 --- a/triedb/pathdb/database_test.go +++ b/triedb/pathdb/database_test.go @@ -33,9 +33,9 @@ import ( "math/rand" "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/trie/testutil" diff --git a/triedb/pathdb/history_test.go b/triedb/pathdb/history_test.go index 4d30831c81..b034326b68 100644 --- a/triedb/pathdb/history_test.go +++ b/triedb/pathdb/history_test.go @@ -31,8 +31,8 @@ import ( "reflect" "testing" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/rlp" "github.com/ava-labs/libevm/trie/testutil" "github.com/ava-labs/libevm/trie/triestate" diff --git a/triedb/pathdb/journal.go b/triedb/pathdb/journal.go index 535b7680c0..3d4d4ae6c7 100644 --- a/triedb/pathdb/journal.go +++ b/triedb/pathdb/journal.go @@ -33,9 +33,9 @@ import ( "io" "time" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" "github.com/ava-labs/libevm/core/rawdb" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/log" "github.com/ava-labs/libevm/rlp" diff --git a/triedb/pathdb/layertree.go b/triedb/pathdb/layertree.go index a52eded0f6..3fc904cdcf 100644 --- a/triedb/pathdb/layertree.go +++ b/triedb/pathdb/layertree.go @@ -31,8 +31,8 @@ import ( "fmt" "sync" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/trie/trienode" "github.com/ava-labs/libevm/trie/triestate" ) diff --git a/triedb/pathdb/testutils.go b/triedb/pathdb/testutils.go index a7ada9947e..2e2ef3f96c 100644 --- a/triedb/pathdb/testutils.go +++ b/triedb/pathdb/testutils.go @@ -30,8 +30,8 @@ import ( "bytes" "fmt" - "github.com/ava-labs/coreth/core/types" "github.com/ava-labs/libevm/common" + "github.com/ava-labs/libevm/core/types" "github.com/ava-labs/libevm/crypto" "github.com/ava-labs/libevm/trie/trienode" "github.com/ava-labs/libevm/trie/triestate"