fix: correct double v2 in imports

accounts/abi/bind/auth.go

@@ -35,7 +35,7 @@ import (
 	"github.com/luxfi/geth/accounts"
 	"github.com/luxfi/geth/accounts/external"
 	"github.com/luxfi/geth/accounts/keystore"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 	ethtypes "github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/crypto"

accounts/abi/bind/backend.go

@@ -31,8 +31,8 @@ import (
 	"errors"
 	"math/big"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	ethereum "github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/core/types"
+	ethereum "github.com/luxfi/evm/v2/iface"
 )
 
 var (

accounts/abi/bind/backends/simulated.go

@@ -31,10 +31,10 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
+	"github.com/luxfi/evm/v2/accounts/abi/bind"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/iface"
 )
 
 // SimulatedBackend is a simulated blockchain.

accounts/abi/bind/base.go

@@ -35,13 +35,13 @@ import (
 	"sync"
 	"reflect"
 	"unsafe"
-	"github.com/luxfi/evm/v2/v2/accounts/abi"
+	"github.com/luxfi/evm/v2/accounts/abi"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/crypto"
 	"github.com/luxfi/geth/event"
-	ethereum "github.com/luxfi/evm/v2/v2/iface"
-	"github.com/luxfi/evm/v2/v2/rpc"
+	ethereum "github.com/luxfi/evm/v2/iface"
+	"github.com/luxfi/evm/v2/rpc"
 )
 
 const basefeeWiggleMultiplier = 2

accounts/abi/bind/base_test.go

@@ -33,10 +33,10 @@ import (
 	"reflect"
 	"strings"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/accounts/abi"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	ethereum "github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/accounts/abi"
+	"github.com/luxfi/evm/v2/accounts/abi/bind"
+	"github.com/luxfi/evm/v2/core/types"
+	ethereum "github.com/luxfi/evm/v2/iface"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
 	"github.com/luxfi/geth/crypto"

accounts/abi/bind/bind.go

@@ -38,7 +38,7 @@ import (
 	"strings"
 	"text/template"
 	"unicode"
-	"github.com/luxfi/evm/v2/v2/accounts/abi"
+	"github.com/luxfi/evm/v2/accounts/abi"
 	"github.com/luxfi/log"
 )
 

accounts/abi/bind/bind_extra.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/luxfi/evm/v2/v2/accounts/abi"
+	"github.com/luxfi/evm/v2/accounts/abi"
 )
 
 type (

accounts/abi/bind/bind_test.go

@@ -296,9 +296,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -352,9 +352,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -398,9 +398,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -455,10 +455,10 @@ var bindTests = []struct {
 			"math/big"
 			"reflect"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
 			"github.com/luxfi/geth/common"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -504,9 +504,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -571,9 +571,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -616,10 +616,10 @@ var bindTests = []struct {
 		[]string{`6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`},
 		[]string{`[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`},
 		`
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
 			"github.com/luxfi/geth/common"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/core"
 		`,
 		`
 			// Create a simulator and wrap a non-deployed contract
@@ -655,10 +655,10 @@ var bindTests = []struct {
 		[]string{`6080604052348015600f57600080fd5b5060888061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063d5f6622514602d575b600080fd5b6033604c565b6040805192835260208301919091528051918290030190f35b600a809156fea264697066735822beefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeef64736f6c6343decafe0033`},
 		[]string{`[{"inputs":[],"name":"Struct","outputs":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"uint256","name":"b","type":"uint256"}],"stateMutability":"pure","type":"function"}]`},
 		`
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
 			"github.com/luxfi/geth/common"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/core"
 		`,
 		`
 			// Create a simulator and wrap a non-deployed contract
@@ -703,9 +703,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -752,10 +752,10 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
 			"github.com/luxfi/geth/common"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -828,9 +828,9 @@ var bindTests = []struct {
 			"fmt"
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -921,10 +921,10 @@ var bindTests = []struct {
 			"math/big"
 			"time"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
 			"github.com/luxfi/geth/common"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -1112,9 +1112,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -1247,9 +1247,9 @@ var bindTests = []struct {
 			"math/big"
 			"reflect"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 
@@ -1389,9 +1389,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -1455,11 +1455,11 @@ var bindTests = []struct {
 		"math/big"
 		"time"
 
-		"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-		"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-		"github.com/luxfi/evm/v2/v2/core"
+		"github.com/luxfi/evm/v2/accounts/abi/bind"
+		"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+		"github.com/luxfi/evm/v2/core"
 		"github.com/luxfi/geth/crypto"
-		"github.com/luxfi/evm/v2/v2/params"
+		"github.com/luxfi/evm/v2/params"
 		`,
 		`
 		// Initialize test accounts
@@ -1565,10 +1565,10 @@ var bindTests = []struct {
 		`
 		"math/big"
 
-		"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-		"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
+		"github.com/luxfi/evm/v2/accounts/abi/bind"
+		"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
 		"github.com/luxfi/geth/crypto"
-		"github.com/luxfi/evm/v2/v2/core"
+		"github.com/luxfi/evm/v2/core"
 		`,
 		`
 		// Initialize test accounts
@@ -1628,10 +1628,10 @@ var bindTests = []struct {
 		`
 		"math/big"
 
-		"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-		"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
+		"github.com/luxfi/evm/v2/accounts/abi/bind"
+		"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
 		"github.com/luxfi/geth/crypto"
-		"github.com/luxfi/evm/v2/v2/core"
+		"github.com/luxfi/evm/v2/core"
         `,
 		`
 		key, _ := crypto.GenerateKey()
@@ -1690,9 +1690,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		`
@@ -1751,9 +1751,9 @@ var bindTests = []struct {
 			"bytes"
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 	   `,
 		`
@@ -1839,9 +1839,9 @@ var bindTests = []struct {
 		`
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 	   `,
 		`
@@ -1908,9 +1908,9 @@ var bindTests = []struct {
 		`
 				"math/big"
 
-				"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-				"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-				"github.com/luxfi/evm/v2/v2/core"
+				"github.com/luxfi/evm/v2/accounts/abi/bind"
+				"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+				"github.com/luxfi/evm/v2/core"
 				"github.com/luxfi/geth/crypto"
 		   `,
 		`
@@ -1960,9 +1960,9 @@ var bindTests = []struct {
 			"context"
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		tester: `
@@ -2008,9 +2008,9 @@ var bindTests = []struct {
 			"context"
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		tester: `
@@ -2049,9 +2049,9 @@ var bindTests = []struct {
 			"context"
 			"math/big"
 
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-			"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-			"github.com/luxfi/evm/v2/v2/core"
+			"github.com/luxfi/evm/v2/accounts/abi/bind"
+			"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+			"github.com/luxfi/evm/v2/core"
 			"github.com/luxfi/geth/crypto"
 		`,
 		tester: `

accounts/abi/bind/precompilebind/precompile_bind.go

@@ -35,9 +35,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/luxfi/evm/v2/v2/accounts/abi"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-	"github.com/luxfi/evm/v2/v2/precompile/allowlist"
+	"github.com/luxfi/evm/v2/accounts/abi"
+	"github.com/luxfi/evm/v2/accounts/abi/bind"
+	"github.com/luxfi/evm/v2/precompile/allowlist"
 )
 
 var errNoAnonymousEvent = errors.New("event type must not be anonymous")

accounts/abi/bind/precompilebind/precompile_bind_test.go

@@ -34,7 +34,7 @@ import (
 	"runtime"
 	"strings"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
+	"github.com/luxfi/evm/v2/accounts/abi/bind"
 	"github.com/luxfi/geth/common"
 	"github.com/stretchr/testify/require"
 )
@@ -451,8 +451,8 @@ var bindTests = []struct {
 		`"github.com/stretchr/testify/require"
 		 "math/big"
 		 "github.com/luxfi/geth/common"
-		 "github.com/luxfi/evm/v2/v2/core/state"
-		 "github.com/luxfi/evm/v2/v2/precompile/allowlist"
+		 "github.com/luxfi/evm/v2/core/state"
+		 "github.com/luxfi/evm/v2/precompile/allowlist"
 		`,
 		`
 			testGreeting := "test"
@@ -516,7 +516,7 @@ var bindTests = []struct {
 		`[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"addressTest","type":"address"},{"indexed":true,"internalType":"uint8","name":"intTest","type":"uint8"},{"indexed":false,"internalType":"bytes","name":"bytesTest","type":"bytes"}],"name":"test","type":"event"},{"inputs":[],"name":"eventTest","outputs":[{"internalType":"string","name":"result","type":"string"}],"stateMutability":"view","type":"function"},{"type":"event","name":"empty","inputs":[]},{"type":"event","name":"indexed","inputs":[{"name":"addr","type":"address","indexed":true},{"name":"num","type":"int8","indexed":true}]},{"type":"event","name":"mixed","inputs":[{"name":"addr","type":"address","indexed":true},{"name":"num","type":"int8"}]},{"type":"event","name":"dynamic","inputs":[{"name":"idxStr","type":"string","indexed":true},{"name":"idxDat","type":"bytes","indexed":true},{"name":"str","type":"string"},{"name":"dat","type":"bytes"}]},{"type":"event","name":"unnamed","inputs":[{"name":"","type":"uint8","indexed":true},{"name":"","type":"uint8","indexed":true}]}]`,
 		`"github.com/stretchr/testify/require"
 		"github.com/luxfi/geth/common"
-		"github.com/luxfi/evm/v2/v2/precompile/contract"
+		"github.com/luxfi/evm/v2/precompile/contract"
 		`,
 		`
 			testAddr := common.Address{1}

accounts/abi/bind/precompilebind/precompile_config_template.go

@@ -11,9 +11,9 @@ const tmplSourcePrecompileConfigGo = `
 package {{.Package}}
 
 import (
-	"github.com/luxfi/evm/v2/v2/precompile/precompileconfig"
+	"github.com/luxfi/evm/v2/precompile/precompileconfig"
 	{{- if .Contract.AllowList}}
-	"github.com/luxfi/evm/v2/v2/precompile/allowlist"
+	"github.com/luxfi/evm/v2/precompile/allowlist"
 
 	"github.com/luxfi/geth/common"
 	{{- end}}

accounts/abi/bind/precompilebind/precompile_config_test_template.go

@@ -13,11 +13,11 @@ package {{.Package}}
 import (
 	"testing"
 
-	"github.com/luxfi/evm/v2/v2/precompile/precompileconfig"
-	"github.com/luxfi/evm/v2/v2/precompile/testutils"
-	"github.com/luxfi/evm/v2/v2/utils"
+	"github.com/luxfi/evm/v2/precompile/precompileconfig"
+	"github.com/luxfi/evm/v2/precompile/testutils"
+	"github.com/luxfi/evm/v2/utils"
 	{{- if .Contract.AllowList}}
-	"github.com/luxfi/evm/v2/v2/precompile/allowlist"
+	"github.com/luxfi/evm/v2/precompile/allowlist"
 
 	"github.com/luxfi/geth/common"
 	{{- end}}

accounts/abi/bind/precompilebind/precompile_contract_template.go

@@ -2,7 +2,7 @@
 // See the file LICENSE for licensing terms.
 package precompilebind
 
-import "github.com/luxfi/evm/v2/v2/accounts/abi/bind"
+import "github.com/luxfi/evm/v2/accounts/abi/bind"
 
 // tmplPrecompileData is the data structure required to fill the binding template.
 type tmplPrecompileData struct {
@@ -31,15 +31,15 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/accounts/abi"
+	"github.com/luxfi/evm/v2/accounts/abi"
 	{{- if .Contract.AllowList}}
-	"github.com/luxfi/evm/v2/v2/precompile/allowlist"
+	"github.com/luxfi/evm/v2/precompile/allowlist"
 	{{- end}}
-	"github.com/luxfi/evm/v2/v2/precompile/contract"
-	"github.com/luxfi/evm/v2/v2/vmerrs"
+	"github.com/luxfi/evm/v2/precompile/contract"
+	"github.com/luxfi/evm/v2/vmerrs"
 	_ "embed"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/vm"
+	"github.com/luxfi/evm/v2/core/vm"
 )
 {{$contract := .Contract}}
 const (

accounts/abi/bind/precompilebind/precompile_contract_test_template.go

@@ -13,12 +13,12 @@ package {{.Package}}
 import (
 	"testing"
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/core/state"
+	"github.com/luxfi/evm/v2/core/state"
 	{{- if .Contract.AllowList}}
-	"github.com/luxfi/evm/v2/v2/precompile/allowlist"
+	"github.com/luxfi/evm/v2/precompile/allowlist"
 	{{- end}}
-	"github.com/luxfi/evm/v2/v2/precompile/testutils"
-	"github.com/luxfi/evm/v2/v2/vmerrs"
+	"github.com/luxfi/evm/v2/precompile/testutils"
+	"github.com/luxfi/evm/v2/vmerrs"
 	"github.com/luxfi/geth/common"
 	"github.com/stretchr/testify/require"
 )

accounts/abi/bind/precompilebind/precompile_event_template.go

@@ -11,7 +11,7 @@ package {{.Package}}
 
 import (
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/precompile/contract"
+	"github.com/luxfi/evm/v2/precompile/contract"
 	"github.com/luxfi/geth/common"
 )
 

accounts/abi/bind/precompilebind/precompile_module_template.go

@@ -13,9 +13,9 @@ package {{.Package}}
 import (
 	"fmt"
 
-	"github.com/luxfi/evm/v2/v2/precompile/precompileconfig"
-	"github.com/luxfi/evm/v2/v2/precompile/contract"
-	"github.com/luxfi/evm/v2/v2/precompile/modules"
+	"github.com/luxfi/evm/v2/precompile/precompileconfig"
+	"github.com/luxfi/evm/v2/precompile/contract"
+	"github.com/luxfi/evm/v2/precompile/modules"
 
 	"github.com/luxfi/geth/common"
 )

accounts/abi/bind/template.go

@@ -26,7 +26,7 @@
 
 package bind
 
-import "github.com/luxfi/evm/v2/v2/accounts/abi"
+import "github.com/luxfi/evm/v2/accounts/abi"
 
 // tmplData is the data structure required to fill the binding template.
 type tmplData struct {
@@ -100,10 +100,10 @@ import (
 	"math/big"
 	"strings"
 	"errors"
-	"github.com/luxfi/evm/v2/v2/accounts/abi"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/accounts/abi"
+	"github.com/luxfi/evm/v2/accounts/abi/bind"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/iface"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/event"
 )

accounts/abi/bind/util.go

@@ -31,8 +31,8 @@ import (
 	"errors"
 	"time"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	ethereum "github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/core/types"
+	ethereum "github.com/luxfi/evm/v2/iface"
 	"github.com/luxfi/log"
 )
 

accounts/abi/bind/util_test.go

@@ -34,10 +34,10 @@ import (
 	"math/big"
 	"testing"
 	"time"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind/backends"
-	"github.com/luxfi/evm/v2/v2/core"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/accounts/abi/bind"
+	"github.com/luxfi/evm/v2/accounts/abi/bind/backends"
+	"github.com/luxfi/evm/v2/core"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/crypto"
 )

cmd/abigen/main.go

@@ -33,9 +33,9 @@ import (
 	"os"
 	"regexp"
 	"strings"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-	"github.com/luxfi/evm/v2/v2/internal/flags"
-	"github.com/luxfi/evm/v2/v2/cmd/utils"
+	"github.com/luxfi/evm/v2/accounts/abi/bind"
+	"github.com/luxfi/evm/v2/internal/flags"
+	"github.com/luxfi/evm/v2/cmd/utils"
 	"github.com/luxfi/geth/common/compiler"
 	"github.com/luxfi/geth/crypto"
 	"github.com/luxfi/log"

cmd/precompilegen/main.go

@@ -33,10 +33,10 @@ import (
 	"path/filepath"
 	"strings"
 	_ "embed"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind"
-	"github.com/luxfi/evm/v2/v2/accounts/abi/bind/precompilebind"
-	"github.com/luxfi/evm/v2/v2/internal/flags"
-	"github.com/luxfi/evm/v2/v2/cmd/utils"
+	"github.com/luxfi/evm/v2/accounts/abi/bind"
+	"github.com/luxfi/evm/v2/accounts/abi/bind/precompilebind"
+	"github.com/luxfi/evm/v2/internal/flags"
+	"github.com/luxfi/evm/v2/cmd/utils"
 	"github.com/luxfi/log"
 	"github.com/urfave/cli/v2"
 )

cmd/simulator/load/funder.go

@@ -8,12 +8,12 @@ import (
 	"crypto/ecdsa"
 	"fmt"
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/key"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/metrics"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/txs"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/ethclient"
-	ethparams "github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/cmd/simulator/key"
+	"github.com/luxfi/evm/v2/cmd/simulator/metrics"
+	"github.com/luxfi/evm/v2/cmd/simulator/txs"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/ethclient"
+	ethparams "github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/log"
 )

cmd/simulator/load/loader.go

@@ -13,17 +13,17 @@ import (
 	"strconv"
 	"syscall"
 	"time"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/config"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/key"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/metrics"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/txs"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/ethclient"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/cmd/simulator/config"
+	"github.com/luxfi/evm/v2/cmd/simulator/key"
+	"github.com/luxfi/evm/v2/cmd/simulator/metrics"
+	"github.com/luxfi/evm/v2/cmd/simulator/txs"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/ethclient"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	ethcrypto "github.com/luxfi/geth/crypto"
 	"github.com/luxfi/log"
-	ethparams "github.com/luxfi/evm/v2/v2/params"
+	ethparams "github.com/luxfi/evm/v2/params"
 	"golang.org/x/sync/errgroup"
 )
 

cmd/simulator/load/worker.go

@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"time"
 	"unsafe"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/ethclient"
-	ethereum "github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/ethclient"
+	ethereum "github.com/luxfi/evm/v2/iface"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/log"
 )

cmd/simulator/main/main.go

@@ -8,8 +8,8 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/config"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/load"
+	"github.com/luxfi/evm/v2/cmd/simulator/config"
+	"github.com/luxfi/evm/v2/cmd/simulator/load"
 	"github.com/luxfi/log"
 	"github.com/spf13/pflag"
 )

cmd/simulator/txs/agent.go

@@ -8,7 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"time"
-	"github.com/luxfi/evm/v2/v2/cmd/simulator/metrics"
+	"github.com/luxfi/evm/v2/cmd/simulator/metrics"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/log"
 )

cmd/simulator/txs/tx_generator.go

@@ -7,8 +7,8 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"fmt"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/ethclient"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/ethclient"
 	ethcrypto "github.com/luxfi/geth/crypto"
 )
 

commontype/chain_context.go

@@ -4,8 +4,8 @@
 package commontype
 
 import (
-	"github.com/luxfi/evm/v2/v2/ids"
-	"github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/ids"
+	"github.com/luxfi/evm/v2/iface"
 )
 
 // ChainContext provides Lux-specific blockchain context

consensus/consensus.go

@@ -7,7 +7,7 @@ package consensus
 import (
 	"math/big"
 
-	"github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/iface"
 	"github.com/luxfi/ids"
 )
 

consensus/dummy/consensus.go

@@ -9,17 +9,17 @@ import (
 	"math/big"
 	"time"
 	
-	"github.com/luxfi/evm/v2/v2/commontype"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/iface"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/params/extras"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/customtypes"
-	customheader "github.com/luxfi/evm/v2/v2/plugin/evm/header"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/vmerrors"
-	"github.com/luxfi/evm/v2/v2/trie"
-	"github.com/luxfi/evm/v2/v2/utils"
+	"github.com/luxfi/evm/v2/commontype"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/iface"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/params/extras"
+	"github.com/luxfi/evm/v2/plugin/evm/customtypes"
+	customheader "github.com/luxfi/evm/v2/plugin/evm/header"
+	"github.com/luxfi/evm/v2/plugin/evm/vmerrors"
+	"github.com/luxfi/evm/v2/trie"
+	"github.com/luxfi/evm/v2/utils"
 	"github.com/luxfi/geth/common"
 )
 

consensus/dummy/consensus_test.go

@@ -7,9 +7,9 @@ import (
    "math"
    "math/big"
    "testing"
-   "github.com/luxfi/evm/v2/v2/commontype"
-   "github.com/luxfi/evm/v2/v2/core/types"
-   header "github.com/luxfi/evm/v2/v2/plugin/evm/header"
+   "github.com/luxfi/evm/v2/commontype"
+   "github.com/luxfi/evm/v2/core/types"
+   header "github.com/luxfi/evm/v2/plugin/evm/header"
    "github.com/luxfi/geth/common"
 )
 

consensus/misc/eip4844/eip4844.go

@@ -19,7 +19,7 @@ package eip4844
 import (
 	"math/big"
 
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 )
 
 // CalcExcessBlobGas calculates the excess blob gas after the change.

consensus/misc/eip4844/eip4844_test.go

@@ -21,7 +21,7 @@ import (
 	"math/big"
 	"testing"
 	
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 )
 
 func TestCalcExcessBlobGas(t *testing.T) {

consensus/validators/validatorsmock.go

@@ -8,7 +8,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/iface"
 	gomock "go.uber.org/mock/gomock"
 )
 

core/bench_test.go

@@ -30,13 +30,13 @@ import (
 	"crypto/ecdsa"
 	"math/big"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	customrawdb "github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	customrawdb "github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
 	"github.com/luxfi/geth/ethdb"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 	ethparams "github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/math"

core/block_validator.go

@@ -29,10 +29,10 @@ package core
 import (
 	"errors"
 	"fmt"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/params"
 	ethparams "github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/trie"
 )

core/blockchain.go

@@ -38,21 +38,21 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"github.com/luxfi/evm/v2/v2/commontype"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/consensus/misc/eip4844"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/customtypes"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/customrawdb"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/customlogs"
-	"github.com/luxfi/evm/v2/v2/core/state/snapshot"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
+	"github.com/luxfi/evm/v2/commontype"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/consensus/misc/eip4844"
+	"github.com/luxfi/evm/v2/plugin/evm/customtypes"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/plugin/evm/customrawdb"
+	"github.com/luxfi/evm/v2/plugin/evm/customlogs"
+	"github.com/luxfi/evm/v2/core/state/snapshot"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
 	"github.com/luxfi/geth/ethdb"
-	"github.com/luxfi/evm/v2/v2/internal/version"
+	"github.com/luxfi/evm/v2/internal/version"
 	"github.com/luxfi/geth/metrics"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/hashdb"

core/blockchain_ext_test.go

@@ -8,12 +8,12 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/upgrade/ap4"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/upgrade/ap4"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/crypto"
 	"github.com/luxfi/geth/ethdb"

core/blockchain_iterator.go

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

core/blockchain_log_test.go

@@ -7,12 +7,12 @@ import (
 	"math/big"
 	"strings"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/accounts/abi"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/accounts/abi"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/crypto"
 	"github.com/stretchr/testify/require"

core/blockchain_reader.go

@@ -28,18 +28,18 @@ package core
 
 import (
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/commontype"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/constants"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/core/state/snapshot"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
-	"github.com/luxfi/evm/v2/v2/iface"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/precompile/contracts/feemanager"
-	"github.com/luxfi/evm/v2/v2/precompile/contracts/rewardmanager"
+	"github.com/luxfi/evm/v2/commontype"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/constants"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/core/state/snapshot"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
+	"github.com/luxfi/evm/v2/iface"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/precompile/contracts/feemanager"
+	"github.com/luxfi/evm/v2/precompile/contracts/rewardmanager"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/event"

core/blockchain_repair_test.go

@@ -33,11 +33,11 @@ package core
 import (
 	"math/big"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/crypto"
 	"github.com/luxfi/geth/triedb"

core/blockchain_sethead_test.go

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

core/blockchain_snapshot_test.go

@@ -37,13 +37,13 @@ import (
 	"path"
 	"strings"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
 	"github.com/luxfi/geth/ethdb"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 )
 

core/blockchain_test.go

@@ -7,15 +7,15 @@ import (
 	"fmt"
 	"math/big"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/core/state/pruner"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/params/extras"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/customrawdb"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/core/state/pruner"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/params/extras"
+	"github.com/luxfi/evm/v2/plugin/evm/customrawdb"
 	"github.com/luxfi/node/upgrade"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/common"

core/bloom_indexer.go

@@ -19,8 +19,8 @@ package core
 import (
 	"context"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/bloombits"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/bloombits"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/common"
 )

core/bloombits/generator.go

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

core/bloombits/generator_test.go

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

core/chain_adapter.go

@@ -6,8 +6,8 @@ package core
 import (
 	"math/big"
 
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/iface"
 	"github.com/luxfi/geth/common"
 )
 

core/chain_indexer.go

@@ -34,8 +34,8 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/event"

core/chain_indexer_test.go

@@ -34,8 +34,8 @@ import (
 	"math/rand"
 	"testing"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/common"
 )
 

core/chain_makers.go

@@ -29,22 +29,22 @@ package core
 import (
 	"fmt"
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/commontype"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/constants"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
-	"github.com/luxfi/evm/v2/v2/iface"
+	"github.com/luxfi/evm/v2/commontype"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/constants"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
+	"github.com/luxfi/evm/v2/iface"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/holiman/uint256"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 	ethparams "github.com/luxfi/geth/params"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/consensus/misc/eip4844"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/header"
+	"github.com/luxfi/evm/v2/consensus/misc/eip4844"
+	"github.com/luxfi/evm/v2/plugin/evm/header"
 )
 
 // BlockGen creates blocks for testing.

core/chain_makers_test.go

@@ -29,11 +29,11 @@ package core
 import (
 	"fmt"
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/crypto"
 	"github.com/luxfi/geth/triedb"

core/error.go

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

core/events.go

@@ -27,7 +27,7 @@
 package core
 
 import (
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/common"
 )
 

core/evm.go

@@ -29,12 +29,12 @@ package core
 import (
 	"bytes"
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/consensus/misc/eip4844"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
-	customheader "github.com/luxfi/evm/v2/v2/plugin/evm/header"
-	"github.com/luxfi/evm/v2/v2/predicate"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/consensus/misc/eip4844"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
+	customheader "github.com/luxfi/evm/v2/plugin/evm/header"
+	"github.com/luxfi/evm/v2/predicate"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/log"

core/extstate/statedb.go

@@ -6,12 +6,12 @@ package extstate
 import (
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/tracing"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
 	ethparams "github.com/luxfi/geth/params"
 	ethtypes "github.com/luxfi/geth/core/types"
 	"github.com/holiman/uint256"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 )
 
 type VmStateDB interface {

core/extstate/testhelpers/statedb_adapter.go

@@ -8,9 +8,9 @@ import (
 	
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/core/tracing"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/holiman/uint256"
-	"github.com/luxfi/evm/v2/v2/core/state"
+	"github.com/luxfi/evm/v2/core/state"
 )
 
 // StateDBAdapter wraps a state.StateDB to implement the simpler AddBalance interface

core/extstate/testhelpers/test_statedb.go

@@ -6,10 +6,10 @@ import (
 	"testing"
 
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/extstate"
-	"github.com/luxfi/evm/v2/v2/precompile/contract"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/extstate"
+	"github.com/luxfi/evm/v2/precompile/contract"
 	"github.com/stretchr/testify/require"
 )
 

core/gen_genesis.go

@@ -6,11 +6,11 @@ import (
 	"encoding/json"
 	"errors"
 	"math/big"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
 	"github.com/luxfi/geth/common/math"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 )
 
 var _ = (*genesisSpecMarshaling)(nil)

core/genesis.go

@@ -32,13 +32,13 @@ import (
 	"fmt"
 	"math/big"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/customrawdb"
-	"github.com/luxfi/evm/v2/v2/upgrade/legacy"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/plugin/evm/customrawdb"
+	"github.com/luxfi/evm/v2/upgrade/legacy"
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/common"

core/genesis_extra_test.go

@@ -9,13 +9,13 @@ import (
 	"time"
 
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/triedb"
-	"github.com/luxfi/evm/v2/v2/commontype"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/params/extras"
-	"github.com/luxfi/evm/v2/v2/utils"
+	"github.com/luxfi/evm/v2/commontype"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/params/extras"
+	"github.com/luxfi/evm/v2/utils"
 	ethparams "github.com/luxfi/geth/params"
 	"github.com/stretchr/testify/require"
 )

core/genesis_test.go

@@ -32,21 +32,21 @@ import (
 	"math/big"
 	"reflect"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/state"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/state"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/ethdb"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/params/extras"
-	"github.com/luxfi/evm/v2/v2/precompile/allowlist"
-	"github.com/luxfi/evm/v2/v2/precompile/contracts/deployerallowlist"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/params/extras"
+	"github.com/luxfi/evm/v2/precompile/allowlist"
+	"github.com/luxfi/evm/v2/precompile/contracts/deployerallowlist"
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/triedb/pathdb"
-	"github.com/luxfi/evm/v2/v2/utils"
+	"github.com/luxfi/evm/v2/utils"
 	ethparams "github.com/luxfi/geth/params"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/stretchr/testify/assert"

core/headerchain.go

@@ -32,11 +32,11 @@ import (
 	"math/big"
 	mrand "math/rand"
 	"sync/atomic"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/lru"
 )

core/headerchain_test.go

@@ -31,12 +31,12 @@ import (
 	"fmt"
 	"math/big"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/consensus"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/core/vm"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/consensus"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/core/vm"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 )
 

core/headerutil/extra.go

@@ -5,7 +5,7 @@
 package headerutil
 
 import (
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 )
 
 // WindowSize is the size of the rolling window

core/main_test.go

@@ -13,8 +13,8 @@ import (
 func TestMain(m *testing.M) {
 	opts := []goleak.Option{
 		// No good way to shut down these goroutines:
-		goleak.IgnoreTopFunction("github.com/luxfi/evm/v2/v2/core/state/snapshot.(*diskLayer).generate"),
-		goleak.IgnoreTopFunction("github.com/luxfi/evm/v2/v2/metrics.(*meterArbiter).tick"),
+		goleak.IgnoreTopFunction("github.com/luxfi/evm/v2/core/state/snapshot.(*diskLayer).generate"),
+		goleak.IgnoreTopFunction("github.com/luxfi/evm/v2/metrics.(*meterArbiter).tick"),
 		goleak.IgnoreTopFunction("github.com/syndtr/goleveldb/leveldb.(*DB).mpoolDrain"),
 	}
 	goleak.VerifyTestMain(m, opts...)

core/mkalloc.go

@@ -41,7 +41,7 @@ import (
 	"math/big"
 	"os"
 	"strconv"
-	"github.com/luxfi/evm/v2/v2/core"
+	"github.com/luxfi/evm/v2/core"
 	"github.com/luxfi/geth/rlp"
 )
 

core/predicate_check.go

@@ -6,11 +6,11 @@ package core
 import (
 	"errors"
 	"fmt"
-	"github.com/luxfi/evm/v2/v2/utils/bitset"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/precompile/precompileconfig"
-	"github.com/luxfi/evm/v2/v2/predicate"
+	"github.com/luxfi/evm/v2/utils/bitset"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/precompile/precompileconfig"
+	"github.com/luxfi/evm/v2/predicate"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/log"
 )

core/predicate_check_test.go

@@ -6,10 +6,10 @@ package core
 import (
 	"errors"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/commontype"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/params"
-	"github.com/luxfi/evm/v2/v2/precompile/precompileconfig"
+	"github.com/luxfi/evm/v2/commontype"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/params"
+	"github.com/luxfi/evm/v2/precompile/precompileconfig"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/node/utils/set"
 	"github.com/stretchr/testify/require"

core/rawdb/accessors_chain.go

@@ -32,9 +32,9 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/luxfi/evm/v2/v2/consensus/misc/eip4844"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/consensus/misc/eip4844"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/log"

core/rawdb/accessors_chain_test.go

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

core/rawdb/accessors_indexes.go

@@ -30,8 +30,8 @@ import (
 	"bytes"
 	"math/big"
 
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/log"

core/rawdb/accessors_indexes_test.go

@@ -21,7 +21,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/rlp"

core/rawdb/accessors_metadata.go

@@ -30,7 +30,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/log"

core/rawdb/chain_iterator.go

@@ -31,7 +31,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/prque"
 	"github.com/luxfi/geth/ethdb"

core/rawdb/chain_iterator_test.go

@@ -33,7 +33,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/common"
 )
 

core/rlp_test.go

@@ -30,9 +30,9 @@ import (
 	"fmt"
 	"math/big"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/consensus/dummy"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/params"
+	"github.com/luxfi/evm/v2/consensus/dummy"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/crypto"
 	"github.com/luxfi/geth/rlp"

core/sender_cacher.go

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

core/state/pruner/bloom.go

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

core/state/pruner/pruner.go

@@ -36,11 +36,11 @@ import (
 	"path/filepath"
 	"strings"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/rawdb"
 	"github.com/luxfi/geth/triedb"
-	"github.com/luxfi/evm/v2/v2/core/state/snapshot"
-	"github.com/luxfi/evm/v2/v2/plugin/evm/customrawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/state/snapshot"
+	"github.com/luxfi/evm/v2/plugin/evm/customrawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/common"

core/state/snapshot/conversion.go

@@ -34,8 +34,8 @@ import (
 	"runtime"
 	"sync"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/common"

core/state/snapshot/difflayer.go

@@ -37,7 +37,7 @@ import (
 
 	bloomfilter "github.com/holiman/bloomfilter/v2"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/rlp"
 	"slices"
 )

core/state/snapshot/difflayer_test.go

@@ -31,8 +31,8 @@ import (
 	crand "crypto/rand"
 	"math/rand"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/utils"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/utils"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/crypto"
 )

core/state/snapshot/disklayer.go

@@ -28,9 +28,9 @@ package snapshot
 
 import (
 	"bytes"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
-	"github.com/luxfi/evm/v2/v2/utils"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
+	"github.com/luxfi/evm/v2/utils"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/rlp"

core/state/snapshot/disklayer_test.go

@@ -29,7 +29,7 @@ package snapshot
 import (
 	"bytes"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/rawdb"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/rlp"
 )

core/state/snapshot/generate.go

@@ -30,12 +30,12 @@ import (
 	"bytes"
 	"fmt"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/trie"
 	"github.com/luxfi/geth/triedb"
-	"github.com/luxfi/evm/v2/v2/utils"
+	"github.com/luxfi/evm/v2/utils"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/log"
 	"github.com/luxfi/geth/rlp"

core/state/snapshot/generate_test.go

@@ -28,8 +28,8 @@ package snapshot
 
 import (
 	"fmt"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/trie/trienode"
 	"github.com/luxfi/geth/triedb/hashdb"
 	"github.com/luxfi/geth/triedb/pathdb"

core/state/snapshot/iterator.go

@@ -31,7 +31,7 @@ import (
 	"fmt"
 	"sort"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/rawdb"
 	"github.com/luxfi/geth/ethdb"
 )
 

core/state/snapshot/iterator_test.go

@@ -33,7 +33,7 @@ import (
 	"fmt"
 	"math/rand"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/rawdb"
 	"github.com/luxfi/geth/common"
 )
 

core/state/snapshot/journal.go

@@ -31,7 +31,7 @@ import (
 	"errors"
 	"fmt"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/rawdb"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/triedb"
 	"github.com/luxfi/geth/common"

core/state/snapshot/snapshot.go

@@ -33,8 +33,8 @@ import (
 	"fmt"
 	"sync"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/metrics"
 	"github.com/luxfi/geth/triedb"

core/state/snapshot/snapshot_ext.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/ethdb"
-	"github.com/luxfi/evm/v2/v2/utils"
+	"github.com/luxfi/evm/v2/utils"
 )
 
 func (t *Tree) DiskAccountIterator(seek common.Hash) AccountIterator {

core/state/snapshot/snapshot_test.go

@@ -32,8 +32,8 @@ import (
 	"math/rand"
 	"testing"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/rlp"
 	"github.com/holiman/uint256"

core/state/snapshot/utils.go

@@ -30,7 +30,7 @@ import (
 	"bytes"
 	"fmt"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/rawdb"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/log"

core/state/snapshot/wipe.go

@@ -29,7 +29,7 @@ package snapshot
 import (
 	"bytes"
 	"time"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/rawdb"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/log"

core/state/snapshot/wipe_test.go

@@ -29,7 +29,7 @@ package snapshot
 import (
 	"math/rand"
 	"testing"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/rawdb"
 	"github.com/luxfi/geth/common"
 )
 

core/state/state_test.go

@@ -28,8 +28,8 @@ package state
 
 import (
 	"testing"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/common"
 )

core/state/statedb.go

@@ -34,7 +34,7 @@ import (
 	"github.com/luxfi/geth/core/state/snapshot"
 	gethtypes "github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/common"
-	evmtypes "github.com/luxfi/evm/v2/v2/core/types"
+	evmtypes "github.com/luxfi/evm/v2/core/types"
 )
 
 // StateDB wraps go-ethereum's StateDB with minimal extensions

core/state/trie_prefetcher_extra_test.go

@@ -13,12 +13,12 @@ import (
 	"testing"
 
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/evm/v2/v2/core/rawdb"
-	"github.com/luxfi/evm/v2/v2/core/types"
+	"github.com/luxfi/evm/v2/core/rawdb"
+	"github.com/luxfi/evm/v2/core/types"
 	"github.com/luxfi/geth/ethdb"
 	"github.com/luxfi/geth/metrics"
 	"github.com/luxfi/geth/triedb"
-	"github.com/luxfi/evm/v2/v2/core/state/snapshot"
+	"github.com/luxfi/evm/v2/core/state/snapshot"
 	"github.com/luxfi/geth/triedb/hashdb"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/stretchr/testify/require"