feat: created generic syncmonitor package in medley and updated gnosis and api keyper services

Author: blockchainluffy

rolling-shutter/keyperimpl/gnosis/keyper.go

@@ -25,6 +25,7 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/slotticker"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/syncmonitor"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
 )
 
@@ -49,7 +50,7 @@ type Keyper struct {
 	validatorSyncer     *ValidatorSyncer
 	eonKeyPublisher     *eonkeypublisher.EonKeyPublisher
 	latestTriggeredSlot *uint64
-	syncMonitor         *SyncMonitor
+	syncMonitor         *syncmonitor.SyncMonitor
 
 	// input events
 	newBlocks        chan *syncevent.LatestBlock
@@ -63,8 +64,7 @@ type Keyper struct {
 
 func New(c *Config) *Keyper {
 	return &Keyper{
-		config:      c,
-		syncMonitor: &SyncMonitor{},
+		config: c,
 	}
 }
 
@@ -156,9 +156,12 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 		return errors.Wrap(err, "failed to reset transaction pointer age")
 	}
 
-	kpr.syncMonitor = &SyncMonitor{
+	kpr.syncMonitor = &syncmonitor.SyncMonitor{
 		DBPool:        kpr.dbpool,
 		CheckInterval: time.Duration(kpr.config.Gnosis.SyncMonitorCheckInterval) * time.Second,
+		SyncState: &GnosisSyncState{
+			kpr.dbpool,
+		},
 	}
 
 	runner.Go(func() error { return kpr.processInputs(ctx) })

rolling-shutter/keyperimpl/gnosis/syncmonitor.go

@@ -0,0 +1,24 @@
+package gnosis
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v4/pgxpool"
+
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
+)
+
+// GnosisSyncState implements the BlockSyncState interface for the gnosis keyper
+type GnosisSyncState struct {
+	DBPool *pgxpool.Pool
+}
+
+// GetSyncedBlockNumber retrieves the current synced block number from transaction submitted events
+func (s *GnosisSyncState) GetSyncedBlockNumber(ctx context.Context) (int64, error) {
+	db := database.New(s.DBPool)
+	record, err := db.GetTransactionSubmittedEventsSyncedUntil(ctx)
+	if err != nil {
+		return 0, err
+	}
+	return record.BlockNumber, nil
+}

rolling-shutter/keyperimpl/gnosis/syncmonitor_test.go

@@ -22,6 +22,7 @@ import (
 	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/syncmonitor"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
 )
 
@@ -36,7 +37,7 @@ type Keyper struct {
 	registrySyncer      *RegistrySyncer
 	eonKeyPublisher     *eonkeypublisher.EonKeyPublisher
 	latestTriggeredTime *uint64
-	syncMonitor         *SyncMonitor
+	syncMonitor         *syncmonitor.SyncMonitor
 
 	// input events
 	newBlocks        chan *syncevent.LatestBlock
@@ -113,10 +114,14 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 		return err
 	}
 
-	kpr.syncMonitor = &SyncMonitor{
+	kpr.syncMonitor = &syncmonitor.SyncMonitor{
 		DBPool:        kpr.dbpool,
 		CheckInterval: time.Duration(kpr.config.Chain.SyncMonitorCheckInterval) * time.Second,
+		SyncState: &ShutterServiceSyncState{
+			kpr.dbpool,
+		},
 	}
+
 	runner.Go(func() error { return kpr.processInputs(ctx) })
 	return runner.StartService(kpr.core, kpr.chainSyncClient, kpr.eonKeyPublisher, kpr.syncMonitor)
 }

rolling-shutter/keyperimpl/gnosis/syncstate.go

@@ -0,0 +1,24 @@
+package shutterservice
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v4/pgxpool"
+
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/shutterservice/database"
+)
+
+// ShutterServiceSyncState implements the BlockSyncState interface for the shutter service
+type ShutterServiceSyncState struct {
+	DBPool *pgxpool.Pool
+}
+
+// GetSyncedBlockNumber retrieves the current synced block number from identity events
+func (s *ShutterServiceSyncState) GetSyncedBlockNumber(ctx context.Context) (int64, error) {
+	db := database.New(s.DBPool)
+	record, err := db.GetIdentityRegisteredEventsSyncedUntil(ctx)
+	if err != nil {
+		return 0, err
+	}
+	return record.BlockNumber, nil
+}