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

This reverts commit e1ee1c203c.

netmap/netmap_contract.go

@@ -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
+		alphabet     []common.IRNode
-		nodeKey  []byte
+		nodeKey      []byte
+		alphabetCall bool
 	)
 
 	if notaryDisabled {
 		alphabet = common.AlphabetNodes()
 		nodeKey = common.InnerRingInvoker(alphabet)
-		if len(nodeKey) == 0 {
+		alphabetCall = len(nodeKey) != 0
-			if !runtime.CheckWitness(publicKey) {
+	} else {
-				panic("updateState: witness check failed")
+		multiaddr := common.AlphabetAddress()
-			}
+		alphabetCall = runtime.CheckWitness(multiaddr)
-			runtime.Notify("UpdateState", state, publicKey)
+	}
-			return
+
+	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) {

tests/netmap_test.go

@@ -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))
-}