Merge pull request #3766 from oasisprotocol/andrej/bugfix/3763

go/consensus: Exclude expired nodes from validator set at genesis time

.changelog/3763.bugfix.md

@@ -0,0 +1,3 @@
+go/consensus: Exclude expired nodes from validator set at genesis time
+
+The validator set selection algorithm now properly ignores expired nodes.

go/consensus/tendermint/api/genesis.go

@@ -160,6 +160,12 @@ func convertValidators(d *genesis.Document) ([]tmtypes.GenesisValidator, error)
 			continue
 		}
 
+		// Skip expired nodes.
+		if openedNode.IsExpired(uint64(d.Beacon.Base)) {
+			continue
+		}
+
+		// Calculate voting power from stake.
 		var power int64
 		if d.Scheduler.Parameters.DebugBypassStake {
 			power = 1

go/consensus/tendermint/api/genesis_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/common/node"
 	"github.com/oasisprotocol/oasis-core/go/common/quantity"
 
+	beacon "github.com/oasisprotocol/oasis-core/go/beacon/api"
 	genesis "github.com/oasisprotocol/oasis-core/go/genesis/api"
 	registry "github.com/oasisprotocol/oasis-core/go/registry/api"
 	scheduler "github.com/oasisprotocol/oasis-core/go/scheduler/api"
@@ -43,16 +44,20 @@ func TestValidatorConversionTopK(t *testing.T) {
 		return e, se
 	}
 
-	mknod := func(ent entity.Entity, num int) *node.MultiSignedNode {
+	mknod := func(ent entity.Entity, num int, expired bool) *node.MultiSignedNode {
 		nods := memorySigner.NewTestSigner(fmt.Sprintf("test node %d", num))
 		n := node.Node{
-			ID:       nods.Public(),
-			EntityID: ent.ID,
-			Roles:    node.RoleValidator,
+			ID:         nods.Public(),
+			EntityID:   ent.ID,
+			Expiration: 1000,
+			Roles:      node.RoleValidator,
 			Consensus: node.ConsensusInfo{
 				ID: nods.Public(),
 			},
 		}
+		if expired {
+			n.Expiration = 1
+		}
 		sn, err := node.MultiSignNode(
 			[]signature.Signer{nods},
 			registry.RegisterGenesisNodeSignatureContext,
@@ -71,16 +76,20 @@ func TestValidatorConversionTopK(t *testing.T) {
 	e4, se4 := mkent(4)
 	e5, se5 := mkent(5)
 
-	sn0 := mknod(e0, 0)
-	sn1 := mknod(e1, 1)
-	sn2 := mknod(e2, 2)
-	sn3 := mknod(e3, 3)
-	sn4 := mknod(e4, 4)
-	sn5 := mknod(e4, 5)
+	sn0 := mknod(e0, 0, false)
+	sn1 := mknod(e1, 1, false)
+	sn2 := mknod(e2, 2, false)
+	sn3 := mknod(e3, 3, false)
+	sn4 := mknod(e4, 4, false)
+	sn5 := mknod(e4, 5, false)
+	sn6 := mknod(e5, 6, true)
 
 	base := scheduler.BaseUnitsPerVotingPower.ToBigInt().Uint64()
 
 	doc := &genesis.Document{
+		Beacon: beacon.Genesis{
+			Base: beacon.EpochTime(123),
+		},
 		Scheduler: scheduler.Genesis{
 			Parameters: scheduler.ConsensusParameters{
 				MinValidators:          1,
@@ -93,7 +102,7 @@ func TestValidatorConversionTopK(t *testing.T) {
 				se0, se1, se2, se3, se4, se5,
 			},
 			Nodes: []*node.MultiSignedNode{
-				sn0, sn1, sn2, sn3, sn4, sn5,
+				sn0, sn1, sn2, sn3, sn4, sn5, sn6,
 			},
 		},
 		Staking: staking.Genesis{
@@ -103,7 +112,7 @@ func TestValidatorConversionTopK(t *testing.T) {
 				staking.NewAddress(e2.ID): mkacct(base * 3000),
 				staking.NewAddress(e3.ID): mkacct(base * 4000),
 				staking.NewAddress(e4.ID): mkacct(base * 5000),
-				staking.NewAddress(e5.ID): mkacct(base * 6000),
+				staking.NewAddress(e5.ID): mkacct(base * 10000),
 			},
 		},
 	}