Use both TXMv1 and TXMv2 for OEV (#16077)

* Fix txmv2 for oev * Fix txmv2 not false errors
smartcontractkit · Jan 27, 2025 · a1a2753 · a1a2753
1 parent 039217d
commit a1a2753
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/core/chains/evm/txm/orchestrator.go b/core/chains/evm/txm/orchestrator.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"math"
 	"math/big"
+	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
@@ -86,7 +87,10 @@ func (o *Orchestrator[BLOCK_HASH, HEAD]) Start(ctx context.Context) error {
 	return o.StartOnce("Orchestrator", func() error {
 		var ms services.MultiStart
 		if err := ms.Start(ctx, o.attemptBuilder); err != nil {
-			return fmt.Errorf("Orchestrator: AttemptBuilder failed to start: %w", err)
+			// TODO: hacky fix for DualBroadcast
+			if !strings.Contains(err.Error(), "already been started once") {
+				return fmt.Errorf("Orchestrator: AttemptBuilder failed to start: %w", err)
+			}
 		}
 		addresses, err := o.keystore.EnabledAddressesForChain(ctx, o.chainID)
 		if err != nil {
@@ -121,7 +125,10 @@ func (o *Orchestrator[BLOCK_HASH, HEAD]) Close() (merr error) {
 			merr = errors.Join(merr, fmt.Errorf("Orchestrator failed to stop Txm: %w", err))
 		}
 		if err := o.attemptBuilder.Close(); err != nil {
-			merr = errors.Join(merr, fmt.Errorf("Orchestrator failed to stop AttemptBuilder: %w", err))
+			// TODO: hacky fix for DualBroadcast
+			if !strings.Contains(err.Error(), "already been stopped") {
+				merr = errors.Join(merr, fmt.Errorf("Orchestrator failed to stop AttemptBuilder: %w", err))
+			}
 		}
 		return merr
 	})

diff --git a/core/chains/legacyevm/evm_txm.go b/core/chains/legacyevm/evm_txm.go
@@ -54,7 +54,7 @@ func newEvmTxm(
 				opts.KeyStore,
 				estimator,
 			)
-			if cfg.Transactions().TransactionManagerV2().DualBroadcast() != nil && *cfg.Transactions().TransactionManagerV2().DualBroadcast() {
+			if cfg.Transactions().TransactionManagerV2().DualBroadcast() == nil || !*cfg.Transactions().TransactionManagerV2().DualBroadcast() {
 				return txmv2, err
 			}
 		}