Proposervm API

api/common_args_responses.go

@@ -58,6 +58,12 @@ type GetHeightResponse struct {
 	Height avajson.Uint64 `json:"height"`
 }
 
+type GetEpochResponse struct {
+	Number       avajson.Uint64 `json:"number"`
+	StartTime    avajson.Uint64 `json:"startTime"`
+	PChainHeight avajson.Uint64 `json:"pChainHeight"`
+}
+
 // FormattedBlock defines a JSON formatted struct containing a block in Hex
 // format
 type FormattedBlock struct {

tests/e2e/c/proposervm_epoch.go

@@ -0,0 +1,99 @@
+// Copyright (C) 2019-2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package c
+
+import (
+	"math/big"
+	"time"
+
+	"github.com/ava-labs/coreth/ethclient"
+	"github.com/ava-labs/libevm/common"
+	"github.com/ava-labs/libevm/core/types"
+	"github.com/onsi/ginkgo/v2"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+
+	"github.com/ava-labs/avalanchego/tests/fixture/e2e"
+	"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
+	"github.com/ava-labs/avalanchego/utils/units"
+	"github.com/ava-labs/avalanchego/vms/proposervm"
+)
+
+var _ = e2e.DescribeCChain("[ProposerVM Epoch]", func() {
+	tc := e2e.NewTestContext()
+	require := require.New(tc)
+
+	const txAmount = 10 * units.Avax // Arbitrary amount to send and transfer
+
+	ginkgo.It("should advance the proposervm epoch according to the upgrade config epoch duration", func() {
+		// TODO: Skip this test if Granite is not activated
+
+		env := e2e.GetEnv(tc)
+		var (
+			senderKey    = env.PreFundedKey
+			recipientKey = e2e.NewPrivateKey(tc)
+		)
+
+		// Select a random node URI to use for both the eth client and
+		// the wallet to avoid having to verify that all nodes are at
+		// the same height before initializing the wallet.
+		nodeURI := env.GetRandomNodeURI()
+		ethClient := e2e.NewEthClient(tc, nodeURI)
+
+		proposerClient := proposervm.NewClient(nodeURI.URI, "C")
+
+		tc.By("issuing C-Chain transactions to advance the epoch", func() {
+			initialEpoch, err := proposerClient.GetEpoch(tc.DefaultContext())
+			require.NoError(err)
+
+			time.Sleep(5 * time.Second)
+
+			issueTransaction(tc, ethClient, senderKey, recipientKey.EthAddress(), int64(txAmount))
+
+			epoch, err := proposerClient.GetEpoch(tc.DefaultContext())
+			require.NoError(err)
+			tc.Log().Debug(
+				"epoch",
+				zap.Uint64("Epoch Number:", epoch.Number),
+				zap.Int64("Epoch Start Time:", epoch.StartTime.Unix()),
+				zap.Uint64("P-Chain Height:", epoch.Height),
+			)
+
+			require.Greater(
+				epoch.Number,
+				initialEpoch.Number,
+				"expected epoch number to advance, but it did not",
+			)
+		})
+	})
+})
+
+func issueTransaction(
+	tc *e2e.GinkgoTestContext,
+	ethClient *ethclient.Client,
+	senderKey *secp256k1.PrivateKey,
+	recipientEthAddress common.Address,
+	txAmount int64,
+) {
+	acceptedNonce, err := ethClient.AcceptedNonceAt(tc.DefaultContext(), senderKey.EthAddress())
+	require.NoError(tc, err)
+	gasPrice := e2e.SuggestGasPrice(tc, ethClient)
+	tx := types.NewTransaction(
+		acceptedNonce,
+		recipientEthAddress,
+		big.NewInt(txAmount),
+		e2e.DefaultGasLimit,
+		gasPrice,
+		nil,
+	)
+
+	cChainID, err := ethClient.ChainID(tc.DefaultContext())
+	require.NoError(tc, err)
+	signer := types.NewEIP155Signer(cChainID)
+	signedTx, err := types.SignTx(tx, signer, senderKey.ToECDSA())
+	require.NoError(tc, err)
+
+	receipt := e2e.SendEthTransaction(tc, ethClient, signedTx)
+	require.Equal(tc, types.ReceiptStatusSuccessful, receipt.Status)
+}

tests/e2e/e2e_test.go

@@ -7,6 +7,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"testing"
+	"time"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/require"
@@ -50,6 +51,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	upgrades := upgrade.Default
 	if flagVars.ActivateGranite() {
 		upgrades.GraniteTime = upgrade.InitiallyActiveTime
+		upgrades.GraniteEpochDuration = 4 * time.Second
 	} else {
 		upgrades.GraniteTime = upgrade.UnscheduledActivationTime
 	}

tests/fixture/tmpnet/network.go

@@ -176,13 +176,13 @@ func BootstrapNewNetwork(
 	}
 
 	if err := checkVMBinaries(log, network.Subnets, network.DefaultRuntimeConfig.Process); err != nil {
-		return err
+		return fmt.Errorf("failed to check VM binaries: %w", err)
 	}
 	if err := network.EnsureDefaultConfig(ctx, log); err != nil {
-		return err
+		return fmt.Errorf("failed to ensure default config: %w", err)
 	}
 	if err := network.Create(rootNetworkDir); err != nil {
-		return err
+		return fmt.Errorf("failed to create network: %w", err)
 	}
 	return network.Bootstrap(ctx, log)
 }

