Fix E2E

cmd/blockchaincmd/add_validator.go

@@ -25,7 +25,6 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"github.com/ava-labs/avalanche-cli/pkg/validatormanager"
-	blockchainSDK "github.com/ava-labs/avalanche-tooling-sdk-go/blockchain"
 	"github.com/ava-labs/avalanche-tooling-sdk-go/evm"
 	sdkutils "github.com/ava-labs/avalanche-tooling-sdk-go/utils"
 	validatormanagersdk "github.com/ava-labs/avalanche-tooling-sdk-go/validatormanager"
@@ -632,9 +631,26 @@ func CallAddValidator(
 			}
 		}
 	}
-	pChainHeight, err := blockchainSDK.GetPChainHeight(validatorManagerRPCEndpoint, validatorManagerBlockchainID.String())
+
+	epochDuration := 30 * time.Second
+
+	// Get P-Chain's current epoch for RegisterL1ValidatorMessage (signed by L1, verified by P-Chain)
+	pChainEpoch, err := utils.GetCurrentEpoch(network.Endpoint, "P")
+	if err != nil {
+		return fmt.Errorf("failure getting p-chain current epoch: %w", err)
+	}
+	epochTime := time.Unix(pChainEpoch.StartTime, 0)
+	elapsed := time.Since(epochTime)
+	if elapsed < epochDuration {
+		time.Sleep(epochDuration - elapsed)
+	}
+	_, _, err = deployer.PChainTransfer(kc.Addresses().List()[0], 1)
+	if err != nil {
+		return fmt.Errorf("could not sent dummy transfer on p-chain: %w", err)
+	}
+	pChainEpoch, err = utils.GetCurrentEpoch(network.Endpoint, "P")
 	if err != nil {
-		return fmt.Errorf("failure getting p-chain height: %w", err)
+		return fmt.Errorf("failure getting p-chain current epoch: %w", err)
 	}
 
 	ctx, cancel := sdkutils.GetTimedContext(constants.EVMEventLookupTimeout)
@@ -666,7 +682,7 @@ func CallAddValidator(
 		sc.UseACP99,
 		initiateTxHash,
 		signatureAggregatorEndpoint,
-		pChainHeight,
+		pChainEpoch.PChainHeight,
 	)
 	if err != nil {
 		return err
@@ -695,6 +711,18 @@ func CallAddValidator(
 		}
 	}
 
+	client, err := evm.GetClient(validatorManagerRPCEndpoint)
+	if err != nil {
+		return fmt.Errorf("failure connecting to validator manager L1: %w", err)
+	}
+	if err := client.SetupProposerVM(signer); err != nil {
+		return fmt.Errorf("failure setting proposer VM on L1: %w", err)
+	}
+	l1Epoch, err := utils.GetCurrentL1Epoch(validatorManagerRPCEndpoint, validatorManagerBlockchainID.String())
+	if err != nil {
+		return fmt.Errorf("failure getting l1 current epoch: %w", err)
+	}
+
 	ctx, cancel = sdkutils.GetTimedContext(constants.EVMEventLookupTimeout)
 	defer cancel()
 	rawTx, err = validatormanager.FinishValidatorRegistration(
@@ -711,7 +739,7 @@ func CallAddValidator(
 		validatorManagerBlockchainID,
 		validatorManagerAddress,
 		signatureAggregatorEndpoint,
-		pChainHeight,
+		l1Epoch.PChainHeight,
 	)
 	if err != nil {
 		return err

cmd/blockchaincmd/change_weight.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"strings"
 
-	blockchainSDK "github.com/ava-labs/avalanche-tooling-sdk-go/blockchain"
-
 	"github.com/ava-labs/avalanche-cli/cmd/flags"
 	"github.com/ava-labs/avalanche-cli/pkg/blockchain"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
@@ -420,9 +418,10 @@ func changeWeightACP99(
 			}
 		}
 	}
-	pChainHeight, err := blockchainSDK.GetPChainHeight(validatorManagerRPCEndpoint, validatorManagerBlockchainID.String())
+	// Get P-Chain's current epoch for SetL1ValidatorWeightMessage (signed by L1, verified by P-Chain)
+	pChainEpoch, err := utils.GetCurrentEpoch(network.Endpoint, "P")
 	if err != nil {
-		return fmt.Errorf("failure getting p-chain height: %w", err)
+		return fmt.Errorf("failure getting p-chain current epoch: %w", err)
 	}
 	ctx, cancel := sdkutils.GetTimedContext(constants.EVMEventLookupTimeout)
 	defer cancel()
