Skip to content

Commit a893225

Browse files
cll-ggcll-gg
authored
OEV-1061 Bump chainlink-evm to prevent running SVR jobs if txmv2 is not enabled (#21548)
* OEV-1061 Bump chainlink-evm to prevent running SVR jobs if txmv2 is not enabled * Add dualBroadcastEnabled=false to places not using txmv2 * Run make generate * Fix test compilation * Use merged version of cl-evm * Add changeset
1 parent b73dfa0 commit a893225

21 files changed

Lines changed: 99 additions & 47 deletions

File tree

‎.changeset/wet-cups-curl.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"chainlink": minor
3+
---
4+
5+
Add supportsDualBroadcast to txm/txmv2 to indicate if it can run SVR feeds

‎common/txmgr/mocks/tx_manager.go‎

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/capabilities/ccip/ocrimpls/contract_transmitter_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,8 @@ func makeTestEvmTxm(t *testing.T, db *sqlx.DB, ethClient client.Client, keyStore
646646
keyStore,
647647
estimator,
648648
ht,
649-
nil)
649+
nil,
650+
false)
650651
require.NoError(t, err, "can't create tx manager")
651652

652653
_, unsub := broadcaster.Subscribe(txm)

‎core/scripts/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
5151
github.com/smartcontractkit/chainlink-data-streams v0.1.12
5252
github.com/smartcontractkit/chainlink-deployments-framework v0.86.3
53-
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260316184837-e63656f0d9dd
53+
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260317171146-bebe2a56cd69
5454
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
5555
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260226130359-963f935e0396
5656
github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0
@@ -496,7 +496,7 @@ require (
496496
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3 // indirect
497497
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect
498498
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250818175541-3389ac08a563 // indirect
499-
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20251210101658-1c5c8e4c4f15 // indirect
499+
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20260317132927-e8bc2c7b01f1 // indirect
500500
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20251210101658-1c5c8e4c4f15 // indirect
501501
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20251021173435-e86785845942 // indirect
502502
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4 // indirect

‎core/scripts/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/services/headreporter/prometheus_reporter_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ func newLegacyChainContainer(t *testing.T, db *sqlx.DB) legacyevm.LegacyChainCon
152152
keyStore,
153153
estimator,
154154
ht,
155-
nil)
155+
nil,
156+
false)
156157
require.NoError(t, err)
157158

158159
cfg := configtest.NewGeneralConfig(t, nil)

‎core/services/vrf/delegate_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func buildVrfUni(t *testing.T, db *sqlx.DB, cfg chainlink.GeneralConfig) vrfUniv
8484
ks := keystore.NewInMemory(db, commonkeystore.FastScryptParams, lggr.Infof)
8585
_, dbConfig, evmConfig := txmgr.MakeTestConfigs(t)
8686
evmKs := keys.NewChainStore(keystore.NewEthSigner(ks.Eth(), ec.ConfiguredChainID()), ec.ConfiguredChainID())
87-
txm, err := txmgr.NewTxm(db, evmConfig, evmConfig.GasEstimator(), evmConfig.Transactions(), nil, dbConfig, dbConfig.Listener(), ec, logger.TestLogger(t), nil, evmKs, nil, nil, nil)
87+
txm, err := txmgr.NewTxm(db, evmConfig, evmConfig.GasEstimator(), evmConfig.Transactions(), nil, dbConfig, dbConfig.Listener(), ec, logger.TestLogger(t), nil, evmKs, nil, nil, nil, false)
8888
orm := heads.NewORM(*testutils.FixtureChainID, db, 0)
8989
require.NoError(t, orm.IdempotentInsertHead(testutils.Context(t), cltest.Head(51)))
9090
jrm := job.NewORM(db, prm, btORM, ks, lggr)

‎core/services/vrf/v2/integration_v2_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func makeTestTxm(t *testing.T, txStore txmgr.TestEvmTxStore, keyStore keystore.E
145145
txmConfig := txmgr.NewEvmTxmConfig(evmConfig)
146146
ks := keys.NewStore(keystore.NewEthSigner(keyStore, ec.ConfiguredChainID()))
147147
txm := txmgr.NewEvmTxm(ec.ConfiguredChainID(), txmConfig, evmConfig.Transactions(), ks, logger.TestLogger(t), nil, nil,
148-
nil, txStore, nil, nil, nil, nil, nil, nil)
148+
nil, txStore, nil, nil, nil, nil, nil, nil, false)
149149

150150
return txm
151151
}

‎core/services/vrf/v2/listener_v2_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func makeTestTxm(t *testing.T, txStore txmgr.TestEvmTxStore, keyStore keystore.M
4040
txmConfig := txmgr.NewEvmTxmConfig(evmConfig)
4141
ks := keys.NewChainStore(keystore.NewEthSigner(keyStore.Eth(), ec.ConfiguredChainID()), ec.ConfiguredChainID())
4242
txm := txmgr.NewEvmTxm(ec.ConfiguredChainID(), txmConfig, evmConfig.Transactions(), ks, logger.TestLogger(t), nil, nil,
43-
nil, txStore, nil, nil, nil, nil, nil, nil)
43+
nil, txStore, nil, nil, nil, nil, nil, nil, false)
4444

4545
return txm
4646
}

‎deployment/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260312174130-8651b6078ed9
4848
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
4949
github.com/smartcontractkit/chainlink-deployments-framework v0.86.3
50-
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260316184837-e63656f0d9dd
50+
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260317171146-bebe2a56cd69
5151
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3
5252
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
5353
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20251021173435-e86785845942
@@ -427,7 +427,7 @@ require (
427427
github.com/smartcontractkit/chainlink-data-streams v0.1.12 // indirect
428428
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect
429429
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250818175541-3389ac08a563 // indirect
430-
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20251210101658-1c5c8e4c4f15 // indirect
430+
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20260317132927-e8bc2c7b01f1 // indirect
431431
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20251210101658-1c5c8e4c4f15 // indirect
432432
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4 // indirect
433433
github.com/smartcontractkit/chainlink-protos/chainlink-ccv/committee-verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect

0 commit comments

Comments
 (0)