From 88cca3779525873e45f6d9f54bc8e0d0f2c9af26 Mon Sep 17 00:00:00 2001 From: ilija42 <57732589+ilija42@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:05:03 +0100 Subject: [PATCH] Bump common and fix Chain Writer naming (#947) * Bump common and fix Chain Writer naming * Bump common * Bump core for integration-tests * Bump go version for monitoring dockerfile * tidy * Bump core for integration tests * Bump core for integration tests --- go.mod | 6 ++---- go.sum | 4 ++-- integration-tests/go.mod | 14 ++++++-------- integration-tests/go.sum | 20 ++++++++++---------- pkg/solana/chainreader/chain_reader_test.go | 4 ++-- pkg/solana/relay.go | 4 ++-- 6 files changed, 24 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index f91c40b2b..f9363c1cc 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/smartcontractkit/chainlink-solana -go 1.22.0 - -toolchain go1.23.2 +go 1.23.3 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc @@ -17,7 +15,7 @@ require ( github.com/jpillora/backoff v1.0.0 github.com/pelletier/go-toml/v2 v2.2.0 github.com/prometheus/client_golang v1.17.0 - github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120190613-262c6d8a55e1 + github.com/smartcontractkit/chainlink-common v0.3.1-0.20241127162636-07aa781ee1f4 github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12 github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.27.0 diff --git a/go.sum b/go.sum index ffe22ed59..cc7b46c09 100644 --- a/go.sum +++ b/go.sum @@ -442,8 +442,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.3.1-0.20241120190613-262c6d8a55e1 h1:lC75ARlNXebYOFmBtU0MTxuKIhcEVgkVmtxIUzexftQ= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120190613-262c6d8a55e1/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241127162636-07aa781ee1f4 h1:atCZ1jol7a+tdtgU/wNqXgliBun5H7BjGBicGL8Tj6o= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241127162636-07aa781ee1f4/go.mod h1:bQktEJf7sJ0U3SmIcXvbGUox7SmXcnSEZ4kUbT8R5Nk= 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-20241007185508-adbe57025f12 h1:NzZGjaqez21I3DU7objl3xExTH4fxYvzTqar8DC6360= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 869c4d264..888056bfb 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -1,8 +1,6 @@ module github.com/smartcontractkit/chainlink-solana/integration-tests -go 1.23 - -toolchain go1.23.2 +go 1.23.3 replace github.com/smartcontractkit/chainlink-solana => ../ @@ -16,13 +14,13 @@ require ( github.com/lib/pq v1.10.9 github.com/pelletier/go-toml/v2 v2.2.3 github.com/rs/zerolog v1.33.0 - github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d + github.com/smartcontractkit/chainlink-common v0.3.1-0.20241127162636-07aa781ee1f4 github.com/smartcontractkit/chainlink-solana v1.1.1-0.20241127190942-9a418b680971 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.17 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink/deployment v0.0.0-20241127192805-54ea74a13bfe github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241127192805-54ea74a13bfe - github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241127192805-54ea74a13bfe + github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241127200605-786894ba3036 github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.34.0 @@ -394,12 +392,12 @@ require ( github.com/slack-go/slack v0.15.0 // indirect github.com/smartcontractkit/chain-selectors v1.0.31 // indirect github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect - github.com/smartcontractkit/chainlink-ccip v0.0.0-20241125151847-c63f5f567fcd // indirect - github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f // indirect + github.com/smartcontractkit/chainlink-ccip v0.0.0-20241126213415-2f00a319d84b // indirect + github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241126213129-304be43f0162 // indirect github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.1 // indirect github.com/smartcontractkit/chainlink-protos/orchestrator v0.3.0 // indirect - github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8 // indirect + github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241127172448-dd45de3c939e // indirect github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 // indirect github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 // 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 0dbe0a965..e8ce2ca52 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1384,20 +1384,20 @@ github.com/smartcontractkit/chain-selectors v1.0.31 h1:oRHyK88KnsCh4OdU2hr0u70pm github.com/smartcontractkit/chain-selectors v1.0.31/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8= github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU= github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241125151847-c63f5f567fcd h1:hzisF429DPXIXg2yXOHT1Z0TeUcJSO71WN1u03yoeMU= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241125151847-c63f5f567fcd/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d h1:0tnjo1gpG16PHAouXamgDAAu6e7PWaM0Ppq6dMWnjx0= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco= -github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f h1:BwrIaQIx5Iy6eT+DfLhFfK2XqjxRm74mVdlX8gbu4dw= -github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f/go.mod h1:wHtwSR3F1CQSJJZDQKuqaqFYnvkT+kMyget7dl8Clvo= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241126213415-2f00a319d84b h1:PRknL5FVq1raLtRKpgTaz4ru/BW4xCYRwGL8GwyR7iI= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241126213415-2f00a319d84b/go.mod h1:w0ryf2zD9DiXdXkD/KYPHu1vZnvoau2+gS84YQ0btcc= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241127162636-07aa781ee1f4 h1:atCZ1jol7a+tdtgU/wNqXgliBun5H7BjGBicGL8Tj6o= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241127162636-07aa781ee1f4/go.mod h1:bQktEJf7sJ0U3SmIcXvbGUox7SmXcnSEZ4kUbT8R5Nk= +github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241126213129-304be43f0162 h1:Xv3KEh7l25La7q+QU0Ln6W0KdCYBsCcneqMFzLgJOvI= +github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241126213129-304be43f0162/go.mod h1:Q7IbnkoczAvEgDYKlTZdbkfMUY5wshxdx5wFfVvXC6M= github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57 h1:1BMTG66HnCIz+KMBWGvyzELNM6VHGwv2WKFhN7H49Sg= github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57/go.mod h1:QPiorgpbLv4+Jn4YO6xxU4ftTu4T3QN8HwX3ImP59DE= github.com/smartcontractkit/chainlink-feeds v0.1.1 h1:JzvUOM/OgGQA1sOqTXXl52R6AnNt+Wg64sVG+XSA49c= github.com/smartcontractkit/chainlink-feeds v0.1.1/go.mod h1:55EZ94HlKCfAsUiKUTNI7QlE/3d3IwTlsU3YNa/nBb4= github.com/smartcontractkit/chainlink-protos/orchestrator v0.3.0 h1:PBUaFfPLm+Efq7H9kdfGBivH+QhJ6vB5EZTR/sCZsxI= github.com/smartcontractkit/chainlink-protos/orchestrator v0.3.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo= -github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8 h1:B4DFdk6MGcQnoCjjMBCx7Z+GWQpxRWJ4O8W/dVJyWGA= -github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= +github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241127172448-dd45de3c939e h1:lvr66RnWMsv85fZMBi9m0ZfTkBYQj/TH7sC/5tntWgc= +github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241127172448-dd45de3c939e/go.mod h1:EBrEgcdIbwepqguClkv8Ohy7CbyWSJaE4EC9aBJlQK0= github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.17 h1:Fw2F8fKa5QdOUzLAj6Y/EB6XFC0QtK2pw5bqQSatL4A= github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.17/go.mod h1:NwmlNKqrb02v4Sci4b5KW644nfH2BW+FrKbWwTN5r6M= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= @@ -1410,8 +1410,8 @@ github.com/smartcontractkit/chainlink/deployment v0.0.0-20241127192805-54ea74a13 github.com/smartcontractkit/chainlink/deployment v0.0.0-20241127192805-54ea74a13bfe/go.mod h1:ueUOL11tGBu1TTonZcIeD6/3av2iZE5AydxtclG8Dvo= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241127192805-54ea74a13bfe h1:93zlj92vuyjALbjOJ5NahdFQjAwEVplXQIzzqrvFMNc= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241127192805-54ea74a13bfe/go.mod h1:MinN1uhp3ygTM9ctNwJgLx7LyBPmwAR1NK18HBK8OEU= -github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241127192805-54ea74a13bfe h1:11DL5edpZ5KkjfY0J+M8obbPzE4pAIWs+jCVEWxZzKo= -github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241127192805-54ea74a13bfe/go.mod h1:q4Gi5NGfFr1w29EvU1PaxspnCd/cW87HAFBIk3Aa5Lg= +github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241127200605-786894ba3036 h1:wUxtbcmVWldfGijbu3H8U2oNlmgtkqE/dwtsxIYBnAs= +github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241127200605-786894ba3036/go.mod h1:pTLM5KDUNXZxRoE0hQCyInFGHZ/tcPNefxX2j8XntCE= 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-20241007185508-adbe57025f12 h1:NzZGjaqez21I3DU7objl3xExTH4fxYvzTqar8DC6360= diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index 165be22e2..fb392d45f 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -532,8 +532,8 @@ func (r *wrappedTestChainReader) HealthReport() map[string]error { return nil } -func (r *chainReaderInterfaceTester) GetChainWriter(t *testing.T) types.ChainWriter { - t.Skip("ChainWriter is not yet supported on Solana") +func (r *chainReaderInterfaceTester) GetContractWriter(t *testing.T) types.ContractWriter { + t.Skip("ContractWriter is not yet supported on Solana") return nil } diff --git a/pkg/solana/relay.go b/pkg/solana/relay.go index d98ab0442..1f2fbdffd 100644 --- a/pkg/solana/relay.go +++ b/pkg/solana/relay.go @@ -121,8 +121,8 @@ func (r *Relayer) NewConfigProvider(ctx context.Context, args relaytypes.RelayAr return configWatcher, err } -func (r *Relayer) NewChainWriter(_ context.Context, _ []byte) (relaytypes.ChainWriter, error) { - return nil, errors.New("chain writer is not supported for solana") +func (r *Relayer) NewContractWriter(_ context.Context, _ []byte) (relaytypes.ContractWriter, error) { + return nil, errors.New("contract writer is not supported for solana") } func (r *Relayer) NewContractReader(ctx context.Context, _ []byte) (relaytypes.ContractReader, error) {