Update address formatting and drop pebble dep

accounts/abi/abi.go

@@ -24,8 +24,8 @@ import (
 	"io"
 	"math/big"
 
-	"github.com/luxfi/geth/common"
 	"github.com/luxfi/crypto"
+	"github.com/luxfi/geth/common"
 )
 
 // The ABI holds information about a contract's context and available

accounts/abi/abi_test.go

@@ -26,10 +26,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math"
 	"github.com/luxfi/crypto"
+	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/internal/testrand"
+	"github.com/luxfi/math"
 )
 
 const jsondata = `

accounts/abi/bind/old.go

@@ -27,6 +27,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/accounts/abi"
 	"github.com/luxfi/geth/accounts/abi/abigen"
@@ -35,7 +36,6 @@ import (
 	"github.com/luxfi/geth/accounts/keystore"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/log"
 )
 

accounts/abi/bind/v2/auth.go

@@ -22,12 +22,12 @@ import (
 	"errors"
 	"math/big"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/accounts/external"
 	"github.com/luxfi/geth/accounts/keystore"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 )
 
 // ErrNotAuthorized is returned when an account is not properly unlocked.

accounts/abi/bind/v2/dep_tree_test.go

@@ -22,9 +22,9 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 )
 
 type linkTestCase struct {

accounts/abi/bind/v2/lib_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts/abi/bind/backends"
 	"github.com/luxfi/geth/accounts/abi/bind/v2"
 	"github.com/luxfi/geth/accounts/abi/bind/v2/internal/contracts/events"
@@ -29,7 +30,6 @@ import (
 	"github.com/luxfi/geth/accounts/abi/bind/v2/internal/contracts/solc_errors"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/eth/ethconfig"
 	"github.com/luxfi/geth/ethclient"
 	"github.com/luxfi/geth/ethclient/simulated"

accounts/abi/error.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/luxfi/geth/common"
 	"github.com/luxfi/crypto"
+	"github.com/luxfi/geth/common"
 )
 
 type Error struct {

accounts/abi/event.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/luxfi/geth/common"
 	"github.com/luxfi/crypto"
+	"github.com/luxfi/geth/common"
 )
 
 // Event is an event potentially triggered by the EVM's LOG mechanism. The Event

accounts/keystore/key.go

@@ -28,10 +28,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/uuid"
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/crypto"
-	"github.com/google/uuid"
 )
 
 const (

accounts/keystore/keystore.go

@@ -32,10 +32,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/event"
 )
 

accounts/keystore/keystore_test.go

@@ -27,9 +27,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/event"
 )
 

accounts/keystore/passphrase.go

@@ -37,12 +37,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"golang.org/x/crypto/pbkdf2"
 	"github.com/google/uuid"
 	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/math"
+	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/crypto/scrypt"
 )
 

accounts/keystore/plain_test.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/luxfi/geth/common"
 	"github.com/luxfi/crypto"
+	"github.com/luxfi/geth/common"
 )
 
 func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {

accounts/keystore/presale.go

@@ -25,11 +25,11 @@ import (
 	"errors"
 	"fmt"
 
-	"golang.org/x/crypto/pbkdf2"
 	"github.com/google/uuid"
 	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
+	"golang.org/x/crypto/pbkdf2"
 )
 
 // creates a Key and stores that in the given KeyStore by decrypting a presale key JSON

accounts/keystore/wallet.go

@@ -19,10 +19,10 @@ package keystore
 import (
 	"math/big"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 )
 
 // keystoreWallet implements the accounts.Wallet interface for the original

accounts/keystore/watch.go

@@ -23,8 +23,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/luxfi/geth/log"
 	"github.com/fsnotify/fsnotify"
+	"github.com/luxfi/geth/log"
 )
 
 type watcher struct {

accounts/scwallet/hub.go

@@ -41,11 +41,11 @@ import (
 	"sync"
 	"time"
 
+	pcsc "github.com/gballet/go-libpcsclite"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/event"
 	"github.com/luxfi/geth/log"
-	pcsc "github.com/gballet/go-libpcsclite"
 )
 
 // Scheme is the URI prefix for smartcard wallets.

accounts/scwallet/securechannel.go

@@ -26,9 +26,9 @@ import (
 	"errors"
 	"fmt"
 
-	"golang.org/x/crypto/pbkdf2"
 	pcsc "github.com/gballet/go-libpcsclite"
 	"github.com/luxfi/crypto"
+	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/text/unicode/norm"
 )
 

accounts/scwallet/wallet.go

@@ -33,13 +33,13 @@ import (
 	"sync"
 	"time"
 
+	pcsc "github.com/gballet/go-libpcsclite"
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/log"
-	pcsc "github.com/gballet/go-libpcsclite"
 	"github.com/status-im/keycard-go/derivationpath"
 )
 

accounts/usbwallet/ledger.go

@@ -28,11 +28,11 @@ import (
 	"io"
 	"math/big"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/rlp"
 )

accounts/usbwallet/wallet.go

@@ -25,11 +25,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/hid"
 )

beacon/engine/types_test.go

@@ -19,9 +19,9 @@ package engine
 import (
 	"testing"
 
+	"github.com/luxfi/crypto/kzg4844"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto/kzg4844"
 )
 
 func TestBlobs(t *testing.T) {

beacon/types/exec_payload.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/trie"
-	"github.com/holiman/uint256"
 	"github.com/protolambda/zrnt/eth2/beacon/capella"
 	zrntcommon "github.com/protolambda/zrnt/eth2/beacon/common"
 	"github.com/protolambda/zrnt/eth2/beacon/deneb"

build/ci.go

@@ -60,8 +60,8 @@ import (
 	"time"
 
 	"github.com/cespare/cp"
-	"github.com/luxfi/geth/common"
 	"github.com/luxfi/crypto/signify"
+	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/internal/build"
 	"github.com/luxfi/geth/internal/download"
 	"github.com/luxfi/geth/internal/version"

cmd/clef/main.go

@@ -35,13 +35,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/accounts/keystore"
 	"github.com/luxfi/geth/cmd/utils"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/internal/ethapi"
 	"github.com/luxfi/geth/internal/flags"
 	"github.com/luxfi/geth/log"

cmd/devp2p/discv4cmd.go

@@ -26,9 +26,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/cmd/devp2p/internal/v4test"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/p2p/discover"
 	"github.com/luxfi/geth/p2p/enode"

cmd/devp2p/internal/ethtest/chain.go

@@ -31,13 +31,13 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
 	"github.com/luxfi/geth/core"
 	"github.com/luxfi/geth/core/forkid"
 	"github.com/luxfi/geth/core/state"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/eth/protocols/eth"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/rlp"

cmd/devp2p/internal/ethtest/engine.go

@@ -25,8 +25,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/luxfi/geth/common"
 	"github.com/golang-jwt/jwt/v4"
+	"github.com/luxfi/geth/common"
 )
 
 // EngineClient is a wrapper around engine-related data.

cmd/devp2p/internal/ethtest/snap.go

@@ -24,10 +24,10 @@ import (
 	"math/rand"
 	"reflect"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/state"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/eth/protocols/snap"
 	"github.com/luxfi/geth/internal/utesting"
 	"github.com/luxfi/geth/trie"

cmd/devp2p/internal/ethtest/suite.go

@@ -25,16 +25,16 @@ import (
 	"sync"
 	"time"
 
+	"github.com/holiman/uint256"
+	"github.com/luxfi/crypto"
+	"github.com/luxfi/crypto/kzg4844"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus/misc/eip4844"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
-	"github.com/luxfi/crypto/kzg4844"
 	"github.com/luxfi/geth/eth/protocols/eth"
 	"github.com/luxfi/geth/internal/utesting"
 	"github.com/luxfi/geth/p2p"
 	"github.com/luxfi/geth/p2p/enode"
-	"github.com/holiman/uint256"
 )
 
 // Suite represents a structure used to test a node's conformance

cmd/devp2p/internal/v5test/framework.go

@@ -24,8 +24,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/luxfi/geth/common/mclock"
 	"github.com/luxfi/crypto"
+	"github.com/luxfi/geth/common/mclock"
 	"github.com/luxfi/geth/p2p/discover/v5wire"
 	"github.com/luxfi/geth/p2p/enode"
 	"github.com/luxfi/geth/p2p/enr"

cmd/devp2p/rlpxcmd.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/luxfi/geth/cmd/devp2p/internal/ethtest"
 	"github.com/luxfi/crypto"
+	"github.com/luxfi/geth/cmd/devp2p/internal/ethtest"
 	"github.com/luxfi/geth/p2p"
 	"github.com/luxfi/geth/p2p/enode"
 	"github.com/luxfi/geth/p2p/rlpx"

cmd/ethkey/generate.go

@@ -22,11 +22,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/google/uuid"
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts/keystore"
 	"github.com/luxfi/geth/cmd/utils"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/crypto"
-	"github.com/google/uuid"
 	"github.com/urfave/cli/v2"
 )
 

cmd/ethkey/inspect.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts/keystore"
 	"github.com/luxfi/geth/cmd/utils"
-	"github.com/luxfi/crypto"
 	"github.com/urfave/cli/v2"
 )
 

cmd/ethkey/message.go

@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/accounts/keystore"
 	"github.com/luxfi/geth/cmd/utils"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/crypto"
 	"github.com/urfave/cli/v2"
 )
 

cmd/evm/internal/t8ntool/block.go

@@ -24,13 +24,13 @@ import (
 	"math/big"
 	"os"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/consensus/clique"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/rlp"
+	"github.com/luxfi/math"
 	"github.com/urfave/cli/v2"
 )
 

cmd/evm/internal/t8ntool/execution.go

@@ -21,9 +21,9 @@ import (
 	stdmath "math"
 	"math/big"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/consensus/ethash"
 	"github.com/luxfi/geth/consensus/misc"
 	"github.com/luxfi/geth/consensus/misc/eip4844"
@@ -39,7 +39,7 @@ import (
 	"github.com/luxfi/geth/rlp"
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/triedb"
-	"github.com/holiman/uint256"
+	"github.com/luxfi/math"
 	"golang.org/x/crypto/sha3"
 )
 

cmd/evm/internal/t8ntool/gen_execresult.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
+	"github.com/luxfi/math"
 )
 
 var _ = (*executionResultMarshaling)(nil)

cmd/evm/internal/t8ntool/gen_header.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
+	"github.com/luxfi/math"
 )
 
 var _ = (*headerMarshaling)(nil)

cmd/evm/internal/t8ntool/gen_stenv.go

@@ -8,8 +8,8 @@ import (
 	"math/big"
 
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
+	"github.com/luxfi/math"
 )
 
 var _ = (*stEnvMarshaling)(nil)

cmd/evm/internal/t8ntool/transition.go

@@ -25,6 +25,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/holiman/uint256"
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
 	"github.com/luxfi/geth/consensus/misc/eip1559"
@@ -34,7 +36,6 @@ import (
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/eth/tracers"
 	"github.com/luxfi/geth/eth/tracers/logger"
 	"github.com/luxfi/geth/log"
@@ -43,7 +44,6 @@ import (
 	"github.com/luxfi/geth/trie/bintrie"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/database"
-	"github.com/holiman/uint256"
 	"github.com/urfave/cli/v2"
 )
 

cmd/evm/internal/t8ntool/tx_iterator.go

@@ -25,10 +25,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/rlp"
 )

cmd/geth/accountcmd.go

@@ -22,11 +22,11 @@ import (
 	"os"
 	"strings"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/accounts/keystore"
 	"github.com/luxfi/geth/cmd/utils"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/crypto"
 	"github.com/urfave/cli/v2"
 )
 

cmd/geth/config.go

@@ -27,6 +27,7 @@ import (
 	"strings"
 	"unicode"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/accounts/external"
 	"github.com/luxfi/geth/accounts/keystore"
@@ -35,7 +36,6 @@ import (
 	"github.com/luxfi/geth/beacon/blsync"
 	"github.com/luxfi/geth/cmd/utils"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/eth/catalyst"
 	"github.com/luxfi/geth/eth/ethconfig"
 	"github.com/luxfi/geth/internal/flags"

cmd/geth/dbcmd.go

@@ -28,6 +28,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/cmd/utils"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
@@ -35,7 +36,6 @@ import (
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/state/snapshot"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/rlp"

cmd/geth/logtestcmd_active.go

@@ -25,9 +25,9 @@ import (
 	"math/big"
 	"time"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/log"
-	"github.com/holiman/uint256"
 	"github.com/urfave/cli/v2"
 )
 

cmd/geth/snapshot.go

@@ -25,6 +25,7 @@ import (
 	"slices"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/cmd/utils"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
@@ -32,7 +33,6 @@ import (
 	"github.com/luxfi/geth/core/state/pruner"
 	"github.com/luxfi/geth/core/state/snapshot"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/rlp"
 	"github.com/luxfi/geth/trie"

cmd/geth/verkle.go

@@ -24,11 +24,11 @@ import (
 	"os"
 	"slices"
 
+	"github.com/ethereum/go-verkle"
 	"github.com/luxfi/geth/cmd/utils"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/log"
-	"github.com/ethereum/go-verkle"
 	"github.com/urfave/cli/v2"
 )
 

cmd/geth/version_check.go

@@ -26,8 +26,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/luxfi/geth/log"
 	"github.com/jedisct1/go-minisign"
+	"github.com/luxfi/geth/log"
 	"github.com/urfave/cli/v2"
 )
 

cmd/utils/flags.go

@@ -33,6 +33,9 @@ import (
 	"strings"
 	"time"
 
+	pcsclite "github.com/gballet/go-libpcsclite"
+	"github.com/luxfi/crypto"
+	"github.com/luxfi/crypto/kzg4844"
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/accounts/keystore"
 	bparams "github.com/luxfi/geth/beacon/params"
@@ -44,8 +47,6 @@ import (
 	"github.com/luxfi/geth/core/txpool/blobpool"
 	"github.com/luxfi/geth/core/txpool/legacypool"
 	"github.com/luxfi/geth/core/vm"
-	"github.com/luxfi/crypto"
-	"github.com/luxfi/crypto/kzg4844"
 	"github.com/luxfi/geth/eth"
 	"github.com/luxfi/geth/eth/ethconfig"
 	"github.com/luxfi/geth/eth/filters"
@@ -73,7 +74,6 @@ import (
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/hashdb"
 	"github.com/luxfi/geth/triedb/pathdb"
-	pcsclite "github.com/gballet/go-libpcsclite"
 	gopsutil "github.com/shirou/gopsutil/mem"
 	"github.com/urfave/cli/v2"
 )

cmd/utils/history_test.go

@@ -26,12 +26,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus/ethash"
 	"github.com/luxfi/geth/core"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/internal/era"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/trie"

cmd/workload/historytestgen.go

@@ -24,9 +24,9 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/internal/flags"
 	"github.com/luxfi/geth/rlp"
 	"github.com/urfave/cli/v2"

common/size.go

@@ -16,10 +16,7 @@
 
 package common
 
-import (
-	"fmt"
-	"github.com/luxfi/crypto/address/formatting"
-)
+import "fmt"
 
 // StorageSize is a wrapper around a float value that supports user friendly
 // formatting.

consensus/beacon/consensus.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus"
 	"github.com/luxfi/geth/consensus/misc/eip1559"
@@ -31,7 +32,6 @@ import (
 	"github.com/luxfi/geth/core/vm"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/trie"
-	"github.com/holiman/uint256"
 )
 
 // Proof-of-stake protocol constants.

consensus/clique/clique.go

@@ -27,6 +27,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
 	"github.com/luxfi/geth/common/lru"
@@ -36,7 +37,6 @@ import (
 	"github.com/luxfi/geth/core/state"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/params"

consensus/clique/clique_test.go

@@ -20,11 +20,11 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 )
 

consensus/clique/snapshot_test.go

@@ -24,11 +24,11 @@ import (
 	"slices"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 )
 

consensus/ethash/consensus.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	mapset "github.com/deckarep/golang-set/v2"
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus"
 	"github.com/luxfi/geth/consensus/misc"
@@ -34,7 +35,6 @@ import (
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/rlp"
 	"github.com/luxfi/geth/trie"
-	"github.com/holiman/uint256"
 	"golang.org/x/crypto/sha3"
 )
 

consensus/ethash/consensus_test.go

@@ -27,9 +27,9 @@ import (
 	"testing"
 
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/params"
+	"github.com/luxfi/math"
 )
 
 type diffTest struct {

consensus/ethash/difficulty.go

@@ -19,8 +19,8 @@ package ethash
 import (
 	"math/big"
 
-	"github.com/luxfi/geth/core/types"
 	"github.com/holiman/uint256"
+	"github.com/luxfi/geth/core/types"
 )
 
 const (

core/asm/asm.go

@@ -148,4 +148,4 @@ func Disassemble(code []byte) ([]string, error) {
 		return nil, err
 	}
 	return out, nil
-}
+}

core/asm/iterator.go

@@ -110,4 +110,4 @@ func IsProgramCounterWithinJumpDest(code []byte, pc int) error {
 		}
 	}
 	return errNoJUMPDEST
-}
+}

core/bench_test.go

@@ -21,15 +21,15 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/consensus/ethash"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/ethdb/pebble"
 	"github.com/luxfi/geth/params"
+	"github.com/luxfi/math"
 )
 
 func BenchmarkInsertChain_empty_memdb(b *testing.B) {

core/bintrie_witness_test.go

@@ -22,6 +22,7 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus/beacon"
 	"github.com/luxfi/geth/consensus/ethash"
@@ -30,7 +31,6 @@ import (
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/triedb"
 )

core/block_validator_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus"
 	"github.com/luxfi/geth/consensus/beacon"
@@ -28,7 +29,6 @@ import (
 	"github.com/luxfi/geth/consensus/ethash"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 )
 

core/blockchain_test.go

@@ -31,6 +31,8 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/holiman/uint256"
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus"
 	"github.com/luxfi/geth/consensus/beacon"
@@ -41,13 +43,11 @@ import (
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"
 	"github.com/luxfi/geth/core/vm/program"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/eth/tracers/logger"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/ethdb/pebble"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/trie"
-	"github.com/holiman/uint256"
 	"github.com/stretchr/testify/assert"
 )
 

core/chain_makers_test.go

@@ -23,12 +23,12 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus/beacon"
 	"github.com/luxfi/geth/consensus/ethash"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/triedb"
 )

core/evm.go

@@ -19,13 +19,13 @@ package core
 import (
 	"math/big"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus"
 	"github.com/luxfi/geth/consensus/misc/eip4844"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"
-	"github.com/holiman/uint256"
 )
 
 // ChainContext supports retrieving headers and consensus parameters from the

core/gen_genesis.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/params"
+	"github.com/luxfi/math"
 )
 
 var _ = (*genesisSpecMarshaling)(nil)

core/genesis.go

@@ -24,14 +24,14 @@ import (
 	"math/big"
 	"strings"
 
+	"github.com/holiman/uint256"
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/state"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/params"
@@ -39,7 +39,7 @@ import (
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/pathdb"
-	"github.com/holiman/uint256"
+	"github.com/luxfi/math"
 )
 
 //go:generate go run github.com/fjl/gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go

core/rawdb/accessors_chain_test.go

@@ -25,9 +25,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/rlp"
 	"golang.org/x/crypto/sha3"

core/rawdb/accessors_indexes_test.go

@@ -22,12 +22,12 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/internal/blocktest"
 	"github.com/luxfi/geth/rlp"
-	"github.com/holiman/uint256"
 )
 
 var newTestHasher = blocktest.NewHasher

core/rawdb/freezer.go

@@ -25,10 +25,10 @@ import (
 	"sync"
 	"sync/atomic"
 
+	"github.com/gofrs/flock"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/metrics"
-	"github.com/gofrs/flock"
 )
 
 var (

core/rawdb/freezer_batch.go

@@ -21,8 +21,8 @@ import (
 	"math"
 	"time"
 
-	"github.com/luxfi/geth/rlp"
 	"github.com/golang/snappy"
+	"github.com/luxfi/geth/rlp"
 )
 
 const (

core/rawdb/freezer_table.go

@@ -29,10 +29,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/golang/snappy"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/metrics"
-	"github.com/golang/snappy"
 )
 
 var (

core/rawdb/schema.go

@@ -21,8 +21,8 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"github.com/luxfi/geth/common"
 	"github.com/luxfi/crypto"
+	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/metrics"
 )
 

core/rlp_test.go

@@ -21,10 +21,10 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus/ethash"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/rlp"
 	"golang.org/x/crypto/sha3"

core/state/access_events.go

@@ -20,11 +20,11 @@ import (
 	"maps"
 	gomath "math"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/trie/utils"
-	"github.com/holiman/uint256"
+	"github.com/luxfi/math"
 )
 
 // mode specifies how a tree location has been accessed

core/state/journal.go

@@ -22,8 +22,8 @@ import (
 	"slices"
 	"sort"
 
-	"github.com/luxfi/geth/common"
 	"github.com/holiman/uint256"
+	"github.com/luxfi/geth/common"
 )
 
 type revision struct {

core/state/pruner/bloom.go

@@ -21,10 +21,10 @@ import (
 	"errors"
 	"os"
 
+	bloomfilter "github.com/holiman/bloomfilter/v2"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/log"
-	bloomfilter "github.com/holiman/bloomfilter/v2"
 )
 
 // stateBloomHash is used to convert a trie hash or contract code hash into a 64 bit mini hash.

core/state/snapshot/difflayer.go

@@ -27,10 +27,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	bloomfilter "github.com/holiman/bloomfilter/v2"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/rlp"
-	bloomfilter "github.com/holiman/bloomfilter/v2"
 )
 
 var (

core/state/snapshot/generate_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
@@ -33,7 +34,6 @@ import (
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/hashdb"
 	"github.com/luxfi/geth/triedb/pathdb"
-	"github.com/holiman/uint256"
 	"golang.org/x/crypto/sha3"
 )
 

core/state/snapshot/snapshot_test.go

@@ -25,11 +25,11 @@ import (
 	"time"
 
 	"github.com/VictoriaMetrics/fastcache"
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/rlp"
-	"github.com/holiman/uint256"
 )
 
 // randomHash generates a random blob of data and returns it as a hash.

core/state/state_object.go

@@ -23,6 +23,7 @@ import (
 	"slices"
 	"time"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/log"
@@ -30,7 +31,6 @@ import (
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/trie/transitiontrie"
 	"github.com/luxfi/geth/trie/trienode"
-	"github.com/holiman/uint256"
 )
 
 type Storage map[common.Hash]common.Hash

core/state/state_sizer_test.go

@@ -20,13 +20,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/pathdb"
-	"github.com/holiman/uint256"
 )
 
 func TestSizeTracker(t *testing.T) {

core/state/state_test.go

@@ -21,11 +21,11 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/triedb"
-	"github.com/holiman/uint256"
 )
 
 type stateEnv struct {

core/state/stateconf/conf.go

@@ -97,4 +97,4 @@ func ShouldSkipStateKeyTransformation(opts ...StateDBStateOption) bool {
 		}
 	}
 	return false
-}
+}

core/state/statedb.go

@@ -27,6 +27,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/state/snapshot"
@@ -38,7 +39,6 @@ import (
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/trie/trienode"
 	"github.com/luxfi/geth/trie/utils"
-	"github.com/holiman/uint256"
 	"golang.org/x/sync/errgroup"
 )
 

core/state/statedb_fuzz_test.go

@@ -29,6 +29,7 @@ import (
 	"testing"
 	"testing/quick"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/state/snapshot"
@@ -38,7 +39,6 @@ import (
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/pathdb"
-	"github.com/holiman/uint256"
 )
 
 // A stateTest checks that the state changes are correctly captured. Instances

core/state/statedb_hooked.go

@@ -19,13 +19,13 @@ package state
 import (
 	"math/big"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/stateless"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/trie/utils"
-	"github.com/holiman/uint256"
 )
 
 // hookedStateDB represents a statedb which emits calls to tracing-hooks

core/state/statedb_hooked_test.go

@@ -21,10 +21,10 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
-	"github.com/holiman/uint256"
 )
 
 // This method tests that the 'burn' from sending-to-selfdestructed accounts

core/state/statedb_test.go

@@ -30,6 +30,7 @@ import (
 	"testing"
 	"testing/quick"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/state/snapshot"
@@ -41,7 +42,6 @@ import (
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/hashdb"
 	"github.com/luxfi/geth/triedb/pathdb"
-	"github.com/holiman/uint256"
 )
 
 // Tests that updating a state trie does not leak any database writes prior to

core/state/sync_test.go

@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"testing"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
@@ -29,7 +30,6 @@ import (
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/hashdb"
 	"github.com/luxfi/geth/triedb/pathdb"
-	"github.com/holiman/uint256"
 )
 
 // testAccount is the data associated with an account used by the state tests.

core/state/trie_prefetcher_test.go

@@ -20,13 +20,13 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/internal/testrand"
 	"github.com/luxfi/geth/triedb"
-	"github.com/holiman/uint256"
 )
 
 func filledStateDB() *StateDB {

core/state_processor_test.go

@@ -22,6 +22,8 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/holiman/uint256"
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus"
 	"github.com/luxfi/geth/consensus/beacon"
@@ -30,10 +32,8 @@ import (
 	"github.com/luxfi/geth/consensus/misc/eip4844"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/trie"
-	"github.com/holiman/uint256"
 	"golang.org/x/crypto/sha3"
 )
 
@@ -454,7 +454,7 @@ func TestEVMGasAccounting(t *testing.T) {
 		BerlinBlock:             big.NewInt(0),
 		LondonBlock:             big.NewInt(0),
 		TerminalTotalDifficulty: big.NewInt(0),
-		EVMTimestamp:      u64(0), // EVM active from genesis
+		EVMTimestamp:            u64(0), // EVM active from genesis
 	}
 
 	// Create standard EIP-1559 config for comparison
@@ -504,7 +504,7 @@ func TestEVMGasAccounting(t *testing.T) {
 		BerlinBlock:             big.NewInt(0),
 		LondonBlock:             big.NewInt(0),
 		TerminalTotalDifficulty: big.NewInt(0),
-		EVMTimestamp:      u64(0), // EVM active from genesis
+		EVMTimestamp:            u64(0), // EVM active from genesis
 		DurangoTimestamp:        u64(0), // Durango active from genesis
 		ShanghaiTime:            nil,    // Shanghai not explicitly set
 	}

core/stateconf/config.go

@@ -104,4 +104,4 @@ func ShouldSkipStateKeyTransformation(opts ...StateDBStateOption) bool {
 		}
 	}
 	return false
-}
+}

core/stateless/database.go

@@ -17,9 +17,9 @@
 package stateless
 
 import (
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/rawdb"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/ethdb"
 )
 

core/tracing/hooks.go

@@ -27,10 +27,10 @@ package tracing
 import (
 	"math/big"
 
+	"github.com/holiman/uint256"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/params"
-	"github.com/holiman/uint256"
 )
 
 // OpContext provides the context at which the opcode is being

core/txindexer_test.go

@@ -20,11 +20,11 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus/ethash"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/params"
 )

core/txpool/blobpool/blobpool.go

@@ -32,6 +32,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/holiman/billy"
+	"github.com/holiman/uint256"
+	"github.com/luxfi/crypto/kzg4844"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/consensus/misc/eip1559"
 	"github.com/luxfi/geth/consensus/misc/eip4844"
@@ -39,14 +42,11 @@ import (
 	"github.com/luxfi/geth/core/state"
 	"github.com/luxfi/geth/core/txpool"
 	"github.com/luxfi/geth/core/types"
-	"github.com/luxfi/crypto/kzg4844"
 	"github.com/luxfi/geth/event"
 	"github.com/luxfi/geth/log"
 	"github.com/luxfi/geth/metrics"
 	"github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/rlp"
-	"github.com/holiman/billy"
-	"github.com/holiman/uint256"
 )
 
 const (