Bug fix setting of initial entropy for sentries (#108)

* Bug fix for sentry nodes * Style
fetchai · Jul 7, 2020 · 76f851a · 76f851a
1 parent 6dea79a
commit 76f851a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/beacon/entropy_generator.go b/beacon/entropy_generator.go
@@ -261,6 +261,14 @@ func (entropyGenerator *EntropyGenerator) changeKeys() (didChangeKeys bool) {
 			"start", entropyGenerator.aeon.Start)
 		didChangeKeys = true
 	}
+
+	// If lastComputedEntropyHeight is not set then set it is equal to group public key (should
+	// only be the case one for first DKG after genesis)
+	if entropyGenerator.lastComputedEntropyHeight == -1 && entropyGenerator.aeon.aeonExecUnit != nil {
+		entropyGenerator.lastComputedEntropyHeight = entropyGenerator.lastBlockHeight
+		entropyGenerator.entropyComputed[entropyGenerator.lastComputedEntropyHeight] =
+			tmhash.Sum([]byte(entropyGenerator.aeon.aeonExecUnit.GroupPublicKey()))
+	}
 	return
 }
 
@@ -383,13 +391,6 @@ func (entropyGenerator *EntropyGenerator) sign() {
 		entropyGenerator.Logger.Debug("sign: no dkg private key", "height", entropyGenerator.lastBlockHeight+1)
 		return
 	}
-	if entropyGenerator.lastComputedEntropyHeight == -1 {
-		// If lastComputedEntropyHeight is not set then set it is equal to group public key (should
-		// only be the case one for first DKG after genesis)
-		entropyGenerator.lastComputedEntropyHeight = entropyGenerator.lastBlockHeight
-		entropyGenerator.entropyComputed[entropyGenerator.lastComputedEntropyHeight] =
-			tmhash.Sum([]byte(entropyGenerator.aeon.aeonExecUnit.GroupPublicKey()))
-	}
 
 	index, _ := entropyGenerator.aeon.validators.GetByAddress(entropyGenerator.aeon.privValidator.GetPubKey().Address())
 	blockHeight := entropyGenerator.lastBlockHeight + 1

diff --git a/config/config.go b/config/config.go
@@ -39,7 +39,7 @@ var (
 	defaultPrivValKeyName   = "priv_validator_key.json"
 	defaultPrivValStateName = "priv_validator_state.json"
 
-	defaultOldEntropyKeyName     = "old_entropy_key.json"
+	defaultOldEntropyKeyName  = "old_entropy_key.json"
 	defaultEntropyKeyName     = "entropy_key.json"
 	defaultNextEntropyKeyName = "next_entropy_key.json"
 	defaultNoiseKeyName       = "noise_key.json"
@@ -51,7 +51,7 @@ var (
 	defaultGenesisJSONPath    = filepath.Join(defaultConfigDir, defaultGenesisJSONName)
 	defaultPrivValKeyPath     = filepath.Join(defaultConfigDir, defaultPrivValKeyName)
 	defaultPrivValStatePath   = filepath.Join(defaultDataDir, defaultPrivValStateName)
-	defaultOldEntropyKeyPath     = filepath.Join(defaultDataDir, defaultOldEntropyKeyName)
+	defaultOldEntropyKeyPath  = filepath.Join(defaultDataDir, defaultOldEntropyKeyName)
 	defaultEntropyKeyPath     = filepath.Join(defaultDataDir, defaultEntropyKeyName)
 	defaultNextEntropyKeyPath = filepath.Join(defaultDataDir, defaultNextEntropyKeyName)
 	defaultNoiseKeyPath       = filepath.Join(defaultDataDir, defaultNoiseKeyName)

diff --git a/consensus/metrics.go b/consensus/metrics.go
@@ -254,7 +254,7 @@ func NopMetrics() *Metrics {
 		BlockParts:      discard.NewCounter(),
 
 		NumFailuresAsBlockProducer: discard.NewCounter(),
-		NumBlockProducer: discard.NewCounter(),
+		NumBlockProducer:           discard.NewCounter(),
 		BlockWithEntropy:           discard.NewGauge(),
 	}
 }
diff --git a/consensus/state.go b/consensus/state.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"github.com/tendermint/tendermint/tx_extensions"
 	"math/rand"
+	"os"
 	"reflect"
 	"runtime/debug"
 	"sync"
 	"time"
-	"os"
 
 	"github.com/pkg/errors"
 

diff --git a/node/node.go b/node/node.go
@@ -592,15 +592,15 @@ func createBeaconReactor(
 	for _, fileToLoad := range keyFiles {
 		if cmn.FileExists(fileToLoad) {
 			// Load the aeon from file
-			if aeonFile, err := beacon.LoadAeonDetailsFile(fileToLoad);err == nil {
+			if aeonFile, err := beacon.LoadAeonDetailsFile(fileToLoad); err == nil {
 				// Get the validators for that aeon
-				if vals, err1 := sm.LoadValidators(db, aeonFile.PublicInfo.ValidatorHeight);err1 == nil {
+				if vals, err1 := sm.LoadValidators(db, aeonFile.PublicInfo.ValidatorHeight); err1 == nil {
 
 					// Push the complete aeon into the entropy generator
 					aeonDetails := beacon.LoadAeonDetails(aeonFile, vals, privValidator)
 					entropyGenerator.SetNextAeonDetails(aeonDetails)
 
-						// Set dkg runner to most recent aeon which we generated keys for
+					// Set dkg runner to most recent aeon which we generated keys for
 					if dkgRunner != nil {
 						dkgRunner.SetCurrentAeon(aeonDetails.Start, aeonDetails.End)
 					}