From e153114163060c25268665dff3670b009f85f5e5 Mon Sep 17 00:00:00 2001
From: Vincent Geddes <117534+vgeddes@users.noreply.github.com>
Date: Thu, 5 Dec 2024 00:51:33 +0200
Subject: [PATCH] tweak

---
 relayer/cmd/sync_beefy_commitment.go |  8 ++------
 relayer/relays/beefy/main.go         | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/relayer/cmd/sync_beefy_commitment.go b/relayer/cmd/sync_beefy_commitment.go
index 2698ebcb7c..3bbca2c7bf 100644
--- a/relayer/cmd/sync_beefy_commitment.go
+++ b/relayer/cmd/sync_beefy_commitment.go
@@ -12,7 +12,7 @@ import (
 
 func syncBeefyCommitmentCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "sync-latest-beefy-commitment",
+		Use:   "sync-beefy-commitment",
 		Short: "Sync beefy commitment on demand",
 		Args:  cobra.ExactArgs(0),
 		RunE:  SyncBeefyCommitmentFn,
@@ -22,9 +22,6 @@ func syncBeefyCommitmentCmd() *cobra.Command {
 	cmd.Flags().String("private-key", "", "Ethereum private key")
 	cmd.Flags().String("private-key-file", "", "The file from which to read the private key")
 	cmd.Flags().String("private-key-id", "", "The secret id to lookup the private key in AWS Secrets Manager")
-
-	cmd.Flags().Uint64P("block-number", "b", 0, "Relay block number which contains a Parachain message")
-	cmd.MarkFlagRequired("block-number")
 	return cmd
 }
 
@@ -57,7 +54,6 @@ func SyncBeefyCommitmentFn(cmd *cobra.Command, _ []string) error {
 	if err != nil {
 		return err
 	}
-	blockNumber, _ := cmd.Flags().GetUint64("block-number")
-	err = relay.OneShotSync(ctx, blockNumber)
+	err = relay.RateLimitedSync(ctx)
 	return err
 }
diff --git a/relayer/relays/beefy/main.go b/relayer/relays/beefy/main.go
index e10f739af0..db90261246 100644
--- a/relayer/relays/beefy/main.go
+++ b/relayer/relays/beefy/main.go
@@ -202,7 +202,7 @@ func (relay *Relay) RateLimitedSync(ctx context.Context) error {
 	var tokens atomic.Uint64
 	tokens.Store(1)
 
-	go refiller(ctx, &tokens, 1, 1, time.Minute*30)
+	go refiller(ctx, &tokens, 1, 1, time.Minute*60)
 
 	for {
 		log.Info("Starting check")
@@ -237,14 +237,22 @@ func (relay *Relay) RateLimitedSync(ctx context.Context) error {
 			}
 
 			log.Info("Sync completed")
-		}
 
-		// Sleep for 5 minute
-		select {
-		case <-ctx.Done():
-			return nil
-		case <-time.After(time.Second * 300):
+			// Sleep for 5 minute to allow message relayer to sync nonces
+			select {
+			case <-ctx.Done():
+				return nil
+			case <-time.After(time.Second * 300):
+			}
+		} else {
+			// Sleep for 1 minute
+			select {
+			case <-ctx.Done():
+				return nil
+			case <-time.After(time.Second * 60):
+			}
 		}
+
 	}
 }