*: always subscribe to TransactionAdded for notary pools

And drop all related logic for checking the type of event. We never care about
removed requests. Fixes #2672.

Signed-off-by: Roman Khimov <[email protected]>

Author: roman-khimov

pkg/innerring/deploy.go

@@ -5,8 +5,10 @@ import (
 	"sync"
 
 	"github.com/nspcc-dev/neo-go/pkg/core/block"
+	"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
 	"github.com/nspcc-dev/neo-go/pkg/core/state"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
+	"github.com/nspcc-dev/neo-go/pkg/neorpc"
 	"github.com/nspcc-dev/neo-go/pkg/neorpc/result"
 	"github.com/nspcc-dev/neo-go/pkg/rpcclient"
 	"github.com/nspcc-dev/neo-go/pkg/rpcclient/notary"
@@ -74,9 +76,12 @@ func (x *fsChain) SubscribeToNewBlocks() (<-chan *block.Block, error) {
 // SubscribeToNotaryRequests implements [deploy.Blockchain] interface.
 func (x *fsChain) SubscribeToNotaryRequests() (<-chan *result.NotaryRequestEvent, error) {
 	if x.wsClient != nil {
-		ch := make(chan *result.NotaryRequestEvent)
+		var (
+			ch     = make(chan *result.NotaryRequestEvent)
+			evtype = mempoolevent.TransactionAdded
+		)
 
-		sub, err := x.wsClient.ReceiveNotaryRequests(nil, ch)
+		sub, err := x.wsClient.ReceiveNotaryRequests(&neorpc.NotaryRequestFilter{Type: &evtype}, ch)
 		if err != nil {
 			return nil, fmt.Errorf("listen to notary requests over Neo RPC WebSocket: %w", err)
 		}

pkg/innerring/processors/container/processor.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/event"
@@ -108,7 +107,6 @@ func (cp *Processor) ListenerNotaryParsers() []event.NotaryParserInfo {
 		pp = make([]event.NotaryParserInfo, 0, 4)
 	)
 
-	p.SetMempoolType(mempoolevent.TransactionAdded)
 	p.SetScriptHash(cp.cnrClient.ContractAddress())
 
 	// container put
@@ -143,7 +141,6 @@ func (cp *Processor) ListenerNotaryHandlers() []event.NotaryHandlerInfo {
 	)
 
 	h.SetScriptHash(cp.cnrClient.ContractAddress())
-	h.SetMempoolType(mempoolevent.TransactionAdded)
 
 	// container put
 	h.SetRequestType(containerEvent.PutNotaryEvent)

pkg/innerring/processors/netmap/processor.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
 	"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/state"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
 	nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
@@ -188,7 +187,6 @@ func (np *Processor) ListenerNotaryParsers() []event.NotaryParserInfo {
 		pp = make([]event.NotaryParserInfo, 0, 2)
 	)
 
-	p.SetMempoolType(mempoolevent.TransactionAdded)
 	p.SetScriptHash(np.netmapClient.ContractAddress())
 
 	// new peer
@@ -212,7 +210,6 @@ func (np *Processor) ListenerNotaryHandlers() []event.NotaryHandlerInfo {
 		hh = make([]event.NotaryHandlerInfo, 0, 2)
 	)
 
-	h.SetMempoolType(mempoolevent.TransactionAdded)
 	h.SetScriptHash(np.netmapClient.ContractAddress())
 
 	// new peer

pkg/innerring/processors/reputation/processor.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
 	repClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/event"
 	reputationEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/reputation"
@@ -94,7 +93,6 @@ func (rp *Processor) ListenerNotificationHandlers() []event.NotificationHandlerI
 func (rp *Processor) ListenerNotaryParsers() []event.NotaryParserInfo {
 	var p event.NotaryParserInfo
 
-	p.SetMempoolType(mempoolevent.TransactionAdded)
 	p.SetRequestType(reputationEvent.PutNotaryEvent)
 	p.SetScriptHash(rp.reputationWrp.ContractAddress())
 	p.SetParser(reputationEvent.ParsePutNotary)
@@ -106,7 +104,6 @@ func (rp *Processor) ListenerNotaryParsers() []event.NotaryParserInfo {
 func (rp *Processor) ListenerNotaryHandlers() []event.NotaryHandlerInfo {
 	var h event.NotaryHandlerInfo
 
-	h.SetMempoolType(mempoolevent.TransactionAdded)
 	h.SetRequestType(reputationEvent.PutNotaryEvent)
 	h.SetScriptHash(rp.reputationWrp.ContractAddress())
 	h.SetHandler(rp.handlePutReputation)

pkg/morph/client/notifications.go

@@ -142,9 +142,9 @@ func (c *Client) ReceiveNotaryRequests(txSigner util.Uint160) error {
 	return nil
 }
 
-// ReceiveAllNotaryRequests subscribes to all notary request events coming from
-// the Neo blockchain the Client connected to. Events are sent to the channel
-// returned from [Client.Notifications].
+// ReceiveAllNotaryRequests subscribes to all [mempoolevent.TransactionAdded]
+// notary pool events coming from the Neo blockchain the Client is connected to.
+// Events are sent to the channel returned from [Client.Notifications].
 //
 // See also [Client.ReceiveNotaryRequests].
 func (c *Client) ReceiveAllNotaryRequests() error {
@@ -161,7 +161,9 @@ func (c *Client) ReceiveAllNotaryRequests() error {
 		return nil
 	}
 
-	_, err := conn.client.ReceiveNotaryRequests(nil, conn.notaryChan)
+	nrAddedType := mempoolevent.TransactionAdded
+	filter := &neorpc.NotaryRequestFilter{Type: &nrAddedType}
+	_, err := conn.client.ReceiveNotaryRequests(filter, conn.notaryChan)
 	if err != nil {
 		return fmt.Errorf("subscribe to notary requests RPC: %w", err)
 	}
@@ -286,7 +288,9 @@ func (c *Client) restoreSubscriptions(conn *connection, resCh chan<- bool) {
 
 	// notary notification events restoration
 	if c.subs.subscribedToAllNotaryEvents {
-		_, err = conn.client.ReceiveNotaryRequests(nil, conn.notaryChan)
+		nrAddedType := mempoolevent.TransactionAdded
+		filter := &neorpc.NotaryRequestFilter{Type: &nrAddedType}
+		_, err = conn.client.ReceiveNotaryRequests(filter, conn.notaryChan)
 		if err != nil {
 			c.logger.Error("could not restore notary notification subscription after RPC switch",
 				zap.Error(err))

pkg/morph/event/listener.go

@@ -348,7 +348,6 @@ func (l *listener) parseAndHandleNotary(nr *result.NotaryRequestEvent) {
 	)
 
 	notaryKey := notaryRequestTypes{}
-	notaryKey.SetMempoolType(nr.Type)
 	notaryKey.SetRequestType(notaryEvent.Type())
 	notaryKey.SetScriptHash(notaryEvent.ScriptHash())
 
@@ -485,7 +484,6 @@ func (l *listener) SetNotaryParser(pi NotaryParserInfo) {
 	}
 
 	log := l.log.With(
-		zap.Stringer("mempool_type", pi.GetMempoolType()),
 		zap.String("contract", pi.ScriptHash().StringLE()),
 		zap.Stringer("notary_type", pi.RequestType()),
 	)
@@ -525,7 +523,6 @@ func (l *listener) RegisterNotaryHandler(hi NotaryHandlerInfo) {
 	}
 
 	log := l.log.With(
-		zap.Stringer("mempool_type", hi.GetMempoolType()),
 		zap.String("contract", hi.ScriptHash().StringLE()),
 		zap.Stringer("notary type", hi.RequestType()),
 	)

pkg/morph/event/utils.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
 	"github.com/nspcc-dev/neo-go/pkg/core/state"
 	"github.com/nspcc-dev/neo-go/pkg/util"
 	"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
@@ -27,7 +26,6 @@ type scriptHashWithType struct {
 }
 
 type notaryRequestTypes struct {
-	notaryRequestMempoolType
 	notaryScriptWithHash
 }
 
@@ -36,24 +34,10 @@ type notaryScriptWithHash struct {
 	scriptHashValue
 }
 
-type notaryRequestMempoolType struct {
-	mempoolTyp mempoolevent.Type
-}
-
 type notaryRequestType struct {
 	notaryType NotaryType
 }
 
-// GetMempoolType is a notary request mempool type getter.
-func (n notaryRequestMempoolType) GetMempoolType() mempoolevent.Type {
-	return n.mempoolTyp
-}
-
-// SetMempoolType is a notary request mempool type setter.
-func (n *notaryRequestMempoolType) SetMempoolType(typ mempoolevent.Type) {
-	n.mempoolTyp = typ
-}
-
 // RequestType is a notary request type getter.
 func (n notaryRequestType) RequestType() NotaryType {
 	return n.notaryType