fix mainnet sa (#2454)

* fix mainnet sa * nit * nit * lint * update version * nit * add a bit more of waiting time for pchain update * validate pos L1 duration (#2455) * validate pos L1 duration * address comments --------- Co-authored-by: Raymond Sukanto <rsukanto@umich.edu> Co-authored-by: arturrez <56270896+arturrez@users.noreply.github.com>
ava-labs · Dec 16, 2024 · 769edac · 769edac
1 parent c091ff3
commit 769edac
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 19 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.8.2
+1.8.3
diff --git a/cmd/blockchaincmd/add_validator.go b/cmd/blockchaincmd/add_validator.go
@@ -126,10 +126,7 @@ Testnet or Mainnet.`,
 	return cmd
 }
 
-func preAddChecks(network models.Network, sovereign bool) error {
-	if sovereign && network.Kind == models.Mainnet {
-		return errNotSupportedOnMainnet
-	}
+func preAddChecks() error {
 	if nodeEndpoint != "" && createLocalValidator {
 		return fmt.Errorf("cannot set both --node-endpoint and --create-local-validator")
 	}
@@ -171,7 +168,7 @@ func addValidator(_ *cobra.Command, args []string) error {
 		network = models.ConvertClusterToNetwork(network)
 	}
 
-	if err := preAddChecks(network, sc.Sovereign); err != nil {
+	if err := preAddChecks(); err != nil {
 		return err
 	}
 
@@ -379,7 +376,7 @@ func CallAddValidator(
 			}
 		}
 		if duration == 0 {
-			duration, err = PromptDuration(time.Now(), network)
+			duration, err = PromptDuration(time.Now(), network, true) // it's pos
 			if err != nil {
 				return nil
 			}
@@ -654,17 +651,19 @@ func CallAddValidatorNonSOV(
 	return err
 }
 
-func PromptDuration(start time.Time, network models.Network) (time.Duration, error) {
+func PromptDuration(start time.Time, network models.Network, isPos bool) (time.Duration, error) {
 	for {
 		txt := "How long should this validator be validating? Enter a duration, e.g. 8760h. Valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\""
 		var d time.Duration
 		var err error
-		switch network.Kind {
-		case models.Fuji:
+		switch {
+		case network.Kind == models.Fuji:
 			d, err = app.Prompt.CaptureFujiDuration(txt)
-		case models.Mainnet:
+		case network.Kind == models.Mainnet && isPos:
+			d, err = app.Prompt.CaptureMainnetL1StakingDuration(txt)
+		case network.Kind == models.Mainnet && !isPos:
 			d, err = app.Prompt.CaptureMainnetDuration(txt)
-		case models.EtnaDevnet:
+		case network.Kind == models.EtnaDevnet:
 			d, err = app.Prompt.CaptureEtnaDuration(txt)
 		default:
 			d, err = app.Prompt.CaptureDuration(txt)
@@ -759,7 +758,7 @@ func getTimeParameters(network models.Network, nodeID ids.NodeID, isValidator bo
 		case defaultDurationOption:
 			useDefaultDuration = true
 		default:
-			duration, err = PromptDuration(start, network)
+			duration, err = PromptDuration(start, network, false) // notSoV
 			if err != nil {
 				return time.Time{}, 0, err
 			}

diff --git a/cmd/blockchaincmd/deploy.go b/cmd/blockchaincmd/deploy.go
@@ -113,7 +113,6 @@ var (
 	ErrMutuallyExlusiveKeyLedger   = errors.New("key source flags --key, --ledger/--ledger-addrs are mutually exclusive")
 	ErrStoredKeyOnMainnet          = errors.New("key --key is not available for mainnet operations")
 	errMutuallyExlusiveSubnetFlags = errors.New("--subnet-only and --subnet-id are mutually exclusive")
-	errNotSupportedOnMainnet       = errors.New("deploying sovereign blockchain is currently not supported on Mainnet")
 )
 
 // avalanche blockchain deploy

diff --git a/cmd/blockchaincmd/helpers.go b/cmd/blockchaincmd/helpers.go
@@ -100,7 +100,7 @@ func UpdatePChainHeight(
 	title string,
 ) error {
 	_, err := ux.TimedProgressBar(
-		30*time.Second,
+		40*time.Second,
 		title,
 		0,
 	)

diff --git a/cmd/contractcmd/init_validator_manager.go b/cmd/contractcmd/init_validator_manager.go
@@ -47,6 +47,7 @@ var (
 		networkoptions.Devnet,
 		networkoptions.EtnaDevnet,
 		networkoptions.Fuji,
+		networkoptions.Mainnet,
 	}
 	validatorManagerFlags ValidatorManagerFlags
 	initPOSManagerFlags   POSManagerSpecFlags

diff --git a/cmd/nodecmd/validate_primary.go b/cmd/nodecmd/validate_primary.go
@@ -206,7 +206,7 @@ func GetTimeParametersPrimaryNetwork(network models.Network, nodeIndex int, vali
 		}
 	default:
 		useCustomDuration = true
-		duration, err = blockchaincmd.PromptDuration(start, network)
+		duration, err = blockchaincmd.PromptDuration(start, network, false) // not L1
 		if err != nil {
 			return time.Time{}, 0, err
 		}

diff --git a/internal/mocks/prompter.go b/internal/mocks/prompter.go
diff --git a/pkg/constants/etna.go b/pkg/constants/etna.go
@@ -41,7 +41,8 @@ var (
 const StakingEtnaMinimumDuration = 100 * time.Second
 
 var EtnaActivationTime = map[uint32]time.Time{
-	avagoconstants.FujiID: time.Date(2024, time.November, 25, 16, 0, 0, 0, time.UTC),
-	EtnaDevnetNetworkID:   time.Date(2024, time.October, 9, 20, 0, 0, 0, time.UTC),
-	LocalNetworkID:        upgrade.Default.EtnaTime,
+	avagoconstants.FujiID:    time.Date(2024, time.November, 25, 16, 0, 0, 0, time.UTC),
+	avagoconstants.MainnetID: time.Date(2024, time.December, 16, 17, 0, 0, 0, time.UTC),
+	EtnaDevnetNetworkID:      time.Date(2024, time.October, 9, 20, 0, 0, 0, time.UTC),
+	LocalNetworkID:           upgrade.Default.EtnaTime,
 }
diff --git a/pkg/prompts/prompts.go b/pkg/prompts/prompts.go
@@ -107,6 +107,7 @@ type Prompter interface {
 	CaptureEtnaDuration(promptStr string) (time.Duration, error)
 	CaptureFujiDuration(promptStr string) (time.Duration, error)
 	CaptureMainnetDuration(promptStr string) (time.Duration, error)
+	CaptureMainnetL1StakingDuration(promptStr string) (time.Duration, error)
 	CaptureDate(promptStr string) (time.Time, error)
 	CaptureNodeID(promptStr string) (ids.NodeID, error)
 	CaptureID(promptStr string) (ids.ID, error)
@@ -263,6 +264,20 @@ func (*realPrompter) CaptureMainnetDuration(promptStr string) (time.Duration, er
 	return time.ParseDuration(durationStr)
 }
 
+func (*realPrompter) CaptureMainnetL1StakingDuration(promptStr string) (time.Duration, error) {
+	prompt := promptui.Prompt{
+		Label:    promptStr,
+		Validate: validateMainnetL1StakingDuration,
+	}
+
+	durationStr, err := prompt.Run()
+	if err != nil {
+		return 0, err
+	}
+
+	return time.ParseDuration(durationStr)
+}
+
 func (*realPrompter) CaptureDate(promptStr string) (time.Time, error) {
 	prompt := promptui.Prompt{
 		Label:    promptStr,

diff --git a/pkg/prompts/validations.go b/pkg/prompts/validations.go
@@ -58,6 +58,21 @@ func validateMainnetStakingDuration(input string) error {
 	return nil
 }
 
+func validateMainnetL1StakingDuration(input string) error {
+	const minL1StakingDuration = 24 * time.Hour
+	d, err := time.ParseDuration(input)
+	if err != nil {
+		return err
+	}
+	if d > genesis.MainnetParams.MaxStakeDuration {
+		return fmt.Errorf("exceeds maximum staking duration of %s", ux.FormatDuration(genesis.MainnetParams.MaxStakeDuration))
+	}
+	if d < minL1StakingDuration {
+		return fmt.Errorf("below the minimum staking duration of %s", ux.FormatDuration(minL1StakingDuration))
+	}
+	return nil
+}
+
 func validateFujiStakingDuration(input string) error {
 	d, err := time.ParseDuration(input)
 	if err != nil {