d.zverev/frostfs-contract
1
0
Fork 0
forked from TrueCloudLab/frostfs-contract
Code Pull requests Activity

[#19] alphabet: Check epoch value in Vote method

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-12-07 15:53:11 +03:00 committed by Alex Vanin
parent 24b7bc5c77
commit a8d55d9166
8 changed files with 182 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
alphabet/alphabet.tpl
View file

@ -2,7 +2,6 @@ package alphabetcontract
import (
"github.com/nspcc-dev/neo-go/pkg/interop/binary"
"github.com/nspcc-dev/neo-go/pkg/interop/blockchain"
"github.com/nspcc-dev/neo-go/pkg/interop/contract"
"github.com/nspcc-dev/neo-go/pkg/interop/crypto"
"github.com/nspcc-dev/neo-go/pkg/interop/engine"
@ -17,9 +16,9 @@ type (
}
ballot struct {
id []byte // id of the voting decision
id []byte // hash of validators list
n [][]byte // already voted inner ring nodes
block int // block with the last vote
height int // height is an neofs epoch when ballot was registered
}
)
@ -35,8 +34,6 @@ const (
netmapContractKey = "netmapScriptHash"
blockDiff = 20 // amount of blocks when ballot get discarded
threshold = totalAlphabetContracts * 2 / 3 + 1
voteKey = "ballots"
@ -91,6 +88,11 @@ func irList() []irNode {
return engine.AppCall(netmapContractAddr, "innerRingList").([]irNode)
}
func currentEpoch() int {
netmapContractAddr := storage.Get(ctx, netmapContractKey).([]byte)
return engine.AppCall(netmapContractAddr, "epoch").(int)
}
func checkPermission(ir []irNode) bool {
if len(ir) <= index {
return false
@ -153,8 +155,13 @@ func Vote(epoch int, candidates [][]byte) {
panic("invalid invoker")
}
curEpoch := currentEpoch()
if epoch != curEpoch {
panic("invalid epoch")
}
id := voteID(epoch, candidates)
n := vote(ctx, id, key)
n := vote(ctx, curEpoch, id, key)
if n >= threshold {
candidate := candidates[index%len(candidates)]
@ -178,12 +185,11 @@ func Name() string {
return name
}
func vote(ctx storage.Context, id, from []byte) int {
func vote(ctx storage.Context, epoch int, id, from []byte) int {
var (
newCandidates []ballot
candidates = getBallots(ctx)
found = -1
blockHeight = blockchain.GetHeight()
)
for i := 0; i < len(candidates); i++ {
@ -198,12 +204,12 @@ func vote(ctx storage.Context, id, from []byte) int {
}
voters = append(voters, from)
cnd = ballot{id: id, n: voters, block: blockHeight}
cnd = ballot{id: id, n: voters, height: epoch}
found = len(voters)
}
// do not add old ballots, they are invalid
if blockHeight-cnd.block <= blockDiff {
// add only valid ballots with current epochs
if cnd.height == epoch {
newCandidates = append(newCandidates, cnd)
}
}
@ -213,7 +219,7 @@ func vote(ctx storage.Context, id, from []byte) int {
newCandidates = append(newCandidates, ballot{
id: id,
n: voters,
block: blockHeight})
height: epoch})
found = 1
}

30
alphabet/az/az_contract.go
View file

@ -2,7 +2,6 @@ package alphabetcontract
import (
"github.com/nspcc-dev/neo-go/pkg/interop/binary"
"github.com/nspcc-dev/neo-go/pkg/interop/blockchain"
"github.com/nspcc-dev/neo-go/pkg/interop/contract"
"github.com/nspcc-dev/neo-go/pkg/interop/crypto"
"github.com/nspcc-dev/neo-go/pkg/interop/engine"
@ -17,9 +16,9 @@ type (
}
ballot struct {
id []byte // id of the voting decision
id []byte // hash of validators list
n [][]byte // already voted inner ring nodes
block int // block with the last vote
height int // height is an neofs epoch when ballot was registered
}
)
@ -35,8 +34,6 @@ const (
netmapContractKey = "netmapScriptHash"
blockDiff = 20 // amount of blocks when ballot get discarded
threshold = totalAlphabetContracts * 2 / 3 + 1
voteKey = "ballots"
@ -91,6 +88,11 @@ func irList() []irNode {
return engine.AppCall(netmapContractAddr, "innerRingList").([]irNode)
}
func currentEpoch() int {
netmapContractAddr := storage.Get(ctx, netmapContractKey).([]byte)
return engine.AppCall(netmapContractAddr, "epoch").(int)
}
func checkPermission(ir []irNode) bool {
if len(ir) <= index {
return false
@ -153,8 +155,13 @@ func Vote(epoch int, candidates [][]byte) {
panic("invalid invoker")
}
curEpoch := currentEpoch()
if epoch != curEpoch {
panic("invalid epoch")
}
id := voteID(epoch, candidates)
n := vote(ctx, id, key)
n := vote(ctx, curEpoch, id, key)
if n >= threshold {
candidate := candidates[index%len(candidates)]
@ -178,12 +185,11 @@ func Name() string {
return name
}
func vote(ctx storage.Context, id, from []byte) int {
func vote(ctx storage.Context, epoch int, id, from []byte) int {
var (
newCandidates []ballot
candidates = getBallots(ctx)
found = -1
blockHeight = blockchain.GetHeight()
)
for i := 0; i < len(candidates); i++ {
@ -198,12 +204,12 @@ func vote(ctx storage.Context, id, from []byte) int {
}
voters = append(voters, from)
cnd = ballot{id: id, n: voters, block: blockHeight}
cnd = ballot{id: id, n: voters, height: epoch}
found = len(voters)
}
// do not add old ballots, they are invalid
if blockHeight-cnd.block <= blockDiff {
// add only valid ballots with current epochs
if cnd.height == epoch {
newCandidates = append(newCandidates, cnd)
}
}
@ -213,7 +219,7 @@ func vote(ctx storage.Context, id, from []byte) int {
newCandidates = append(newCandidates, ballot{
id: id,
n: voters,
block: blockHeight})
height: epoch})
found = 1
}

30
alphabet/buky/buky_contract.go
View file

@ -2,7 +2,6 @@ package alphabetcontract
import (
"github.com/nspcc-dev/neo-go/pkg/interop/binary"
"github.com/nspcc-dev/neo-go/pkg/interop/blockchain"
"github.com/nspcc-dev/neo-go/pkg/interop/contract"
"github.com/nspcc-dev/neo-go/pkg/interop/crypto"
"github.com/nspcc-dev/neo-go/pkg/interop/engine"
@ -17,9 +16,9 @@ type (
}
ballot struct {
id []byte // id of the voting decision
id []byte // hash of validators list
n [][]byte // already voted inner ring nodes
block int // block with the last vote
height int // height is an neofs epoch when ballot was registered
}
)
@ -35,8 +34,6 @@ const (
netmapContractKey = "netmapScriptHash"
blockDiff = 20 // amount of blocks when ballot get discarded
threshold = totalAlphabetContracts * 2 / 3 + 1
voteKey = "ballots"
@ -91,6 +88,11 @@ func irList() []irNode {
return engine.AppCall(netmapContractAddr, "innerRingList").([]irNode)
}
func currentEpoch() int {
netmapContractAddr := storage.Get(ctx, netmapContractKey).([]byte)
return engine.AppCall(netmapContractAddr, "epoch").(int)
}
func checkPermission(ir []irNode) bool {
if len(ir) <= index {
return false
@ -153,8 +155,13 @@ func Vote(epoch int, candidates [][]byte) {
panic("invalid invoker")
}
curEpoch := currentEpoch()
if epoch != curEpoch {
panic("invalid epoch")
}
id := voteID(epoch, candidates)
n := vote(ctx, id, key)
n := vote(ctx, curEpoch, id, key)
if n >= threshold {
candidate := candidates[index%len(candidates)]
@ -178,12 +185,11 @@ func Name() string {
return name
}
func vote(ctx storage.Context, id, from []byte) int {
func vote(ctx storage.Context, epoch int, id, from []byte) int {
var (
newCandidates []ballot
candidates = getBallots(ctx)
found = -1
blockHeight = blockchain.GetHeight()
)
for i := 0; i < len(candidates); i++ {
@ -198,12 +204,12 @@ func vote(ctx storage.Context, id, from []byte) int {
}
voters = append(voters, from)
cnd = ballot{id: id, n: voters, block: blockHeight}
cnd = ballot{id: id, n: voters, height: epoch}
found = len(voters)
}
// do not add old ballots, they are invalid
if blockHeight-cnd.block <= blockDiff {
// add only valid ballots with current epochs
if cnd.height == epoch {
newCandidates = append(newCandidates, cnd)
}
}
@ -213,7 +219,7 @@ func vote(ctx storage.Context, id, from []byte) int {
newCandidates = append(newCandidates, ballot{
id: id,
n: voters,
block: blockHeight})
height: epoch})
found = 1
}

30
alphabet/dobro/dobro_contract.go
View file

@ -2,7 +2,6 @@ package alphabetcontract
import (
"github.com/nspcc-dev/neo-go/pkg/interop/binary"
"github.com/nspcc-dev/neo-go/pkg/interop/blockchain"
"github.com/nspcc-dev/neo-go/pkg/interop/contract"
"github.com/nspcc-dev/neo-go/pkg/interop/crypto"
"github.com/nspcc-dev/neo-go/pkg/interop/engine"
@ -17,9 +16,9 @@ type (
}
ballot struct {
id []byte // id of the voting decision
id []byte // hash of validators list
n [][]byte // already voted inner ring nodes
block int // block with the last vote
height int // height is an neofs epoch when ballot was registered
}
)
@ -35,8 +34,6 @@ const (
netmapContractKey = "netmapScriptHash"
blockDiff = 20 // amount of blocks when ballot get discarded
threshold = totalAlphabetContracts * 2 / 3 + 1
voteKey = "ballots"
@ -91,6 +88,11 @@ func irList() []irNode {
return engine.AppCall(netmapContractAddr, "innerRingList").([]irNode)
}
func currentEpoch() int {
netmapContractAddr := storage.Get(ctx, netmapContractKey).([]byte)
return engine.AppCall(netmapContractAddr, "epoch").(int)
}
func checkPermission(ir []irNode) bool {
if len(ir) <= index {
return false
@ -153,8 +155,13 @@ func Vote(epoch int, candidates [][]byte) {
panic("invalid invoker")
}
curEpoch := currentEpoch()
if epoch != curEpoch {
panic("invalid epoch")
}
id := voteID(epoch, candidates)
n := vote(ctx, id, key)
n := vote(ctx, curEpoch, id, key)
if n >= threshold {
candidate := candidates[index%len(candidates)]
@ -178,12 +185,11 @@ func Name() string {
return name
}
func vote(ctx storage.Context, id, from []byte) int {
func vote(ctx storage.Context, epoch int, id, from []byte) int {
var (
newCandidates []ballot
candidates = getBallots(ctx)
found = -1
blockHeight = blockchain.GetHeight()
)
for i := 0; i < len(candidates); i++ {
@ -198,12 +204,12 @@ func vote(ctx storage.Context, id, from []byte) int {
}
voters = append(voters, from)
cnd = ballot{id: id, n: voters, block: blockHeight}
cnd = ballot{id: id, n: voters, height: epoch}
found = len(voters)
}
// do not add old ballots, they are invalid
if blockHeight-cnd.block <= blockDiff {
// add only valid ballots with current epochs
if cnd.height == epoch {
newCandidates = append(newCandidates, cnd)
}
}
@ -213,7 +219,7 @@ func vote(ctx storage.Context, id, from []byte) int {
newCandidates = append(newCandidates, ballot{
id: id,
n: voters,
block: blockHeight})
height: epoch})
found = 1
}

30
alphabet/glagoli/glagoli_contract.go
View file

@ -2,7 +2,6 @@ package alphabetcontract
import (
"github.com/nspcc-dev/neo-go/pkg/interop/binary"
"github.com/nspcc-dev/neo-go/pkg/interop/blockchain"
"github.com/nspcc-dev/neo-go/pkg/interop/contract"
"github.com/nspcc-dev/neo-go/pkg/interop/crypto"
"github.com/nspcc-dev/neo-go/pkg/interop/engine"
@ -17,9 +16,9 @@ type (
}
ballot struct {
id []byte // id of the voting decision
id []byte // hash of validators list
n [][]byte // already voted inner ring nodes
block int // block with the last vote
height int // height is an neofs epoch when ballot was registered
}
)
@ -35,8 +34,6 @@ const (
netmapContractKey = "netmapScriptHash"
blockDiff = 20 // amount of blocks when ballot get discarded
threshold = totalAlphabetContracts * 2 / 3 + 1
voteKey = "ballots"
@ -91,6 +88,11 @@ func irList() []irNode {
return engine.AppCall(netmapContractAddr, "innerRingList").([]irNode)
}
func currentEpoch() int {
netmapContractAddr := storage.Get(ctx, netmapContractKey).([]byte)
return engine.AppCall(netmapContractAddr, "epoch").(int)
}
func checkPermission(ir []irNode) bool {
if len(ir) <= index {
return false
@ -153,8 +155,13 @@ func Vote(epoch int, candidates [][]byte) {
panic("invalid invoker")
}
curEpoch := currentEpoch()
if epoch != curEpoch {
panic("invalid epoch")
}
id := voteID(epoch, candidates)
n := vote(ctx, id, key)
n := vote(ctx, curEpoch, id, key)
if n >= threshold {
candidate := candidates[index%len(candidates)]
@ -178,12 +185,11 @@ func Name() string {
return name
}
func vote(ctx storage.Context, id, from []byte) int {
func vote(ctx storage.Context, epoch int, id, from []byte) int {
var (
newCandidates []ballot
candidates = getBallots(ctx)
found = -1
blockHeight = blockchain.GetHeight()
)
for i := 0; i < len(candidates); i++ {
@ -198,12 +204,12 @@ func vote(ctx storage.Context, id, from []byte) int {
}
voters = append(voters, from)
cnd = ballot{id: id, n: voters, block: blockHeight}
cnd = ballot{id: id, n: voters, height: epoch}
found = len(voters)
}
// do not add old ballots, they are invalid
if blockHeight-cnd.block <= blockDiff {
// add only valid ballots with current epochs
if cnd.height == epoch {
newCandidates = append(newCandidates, cnd)
}
}
@ -213,7 +219,7 @@ func vote(ctx storage.Context, id, from []byte) int {
newCandidates = append(newCandidates, ballot{
id: id,
n: voters,
block: blockHeight})
height: epoch})
found = 1
}

30
alphabet/jest/jest_contract.go
View file

@ -2,7 +2,6 @@ package alphabetcontract
import (
"github.com/nspcc-dev/neo-go/pkg/interop/binary"
"github.com/nspcc-dev/neo-go/pkg/interop/blockchain"
"github.com/nspcc-dev/neo-go/pkg/interop/contract"
"github.com/nspcc-dev/neo-go/pkg/interop/crypto"
"github.com/nspcc-dev/neo-go/pkg/interop/engine"
@ -17,9 +16,9 @@ type (
}
ballot struct {
id []byte // id of the voting decision
id []byte // hash of validators list
n [][]byte // already voted inner ring nodes
block int // block with the last vote
height int // height is an neofs epoch when ballot was registered
}
)
@ -35,8 +34,6 @@ const (
netmapContractKey = "netmapScriptHash"
blockDiff = 20 // amount of blocks when ballot get discarded
threshold = totalAlphabetContracts * 2 / 3 + 1
voteKey = "ballots"
@ -91,6 +88,11 @@ func irList() []irNode {
return engine.AppCall(netmapContractAddr, "innerRingList").([]irNode)
}
func currentEpoch() int {
netmapContractAddr := storage.Get(ctx, netmapContractKey).([]byte)
return engine.AppCall(netmapContractAddr, "epoch").(int)
}
func checkPermission(ir []irNode) bool {
if len(ir) <= index {
return false
@ -153,8 +155,13 @@ func Vote(epoch int, candidates [][]byte) {
panic("invalid invoker")
}
curEpoch := currentEpoch()
if epoch != curEpoch {
panic("invalid epoch")
}
id := voteID(epoch, candidates)
n := vote(ctx, id, key)
n := vote(ctx, curEpoch, id, key)
if n >= threshold {
candidate := candidates[index%len(candidates)]
@ -178,12 +185,11 @@ func Name() string {
return name
}
func vote(ctx storage.Context, id, from []byte) int {
func vote(ctx storage.Context, epoch int, id, from []byte) int {
var (
newCandidates []ballot
candidates = getBallots(ctx)
found = -1
blockHeight = blockchain.GetHeight()
)
for i := 0; i < len(candidates); i++ {
@ -198,12 +204,12 @@ func vote(ctx storage.Context, id, from []byte) int {
}
voters = append(voters, from)
cnd = ballot{id: id, n: voters, block: blockHeight}
cnd = ballot{id: id, n: voters, height: epoch}
found = len(voters)
}
// do not add old ballots, they are invalid
if blockHeight-cnd.block <= blockDiff {
// add only valid ballots with current epochs
if cnd.height == epoch {
newCandidates = append(newCandidates, cnd)
}
}
@ -213,7 +219,7 @@ func vote(ctx storage.Context, id, from []byte) int {
newCandidates = append(newCandidates, ballot{
id: id,
n: voters,
block: blockHeight})
height: epoch})
found = 1
}

30
alphabet/vedi/vedi_contract.go
View file

@ -2,7 +2,6 @@ package alphabetcontract
import (
"github.com/nspcc-dev/neo-go/pkg/interop/binary"
"github.com/nspcc-dev/neo-go/pkg/interop/blockchain"
"github.com/nspcc-dev/neo-go/pkg/interop/contract"
"github.com/nspcc-dev/neo-go/pkg/interop/crypto"
"github.com/nspcc-dev/neo-go/pkg/interop/engine"
@ -17,9 +16,9 @@ type (
}
ballot struct {
id []byte // id of the voting decision
id []byte // hash of validators list
n [][]byte // already voted inner ring nodes
block int // block with the last vote
height int // height is an neofs epoch when ballot was registered
}
)
@ -35,8 +34,6 @@ const (
netmapContractKey = "netmapScriptHash"
blockDiff = 20 // amount of blocks when ballot get discarded
threshold = totalAlphabetContracts * 2 / 3 + 1
voteKey = "ballots"
@ -91,6 +88,11 @@ func irList() []irNode {
return engine.AppCall(netmapContractAddr, "innerRingList").([]irNode)
}
func currentEpoch() int {
netmapContractAddr := storage.Get(ctx, netmapContractKey).([]byte)
return engine.AppCall(netmapContractAddr, "epoch").(int)
}
func checkPermission(ir []irNode) bool {
if len(ir) <= index {
return false
@ -153,8 +155,13 @@ func Vote(epoch int, candidates [][]byte) {
panic("invalid invoker")
}
curEpoch := currentEpoch()
if epoch != curEpoch {
panic("invalid epoch")
}
id := voteID(epoch, candidates)
n := vote(ctx, id, key)
n := vote(ctx, curEpoch, id, key)
if n >= threshold {
candidate := candidates[index%len(candidates)]
@ -178,12 +185,11 @@ func Name() string {
return name
}
func vote(ctx storage.Context, id, from []byte) int {
func vote(ctx storage.Context, epoch int, id, from []byte) int {
var (
newCandidates []ballot
candidates = getBallots(ctx)
found = -1
blockHeight = blockchain.GetHeight()
)
for i := 0; i < len(candidates); i++ {
@ -198,12 +204,12 @@ func vote(ctx storage.Context, id, from []byte) int {
}
voters = append(voters, from)
cnd = ballot{id: id, n: voters, block: blockHeight}
cnd = ballot{id: id, n: voters, height: epoch}
found = len(voters)
}
// do not add old ballots, they are invalid
if blockHeight-cnd.block <= blockDiff {
// add only valid ballots with current epochs
if cnd.height == epoch {
newCandidates = append(newCandidates, cnd)
}
}
@ -213,7 +219,7 @@ func vote(ctx storage.Context, id, from []byte) int {
newCandidates = append(newCandidates, ballot{
id: id,
n: voters,
block: blockHeight})
height: epoch})
found = 1
}

30
alphabet/zhivete/zhivete_contract.go
View file

@ -2,7 +2,6 @@ package alphabetcontract
import (
"github.com/nspcc-dev/neo-go/pkg/interop/binary"
"github.com/nspcc-dev/neo-go/pkg/interop/blockchain"
"github.com/nspcc-dev/neo-go/pkg/interop/contract"
"github.com/nspcc-dev/neo-go/pkg/interop/crypto"
"github.com/nspcc-dev/neo-go/pkg/interop/engine"
@ -17,9 +16,9 @@ type (
}
ballot struct {
id []byte // id of the voting decision
id []byte // hash of validators list
n [][]byte // already voted inner ring nodes
block int // block with the last vote
height int // height is an neofs epoch when ballot was registered
}
)
@ -35,8 +34,6 @@ const (
netmapContractKey = "netmapScriptHash"
blockDiff = 20 // amount of blocks when ballot get discarded
threshold = totalAlphabetContracts * 2 / 3 + 1
voteKey = "ballots"
@ -91,6 +88,11 @@ func irList() []irNode {
return engine.AppCall(netmapContractAddr, "innerRingList").([]irNode)
}
func currentEpoch() int {
netmapContractAddr := storage.Get(ctx, netmapContractKey).([]byte)
return engine.AppCall(netmapContractAddr, "epoch").(int)
}
func checkPermission(ir []irNode) bool {
if len(ir) <= index {
return false
@ -153,8 +155,13 @@ func Vote(epoch int, candidates [][]byte) {
panic("invalid invoker")
}
curEpoch := currentEpoch()
if epoch != curEpoch {
panic("invalid epoch")
}
id := voteID(epoch, candidates)
n := vote(ctx, id, key)
n := vote(ctx, curEpoch, id, key)
if n >= threshold {
candidate := candidates[index%len(candidates)]
@ -178,12 +185,11 @@ func Name() string {
return name
}
func vote(ctx storage.Context, id, from []byte) int {
func vote(ctx storage.Context, epoch int, id, from []byte) int {
var (
newCandidates []ballot
candidates = getBallots(ctx)
found = -1
blockHeight = blockchain.GetHeight()
)
for i := 0; i < len(candidates); i++ {
@ -198,12 +204,12 @@ func vote(ctx storage.Context, id, from []byte) int {
}
voters = append(voters, from)
cnd = ballot{id: id, n: voters, block: blockHeight}
cnd = ballot{id: id, n: voters, height: epoch}
found = len(voters)
}
// do not add old ballots, they are invalid
if blockHeight-cnd.block <= blockDiff {
// add only valid ballots with current epochs
if cnd.height == epoch {
newCandidates = append(newCandidates, cnd)
}
}
@ -213,7 +219,7 @@ func vote(ctx storage.Context, id, from []byte) int {
newCandidates = append(newCandidates, ballot{
id: id,
n: voters,
block: blockHeight})
height: epoch})
found = 1
}