debug ir gas distribution

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

pkg/innerring/blocktimer.go

@@ -6,7 +6,6 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/util"
 	"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/alphabet"
 	"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement"
-	timerEvent "github.com/nspcc-dev/neofs-node/pkg/innerring/timers"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/event"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/timer"
@@ -139,12 +138,3 @@ func newEpochTimer(args *epochTimerArgs) *timer.BlockTimer {
 
 	return epochTimer
 }
-
-func newEmissionTimer(args *emitTimerArgs) *timer.BlockTimer {
-	return timer.NewBlockTimer(
-		timer.StaticBlockMeter(args.emitDuration),
-		func() {
-			args.ap.HandleGasEmission(timerEvent.NewAlphabetEmitTick{})
-		},
-	)
-}

pkg/innerring/innerring.go

@@ -976,7 +976,7 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper, errChan chan<-
 	emissionHardcoded := 10_0000_0000
 
 	// create alphabet processor
-	alphabetProcessor, err := alphabet.New(&alphabet.Params{
+	alphaProcessor, err := alphabet.New(&alphabet.Params{
 		Log:               log,
 		PoolSize:          cfg.GetInt("workers.alphabet"),
 		AlphabetContracts: server.contracts.alphabet,
@@ -990,7 +990,7 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper, errChan chan<-
 		return nil, err
 	}
 
-	err = bindMorphProcessor(alphabetProcessor, server)
+	err = bindMorphProcessor(alphaProcessor, server)
 	if err != nil {
 		return nil, err
 	}
@@ -1039,14 +1039,6 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper, errChan chan<-
 
 	server.addBlockTimer(server.epochTimer)
 
-	// initialize emission timer
-	emissionTimer := newEmissionTimer(&emitTimerArgs{
-		ap:           alphabetProcessor,
-		emitDuration: cfg.GetUint32("timers.emit"),
-	})
-
-	server.addBlockTimer(emissionTimer)
-
 	return server, nil
 }
 

pkg/innerring/processors/alphabet/handlers.go

@@ -1,13 +1,13 @@
 package alphabet
 
 import (
-	"github.com/nspcc-dev/neofs-node/pkg/innerring/timers"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/event"
+	netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
 	"go.uber.org/zap"
 )
 
 func (ap *Processor) HandleGasEmission(ev event.Event) {
-	_ = ev.(timers.NewAlphabetEmitTick)
+	_ = ev.(netmapEvent.NewEpoch)
 	ap.log.Info("tick", zap.String("type", "alphabet gas emit"))
 
 	// send event to the worker pool

pkg/innerring/processors/alphabet/processor.go

@@ -8,6 +8,7 @@ import (
 	"github.com/nspcc-dev/neofs-node/pkg/morph/client"
 	nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/event"
+	netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
 	"github.com/panjf2000/ants/v2"
 	"go.uber.org/zap"
 )
@@ -82,14 +83,36 @@ func New(p *Params) (*Processor, error) {
 	}, nil
 }
 
+const newEpochNotification = "NewEpoch"
+
 // ListenerNotificationParsers for the 'event.Listener' event producer.
 func (ap *Processor) ListenerNotificationParsers() []event.NotificationParserInfo {
-	return nil
+	parsers := make([]event.NotificationParserInfo, 0, 1)
+
+	var p event.NotificationParserInfo
+	p.SetScriptHash(ap.netmapClient.ContractAddress())
+
+	// new epoch event
+	p.SetType(newEpochNotification)
+	p.SetParser(netmapEvent.ParseNewEpoch)
+	parsers = append(parsers, p)
+
+	return parsers
 }
 
 // ListenerNotificationHandlers for the 'event.Listener' event producer.
 func (ap *Processor) ListenerNotificationHandlers() []event.NotificationHandlerInfo {
-	return nil
+	handlers := make([]event.NotificationHandlerInfo, 0, 1)
+
+	var i event.NotificationHandlerInfo
+	i.SetScriptHash(ap.netmapClient.ContractAddress())
+
+	// new epoch handler
+	i.SetType(newEpochNotification)
+	i.SetHandler(ap.HandleGasEmission)
+	handlers = append(handlers, i)
+
+	return handlers
 }
 
 // ListenerNotaryParsers for the 'event.Listener' event producer.