dstepanov-yadro/frostfs-contract
1
0
Fork 0
forked from TrueCloudLab/frostfs-contract
Code Pull requests Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

34
netmap/netmap_contract.go
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) {

33
tests/netmap_test.go
View file

@ -92,36 +92,3 @@ func TestAddPeer(t *testing.T) {
require.Equal(t, stackitem.NewArray([]stackitem.Item{stackitem.NewByteArray(dummyInfo)}),
aer.Events[0].Item)
}
func TestUpdateState(t *testing.T) {
bc := NewChain(t)
h := prepareNetmapContract(t, bc)
acc := NewAccount(t, bc)
dummyInfo := dummyNodeInfo(acc)
tx := PrepareInvoke(t, bc, []*wallet.Account{CommitteeAcc, acc}, h, "addPeer", dummyInfo)
AddBlockCheckHalt(t, bc, tx)
t.Run("missing witness", func(t *testing.T) {
tx = PrepareInvoke(t, bc, acc, h, "updateState", int64(2), acc.PrivateKey().PublicKey().Bytes())
AddBlock(t, bc, tx)
CheckFault(t, bc, tx.Hash(), "updateState: alphabet witness check failed")
tx = PrepareInvoke(t, bc, CommitteeAcc, h, "updateState", int64(2), acc.PrivateKey().PublicKey().Bytes())
AddBlock(t, bc, tx)
CheckFault(t, bc, tx.Hash(), "updateState: witness check failed")
})
tx = PrepareInvoke(t, bc, []*wallet.Account{CommitteeAcc, acc}, h,
"updateState", int64(2), acc.PrivateKey().PublicKey().Bytes())
AddBlockCheckHalt(t, bc, tx)
tx = PrepareInvoke(t, bc, acc, h, "netmapCandidates")
AddBlock(t, bc, tx)
aer := CheckHalt(t, bc, tx.Hash())
nodes, ok := aer.Stack[0].Value().([]stackitem.Item)
require.True(t, ok)
require.Equal(t, 0, len(nodes))
}