Fix import paths and add missing interface stubs for subnet-evm v0.7.5

- Update imports from luxdefi/node to luxfi/node
- Replace libevm interfaces with direct go-ethereum imports
- Add placeholder interface files for missing dependencies
- Update go.mod to use local luxfi/node path
- Fix merge conflicts in multiple files
- Create stub implementations for missing packages

This allows the project structure to align with v0.7.5 requirements
but the build still needs additional work to be fully functional.

accounts/abi/bind/auth.go

@@ -32,10 +32,10 @@ import (
 	"errors"
 	"io"
 	"math/big"
-	"github.com/luxdefi/evm/accounts"
-	"github.com/luxdefi/evm/accounts/external"
-	"github.com/luxdefi/evm/accounts/keystore"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/accounts"
+	"github.com/ethereum/go-ethereum/accounts/external"
+	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"

accounts/abi/bind/backend.go

@@ -30,7 +30,7 @@ import (
 	"context"
 	"errors"
 	"math/big"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/interfaces"
 	"github.com/ethereum/go-ethereum/common"
 )

accounts/abi/bind/backends/simulated.go

@@ -35,12 +35,12 @@ import (
 	"github.com/luxdefi/evm/consensus/dummy"
 	"github.com/luxdefi/evm/core"
 	"github.com/luxdefi/evm/core/bloombits"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/eth/filters"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/interfaces"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/rpc"

accounts/abi/bind/base.go

@@ -34,7 +34,7 @@ import (
 	"strings"
 	"sync"
 	"github.com/luxdefi/evm/accounts/abi"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/interfaces"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

accounts/abi/bind/base_test.go

@@ -35,7 +35,7 @@ import (
 	"testing"
 	"github.com/luxdefi/evm/accounts/abi"
 	"github.com/luxdefi/evm/accounts/abi/bind"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/interfaces"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"

accounts/abi/bind/precompilebind/precompile_contract_template.go

@@ -39,7 +39,7 @@ import (
 	"github.com/luxdefi/evm/vmerrs"
 	_ "embed"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/luxdefi/evm/interfaces/core/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 {{$contract := .Contract}}
 const (

accounts/abi/bind/template.go

@@ -102,7 +102,7 @@ import (
 	"errors"
 	"github.com/luxdefi/evm/accounts/abi"
 	"github.com/luxdefi/evm/accounts/abi/bind"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/interfaces"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/event"

accounts/abi/bind/util.go

@@ -30,7 +30,7 @@ import (
 	"context"
 	"errors"
 	"time"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/interfaces"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"

accounts/abi/bind/util_test.go

@@ -35,7 +35,7 @@ import (
 	"github.com/luxdefi/evm/accounts/abi/bind"
 	"github.com/luxdefi/evm/accounts/abi/bind/backends"
 	"github.com/luxdefi/evm/core"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )

accounts/scwallet/wallet.go

@@ -0,0 +1,4 @@
+package scwallet
+
+// Placeholder smart card wallet
+type Wallet interface{}

cmd/evm/internal/t8ntool/block.go

@@ -33,7 +33,7 @@ import (
 	"fmt"
 	"math/big"
 	"os"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"

cmd/evm/internal/t8ntool/execution.go

@@ -30,13 +30,13 @@ import (
 	"fmt"
 	"math/big"
 	"github.com/luxdefi/evm/core"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/crypto"

cmd/evm/internal/t8ntool/flags.go

@@ -29,7 +29,7 @@ package t8ntool
 import (
 	"fmt"
 	"strings"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/tests"
 	"github.com/urfave/cli/v2"
 )

cmd/evm/internal/t8ntool/gen_header.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"math/big"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"

cmd/evm/internal/t8ntool/tracewriter.go

@@ -22,7 +22,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/luxdefi/evm/interfaces/core/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/luxdefi/evm/eth/tracers"
 )

cmd/evm/internal/t8ntool/transaction.go

@@ -34,7 +34,7 @@ import (
 	"os"
 	"strings"
 	"github.com/luxdefi/evm/core"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/tests"
 	"github.com/ethereum/go-ethereum/common"

cmd/evm/internal/t8ntool/transition.go

@@ -36,8 +36,8 @@ import (
 	"github.com/luxdefi/evm/consensus/dummy"
 	"github.com/luxdefi/evm/core"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/eth/tracers/logger"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/tests"

cmd/evm/internal/t8ntool/tx_iterator.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/luxdefi/evm/params"

cmd/evm/runner.go

@@ -38,15 +38,15 @@ import (
 	"time"
 	"github.com/luxdefi/evm/cmd/evm/internal/compiler"
 	"github.com/luxdefi/evm/core"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/core/vm/runtime"
 	"github.com/luxdefi/evm/eth/tracers/logger"
 	"github.com/luxdefi/evm/internal/flags"
 	"github.com/luxdefi/evm/params"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"

cmd/evm/staterunner.go

@@ -32,7 +32,7 @@ import (
 	"fmt"
 	"os"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/eth/tracers/logger"
 	"github.com/luxdefi/evm/tests"
 	"github.com/ethereum/go-ethereum/common"

cmd/simulator/load/funder.go

@@ -11,7 +11,7 @@ import (
 	"github.com/luxdefi/evm/cmd/simulator/key"
 	"github.com/luxdefi/evm/cmd/simulator/metrics"
 	"github.com/luxdefi/evm/cmd/simulator/txs"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/ethclient"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"

cmd/simulator/load/loader.go

@@ -17,7 +17,7 @@ import (
 	"github.com/luxdefi/evm/cmd/simulator/key"
 	"github.com/luxdefi/evm/cmd/simulator/metrics"
 	"github.com/luxdefi/evm/cmd/simulator/txs"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/ethclient"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"

cmd/simulator/load/worker.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 	"time"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/ethclient"
 	"github.com/luxdefi/evm/interfaces"
 	"github.com/ethereum/go-ethereum/common"

cmd/simulator/txs/tx_generator.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"fmt"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/ethclient"
 	ethcrypto "github.com/ethereum/go-ethereum/crypto"
 )

consensus/consensus.go

@@ -31,7 +31,7 @@ import (
 	"math/big"
 	"github.com/luxdefi/evm/commontype"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 )

consensus/dummy/consensus.go

@@ -8,12 +8,12 @@ import (
 	"fmt"
 	"math/big"
 	"time"
-	"github.com/luxdefi/node/utils/timer/mockable"
+	"github.com/luxfi/node/utils/timer/mockable"
 	"github.com/luxdefi/evm/consensus"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/params"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/vmerrs"
 	"github.com/ethereum/go-ethereum/common"
 )

consensus/dummy/consensus_test.go

@@ -7,7 +7,7 @@ import (
 	"math"
 	"math/big"
 	"testing"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 )

consensus/misc/eip4844/eip4844.go

@@ -31,8 +31,8 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/luxdefi/evm/core/types"
-	ethparams "github.com/luxdefi/evm/interfaces/params"
+	"github.com/ethereum/go-ethereum/core/types"
+	ethparams "github.com/ethereum/go-ethereum/params"
 )
 
 var (

consensus/misc/eip4844/eip4844_test.go

@@ -23,7 +23,7 @@ import (
 <<<<<<< HEAD:consensus/misc/eip4844_test.go
 	"github.com/luxdefi/evm/params"
 =======
-	ethparams "github.com/luxdefi/evm/interfaces/params"
+	ethparams "github.com/ethereum/go-ethereum/params"
 >>>>>>> v0.7.5:consensus/misc/eip4844/eip4844_test.go
 )
 

core/bench_test.go

@@ -32,10 +32,10 @@ import (
 	"testing"
 	"github.com/luxdefi/evm/consensus/dummy"
 	"github.com/luxdefi/evm/constants"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"

core/block_validator.go

@@ -31,9 +31,9 @@ import (
 	"fmt"
 	"github.com/luxdefi/evm/consensus"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/params"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 )
 
 // BlockValidator is responsible for validating block headers, uncles and

core/blockchain.go

@@ -40,16 +40,16 @@ import (
 	"time"
 	"github.com/luxdefi/evm/commontype"
 	"github.com/luxdefi/evm/consensus"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
 	"github.com/luxdefi/evm/core/state/snapshot"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/internal/version"
-	"github.com/luxdefi/evm/metrics"
+	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/luxdefi/evm/params"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/lru"
 	"github.com/ethereum/go-ethereum/event"

core/blockchain_iterator.go

@@ -32,7 +32,7 @@ import (
 	"errors"
 	"fmt"
 	"sync"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 )
 
 type blockAndState struct {

core/blockchain_log_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"github.com/luxdefi/evm/accounts/abi"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

core/blockchain_reader.go

@@ -31,15 +31,15 @@ import (
 	"github.com/luxdefi/evm/commontype"
 	"github.com/luxdefi/evm/consensus"
 	"github.com/luxdefi/evm/constants"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
 	"github.com/luxdefi/evm/core/state/snapshot"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/precompile/contracts/feemanager"
 	"github.com/luxdefi/evm/precompile/contracts/rewardmanager"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/event"
 )

core/blockchain_repair_test.go

@@ -34,9 +34,9 @@ import (
 	"math/big"
 	"testing"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 )

core/blockchain_sethead_test.go

@@ -31,7 +31,7 @@ package core
 
 import (
 	"testing"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 )
 
 // verifyNoGaps checks that there are no gaps after the initial set of blocks in

core/blockchain_snapshot_test.go

@@ -39,10 +39,10 @@ import (
 	"testing"
 	"github.com/luxdefi/evm/consensus"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 )

core/blockchain_test.go

@@ -9,13 +9,13 @@ import (
 	"os"
 	"testing"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
 	"github.com/luxdefi/evm/core/state/pruner"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/eth/tracers/logger"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

core/bloom_indexer.go

@@ -20,9 +20,9 @@ import (
 	"context"
 	"time"
 	"github.com/luxdefi/evm/core/bloombits"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/bitutil"
 )

core/bloombits/generator.go

@@ -28,7 +28,7 @@ package bloombits
 
 import (
 	"errors"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 )
 
 var (

core/bloombits/generator_test.go

@@ -31,7 +31,7 @@ import (
 	crand "crypto/rand"
 	"math/rand"
 	"testing"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 )
 
 // Tests that batched bloom bits are correctly rotated from the input bloom

core/chain_indexer.go

@@ -34,9 +34,9 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"

core/chain_indexer_test.go

@@ -34,8 +34,8 @@ import (
 	"math/rand"
 	"testing"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/common"
 )
 

core/chain_makers.go

@@ -33,13 +33,13 @@ import (
 	"github.com/luxdefi/evm/consensus"
 	"github.com/luxdefi/evm/consensus/dummy"
 	"github.com/luxdefi/evm/constants"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 )
 

core/chain_makers_test.go

@@ -30,9 +30,9 @@ import (
 	"fmt"
 	"math/big"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

core/error.go

@@ -28,7 +28,7 @@ package core
 
 import (
 	"errors"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 )
 
 var (

core/events.go

@@ -27,7 +27,7 @@
 package core
 
 import (
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/common"
 )
 

core/evm.go

@@ -30,8 +30,8 @@ import (
 	"bytes"
 	"math/big"
 	"github.com/luxdefi/evm/consensus"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/predicate"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"

core/extstate/statedb.go

@@ -5,8 +5,8 @@ package extstate
 
 import (
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/interfaces/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/predicate"
 )

core/extstate/test_statedb.go

@@ -5,7 +5,7 @@ package extstate
 import (
 	"testing"
 <<<<<<< HEAD:core/state/test_statedb.go
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/precompile/contract"
 	"github.com/ethereum/go-ethereum/common"
 =======

core/genesis.go

@@ -32,12 +32,12 @@ import (
 	"fmt"
 	"math/big"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"

core/genesis_extra_test.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/luxdefi/evm/interfaces/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/interfaces/triedb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/triedb"
 	"github.com/luxdefi/evm/commontype"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/params/extras"

core/genesis_test.go

@@ -33,15 +33,15 @@ import (
 	"reflect"
 	"testing"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/precompile/allowlist"
 	"github.com/luxdefi/evm/precompile/contracts/deployerallowlist"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/utils"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/stretchr/testify/assert"

core/headerchain.go

@@ -33,9 +33,9 @@ import (
 	mrand "math/rand"
 	"sync/atomic"
 	"github.com/luxdefi/evm/consensus"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/lru"

core/headerchain_test.go

@@ -33,9 +33,9 @@ import (
 	"testing"
 	"github.com/luxdefi/evm/consensus"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 )

core/predicate_check.go

@@ -6,8 +6,8 @@ package core
 import (
 	"errors"
 	"fmt"
-	"github.com/luxdefi/node/utils/set"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/luxfi/node/utils/set"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/precompile/precompileconfig"
 	"github.com/luxdefi/evm/predicate"

core/predicate_check_test.go

@@ -6,9 +6,9 @@ package core
 import (
 	"errors"
 	"testing"
-	"github.com/luxdefi/node/snow/engine/snowman/block"
-	"github.com/luxdefi/node/utils/set"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/luxfi/node/snow/engine/snowman/block"
+	"github.com/luxfi/node/utils/set"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/precompile/precompileconfig"
 	"github.com/ethereum/go-ethereum/common"

core/rlp_test.go

@@ -31,7 +31,7 @@ import (
 	"math/big"
 	"testing"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/params"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

core/sender_cacher.go

@@ -28,7 +28,7 @@ package core
 
 import (
 	"sync"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 )
 
 // txSenderCacherRequest is a request for recovering transaction senders with a

core/state/database.go

@@ -29,10 +29,10 @@ package state
 import (
 	"errors"
 	"fmt"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/trie/trienode"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/lru"

core/state/dump.go

@@ -30,8 +30,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"time"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/log"

core/state/pruner/bloom.go

@@ -30,7 +30,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"os"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	bloomfilter "github.com/holiman/bloomfilter/v2"

core/state/pruner/pruner.go

@@ -36,11 +36,11 @@ import (
 	"path/filepath"
 	"strings"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state/snapshot"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"

core/state/snapshot/context.go

@@ -32,7 +32,7 @@ import (
 	"math"
 	"time"
 
-	"golang.org/x/exp/slog"
+	"log/slog"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"

core/state/snapshot/conversion.go

@@ -34,10 +34,10 @@ import (
 	"runtime"
 	"sync"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"

core/state/snapshot/difflayer.go

@@ -36,10 +36,10 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rlp"
 	bloomfilter "github.com/holiman/bloomfilter/v2"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 var (

core/state/snapshot/disklayer.go

@@ -30,9 +30,9 @@ import (
 	"bytes"
 	"sync"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"

core/state/snapshot/disklayer_test.go

@@ -29,7 +29,7 @@ package snapshot
 import (
 	"bytes"
 	"testing"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/ethdb/memorydb"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"

core/state/snapshot/generate.go

@@ -30,10 +30,10 @@ import (
 	"bytes"
 	"fmt"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"

core/state/snapshot/generate_test.go

@@ -31,10 +31,10 @@ import (
 	"os"
 	"testing"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/trie/trienode"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"

core/state/snapshot/iterator.go

@@ -30,8 +30,8 @@ import (
 	"bytes"
 	"fmt"
 	"sort"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/common"
 )
 

core/state/snapshot/iterator_fast.go

@@ -32,7 +32,7 @@ import (
 	"sort"
 
 	"github.com/ethereum/go-ethereum/common"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // weightedIterator is a iterator with an assigned weight. It is used to prioritise

core/state/snapshot/iterator_test.go

@@ -33,7 +33,7 @@ import (
 	"fmt"
 	"math/rand"
 	"testing"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/common"
 )
 

core/state/snapshot/journal.go

@@ -31,9 +31,9 @@ import (
 	"errors"
 	"fmt"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"

core/state/snapshot/snapshot.go

@@ -33,10 +33,10 @@ import (
 	"fmt"
 	"sync"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/metrics"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/metrics"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"

core/state/snapshot/snapshot_ext.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/luxdefi/evm/interfaces/ethdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/utils"
 )
 

core/state/snapshot/snapshot_test.go

@@ -32,8 +32,8 @@ import (
 	"math/rand"
 	"testing"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"
 )

core/state/snapshot/utils.go

@@ -30,8 +30,8 @@ import (
 	"bytes"
 	"fmt"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 )

core/state/snapshot/wipe.go

@@ -29,8 +29,8 @@ package snapshot
 import (
 	"bytes"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 )

core/state/snapshot/wipe_test.go

@@ -29,7 +29,7 @@ package snapshot
 import (
 	"math/rand"
 	"testing"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/ethdb/memorydb"
 	"github.com/ethereum/go-ethereum/common"
 )

core/state/state_test.go

@@ -28,10 +28,10 @@ package state
 
 import (
 	"testing"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )

core/state/statedb.go

@@ -33,13 +33,13 @@ import (
 	"math/big"
 	"sort"
 	"time"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state/snapshot"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/metrics"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/predicate"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/trie/trienode"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

core/state/trie_prefetcher_extra_test.go

@@ -12,14 +12,14 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/luxdefi/node/database"
+	"github.com/luxfi/node/database"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/luxdefi/evm/interfaces/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/interfaces/ethdb"
-	"github.com/luxdefi/evm/interfaces/libevm/stateconf"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/libevm/stateconf"
 	"github.com/luxdefi/evm/interfaces/metrics"
-	"github.com/luxdefi/evm/interfaces/triedb"
+	"github.com/ethereum/go-ethereum/triedb"
 	"github.com/luxdefi/evm/core/state/snapshot"
 	"github.com/luxdefi/evm/triedb/hashdb"
 	"github.com/stretchr/testify/require"

core/state_manager.go

@@ -30,8 +30,8 @@ import (
 	"fmt"
 	"math/rand"
 	"time"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/common"
 )
 

core/state_manager_test.go

@@ -6,7 +6,7 @@ package core
 import (
 	"math/big"
 	"testing"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/assert"
 )

core/state_processor.go

@@ -31,8 +31,8 @@ import (
 	"math/big"
 	"github.com/luxdefi/evm/consensus"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/precompile/contract"
 	"github.com/luxdefi/evm/precompile/modules"

core/state_processor_ext_test.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/luxdefi/evm/interfaces/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/interfaces/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
-	ethparams "github.com/luxdefi/evm/interfaces/params"
+	ethparams "github.com/ethereum/go-ethereum/params"
 	"github.com/luxdefi/evm/consensus/dummy"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/params/extras"

core/state_processor_test.go

@@ -32,12 +32,12 @@ import (
 	"testing"
 	"github.com/luxdefi/evm/consensus"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/precompile/contracts/txallowlist"
-	"github.com/luxdefi/evm/trie"
+	"github.com/ethereum/go-ethereum/trie"
 	"github.com/luxdefi/evm/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

core/state_transition.go

@@ -30,8 +30,8 @@ import (
 	"fmt"
 	"math"
 	"math/big"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/core/vm"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/precompile/contracts/txallowlist"
 	"github.com/luxdefi/evm/utils"

core/test_blockchain.go

@@ -10,10 +10,10 @@ import (
 	"time"
 	"github.com/luxdefi/evm/commontype"
 	"github.com/luxdefi/evm/consensus/dummy"
-	"github.com/luxdefi/evm/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/luxdefi/evm/core/state"
-	"github.com/luxdefi/evm/core/types"
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/params"
 	"github.com/luxdefi/evm/precompile/allowlist"
 	"github.com/luxdefi/evm/precompile/contracts/deployerallowlist"

core/trie_stress_bench_test.go

@@ -30,7 +30,7 @@ import (
 	_ "embed"
 	"math/big"
 	"testing"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/precompile/contract"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

core/txindexer.go

@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/luxdefi/evm/interfaces/core/rawdb"
-	"github.com/luxdefi/evm/interfaces/ethdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 )
 

core/txindexer_test.go

@@ -23,10 +23,10 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/luxdefi/evm/interfaces/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/luxdefi/evm/interfaces/ethdb"
-	ethparams "github.com/luxdefi/evm/interfaces/params"
+	"github.com/ethereum/go-ethereum/ethdb"
+	ethparams "github.com/ethereum/go-ethereum/params"
 	"github.com/luxdefi/evm/consensus/dummy"
 	"github.com/luxdefi/evm/params"
 	"github.com/stretchr/testify/require"

core/txpool/blobpool/blobpool.go

@@ -40,11 +40,11 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/luxdefi/evm/interfaces/metrics"
-	ethparams "github.com/luxdefi/evm/interfaces/params"
+	ethparams "github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/luxdefi/evm/consensus/misc/eip4844"
 	"github.com/luxdefi/evm/core"

core/txpool/blobpool/blobpool_test.go

@@ -41,12 +41,12 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/luxdefi/evm/interfaces/core/rawdb"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/crypto/kzg4844"
 	"github.com/luxdefi/evm/interfaces/ethdb/memorydb"
 	"github.com/ethereum/go-ethereum/log"
-	ethparams "github.com/luxdefi/evm/interfaces/params"
+	ethparams "github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/luxdefi/evm/commontype"
 	"github.com/luxdefi/evm/consensus/misc/eip4844"

core/txpool/blobpool/evictheap_test.go

@@ -32,7 +32,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
-	ethparams "github.com/luxdefi/evm/interfaces/params"
+	ethparams "github.com/ethereum/go-ethereum/params"
 	"github.com/holiman/uint256"
 )
 

core/txpool/blobpool/interface.go

@@ -29,10 +29,10 @@ package blobpool
 import (
 	"math/big"
 <<<<<<< HEAD:core/rawdb/databases_non64bit.go
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 =======
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/luxdefi/evm/commontype"
 	"github.com/luxdefi/evm/core/state"
 	"github.com/luxdefi/evm/params"

core/txpool/blobpool/limbo.go

@@ -30,7 +30,7 @@ import (
 	"errors"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/luxdefi/evm/core/types"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/holiman/billy"

core/txpool/blobpool/slotter.go

@@ -44,7 +44,7 @@ func newSlotter() func() (uint32, bool) {
 		finished := slotsize > maxBlobsPerTransaction*blobSize+txMaxSize
 
 <<<<<<< HEAD:ethdb/pebble/pebble_test.go
-	"github.com/luxdefi/evm/ethdb"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/luxdefi/evm/ethdb/dbtest"
 	"github.com/cockroachdb/pebble"
 	"github.com/cockroachdb/pebble/vfs"