refactor: align PointerTo functions

graft/coreth/core/genesis_extra_test.go

@@ -35,8 +35,8 @@ import (
 	"github.com/ava-labs/avalanchego/graft/coreth/params"
 	"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
 	"github.com/ava-labs/avalanchego/graft/coreth/params/paramstest"
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
 	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
+	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
 	"github.com/ava-labs/libevm/core/types"
@@ -68,8 +68,8 @@ func TestGenesisEthUpgrades(t *testing.T) {
 		},
 		&extras.ChainConfig{
 			NetworkUpgrades: extras.NetworkUpgrades{
-				ApricotPhase1BlockTimestamp: utils.NewUint64(0),
-				ApricotPhase2BlockTimestamp: utils.NewUint64(0),
+				ApricotPhase1BlockTimestamp: utils.PointerTo[uint64](0),
+				ApricotPhase2BlockTimestamp: utils.PointerTo[uint64](0),
 			},
 		},
 	)

graft/coreth/core/genesis_test.go

@@ -42,7 +42,7 @@ import (
 	"github.com/ava-labs/avalanchego/graft/coreth/precompile/contracts/warp"
 	"github.com/ava-labs/avalanchego/graft/coreth/triedb/pathdb"
 	"github.com/ava-labs/avalanchego/graft/evm/firewood"
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
+	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
@@ -78,7 +78,7 @@ func TestSetupGenesis(t *testing.T) {
 
 func testSetupGenesis(t *testing.T, scheme string) {
 	apricotPhase1Config := params.Copy(params.TestApricotPhase1Config)
-	params.GetExtra(&apricotPhase1Config).ApricotPhase1BlockTimestamp = utils.NewUint64(100)
+	params.GetExtra(&apricotPhase1Config).ApricotPhase1BlockTimestamp = utils.PointerTo[uint64](100)
 	var (
 		customghash = common.HexToHash("0x1099a11e9e454bd3ef31d688cf21936671966407bc330f051d754b5ce401e7ed")
 		customg     = Genesis{
@@ -91,7 +91,7 @@ func testSetupGenesis(t *testing.T, scheme string) {
 	)
 
 	rollbackApricotPhase1Config := params.Copy(&apricotPhase1Config)
-	params.GetExtra(&rollbackApricotPhase1Config).ApricotPhase1BlockTimestamp = utils.NewUint64(90)
+	params.GetExtra(&rollbackApricotPhase1Config).ApricotPhase1BlockTimestamp = utils.PointerTo[uint64](90)
 	oldcustomg.Config = &rollbackApricotPhase1Config
 	tests := []struct {
 		name       string
@@ -237,7 +237,7 @@ func TestNetworkUpgradeBetweenHeadAndAcceptedBlock(t *testing.T) {
 	require.Greater(block.Time, bc.lastAccepted.Time())
 
 	activatedGenesis := customg
-	apricotPhase2Timestamp := utils.NewUint64(51)
+	apricotPhase2Timestamp := utils.PointerTo[uint64](51)
 	updatedApricotPhase2Config := params.Copy(params.TestApricotPhase1Config)
 	params.GetExtra(&updatedApricotPhase2Config).ApricotPhase2BlockTimestamp = apricotPhase2Timestamp
 
@@ -275,7 +275,7 @@ func TestGenesisWriteUpgradesRegression(t *testing.T) {
 
 	params.GetExtra(genesis.Config).UpgradeConfig.PrecompileUpgrades = []extras.PrecompileUpgrade{
 		{
-			Config: warp.NewConfig(utils.NewUint64(51), 0, false),
+			Config: warp.NewConfig(utils.PointerTo[uint64](51), 0, false),
 		},
 	}
 	_, _, err = SetupGenesisBlock(db, trieDB, genesis, genesisBlock.Hash(), false)

graft/coreth/core/state_processor_test.go

@@ -41,8 +41,8 @@ import (
 	"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap1"
 	"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap3"
 	"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/cortina"
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
 	"github.com/ava-labs/avalanchego/upgrade"
+	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/vms/evm/acp176"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/consensus/misc/eip4844"
@@ -283,8 +283,8 @@ func TestStateProcessorErrors(t *testing.T) {
 					},
 					&extras.ChainConfig{
 						NetworkUpgrades: extras.NetworkUpgrades{
-							ApricotPhase1BlockTimestamp: utils.NewUint64(0),
-							ApricotPhase2BlockTimestamp: utils.NewUint64(0),
+							ApricotPhase1BlockTimestamp: utils.PointerTo[uint64](0),
+							ApricotPhase2BlockTimestamp: utils.PointerTo[uint64](0),
 						},
 					},
 				),
@@ -391,7 +391,7 @@ func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Tr
 	}
 	if configExtra.IsGranite(header.Time) {
 		headerExtra := customtypes.GetHeaderExtra(header)
-		headerExtra.TimeMilliseconds = utils.NewUint64(timeMS)
+		headerExtra.TimeMilliseconds = utils.PointerTo(timeMS)
 	}
 	if configExtra.IsApricotPhase4(header.Time) {
 		headerExtra := customtypes.GetHeaderExtra(header)

graft/coreth/internal/ethapi/api_test.go

@@ -49,7 +49,7 @@ import (
 	"github.com/ava-labs/avalanchego/graft/coreth/params"
 	"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap3"
 	"github.com/ava-labs/avalanchego/graft/coreth/rpc"
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
+	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/libevm/accounts"
 	"github.com/ava-labs/libevm/accounts/keystore"
 	"github.com/ava-labs/libevm/common"
@@ -796,8 +796,8 @@ func TestEstimateGas(t *testing.T) {
 func TestCall(t *testing.T) {
 	// Enable BLOBHASH opcode in Cancun
 	cfg := *params.TestChainConfig
-	cfg.ShanghaiTime = utils.NewUint64(0)
-	cfg.CancunTime = utils.NewUint64(0)
+	cfg.ShanghaiTime = utils.PointerTo[uint64](0)
+	cfg.CancunTime = utils.PointerTo[uint64](0)
 	t.Parallel()
 	// Initialize test accounts
 	var (

graft/coreth/params/config.go

@@ -31,7 +31,7 @@ import (
 	"math/big"
 
 	"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
+	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/libevm/libevm"
 	ethparams "github.com/ava-labs/libevm/params"
 )
@@ -96,8 +96,8 @@ func initialiseChainConfigs() {
 			MuirGlacierBlock:    big.NewInt(0),
 			BerlinBlock:         big.NewInt(0),
 			LondonBlock:         big.NewInt(0),
-			ShanghaiTime:        utils.NewUint64(0),
-			CancunTime:          utils.NewUint64(0),
+			ShanghaiTime:        utils.PointerTo[uint64](0),
+			CancunTime:          utils.PointerTo[uint64](0),
 		},
 		extras.TestChainConfig,
 	)
@@ -333,7 +333,7 @@ func initialiseChainConfigs() {
 			MuirGlacierBlock:    big.NewInt(0),
 			BerlinBlock:         big.NewInt(0),
 			LondonBlock:         big.NewInt(0),
-			ShanghaiTime:        utils.NewUint64(0),
+			ShanghaiTime:        utils.PointerTo[uint64](0),
 		},
 		extras.TestDurangoChainConfig,
 	)
@@ -354,8 +354,8 @@ func initialiseChainConfigs() {
 			MuirGlacierBlock:    big.NewInt(0),
 			BerlinBlock:         big.NewInt(0),
 			LondonBlock:         big.NewInt(0),
-			ShanghaiTime:        utils.NewUint64(0),
-			CancunTime:          utils.NewUint64(0),
+			ShanghaiTime:        utils.PointerTo[uint64](0),
+			CancunTime:          utils.PointerTo[uint64](0),
 		},
 		extras.TestEtnaChainConfig,
 	)
@@ -376,8 +376,8 @@ func initialiseChainConfigs() {
 			MuirGlacierBlock:    big.NewInt(0),
 			BerlinBlock:         big.NewInt(0),
 			LondonBlock:         big.NewInt(0),
-			ShanghaiTime:        utils.NewUint64(0),
-			CancunTime:          utils.NewUint64(0),
+			ShanghaiTime:        utils.PointerTo[uint64](0),
+			CancunTime:          utils.PointerTo[uint64](0),
 		},
 		extras.TestFortunaChainConfig,
 	)
@@ -398,8 +398,8 @@ func initialiseChainConfigs() {
 			MuirGlacierBlock:    big.NewInt(0),
 			BerlinBlock:         big.NewInt(0),
 			LondonBlock:         big.NewInt(0),
-			ShanghaiTime:        utils.NewUint64(0),
-			CancunTime:          utils.NewUint64(0),
+			ShanghaiTime:        utils.PointerTo[uint64](0),
+			CancunTime:          utils.PointerTo[uint64](0),
 		},
 		extras.TestGraniteChainConfig,
 	)
@@ -420,8 +420,8 @@ func initialiseChainConfigs() {
 			MuirGlacierBlock:    big.NewInt(0),
 			BerlinBlock:         big.NewInt(0),
 			LondonBlock:         big.NewInt(0),
-			ShanghaiTime:        utils.NewUint64(0),
-			CancunTime:          utils.NewUint64(0),
+			ShanghaiTime:        utils.PointerTo[uint64](0),
+			CancunTime:          utils.PointerTo[uint64](0),
 		},
 		extras.TestHeliconChainConfig,
 	)

graft/coreth/params/config_extra.go

@@ -10,8 +10,8 @@ import (
 	"math/big"
 
 	"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
 	"github.com/ava-labs/avalanchego/upgrade"
+	"github.com/ava-labs/avalanchego/utils"
 )
 
 const (
@@ -80,11 +80,11 @@ func SetEthUpgrades(c *ChainConfig) error {
 	// We only mark Shanghai and Cancun as enabled if we have marked them as
 	// scheduled.
 	if durango := extra.DurangoBlockTimestamp; durango != nil && *durango < unscheduledActivation {
-		c.ShanghaiTime = utils.NewUint64(*durango)
+		c.ShanghaiTime = utils.PointerTo(*durango)
 	}
 
 	if etna := extra.EtnaTimestamp; etna != nil && *etna < unscheduledActivation {
-		c.CancunTime = utils.NewUint64(*etna)
+		c.CancunTime = utils.PointerTo(*etna)
 	}
 	return nil
 }

graft/coreth/params/config_extra_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
 	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
+	"github.com/ava-labs/avalanchego/utils"
 )
 
 func TestMain(m *testing.M) {
@@ -22,7 +22,7 @@ func TestMain(m *testing.M) {
 
 func TestSetEthUpgrades(t *testing.T) {
 	genesisBlock := big.NewInt(0)
-	genesisTimestamp := utils.NewUint64(initiallyActive)
+	genesisTimestamp := utils.PointerTo(initiallyActive)
 	tests := []struct {
 		fork     upgradetest.Fork
 		expected *ChainConfig

graft/coreth/params/config_test.go

@@ -35,7 +35,7 @@ import (
 	"time"
 
 	"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
+	"github.com/ava-labs/avalanchego/utils"
 	ethparams "github.com/ava-labs/libevm/params"
 )
 
@@ -119,7 +119,7 @@ func TestCheckCompatible(t *testing.T) {
 			headTimestamp: 0,
 			wantErr: &ethparams.ConfigCompatError{
 				What:         "ApricotPhase5 fork block timestamp",
-				StoredTime:   utils.NewUint64(0),
+				StoredTime:   utils.PointerTo[uint64](0),
 				NewTime:      nil,
 				RewindToTime: 0,
 			},
@@ -131,7 +131,7 @@ func TestCheckCompatible(t *testing.T) {
 			headTimestamp: 100,
 			wantErr: &ethparams.ConfigCompatError{
 				What:         "ApricotPhase5 fork block timestamp",
-				StoredTime:   utils.NewUint64(0),
+				StoredTime:   utils.PointerTo[uint64](0),
 				NewTime:      nil,
 				RewindToTime: 0,
 			},
@@ -151,7 +151,7 @@ func TestConfigRules(t *testing.T) {
 		&ChainConfig{},
 		&extras.ChainConfig{
 			NetworkUpgrades: extras.NetworkUpgrades{
-				CortinaBlockTimestamp: utils.NewUint64(500),
+				CortinaBlockTimestamp: utils.PointerTo[uint64](500),
 			},
 		},
 	)

graft/coreth/params/extras/config.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/ava-labs/libevm/common"
 
-	"github.com/ava-labs/avalanchego/graft/evm/utils"
 	"github.com/ava-labs/avalanchego/snow"
+	"github.com/ava-labs/avalanchego/utils"
 
 	ethparams "github.com/ava-labs/libevm/params"
 )
@@ -20,63 +20,63 @@ var (
 	TestLaunchConfig = &ChainConfig{}
 
 	TestApricotPhase1Config = copyAndSet(TestLaunchConfig, func(c *ChainConfig) {
-		c.NetworkUpgrades.ApricotPhase1BlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.ApricotPhase1BlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestApricotPhase2Config = copyAndSet(TestApricotPhase1Config, func(c *ChainConfig) {
-		c.NetworkUpgrades.ApricotPhase2BlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.ApricotPhase2BlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestApricotPhase3Config = copyAndSet(TestApricotPhase2Config, func(c *ChainConfig) {
-		c.NetworkUpgrades.ApricotPhase3BlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.ApricotPhase3BlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestApricotPhase4Config = copyAndSet(TestApricotPhase3Config, func(c *ChainConfig) {
-		c.NetworkUpgrades.ApricotPhase4BlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.ApricotPhase4BlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestApricotPhase5Config = copyAndSet(TestApricotPhase4Config, func(c *ChainConfig) {
-		c.NetworkUpgrades.ApricotPhase5BlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.ApricotPhase5BlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestApricotPhasePre6Config = copyAndSet(TestApricotPhase5Config, func(c *ChainConfig) {
-		c.NetworkUpgrades.ApricotPhasePre6BlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.ApricotPhasePre6BlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestApricotPhase6Config = copyAndSet(TestApricotPhasePre6Config, func(c *ChainConfig) {
-		c.NetworkUpgrades.ApricotPhase6BlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.ApricotPhase6BlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestApricotPhasePost6Config = copyAndSet(TestApricotPhase6Config, func(c *ChainConfig) {
-		c.NetworkUpgrades.ApricotPhasePost6BlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.ApricotPhasePost6BlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestBanffChainConfig = copyAndSet(TestApricotPhasePost6Config, func(c *ChainConfig) {
-		c.NetworkUpgrades.BanffBlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.BanffBlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestCortinaChainConfig = copyAndSet(TestBanffChainConfig, func(c *ChainConfig) {
-		c.NetworkUpgrades.CortinaBlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.CortinaBlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestDurangoChainConfig = copyAndSet(TestCortinaChainConfig, func(c *ChainConfig) {
-		c.NetworkUpgrades.DurangoBlockTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.DurangoBlockTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestEtnaChainConfig = copyAndSet(TestDurangoChainConfig, func(c *ChainConfig) {
-		c.NetworkUpgrades.EtnaTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.EtnaTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestFortunaChainConfig = copyAndSet(TestEtnaChainConfig, func(c *ChainConfig) {
-		c.NetworkUpgrades.FortunaTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.FortunaTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestGraniteChainConfig = copyAndSet(TestFortunaChainConfig, func(c *ChainConfig) {
-		c.NetworkUpgrades.GraniteTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.GraniteTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestHeliconChainConfig = copyAndSet(TestGraniteChainConfig, func(c *ChainConfig) {
-		c.NetworkUpgrades.HeliconTimestamp = utils.NewUint64(0)
+		c.NetworkUpgrades.HeliconTimestamp = utils.PointerTo[uint64](0)
 	})
 
 	TestChainConfig = copyConfig(TestHeliconChainConfig)
@@ -125,7 +125,7 @@ func (c *ChainConfig) CheckConfigCompatible(newcfg_ *ethparams.ChainConfig, head
 		// Return an error to prevent the chain from starting, just in case.
 		return ethparams.NewTimestampCompatError(
 			fmt.Sprintf("ChainConfig.Hooks() is not of the expected type *extras.ChainConfig, got %T", newcfg_.Hooks()),
-			utils.NewUint64(0),
+			utils.PointerTo[uint64](0),
 			nil,
 		)
 	}