Skip to content

Commit 05c9b56

Browse files
pavel-raykovpavel-raykov
authored
[CRE-491] Use moved EVM relay mercury from chainlink-evm (#21326)
* Minor. * Minor. * Minor. * Minor. * Minor. * Minor. * Minor.
1 parent 57dadb4 commit 05c9b56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+91
-4864
lines changed

‎.mockery.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,6 @@ packages:
238238
dir: "common/types/mocks"
239239
interfaces:
240240
MonitoringEndpoint:
241-
github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury:
242-
interfaces:
243-
asyncDeleter:
244-
config:
245-
mockname: AsyncDeleter
246241
github.com/smartcontractkit/chainlink-evm/pkg/config:
247242
config:
248243
dir: "core/services/relay/evm/types/mocks"

‎core/capabilities/fakes/streams_trigger.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"github.com/smartcontractkit/chainlink-common/pkg/logger"
2222
"github.com/smartcontractkit/chainlink-common/pkg/services"
2323
v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
24+
"github.com/smartcontractkit/chainlink-evm/pkg/mercury/v3/reportcodec"
2425

2526
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key"
2627
"github.com/smartcontractkit/chainlink/v2/core/capabilities/streams"
27-
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
2828
)
2929

3030
type fakeStreamsTrigger struct {

‎core/capabilities/integration_tests/keystone/keystone_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ import (
1717
"github.com/smartcontractkit/chainlink-common/pkg/capabilities/datastreams"
1818
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1919
feeds_consumer "github.com/smartcontractkit/chainlink-evm/gethwrappers/keystone/generated/feeds_consumer_1_0_0"
20+
reporttypes "github.com/smartcontractkit/chainlink-evm/pkg/mercury/v3/types"
2021
"github.com/smartcontractkit/chainlink-protos/cre/go/values"
22+
2123
"github.com/smartcontractkit/chainlink/v2/core/capabilities/integration_tests/framework"
22-
reporttypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/types"
2324
)
2425

2526
func Test_AllAtOnceTransmissionSchedule(t *testing.T) {

‎core/capabilities/integration_tests/keystone/setup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
2020
v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
2121
feeds_consumer "github.com/smartcontractkit/chainlink-evm/gethwrappers/keystone/generated/feeds_consumer_1_0_0"
22+
"github.com/smartcontractkit/chainlink-evm/pkg/mercury/v3/reportcodec"
2223

2324
"github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key"
2425
"github.com/smartcontractkit/chainlink/v2/core/capabilities/integration_tests/framework"
25-
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
2626
)
2727

2828
var (

‎core/capabilities/streams/codec.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/smartcontractkit/chainlink-common/pkg/capabilities/datastreams"
1111
"github.com/smartcontractkit/chainlink-common/pkg/logger"
12+
"github.com/smartcontractkit/chainlink-evm/pkg/mercury/v3/reportcodec"
1213
"github.com/smartcontractkit/chainlink-protos/cre/go/values"
13-
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
1414
)
1515

1616
type codec struct {

‎core/capabilities/streams/codec_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"github.com/smartcontractkit/chainlink-common/pkg/capabilities/datastreams"
1818
"github.com/smartcontractkit/chainlink-common/pkg/logger"
1919
v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
20+
"github.com/smartcontractkit/chainlink-evm/pkg/mercury/v3/reportcodec"
2021
"github.com/smartcontractkit/chainlink-protos/cre/go/values"
2122
"github.com/smartcontractkit/chainlink/v2/core/capabilities/streams"
22-
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
2323
)
2424

2525
func TestCodec_WrapUnwrap(t *testing.T) {

‎core/scripts/go.mod‎

Lines changed: 1 addition & 1 deletion
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-0.20260227110503-42b236799872
5252
github.com/smartcontractkit/chainlink-deployments-framework v0.80.1-0.20260209182815-b296b7df28a6
53-
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260223142528-fe0bf6474c99
53+
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260227175232-0de99d1959de
5454
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20251222115927-36a18321243c
5555
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260217043601-5cc966896c4f
5656
github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0

‎core/scripts/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,8 +1619,8 @@ github.com/smartcontractkit/chainlink-data-streams v0.1.12-0.20260227110503-42b2
16191619
github.com/smartcontractkit/chainlink-data-streams v0.1.12-0.20260227110503-42b236799872/go.mod h1:5jROIH/4cgHBQn875A+E2DCqvkBtrkHs+ciedcGTjNI=
16201620
github.com/smartcontractkit/chainlink-deployments-framework v0.80.1-0.20260209182815-b296b7df28a6 h1:wVGho+uL3UEqhzMtAXmtZDUQ14J1Fmm7PkqJDuJWd1c=
16211621
github.com/smartcontractkit/chainlink-deployments-framework v0.80.1-0.20260209182815-b296b7df28a6/go.mod h1:0EzSyjHDLYSNqo3Bp9lSQs53CTaGbXHB5ovCa6BoOOM=
1622-
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260223142528-fe0bf6474c99 h1:hZTafPs2L9PXC+dhQZcIDKZTU6bND4Lr2esu7yhUl0c=
1623-
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260223142528-fe0bf6474c99/go.mod h1:vyCNAFYkDz+GAG/dcHXxfk3U9C1P2NLGLEBCmk9OzgY=
1622+
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260227175232-0de99d1959de h1:T9LNES9gAKP3GH8YK48hTHb+iN2lpWQuEGTEXGMCryE=
1623+
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260227175232-0de99d1959de/go.mod h1:RbSY8We8s4ac7uO7Q3cJ7f1IqnCzTD/TErVoLmXH8N8=
16241624
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3 h1:V22ITnWmgBAyxH+VVVo1jxm/LeJ3jcVMCVYB+zLN5mU=
16251625
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3/go.mod h1:u5vhpPHVUdGUni9o00MBu2aKPE0Q2DRoipAGPYD01e0=
16261626
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20251222115927-36a18321243c h1:eX7SCn5AGUGduv5OrjbVJkUSOnyeal0BtVem6zBSB2Y=

‎core/scripts/keystone/src/02_provision_streams_trigger_capability.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,15 @@ import (
3434

3535
mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
3636
datastreamsmercury "github.com/smartcontractkit/chainlink-data-streams/mercury"
37+
"github.com/smartcontractkit/chainlink-evm/pkg/mercury"
3738

3839
helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
3940

4041
focr "github.com/smartcontractkit/chainlink-deployments-framework/offchain/ocr"
41-
"github.com/smartcontractkit/chainlink/v2/core/bridges"
42-
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
43-
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury"
44-
4542
verifierContract "github.com/smartcontractkit/chainlink-evm/gethwrappers/llo-feeds/generated/verifier"
4643
"github.com/smartcontractkit/chainlink-evm/gethwrappers/llo-feeds/generated/verifier_proxy"
44+
"github.com/smartcontractkit/chainlink/v2/core/bridges"
45+
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
4746

4847
"github.com/smartcontractkit/chainlink/v2/core/store/models"
4948
"github.com/smartcontractkit/chainlink/v2/core/web/presenters"

‎core/services/chainlink/application.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
"github.com/smartcontractkit/chainlink-data-streams/mercury/wsrpc"
4242
"github.com/smartcontractkit/chainlink-evm/pkg/chains/legacyevm"
4343
"github.com/smartcontractkit/chainlink-evm/pkg/logpoller"
44+
"github.com/smartcontractkit/chainlink-evm/pkg/mercury"
4445
"github.com/smartcontractkit/chainlink-evm/pkg/txmgr"
4546
evmutils "github.com/smartcontractkit/chainlink-evm/pkg/utils"
4647
"github.com/smartcontractkit/chainlink/v2/core/services/ring"
@@ -80,7 +81,6 @@ import (
8081
"github.com/smartcontractkit/chainlink/v2/core/services/periodicbackup"
8182
"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
8283
"github.com/smartcontractkit/chainlink/v2/core/services/relay"
83-
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury"
8484
"github.com/smartcontractkit/chainlink/v2/core/services/standardcapabilities"
8585
"github.com/smartcontractkit/chainlink/v2/core/services/streams"
8686
"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"

0 commit comments

Comments
 (0)