Skip to content

Return error when Forwarders are not enabled#455

Merged
dimriou merged 1 commit intodevelopfrom
orchestrator_changes_for_dfs
Apr 29, 2026
Merged

Return error when Forwarders are not enabled#455
dimriou merged 1 commit intodevelopfrom
orchestrator_changes_for_dfs

Conversation

@dimriou
Copy link
Copy Markdown
Contributor

@dimriou dimriou commented Apr 29, 2026

This PR makes TXMv2 Orchestrator's methods more aligned with v1's txmgr to enable DFs without forwarders

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 29, 2026

⚠️ API Diff Results - github.com/smartcontractkit/chainlink-evm

⚠️ Breaking Changes (10)

pkg/config.TransactionManagerV2 (2)
  • CustomURL — ➕ Added

  • CustomURLs — 🗑️ Removed

pkg/config/toml.TransactionManagerV2Config (1)
  • CustomURLs — 🗑️ Removed
pkg/txm/clientwrappers/dualbroadcast (1)
  • SelectClient — Type changed:
func(
  github.com/smartcontractkit/chainlink-common/pkg/logger.Logger, 
  github.com/smartcontractkit/chainlink-evm/pkg/client.Client, 
  github.com/smartcontractkit/chainlink-evm/pkg/keys.ChainStore, 
  - []*net/url.URL, 
  + *net/url.URL, 
  *math/big.Int, 
  github.com/smartcontractkit/chainlink-evm/pkg/txm.TxStore, 
  bool, 
  *bool, 
  *time.Duration, 
  github.com/smartcontractkit/chainlink-evm/pkg/txm.Metrics
)
(github.com/smartcontractkit/chainlink-evm/pkg/txm.Client, github.com/smartcontractkit/chainlink-evm/pkg/txm.ErrorHandler, error)
pkg/txmgr.(*evmTxmMetrics) (1)
  • IncrementNumFinalizedTxs — 🗑️ Removed
pkg/txmgr.EvmTxStore (1)
  • OldestNonTerminalTxAgeSeconds — ➕ Added
pkg/txmgr.finalizerMetrics (3)
  • AddNumFinalizedTxs — ➕ Added

  • IncrementNumFinalizedTxs — 🗑️ Removed

  • RecordOldestNonTerminalTxAgeSeconds — ➕ Added

pkg/txmgr.finalizerTxStore (1)
  • OldestNonTerminalTxAgeSeconds — ➕ Added

✅ Compatible Changes (12)

pkg/client (1)
  • IsBatchRPCResponseEnvelopeUnmarshalError — ➕ Added
pkg/txm/clientwrappers/dualbroadcast (5)
  • FlashbotsClient — ➕ Added

  • FlashbotsClientRPC — ➕ Added

  • NewFlashbotsClient — ➕ Added

  • Privacy — ➕ Added

  • RefundConfig — ➕ Added

pkg/txmgr.(*evmTxStore) (1)
  • OldestNonTerminalTxAgeSeconds — ➕ Added
pkg/txmgr.(*evmTxmMetrics) (2)
  • AddNumFinalizedTxs — ➕ Added

  • RecordOldestNonTerminalTxAgeSeconds — ➕ Added

pkg/txmgr/mocks (1)
  • EvmTxStore_OldestNonTerminalTxAgeSeconds_Call — ➕ Added
pkg/txmgr/mocks.(*EvmTxStore) (1)
  • OldestNonTerminalTxAgeSeconds — ➕ Added
pkg/txmgr/mocks.(*EvmTxStore_Expecter) (1)
  • OldestNonTerminalTxAgeSeconds — ➕ Added

📄 View full apidiff report

@dimriou dimriou force-pushed the orchestrator_changes_for_dfs branch from 95faf81 to b2d96ae Compare April 29, 2026 09:06
@dimriou dimriou force-pushed the orchestrator_changes_for_dfs branch from b2d96ae to 15bddb2 Compare April 29, 2026 09:16
@dimriou dimriou marked this pull request as ready for review April 29, 2026 09:27
Copilot AI review requested due to automatic review settings April 29, 2026 09:27
@dimriou dimriou requested review from a team as code owners April 29, 2026 09:27
@dimriou dimriou enabled auto-merge (squash) April 29, 2026 09:28
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the TXMv2 Orchestrator to better align its behavior with the legacy txmgr, particularly around forwarder handling when forwarders are disabled.

Changes:

  • Fixes CreateTransaction to return the actual keystore “not enabled” error (kErr) in NotEnabledError.
  • Changes GetForwarderForEOA* methods to return an explicit error when forwarding is disabled (o.fwdMgr == nil).
  • Replaces the prior CountTransactionsByState implementation with an unimplemented error.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread pkg/txm/orchestrator.go
Comment thread pkg/txm/orchestrator.go
Comment thread pkg/txm/orchestrator.go
Comment thread pkg/txm/orchestrator.go
@dimriou dimriou merged commit 0be6fb4 into develop Apr 29, 2026
40 of 42 checks passed
@dimriou dimriou deleted the orchestrator_changes_for_dfs branch April 29, 2026 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants