Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion daemon/algod/api/server/v2/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func convertParticipationRecord(record account.ParticipationRecord) generated.Pa
participationKey.LastVote = roundToPtrOrNil(record.LastVote)
participationKey.LastBlockProposal = roundToPtrOrNil(record.LastBlockProposal)
participationKey.LastVote = roundToPtrOrNil(record.LastVote)
participationKey.LastStateProof = roundToPtrOrNil(record.LastCompactCertificate)
participationKey.LastStateProof = roundToPtrOrNil(record.LastStateProof)

// Special case for first valid on round 0
if record.EffectiveLast != 0 && record.EffectiveFirst == 0 {
Expand Down
80 changes: 40 additions & 40 deletions data/account/participationRegistry.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ type ParticipationRecord struct {
LastValid basics.Round
KeyDilution uint64

LastVote basics.Round
LastBlockProposal basics.Round
LastCompactCertificate basics.Round
EffectiveFirst basics.Round
EffectiveLast basics.Round
LastVote basics.Round
LastBlockProposal basics.Round
LastStateProof basics.Round
EffectiveFirst basics.Round
EffectiveLast basics.Round

VRF *crypto.VRFSecrets
Voting *crypto.OneTimeSignatureSecrets
Expand All @@ -101,18 +101,18 @@ func (r ParticipationRecord) Duplicate() ParticipationRecord {
voting = r.Voting.Snapshot()
}
return ParticipationRecord{
ParticipationID: r.ParticipationID,
Account: r.Account,
FirstValid: r.FirstValid,
LastValid: r.LastValid,
KeyDilution: r.KeyDilution,
LastVote: r.LastVote,
LastBlockProposal: r.LastBlockProposal,
LastCompactCertificate: r.LastCompactCertificate,
EffectiveFirst: r.EffectiveFirst,
EffectiveLast: r.EffectiveLast,
VRF: &vrf,
Voting: &voting,
ParticipationID: r.ParticipationID,
Account: r.Account,
FirstValid: r.FirstValid,
LastValid: r.LastValid,
KeyDilution: r.KeyDilution,
LastVote: r.LastVote,
LastBlockProposal: r.LastBlockProposal,
LastStateProof: r.LastStateProof,
EffectiveFirst: r.EffectiveFirst,
EffectiveLast: r.EffectiveLast,
VRF: &vrf,
Voting: &voting,
}
}

Expand All @@ -124,13 +124,13 @@ type ParticipationAction int
const (
Vote ParticipationAction = iota
BlockProposal
CompactCertificate
StateProof
)

var participationActionFields = map[ParticipationAction]string{
Vote: "lastVoteRound",
BlockProposal: "lastBlockProposalRound",
CompactCertificate: "lastCompactCertificateRound",
Vote: "lastVoteRound",
BlockProposal: "lastBlockProposalRound",
StateProof: "lastStateProofRound",
}

// ErrParticipationIDNotFound is used when attempting to update a set of keys which do not exist.
Expand Down Expand Up @@ -246,7 +246,7 @@ var (

lastVoteRound INTEGER,
lastBlockProposalRound INTEGER,
lastCompactCertificateRound INTEGER,
lastStateProofRound INTEGER,
effectiveFirstRound INTEGER,
effectiveLastRound INTEGER,

Expand All @@ -268,7 +268,7 @@ var (
selectRecords = `SELECT
k.participationID, k.account, k.firstValidRound,
k.lastValidRound, k.keyDilution, k.vrf,
r.lastVoteRound, r.lastBlockProposalRound, r.lastCompactCertificateRound,
r.lastVoteRound, r.lastBlockProposalRound, r.lastStateProofRound,
r.effectiveFirstRound, r.effectiveLastRound, r.voting
FROM Keysets k
INNER JOIN Rolling r
Expand All @@ -278,7 +278,7 @@ var (
updateRollingFieldsSQL = `UPDATE Rolling
SET lastVoteRound=?,
lastBlockProposalRound=?,
lastCompactCertificateRound=?,
lastStateProofRound=?,
effectiveFirstRound=?,
effectiveLastRound=?
WHERE pk IN (SELECT pk FROM Keysets WHERE participationID=?)`
Expand Down Expand Up @@ -612,18 +612,18 @@ func (db *participationDB) Insert(record Participation) (id ParticipationID, err

// update cache.
db.cache[id] = ParticipationRecord{
ParticipationID: id,
Account: record.Address(),
FirstValid: record.FirstValid,
LastValid: record.LastValid,
KeyDilution: record.KeyDilution,
LastVote: 0,
LastBlockProposal: 0,
LastCompactCertificate: 0,
EffectiveFirst: 0,
EffectiveLast: 0,
Voting: voting,
VRF: vrf,
ParticipationID: id,
Account: record.Address(),
FirstValid: record.FirstValid,
LastValid: record.LastValid,
KeyDilution: record.KeyDilution,
LastVote: 0,
LastBlockProposal: 0,
LastStateProof: 0,
EffectiveFirst: 0,
EffectiveLast: 0,
Voting: voting,
VRF: vrf,
}

return
Expand Down Expand Up @@ -722,7 +722,7 @@ func scanRecords(rows *sql.Rows) ([]ParticipationRecord, error) {
}

if lastCompactCertificate.Valid {
record.LastCompactCertificate = basics.Round(lastCompactCertificate.Int64)
record.LastStateProof = basics.Round(lastCompactCertificate.Int64)
}

if effectiveFirst.Valid {
Expand Down Expand Up @@ -785,7 +785,7 @@ func updateRollingFields(ctx context.Context, tx *sql.Tx, record ParticipationRe
result, err := tx.ExecContext(ctx, updateRollingFieldsSQL,
record.LastVote,
record.LastBlockProposal,
record.LastCompactCertificate,
record.LastStateProof,
record.EffectiveFirst,
record.EffectiveLast,
record.ParticipationID[:])
Expand Down Expand Up @@ -908,8 +908,8 @@ func (db *participationDB) Record(account basics.Address, round basics.Round, pa
record.LastVote = round
case BlockProposal:
record.LastBlockProposal = round
case CompactCertificate:
record.LastCompactCertificate = round
case StateProof:
record.LastStateProof = round
default:
return ErrUnknownParticipationAction
}
Expand Down
6 changes: 3 additions & 3 deletions data/account/participationRegistry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ func TestParticipation_Record(t *testing.T) {

a.NoError(registry.Record(p.Parent, 1000, Vote))
a.NoError(registry.Record(p.Parent, 2000, BlockProposal))
a.NoError(registry.Record(p.Parent, 3000, CompactCertificate))
a.NoError(registry.Record(p.Parent, 3000, StateProof))

// Verify that one and only one key was updated.
test := func(registry ParticipationRegistry) {
Expand All @@ -282,11 +282,11 @@ func TestParticipation_Record(t *testing.T) {
if record.ParticipationID == p.ID() {
require.Equal(t, 1000, int(record.LastVote))
require.Equal(t, 2000, int(record.LastBlockProposal))
require.Equal(t, 3000, int(record.LastCompactCertificate))
require.Equal(t, 3000, int(record.LastStateProof))
} else {
require.Equal(t, 0, int(record.LastVote))
require.Equal(t, 0, int(record.LastBlockProposal))
require.Equal(t, 0, int(record.LastCompactCertificate))
require.Equal(t, 0, int(record.LastStateProof))
}
}
}
Expand Down