Skip to content

Commit 2617aa9

Browse files
patrickhuie19patrickhuie19
committed
switching to common orgresolver service
1 parent 705588e commit 2617aa9

21 files changed

Lines changed: 48 additions & 234 deletions

File tree

‎core/scripts/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
github.com/shopspring/decimal v1.4.0
4848
github.com/smartcontractkit/chainlink-automation v0.8.1
4949
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250930202440-88c08e65d960
50-
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251002161429-f0c57dab20d5
50+
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251003215432-a8795d634f42
5151
github.com/smartcontractkit/chainlink-data-streams v0.1.5
5252
github.com/smartcontractkit/chainlink-deployments-framework v0.54.0
5353
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20251006145521-1bb51044b147
@@ -486,7 +486,7 @@ require (
486486
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2 // indirect
487487
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d // indirect
488488
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250807135425-a2c09896d609 // indirect
489-
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20250908151016-bf310cf85379 // indirect
489+
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b // indirect
490490
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 // indirect
491491
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
492492
github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect

‎core/scripts/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,8 +1597,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8
15971597
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
15981598
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5 h1:QhcYGEhRLInr1/qh/3RJiVdvJ0nxBHKhPe65WLbSBnU=
15991599
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
1600-
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251002161429-f0c57dab20d5 h1:T4xnp4/MkrhbVAex7JVO9VypWX/bxiXsmBiOqZQK8Bw=
1601-
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251002161429-f0c57dab20d5/go.mod h1:1r3aM96KHAESfnayJ3BTHCkP1qJS1BEG1r4czeoaXlA=
1600+
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251003215432-a8795d634f42 h1:wq5axTY1g0EY/xHsdmpDqJrfCqf6dmoxoNBjVxhBl1c=
1601+
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251003215432-a8795d634f42/go.mod h1:37kbNkl7i8GIVDX7ScdzxQCMGFYkaL6cX+P1wRG4D4U=
16021602
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.4 h1:hvqATtrZ0iMRTI80cpBot/3JFbjz2j+2tvpfooVhRHw=
16031603
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.4/go.mod h1:eKGyfTKzr0/PeR7qKN4l2FcW9p+HzyKUwAfGhm/5YZc=
16041604
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
@@ -1627,8 +1627,8 @@ github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc
16271627
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
16281628
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 h1:PWwLGimBt37eDzpbfZ9V/ZkW4oCjcwKjKiAwKlSfPc0=
16291629
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
1630-
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20250908151016-bf310cf85379 h1:NT9UDWd0myN0swDx2reN95RxxEshOKdgGAbv1CiRavU=
1631-
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20250908151016-bf310cf85379/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY=
1630+
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b h1:QuI6SmQFK/zyUlVWEf0GMkiUYBPY4lssn26nKSd/bOM=
1631+
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY=
16321632
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 h1:0eroOyBwmdoGUwUdvMI0/J7m5wuzNnJDMglSOK1sfNY=
16331633
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
16341634
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 h1:L6KJ4kGv/yNNoCk8affk7Y1vAY0qglPMXC/hevV/IsA=

‎core/services/chainlink/application.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import (
5050
"github.com/smartcontractkit/chainlink-evm/pkg/txmgr"
5151
evmutils "github.com/smartcontractkit/chainlink-evm/pkg/utils"
5252

53+
"github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
5354
"github.com/smartcontractkit/chainlink/v2/core/bridges"
5455
"github.com/smartcontractkit/chainlink/v2/core/build"
5556
"github.com/smartcontractkit/chainlink/v2/core/capabilities"
@@ -79,7 +80,6 @@ import (
7980
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2"
8081
"github.com/smartcontractkit/chainlink/v2/core/services/ocrbootstrap"
8182
"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
82-
"github.com/smartcontractkit/chainlink/v2/core/services/orgresolver"
8383
p2pmain "github.com/smartcontractkit/chainlink/v2/core/services/p2p"
8484
p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
8585
p2pwrapper "github.com/smartcontractkit/chainlink/v2/core/services/p2p/wrapper"

‎core/services/orgresolver/linking.go‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎core/services/orgresolver/linking_test.go‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎core/services/workflows/syncer/v2/handler.go‎

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

1010
"github.com/smartcontractkit/chainlink-common/pkg/custmsg"
1111
"github.com/smartcontractkit/chainlink-common/pkg/services"
12+
"github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
1213
"github.com/smartcontractkit/chainlink-common/pkg/settings/limits"
1314
commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
1415
"github.com/smartcontractkit/chainlink-common/pkg/types/core"
@@ -20,7 +21,6 @@ import (
2021
"github.com/smartcontractkit/chainlink/v2/core/platform"
2122
"github.com/smartcontractkit/chainlink/v2/core/services/job"
2223
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/workflowkey"
23-
"github.com/smartcontractkit/chainlink/v2/core/services/orgresolver"
2424
"github.com/smartcontractkit/chainlink/v2/core/services/workflows"
2525
artifacts "github.com/smartcontractkit/chainlink/v2/core/services/workflows/artifacts/v2"
2626
"github.com/smartcontractkit/chainlink/v2/core/services/workflows/events"

‎core/services/workflows/syncer/v2/handler_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
eventsv2 "github.com/smartcontractkit/chainlink-protos/workflows/go/v2"
3030
v2 "github.com/smartcontractkit/chainlink/v2/core/services/workflows/v2"
3131

32+
"github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
3233
"github.com/smartcontractkit/chainlink/v2/core/capabilities"
3334
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
3435
"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
@@ -37,7 +38,6 @@ import (
3738
ghcapabilities "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers/capabilities"
3839
"github.com/smartcontractkit/chainlink/v2/core/services/job"
3940
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/workflowkey"
40-
"github.com/smartcontractkit/chainlink/v2/core/services/orgresolver"
4141
artifacts "github.com/smartcontractkit/chainlink/v2/core/services/workflows/artifacts/v2"
4242
"github.com/smartcontractkit/chainlink/v2/core/services/workflows/ratelimiter"
4343
"github.com/smartcontractkit/chainlink/v2/core/services/workflows/store"

‎core/services/workflows/v2/config.go‎

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

1919
"github.com/smartcontractkit/chainlink-common/pkg/logger"
2020

21+
"github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
2122
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/workflowkey"
22-
"github.com/smartcontractkit/chainlink/v2/core/services/orgresolver"
2323
"github.com/smartcontractkit/chainlink/v2/core/services/workflows/metering"
2424
"github.com/smartcontractkit/chainlink/v2/core/services/workflows/store"
2525
"github.com/smartcontractkit/chainlink/v2/core/services/workflows/types"

‎deployment/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ require (
4040
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250930202440-88c08e65d960
4141
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5
4242
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5
43-
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251002161429-f0c57dab20d5
43+
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251003215432-a8795d634f42
4444
github.com/smartcontractkit/chainlink-deployments-framework v0.54.0
4545
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20251006145521-1bb51044b147
4646
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20251003185510-17234095940f
@@ -408,7 +408,7 @@ require (
408408
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2 // indirect
409409
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2 // indirect
410410
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250807135425-a2c09896d609 // indirect
411-
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20250908151016-bf310cf85379 // indirect
411+
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b // indirect
412412
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
413413
github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect
414414
github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect

‎deployment/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8
13361336
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
13371337
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5 h1:QhcYGEhRLInr1/qh/3RJiVdvJ0nxBHKhPe65WLbSBnU=
13381338
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
1339-
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251002161429-f0c57dab20d5 h1:T4xnp4/MkrhbVAex7JVO9VypWX/bxiXsmBiOqZQK8Bw=
1340-
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251002161429-f0c57dab20d5/go.mod h1:1r3aM96KHAESfnayJ3BTHCkP1qJS1BEG1r4czeoaXlA=
1339+
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251003215432-a8795d634f42 h1:wq5axTY1g0EY/xHsdmpDqJrfCqf6dmoxoNBjVxhBl1c=
1340+
github.com/smartcontractkit/chainlink-common v0.9.6-0.20251003215432-a8795d634f42/go.mod h1:37kbNkl7i8GIVDX7ScdzxQCMGFYkaL6cX+P1wRG4D4U=
13411341
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.4 h1:hvqATtrZ0iMRTI80cpBot/3JFbjz2j+2tvpfooVhRHw=
13421342
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.4/go.mod h1:eKGyfTKzr0/PeR7qKN4l2FcW9p+HzyKUwAfGhm/5YZc=
13431343
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
@@ -1366,8 +1366,8 @@ github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc
13661366
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
13671367
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 h1:PWwLGimBt37eDzpbfZ9V/ZkW4oCjcwKjKiAwKlSfPc0=
13681368
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
1369-
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20250908151016-bf310cf85379 h1:NT9UDWd0myN0swDx2reN95RxxEshOKdgGAbv1CiRavU=
1370-
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20250908151016-bf310cf85379/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY=
1369+
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b h1:QuI6SmQFK/zyUlVWEf0GMkiUYBPY4lssn26nKSd/bOM=
1370+
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY=
13711371
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 h1:0eroOyBwmdoGUwUdvMI0/J7m5wuzNnJDMglSOK1sfNY=
13721372
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
13731373
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 h1:L6KJ4kGv/yNNoCk8affk7Y1vAY0qglPMXC/hevV/IsA=

0 commit comments

Comments
 (0)