@@ -441,7 +440,7 @@ func changeWeightACP99(
 		weight,
 		initiateTxHash,
 		signatureAggregatorEndpoint,
-		pChainHeight,
+		pChainEpoch.PChainHeight,
 	)
 	if err != nil {
 		return err
@@ -482,6 +481,12 @@ func changeWeightACP99(
 			}
 		}
 	}
+	// Get L1's current epoch for L1ValidatorWeightMessage (signed by P-Chain, verified by L1)
+	l1Epoch, err := utils.GetCurrentL1Epoch(validatorManagerRPCEndpoint, validatorManagerBlockchainID.String())
+	if err != nil {
+		return fmt.Errorf("failure getting l1 current epoch: %w", err)
+	}
+
 	ctx, cancel = sdkutils.GetTimedContext(constants.EVMEventLookupTimeout)
 	defer cancel()
 	rawTx, err = validatormanager.FinishValidatorWeightChange(
@@ -499,7 +504,7 @@ func changeWeightACP99(
 		signedMessage,
 		newWeight,
 		signatureAggregatorEndpoint,
-		pChainHeight,
+		l1Epoch.PChainHeight,
 	)
 	if err != nil {
 		return err

cmd/blockchaincmd/create.go

@@ -70,7 +70,6 @@ var createNetworkOptions = []networkoptions.NetworkOption{
 	networkoptions.Local,
 	networkoptions.Fuji,
 	networkoptions.Mainnet,
-	networkoptions.Granite,
 }
 
 var (
@@ -305,7 +304,6 @@ func createBlockchainConfig(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf("using network %s \n", network.Name())
 
 	if vmType == models.SubnetEvm {
 		if sovereign {

cmd/blockchaincmd/deploy.go

@@ -284,7 +284,6 @@ func getChainsInSubnet(blockchainName string) ([]string, error) {
 func checkSubnetEVMDefaultAddressNotInAlloc(network models.Network, chain string) error {
 	if network.Kind != models.Local &&
 		network.Kind != models.Devnet &&
-		network.Kind != models.Granite &&
 		!simulatedPublicNetwork() {
 		genesis, err := app.LoadEvmGenesis(chain)
 		if err != nil {
@@ -1177,13 +1176,11 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 					deployRelayerFlags.CChainFundingKey = "ewoq"
 					deployRelayerFlags.CChainAmount = constants.DefaultRelayerAmount
 				}
-				if network.Kind != models.Granite {
-					if err := relayercmd.CallDeploy(nil, deployRelayerFlags, network); err != nil {
-						relayerErr = err
-						ux.Logger.RedXToUser("Relayer is not deployed due to: %v", relayerErr)
-					} else {
-						ux.Logger.GreenCheckmarkToUser("Relayer is successfully deployed")
-					}
+				if err := relayercmd.CallDeploy(nil, deployRelayerFlags, network); err != nil {
+					relayerErr = err
+					ux.Logger.RedXToUser("Relayer is not deployed due to: %v", relayerErr)
+				} else {
+					ux.Logger.GreenCheckmarkToUser("Relayer is successfully deployed")
 				}
 			}
 		}

cmd/blockchaincmd/describe.go

@@ -399,42 +399,46 @@ func printPrecompiles(genesis core.Genesis) {
 
 	warpSet := false
 	allowListSet := false
-	// Warp
-	extra := params.GetExtra(genesis.Config)
-	if extra.GenesisPrecompiles[warp.ConfigKey] != nil {
-		t.AppendRow(table.Row{"Warp", "n/a", "n/a", "n/a"})
-		warpSet = true
-	}
-	// Native Minting
-	if extra.GenesisPrecompiles[nativeminter.ConfigKey] != nil {
-		cfg := extra.GenesisPrecompiles[nativeminter.ConfigKey].(*nativeminter.Config)
-		addPrecompileAllowListToTable(t, "Native Minter", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
-		allowListSet = true
-	}
-	// Contract allow list
-	if extra.GenesisPrecompiles[deployerallowlist.ConfigKey] != nil {
-		cfg := extra.GenesisPrecompiles[deployerallowlist.ConfigKey].(*deployerallowlist.Config)
-		addPrecompileAllowListToTable(t, "Contract Allow List", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
-		allowListSet = true
-	}
-	// TX allow list
-	if extra.GenesisPrecompiles[txallowlist.ConfigKey] != nil {
-		cfg := extra.GenesisPrecompiles[txallowlist.Module.ConfigKey].(*txallowlist.Config)
-		addPrecompileAllowListToTable(t, "Tx Allow List", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
-		allowListSet = true
-	}
-	// Fee config allow list
-	if extra.GenesisPrecompiles[feemanager.ConfigKey] != nil {
-		cfg := extra.GenesisPrecompiles[feemanager.ConfigKey].(*feemanager.Config)
-		addPrecompileAllowListToTable(t, "Fee Config Allow List", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
-		allowListSet = true
-	}
-	// Reward config allow list
-	if extra.GenesisPrecompiles[rewardmanager.ConfigKey] != nil {
-		cfg := extra.GenesisPrecompiles[rewardmanager.ConfigKey].(*rewardmanager.Config)
-		addPrecompileAllowListToTable(t, "Reward Manager Allow List", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
-		allowListSet = true
-	}
+
+	params.WithTempRegisteredExtras(func() {
+		extra := params.GetExtra(genesis.Config)
+		// Warp
+		if extra.GenesisPrecompiles[warp.ConfigKey] != nil {
+			t.AppendRow(table.Row{"Warp", "n/a", "n/a", "n/a"})
+			warpSet = true
+		}
+		// Native Minting
+		if extra.GenesisPrecompiles[nativeminter.ConfigKey] != nil {
+			cfg := extra.GenesisPrecompiles[nativeminter.ConfigKey].(*nativeminter.Config)
+			addPrecompileAllowListToTable(t, "Native Minter", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
+			allowListSet = true
+		}
+		// Contract allow list
+		if extra.GenesisPrecompiles[deployerallowlist.ConfigKey] != nil {
+			cfg := extra.GenesisPrecompiles[deployerallowlist.ConfigKey].(*deployerallowlist.Config)
+			addPrecompileAllowListToTable(t, "Contract Allow List", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
+			allowListSet = true
+		}
+		// TX allow list
+		if extra.GenesisPrecompiles[txallowlist.ConfigKey] != nil {
+			cfg := extra.GenesisPrecompiles[txallowlist.Module.ConfigKey].(*txallowlist.Config)
+			addPrecompileAllowListToTable(t, "Tx Allow List", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
+			allowListSet = true
+		}
+		// Fee config allow list
+		if extra.GenesisPrecompiles[feemanager.ConfigKey] != nil {
+			cfg := extra.GenesisPrecompiles[feemanager.ConfigKey].(*feemanager.Config)
+			addPrecompileAllowListToTable(t, "Fee Config Allow List", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
+			allowListSet = true
+		}
+		// Reward config allow list
+		if extra.GenesisPrecompiles[rewardmanager.ConfigKey] != nil {
+			cfg := extra.GenesisPrecompiles[rewardmanager.ConfigKey].(*rewardmanager.Config)
+			addPrecompileAllowListToTable(t, "Reward Manager Allow List", cfg.AdminAddresses, cfg.ManagerAddresses, cfg.EnabledAddresses)
+			allowListSet = true
+		}
+	})
+
 	if warpSet || allowListSet {
 		ux.Logger.PrintToUser("%s", t.Render())
 		if allowListSet {

cmd/blockchaincmd/helpers.go

@@ -190,9 +190,6 @@ func StartLocalMachine(
 		bootstrapValidatorFlags.NumBootstrapValidators = constants.DefaultNumberOfLocalMachineNodes
 	}
 	connectionSettings := localnet.ConnectionSettings{}
-	if network.Kind == models.Granite {
-		connectionSettings = node.GetGraniteConnectionSettings()
-	}
 	// if no cluster provided - we create one with fmt.Sprintf("%s-local-node-%s", blockchainName, networkNameComponent) name
 	if localMachineFlags.UseLocalMachine && clusterNameFlagValue == "" {
 		if localnet.LocalClusterExists(app, clusterName) {