Revert "[#152] netmap: allow only alphabet calls in updateState"

This reverts commit e1ee1c203c.
This commit is contained in:
Evgenii Stratonikov 2021-10-19 16:47:21 +03:00 committed by Alex Vanin
parent 81c12b3f24
commit a9503b5cf8
2 changed files with 18 additions and 49 deletions

View file

@ -259,21 +259,31 @@ func UpdateState(state int, publicKey interop.PublicKey) {
notaryDisabled := storage.Get(ctx, notaryDisabledKey).(bool)
var ( // for invocation collection without notary
alphabet []common.IRNode
nodeKey []byte
alphabet []common.IRNode
nodeKey []byte
alphabetCall bool
)
if notaryDisabled {
alphabet = common.AlphabetNodes()
nodeKey = common.InnerRingInvoker(alphabet)
if len(nodeKey) == 0 {
if !runtime.CheckWitness(publicKey) {
panic("updateState: witness check failed")
}
runtime.Notify("UpdateState", state, publicKey)
return
alphabetCall = len(nodeKey) != 0
} else {
multiaddr := common.AlphabetAddress()
alphabetCall = runtime.CheckWitness(multiaddr)
}
if !alphabetCall {
if !runtime.CheckWitness(publicKey) {
panic("updateState: witness check failed")
}
runtime.Notify("UpdateState", state, publicKey)
return
}
if notaryDisabled {
threshold := len(alphabet)*2/3 + 1
id := common.InvokeID([]interface{}{state, publicKey}, []byte("update"))
@ -283,14 +293,6 @@ func UpdateState(state int, publicKey interop.PublicKey) {
}
common.RemoveVotes(ctx, id)
} else {
multiaddr := common.AlphabetAddress()
if !runtime.CheckWitness(publicKey) {
panic("updateState: witness check failed")
}
if !runtime.CheckWitness(multiaddr) {
panic("updateState: alphabet witness check failed")
}
}
switch nodeState(state) {