ACP 77

cmd/blockchaincmd/create.go

@@ -12,6 +12,8 @@ import (
 	"strings"
 	"unicode"
 
+	"github.com/ava-labs/avalanche-cli/pkg/application"
+
 	"github.com/ava-labs/avalanche-cli/cmd/flags"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
@@ -45,6 +47,8 @@ type CreateFlags struct {
 	useLatestReleasedVMVersion    bool
 	useLatestPreReleasedVMVersion bool
 	useExternalGasToken           bool
+	proofOfStake                  bool
+	proofOfAuthority              bool
 }
 
 var (
@@ -56,8 +60,9 @@ var (
 
 	errIllegalNameCharacter = errors.New(
 		"illegal name character: only letters, no special characters allowed")
-	errMutuallyExlusiveVersionOptions   = errors.New("version flags --latest,--pre-release,vm-version are mutually exclusive")
-	errMutuallyExclusiveVMConfigOptions = errors.New("--genesis flag disables --evm-chain-id,--evm-defaults,--production-defaults,--test-defaults")
+	errMutuallyExlusiveVersionOptions             = errors.New("version flags --latest,--pre-release,vm-version are mutually exclusive")
+	errMutuallyExclusiveVMConfigOptions           = errors.New("--genesis flag disables --evm-chain-id,--evm-defaults,--production-defaults,--test-defaults")
+	errMutuallyExlusiveValidatorManagementOptions = errors.New("validator management type flags --proof-of-authority,--proof-of-stake are mutually exclusive")
 )
 
 // avalanche blockchain create
@@ -101,6 +106,8 @@ configuration, pass the -f flag.`,
 	cmd.Flags().BoolVar(&createFlags.useWarp, "warp", true, "generate a vm with warp support (needed for teleporter)")
 	cmd.Flags().BoolVar(&createFlags.useTeleporter, "teleporter", false, "interoperate with other blockchains using teleporter")
 	cmd.Flags().BoolVar(&createFlags.useExternalGasToken, "external-gas-token", false, "use a gas token from another blockchain")
+	cmd.Flags().BoolVar(&createFlags.proofOfAuthority, "proof-of-authority", false, "use proof of authority for validator management")
+	cmd.Flags().BoolVar(&createFlags.proofOfStake, "proof-of-stake", false, "(coming soon) use proof of stake for validator management")
 	return cmd
 }
 
@@ -185,6 +192,11 @@ func createBlockchainConfig(cmd *cobra.Command, args []string) error {
 		return errors.New("flags --evm,--custom are mutually exclusive")
 	}
 
+	// validator management type exclusiveness
+	if !flags.EnsureMutuallyExclusive([]bool{createFlags.proofOfAuthority, createFlags.proofOfStake}) {
+		return errMutuallyExlusiveValidatorManagementOptions
+	}
+
 	// get vm kind
 	vmType, err := vm.PromptVMType(app, createFlags.useSubnetEvm, createFlags.useCustomVM)
 	if err != nil {
@@ -343,7 +355,9 @@ func createBlockchainConfig(cmd *cobra.Command, args []string) error {
 			}
 		}
 	}
-
+	if err = promptValidatorManagementType(app, sc); err != nil {
+		return err
+	}
 	if err = app.WriteGenesisFile(blockchainName, genesisBytes); err != nil {
 		return err
 	}
@@ -422,3 +436,43 @@ func checkInvalidSubnetNames(name string) error {
 	}
 	return nil
 }
+
+// TODO: add explain the difference for different validator management type
+func promptValidatorManagementType(
+	app *application.Avalanche,
+	sidecar *models.Sidecar,
+) error {
+	proofOfAuthorityOption := "Proof of Authority"
+	proofOfStakeOption := "Proof of Stake"
+	explainOption := "Explain the difference"
+	if createFlags.proofOfStake {
+		sidecar.ValidatorManagement = models.ValidatorManagementTypeFromString(proofOfStakeOption)
+		return nil
+	}
+	if createFlags.proofOfAuthority {
+		sidecar.ValidatorManagement = models.ValidatorManagementTypeFromString(proofOfAuthorityOption)
+		return nil
+	}
+	options := []string{proofOfAuthorityOption, proofOfStakeOption, explainOption}
+	var subnetTypeStr string
+	for {
+		option, err := app.Prompt.CaptureList(
+			"Which validator management protocol would you like to use in your blockchain?",
+			options,
+		)
+		if err != nil {
+			return err
+		}
+		switch option {
+		case proofOfAuthorityOption:
+			subnetTypeStr = models.ProofOfAuthority
+		case proofOfStakeOption:
+			subnetTypeStr = models.ProofOfStake
+		case explainOption:
+			continue
+		}
+		break
+	}
+	sidecar.ValidatorManagement = models.ValidatorManagementTypeFromString(subnetTypeStr)
+	return nil
+}

pkg/models/sidecar.go

@@ -39,6 +39,7 @@ type Sidecar struct {
 	RunRelayer        bool
 	// SubnetEVM based VM's only
 	SubnetEVMMainnetChainID uint
+	ValidatorManagement     ValidatorManagementType
 }
 
 func (sc Sidecar) GetVMID() (string, error) {

pkg/models/validator_management.go

@@ -0,0 +1,22 @@
+// Copyright (C) 2022, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+package models
+
+type ValidatorManagementType string
+
+const (
+	ProofOfStake                 = "Proof Of Stake (Coming Soon)"
+	ProofOfAuthority             = "Proof Of Authority"
+	UndefinedValidatorManagement = "Undefined Validator Management"
+)
+
+func ValidatorManagementTypeFromString(s string) ValidatorManagementType {
+	switch s {
+	case ProofOfStake:
+		return ProofOfStake
+	case ProofOfAuthority:
+		return ProofOfAuthority
+	default:
+		return UndefinedValidatorManagement
+	}
+}

tests/e2e/commands/subnet.go

@@ -43,6 +43,7 @@ func CreateSubnetEvmConfigWithVersion(subnetName string, genesisPath string, ver
 		genesisPath,
 		"--evm",
 		subnetName,
+		"--proof-of-authority",
 		"--" + constants.SkipUpdateFlag,
 		"--teleporter=false",
 		"--evm-token",
@@ -122,6 +123,7 @@ func CreateCustomVMConfig(subnetName string, genesisPath string, vmPath string)
 		"create",
 		"--genesis",
 		genesisPath,
+		"--proof-of-authority",
 		"--custom",
 		subnetName,
 		"--custom-vm-path",

tests/e2e/testcases/subnet/local/suite.go

@@ -25,11 +25,6 @@ const (
 	subnetName       = "e2eSubnetTest"
 	secondSubnetName = "e2eSecondSubnetTest"
 	confPath         = "tests/e2e/assets/test_avalanche-cli.json"
-	stakeAmount      = "2000"
-	stakeDuration    = "337h"
-	delegateAmount   = "25"
-	delegateDuration = "336h"
-	localNetwork     = "Local Network"
 )
 
 var (