Merge pull request #597 from FactomProject/FD-709_release_6.0.1

Release v6.0.1
FactomProject · Oct 12, 2018 · 035968e · 035968e
2 parents 1a4d70a + e916978
commit 035968e
Show file tree

Hide file tree

Showing 41 changed files with 373 additions and 102 deletions.
diff --git a/Utilities/DatabaseGenerator/blockgen/blockgen.go b/Utilities/DatabaseGenerator/blockgen/blockgen.go
@@ -66,7 +66,7 @@ func (bg *BlockGen) NewBlock(prev *state.DBState, netid uint32, firstTimeStamp i
 		}
 	}
 
-	dblock.HeaderHash()
+	dblock.GetHeaderHash()
 	dblock.BuildBodyMR()
 	dblock.BuildKeyMerkleRoot()
 

diff --git a/Utilities/DatabaseGenerator/blockgen/generator.go b/Utilities/DatabaseGenerator/blockgen/generator.go
@@ -114,7 +114,7 @@ func (g *DBGenerator) loadGenesis() {
 	var err error
 	fmt.Println("\n***********************************")
 	fmt.Println("******* New Database **************")
-	fmt.Println("***********************************\n")
+	fmt.Println("***********************************")
 
 	var customIdentity interfaces.IHash
 	if g.FactomdState.Network == "CUSTOM" {

diff --git a/Utilities/DatabaseIntegrityCheck/DatabaseIntegrityCheck_test.go b/Utilities/DatabaseIntegrityCheck/DatabaseIntegrityCheck_test.go
@@ -16,7 +16,7 @@ func TestCheckDatabaseFromDBO(t *testing.T) {
 }
 
 func TestCheckDatabaseFromState(t *testing.T) {
-	state := testHelper.CreateAndPopulateTestState()
+	state := testHelper.CreateAndPopulateTestStateAndStartValidator()
 	CheckDatabase(state.DB.(interfaces.DBOverlay))
 }
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.0.0
+6.0.1
diff --git a/activations/activationHeight.go b/activations/activationHeight.go
@@ -4,6 +4,7 @@ package activations
 
 import (
 	"fmt"
+	"math"
 	"os"
 
 	"github.com/FactomProject/factomd/common/globals"
@@ -12,9 +13,9 @@ import (
 type ActivationType int
 
 const (
-	_                ActivationType = iota // 0 Don't use ZERO
-	ELECTION_NO_SORT                = iota // 1 -- this is a passing activation and this ID may be reused once that height is passes and the references are removed
-
+	_                       ActivationType = iota // 0 Don't use ZERO
+	ELECTION_NO_SORT                       = iota // 1 -- this is a passing activation and this ID may be reused once that height is passes and the references are removed
+	TESTNET_COINBASE_PERIOD                = iota // 2 -- this is a passing activation and this ID may be reused once that height is passes and the references are removed
 	//
 	ACTIVATION_TYPE_COUNT = iota - 1 // Always Last
 )
@@ -23,6 +24,7 @@ type Activation struct {
 	Name             string
 	Id               ActivationType
 	Description      string
+	DefaultHeight    int            // height of activation on nets not expressly listed (math.MaxInt32 means never)
 	ActivationHeight map[string]int // this maps a network Name to the height for that network for the feature to activate
 }
 
@@ -33,14 +35,24 @@ func init() {
 
 	// unordered list of activations
 	var activations []Activation = []Activation{
-		Activation{"ElectionNoSort", ELECTION_NO_SORT, "Disable sorting of severs after elections",
+		Activation{"ElectionNoSort", ELECTION_NO_SORT,
+			"Disable sorting of severs after elections",
+			0, // active at the beginning of time unless overridden below
 			map[string]int{
 				"MAIN":                      146060 + 8*24*10 + 1, // On 6/20/18 11:45 mainnet was 146060, we want activation at 6/28/18 at ~12pm
-				"TEST":                      0,                    // On 6/20/18 11:45 testnet was 146060, we want activation at 6/22/18 at ~12pm
 				"LOCAL":                     10,                   // Must be > 6 for TestActivationHeightElection to pass
 				"CUSTOM:fct_community_test": 33037 + 2*24*10 + 1,  // On 6/22/18 11:45 testnet was 33037, we want activation at 6/24/18 at 12:00pm
 			},
 		},
+		Activation{"TestNetCoinBasePeriod", TESTNET_COINBASE_PERIOD,
+			"Change testnet coin base payout delay to 144 blocks",
+			math.MaxInt32, // inactive unless overridden below
+			map[string]int{
+				"MAIN":                      math.MaxInt32,
+				"LOCAL":                     math.MaxInt32,
+				"CUSTOM:fct_community_test": 45335, //  Monday morning September 17
+			},
+		},
 	}
 
 	if ACTIVATION_TYPE_COUNT != len(activations) {
@@ -61,7 +73,7 @@ func (id ActivationType) String() string {
 
 	n, ok := ActivationNameMap[id]
 	if !ok {
-		n = fmt.Sprintf("ActivationId(%v)", id)
+		n = fmt.Sprintf("ActivationId(%v)", string(id))
 	}
 	return n
 }
@@ -92,8 +104,12 @@ func IsActive(id ActivationType, height int) bool {
 
 	h, ok := a.ActivationHeight[netName]
 	if !ok {
-		fmt.Fprintf(os.Stderr, "Activation %s does not know network name \"%s\". Activating at 0.\n", id.String(), netName)
-		a.ActivationHeight[netName] = 0
+		a.ActivationHeight[netName] = a.DefaultHeight
+		if a.DefaultHeight != math.MaxInt32 {
+			fmt.Fprintf(os.Stderr, "Activation %s does not know network name \"%s\". Activating at %d.\n", id.String(), netName, a.DefaultHeight)
+		} else {
+			fmt.Fprintf(os.Stderr, "Activation %s does not know network name \"%s\". Never activating.\n", id.String(), netName)
+		}
 		return true
 	}
 

diff --git a/common/directoryBlock/directoryBlock.go b/common/directoryBlock/directoryBlock.go
@@ -445,7 +445,6 @@ func NewDirectoryBlock(prev interfaces.IDirectoryBlock) interfaces.IDirectoryBlo
 
 	newdb.Header = new(DBlockHeader)
 	newdb.GetHeader().SetVersion(constants.VERSION_0)
-
 	if prev != nil {
 		newdb.GetHeader().SetPrevFullHash(prev.GetFullHash())
 		newdb.GetHeader().SetPrevKeyMR(prev.GetKeyMR())

diff --git a/common/identityEntries/newServerEfficiency_test.go b/common/identityEntries/newServerEfficiency_test.go
@@ -44,6 +44,6 @@ func TestNewServerEfficiencyStruct(t *testing.T) {
 	}
 
 	if nses.Efficiency != 4952 {
-		t.Error("Should be 4952, found %d", nses.Efficiency)
+		t.Errorf("Should be 4952, found %d", nses.Efficiency)
 	}
 }
diff --git a/common/messages/dbstate.go b/common/messages/dbstate.go
@@ -694,14 +694,14 @@ func (m *DBStateMsg) MarshalBinary() (rval []byte, err error) {
 
 func (m *DBStateMsg) String() string {
 	data, _ := m.MarshalBinary()
-	return fmt.Sprintf("DBState: dbht:%3d [size: %11s] dblock %6x admin %6x fb %6x ec %6x hash %6x",
+	return fmt.Sprintf("DBState: dbht:%3d [size: %11s] dblock %6x admin %6x fb %6x ec %6x hash %6x ts:%s DB:%v",
 		m.DirectoryBlock.GetHeader().GetDBHeight(),
 		primitives.AddCommas(int64(len(data))),
 		m.DirectoryBlock.GetKeyMR().Bytes()[:3],
 		m.AdminBlock.GetHash().Bytes()[:3],
 		m.FactoidBlock.GetHash().Bytes()[:3],
 		m.EntryCreditBlock.GetHash().Bytes()[:3],
-		m.GetHash().Bytes()[:3])
+		m.GetHash().Bytes()[:3], m.DirectoryBlock.GetTimestamp().String(), m.IsInDB)
 }
 
 func (m *DBStateMsg) LogFields() log.Fields {

diff --git a/common/messages/dbstate_test.go b/common/messages/dbstate_test.go
@@ -165,7 +165,7 @@ func TestMarshalUnmarshalDBStateMsg(t *testing.T) {
 }
 
 func TestSimpleDBStateMsgValidate(t *testing.T) {
-	state := testHelper.CreateAndPopulateTestState()
+	state := testHelper.CreateAndPopulateTestStateAndStartValidator()
 
 	msg := new(DBStateMsg)
 	if msg.Validate(state) >= 0 {
@@ -190,7 +190,7 @@ func TestSimpleDBStateMsgValidate(t *testing.T) {
 }
 
 func TestDBStateDataValidate(t *testing.T) {
-	state := testHelper.CreateAndPopulateTestState()
+	state := testHelper.CreateAndPopulateTestStateAndStartValidator()
 	msg := newDBStateMsg()
 
 	if v := msg.ValidateData(state); v != 1 {

diff --git a/common/messages/electionMsgs/electionAdapter_test.go b/common/messages/electionMsgs/electionAdapter_test.go
@@ -44,7 +44,7 @@ func TestElectionAuditOrder(t *testing.T) {
 }
 
 func TestSimpleSigning(t *testing.T) {
-	s := CreateAndPopulateTestState()
+	s := CreateAndPopulateTestStateAndStartValidator()
 	e := NewTestElection()
 	v1 := NewTestVolunteerMessage(e, 2, 0)
 	err := v1.Sign(s)
@@ -60,7 +60,7 @@ func TestSimpleSigning(t *testing.T) {
 
 func TestElectionAdapterSimple(t *testing.T) {
 	e := NewTestElection()
-	e.State = CreateAndPopulateTestState()
+	e.State = CreateAndPopulateTestStateAndStartValidator()
 	e.State.SetIdentityChainID(primitives.NewZeroHash())
 
 	a := NewElectionAdapter(e, primitives.NewZeroHash())

diff --git a/common/messages/electionMsgs/electionMsgTesting/controller.go b/common/messages/electionMsgs/electionMsgTesting/controller.go
@@ -55,7 +55,7 @@ func NewController(feds, auds int) *Controller {
 		s.Online = true
 
 		c.feds[i] = &s
-		e.State = testHelper.CreateAndPopulateTestState()
+		e.State = testHelper.CreateAndPopulateTestStateAndStartValidator()
 		e.State.SetIdentityChainID(s.ChainID)
 		c.Elections[i] = e
 	}

diff --git a/common/messages/electionMsgs/fedVoteLevelMsg_test.go b/common/messages/electionMsgs/fedVoteLevelMsg_test.go
@@ -17,7 +17,7 @@ import (
 func TestMarshalUnmarshalFedVoteLevel(t *testing.T) {
 	messages.General = new(msgsupport.GeneralFactory)
 	primitives.General = messages.General
-	s := testHelper.CreateAndPopulateTestState()
+	s := testHelper.CreateAndPopulateTestStateAndStartValidator()
 
 	test := func(va *FedVoteLevelMsg, num string) {
 		vas, err := va.JSONString()

diff --git a/common/messages/electionMsgs/fedVotePropose_test.go b/common/messages/electionMsgs/fedVotePropose_test.go
@@ -53,7 +53,7 @@ func TestMarshalUnmarshalFedVoteProposal(t *testing.T) {
 		}
 	}
 
-	s := testHelper.CreateAndPopulateTestState()
+	s := testHelper.CreateAndPopulateTestStateAndStartValidator()
 	// Have volunteer
 	for i := 0; i < 20; i++ {
 		p := NewFedProposalMsg(primitives.RandomHash(), *randomVol(s))

diff --git a/common/messages/electionMsgs/fedVoteVolunteerMsg_test.go b/common/messages/electionMsgs/fedVoteVolunteerMsg_test.go
@@ -42,7 +42,7 @@ func TestUnmarshalFedVoteVolunteerDBSig(t *testing.T) {
 	vol := con.Volunteers[0]
 
 	var err error
-	s := testHelper.CreateAndPopulateTestState()
+	s := testHelper.CreateAndPopulateTestStateAndStartValidator()
 	for s.UpdateState() {
 	}
 	for s.Process() {

diff --git a/common/messages/entryBlockResponse_test.go b/common/messages/entryBlockResponse_test.go
@@ -35,7 +35,7 @@ func TestUnmarshalNilEntryBlockResponse(t *testing.T) {
 
 func TestNewEntryBlockResponse(t *testing.T) {
 
-	state := testHelper.CreateAndPopulateTestState()
+	state := testHelper.CreateAndPopulateTestStateAndStartValidator()
 	msg := NewEntryBlockResponse(state)
 	response := msg.String()
 	timestamp := fmt.Sprintf("%d", msg.GetTimestamp().GetTimeMilli())

diff --git a/common/messages/heartbeat_test.go b/common/messages/heartbeat_test.go
@@ -144,7 +144,7 @@ func newSignedHeartbeat() *Heartbeat {
 }
 
 func TestValidHeatbeat(t *testing.T) {
-	s := testHelper.CreateAndPopulateTestState()
+	s := testHelper.CreateAndPopulateTestStateAndStartValidator()
 	a := identity.RandomAuthority()
 
 	pkey := primitives.RandomPrivateKey()

diff --git a/common/messages/revealEntry_test.go b/common/messages/revealEntry_test.go
@@ -95,7 +95,7 @@ func newRevealEntry() *RevealEntryMsg {
 }
 
 func TestValidRevealMsg(t *testing.T) {
-	s := testHelper.CreateAndPopulateTestState()
+	s := testHelper.CreateAndPopulateTestStateAndStartValidator()
 
 	if v := testValid(1, 0, s); v != 0 {
 		t.Error("Should be 0, found ", v)
@@ -163,7 +163,7 @@ func newMaliciousRevealEntry() *RevealEntryMsg {
 }
 
 func TestRevealMaliciousFirstEntryReveal(t *testing.T) {
-	testState := testHelper.CreateAndPopulateTestState()
+	testState := testHelper.CreateAndPopulateTestStateAndStartValidator()
 
 	m := newMaliciousRevealEntry()
 	goodEntry := newSignedCommitChain()

diff --git a/controlPanel/controlPanel_test.go b/controlPanel/controlPanel_test.go
@@ -65,7 +65,7 @@ func TestControlPanel(t *testing.T) {
 	if LongTest {
 		var i uint32
 		connections := make(chan interface{})
-		emptyState := CreateAndPopulateTestState()
+		emptyState := CreateAndPopulateTestStateAndStartValidator()
 
 		gitBuild := "Test Is Running"
 		go ServeControlPanel(emptyState.ControlPanelChannel, emptyState, connections, nil, gitBuild)
@@ -84,7 +84,7 @@ func TestControlPanel(t *testing.T) {
 
 func TestDataDump(t *testing.T) {
 	AllConnections = NewConnectionsMap()
-	s := CreateAndPopulateTestState()
+	s := CreateAndPopulateTestStateAndStartValidator()
 	ds, err := state.DeepStateDisplayCopy(s)
 	if err != nil {
 		t.Error(err)
@@ -100,7 +100,7 @@ func TestDataDump(t *testing.T) {
 func TestSearching(t *testing.T) {
 	var err error
 	InitTemplates()
-	s := CreateAndPopulateTestState()
+	s := CreateAndPopulateTestStateAndStartValidator()
 	StatePointer = s
 
 	c := new(SearchedStruct)

diff --git a/database/securedb/encryptedMarshaler_test.go b/database/securedb/encryptedMarshaler_test.go
@@ -18,7 +18,7 @@ func TestEncryptedMarshaler(t *testing.T) {
 	var err error
 	var ems []*EncryptedMarshaler
 	var hashes []interfaces.BinaryMarshallable
-	s := testHelper.CreateAndPopulateTestState()
+	s := testHelper.CreateAndPopulateTestStateAndStartValidator()
 
 	key := primitives.RandomHash().Bytes()
 	// Test with IHash