Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BCI-3989][core] - CR methods err when service unstarted #14123

Draft
wants to merge 80 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
111057c
add isStarted check
Farber98 Aug 14, 2024
6f8ed23
move start outside getChainReader
Farber98 Aug 14, 2024
0074a33
bump common version
Farber98 Aug 14, 2024
2132bf0
Squashed commit of the following:
Farber98 Aug 14, 2024
53adad8
Revert "Squashed commit of the following:"
Farber98 Aug 15, 2024
bf588c7
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 15, 2024
2cce774
bump common version
Farber98 Aug 15, 2024
e8b366e
fix ccip failing integration tests
Farber98 Aug 15, 2024
7fa91e6
Revert "fix ccip failing integration tests"
Farber98 Aug 15, 2024
ed83615
remove check from bind
Farber98 Aug 15, 2024
fa2d416
bump common version
Farber98 Aug 15, 2024
4b2e503
fix chain reader tests
Farber98 Aug 15, 2024
7184150
StartChainReader method
Farber98 Aug 15, 2024
1e41db4
bump common version
Farber98 Aug 15, 2024
add59d8
start chain reader inside registry syncer
Farber98 Aug 15, 2024
db99f56
Revert "start chain reader inside registry syncer"
Farber98 Aug 15, 2024
7fde790
make error more clear for logging
Farber98 Aug 15, 2024
83c2559
starting cr service in write capability
Farber98 Aug 15, 2024
52e3313
starting contractReader inside registrySyncer
Farber98 Aug 15, 2024
b0c3305
idempotency if already started or already closed
Farber98 Aug 15, 2024
46d0c84
start reader in ccip delegate
Farber98 Aug 15, 2024
deb2d30
create var for err
Farber98 Aug 16, 2024
8a7054d
bump common version
Farber98 Aug 16, 2024
2aa2ee3
close chain reader after tests
Farber98 Aug 16, 2024
c63bcc6
bump common version
Farber98 Aug 16, 2024
733e0e0
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 22, 2024
894835e
bump common version
Farber98 Aug 22, 2024
d7153ac
add changeset
Farber98 Aug 22, 2024
be1d2c8
use state machine instead of flag
Farber98 Aug 22, 2024
46d7e32
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 22, 2024
4ea601d
use state machine ready method
Farber98 Aug 22, 2024
19a0268
idempotent start and close
Farber98 Aug 22, 2024
a0344e4
rename methods + bump common version
Farber98 Aug 23, 2024
5f45f15
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 23, 2024
482bb8b
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 23, 2024
5c93499
bump common version
Farber98 Aug 23, 2024
0e8f75f
bump common
Farber98 Aug 23, 2024
2eb9b0d
use state machine helpers to check if started inside methods
Farber98 Aug 24, 2024
6381bcd
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 24, 2024
f8d149d
bump common version
Farber98 Aug 24, 2024
160ea54
fix conflict
Farber98 Aug 24, 2024
0272eec
fix conflict
Farber98 Aug 24, 2024
d945744
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 26, 2024
017380c
remove start and close state check
Farber98 Aug 26, 2024
7448064
separate instantiation from starting svc in syncer tests
Farber98 Aug 26, 2024
6fc175f
remove Start and return svc started from getChainReader
Farber98 Aug 26, 2024
2a236da
bump common
Farber98 Aug 26, 2024
e42f6dd
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 28, 2024
3bff641
bump deps
Farber98 Aug 28, 2024
917add2
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 28, 2024
732f4c0
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 28, 2024
ca2124d
bump common
Farber98 Aug 28, 2024
19ac700
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 28, 2024
f13379f
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 29, 2024
ec4dcbd
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Aug 30, 2024
3684bde
bump common
Farber98 Aug 30, 2024
eaa8149
fix tidy & generate ci
Farber98 Aug 30, 2024
e06b1d1
fix go.md error
Farber98 Aug 30, 2024
d6e2d43
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
ilija42 Sep 2, 2024
cadbc0f
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Sep 3, 2024
2715354
bump common
Farber98 Sep 3, 2024
9b8be2f
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Sep 4, 2024
8ddc56c
add start. add start and close where needed
Farber98 Sep 4, 2024
8095ff8
bump common
Farber98 Sep 4, 2024
872fd3c
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Sep 4, 2024
00044c6
bump common
Farber98 Sep 4, 2024
e1792e9
merge develop
Farber98 Sep 5, 2024
76ed985
merge develop
Farber98 Sep 5, 2024
218f3cd
merge develop
Farber98 Sep 5, 2024
d8e1c2b
fix conflicts with chain components pr
Farber98 Sep 5, 2024
37c892c
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Sep 12, 2024
3fcbbf6
fix conflicts pr
Farber98 Sep 12, 2024
56b0f5f
bump common
Farber98 Sep 12, 2024
e569a69
add flag to control if we return cr started
Farber98 Sep 15, 2024
36e4489
bump common
Farber98 Sep 15, 2024
c83a850
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Sep 15, 2024
40d2cc1
bump common
Farber98 Sep 16, 2024
e96d20c
refactor codec and chaincomponents ifaces
Farber98 Sep 16, 2024
07c8f01
Merge branch 'develop' into BCI-3989-cr-methods-error-when-unstarted
Farber98 Sep 16, 2024
b22ad6b
bump common
Farber98 Sep 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/rotten-timers-remain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

