From e4b1032a7f44d43328b6c659ff7cebdc309ee29e Mon Sep 17 00:00:00 2001 From: Farber98 Date: Thu, 22 Aug 2024 09:01:03 -0300 Subject: [PATCH 01/22] add missing methods to testing interface Signed-off-by: Farber98 --- pkg/solana/chainreader/chain_reader_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index 5732e743a..85d7ff2e3 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -534,6 +534,10 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract return r.reader } +func (r *chainReaderInterfaceTester) StartChainReader(t *testing.T) {} + +func (r *chainReaderInterfaceTester) CloseChainReader(t *testing.T) {} + type wrappedTestChainReader struct { test *testing.T service *chainreader.SolanaChainReaderService From 72b155da006f906256fea3df584b76588be9909f Mon Sep 17 00:00:00 2001 From: Farber98 Date: Fri, 23 Aug 2024 11:55:19 -0300 Subject: [PATCH 02/22] rename interface tester methods --- pkg/solana/chainreader/chain_reader_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index 85d7ff2e3..867868784 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -534,9 +534,9 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract return r.reader } -func (r *chainReaderInterfaceTester) StartChainReader(t *testing.T) {} +func (r *chainReaderInterfaceTester) Start(t *testing.T) {} -func (r *chainReaderInterfaceTester) CloseChainReader(t *testing.T) {} +func (r *chainReaderInterfaceTester) Close(t *testing.T) {} type wrappedTestChainReader struct { test *testing.T From ae54542d924b495f064e6fcd02999a8c3101db00 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Mon, 26 Aug 2024 16:01:55 -0300 Subject: [PATCH 03/22] remove unnecesary Start method --- pkg/solana/chainreader/chain_reader_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index 867868784..d900e2087 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -534,8 +534,6 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract return r.reader } -func (r *chainReaderInterfaceTester) Start(t *testing.T) {} - func (r *chainReaderInterfaceTester) Close(t *testing.T) {} type wrappedTestChainReader struct { From 07e8c773f9ef05e5234a229cb4fbf3845086a6fc Mon Sep 17 00:00:00 2001 From: Farber98 Date: Thu, 29 Aug 2024 12:51:50 -0300 Subject: [PATCH 04/22] close method impl --- pkg/solana/chainreader/chain_reader_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index d900e2087..c74091d3b 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -534,7 +534,9 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract return r.reader } -func (r *chainReaderInterfaceTester) Close(t *testing.T) {} +func (r *chainReaderInterfaceTester) Close(t *testing.T) { + require.NoError(t, r.reader.Close()) +} type wrappedTestChainReader struct { test *testing.T From 06201dcbe697ecebc059e8828eb4545ca0eb88c0 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Thu, 29 Aug 2024 15:38:11 -0300 Subject: [PATCH 05/22] svc not started test in solana --- pkg/solana/chainreader/chain_reader_test.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index c74091d3b..7b2673bbf 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -520,7 +520,9 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract require.NoError(t, svc.Start(context.Background())) t.Cleanup(func() { - require.NoError(t, svc.Close()) + if svc.Ready() == nil { + require.NoError(t, svc.Close()) + } }) if r.reader == nil { @@ -535,7 +537,7 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract } func (r *chainReaderInterfaceTester) Close(t *testing.T) { - require.NoError(t, r.reader.Close()) + require.NoError(t, r.reader.service.Close()) } type wrappedTestChainReader struct { @@ -625,6 +627,10 @@ func (r *wrappedTestChainReader) GetLatestValue(ctx context.Context, contractNam fallthrough default: + if r.service.Ready() != nil { + return errors.New("service not ready") + } + if len(r.testStructQueue) == 0 { r.test.FailNow() } From e666621734d165e7be89de66ec5d4986f67f7e5d Mon Sep 17 00:00:00 2001 From: Farber98 Date: Fri, 30 Aug 2024 15:19:16 -0300 Subject: [PATCH 06/22] start service again so cleanup closes gracefully --- pkg/solana/chainreader/chain_reader_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index 7b2673bbf..ef3e10fae 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -520,9 +520,7 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract require.NoError(t, svc.Start(context.Background())) t.Cleanup(func() { - if svc.Ready() == nil { - require.NoError(t, svc.Close()) - } + require.NoError(t, svc.Close()) }) if r.reader == nil { @@ -627,7 +625,10 @@ func (r *wrappedTestChainReader) GetLatestValue(ctx context.Context, contractNam fallthrough default: + // If you called a method and the service is not started if r.service.Ready() != nil { + // Start service again so it's gracefully closed by the cleanup function later. + require.NoError(r.test, r.service.Start(ctx)) return errors.New("service not ready") } From c14eed5e553ea196522f2ee03db0f00a5cbf8e80 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Tue, 3 Sep 2024 12:25:07 -0300 Subject: [PATCH 07/22] bump common ref --- go.mod | 4 ++-- go.sum | 8 ++++---- integration-tests/go.mod | 4 ++-- integration-tests/go.sum | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 12c2ea189..351e5584f 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.20240829145110-4a45c426fbe8 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240903142547-fa1ace87cf7c github.com/smartcontractkit/libocr v0.0.0-20240702141926-063ceef8c42e github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.27.0 @@ -72,7 +72,6 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect github.com/mr-tron/base58 v1.2.0 // indirect - github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect github.com/oklog/run v1.0.0 // indirect github.com/onsi/gomega v1.24.1 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -85,6 +84,7 @@ require ( github.com/ryanuber/go-glob v1.0.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.2.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect + github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect github.com/streamingfast/logging v0.0.0-20220405224725-2755dab2ce75 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect diff --git a/go.sum b/go.sum index cd2c94f8c..a852e08eb 100644 --- a/go.sum +++ b/go.sum @@ -425,10 +425,10 @@ 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.20240829145110-4a45c426fbe8 h1:MOFuL1J4/rRcR0x09qSlOsKIiq4I7YzbZcQ421KqUZA= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8/go.mod h1:TJSY2ETKiXLRPvGHNO7Dp1tlpFIPSCWwN3iIdrsadIE= -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/chainlink-common v0.2.2-0.20240903142547-fa1ace87cf7c h1:F8hJnja4luqP4OHB9KcYhrwQFLR1WsS0Xs4TTkHAdBc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240903142547-fa1ace87cf7c/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= github.com/smartcontractkit/libocr v0.0.0-20240702141926-063ceef8c42e/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 3c0e79cc4..4651b9913 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,7 +14,7 @@ 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.20240829145110-4a45c426fbe8 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240903142547-fa1ace87cf7c github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457f github.com/smartcontractkit/chainlink-testing-framework v1.34.10 github.com/smartcontractkit/chainlink-testing-framework/seth v1.2.1 @@ -327,7 +327,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 @@ -384,6 +383,7 @@ require ( github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 // indirect github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.1 // indirect github.com/smartcontractkit/chainlink-testing-framework/wasp v0.4.10 // 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 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 5c80f7591..be51e579c 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1390,8 +1390,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-20240806144315-04ac101e9c95 h1:LAgJTg9Yr/uCo2g7Krp88Dco2U45Y6sbJVl8uKoLkys= github.com/smartcontractkit/chainlink-ccip v0.0.0-20240806144315-04ac101e9c95/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo= -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.20240903142547-fa1ace87cf7c h1:F8hJnja4luqP4OHB9KcYhrwQFLR1WsS0Xs4TTkHAdBc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240903142547-fa1ace87cf7c/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= @@ -1412,8 +1412,8 @@ github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240829192404-67 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240829192404-674eac31cc16/go.mod h1:FP0vXPTAIyGFLVN3GU1zwp/eoi+nKZiTVG4Q97qEk0A= github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240829192404-674eac31cc16 h1:xtxqhCCRIcOfsu/4Wd0qc2mIpSA7frbLUp1DXzVyAVE= github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240829192404-674eac31cc16/go.mod h1:0hlkF9wKyi6Mcybla6kEcFvSRyBT0CmzxeH+AqCBxXo= -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= From a0b44bd2b4d82d45f770d5ee728808d1cb513599 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Tue, 3 Sep 2024 13:04:10 -0300 Subject: [PATCH 08/22] close ignoring error as core does. It might be already closed --- pkg/solana/chainreader/chain_reader_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index ef3e10fae..46f46ef98 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -520,7 +520,7 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract require.NoError(t, svc.Start(context.Background())) t.Cleanup(func() { - require.NoError(t, svc.Close()) + _ = svc.Close() }) if r.reader == nil { @@ -627,8 +627,6 @@ func (r *wrappedTestChainReader) GetLatestValue(ctx context.Context, contractNam default: // If you called a method and the service is not started if r.service.Ready() != nil { - // Start service again so it's gracefully closed by the cleanup function later. - require.NoError(r.test, r.service.Start(ctx)) return errors.New("service not ready") } From fc6cfe83f9262d0385d767796aa325abf9499a03 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Tue, 3 Sep 2024 23:28:37 -0300 Subject: [PATCH 09/22] add start. address comment --- pkg/solana/chainreader/chain_reader_test.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index 46f46ef98..61c800338 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -518,11 +518,6 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract t.FailNow() } - require.NoError(t, svc.Start(context.Background())) - t.Cleanup(func() { - _ = svc.Close() - }) - if r.reader == nil { r.reader = &wrappedTestChainReader{tester: r} } @@ -538,6 +533,10 @@ func (r *chainReaderInterfaceTester) Close(t *testing.T) { require.NoError(t, r.reader.service.Close()) } +func (r *chainReaderInterfaceTester) Start(t *testing.T) { + require.NoError(t, r.reader.service.Start(context.Background())) +} + type wrappedTestChainReader struct { test *testing.T service *chainreader.SolanaChainReaderService @@ -626,8 +625,8 @@ func (r *wrappedTestChainReader) GetLatestValue(ctx context.Context, contractNam fallthrough default: // If you called a method and the service is not started - if r.service.Ready() != nil { - return errors.New("service not ready") + if err := r.service.Ready(); err != nil { + return fmt.Errorf("service not ready. err: %w", err) } if len(r.testStructQueue) == 0 { From b15fafdf1144a9343693679c9b896313186a90dc Mon Sep 17 00:00:00 2001 From: Farber98 Date: Tue, 3 Sep 2024 23:29:18 -0300 Subject: [PATCH 10/22] bump common --- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 351e5584f..8cf9a1aea 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.20240903142547-fa1ace87cf7c + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64 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 a852e08eb..ea6de04cd 100644 --- a/go.sum +++ b/go.sum @@ -425,8 +425,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.20240903142547-fa1ace87cf7c h1:F8hJnja4luqP4OHB9KcYhrwQFLR1WsS0Xs4TTkHAdBc= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240903142547-fa1ace87cf7c/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64 h1:vH3VK0mPs017xV+jqresTiv48GgXatTnmVf4JhgdcxI= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64/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 4651b9913..403066d1c 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,7 +14,7 @@ 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.20240903142547-fa1ace87cf7c + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64 github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457f github.com/smartcontractkit/chainlink-testing-framework v1.34.10 github.com/smartcontractkit/chainlink-testing-framework/seth v1.2.1 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index be51e579c..7fcf4d69c 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1390,8 +1390,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-20240806144315-04ac101e9c95 h1:LAgJTg9Yr/uCo2g7Krp88Dco2U45Y6sbJVl8uKoLkys= github.com/smartcontractkit/chainlink-ccip v0.0.0-20240806144315-04ac101e9c95/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240903142547-fa1ace87cf7c h1:F8hJnja4luqP4OHB9KcYhrwQFLR1WsS0Xs4TTkHAdBc= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240903142547-fa1ace87cf7c/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64 h1:vH3VK0mPs017xV+jqresTiv48GgXatTnmVf4JhgdcxI= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64/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= From 6254cdb2d91efe84ab0ec03722db4406c3ce2e4a Mon Sep 17 00:00:00 2001 From: Farber98 Date: Wed, 4 Sep 2024 13:47:27 -0300 Subject: [PATCH 11/22] bump common --- integration-tests/go.sum | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/go.sum b/integration-tests/go.sum index c0b796ce2..fdc329a3b 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1390,8 +1390,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.20240904021311-208ef0231a64 h1:vH3VK0mPs017xV+jqresTiv48GgXatTnmVf4JhgdcxI= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64/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= @@ -1412,8 +1412,8 @@ github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240902145730-2d github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240902145730-2d77ff4623d0/go.mod h1:NjCfyvWFZE+z/enmDyLbKcPVW0ILJ61jTC8ce0lPmVI= github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240902145730-2d77ff4623d0 h1:Ry0b3GaBLTcXre8RnZztOj1Q6vgTzp5APrdr9cZLCec= github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240902145730-2d77ff4623d0/go.mod h1:omJ9mZWX3VGD5is3iQSdmSVV1v02r6SnAZ3YND9ci2A= -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= From 9769b7d979a6eca68f59f8170df4a9c20c3bf87f Mon Sep 17 00:00:00 2001 From: Farber98 Date: Wed, 4 Sep 2024 13:47:58 -0300 Subject: [PATCH 12/22] bump data streams for core integration tests --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index ca5bccf95..61638d983 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -378,7 +378,7 @@ require ( github.com/smartcontractkit/chainlink-automation v1.0.4 // indirect github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 // indirect - github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240820130645-cf4b159fbba2 // indirect + github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240904093355-e40169857652 // indirect github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827 // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 // indirect github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.1 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index fdc329a3b..30940981f 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1394,8 +1394,8 @@ github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a6 github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64/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= -github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240820130645-cf4b159fbba2/go.mod h1:V/86loaFSH0dqqUEHqyXVbyNqDRSjvcf9BRomWFTljU= +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-20240710170203-5b41615da827 h1:BCHu4pNP6arrcHLEWx61XjLaonOd2coQNyL0NTUcaMc= github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827/go.mod h1:OPX+wC2TWQsyLNpR7daMt2vMpmsNcoBxbZyGTHr6tiA= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 h1:HyLTySm7BR+oNfZqDTkVJ25wnmcTtxBBD31UkFL+kEM= From 048d13c059c5321efd0f9348bd697fccb4636957 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Wed, 4 Sep 2024 14:14:46 -0300 Subject: [PATCH 13/22] fix v2 dependencies --- integration-tests/go.mod | 4 ++-- integration-tests/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 61638d983..cee7a5f19 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -19,7 +19,7 @@ require ( github.com/smartcontractkit/chainlink-testing-framework v1.35.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.2.1 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240902145730-2d77ff4623d0 - github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240902145730-2d77ff4623d0 + github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240904164340-3ba567d984a2 github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.28.0 @@ -376,7 +376,7 @@ require ( github.com/slack-go/slack v0.12.2 // indirect 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-20240828115624-442f1cff195b // indirect + github.com/smartcontractkit/chainlink-ccip v0.0.0-20240902144105-70b5719fd098 // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240904093355-e40169857652 // indirect github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 30940981f..3ccf7537d 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1388,8 +1388,8 @@ github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1Wo github.com/smartcontractkit/chain-selectors v1.0.21/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-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-ccip v0.0.0-20240902144105-70b5719fd098 h1:gZsXQ//TbsaD9bcvR2wOdao7AgNDIS/Uml0FEF0vJuI= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20240902144105-70b5719fd098/go.mod h1:Z9lQ5t20kRk28pzRLnqAJZUVOw8E6/siA3P3MLyKqoM= github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64 h1:vH3VK0mPs017xV+jqresTiv48GgXatTnmVf4JhgdcxI= github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904021311-208ef0231a64/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0= @@ -1410,8 +1410,8 @@ github.com/smartcontractkit/chainlink-testing-framework/wasp v0.4.10 h1:s7e9YPU/ github.com/smartcontractkit/chainlink-testing-framework/wasp v0.4.10/go.mod h1:E7x2ICsT8vzy0nL6wwBphoQMoNwOMl0L9voQpEl1FoM= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240902145730-2d77ff4623d0 h1:7Djr0n61hgCywndPLqOCq5QjPzSWC/b4TpuOC4mqXAA= github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240902145730-2d77ff4623d0/go.mod h1:NjCfyvWFZE+z/enmDyLbKcPVW0ILJ61jTC8ce0lPmVI= -github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240902145730-2d77ff4623d0 h1:Ry0b3GaBLTcXre8RnZztOj1Q6vgTzp5APrdr9cZLCec= -github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240902145730-2d77ff4623d0/go.mod h1:omJ9mZWX3VGD5is3iQSdmSVV1v02r6SnAZ3YND9ci2A= +github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240904164340-3ba567d984a2 h1:9VEYv2v+T7AyDCDAQQrZmnUCdGfPgN6ToAqV5R091cw= +github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240904164340-3ba567d984a2/go.mod h1:R9OfCOgddtzbufMQKnbpo66dqTY3bTDZnJUVG4MP5tk= 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= From 53f53b6b10921135fb07ebf63f53f7bcc192fad0 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Thu, 5 Sep 2024 10:26:11 -0300 Subject: [PATCH 14/22] fix conflicts with chain components pr --- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- pkg/solana/chainreader/chain_reader_test.go | 15 ++++++++------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index cda1cd771..f373dbf72 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.20240904135753-00ac29d259a7 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240905131629-0d7af2089433 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 2a2a834af..1e1b1bad5 100644 --- a/go.sum +++ b/go.sum @@ -425,8 +425,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.20240904135753-00ac29d259a7 h1:VL+mgHtgAuGbOOpRvjlhV/go+OpdCGqko1DxFrbw9jM= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904135753-00ac29d259a7/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240905131629-0d7af2089433 h1:H+azTOcvRK3L89WJYe3pFG/LuHQe9e/ylHj+gdr652M= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240905131629-0d7af2089433/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 9e8bfea95..5a3405b26 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,7 +14,7 @@ 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.20240904135753-00ac29d259a7 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240905131629-0d7af2089433 github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457f github.com/smartcontractkit/chainlink-testing-framework v1.35.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.2.1 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 95a7aeaad..70ef00856 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1390,8 +1390,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-20240902144105-70b5719fd098 h1:gZsXQ//TbsaD9bcvR2wOdao7AgNDIS/Uml0FEF0vJuI= github.com/smartcontractkit/chainlink-ccip v0.0.0-20240902144105-70b5719fd098/go.mod h1:Z9lQ5t20kRk28pzRLnqAJZUVOw8E6/siA3P3MLyKqoM= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904135753-00ac29d259a7 h1:VL+mgHtgAuGbOOpRvjlhV/go+OpdCGqko1DxFrbw9jM= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240904135753-00ac29d259a7/go.mod h1:D/qaCoq0SxXzg5NRN5FtBRv98VBf+D2NOC++RbvvuOc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240905131629-0d7af2089433 h1:H+azTOcvRK3L89WJYe3pFG/LuHQe9e/ylHj+gdr652M= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240905131629-0d7af2089433/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-20240904093355-e40169857652 h1:0aZ3HiEz2bMM5ywHAyKlFMN95qTzpNDn7uvnHLrFX6s= diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index 6437297eb..edb5bbbf4 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -529,11 +529,11 @@ func (r *chainReaderInterfaceTester) GetChainReader(t *testing.T) types.Contract return r.reader } -func (r *chainReaderInterfaceTester) Close(t *testing.T) { +func (r *chainReaderInterfaceTester) CloseChainReader(t *testing.T) { require.NoError(t, r.reader.service.Close()) } -func (r *chainReaderInterfaceTester) Start(t *testing.T) { +func (r *chainReaderInterfaceTester) StartChainReader(t *testing.T) { require.NoError(t, r.reader.service.Start(context.Background())) } @@ -575,6 +575,12 @@ func (r *wrappedTestChainReader) GetLatestValue(ctx context.Context, contractNam a ag_solana.PublicKey b ag_solana.PublicKey ) + + // If you called the method and the service is not started + if err := r.service.Ready(); err != nil { + return fmt.Errorf("service not ready. err: %w", err) + } + switch contractName + method { case AnyContractName + EventName: r.test.Skip("Events are not yet supported in Solana") @@ -629,11 +635,6 @@ func (r *wrappedTestChainReader) GetLatestValue(ctx context.Context, contractNam fallthrough default: - // If you called a method and the service is not started - if err := r.service.Ready(); err != nil { - return fmt.Errorf("service not ready. err: %w", err) - } - if len(r.testStructQueue) == 0 { r.test.FailNow() } From 1cf0ccd2e4be0ad11987ce5d8d5a542a3d62623a Mon Sep 17 00:00:00 2001 From: Farber98 Date: Thu, 12 Sep 2024 15:40:58 -0300 Subject: [PATCH 15/22] fix pr conflicts --- pkg/solana/chainreader/chain_reader_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index c7e4e94d0..dedf9f3f9 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -545,11 +545,11 @@ func (r *chainReaderInterfaceTester) GetContractReader(t *testing.T) types.Contr return r.reader } -func (r *chainReaderInterfaceTester) CloseChainReader(t *testing.T) { +func (r *chainReaderInterfaceTester) CloseContractReader(t *testing.T) { require.NoError(t, r.reader.service.Close()) } -func (r *chainReaderInterfaceTester) StartChainReader(t *testing.T) { +func (r *chainReaderInterfaceTester) StartContractReader(t *testing.T) { require.NoError(t, r.reader.service.Start(context.Background())) } From 6d6b3966d6488e594d3b43da7c080eb1ccbc698e Mon Sep 17 00:00:00 2001 From: Farber98 Date: Thu, 12 Sep 2024 15:42:13 -0300 Subject: [PATCH 16/22] bump common version --- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 29c9bc4d7..7fa345509 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.20240911152814-4836d1d7f16b + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e 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 a4e3f137a..b03a707df 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.20240911152814-4836d1d7f16b h1:eW1CSdNcDtOFqjrtfR93KTg80rHP+WWh5UybdJcdU8M= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240911152814-4836d1d7f16b/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e h1:hD5q/y3P7mXQ+KbgyJ8bE0l+v367cR02jx46OEa6dc8= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= 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 ffb4a52c5..e7b5a1d89 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,7 +14,7 @@ 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.20240911152814-4836d1d7f16b + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240911160840-cde14abca28e github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.5 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index ecc0c193b..ec7523a89 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1394,8 +1394,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-20240911145028-d346e3ace978 h1:BPuehkAQ8R112SlTitukSdKYRJMY3zkvaQS4VSTNn0Q= github.com/smartcontractkit/chainlink-ccip v0.0.0-20240911145028-d346e3ace978/go.mod h1:X1f4CKlR1RilSgzArQv5HNvMrVSt+Zloihm3REwxhdQ= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240911152814-4836d1d7f16b h1:eW1CSdNcDtOFqjrtfR93KTg80rHP+WWh5UybdJcdU8M= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240911152814-4836d1d7f16b/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e h1:hD5q/y3P7mXQ+KbgyJ8bE0l+v367cR02jx46OEa6dc8= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7 h1:lTGIOQYLk1Ufn++X/AvZnt6VOcuhste5yp+C157No/Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7/go.mod h1:BMYE1vC/pGmdFSsOJdPrAA0/4gZ0Xo0SxTMdGspBtRo= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240906125718-9f0a98d32fbc h1:tRmTlaoAt+7FakMXXgeCuRPmzzBo5jsGpeCVvcU6KMc= From 3f986a2180e37c008927e62fbba13a70762f0a0f Mon Sep 17 00:00:00 2001 From: Farber98 Date: Sun, 15 Sep 2024 20:49:21 -0300 Subject: [PATCH 17/22] add flag to control if we return cr started --- pkg/solana/chainreader/chain_reader_test.go | 58 ++++++++++++--------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index dedf9f3f9..59e3c73ee 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -430,7 +430,40 @@ func (r *chainReaderInterfaceTester) Name() string { return "Solana" } -func (r *chainReaderInterfaceTester) Setup(t *testing.T) { +func (r *chainReaderInterfaceTester) Setup(t *testing.T, started bool) { + r.setupChainReader(t, started) +} + +func (r *chainReaderInterfaceTester) setupChainReader(t *testing.T, started bool) { + t.Cleanup(func() { + if started { + require.NoError(t, r.reader.Close()) + } + }) + + r.setChainReaderConfig(t) + + client := new(mockedRPCClient) + svc, err := chainreader.NewChainReaderService(logger.Test(t), client, r.conf) + if err != nil { + t.Logf("chain reader service was not able to start: %s", err.Error()) + t.FailNow() + } + + if started { + require.NoError(t, svc.Start(tests.Context(t))) + } + + if r.reader == nil { + r.reader = &wrappedTestChainReader{tester: r} + } + + r.reader.test = t + r.reader.service = svc + r.reader.client = client +} + +func (r *chainReaderInterfaceTester) setChainReaderConfig(t *testing.T) { r.address = make([]string, 7) for idx := range r.address { r.address[idx] = ag_solana.NewWallet().PublicKey().String() @@ -527,32 +560,9 @@ func (r *chainReaderInterfaceTester) Setup(t *testing.T) { } 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 { - t.Logf("chain reader service was not able to start: %s", err.Error()) - t.FailNow() - } - - if r.reader == nil { - r.reader = &wrappedTestChainReader{tester: r} - } - - r.reader.test = t - r.reader.service = svc - r.reader.client = client - return r.reader } -func (r *chainReaderInterfaceTester) CloseContractReader(t *testing.T) { - require.NoError(t, r.reader.service.Close()) -} - -func (r *chainReaderInterfaceTester) StartContractReader(t *testing.T) { - require.NoError(t, r.reader.service.Start(context.Background())) -} - type wrappedTestChainReader struct { test *testing.T service *chainreader.SolanaChainReaderService From 1f37e8a85dea2300e2f466788112a80b9a4f2f6f Mon Sep 17 00:00:00 2001 From: Farber98 Date: Sun, 15 Sep 2024 20:50:48 -0300 Subject: [PATCH 18/22] bump common --- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7fa345509..19f3db246 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.20240912183624-489fd0a47f8e + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804 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 b03a707df..fdbc721ea 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.20240912183624-489fd0a47f8e h1:hD5q/y3P7mXQ+KbgyJ8bE0l+v367cR02jx46OEa6dc8= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804 h1:Tz7ReWjQWACTi71xE/R54ydDd/ZApXEyujSxWrFucn0= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= 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 e7b5a1d89..377cc03b4 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,7 +14,7 @@ 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.20240912183624-489fd0a47f8e + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804 github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240911160840-cde14abca28e github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.5 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index ec7523a89..e02055336 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1394,8 +1394,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-20240911145028-d346e3ace978 h1:BPuehkAQ8R112SlTitukSdKYRJMY3zkvaQS4VSTNn0Q= github.com/smartcontractkit/chainlink-ccip v0.0.0-20240911145028-d346e3ace978/go.mod h1:X1f4CKlR1RilSgzArQv5HNvMrVSt+Zloihm3REwxhdQ= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e h1:hD5q/y3P7mXQ+KbgyJ8bE0l+v367cR02jx46OEa6dc8= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240912183624-489fd0a47f8e/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804 h1:Tz7ReWjQWACTi71xE/R54ydDd/ZApXEyujSxWrFucn0= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7 h1:lTGIOQYLk1Ufn++X/AvZnt6VOcuhste5yp+C157No/Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7/go.mod h1:BMYE1vC/pGmdFSsOJdPrAA0/4gZ0Xo0SxTMdGspBtRo= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240906125718-9f0a98d32fbc h1:tRmTlaoAt+7FakMXXgeCuRPmzzBo5jsGpeCVvcU6KMc= From 79b4500709ce237c17a9f01aed16886c0b26dc33 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Sun, 15 Sep 2024 21:01:43 -0300 Subject: [PATCH 19/22] bump common --- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 19f3db246..7248d803f 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.20240915233830-66ba7cde5804 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63 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 fdbc721ea..f0f6cab97 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.20240915233830-66ba7cde5804 h1:Tz7ReWjQWACTi71xE/R54ydDd/ZApXEyujSxWrFucn0= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63 h1:TFuWUY2JrlBlOTdo/bUWwxsrUQVJ8K4wvpo66QNRnC4= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= 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 377cc03b4..8d2001670 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,7 +14,7 @@ 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.20240915233830-66ba7cde5804 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63 github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240911160840-cde14abca28e github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.5 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index e02055336..edb995013 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1394,8 +1394,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-20240911145028-d346e3ace978 h1:BPuehkAQ8R112SlTitukSdKYRJMY3zkvaQS4VSTNn0Q= github.com/smartcontractkit/chainlink-ccip v0.0.0-20240911145028-d346e3ace978/go.mod h1:X1f4CKlR1RilSgzArQv5HNvMrVSt+Zloihm3REwxhdQ= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804 h1:Tz7ReWjQWACTi71xE/R54ydDd/ZApXEyujSxWrFucn0= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915233830-66ba7cde5804/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63 h1:TFuWUY2JrlBlOTdo/bUWwxsrUQVJ8K4wvpo66QNRnC4= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7 h1:lTGIOQYLk1Ufn++X/AvZnt6VOcuhste5yp+C157No/Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7/go.mod h1:BMYE1vC/pGmdFSsOJdPrAA0/4gZ0Xo0SxTMdGspBtRo= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240906125718-9f0a98d32fbc h1:tRmTlaoAt+7FakMXXgeCuRPmzzBo5jsGpeCVvcU6KMc= From 71454f375a4701c6f69d1830b50a5c81e0ea8f53 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Sun, 15 Sep 2024 21:07:45 -0300 Subject: [PATCH 20/22] make gomodtidy --- integration-tests/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index b8be77538..d52867052 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -15,7 +15,7 @@ require ( 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.20240915235808-392195f7dc63 - github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240911160840-cde14abca28e + github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240911182932-3c609a6ac664 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.5 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240910220528-150634e5880d From b7f19d97c08ca35e893dd5fd378caf1eccb719ec Mon Sep 17 00:00:00 2001 From: Farber98 Date: Mon, 16 Sep 2024 19:00:42 -0300 Subject: [PATCH 21/22] refactor codec and chaincomponents ifaces --- pkg/solana/chainreader/chain_reader_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/solana/chainreader/chain_reader_test.go b/pkg/solana/chainreader/chain_reader_test.go index be513c4f4..9e54f0332 100644 --- a/pkg/solana/chainreader/chain_reader_test.go +++ b/pkg/solana/chainreader/chain_reader_test.go @@ -431,22 +431,22 @@ func (r *chainReaderInterfaceTester) Name() string { } func (r *chainReaderInterfaceTester) Setup(t *testing.T, started bool) { - r.setupChainReader(t, started) + r.setContractReader(t, started) } -func (r *chainReaderInterfaceTester) setupChainReader(t *testing.T, started bool) { +func (r *chainReaderInterfaceTester) setContractReader(t *testing.T, started bool) { t.Cleanup(func() { if started { require.NoError(t, r.reader.Close()) } }) - r.setChainReaderConfig(t) + r.setContractReaderConfig(t) client := new(mockedRPCClient) svc, err := chainreader.NewChainReaderService(logger.Test(t), client, r.conf) if err != nil { - t.Logf("chain reader service was not able to start: %s", err.Error()) + t.Logf("contract reader service was not able to start: %s", err.Error()) t.FailNow() } @@ -463,7 +463,7 @@ func (r *chainReaderInterfaceTester) setupChainReader(t *testing.T, started bool r.reader.client = client } -func (r *chainReaderInterfaceTester) setChainReaderConfig(t *testing.T) { +func (r *chainReaderInterfaceTester) setContractReaderConfig(t *testing.T) { r.address = make([]string, 7) for idx := range r.address { r.address[idx] = ag_solana.NewWallet().PublicKey().String() From bc3a0f4daf6774cf23f24c7f7a7a38ef68b7b7b2 Mon Sep 17 00:00:00 2001 From: Farber98 Date: Mon, 16 Sep 2024 19:02:29 -0300 Subject: [PATCH 22/22] bump common --- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7313854f6..f6f9c5516 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.20240915235808-392195f7dc63 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240916214706-e7280848cd7b 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 f0f6cab97..dff4e51ee 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.20240915235808-392195f7dc63 h1:TFuWUY2JrlBlOTdo/bUWwxsrUQVJ8K4wvpo66QNRnC4= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240916214706-e7280848cd7b h1:7RyN8+dNTN+hjnKfgfEYdRfxqeHTnPq8ILcHn/gOe6k= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240916214706-e7280848cd7b/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= 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 d52867052..93aedeea3 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,7 +14,7 @@ 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.20240915235808-392195f7dc63 + github.com/smartcontractkit/chainlink-common v0.2.2-0.20240916214706-e7280848cd7b github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240911182932-3c609a6ac664 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.5 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index a5b135dce..8f785a4eb 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1394,8 +1394,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-20240911145028-d346e3ace978 h1:BPuehkAQ8R112SlTitukSdKYRJMY3zkvaQS4VSTNn0Q= github.com/smartcontractkit/chainlink-ccip v0.0.0-20240911145028-d346e3ace978/go.mod h1:X1f4CKlR1RilSgzArQv5HNvMrVSt+Zloihm3REwxhdQ= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63 h1:TFuWUY2JrlBlOTdo/bUWwxsrUQVJ8K4wvpo66QNRnC4= -github.com/smartcontractkit/chainlink-common v0.2.2-0.20240915235808-392195f7dc63/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240916214706-e7280848cd7b h1:7RyN8+dNTN+hjnKfgfEYdRfxqeHTnPq8ILcHn/gOe6k= +github.com/smartcontractkit/chainlink-common v0.2.2-0.20240916214706-e7280848cd7b/go.mod h1:sjiiPwd4KsYOCf68MwL86EKphdXeT66EY7j53WH5DCc= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7 h1:lTGIOQYLk1Ufn++X/AvZnt6VOcuhste5yp+C157No/Q= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7/go.mod h1:BMYE1vC/pGmdFSsOJdPrAA0/4gZ0Xo0SxTMdGspBtRo= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240906125718-9f0a98d32fbc h1:tRmTlaoAt+7FakMXXgeCuRPmzzBo5jsGpeCVvcU6KMc=