upgrade/upgrade.go

@@ -77,28 +77,30 @@ var (
 		EtnaTime:                     InitiallyActiveTime,
 		FortunaTime:                  InitiallyActiveTime,
 		GraniteTime:                  UnscheduledActivationTime,
+		GraniteEpochDuration:         30 * time.Second,
 	}
 
 	ErrInvalidUpgradeTimes = errors.New("invalid upgrade configuration")
 )
 
 type Config struct {
-	ApricotPhase1Time            time.Time `json:"apricotPhase1Time"`
-	ApricotPhase2Time            time.Time `json:"apricotPhase2Time"`
-	ApricotPhase3Time            time.Time `json:"apricotPhase3Time"`
-	ApricotPhase4Time            time.Time `json:"apricotPhase4Time"`
-	ApricotPhase4MinPChainHeight uint64    `json:"apricotPhase4MinPChainHeight"`
-	ApricotPhase5Time            time.Time `json:"apricotPhase5Time"`
-	ApricotPhasePre6Time         time.Time `json:"apricotPhasePre6Time"`
-	ApricotPhase6Time            time.Time `json:"apricotPhase6Time"`
-	ApricotPhasePost6Time        time.Time `json:"apricotPhasePost6Time"`
-	BanffTime                    time.Time `json:"banffTime"`
-	CortinaTime                  time.Time `json:"cortinaTime"`
-	CortinaXChainStopVertexID    ids.ID    `json:"cortinaXChainStopVertexID"`
-	DurangoTime                  time.Time `json:"durangoTime"`
-	EtnaTime                     time.Time `json:"etnaTime"`
-	FortunaTime                  time.Time `json:"fortunaTime"`
-	GraniteTime                  time.Time `json:"graniteTime"`
+	ApricotPhase1Time            time.Time     `json:"apricotPhase1Time"`
+	ApricotPhase2Time            time.Time     `json:"apricotPhase2Time"`
+	ApricotPhase3Time            time.Time     `json:"apricotPhase3Time"`
+	ApricotPhase4Time            time.Time     `json:"apricotPhase4Time"`
+	ApricotPhase4MinPChainHeight uint64        `json:"apricotPhase4MinPChainHeight"`
+	ApricotPhase5Time            time.Time     `json:"apricotPhase5Time"`
+	ApricotPhasePre6Time         time.Time     `json:"apricotPhasePre6Time"`
+	ApricotPhase6Time            time.Time     `json:"apricotPhase6Time"`
+	ApricotPhasePost6Time        time.Time     `json:"apricotPhasePost6Time"`
+	BanffTime                    time.Time     `json:"banffTime"`
+	CortinaTime                  time.Time     `json:"cortinaTime"`
+	CortinaXChainStopVertexID    ids.ID        `json:"cortinaXChainStopVertexID"`
+	DurangoTime                  time.Time     `json:"durangoTime"`
+	EtnaTime                     time.Time     `json:"etnaTime"`
+	FortunaTime                  time.Time     `json:"fortunaTime"`
+	GraniteTime                  time.Time     `json:"graniteTime"`
+	GraniteEpochDuration         time.Duration `json:"graniteEpochDuration"`
 }
 
 func (c *Config) Validate() error {

vms/proposervm/batched_vm_test.go

@@ -40,8 +40,9 @@ func TestCoreVMNotRemote(t *testing.T) {
 	var (
 		activationTime = time.Unix(0, 0)
 		durangoTime    = activationTime
+		graniteTime    = activationTime
 	)
-	_, _, proVM, _ := initTestProposerVM(t, activationTime, durangoTime, 0)
+	_, _, proVM, _ := initTestProposerVM(t, activationTime, durangoTime, graniteTime, 0)
 	defer func() {
 		require.NoError(proVM.Shutdown(context.Background()))
 	}()
@@ -70,8 +71,9 @@ func TestGetAncestorsPreForkOnly(t *testing.T) {
 	var (
 		activationTime = mockable.MaxTime
 		durangoTime    = activationTime
+		graniteTime    = activationTime
 	)
-	coreVM, proRemoteVM := initTestRemoteProposerVM(t, activationTime, durangoTime)
+	coreVM, proRemoteVM := initTestRemoteProposerVM(t, activationTime, durangoTime, graniteTime)
 	defer func() {
 		require.NoError(proRemoteVM.Shutdown(context.Background()))
 	}()
@@ -193,8 +195,9 @@ func TestGetAncestorsPostForkOnly(t *testing.T) {
 	var (
 		activationTime = time.Unix(0, 0)
 		durangoTime    = activationTime
+		graniteTime    = activationTime
 	)
-	coreVM, proRemoteVM := initTestRemoteProposerVM(t, activationTime, durangoTime)
+	coreVM, proRemoteVM := initTestRemoteProposerVM(t, activationTime, durangoTime, graniteTime)
 	defer func() {
 		require.NoError(proRemoteVM.Shutdown(context.Background()))
 	}()
@@ -222,7 +225,7 @@ func TestGetAncestorsPostForkOnly(t *testing.T) {
 	// prepare build of next block
 	require.NoError(builtBlk2.Verify(context.Background()))
 	require.NoError(proRemoteVM.SetPreference(context.Background(), builtBlk2.ID()))
-	require.NoError(waitForProposerWindow(proRemoteVM, builtBlk2, 0))
+	require.NoError(waitForProposerWindow(proRemoteVM, builtBlk2, builtBlk2.(*postForkBlock).PChainHeight()))
 
 	coreBlk3 := snowmantest.BuildChild(coreBlk2)
 	coreVM.BuildBlockF = func(context.Context) (snowman.Block, error) {
@@ -327,10 +330,11 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) {
 		postForkTime = currentTime.Add(15 * time.Minute)
 
 		durangoTime = forkTime
+		graniteTime = forkTime
 	)
 
 	// enable ProBlks in next future
-	coreVM, proRemoteVM := initTestRemoteProposerVM(t, forkTime, durangoTime)
+	coreVM, proRemoteVM := initTestRemoteProposerVM(t, forkTime, durangoTime, graniteTime)
 	defer func() {
 		require.NoError(proRemoteVM.Shutdown(context.Background()))
 	}()
@@ -499,8 +503,9 @@ func TestBatchedParseBlockPreForkOnly(t *testing.T) {
 	var (
 		activationTime = mockable.MaxTime
 		durangoTime    = activationTime
+		graniteTime    = activationTime
 	)
-	coreVM, proRemoteVM := initTestRemoteProposerVM(t, activationTime, durangoTime)
+	coreVM, proRemoteVM := initTestRemoteProposerVM(t, activationTime, durangoTime, graniteTime)
 	defer func() {
 		require.NoError(proRemoteVM.Shutdown(context.Background()))
 	}()
@@ -596,6 +601,11 @@ func TestBatchedParseBlockParallel(t *testing.T) {
 	parentID := ids.ID{1}
 	timestamp := time.Unix(123, 0)
 	pChainHeight := uint64(2)
+	pChainEpoch := blockbuilder.PChainEpoch{
+		Height:    uint64(2),
+		Number:    uint64(0),
+		StartTime: time.Unix(123, 0),
+	}
 	chainID := ids.GenerateTestID()
 
 	vm := VM{
@@ -616,10 +626,10 @@ func TestBatchedParseBlockParallel(t *testing.T) {
 
 	blockThatCantBeParsed := snowmantest.BuildChild(snowmantest.Genesis)
 
-	blocksWithUnparsable := makeParseableBlocks(t, parentID, timestamp, pChainHeight, cert, chainID, key)
+	blocksWithUnparsable := makeParseableBlocks(t, parentID, timestamp, pChainHeight, pChainEpoch, cert, chainID, key)
 	blocksWithUnparsable[50] = blockThatCantBeParsed.Bytes()
 
-	parsableBlocks := makeParseableBlocks(t, parentID, timestamp, pChainHeight, cert, chainID, key)
+	parsableBlocks := makeParseableBlocks(t, parentID, timestamp, pChainHeight, pChainEpoch, cert, chainID, key)
 
 	for _, testCase := range []struct {
 		name         string
@@ -663,14 +673,15 @@ func TestBatchedParseBlockParallel(t *testing.T) {
 	}
 }
 
-func makeParseableBlocks(t *testing.T, parentID ids.ID, timestamp time.Time, pChainHeight uint64, cert *staking.Certificate, chainID ids.ID, key crypto.Signer) [][]byte {
+func makeParseableBlocks(t *testing.T, parentID ids.ID, timestamp time.Time, pChainHeight uint64, pChainEpoch blockbuilder.PChainEpoch, cert *staking.Certificate, chainID ids.ID, key crypto.Signer) [][]byte {
 	makeSignedBlock := func(i int) []byte {
 		buff := binary.AppendVarint(nil, int64(i))
 
 		signedBlock, err := blockbuilder.Build(
 			parentID,
 			timestamp,
 			pChainHeight,
+			pChainEpoch,
 			cert,
 			buff,
 			chainID,
@@ -693,8 +704,9 @@ func TestBatchedParseBlockPostForkOnly(t *testing.T) {
 	var (
 		activationTime = time.Unix(0, 0)
 		durangoTime    = activationTime
+		graniteTime    = activationTime
 	)
-	coreVM, proRemoteVM := initTestRemoteProposerVM(t, activationTime, durangoTime)
+	coreVM, proRemoteVM := initTestRemoteProposerVM(t, activationTime, durangoTime, graniteTime)
 	defer func() {
 		require.NoError(proRemoteVM.Shutdown(context.Background()))
 	}()
@@ -784,10 +796,11 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) {
 		postForkTime = currentTime.Add(15 * time.Minute)
 
 		durangoTime = forkTime
+		graniteTime = forkTime
 	)
 
 	// enable ProBlks in next future
-	coreVM, proRemoteVM := initTestRemoteProposerVM(t, forkTime, durangoTime)
+	coreVM, proRemoteVM := initTestRemoteProposerVM(t, forkTime, durangoTime, graniteTime)
 	defer func() {
 		require.NoError(proRemoteVM.Shutdown(context.Background()))
 	}()
@@ -917,6 +930,7 @@ func initTestRemoteProposerVM(
 	t *testing.T,
 	activationTime,
 	durangoTime time.Time,
+	graniteTime time.Time,
 ) (
 	TestRemoteProposerVM,
 	*VM,
@@ -970,6 +984,7 @@ func initTestRemoteProposerVM(
 				ApricotPhase4Time:            activationTime,
 				ApricotPhase4MinPChainHeight: 0,
 				DurangoTime:                  durangoTime,
+				GraniteTime:                  graniteTime,
 			},
 			MinBlkDelay:         DefaultMinBlockDelay,
 			NumHistoricalBlocks: DefaultNumHistoricalBlocks,