acid-ant/frostfs-contract
1
0
Fork 0
forked from TrueCloudLab/frostfs-contract
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#44] Fix processing order in voting

Browse source 
Remove old ballots first so there won't be any
interference with votes of the same tx in the
future after `blockDiff` blocks.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2021-02-02 18:16:23 +03:00 committed by Alex Vanin
parent b1063e66b9
commit e87765b733
5 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
balance/balance_contract.go
View file

@ -413,6 +413,11 @@ func vote(ctx storage.Context, id, from []byte) int {
for i := 0; i < len(candidates); i++ { for i := 0; i < len(candidates); i++ {
cnd := candidates[i] cnd := candidates[i]
if blockHeight-cnd.block > blockDiff {
continue
}
if bytesEqual(cnd.id, id) { if bytesEqual(cnd.id, id) {
voters := cnd.n voters := cnd.n
@ -427,10 +432,7 @@ func vote(ctx storage.Context, id, from []byte) int {
found = len(voters) found = len(voters)
} }
// do not add old ballots, they are invalid newCandidates = append(newCandidates, cnd)
if blockHeight-cnd.block <= blockDiff {
newCandidates = append(newCandidates, cnd)
}
} }
if found < 0 { if found < 0 {

10
container/container_contract.go
View file

@ -502,6 +502,11 @@ func vote(ctx storage.Context, id, from []byte) int {
for i := 0; i < len(candidates); i++ { for i := 0; i < len(candidates); i++ {
cnd := candidates[i] cnd := candidates[i]
if blockHeight-cnd.block > blockDiff {
continue
}
if bytesEqual(cnd.id, id) { if bytesEqual(cnd.id, id) {
voters := cnd.n voters := cnd.n
@ -516,10 +521,7 @@ func vote(ctx storage.Context, id, from []byte) int {
found = len(voters) found = len(voters)
} }
// do not add old ballots, they are invalid newCandidates = append(newCandidates, cnd)
if blockHeight-cnd.block <= blockDiff {
newCandidates = append(newCandidates, cnd)
}
} }
if found < 0 { if found < 0 {

10
neofs/neofs_contract.go
View file

@ -556,6 +556,11 @@ func vote(ctx storage.Context, id, from []byte) int {
for i := 0; i < len(candidates); i++ { for i := 0; i < len(candidates); i++ {
cnd := candidates[i] cnd := candidates[i]
if blockHeight-cnd.block > blockDiff {
continue
}
if bytesEqual(cnd.id, id) { if bytesEqual(cnd.id, id) {
voters := cnd.n voters := cnd.n
@ -570,10 +575,7 @@ func vote(ctx storage.Context, id, from []byte) int {
found = len(voters) found = len(voters)
} }
// do not add old ballots, they are invalid newCandidates = append(newCandidates, cnd)
if blockHeight-cnd.block <= blockDiff {
newCandidates = append(newCandidates, cnd)
}
} }
if found < 0 { if found < 0 {

10
neofsid/neofsid_contract.go
View file

@ -231,6 +231,11 @@ func vote(ctx storage.Context, id, from []byte) int {
for i := 0; i < len(candidates); i++ { for i := 0; i < len(candidates); i++ {
cnd := candidates[i] cnd := candidates[i]
if blockHeight-cnd.block > blockDiff {
continue
}
if bytesEqual(cnd.id, id) { if bytesEqual(cnd.id, id) {
voters := cnd.n voters := cnd.n
@ -245,10 +250,7 @@ func vote(ctx storage.Context, id, from []byte) int {
found = len(voters) found = len(voters)
} }
// do not add old ballots, they are invalid newCandidates = append(newCandidates, cnd)
if blockHeight-cnd.block <= blockDiff {
newCandidates = append(newCandidates, cnd)
}
} }
if found < 0 { if found < 0 {

10
netmap/netmap_contract.go
View file

@ -431,6 +431,11 @@ func vote(ctx storage.Context, id, from []byte) int {
for i := 0; i < len(candidates); i++ { for i := 0; i < len(candidates); i++ {
cnd := candidates[i] cnd := candidates[i]
if blockHeight-cnd.block > blockDiff {
continue
}
if bytesEqual(cnd.id, id) { if bytesEqual(cnd.id, id) {
voters := cnd.n voters := cnd.n
@ -445,10 +450,7 @@ func vote(ctx storage.Context, id, from []byte) int {
found = len(voters) found = len(voters)
} }
// do not add old ballots, they are invalid newCandidates = append(newCandidates, cnd)
if blockHeight-cnd.block <= blockDiff {
newCandidates = append(newCandidates, cnd)
}
} }
if found < 0 { if found < 0 {