[#971] *: Add notification TX hash to neofs/netmap morph client calls

Add hash of the TX that generated notification
to neofs/netmap event structures. Adapt all
neofs/netmap wrapper calls to new structures.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>

pkg/innerring/processors/netmap/internal_events.go

@@ -1,8 +1,21 @@
 package netmap
 
+import "github.com/nspcc-dev/neo-go/pkg/util"
+
 // netmapCleanupTick is a event to remove offline nodes.
 type netmapCleanupTick struct {
 	epoch uint64
+
+	// txHash is used in notary environmental
+	// for calculating unique but same for
+	// all notification receivers values.
+	txHash util.Uint256
+}
+
+// TxHash returns hash of the TX that triggers
+// synchronization process.
+func (s netmapCleanupTick) TxHash() util.Uint256 {
+	return s.txHash
 }
 
 // MorphEvent implements Event interface.

pkg/innerring/processors/netmap/process_cleanup.go

@@ -2,7 +2,7 @@ package netmap
 
 import (
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
-	netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
+	netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
 	"github.com/nspcc-dev/neofs-sdk-go/netmap"
 	"go.uber.org/zap"
 )
@@ -25,20 +25,13 @@ func (np *Processor) processNetmapCleanupTick(ev netmapCleanupTick) {
 
 		np.log.Info("vote to remove node from netmap", zap.String("key", s))
 
-		if np.notaryDisabled {
-			err = np.netmapClient.UpdatePeerState(key.Bytes(), netmap.NodeStateOffline)
-		} else {
-			// use epoch as TX nonce to prevent collisions
-			err = np.netmapClient.Morph().NotaryInvoke(
-				np.netmapClient.ContractAddress(),
-				0,
-				uint32(ev.epoch),
-				netmapEvent.UpdateStateNotaryEvent,
-				int64(netmap.NodeStateOffline.ToV2()),
-				key.Bytes(),
-			)
-		}
+		prm := netmapclient.UpdatePeerPrm{}
 
+		prm.SetKey(key.Bytes())
+		prm.SetState(netmap.NodeStateOffline)
+		prm.SetHash(ev.TxHash())
+
+		err = np.netmapClient.UpdatePeerState(prm)
 		if err != nil {
 			np.log.Error("can't invoke netmap.UpdateState", zap.Error(err))
 		}

pkg/innerring/processors/netmap/process_epoch.go

@@ -10,8 +10,8 @@ import (
 
 // Process new epoch notification by setting global epoch value and resetting
 // local epoch timer.
-func (np *Processor) processNewEpoch(event netmapEvent.NewEpoch) {
-	epoch := event.EpochNumber()
+func (np *Processor) processNewEpoch(ev netmapEvent.NewEpoch) {
+	epoch := ev.EpochNumber()
 
 	epochDuration, err := np.netmapClient.EpochDuration()
 	if err != nil {
@@ -47,11 +47,11 @@ func (np *Processor) processNewEpoch(event netmapEvent.NewEpoch) {
 	}
 
 	np.netmapSnapshot.update(networkMap, epoch)
-	np.handleCleanupTick(netmapCleanupTick{epoch: epoch})
+	np.handleCleanupTick(netmapCleanupTick{epoch: epoch, txHash: ev.TxHash()})
 	np.handleNewAudit(audit.NewAuditStartEvent(epoch))
 	np.handleAuditSettlements(settlement.NewAuditEvent(epoch))
-	np.handleAlphabetSync(governance.NewSyncEvent())
-	np.handleNotaryDeposit(event)
+	np.handleAlphabetSync(governance.NewSyncEvent(ev.TxHash()))
+	np.handleNotaryDeposit(ev)
 }
 
 // Process new epoch tick by invoking new epoch method in network map contract.

pkg/innerring/processors/netmap/process_peers.go

@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strings"
 
+	netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
 	netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
 	"github.com/nspcc-dev/neofs-sdk-go/netmap"
 	"go.uber.org/zap"
@@ -81,18 +82,22 @@ func (np *Processor) processAddPeer(ev netmapEvent.AddPeer) {
 		np.log.Info("approving network map candidate",
 			zap.String("key", keyString))
 
+		prm := netmapclient.AddPeerPrm{}
+		prm.SetNodeInfo(nodeInfo)
+
 		if nr := ev.NotaryRequest(); nr != nil {
 			// create new notary request with the original nonce
 			err = np.netmapClient.Morph().NotaryInvoke(
 				np.netmapClient.ContractAddress(),
 				0,
 				nr.MainTransaction.Nonce,
+				nil,
 				netmapEvent.AddPeerNotaryEvent,
 				nodeInfoBinary,
 			)
 		} else {
 			// notification event case
-			err = np.netmapClient.AddPeer(nodeInfo)
+			err = np.netmapClient.AddPeer(prm)
 		}
 
 		if err != nil {
@@ -126,7 +131,12 @@ func (np *Processor) processUpdatePeer(ev netmapEvent.UpdatePeer) {
 	if nr := ev.NotaryRequest(); nr != nil {
 		err = np.netmapClient.Morph().NotarySignAndInvokeTX(nr.MainTransaction)
 	} else {
-		err = np.netmapClient.UpdatePeerState(ev.PublicKey().Bytes(), ev.Status())
+		prm := netmapclient.UpdatePeerPrm{}
+
+		prm.SetState(ev.Status())
+		prm.SetKey(ev.PublicKey().Bytes())
+
+		err = np.netmapClient.UpdatePeerState(prm)
 	}
 	if err != nil {
 		np.log.Error("can't invoke netmap.UpdatePeer", zap.Error(err))