chainReader methods return err when called and service is not started yet. #internal
5 changes: 5 additions & 0 deletions core/capabilities/ccip/delegate.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@ func (d *Delegate) getHomeChainContractReader(
return nil, types.BoundContract{}, fmt.Errorf("failed to create home chain contract reader: %w", err)
}

err = reader.Start(ctx)
if err != nil {
return nil, types.BoundContract{}, err
}

reader, ccipConfigBinding, err := bindReader(ctx, reader, d.capabilityConfig.ExternalRegistry().Address(), capabilityLabelledName, capabilityVersion)
if err != nil {
return nil, types.BoundContract{}, fmt.Errorf("failed to bind home chain contract reader: %w", err)
Expand Down
14 changes: 4 additions & 10 deletions core/scripts/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/prometheus/client_golang v1.17.0
github.com/shopspring/decimal v1.4.0
github.com/smartcontractkit/chainlink-automation v1.0.4
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240830171115-699bdf8c4aae
github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7
github.com/spf13/cobra v1.8.0
Expand Down Expand Up @@ -243,7 +243,6 @@ require (
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
Expand Down Expand Up @@ -277,6 +276,7 @@ require (
github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827 // indirect
github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457f // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 // indirect
github.com/smartcontractkit/wsrpc v0.7.3 // indirect
Expand Down Expand Up @@ -363,11 +363,5 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
// replicating the replace directive on cosmos SDK
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69
github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f

)
// replicating the replace directive on cosmos SDK
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
8 changes: 4 additions & 4 deletions core/scripts/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1190,8 +1190,8 @@ github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8um
github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b h1:v1RnZVfUoHIm/lwIqRAH4eDRNTu+N+AtQE5Ik4U9hsU=
github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b/go.mod h1:Z9lQ5t20kRk28pzRLnqAJZUVOw8E6/siA3P3MLyKqoM=
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8 h1:MOFuL1J4/rRcR0x09qSlOsKIiq4I7YzbZcQ421KqUZA=
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8/go.mod h1:TJSY2ETKiXLRPvGHNO7Dp1tlpFIPSCWwN3iIdrsadIE=
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240830171115-699bdf8c4aae h1:smILN8jc7yVQ//8LCz6clyiIpw9ednjWuIuBhoz2kzc=
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240830171115-699bdf8c4aae/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45/go.mod h1:LV0h7QBQUpoC2UUi6TcUvcIFm1xjP/DtEcqV8+qeLUs=
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240820130645-cf4b159fbba2 h1:KH6tpCw5hu8u6UTtgll7a8mE4sIbHCbmtzHJdKuRwBw=
Expand All @@ -1202,8 +1202,8 @@ github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457
github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457f/go.mod h1:Ml88TJTwZCj6yHDkAEN/EhxVutzSlk+kDZgfibRIqF0=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 h1:HyLTySm7BR+oNfZqDTkVJ25wnmcTtxBBD31UkFL+kEM=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=
github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7 h1:e38V5FYE7DA1JfKXeD5Buo/7lczALuVXlJ8YNTAUxcw=
github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM=
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE=
Expand Down
5 changes: 5 additions & 0 deletions core/services/registrysyncer/syncer.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,11 @@ func (s *registrySyncer) Sync(ctx context.Context, isInitialSync bool) error {
return err
}

err = reader.Start(ctx)
if err != nil {
return err
}
Comment on lines +280 to +283
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't it be started in func (s *registrySyncer) Start(ctx context.Context) error {

Copy link
Contributor Author

@Farber98 Farber98 Aug 24, 2024

Choose a reason for hiding this comment

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

func (s *registrySyncer) Start(ctx context.Context) error calls func (s *registrySyncer) syncLoop() that calls func (s *registrySyncer) Sync(ctx context.Context, isInitialSync bool) error which initializes the CR.

I added these lines to start the CR service right after this initialization

Copy link
Contributor

Choose a reason for hiding this comment

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

Why is it better to have the initialization here, rather than in (*registrySyncer).Start? Isn't that just contributing to this problem in the first place?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What do you mean by this problem?

There's a note in the newReader func that says why this is achieved this way:

// NOTE: this can't be called while initializing the syncer and needs to be called in the sync loop.
// This is because Bind() makes an onchain call to verify that the contract address exists, and if
// called during initialization, this results in a "no live nodes" error.

Copy link
Contributor Author

@Farber98 Farber98 Aug 29, 2024

Choose a reason for hiding this comment

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

I added these lines as we are now enforcing CR service to be in Started state before calling the methods. This syncer was not starting the service previously and that's why we got some tests failing but now they are passing with this change

Copy link
Contributor

Choose a reason for hiding this comment

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

What do you mean by this problem?

If all dependencies are Started before anything that uses them, then there is no need to be defensive about checking internally if Start has been called. But I see that there is a good reason to defer in this case.


s.reader = reader
}

Expand Down
2 changes: 1 addition & 1 deletion core/services/registrysyncer/syncer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (c *crFactory) NewContractReader(ctx context.Context, cfg []byte) (types.Co
return nil, err
}

return svc, svc.Start(ctx)
return svc, nil
}

