add sync monitor config

Author: ylembachar

play/manual/keyper-0.toml

@@ -15,6 +15,9 @@ CustomBootstrapAddresses = ['/ip4/127.0.0.1/tcp/2001/p2p/12D3KooWMyutShWdqYj7fre
 Environment = "local"
 DiscoveryNamespace = "shutter-42"
 
+[P2P.FloodSubDiscovery]
+enabled = false
+
 [Gnosis]
 EncryptedGasLimit = 1000000
 MinGasPerTransaction = 21000
@@ -23,6 +26,7 @@ SecondsPerSlot = 5
 SlotsPerEpoch = 16
 GenesisSlotTimestamp = 1665396300
 SyncStartBlockNumber = 0
+SyncMonitorCheckInterval = 30
 
 [Gnosis.Node]
 PrivateKey = 'dcb23da56656b3c8a11e2b4cdd92f430c500862f7f7fc762807d11b734e9500c'

play/manual/keyper-1.toml

@@ -15,6 +15,9 @@ CustomBootstrapAddresses = ['/ip4/127.0.0.1/tcp/2001/p2p/12D3KooWMyutShWdqYj7fre
 Environment = "local"
 DiscoveryNamespace = "shutter-42"
 
+[P2P.FloodSubDiscovery]
+enabled = false
+
 [Gnosis]
 EncryptedGasLimit = 1000000
 MinGasPerTransaction = 21000
@@ -23,6 +26,7 @@ SecondsPerSlot = 5
 SlotsPerEpoch = 16
 GenesisSlotTimestamp = 1665396300
 SyncStartBlockNumber = 0
+SyncMonitorCheckInterval = 30
 
 [Gnosis.Node]
 PrivateKey = '00b4a53228e3761ad78bd376b8293f19af36777f71d8e55a61975f8eecd8c1c1'

play/manual/keyper-2.toml

@@ -15,6 +15,9 @@ CustomBootstrapAddresses = ['/ip4/127.0.0.1/tcp/2001/p2p/12D3KooWMyutShWdqYj7fre
 Environment = "local"
 DiscoveryNamespace = "shutter-42"
 
+[P2P.FloodSubDiscovery]
+enabled = false
+
 [Gnosis]
 EncryptedGasLimit = 1000000
 MinGasPerTransaction = 21000
@@ -23,6 +26,7 @@ SecondsPerSlot = 5
 SlotsPerEpoch = 16
 GenesisSlotTimestamp = 1665396300
 SyncStartBlockNumber = 0
+SyncMonitorCheckInterval = 30
 
 [Gnosis.Node]
 PrivateKey = 'a4e901b1df81ff8fc5fa77f5bf0c15a4c8410e85fcaf19fbec47a2241b9d65d6'

rolling-shutter/keyperimpl/gnosis/config.go

@@ -98,28 +98,30 @@ func (c *Config) GetAddress() common.Address {
 }
 
 type GnosisConfig struct {
-	Node                 *configuration.EthnodeConfig `shconfig:",required"`
-	Contracts            *GnosisContractsConfig       `shconfig:",required"`
-	EncryptedGasLimit    uint64                       `shconfig:",required"`
-	MinGasPerTransaction uint64                       `shconfig:",required"`
-	MaxTxPointerAge      uint64                       `shconfig:",required"`
-	SecondsPerSlot       uint64                       `shconfig:",required"`
-	SlotsPerEpoch        uint64                       `shconfig:",required"`
-	GenesisSlotTimestamp uint64                       `shconfig:",required"`
-	SyncStartBlockNumber uint64                       `shconfig:",required"`
+	Node                     *configuration.EthnodeConfig `shconfig:",required"`
+	Contracts                *GnosisContractsConfig       `shconfig:",required"`
+	EncryptedGasLimit        uint64                       `shconfig:",required"`
+	MinGasPerTransaction     uint64                       `shconfig:",required"`
+	MaxTxPointerAge          uint64                       `shconfig:",required"`
+	SecondsPerSlot           uint64                       `shconfig:",required"`
+	SlotsPerEpoch            uint64                       `shconfig:",required"`
+	GenesisSlotTimestamp     uint64                       `shconfig:",required"`
+	SyncStartBlockNumber     uint64                       `shconfig:",required"`
+	SyncMonitorCheckInterval uint64                       `shconfig:",required"`
 }
 
 func NewGnosisConfig() *GnosisConfig {
 	c := &GnosisConfig{
-		Node:                 configuration.NewEthnodeConfig(),
-		Contracts:            NewGnosisContractsConfig(),
-		EncryptedGasLimit:    0,
-		MinGasPerTransaction: 0,
-		MaxTxPointerAge:      0,
-		SecondsPerSlot:       0,
-		SlotsPerEpoch:        0,
-		GenesisSlotTimestamp: 0,
-		SyncStartBlockNumber: 0,
+		Node:                     configuration.NewEthnodeConfig(),
+		Contracts:                NewGnosisContractsConfig(),
+		EncryptedGasLimit:        0,
+		MinGasPerTransaction:     0,
+		MaxTxPointerAge:          0,
+		SecondsPerSlot:           0,
+		SlotsPerEpoch:            0,
+		GenesisSlotTimestamp:     0,
+		SyncStartBlockNumber:     0,
+		SyncMonitorCheckInterval: 0,
 	}
 	c.Init()
 	return c
@@ -156,6 +158,7 @@ func (c *GnosisConfig) SetExampleValues() error {
 	c.SlotsPerEpoch = 16
 	c.GenesisSlotTimestamp = 1665410700
 	c.SyncStartBlockNumber = 0
+	c.SyncMonitorCheckInterval = 30
 	return nil
 }
 

rolling-shutter/keyperimpl/gnosis/keyper.go

@@ -157,7 +157,8 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 	}
 
 	kpr.syncMonitor = &SyncMonitor{
-		DBPool: kpr.dbpool,
+		DBPool:        kpr.dbpool,
+		CheckInterval: time.Duration(kpr.config.Gnosis.SyncMonitorCheckInterval) * time.Second,
 	}
 
 	runner.Go(func() error { return kpr.processInputs(ctx) })

rolling-shutter/keyperimpl/gnosis/syncmonitor.go

@@ -12,12 +12,9 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )
 
-const (
-	checkInterval = 30 * time.Second
-)
-
 type SyncMonitor struct {
-	DBPool *pgxpool.Pool
+	DBPool        *pgxpool.Pool
+	CheckInterval time.Duration
 }
 
 func (s *SyncMonitor) Start(ctx context.Context, runner service.Runner) error {
@@ -32,9 +29,11 @@ func (s *SyncMonitor) runMonitor(ctx context.Context) error {
 	var lastBlockNumber int64
 	db := database.New(s.DBPool)
 
+	log.Debug().Msg("starting the sync monitor")
+
 	for {
 		select {
-		case <-time.After(checkInterval):
+		case <-time.After(s.CheckInterval):
 			record, err := db.GetTransactionSubmittedEventsSyncedUntil(ctx)
 			if err != nil {
 				log.Warn().Err(err).Msg("error fetching block number")

rolling-shutter/keyperimpl/gnosis/syncmonitor_test.go

@@ -43,7 +43,8 @@ func TestSyncMonitor_ThrowsErrorWhenBlockNotIncreasing(t *testing.T) {
 	}
 
 	monitor := &gnosis.SyncMonitor{
-		DBPool: dbpool,
+		DBPool:        dbpool,
+		CheckInterval: 30 * time.Second,
 	}
 
 	errCh := make(chan error, 1)