Merge branch 'master' into libevm (#821)

ceyonur · ARR4N · commit 7a89e1d0f0a2 · 2025-03-10T10:10:20.000Z
diff --git a/consensus/dummy/dynamic_fees.go b/consensus/dummy/dynamic_fees.go
@@ -12,6 +12,7 @@ import (
 	"github.com/ava-labs/coreth/params"
 	"github.com/ava-labs/coreth/params/extras"
 	"github.com/ava-labs/coreth/plugin/evm/ap4"
+	"github.com/ava-labs/coreth/plugin/evm/ap5"
 	"github.com/ava-labs/coreth/plugin/evm/header"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/common/math"
@@ -31,7 +32,7 @@ var (
 	EtnaMinBaseFee              = big.NewInt(params.EtnaMinBaseFee)
 
 	ApricotPhase3BaseFeeChangeDenominator = new(big.Int).SetUint64(params.ApricotPhase3BaseFeeChangeDenominator)
-	ApricotPhase5BaseFeeChangeDenominator = new(big.Int).SetUint64(params.ApricotPhase5BaseFeeChangeDenominator)
+	ApricotPhase5BaseFeeChangeDenominator = big.NewInt(ap5.BaseFeeChangeDenominator)
 
 	errEstimateBaseFeeWithoutActivation = errors.New("cannot estimate base fee for chain without apricot phase 3 scheduled")
 )
@@ -94,7 +95,7 @@ func calcBaseFeeWithWindow(config *extras.ChainConfig, parent *types.Header, tim
 	)
 	if isApricotPhase5 {
 		baseFeeChangeDenominator = ApricotPhase5BaseFeeChangeDenominator
-		parentGasTarget = params.ApricotPhase5TargetGas
+		parentGasTarget = ap5.TargetGas
 	}
 
 	// Calculate the amount of gas consumed within the rollup window.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.23.6
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.12.1
-	github.com/ava-labs/avalanchego v1.12.3-0.20250219020546-daac8c8bbd8c
+	github.com/ava-labs/avalanchego v1.12.3-0.20250220150250-9e886ffca1ba
 	github.com/ava-labs/libevm v1.13.14-0.2.0.rc.3
 	github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233
 	github.com/davecgh/go-spew v1.1.1
diff --git a/go.sum b/go.sum
@@ -56,8 +56,8 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/ava-labs/avalanchego v1.12.3-0.20250219020546-daac8c8bbd8c h1:LAKh2eokSOtM5TRiMtGnl+vaTJa72dL/i/ZitSMR23w=
-github.com/ava-labs/avalanchego v1.12.3-0.20250219020546-daac8c8bbd8c/go.mod h1:5e246cVO15EOZp7q3Dx2wRznTXMUgLrbWgnAd1RNgKU=
+github.com/ava-labs/avalanchego v1.12.3-0.20250220150250-9e886ffca1ba h1:VTGpl5PwfPo9046h6x7BvtjDGxEAPreNwaWK/0dwyFk=
+github.com/ava-labs/avalanchego v1.12.3-0.20250220150250-9e886ffca1ba/go.mod h1:oURZGkQSIWOGBqP2Lirf768MVAePVGdvYQfmHUZS4aE=
 github.com/ava-labs/libevm v1.13.14-0.2.0.rc.3 h1:1CWGo2icnX9dRqGQl7CFywYGIZWxe+ucy0w8NAsVTWE=
 github.com/ava-labs/libevm v1.13.14-0.2.0.rc.3/go.mod h1:+Iol+sVQ1KyoBsHf3veyrBmHCXr3xXRWq6ZXkgVfNLU=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
diff --git a/params/avalanche_params.go b/params/avalanche_params.go
@@ -4,8 +4,6 @@
 package params
 
 import (
-	"math/big"
-
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 )
 
@@ -19,27 +17,13 @@ const (
 	ApricotPhase1GasLimit uint64 = 8_000_000
 	CortinaGasLimit       uint64 = 15_000_000
 
-	ApricotPhase3MinBaseFee               int64  = 75 * GWei
-	ApricotPhase3MaxBaseFee                      = 225 * GWei
-	ApricotPhase3InitialBaseFee           int64  = 225 * GWei
-	ApricotPhase3TargetGas                       = 10_000_000
-	ApricotPhase3BaseFeeChangeDenominator        = 12
-	ApricotPhase5TargetGas                       = 15_000_000
-	ApricotPhase5BaseFeeChangeDenominator uint64 = 36
-	EtnaMinBaseFee                        int64  = GWei
+	ApricotPhase3MinBaseFee               int64 = 75 * GWei
+	ApricotPhase3MaxBaseFee                     = 225 * GWei
+	ApricotPhase3InitialBaseFee           int64 = 225 * GWei
+	ApricotPhase3TargetGas                      = 10_000_000
+	ApricotPhase3BaseFeeChangeDenominator       = 12
+	EtnaMinBaseFee                        int64 = GWei
 
 	RollupWindow            = 10 // in seconds
 	DynamicFeeExtraDataSize = wrappers.LongLen * RollupWindow
-
-	// The base cost to charge per atomic transaction. Added in Apricot Phase 5.
-	AtomicTxBaseCost uint64 = 10_000
 )
-
-// The atomic gas limit specifies the maximum amount of gas that can be consumed by the atomic
-// transactions included in a block and is enforced as of ApricotPhase5. Prior to ApricotPhase5,
-// a block included a single atomic transaction. As of ApricotPhase5, each block can include a set
-// of atomic transactions where the cumulative atomic gas consumed is capped by the atomic gas limit,
-// similar to the block gas limit.
-//
-// This value must always remain <= MaxUint64.
-var AtomicGasLimit *big.Int = big.NewInt(100_000)
diff --git a/plugin/evm/ap5/params.go b/plugin/evm/ap5/params.go
@@ -0,0 +1,39 @@
+// (c) 2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+// AP5 defines constants used after the Apricot Phase 5 upgrade.
+package ap5
+
+const (
+	// BlockGasCostStep is the rate at which the block gas cost changes per
+	// second.
+	//
+	// This value modifies the previously used `ap4.BlockGasCostStep`.
+	BlockGasCostStep = 200_000
+
+	// TargetGas is the target amount of gas to be included in the window. The
+	// target amount of gas per second equals [TargetGas] / `ap3.WindowLen`.
+	//
+	// This value modifies the previously used `ap3.TargetGas`.
+	TargetGas = 15_000_000
+
+	// BaseFeeChangeDenominator is the denominator used to smoothen base fee
+	// changes.
+	//
+	// This value modifies the previously used `ap3.BaseFeeChangeDenominator`.
+	BaseFeeChangeDenominator = 36
+
+	// AtomicGasLimit specifies the maximum amount of gas that can be consumed
+	// by the atomic transactions included in a block.
+	//
+	// Prior to Apricot Phase 5, a block included a single atomic transaction.
+	// As of Apricot Phase 5, each block can include a set of atomic
+	// transactions where the cumulative atomic gas consumed is capped by the
+	// atomic gas limit, similar to the block gas limit.
+	AtomicGasLimit = 100_000
+
+	// AtomicTxIntrinsicGas is the base amount of gas to charge per atomic
+	// transaction. There are additional gas costs that can be charged per
+	// transaction.
+	AtomicTxIntrinsicGas = 10_000
+)
diff --git a/plugin/evm/atomic/export_tx.go b/plugin/evm/atomic/export_tx.go
@@ -10,6 +10,7 @@ import (
 	"math/big"
 
 	"github.com/ava-labs/coreth/params/extras"
+	"github.com/ava-labs/coreth/plugin/evm/ap5"
 	"github.com/holiman/uint256"
 
 	"github.com/ava-labs/avalanchego/chains/atomic"
@@ -142,7 +143,7 @@ func (utx *UnsignedExportTx) GasUsed(fixedFee bool) (uint64, error) {
 		return 0, err
 	}
 	if fixedFee {
-		cost, err = math.Add64(cost, AtomicTxBaseCost)
+		cost, err = math.Add64(cost, ap5.AtomicTxIntrinsicGas)
 		if err != nil {
 			return 0, err
 		}
diff --git a/plugin/evm/atomic/import_tx.go b/plugin/evm/atomic/import_tx.go
@@ -11,6 +11,7 @@ import (
 	"slices"
 
 	"github.com/ava-labs/coreth/params/extras"
+	"github.com/ava-labs/coreth/plugin/evm/ap5"
 	"github.com/holiman/uint256"
 
 	"github.com/ava-labs/avalanchego/chains/atomic"
@@ -150,7 +151,7 @@ func (utx *UnsignedImportTx) GasUsed(fixedFee bool) (uint64, error) {
 		}
 	}
 	if fixedFee {
-		cost, err = math.Add64(cost, AtomicTxBaseCost)
+		cost, err = math.Add64(cost, ap5.AtomicTxIntrinsicGas)
 		if err != nil {
 			return 0, err
 		}
diff --git a/plugin/evm/block_verification.go b/plugin/evm/block_verification.go
@@ -9,14 +9,16 @@ import (
 	"math/big"
 
 	"github.com/ava-labs/libevm/common"
+	"github.com/ava-labs/libevm/trie"
 
 	safemath "github.com/ava-labs/avalanchego/utils/math"
 
 	"github.com/ava-labs/coreth/constants"
 	"github.com/ava-labs/coreth/core/types"
 	"github.com/ava-labs/coreth/params"
+	"github.com/ava-labs/coreth/plugin/evm/ap5"
 	"github.com/ava-labs/coreth/plugin/evm/header"
-	"github.com/ava-labs/libevm/trie"
+	"github.com/ava-labs/coreth/utils"
 )
 
 var (
@@ -199,7 +201,7 @@ func (v blockValidator) SyntacticVerify(b *Block, rules params.Rules) error {
 			return errNilExtDataGasUsedApricotPhase4
 		}
 		if rulesExtra.IsApricotPhase5 {
-			if ethHeader.ExtDataGasUsed.Cmp(params.AtomicGasLimit) == 1 {
+			if !utils.BigLessOrEqualUint64(ethHeader.ExtDataGasUsed, ap5.AtomicGasLimit) {
 				return fmt.Errorf("too large extDataGasUsed: %d", ethHeader.ExtDataGasUsed)
 			}
 		} else {
diff --git a/plugin/evm/header/block_gas_cost.go b/plugin/evm/header/block_gas_cost.go
@@ -9,14 +9,9 @@ import (
 	"github.com/ava-labs/coreth/core/types"
 	"github.com/ava-labs/coreth/params/extras"
 	"github.com/ava-labs/coreth/plugin/evm/ap4"
+	"github.com/ava-labs/coreth/plugin/evm/ap5"
 )
 
-// ApricotPhase5BlockGasCostStep is the rate at which the block gas cost changes
-// per second as of the Apricot Phase 5 upgrade.
-//
-// This value modifies the previously used [ap4.BlockGasCostStep].
-const ApricotPhase5BlockGasCostStep = 200_000
-
 // BlockGasCost calculates the required block gas cost based on the parent
 // header and the timestamp of the new block.
 func BlockGasCost(
@@ -26,7 +21,7 @@ func BlockGasCost(
 ) uint64 {
 	step := uint64(ap4.BlockGasCostStep)
 	if config.IsApricotPhase5(timestamp) {
-		step = ApricotPhase5BlockGasCostStep
+		step = ap5.BlockGasCostStep
 	}
 	// Treat an invalid parent/current time combination as 0 elapsed time.
 	//
diff --git a/plugin/evm/header/block_gas_cost_test.go b/plugin/evm/header/block_gas_cost_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ava-labs/coreth/core/types"
 	"github.com/ava-labs/coreth/params/extras"
 	"github.com/ava-labs/coreth/plugin/evm/ap4"
+	"github.com/ava-labs/coreth/plugin/evm/ap5"
 	"github.com/ava-labs/coreth/utils"
 	"github.com/stretchr/testify/assert"
 )
@@ -36,7 +37,7 @@ func TestBlockGasCost(t *testing.T) {
 			parentTime:                  10,
 			parentCost:                  big.NewInt(ap4.MaxBlockGasCost),
 			timestamp:                   10 + ap4.TargetBlockRate + 1,
-			expected:                    ap4.MaxBlockGasCost - ApricotPhase5BlockGasCostStep,
+			expected:                    ap4.MaxBlockGasCost - ap5.BlockGasCostStep,
 		},
 		{
 			name:       "negative_time_elapsed",
diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
@@ -40,6 +40,7 @@ import (
 	"github.com/ava-labs/coreth/params"
 	"github.com/ava-labs/coreth/params/extras"
 	"github.com/ava-labs/coreth/peer"
+	"github.com/ava-labs/coreth/plugin/evm/ap5"
 	"github.com/ava-labs/coreth/plugin/evm/atomic"
 	"github.com/ava-labs/coreth/plugin/evm/config"
 	"github.com/ava-labs/coreth/plugin/evm/message"
@@ -852,7 +853,7 @@ func (vm *VM) postBatchOnFinalizeAndAssemble(header *types.Header, state *state.
 			return nil, nil, nil, err
 		}
 		// ensure [gasUsed] + [batchGasUsed] doesnt exceed the [atomicGasLimit]
-		if totalGasUsed := new(big.Int).Add(batchGasUsed, txGasUsed); totalGasUsed.Cmp(params.AtomicGasLimit) > 0 {
+		if totalGasUsed := new(big.Int).Add(batchGasUsed, txGasUsed); !utils.BigLessOrEqualUint64(totalGasUsed, ap5.AtomicGasLimit) {
 			// Send [tx] back to the mempool's tx heap.
 			vm.mempool.CancelCurrentTx(tx.ID())
 			break
@@ -981,8 +982,8 @@ func (vm *VM) onExtraStateChange(block *types.Block, state *state.StateDB) (*big
 		// atomic gas limit.
 		if rulesExtra.IsApricotPhase5 {
 			// Ensure that [tx] does not push [block] above the atomic gas limit.
-			if batchGasUsed.Cmp(params.AtomicGasLimit) == 1 {
-				return nil, nil, fmt.Errorf("atomic gas used (%d) by block (%s), exceeds atomic gas limit (%d)", batchGasUsed, block.Hash().Hex(), params.AtomicGasLimit)
+			if !utils.BigLessOrEqualUint64(batchGasUsed, ap5.AtomicGasLimit) {
+				return nil, nil, fmt.Errorf("atomic gas used (%d) by block (%s), exceeds atomic gas limit (%d)", batchGasUsed, block.Hash().Hex(), ap5.AtomicGasLimit)
 			}
 		}
 	}
@@ -1569,8 +1570,8 @@ func (vm *VM) verifyTxAtTip(tx *atomic.Tx) error {
 	if err != nil {
 		return err
 	}
-	if new(big.Int).SetUint64(gasUsed).Cmp(params.AtomicGasLimit) > 0 {
-		return fmt.Errorf("tx gas usage (%d) exceeds atomic gas limit (%d)", gasUsed, params.AtomicGasLimit.Uint64())
+	if gasUsed > ap5.AtomicGasLimit {
+		return fmt.Errorf("tx gas usage (%d) exceeds atomic gas limit (%d)", gasUsed, ap5.AtomicGasLimit)
 	}
 
 	// Note: we fetch the current block and then the state at that block instead of the current state directly
diff --git a/plugin/evm/vm_warp_test.go b/plugin/evm/vm_warp_test.go
@@ -270,13 +270,15 @@ func testWarpVMTransaction(t *testing.T, unsignedMessage *avalancheWarp.Unsigned
 	blsSecretKey1, err := localsigner.New()
 	require.NoError(err)
 	blsPublicKey1 := blsSecretKey1.PublicKey()
-	blsSignature1 := blsSecretKey1.Sign(unsignedMessage.Bytes())
+	blsSignature1, err := blsSecretKey1.Sign(unsignedMessage.Bytes())
+	require.NoError(err)
 
 	nodeID2 := ids.GenerateTestNodeID()
 	blsSecretKey2, err := localsigner.New()
 	require.NoError(err)
 	blsPublicKey2 := blsSecretKey2.PublicKey()
-	blsSignature2 := blsSecretKey2.Sign(unsignedMessage.Bytes())
+	blsSignature2, err := blsSecretKey2.Sign(unsignedMessage.Bytes())
+	require.NoError(err)
 
 	blsAggregatedSignature, err := bls.AggregateSignatures([]*bls.Signature{blsSignature1, blsSignature2})
 	require.NoError(err)
@@ -532,11 +534,14 @@ func testReceiveWarpMessage(
 	newSigner := func(networkID ids.ID, weight uint64) signer {
 		secret, err := localsigner.New()
 		require.NoError(err)
+		sig, err := secret.Sign(unsignedMessage.Bytes())
+		require.NoError(err)
+
 		return signer{
 			networkID: networkID,
 			nodeID:    ids.GenerateTestNodeID(),
 			secret:    secret,
-			signature: secret.Sign(unsignedMessage.Bytes()),
+			signature: sig,
 			weight:    weight,
 		}
 	}
diff --git a/precompile/contracts/warp/predicate_test.go b/precompile/contracts/warp/predicate_test.go
@@ -94,7 +94,10 @@ func init() {
 	}
 
 	for _, testVdr := range testVdrs {
-		blsSignature := testVdr.sk.Sign(unsignedMsg.Bytes())
+		blsSignature, err := testVdr.sk.Sign(unsignedMsg.Bytes())
+		if err != nil {
+			panic(err)
+		}
 		blsSignatures = append(blsSignatures, blsSignature)
 	}
 
@@ -235,13 +238,16 @@ func testWarpMessageFromPrimaryNetwork(t *testing.T, requirePrimaryNetworkSigner
 	getValidatorsOutput := make(map[ids.NodeID]*validators.GetValidatorOutput)
 	blsSignatures := make([]*bls.Signature, 0, numKeys)
 	for i := 0; i < numKeys; i++ {
+		sig, err := testVdrs[i].sk.Sign(unsignedMsg.Bytes())
+		require.NoError(err)
+
 		validatorOutput := &validators.GetValidatorOutput{
 			NodeID:    testVdrs[i].nodeID,
 			Weight:    20,
 			PublicKey: testVdrs[i].vdr.PublicKey,
 		}
 		getValidatorsOutput[testVdrs[i].nodeID] = validatorOutput
-		blsSignatures = append(blsSignatures, testVdrs[i].sk.Sign(unsignedMsg.Bytes()))
+		blsSignatures = append(blsSignatures, sig)
 	}
 	aggregateSignature, err := bls.AggregateSignatures(blsSignatures)
 	require.NoError(err)
diff --git a/precompile/contracts/warp/signature_verification_test.go b/precompile/contracts/warp/signature_verification_test.go
diff --git a/scripts/versions.sh b/scripts/versions.sh
diff --git a/utils/numbers.go b/utils/numbers.go
diff --git a/utils/numbers_test.go b/utils/numbers_test.go
diff --git a/warp/aggregator/aggregator_test.go b/warp/aggregator/aggregator_test.go

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"math/big"`
`11`	`11`
`12`	`12`	`"github.com/ava-labs/coreth/params/extras"`
	`13`	`+ "github.com/ava-labs/coreth/plugin/evm/ap5"`
`13`	`14`	`"github.com/holiman/uint256"`
`14`	`15`
`15`	`16`	`"github.com/ava-labs/avalanchego/chains/atomic"`
`@@ -142,7 +143,7 @@ func (utx *UnsignedExportTx) GasUsed(fixedFee bool) (uint64, error) {`
`142`	`143`	`return 0, err`
`143`	`144`	`}`
`144`	`145`	`if fixedFee {`
`145`		`- cost, err = math.Add64(cost, AtomicTxBaseCost)`
	`146`	`+ cost, err = math.Add64(cost, ap5.AtomicTxIntrinsicGas)`
`146`	`147`	`if err != nil {`
`147`	`148`	`return 0, err`
`148`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"slices"`
`12`	`12`
`13`	`13`	`"github.com/ava-labs/coreth/params/extras"`
	`14`	`+ "github.com/ava-labs/coreth/plugin/evm/ap5"`
`14`	`15`	`"github.com/holiman/uint256"`
`15`	`16`
`16`	`17`	`"github.com/ava-labs/avalanchego/chains/atomic"`
`@@ -150,7 +151,7 @@ func (utx *UnsignedImportTx) GasUsed(fixedFee bool) (uint64, error) {`
`150`	`151`	`}`
`151`	`152`	`}`
`152`	`153`	`if fixedFee {`
`153`		`- cost, err = math.Add64(cost, AtomicTxBaseCost)`
	`154`	`+ cost, err = math.Add64(cost, ap5.AtomicTxIntrinsicGas)`
`154`	`155`	`if err != nil {`
`155`	`156`	`return 0, err`
`156`	`157`	`}`