diff --git a/go.mod b/go.mod index 480a20338..904084a74 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/hashicorp/go-plugin v1.6.2-0.20240829161738-06afb6d7ae99 github.com/pelletier/go-toml/v2 v2.2.0 github.com/prometheus/client_golang v1.17.0 - github.com/smartcontractkit/chainlink-common v0.2.2-0.20240909223413-5d42fb7622b7 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240910154010-ed9f50de7322 github.com/smartcontractkit/libocr v0.0.0-20240702141926-063ceef8c42e github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.27.0 diff --git a/go.sum b/go.sum index ac57c4ee7..6ba1066e2 100644 --- a/go.sum +++ b/go.sum @@ -435,8 +435,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.2.2-0.20240909223413-5d42fb7622b7 h1:fOWoiQVqY1TJUUNsSrxb5sNGgmlfoM1seICgHmGK+Ms= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240909223413-5d42fb7622b7/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240910154010-ed9f50de7322 h1:9SkeP9lpTMDqtqDd+BKPQhkPcylSoYi63L9YFdbzbEo= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240910154010-ed9f50de7322/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc= 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-20240702141926-063ceef8c42e h1:9ypZ/8aW8Vm497i1gXHcT96oNLiu88jbg9QdX+IUE3E= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 3100bc047..bd5f598e5 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.33.0 - github.com/smartcontractkit/chainlink-common v0.2.2-0.20240909223413-5d42fb7622b7 - github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240904154226-abc1ed5c962a + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240910154010-ed9f50de7322 + github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240910144900-b715bf7519e1 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240906134410-57cec53b3d38 - github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240910095130-b09fdb75c9ef + github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240910145040-e19dc89f9b4d github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.28.0 @@ -378,10 +378,10 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.21 // indirect github.com/smartcontractkit/chainlink-automation v1.0.4 // indirect github.com/smartcontractkit/chainlink-ccip v0.0.0-20240910072312-810030689426 // indirect - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 // indirect + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240910130914-fd4a45b0a3f5 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240904093355-e40169857652 // indirect - github.com/smartcontractkit/chainlink-feeds v0.0.0-20240909142234-299749c4c0b5 // indirect - github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 // indirect + github.com/smartcontractkit/chainlink-feeds v0.0.0-20240910125011-92c9c51ebe3b // indirect + github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240910130432-2d0ff1158d6f // indirect github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 // indirect github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0 // indirect github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 4b8b9b7f9..e6f0d98c4 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1390,16 +1390,16 @@ 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-20240910072312-810030689426 h1:siC6AoTs4889FwiqgEp0sC6S8nFlDzVTZAmUX7cV7aM= github.com/smartcontractkit/chainlink-ccip v0.0.0-20240910072312-810030689426/go.mod h1:v8hmGodMN1s1TQnvZepZ3Pbo+PyzWVdXag7JzJnvrkI= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240909223413-5d42fb7622b7 h1:fOWoiQVqY1TJUUNsSrxb5sNGgmlfoM1seICgHmGK+Ms= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240909223413-5d42fb7622b7/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-common v0.2.2-0.20240910154010-ed9f50de7322 h1:9SkeP9lpTMDqtqDd+BKPQhkPcylSoYi63L9YFdbzbEo= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240910154010-ed9f50de7322/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240910130914-fd4a45b0a3f5 h1:JM6P74E9WvLif/PX+eeY1CNZ7u8Dh3PIQej3rB3XHG8= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240910130914-fd4a45b0a3f5/go.mod h1:IYU8HDfJ8BJAXrWpRILYlEkyrLlZIbAwKEcYq+ImudI= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240904093355-e40169857652 h1:0aZ3HiEz2bMM5ywHAyKlFMN95qTzpNDn7uvnHLrFX6s= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240904093355-e40169857652/go.mod h1:PwPcmQNAzVmU8r8JWKrDRgvXesDwxnqbMD6DvYt/Z7M= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240909142234-299749c4c0b5 h1:88ZNrxZd0Uxn9934G/3L5AABTX13iorQJdUXcSUewwg= -github.com/smartcontractkit/chainlink-feeds v0.0.0-20240909142234-299749c4c0b5/go.mod h1:/QPAcfj5RQ4pNmDBLJ/Or7EjMAvFU3Xb1pM9gl0jfao= -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/chainlink-feeds v0.0.0-20240910125011-92c9c51ebe3b h1:VJrS202o/sSe3HoFBq7PTzQE7Hy+lEBv3ZalVGNigkA= +github.com/smartcontractkit/chainlink-feeds v0.0.0-20240910125011-92c9c51ebe3b/go.mod h1:FLlWBt2hwiMVgt9AcSo6wBJYIRd/nsc8ENbV1Wir1bw= +github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240910130432-2d0ff1158d6f h1:taKImws+NXcJIiEJ26fjahkj9eyOG7qOgFEO+/wxaG8= +github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240910130432-2d0ff1158d6f/go.mod h1:8mQ4OHBAsDi1hm2E78StzRdb72vovpH6PqRSJ2FtlqE= github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.0 h1:OBOOdlZzowUt1mKDGnMzskuVqOJHSQ49w/2fTYHZEiM= github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.0/go.mod h1:nLOy8QkAmofo7+HR6yOyKxdaA93tHjyjz4caM+eZAn4= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= @@ -1410,8 +1410,8 @@ github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0 h1:gfhfTn7H github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0/go.mod h1:tqajhpUJA/9OaMCLitghBXjAgqYO4i27St0F4TUO3+M= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240906134410-57cec53b3d38 h1:pTTrdBCPHb9BZomSZu+jh6FitVH/mvof2vgkCmNbH2Q= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240906134410-57cec53b3d38/go.mod h1:iNzGZoKXAPeHp8Fmr3JwnkuzGYEuPr7IB2qzcJubyL0= -github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240910095130-b09fdb75c9ef h1:cr8N9wrrBtv2FYIlwJqrPU40oYJ5LOsy7Fe/StNKw3M= -github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240910095130-b09fdb75c9ef/go.mod h1:YqSaywmjWjNf8pAM0vkTl24fJDs6Xji0NO8ICCMPZ6s= +github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240910145040-e19dc89f9b4d h1:wG359AGuFyXc4IcSgdqR40hojJ30jKWMIBxGXaTyHJQ= +github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240910145040-e19dc89f9b4d/go.mod h1:BwRy5tpR5Cb/Js+glCZX/UwPSVLyo5pdinWT/rkcizE= 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= diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index 61c8e0493..d9be55c67 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -518,7 +518,7 @@ func (r *chainReaderInterfaceTester) Setup(t *testing.T) { } } -func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.ContractReader { +func (r *chainReaderInterfaceTester) GetContractReader(t *testing.T) types.ContractReader { client := new(mockedRPCClient) svc, err := chainreader.NewChainReaderService(logger.Test(t), client, r.conf) if err != nil { @@ -879,9 +879,9 @@ type skipEventsChainReaderTester struct { ChainComponentsInterfaceTester[*testing.T] } -func (s *skipEventsChainReaderTester) GetChainReader(t *testing.T) types.ContractReader { +func (s *skipEventsChainReaderTester) GetContractReader(t *testing.T) types.ContractReader { return &skipEventsChainReader{ - ContractReader: s.ChainComponentsInterfaceTester.GetChainReader(t), + ContractReader: s.ChainComponentsInterfaceTester.GetContractReader(t), t: t, } } diff --git a/pkg/solana/relay.go b/pkg/solana/relay.go index acb43720c..d6a293a59 100644 --- a/pkg/solana/relay.go +++ b/pkg/solana/relay.go @@ -304,7 +304,7 @@ func (p *medianProvider) OnchainConfigCodec() median.OnchainConfigCodec { return median.StandardOnchainConfigCodec{} } -func (p *medianProvider) ChainReader() relaytypes.ContractReader { +func (p *medianProvider) ContractReader() relaytypes.ContractReader { return nil }