Add ParticipationRegistry Insert/Delete usage in node.

data/account/participation.go

@@ -57,25 +57,31 @@ type Participation struct {
 	KeyDilution uint64
 }
 
-// participationIDData is for msgpack encoding the participation data.
-type participationIDData struct {
+// ParticipationKeyIdentity is for msgpack encoding the participation data.
+type ParticipationKeyIdentity struct {
 	_struct struct{} `codec:",omitempty,omitemptyarray"`
 
-	Parent      basics.Address    `codec:"addr"`
-	VRFSK       crypto.VrfPrivkey `codec:"vrfsk"`
-	FirstValid  basics.Round      `codec:"fv"`
-	LastValid   basics.Round      `codec:"lv"`
-	KeyDilution uint64            `codec:"kd"`
+	Parent      basics.Address                  `codec:"addr"`
+	VRFSK       crypto.VrfPrivkey               `codec:"vrfsk"`
+	VoteID      crypto.OneTimeSignatureVerifier `codec:"vote-id"`
+	FirstValid  basics.Round                    `codec:"fv"`
+	LastValid   basics.Round                    `codec:"lv"`
+	KeyDilution uint64                          `codec:"kd"`
 }
 
 // ToBeHashed implements the Hashable interface.
-func (id *participationIDData) ToBeHashed() (protocol.HashID, []byte) {
+func (id *ParticipationKeyIdentity) ToBeHashed() (protocol.HashID, []byte) {
 	return protocol.ParticipationKeys, protocol.Encode(id)
 }
 
-// ParticipationID computes a ParticipationID.
-func (part Participation) ParticipationID() ParticipationID {
-	idData := participationIDData{
+// ID creates a ParticipationID hash from the identity file.
+func (id ParticipationKeyIdentity) ID() ParticipationID {
+	return ParticipationID(crypto.HashObj(&id))
+}
+
+// ID computes a ParticipationID.
+func (part Participation) ID() ParticipationID {
+	idData := ParticipationKeyIdentity{
 		Parent:      part.Parent,
 		FirstValid:  part.FirstValid,
 		LastValid:   part.LastValid,
@@ -84,6 +90,9 @@ func (part Participation) ParticipationID() ParticipationID {
 	if part.VRF != nil {
 		copy(idData.VRFSK[:], part.VRF.SK[:])
 	}
+	if part.Voting != nil {
+		copy(idData.VoteID[:], part.Voting.OneTimeSignatureVerifier[:])
+	}
 
 	return ParticipationID(crypto.HashObj(&idData))
 }

data/account/participationRegistry.go

@@ -126,6 +126,9 @@ type ParticipationRegistry interface {
 	// Delete removes a record from storage.
 	Delete(id ParticipationID) error
 
+	// DeleteExpired removes all records from storage which are expired on the given round.
+	DeleteExpired(round basics.Round) error
+
 	// Get a participation record.
 	Get(id ParticipationID) ParticipationRecord
 
@@ -283,9 +286,9 @@ func (db *participationDB) Insert(record Participation) (id ParticipationID, err
 	db.mutex.Lock()
 	defer db.mutex.Unlock()
 
-	id = record.ParticipationID()
+	id = record.ID()
 	if _, ok := db.cache[id]; ok {
-		return ParticipationID{}, ErrAlreadyInserted
+		return id, ErrAlreadyInserted
 	}
 
 	err = db.store.Wdb.Atomic(func(ctx context.Context, tx *sql.Tx) error {
@@ -387,6 +390,19 @@ func (db *participationDB) Delete(id ParticipationID) error {
 	return err
 }
 
+func (db *participationDB) DeleteExpired(round basics.Round) error {
+	// This could be optimized to delete everything with one query.
+	for _, v := range db.GetAll() {
+		if v.LastValid < round {
+			err := db.Delete(v.ParticipationID)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 // scanRecords is a helper to manage scanning participation records.
 func scanRecords(rows *sql.Rows) ([]ParticipationRecord, error) {
 	results := make([]ParticipationRecord, 0)