Merge branch 'dev' into lint

Author: StephenButtolph

README.md

@@ -1,4 +1,5 @@
 # AvalancheGo
+![Avalanche](resources/AvalancheBlack.png?raw=true)
 
 Official node implementation of the [Avalanche](https://avax.network) network -
 a blockchains platform with high throughput, and blazing fast transactions.

go.mod

@@ -37,5 +37,6 @@ require (
 	golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 // indirect
 	google.golang.org/genproto v0.0.0-20200218151345-dad8c97a84f5 // indirect
 	google.golang.org/grpc v1.29.1
+	google.golang.org/protobuf v1.23.0
 	gotest.tools v2.2.0+incompatible
 )

main/params.go

@@ -262,6 +262,18 @@ func getViper() (*viper.Viper, error) {
 // setNodeConfig sets attributes on [Config] based on the values
 // defined in the [viper] environment
 func setNodeConfig(v *viper.Viper) error {
+	// Consensus Parameters
+	Config.ConsensusParams.K = v.GetInt(snowSampleSizeKey)
+	Config.ConsensusParams.Alpha = v.GetInt(snowQuorumSizeKey)
+	Config.ConsensusParams.BetaVirtuous = v.GetInt(snowVirtuousCommitThresholdKey)
+	Config.ConsensusParams.BetaRogue = v.GetInt(snowRogueCommitThresholdKey)
+	Config.ConsensusParams.Parents = v.GetInt(snowAvalancheNumParentsKey)
+	Config.ConsensusParams.BatchSize = v.GetInt(snowAvalancheBatchSizeKey)
+	Config.ConsensusParams.ConcurrentRepolls = v.GetInt(snowConcurrentRepollsKey)
+
+	Config.ConsensusGossipFrequency = v.GetDuration(consensusGossipFrequencyKey)
+	Config.ConsensusShutdownTimeout = v.GetDuration(consensusShutdownTimeoutKey)
+
 	// Logging:
 	loggingConfig, err := logging.DefaultConfig()
 	if err != nil {
@@ -640,18 +652,6 @@ func setNodeConfig(v *viper.Viper) error {
 		Config.Params = *genesis.GetParams(networkID)
 	}
 
-	// Consensus Parameters
-	Config.ConsensusParams.K = v.GetInt(snowSampleSizeKey)
-	Config.ConsensusParams.Alpha = v.GetInt(snowQuorumSizeKey)
-	Config.ConsensusParams.BetaVirtuous = v.GetInt(snowVirtuousCommitThresholdKey)
-	Config.ConsensusParams.BetaRogue = v.GetInt(snowRogueCommitThresholdKey)
-	Config.ConsensusParams.Parents = v.GetInt(snowAvalancheNumParentsKey)
-	Config.ConsensusParams.BatchSize = v.GetInt(snowAvalancheBatchSizeKey)
-	Config.ConsensusParams.ConcurrentRepolls = v.GetInt(snowConcurrentRepollsKey)
-
-	Config.ConsensusGossipFrequency = v.GetDuration(consensusGossipFrequencyKey)
-	Config.ConsensusShutdownTimeout = v.GetDuration(consensusShutdownTimeoutKey)
-
 	// Assertions
 	Config.EnableAssertions = v.GetBool(assertionsEnabledKey)
 

resources/AvalancheBlack.png

@@ -13,7 +13,7 @@ BUILD_DIR="$AVALANCHE_PATH/build" # Where binaries go
 PLUGIN_DIR="$BUILD_DIR/plugins" # Where plugin binaries (namely coreth) go
 BINARY_PATH="$PLUGIN_DIR/evm"
 
-CORETH_VER="v0.3.17"
+CORETH_VER="v0.3.18"
 
 CORETH_PATH="$GOPATH/pkg/mod/github.com/ava-labs/coreth@$CORETH_VER"
 

scripts/build_coreth.sh

@@ -38,4 +38,7 @@ type Block interface {
 	// This is used for sending blocks to peers. The bytes should be able to be
 	// parsed into the same block on another node.
 	Bytes() []byte
+
+	// Height returns the height of this block in the chain.
+	Height() uint64
 }

snow/consensus/snowman/block.go

@@ -159,9 +159,13 @@ func (b *Bootstrapper) process(vtxs ...avalanche.Vertex) error {
 		}
 	}
 
+	// Cache to ensure that we don't reprocess the same vertex within the loop below
+	// TODO remove after Apricot release?
+	dontReprocessCache := &cache.LRU{Size: 1000}
 	for toProcess.Len() > 0 { // While there are unprocessed vertices
 		vtx := toProcess.Pop() // Get an unknown vertex or one furthest down the DAG
 		vtxID := vtx.ID()
+		dontReprocessCache.Put(vtxID, nil)
 
 		switch vtx.Status() {
 		case choices.Unknown:
@@ -207,8 +211,11 @@ func (b *Bootstrapper) process(vtxs ...avalanche.Vertex) error {
 				return err
 			}
 			for _, parent := range parents { // Process the parents of this vertex (traverse up the DAG)
-				if _, ok := b.processedCache.Get(parent.ID()); !ok { // But only if we haven't processed the parent
-					toProcess.Push(parent)
+				parentID := parent.ID()
+				if _, ok := b.processedCache.Get(parentID); !ok { // But only if we haven't processed the parent
+					if _, ok := dontReprocessCache.Get(parentID); !ok {
+						toProcess.Push(parent)
+					}
 				}
 			}
 			height, err := vtx.Height()

snow/engine/avalanche/bootstrap/bootstrapper.go

@@ -239,7 +239,6 @@ func (b *queryBenchlist) cleanup() {
 	updatedWeight := currentWeight
 	totalWeight := b.vdrs.Weight()
 	maxBenchlistWeight := uint64(float64(totalWeight) * b.maxPortion)
-
 	// Iterate over elements of the benchlist in order of expiration
 	for b.benchlistOrder.Len() > 0 {
 		e := b.benchlistOrder.Front()
@@ -273,7 +272,8 @@ func (b *queryBenchlist) cleanup() {
 	}
 
 	updatedBenchLen := b.benchlistSet.Len()
-	b.ctx.Log.Debug("Benched Weight: (%d/%d) -> (%d/%d). Benched Validators: %d -> %d.",
+	b.ctx.Log.Debug("Maximum Benchable Weight: %d. Benched Weight: (%d/%d) -> (%d/%d). Benched Validators: %d -> %d.",
+		maxBenchlistWeight,
 		currentWeight,
 		totalWeight,
 		updatedWeight,

snow/networking/benchlist/benchlist.go

@@ -50,6 +50,11 @@ type benchlistManager struct {
 
 // NewManager returns a manager for chain-specific query benchlisting
 func NewManager(config *Config) Manager {
+	// If the maximum portion of validators allowed to be benchlisted
+	// is 0, return the no-op benchlist
+	if config.MaxPortion <= 0 {
+		return NewNoBenchlist()
+	}
 	return &benchlistManager{
 		config:          config,
 		chainBenchlists: make(map[ids.ID]QueryBenchlist),

snow/networking/benchlist/benchlist_manager.go

@@ -381,7 +381,10 @@ func (sr *ChainRouter) QueryFailed(validatorID ids.ShortID, chainID ids.ID, requ
 	sr.lock.RLock()
 	defer sr.lock.RUnlock()
 
-	sr.timeouts.Cancel(validatorID, chainID, requestID)
+	// Registers a failure to the benchlist instead of canceling the timeout.
+	// This allows the benchlist to register failed queries caused by [validatorID]
+	// being unreachable.
+	sr.timeouts.RegisterFailure(validatorID, chainID, requestID)
 	if chain, exists := sr.chains[chainID]; exists {
 		chain.QueryFailed(validatorID, requestID)
 	} else {