Add extra checks for completed messages

ethereum/broadcast.go

@@ -56,16 +56,17 @@ func (e *Ethereum) Broadcast(
 	var broadcastErrors error
 MsgLoop:
 	for _, msg := range msgs {
-		if msg.Status == types.Complete {
-			continue MsgLoop
-		}
-
 		attestationBytes, err := hex.DecodeString(msg.Attestation[2:])
 		if err != nil {
 			return errors.New("unable to decode message attestation")
 		}
 
 		for attempt := 0; attempt <= e.maxRetries; attempt++ {
+			// check if another worker already broadcasted tx due to flush
+			if msg.Status == types.Complete {
+				continue MsgLoop
+			}
+
 			if err := e.attemptBroadcast(
 				ctx,
 				logger,
@@ -139,7 +140,6 @@ func (e *Ethereum) attemptBroadcast(
 	if nonceErr != nil {
 		logger.Debug("Error querying whether nonce was used.   Continuing...", "error:", nonceErr)
 	} else {
-		fmt.Printf("received used nonce response: %d\n", response)
 		if response.Uint64() == uint64(1) {
 			// nonce has already been used, mark as complete
 			logger.Debug(fmt.Sprintf("This source domain/nonce has already been used: %d %d",

ethereum/contract_backend_wrapper.go

@@ -2,7 +2,6 @@ package ethereum
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -19,10 +18,5 @@ func NewContractBackendWrapper(client *ethclient.Client) *ContractBackendWrapper
 }
 
 func (c *ContractBackendWrapper) SendTransaction(ctx context.Context, tx *types.Transaction) error {
-	json, err := tx.MarshalJSON()
-	if err != nil {
-		return err
-	}
-	fmt.Printf("SendTransaction: %+v\n\nRAW: %s\n", tx, json)
 	return c.Client.SendTransaction(ctx, tx)
 }

noble/broadcast.go

@@ -103,6 +103,11 @@ func (n *Noble) attemptBroadcast(
 			continue
 		}
 
+		// check if another worker already broadcasted tx due to flush
+		if msg.Status == types.Complete {
+			continue
+		}
+
 		attestationBytes, err := hex.DecodeString(msg.Attestation[2:])
 		if err != nil {
 			return fmt.Errorf("unable to decode message attestation")

noble/message_state.go

@@ -73,8 +73,6 @@ func txToMessageState(tx *ctypes.ResultTx) ([]*types.MessageState, error) {
 					}
 
 					messageStates = append(messageStates, messageState)
-
-					fmt.Printf("Appended transfer from 4 to %d\n", msg.DestinationDomain)
 				}
 			}
 			if !parsed {