diff --git a/go.mod b/go.mod index 934b7f865..fbac625fb 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/pelletier/go-toml/v2 v2.1.1 github.com/prometheus/client_golang v1.17.0 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240628105325-feb3255b1d75 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240703131156-eb97a39710d6 github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.26.0 diff --git a/go.sum b/go.sum index f32a94721..f79443976 100644 --- a/go.sum +++ b/go.sum @@ -452,8 +452,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240628105325-feb3255b1d75 h1:XqaPYd2XKFdPT9ctYte17/c3Lh47TgxFxUvgcg0qSdk= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240628105325-feb3255b1d75/go.mod h1:EWvSuqIJUYXZLEHewC7WCaPylM2jyjF3Q36BZPS4MoI= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240703131156-eb97a39710d6 h1:6M0+0ZN5nySD8ReRGfQpCL1UyI3maVMPkun2bmYQXLQ= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240703131156-eb97a39710d6/go.mod h1:EWvSuqIJUYXZLEHewC7WCaPylM2jyjF3Q36BZPS4MoI= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 37483ee08..204ca2461 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,12 +14,12 @@ require ( github.com/lib/pq v1.10.9 github.com/pelletier/go-toml/v2 v2.2.2 github.com/rs/zerolog v1.31.0 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240628105325-feb3255b1d75 - github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240627134229-63de1a005c44 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240703131156-eb97a39710d6 + github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c8 github.com/smartcontractkit/chainlink-testing-framework v1.31.7 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240628194526-3f8c00a6f188 - github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240628120942-b59460be5097 - github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c + github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240703131837-ce689a534176 + github.com/smartcontractkit/libocr v0.0.0-20240702141926-063ceef8c42e github.com/smartcontractkit/seth v1.0.12 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.28.0 @@ -359,7 +359,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.10 // indirect github.com/smartcontractkit/chainlink-automation v1.0.4 // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240621143432-85370a54b141 // indirect - github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 // indirect + github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240702144807-761f63e7b527 // indirect github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917 // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba // indirect github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 181ddae41..dbca924d1 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1407,12 +1407,12 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8= github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240628105325-feb3255b1d75 h1:XqaPYd2XKFdPT9ctYte17/c3Lh47TgxFxUvgcg0qSdk= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240628105325-feb3255b1d75/go.mod h1:EWvSuqIJUYXZLEHewC7WCaPylM2jyjF3Q36BZPS4MoI= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240703131156-eb97a39710d6 h1:6M0+0ZN5nySD8ReRGfQpCL1UyI3maVMPkun2bmYQXLQ= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240703131156-eb97a39710d6/go.mod h1:EWvSuqIJUYXZLEHewC7WCaPylM2jyjF3Q36BZPS4MoI= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240621143432-85370a54b141 h1:TMOoYaeSDkkI3jkCH7lKHOZaLkeDuxFTNC+XblD6M0M= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240621143432-85370a54b141/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k= -github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo= -github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540/go.mod h1:sjAmX8K2kbQhvDarZE1ZZgDgmHJ50s0BBc/66vKY2ek= +github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240702144807-761f63e7b527 h1:Vs6myS+bpPwb8chUY7XxveJyhvejknhOmhDTddgsK5I= +github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240702144807-761f63e7b527/go.mod h1:KRK7KlAEpmORi+nJgT0vxQVWvlLEBQ6zgzXziZuKvUM= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917 h1:MD80ZRCTvxxJ8PBmhtrKoTnky8cVNYrCrIBLVRbrOM0= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917/go.mod h1:jwVxhctE6BgLOSSsVq9wbREpZ8Ev34H+UBxeUhESZRs= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI= @@ -1425,14 +1425,14 @@ github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772 h1: github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240628194526-3f8c00a6f188 h1:Mv3AcLG4oPWy+2pFSP8RNC/MYgv4xdzSxhzhYrDLRFk= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240628194526-3f8c00a6f188/go.mod h1:dfS7QEXweze1Rhckl9cxXGyE6Ht0POxqe0J0ND7N1tk= -github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240628194526-3f8c00a6f188 h1:Im3F/GiktNZjbznuVxUokKtbLOR+cKUCTBT84N93Nu0= -github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240628194526-3f8c00a6f188/go.mod h1:5Z7DcWYnEB7G5MRUf6EvmN+NbdTGzFxCbzjdt3WfDAE= +github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240703131837-ce689a534176 h1:QpFxigYcXoFRT9HhXHTGozolDSfTnFC2vCcKCyj1vUw= +github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240703131837-ce689a534176/go.mod h1:8lYwq/fCD8VtCAkSLx8Izc1+6T8agWJo9JgvfplwRGE= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= 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/libocr v0.0.0-20240419185742-fd3cab206b2c h1:lIyMbTaF2H0Q71vkwZHX/Ew4KF2BxiKhqEXwF8rn+KI= -github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM= +github.com/smartcontractkit/libocr v0.0.0-20240702141926-063ceef8c42e h1:9ypZ/8aW8Vm497i1gXHcT96oNLiu88jbg9QdX+IUE3E= +github.com/smartcontractkit/libocr v0.0.0-20240702141926-063ceef8c42e/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM= github.com/smartcontractkit/seth v1.0.12 h1:iVdgMx42XWanPPnBaM5StR4c1XsTr/0/B/kKRZL5BsY= github.com/smartcontractkit/seth v1.0.12/go.mod h1:thWtbLyW4nRHJGzC5heknQDORoJPErE15sF34LHkorg= github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE= diff --git a/pkg/solana/chainreader/chain_reader.go b/pkg/solana/chainreader/chain_reader.go index e375e6356..edca12303 100644 --- a/pkg/solana/chainreader/chain_reader.go +++ b/pkg/solana/chainreader/chain_reader.go @@ -169,8 +169,8 @@ func (s *SolanaChainReaderService) GetLatestValue(ctx context.Context, contractN return nil } -// BatchGetLatestValue implements the types.ContractReader interface. -func (s *SolanaChainReaderService) BatchGetLatestValue(_ context.Context, _ types.BatchGetLatestValueRequest) (types.BatchGetLatestValueResult, error) { +// BatchGetLatestValues implements the types.ContractReader interface. +func (s *SolanaChainReaderService) BatchGetLatestValues(_ context.Context, _ types.BatchGetLatestValuesRequest) (types.BatchGetLatestValuesResult, error) { return nil, errors.New("unimplemented") } diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index d795ab577..fb4f075c1 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -664,9 +664,9 @@ func (r *wrappedTestChainReader) GetLatestValue(ctx context.Context, contractNam return r.service.GetLatestValue(ctx, contractName, method, params, returnVal) } -// BatchGetLatestValue implements the types.ContractReader interface. -func (r *wrappedTestChainReader) BatchGetLatestValue(_ context.Context, _ types.BatchGetLatestValueRequest) (types.BatchGetLatestValueResult, error) { - r.test.Skip("BatchGetLatestValue is not yet supported in Solana") +// BatchGetLatestValues implements the types.ContractReader interface. +func (r *wrappedTestChainReader) BatchGetLatestValues(_ context.Context, _ types.BatchGetLatestValuesRequest) (types.BatchGetLatestValuesResult, error) { + r.test.Skip("BatchGetLatestValues is not yet supported in Solana") return nil, nil } @@ -877,8 +877,8 @@ func (s *skipEventsChainReader) GetLatestValue(ctx context.Context, contractName return s.ContractReader.GetLatestValue(ctx, contractName, method, params, returnVal) } -func (s *skipEventsChainReader) BatchGetLatestValue(_ context.Context, _ types.BatchGetLatestValueRequest) (types.BatchGetLatestValueResult, error) { - s.t.Skip("BatchGetLatestValue is not yet supported in Solana") +func (s *skipEventsChainReader) BatchGetLatestValues(_ context.Context, _ types.BatchGetLatestValueRequest) (types.BatchGetLatestValueResult, error) { + s.t.Skip("BatchGetLatestValues is not yet supported in Solana") return nil, nil }