Fixes after audit

mboben · mboben · commit 42c4bee1f834 · 2025-09-17T15:27:24.000+02:00
diff --git a/avalanchego/api/info/service.go b/avalanchego/api/info/service.go
@@ -330,11 +330,11 @@ func (i *Info) Uptime(_ *http.Request, _ *struct{}, reply *UptimeResponse) error
 }
 
 type ACP struct {
-	SupportWeight *big.Int            `json:"supportWeight"`
+	SupportWeight json.BigInt         `json:"supportWeight"`
 	Supporters    set.Set[ids.NodeID] `json:"supporters"`
-	ObjectWeight  *big.Int            `json:"objectWeight"`
+	ObjectWeight  json.BigInt         `json:"objectWeight"`
 	Objectors     set.Set[ids.NodeID] `json:"objectors"`
-	AbstainWeight *big.Int            `json:"abstainWeight"`
+	AbstainWeight json.BigInt         `json:"abstainWeight"`
 }
 
 type ACPsReply struct {
@@ -344,7 +344,11 @@ type ACPsReply struct {
 func (a *ACPsReply) getACP(acpNum uint32) *ACP {
 	acp, ok := a.ACPs[acpNum]
 	if !ok {
-		acp = &ACP{}
+		acp = &ACP{
+			SupportWeight: json.NewBigIntFromInt(0),
+			ObjectWeight:  json.NewBigIntFromInt(0),
+			AbstainWeight: json.NewBigIntFromInt(0),
+		}
 		a.ACPs[acpNum] = acp
 	}
 	return acp
@@ -367,19 +371,19 @@ func (i *Info) Acps(_ *http.Request, _ *struct{}, reply *ACPsReply) error {
 		for acpNum := range peer.SupportedACPs {
 			acp := reply.getACP(acpNum)
 			acp.Supporters.Add(peer.ID)
-			acp.SupportWeight = new(big.Int).Add(acp.SupportWeight, new(big.Int).SetUint64(weight))
+			acp.SupportWeight.Set(new(big.Int).Add(acp.SupportWeight.ToBigInt(), new(big.Int).SetUint64(weight)))
 		}
 		for acpNum := range peer.ObjectedACPs {
 			acp := reply.getACP(acpNum)
 			acp.Objectors.Add(peer.ID)
-			acp.ObjectWeight = new(big.Int).Add(acp.ObjectWeight, new(big.Int).SetUint64(weight))
+			acp.ObjectWeight.Set(new(big.Int).Add(acp.ObjectWeight.ToBigInt(), new(big.Int).SetUint64(weight)))
 		}
 	}
 
 	totalWeight := i.validators.TotalWeight(constants.PrimaryNetworkID)
 	for acpNum := range constants.CurrentACPs {
 		acp := reply.getACP(acpNum)
-		acp.AbstainWeight = new(big.Int).Sub(totalWeight, new(big.Int).Add(acp.SupportWeight, acp.ObjectWeight))
+		acp.AbstainWeight.Set(new(big.Int).Sub(totalWeight, new(big.Int).Add(acp.SupportWeight.ToBigInt(), acp.ObjectWeight.ToBigInt())))
 	}
 	return nil
 }
diff --git a/avalanchego/config/config.go b/avalanchego/config/config.go
@@ -763,7 +763,7 @@ func getStakingConfig(v *viper.Viper, networkID uint32) (node.StakingConfig, err
 }
 
 func getTxFeeConfig(v *viper.Viper, networkID uint32) genesis.TxFeeConfig {
-	if networkID != constants.MainnetID {
+	if networkID == constants.LocalFlareID || networkID == constants.LocalID {
 		return genesis.TxFeeConfig{
 			CreateAssetTxFee: v.GetUint64(CreateAssetTxFeeKey),
 			StaticFeeConfig: txfee.StaticConfig{
diff --git a/avalanchego/database/helpers.go b/avalanchego/database/helpers.go
@@ -7,7 +7,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"math/big"
 	"time"
 
 	"github.com/ava-labs/avalanchego/ids"
@@ -68,18 +67,6 @@ func ParseUInt64(b []byte) (uint64, error) {
 	return binary.BigEndian.Uint64(b), nil
 }
 
-func GetBigInt(db KeyValueReader, key []byte) (*big.Int, error) {
-	b, err := db.Get(key)
-	if err != nil {
-		return nil, err
-	}
-	return new(big.Int).SetBytes(b), nil
-}
-
-func ParseBigInt(b []byte) (*big.Int, error) {
-	return new(big.Int).SetBytes(b), nil
-}
-
 func PutUInt32(db KeyValueWriter, key []byte, val uint32) error {
 	b := PackUInt32(val)
 	return db.Put(key, b)
diff --git a/avalanchego/genesis/genesis_coston.go b/avalanchego/genesis/genesis_coston.go
@@ -85,11 +85,10 @@ var (
 		TxFeeConfig: TxFeeConfig{
 			CreateAssetTxFee: 10 * units.MilliAvax,
 			StaticFeeConfig: txfee.StaticConfig{
-				TxFee:                 units.MilliAvax,
-				CreateSubnetTxFee:     100 * units.MilliAvax,
-				CreateBlockchainTxFee: 100 * units.MilliAvax,
-
-				TransformSubnetTxFee:          1 * units.Avax,
+				TxFee:                         units.MilliAvax,
+				CreateSubnetTxFee:             100 * units.MilliAvax,
+				TransformSubnetTxFee:          100 * units.MilliAvax,
+				CreateBlockchainTxFee:         100 * units.MilliAvax,
 				AddPrimaryNetworkValidatorFee: 0,
 				AddPrimaryNetworkDelegatorFee: 0,
 				AddSubnetValidatorFee:         units.MilliAvax,
diff --git a/avalanchego/genesis/genesis_costwo.go b/avalanchego/genesis/genesis_costwo.go
@@ -22,11 +22,10 @@ var (
 		TxFeeConfig: TxFeeConfig{
 			CreateAssetTxFee: units.MilliAvax,
 			StaticFeeConfig: txfee.StaticConfig{
-				TxFee:                 units.MilliAvax,
-				CreateSubnetTxFee:     100 * units.MegaAvax,
-				CreateBlockchainTxFee: 100 * units.MegaAvax,
-
-				TransformSubnetTxFee:          1 * units.Avax,
+				TxFee:                         units.MilliAvax,
+				CreateSubnetTxFee:             100 * units.MilliAvax,
+				TransformSubnetTxFee:          100 * units.MilliAvax,
+				CreateBlockchainTxFee:         100 * units.MilliAvax,
 				AddPrimaryNetworkValidatorFee: 0,
 				AddPrimaryNetworkDelegatorFee: 0,
 				AddSubnetValidatorFee:         units.MilliAvax,
diff --git a/avalanchego/genesis/genesis_flare.go b/avalanchego/genesis/genesis_flare.go
@@ -22,11 +22,10 @@ var (
 		TxFeeConfig: TxFeeConfig{
 			CreateAssetTxFee: units.MilliAvax,
 			StaticFeeConfig: txfee.StaticConfig{
-				TxFee:                 units.MilliAvax,
-				CreateSubnetTxFee:     100 * units.MegaAvax,
-				CreateBlockchainTxFee: 100 * units.MegaAvax,
-
-				TransformSubnetTxFee:          1 * units.Avax,
+				TxFee:                         units.MilliAvax,
+				CreateSubnetTxFee:             100 * units.MilliAvax,
+				TransformSubnetTxFee:          100 * units.MilliAvax,
+				CreateBlockchainTxFee:         100 * units.MilliAvax,
 				AddPrimaryNetworkValidatorFee: 0,
 				AddPrimaryNetworkDelegatorFee: 0,
 				AddSubnetValidatorFee:         units.MilliAvax,
diff --git a/avalanchego/genesis/genesis_local.go b/avalanchego/genesis/genesis_local.go
@@ -99,6 +99,7 @@ var (
 	LocalParams = Params{
 		TxFeeConfig: TxFeeConfig{
 			CreateAssetTxFee: units.MilliAvax,
+			// For reference only, fees are set via program arguments (defaults are below)
 			StaticFeeConfig: txfee.StaticConfig{
 				TxFee:                         units.MilliAvax,
 				CreateSubnetTxFee:             100 * units.MilliAvax,
diff --git a/avalanchego/genesis/genesis_localFlare.go b/avalanchego/genesis/genesis_localFlare.go
@@ -21,12 +21,12 @@ var (
 	LocalFlareParams = Params{
 		TxFeeConfig: TxFeeConfig{
 			CreateAssetTxFee: units.MilliAvax,
+			// For reference only, fees are set via program arguments (defaults are below)
 			StaticFeeConfig: txfee.StaticConfig{
-				TxFee:                 units.MilliAvax,
-				CreateSubnetTxFee:     100 * units.MegaAvax,
-				CreateBlockchainTxFee: 100 * units.MegaAvax,
-
-				TransformSubnetTxFee:          1 * units.Avax,
+				TxFee:                         units.MilliAvax,
+				CreateSubnetTxFee:             100 * units.MilliAvax,
+				TransformSubnetTxFee:          100 * units.MilliAvax,
+				CreateBlockchainTxFee:         100 * units.MilliAvax,
 				AddPrimaryNetworkValidatorFee: 0,
 				AddPrimaryNetworkDelegatorFee: 0,
 				AddSubnetValidatorFee:         units.MilliAvax,
diff --git a/avalanchego/genesis/params.go b/avalanchego/genesis/params.go
@@ -50,17 +50,15 @@ type Params struct {
 }
 
 func GetTxFeeConfig(networkID uint32) TxFeeConfig {
+	// TxFee configs are ommitted for LocalFlare and Local networks since they
+	// are set from program arguments (getTxFeeConfig)
 	switch networkID {
 	case constants.MainnetID:
 		return MainnetParams.TxFeeConfig
-	case constants.LocalID:
-		return LocalParams.TxFeeConfig
 	case constants.FlareID:
 		return FlareParams.TxFeeConfig
 	case constants.CostwoID:
 		return CostwoParams.TxFeeConfig
-	case constants.LocalFlareID:
-		return LocalFlareParams.TxFeeConfig
 	case constants.SongbirdID:
 		return SongbirdParams.TxFeeConfig
 	case constants.CostonID:
diff --git a/avalanchego/snow/networking/tracker/targeter.go b/avalanchego/snow/networking/tracker/targeter.go
@@ -4,6 +4,8 @@
 package tracker
 
 import (
+	"math/big"
+
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow/validators"
 	"github.com/ava-labs/avalanchego/utils/constants"
@@ -69,6 +71,10 @@ func (t *targeter) TargetUsage(nodeID ids.NodeID) float64 {
 	}
 
 	totalWeight := t.vdrs.TotalWeight(constants.PrimaryNetworkID)
+	if totalWeight.Cmp(big.NewInt(0)) == 0 {
+		return baseAlloc
+	}
+
 	totalWeightFloat, _ := totalWeight.Float64()
 
 	vdrAlloc := t.vdrAlloc * float64(weight) / totalWeightFloat
diff --git a/avalanchego/utils/json/bigInt.go b/avalanchego/utils/json/bigInt.go
@@ -0,0 +1,62 @@
+// Copyright (C) 2019-2024, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package json
+
+import (
+	"math/big"
+)
+
+type BigInt struct {
+	value *big.Int
+}
+
+func NewBigInt(value *big.Int) BigInt {
+	return BigInt{value: new(big.Int).Set(value)}
+}
+
+func NewBigIntFromInt(value int64) BigInt {
+	return BigInt{value: big.NewInt(value)}
+}
+
+func (b *BigInt) Set(value *big.Int) {
+	if value == nil {
+		b.value = nil
+	} else if b.value == nil {
+		b.value = new(big.Int).Set(value)
+	} else {
+		b.value.Set(value)
+	}
+}
+
+func (b BigInt) ToBigInt() *big.Int {
+	if b.value == nil {
+		return nil
+	}
+	return new(big.Int).Set(b.value)
+}
+
+func (b BigInt) MarshalJSON() ([]byte, error) {
+	if b.value == nil {
+		return []byte("null"), nil
+	}
+	text, err := b.value.MarshalText()
+	if err != nil {
+		return nil, err
+	}
+	return []byte(`"` + string(text) + `"`), nil
+}
+
+func (b *BigInt) UnmarshalJSON(data []byte) error {
+	if len(data) >= 2 && data[0] == '"' && data[len(data)-1] == '"' {
+		data = data[1 : len(data)-1]
+	}
+	if string(data) == "null" {
+		b.value = nil
+		return nil
+	}
+	if b.value == nil {
+		b.value = new(big.Int)
+	}
+	return b.value.UnmarshalText(data)
+}
diff --git a/avalanchego/vms/platformvm/client.go b/avalanchego/vms/platformvm/client.go
@@ -543,9 +543,9 @@ func (c *client) GetTotalStake(ctx context.Context, subnetID ids.ID, options ...
 	}, res, options...)
 	var amount *big.Int
 	if subnetID == constants.PrimaryNetworkID {
-		amount = res.Stake
+		amount = res.Stake.ToBigInt()
 	} else {
-		amount = res.Weight
+		amount = res.Weight.ToBigInt()
 	}
 	return amount, err
 }
diff --git a/avalanchego/vms/platformvm/service.go b/avalanchego/vms/platformvm/service.go
@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"maps"
 	"math"
-	"math/big"
 	"net/http"
 	"os"
 	"strings"
@@ -1718,9 +1717,9 @@ type GetTotalStakeArgs struct {
 // GetTotalStakeReply is the response from calling GetTotalStake.
 type GetTotalStakeReply struct {
 	// Deprecated: Use Weight instead.
-	Stake *big.Int `json:"stake"`
+	Stake avajson.BigInt `json:"stake"`
 
-	Weight *big.Int `json:"weight"`
+	Weight avajson.BigInt `json:"weight"`
 }
 
 // GetTotalStake returns the total amount staked on the Primary Network
@@ -1732,8 +1731,8 @@ func (s *Service) GetTotalStake(_ *http.Request, args *GetTotalStakeArgs, reply
 
 	totalWeight := s.vm.Validators.TotalWeight(args.SubnetID)
 	weight := totalWeight
-	reply.Weight = weight
-	reply.Stake = weight
+	reply.Weight = avajson.NewBigInt(weight)
+	reply.Stake = avajson.NewBigInt(weight)
 	return nil
 }
 
diff --git a/coreth/core/genesis_test.go b/coreth/core/genesis_test.go
@@ -67,22 +67,22 @@ func TestSetupGenesis(t *testing.T) {
 }
 
 func testSetupGenesis(t *testing.T, scheme string) {
-	apricotPhase1Config := *params.TestFlareApricotPhase1Config
-	apricotPhase1Config.ApricotPhase1BlockTimestamp = utils.NewUint64(100)
+	apricotPhase4Config := *params.TestFlareApricotPhase4Config
+	apricotPhase4Config.ApricotPhase4BlockTimestamp = utils.NewUint64(100)
 	var (
-		customghash = common.HexToHash("0x1099a11e9e454bd3ef31d688cf21936671966407bc330f051d754b5ce401e7ed")
+		customghash = common.HexToHash("0x02cd6246f54563efaf38f0a1c9604899937999ae1d7b813872f77259a19917bf")
 		customg     = Genesis{
-			Config: &apricotPhase1Config,
+			Config: &apricotPhase4Config,
 			Alloc: types.GenesisAlloc{
 				{1}: {Balance: big.NewInt(1), Storage: map[common.Hash]common.Hash{{1}: {1}}},
 			},
 		}
 		oldcustomg = customg
 	)
 
-	rollbackApricotPhase1Config := apricotPhase1Config
-	rollbackApricotPhase1Config.ApricotPhase1BlockTimestamp = utils.NewUint64(90)
-	oldcustomg.Config = &rollbackApricotPhase1Config
+	rollbackApricotPhase4Config := apricotPhase4Config
+	rollbackApricotPhase4Config.ApricotPhase4BlockTimestamp = utils.NewUint64(90)
+	oldcustomg.Config = &rollbackApricotPhase4Config
 	tests := []struct {
 		name       string
 		fn         func(ethdb.Database) (*params.ChainConfig, common.Hash, error)
@@ -129,8 +129,8 @@ func testSetupGenesis(t *testing.T, scheme string) {
 		{
 			name: "incompatible config for avalanche fork in DB",
 			fn: func(db ethdb.Database) (*params.ChainConfig, common.Hash, error) {
-				// Commit the 'old' genesis block with ApricotPhase1 transition at 90.
-				// Advance to block #4, past the ApricotPhase1 transition block of customg.
+				// Commit the 'old' genesis block with ApricotPhase4 transition at 90.
+				// Advance to block #4, past the ApricotPhase4 transition block of customg.
 				tdb := triedb.NewDatabase(db, newDbConfig(scheme))
 				genesis, err := oldcustomg.Commit(db, tdb)
 				if err != nil {
@@ -158,7 +158,7 @@ func testSetupGenesis(t *testing.T, scheme string) {
 			wantHash:   customghash,
 			wantConfig: customg.Config,
 			wantErr: &params.ConfigCompatError{
-				What:         "ApricotPhase1 fork block timestamp",
+				What:         "ApricotPhase4 fork block timestamp",
 				StoredTime:   u64(90),
 				NewTime:      u64(100),
 				RewindToTime: 89,
diff --git a/coreth/upgrade/upgrade.go b/coreth/upgrade/upgrade.go
@@ -110,7 +110,6 @@ var (
 		ApricotPhasePost6Time:        InitiallyActiveTime,
 		BanffTime:                    InitiallyActiveTime,
 		CortinaTime:                  InitiallyActiveTime,
-		CortinaXChainStopVertexID:    ids.Empty,
 		DurangoTime:                  InitiallyActiveTime,
 		EtnaTime:                     UnscheduledActivationTime,
 	}
@@ -126,13 +125,24 @@ var (
 		ApricotPhasePost6Time:        ZeroTime,
 		BanffTime:                    ZeroTime,
 		CortinaTime:                  ZeroTime,
-		CortinaXChainStopVertexID:    ids.Empty,
 		DurangoTime:                  ZeroTime,
 		EtnaTime:                     UnscheduledActivationTime,
 	}
-
-	Local = Config{}
-
+	Local = Config{
+		ApricotPhase1Time:            ZeroTime,
+		ApricotPhase2Time:            ZeroTime,
+		ApricotPhase3Time:            ZeroTime,
+		ApricotPhase4Time:            ZeroTime,
+		ApricotPhase4MinPChainHeight: 0,
+		ApricotPhase5Time:            ZeroTime,
+		ApricotPhasePre6Time:         ZeroTime,
+		ApricotPhase6Time:            ZeroTime,
+		ApricotPhasePost6Time:        ZeroTime,
+		BanffTime:                    ZeroTime,
+		CortinaTime:                  ZeroTime,
+		DurangoTime:                  ZeroTime,
+		EtnaTime:                     UnscheduledActivationTime,
+	}
 	ErrInvalidUpgradeTimes = errors.New("invalid upgrade configuration")
 )
 

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ func getStakingConfig(v *viper.Viper, networkID uint32) (node.StakingConfig, err`
`763`	`763`	`}`
`764`	`764`
`765`	`765`	`func getTxFeeConfig(v *viper.Viper, networkID uint32) genesis.TxFeeConfig {`
`766`		`- if networkID != constants.MainnetID {`
	`766`	`+ if networkID == constants.LocalFlareID \|\| networkID == constants.LocalID {`
`767`	`767`	`return genesis.TxFeeConfig{`
`768`	`768`	`CreateAssetTxFee: v.GetUint64(CreateAssetTxFeeKey),`
`769`	`769`	`StaticFeeConfig: txfee.StaticConfig{`