Merge pull request #199 from ava-labs/dev

v1.2.3-rc
ava-labs · Dec 1, 2021 · 6c231c8 · 6c231c8
2 parents 8f03378 + b005d55
commit 6c231c8
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/cmd/startnode.go b/cmd/startnode.go
@@ -151,8 +151,6 @@ func init() {
 	StartnodeCmd.Flags().IntVar(&flags.SnowQuorumSize, "snow-quorum-size", flags.SnowQuorumSize, "Alpha value to use for required number positive results.")
 	StartnodeCmd.Flags().IntVar(&flags.SnowVirtuousCommitThreshold, "snow-virtuous-commit-threshold", flags.SnowVirtuousCommitThreshold, "Beta value to use for virtuous transactions.")
 	StartnodeCmd.Flags().IntVar(&flags.SnowRogueCommitThreshold, "snow-rogue-commit-threshold", flags.SnowRogueCommitThreshold, "Beta value to use for rogue transactions.")
-	StartnodeCmd.Flags().IntVar(&flags.SnowEpochFirstTransition, "snow-epoch-first-transition", flags.SnowEpochFirstTransition, "Unix timestamp of the transition from epoch 0 to epoch 1. Defaults to 1609873200 which is 1/5/2021 @ 7:00pm (UTC)")
-	StartnodeCmd.Flags().StringVar(&flags.SnowEpochDuration, "snow-epoch-duration", flags.SnowEpochDuration, "Duration of each epoch. Defaults to `6h`")
 	StartnodeCmd.Flags().IntVar(&flags.SnowConcurrentRepolls, "snow-concurrent-repolls", flags.SnowConcurrentRepolls, "Snow consensus requires repolling transactions that are issued during low time of network usage. This parameter lets one define how aggressive the client will be in finalizing these pending transactions. This should only be changed after careful consideration of the tradeoffs of Snow consensus. The value must be at least `1` and at most `--snow-rogue-commit-threshold`. Defaults to `4`")
 	StartnodeCmd.Flags().IntVar(&flags.MinDelegatorStake, "min-delegator-stake", flags.MinDelegatorStake, "The minimum stake, in nAVAX, that can be delegated to a validator of the Primary Network. Defaults to `25000000000` (25 AVAX) on Main Net. Defaults to `5000000` (.005 AVAX) on Test Net.")
 	StartnodeCmd.Flags().StringVar(&flags.ConsensusShutdownTimeout, "consensus-shutdown-timeout", flags.ConsensusShutdownTimeout, "Timeout before killing an unresponsive chain. Defaults to `5s`")

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.2.9
-	github.com/ava-labs/avalanchego v1.6.5
+	github.com/ava-labs/avalanchego v1.7.1
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/rpc v1.2.0

diff --git a/go.sum b/go.sum
@@ -38,6 +38,8 @@ github.com/ava-labs/avalanchego v1.6.4 h1:EbjGqyU9MqpsRVC9wmNmwUNlFM8aiTTKmNAwui
 github.com/ava-labs/avalanchego v1.6.4/go.mod h1:DzxlGkF8hj3GiwRoQfHq9gJfyt4EyeIpAsdfBOBg6mI=
 github.com/ava-labs/avalanchego v1.6.5 h1:xzta2OGAjF7ka06Cl1IoB4jtrqhAuxjI1onVDGWwdsk=
 github.com/ava-labs/avalanchego v1.6.5/go.mod h1:M21LNXMX5AcvUfQ0x1wKewOEgJjOcq8W08m3gmnGJAU=
+github.com/ava-labs/avalanchego v1.7.1 h1:vN6UGxkDSw/CRSx/uWCbT3GQ1Gmvx6IOM7WB3fMGmjM=
+github.com/ava-labs/avalanchego v1.7.1/go.mod h1:jwfTpP+SB9AZVnHBuh3/d2WNbsIgGwUpqOfOgtEkelk=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

diff --git a/node/cli_tools.go b/node/cli_tools.go
@@ -81,9 +81,6 @@ func FlagsToArgs(flags Flags, basedir string, sepBase bool) ([]string, Metadata)
 		"--snow-sample-size=" + strconv.Itoa(flags.SnowSampleSize),
 		"--snow-quorum-size=" + strconv.Itoa(flags.SnowQuorumSize),
 		"--snow-virtuous-commit-threshold=" + strconv.Itoa(flags.SnowVirtuousCommitThreshold),
-		"--snow-rogue-commit-threshold=" + strconv.Itoa(flags.SnowRogueCommitThreshold),
-		"--snow-epoch-first-transition=" + strconv.Itoa(flags.SnowEpochFirstTransition),
-		"--snow-epoch-duration=" + flags.SnowEpochDuration,
 		"--min-delegator-stake=" + strconv.Itoa(flags.MinDelegatorStake),
 		"--consensus-shutdown-timeout=" + flags.ConsensusShutdownTimeout,
 		"--consensus-gossip-frequency=" + flags.ConsensusGossipFrequency,

diff --git a/node/config.go b/node/config.go
@@ -74,8 +74,6 @@ type Flags struct {
 	SnowQuorumSize              int
 	SnowVirtuousCommitThreshold int
 	SnowRogueCommitThreshold    int
-	SnowEpochFirstTransition    int
-	SnowEpochDuration           string
 	SnowConcurrentRepolls       int
 	MinDelegatorStake           int
 	ConsensusShutdownTimeout    string
@@ -196,8 +194,6 @@ type FlagsYAML struct {
 	SnowQuorumSize                          *int     `yaml:"snow-quorum-size,omitempty"`
 	SnowVirtuousCommitThreshold             *int     `yaml:"snow-virtuous-commit-threshold,omitempty"`
 	SnowRogueCommitThreshold                *int     `yaml:"snow-rogue-commit-threshold,omitempty"`
-	SnowEpochFirstTransition                *int     `yaml:"snow-epoch-first-transition,omitempty"`
-	SnowEpochDuration                       *string  `yaml:"snow-epoch-duration,omitempty"`
 	SnowConcurrentRepolls                   *int     `yaml:"snow-concurrent-repolls,omitempty"`
 	MinDelegatorStake                       *int     `yaml:"min-delegator-stake,omitempty"`
 	ConsensusShutdownTimeout                *string  `yaml:"consensus-shutdown-timeout,omitempty"`
@@ -318,8 +314,6 @@ func DefaultFlags() Flags {
 		SnowQuorumSize:                          16,
 		SnowVirtuousCommitThreshold:             15,
 		SnowRogueCommitThreshold:                20,
-		SnowEpochFirstTransition:                1609873200,
-		SnowEpochDuration:                       "6h",
 		SnowConcurrentRepolls:                   4,
 		MinDelegatorStake:                       5000000,
 		ConsensusShutdownTimeout:                "5s",