Merge branch 'master' into fix/block-acquisition

[goreleaser]
synapsecns · Jul 8, 2024 · a15576b · a15576b
2 parents bd22f55 + 31b5f8f
commit a15576b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/services/cctp-relayer/relayer/relayer.go b/services/cctp-relayer/relayer/relayer.go
@@ -2,6 +2,7 @@ package relayer
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 	"time"
@@ -304,11 +305,13 @@ func (c *CCTPRelayer) Run(parentCtx context.Context) error {
 	})
 
 	g.Go(func() error {
-		err := c.txSubmitter.Start(ctx)
-		if err != nil {
-			err = fmt.Errorf("could not start tx submitter: %w", err)
+		if !c.txSubmitter.Started() {
+			err := c.txSubmitter.Start(ctx)
+			if err != nil && !errors.Is(err, submitter.ErrSubmitterAlreadyStarted) {
+				return fmt.Errorf("could not start tx submitter: %w", err)
+			}
 		}
-		return err
+		return nil
 	})
 
 	g.Go(func() error {

diff --git a/services/rfq/relayer/service/relayer.go b/services/rfq/relayer/service/relayer.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math/big"
 	"sync"
@@ -237,9 +238,12 @@ func (r *Relayer) Start(ctx context.Context) (err error) {
 	})
 
 	g.Go(func() error {
-		err := r.submitter.Start(ctx)
-		if err != nil {
-			return fmt.Errorf("could not start submitter: %w", err)
+		if !r.submitter.Started() {
+			err := r.submitter.Start(ctx)
+			if err != nil && !errors.Is(err, submitter.ErrSubmitterAlreadyStarted) {
+				return fmt.Errorf("could not start submitter: %w", err)
+			}
+			return nil
 		}
 		return nil
 	})