Update math imports to use math/big subpackage

accounts/abi/abi_test.go

@@ -39,7 +39,7 @@ import (
 
 	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/stretchr/testify/assert"
 )
 

accounts/abi/pack.go

@@ -34,7 +34,7 @@ import (
 	"reflect"
 
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	math "github.com/luxfi/math/big"
 )
 
 // packBytesSlice packs the given bytes as [L, V] as the canonical representation

accounts/abi/topics.go

@@ -36,7 +36,7 @@ import (
 
 	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	math "github.com/luxfi/math/big"
 )
 
 // packTopic packs rule into the corresponding hash value for a log's topic

cmd/evm/internal/t8ntool/block.go

@@ -38,7 +38,7 @@ import (
 	"github.com/luxfi/crypto"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/rlp"
 	"github.com/urfave/cli/v2"

cmd/evm/internal/t8ntool/execution.go

@@ -37,7 +37,7 @@ import (
 	"github.com/luxfi/evm/core/state"
 	"github.com/luxfi/evm/params"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/consensus/misc/eip4844"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/tracing"

cmd/evm/internal/t8ntool/gen_header.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
 )
 

cmd/evm/internal/t8ntool/gen_stenv.go

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

core/bench_test.go

@@ -37,7 +37,7 @@ import (
 	"github.com/luxfi/evm/params"
 	"github.com/luxfi/evm/plugin/evm/customrawdb"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"

core/gen_genesis.go

@@ -10,7 +10,7 @@ import (
 	"github.com/luxfi/evm/params"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
 )
 

core/genesis.go

@@ -43,7 +43,7 @@ import (
 	"github.com/luxfi/evm/plugin/evm/upgrade/legacy"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"

core/state_transition.go

@@ -38,7 +38,7 @@ import (
 	"github.com/luxfi/evm/precompile/contracts/txallowlist"
 	"github.com/luxfi/evm/utils"
 	"github.com/luxfi/geth/common"
-	cmath "github.com/luxfi/math/math"
+	cmath "github.com/luxfi/math"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"

internal/ethapi/api.go

@@ -52,7 +52,7 @@ import (
 	"github.com/luxfi/geth/accounts/scwallet"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	commonmath "github.com/luxfi/math/math"
+	commonmath "github.com/luxfi/math"
 	"github.com/luxfi/geth/core/tracing"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"

internal/flags/flags.go

@@ -39,7 +39,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/urfave/cli/v2"
 )
 

params/extras/state_upgrade.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	ethparams "github.com/luxfi/geth/params"
 )
 

params/extras/state_upgrade_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/luxfi/evm/utils"
 	"github.com/luxfi/evm/utils/utilstest"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/stretchr/testify/require"
 )
 

plugin/evm/blockgascost/cost.go

@@ -8,7 +8,7 @@ import (
 	"math"
 
 	"github.com/luxfi/evm/commontype"
-	safemath "github.com/luxfi/math/math"
+	safemath "github.com/luxfi/math"
 )
 
 // BlockGasCost calculates the required block gas cost.

plugin/evm/customtypes/block_test.go

@@ -37,7 +37,7 @@ import (
 	"github.com/luxfi/evm/internal/blocktest"
 	"github.com/luxfi/evm/params"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/rlp"
 

plugin/evm/header/gas_limit.go

@@ -11,7 +11,7 @@ import (
 	"github.com/luxfi/evm/params/extras"
 	"github.com/luxfi/geth/core/types"
 	ethparams "github.com/luxfi/geth/params"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 )
 
 var (

plugin/evm/upgrade/feewindow/window.go

@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"math"
 
-	safemath "github.com/luxfi/math/math"
+	safemath "github.com/luxfi/math/safe"
 	"github.com/luxfi/utils/wrappers"
 )
 

precompile/contracts/feemanager/unpack_pack_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/luxfi/evm/commontype"
 	"github.com/luxfi/evm/precompile/contract"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/stretchr/testify/require"
 )
 

precompile/contracts/nativeminter/config.go

@@ -11,7 +11,7 @@ import (
 	"github.com/luxfi/evm/precompile/precompileconfig"
 	"github.com/luxfi/evm/utils"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 )
 
 var _ precompileconfig.Config = (*Config)(nil)

precompile/contracts/nativeminter/config_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/luxfi/evm/precompile/precompiletest"
 	"github.com/luxfi/evm/utils"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"go.uber.org/mock/gomock"
 )
 

precompile/contracts/nativeminter/contract_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/luxfi/evm/precompile/precompileconfig"
 	"github.com/luxfi/evm/precompile/precompiletest"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	ethtypes "github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"
 	"github.com/stretchr/testify/require"

precompile/contracts/warp/config.go

@@ -17,7 +17,7 @@ import (
 	"github.com/luxfi/evm/precompile/precompileconfig"
 	"github.com/luxfi/evm/predicate"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/ids"
 	"github.com/luxfi/log"
 	"github.com/luxfi/warp"

precompile/contracts/warp/contract.go

@@ -12,7 +12,7 @@ import (
 	"github.com/luxfi/evm/accounts/abi"
 	"github.com/luxfi/evm/precompile/contract"
 	"github.com/luxfi/geth/common"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
 	"github.com/luxfi/geth/core/vm"
 	"github.com/luxfi/warp"

precompile/contracts/warp/contract_warp_handler.go

@@ -10,7 +10,7 @@ import (
 	"github.com/luxfi/evm/precompile/contract"
 	"github.com/luxfi/evm/predicate"
 	"github.com/luxfi/geth/common"
-	commonmath "github.com/luxfi/math/math"
+	commonmath "github.com/luxfi/math"
 	"github.com/luxfi/geth/core/vm"
 	"github.com/luxfi/log"
 	"github.com/luxfi/math/set"

sync/statesync/trie_sync_stats.go

@@ -11,7 +11,7 @@ import (
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/metrics"
 	"github.com/luxfi/log"
-	luxmath "github.com/luxfi/math/math"
+	luxmath "github.com/luxfi/math"
 	"github.com/luxfi/timer"
 )
 

tests/gen_stenv.go

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

tests/gen_sttransaction.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/core/types"
 )
 

tests/state_test_util.go

@@ -45,7 +45,7 @@ import (
 	"github.com/luxfi/evm/plugin/evm/customrawdb"
 	"github.com/luxfi/geth/common"
 	"github.com/luxfi/geth/common/hexutil"
-	"github.com/luxfi/math/math"
+	"github.com/luxfi/math"
 	"github.com/luxfi/geth/consensus/misc/eip4844"
 	"github.com/luxfi/geth/core/rawdb"
 	"github.com/luxfi/geth/core/tracing"