func newContractReaderFactory(t *testing.T, simulatedBackend *backends.SimulatedBackend) *crFactory {
Expand Down
44 changes: 32 additions & 12 deletions core/services/relay/evm/chain_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,30 +175,50 @@ func (cr *chainReader) HealthReport() map[string]error {
return map[string]error{cr.Name(): nil}
}

func (cr *chainReader) GetLatestValue(ctx context.Context, contractName, method string, confidenceLevel primitives.ConfidenceLevel, params, returnVal any) error {
b, err := cr.bindings.GetReadBinding(contractName, method)
if err != nil {
return err
func (cr *chainReader) GetLatestValue(ctx context.Context, contractName, method string, confidenceLevel primitives.ConfidenceLevel, params, returnVal any) (err error) {
if ok := cr.StateMachine.IfStarted(func() {
b, bindingErr := cr.bindings.GetReadBinding(contractName, method)
if bindingErr != nil {
err = bindingErr
return
}

err = b.GetLatestValue(ctx, confidenceLevel, params, returnVal)
}); !ok {
return fmt.Errorf("ContractReader should be in Started state before calling GetLatestValue. Current state: %s", cr.StateMachine.State())
}

return b.GetLatestValue(ctx, confidenceLevel, params, returnVal)
return err
}

func (cr *chainReader) BatchGetLatestValues(ctx context.Context, request commontypes.BatchGetLatestValuesRequest) (commontypes.BatchGetLatestValuesResult, error) {
return cr.bindings.BatchGetLatestValues(ctx, request)
func (cr *chainReader) BatchGetLatestValues(ctx context.Context, request commontypes.BatchGetLatestValuesRequest) (res commontypes.BatchGetLatestValuesResult, err error) {
if ok := cr.StateMachine.IfStarted(func() {
res, err = cr.bindings.BatchGetLatestValues(ctx, request)
}); !ok {
return nil, fmt.Errorf("ContractReader should be in Started state before calling BatchGetLatestValues. Current state: %s", cr.StateMachine.State())
}

return res, err
}

func (cr *chainReader) Bind(ctx context.Context, bindings []commontypes.BoundContract) error {
return cr.bindings.Bind(ctx, cr.lp, bindings)
}

func (cr *chainReader) QueryKey(ctx context.Context, contractName string, filter query.KeyFilter, limitAndSort query.LimitAndSort, sequenceDataType any) ([]commontypes.Sequence, error) {
b, err := cr.bindings.GetReadBinding(contractName, filter.Key)
if err != nil {
return nil, err
func (cr *chainReader) QueryKey(ctx context.Context, contractName string, filter query.KeyFilter, limitAndSort query.LimitAndSort, sequenceDataType any) (seq []commontypes.Sequence, err error) {
if ok := cr.StateMachine.IfStarted(func() {
b, bindingErr := cr.bindings.GetReadBinding(contractName, filter.Key)
if bindingErr != nil {
seq, err = nil, bindingErr
return
}

seq, err = b.QueryKey(ctx, filter, limitAndSort, sequenceDataType)
}); !ok {
return nil, fmt.Errorf("ContractReader should be in Started state before calling QueryKey. Current state: %s", cr.StateMachine.State())
}

return b.QueryKey(ctx, filter, limitAndSort, sequenceDataType)
return seq, err
}

func (cr *chainReader) CreateContractType(contractName, itemType string, forEncoding bool) (any, error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ func (it *EVMChainReaderInterfaceTester[T]) GetChainReader(t T) clcommontypes.Co
return cr
}

func (it *EVMChainReaderInterfaceTester[T]) Close(t T) {
require.NoError(t, it.cr.Close())
}

func (it *EVMChainReaderInterfaceTester[T]) SetTestStructLatestValue(t T, testStruct *TestStruct) {
it.sendTxWithTestStruct(t, it.address, testStruct, (*chain_reader_tester.ChainReaderTesterTransactor).AddTestStruct)
}
Expand Down
5 changes: 5 additions & 0 deletions core/services/relay/evm/write_target.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ func NewWriteTarget(ctx context.Context, relayer *Relayer, chain legacyevm.Chain
return nil, err
}

err = cr.Start(ctx)
if err != nil {
return nil, err
}

chainWriterConfig := relayevmtypes.ChainWriterConfig{
Contracts: map[string]*relayevmtypes.ContractConfig{
"forwarder": {
Expand Down
3 changes: 3 additions & 0 deletions go.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ flowchart LR
click chainlink-solana href "https://github.com/smartcontractkit/chainlink-solana"
chainlink/v2 --> chainlink-starknet/relayer
click chainlink-starknet/relayer href "https://github.com/smartcontractkit/chainlink-starknet"
chainlink/v2 --> grpc-proxy
ilija42 marked this conversation as resolved.
Show resolved Hide resolved
click grpc-proxy href "https://github.com/smartcontractkit/grpc-proxy"
chainlink/v2 --> libocr
click libocr href "https://github.com/smartcontractkit/libocr"
chainlink/v2 --> tdh2/go/ocr2/decryptionplugin
Expand All @@ -55,6 +57,7 @@ flowchart LR
chainlink-automation --> libocr
chainlink-ccip --> chainlink-common
chainlink-ccip --> libocr
chainlink-common --> grpc-proxy
chainlink-common --> libocr
chainlink-cosmos --> chainlink-common
chainlink-cosmos --> libocr
Expand Down
13 changes: 4 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ require (
github.com/smartcontractkit/chain-selectors v1.0.21
github.com/smartcontractkit/chainlink-automation v1.0.4
github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240830171115-699bdf8c4aae
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240820130645-cf4b159fbba2
github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827
Expand Down Expand Up @@ -279,7 +279,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
Expand All @@ -294,6 +293,7 @@ require (
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sethvargo/go-retry v0.2.4 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand Down Expand Up @@ -349,10 +349,5 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
// replicating the replace directive on cosmos SDK
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69
github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f
Copy link
Contributor Author

Choose a reason for hiding this comment

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

seems it's not needed anymore as it has been replaced by github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7

)
// replicating the replace directive on cosmos SDK
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1147,8 +1147,8 @@ github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8um
github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b h1:v1RnZVfUoHIm/lwIqRAH4eDRNTu+N+AtQE5Ik4U9hsU=
github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b/go.mod h1:Z9lQ5t20kRk28pzRLnqAJZUVOw8E6/siA3P3MLyKqoM=
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8 h1:MOFuL1J4/rRcR0x09qSlOsKIiq4I7YzbZcQ421KqUZA=
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8/go.mod h1:TJSY2ETKiXLRPvGHNO7Dp1tlpFIPSCWwN3iIdrsadIE=
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240830171115-699bdf8c4aae h1:smILN8jc7yVQ//8LCz6clyiIpw9ednjWuIuBhoz2kzc=
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240830171115-699bdf8c4aae/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45/go.mod h1:LV0h7QBQUpoC2UUi6TcUvcIFm1xjP/DtEcqV8+qeLUs=
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240820130645-cf4b159fbba2 h1:KH6tpCw5hu8u6UTtgll7a8mE4sIbHCbmtzHJdKuRwBw=
Expand All @@ -1159,8 +1159,8 @@ github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457
github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457f/go.mod h1:Ml88TJTwZCj6yHDkAEN/EhxVutzSlk+kDZgfibRIqF0=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 h1:HyLTySm7BR+oNfZqDTkVJ25wnmcTtxBBD31UkFL+kEM=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=
github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7 h1:e38V5FYE7DA1JfKXeD5Buo/7lczALuVXlJ8YNTAUxcw=
github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM=
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE=
Expand Down
7 changes: 2 additions & 5 deletions integration-tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ require (
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240808195812-ae0378684685
github.com/smartcontractkit/chain-selectors v1.0.21
github.com/smartcontractkit/chainlink-automation v1.0.4
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8
github.com/smartcontractkit/chainlink-common v0.2.2-0.20240830171115-699bdf8c4aae
github.com/smartcontractkit/chainlink-testing-framework v1.34.10
github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.1
github.com/smartcontractkit/chainlink-testing-framework/havoc v0.1.0
Expand Down Expand Up @@ -361,7 +361,6 @@ require (
github.com/mtibben/percent v0.2.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/oklog/ulid v1.3.1 // indirect
Expand Down Expand Up @@ -409,6 +408,7 @@ require (
github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827 // indirect
github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457f // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 // indirect
github.com/smartcontractkit/wsrpc v0.8.1 // indirect
Expand Down Expand Up @@ -518,9 +518,6 @@ replace (
// replicating the replace directive on cosmos SDK
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69
github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f

// type func(a Label, b Label) bool of func(a, b Label) bool {…} does not match inferred type func(a Label, b Label) int for func(a E, b E) int
github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510
)
Expand Down
Loading
Loading