switch from chainlink-relay to chainlink-common

smartcontractkit · Nov 17, 2023 · cde044a · cde044a
1 parent c7eb330
commit cde044a
Show file tree

Hide file tree

Showing 41 changed files with 101 additions and 86 deletions.
diff --git a/cmd/monitoring/main.go b/cmd/monitoring/main.go
@@ -5,8 +5,9 @@ import (
 	"fmt"
 
 	"github.com/gagliardetto/solana-go/rpc"
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 
 	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring"
 )

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.17.0
-	github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231020230319-2ede955d1dc9
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231115220132-869da59f5b1c
 	github.com/smartcontractkit/libocr v0.0.0-20230925165524-ffa38fe11ef8
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/multierr v1.11.0

diff --git a/go.sum b/go.sum
@@ -429,8 +429,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g
 github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231020230319-2ede955d1dc9 h1:fFD5SgSJtnXvkGLK3CExNKpUIz4sGrNNkKv3Ljw63Hk=
-github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231020230319-2ede955d1dc9/go.mod h1:M9U1JV7IQi8Sfj4JR1qSi1tIh6omgW78W/8SHN/8BUQ=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231115220132-869da59f5b1c h1:C/bwm/TyexSX+HE/SmJrFxLpCG3qdVNqqUpIgPU/Mkw=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231115220132-869da59f5b1c/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 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/common/common.go b/integration-tests/common/common.go
@@ -37,7 +37,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 
-	relay_utils "github.com/smartcontractkit/chainlink-relay/pkg/utils"
+	relay_utils "github.com/smartcontractkit/chainlink-common/pkg/utils"
 	test_env_sol "github.com/smartcontractkit/chainlink-solana/integration-tests/docker/test_env"
 	"github.com/smartcontractkit/chainlink-solana/integration-tests/solclient"
 	solcfg "github.com/smartcontractkit/chainlink-solana/pkg/solana/config"

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -15,11 +15,11 @@ require (
 	github.com/onsi/gomega v1.27.8
 	github.com/rs/zerolog v1.30.0
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
-	github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231115124244-8303409abccd
-	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231116223216-9eea341937de
+	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231116220215-93510f138ff6
 	github.com/smartcontractkit/chainlink-testing-framework v1.19.0
-	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116210131-a9d81ae52ccd
-	github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116210131-a9d81ae52ccd
+	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116224343-7780eb63d8dc
+	github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116224343-7780eb63d8dc
 	github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
 	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.23.0
@@ -379,8 +379,8 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/slack-go/slack v0.12.2 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 // indirect
-	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb // indirect
+	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231116223324-56d60ee456c3 // indirect
+	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231116220530-9d5db8010d3b // indirect
 	github.com/smartcontractkit/ocr2keepers v0.7.28 // indirect
 	github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect

diff --git a/integration-tests/go.sum b/integration-tests/go.sum
@@ -2355,18 +2355,18 @@ github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ
 github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 h1:Pt6c7bJU9wIN6PQQnmN8UmYYH6lpfiQ6U/B8yEC2s5s=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255/go.mod h1:EHppaccd/LTlTMI2o4dmBHe4BknEgEFFDjDGMNuGb3k=
-github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231115124244-8303409abccd h1:PRVJxNK67pQWufXuB1cxckH/xZkcQFDy8KjN9ZYqong=
-github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231115124244-8303409abccd/go.mod h1:rOayi690YxLlkQy959PD8INhOAIAUi9LoN0G+J/CEf4=
-github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb h1:HiluOfEVGOQTM6BTDImOqYdMZZ7qq7fkZ3TJdmItNr8=
-github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb/go.mod h1:/30flFG4L/iCYAFeA3DUzR0xuHSxAMONiWTzyzvsNwo=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231116223216-9eea341937de h1:FUay6fhW3ELmUfIk8R4ql+WsWNQHHn+qQBxDfQD9cIs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231116223216-9eea341937de/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231116223324-56d60ee456c3 h1:Z26fE3PWqlQRqW7QSRYCSpfTXzHkPqcppMPMASU8Z6g=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231116223324-56d60ee456c3/go.mod h1:EnvRRl5epzfFyXzo2JkQAh1N3EvDZOF5+ExjId4uyi0=
+github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231116220530-9d5db8010d3b h1:KWfn3upgUYbOoOEUAuTJndS2OOmvO67h78P/oF3kbwM=
+github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231116220530-9d5db8010d3b/go.mod h1:ShLh2mumD8ShuRBS6ONHDaW6BDloVA3fAbGysJg4Ht4=
 github.com/smartcontractkit/chainlink-testing-framework v1.19.0 h1:ungyY1gYcXCtmdX2yCon8pkx9HgPPLg4aNAhKNZFP5c=
 github.com/smartcontractkit/chainlink-testing-framework v1.19.0/go.mod h1:zScXRqmvbyTFUooyLYrOp4+V/sFPUbFJNRc72YmnuIk=
-github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116210131-a9d81ae52ccd h1:55Zi3Ed6+xJYs+qCORNPVvoitUh/WP8B0AwUtWZ+m3M=
-github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116210131-a9d81ae52ccd/go.mod h1:4/r8AW79/ZW0tED8GfOjO17AyXyEDZLdgeeZeLpkT1c=
-github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116210131-a9d81ae52ccd h1:hBerlu8Kus3+a+IUjLiwRmIzLMW663kEFxBCbiFOjrQ=
-github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116210131-a9d81ae52ccd/go.mod h1:8wHqNlLPdwa9ByE9lPnhrLHdlvfjZI1uj5RRrhrT4Ys=
+github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116224343-7780eb63d8dc h1:avcEXOkSX95tITMGImqGl1nwX+cmm+q74cXRiVHdBbQ=
+github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116224343-7780eb63d8dc/go.mod h1:JATrsArYN6wOfkjQ0i/UHnUTXrCK6v5Qr6WwPmG+vQc=
+github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116224343-7780eb63d8dc h1:JgldMjvhBvsYRRhcfHZrsX35sMMXep+ZD46x3lP/oDE=
+github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116224343-7780eb63d8dc/go.mod h1:A3oWdc95WLNcQSlxmDuQoEnmVY1uJVPNH+BEElTMJho=
 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/pkg/monitoring/config.go b/pkg/monitoring/config.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
 type SolanaConfig struct {

diff --git a/pkg/monitoring/feed_config.go b/pkg/monitoring/feed_config.go
@@ -7,7 +7,8 @@ import (
 	"math/big"
 
 	"github.com/gagliardetto/solana-go"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
 type SolanaFeedConfig struct {

diff --git a/pkg/monitoring/metrics.go b/pkg/monitoring/metrics.go
@@ -5,7 +5,8 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
 var BalanceAccountNames = []string{

diff --git a/pkg/monitoring/node_config.go b/pkg/monitoring/node_config.go
@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"io"
 
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
 	"github.com/smartcontractkit/libocr/offchainreporting2/types"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
 type SolanaNodeConfig struct {

diff --git a/pkg/monitoring/prometheus_exporter.go b/pkg/monitoring/prometheus_exporter.go
@@ -5,7 +5,8 @@ import (
 	"sync"
 
 	"github.com/gagliardetto/solana-go"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
 func NewPrometheusExporterFactory(

diff --git a/pkg/monitoring/prometheus_exporter_test.go b/pkg/monitoring/prometheus_exporter_test.go
@@ -5,9 +5,10 @@ import (
 	"testing"
 	"time"
 
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
-	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
 	"github.com/stretchr/testify/require"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
+	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
 )
 
 func TestPrometheusExporter(t *testing.T) {

diff --git a/pkg/monitoring/source_balances.go b/pkg/monitoring/source_balances.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/gagliardetto/solana-go"
 	"github.com/gagliardetto/solana-go/rpc"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
 type Balances struct {

diff --git a/pkg/monitoring/source_envelope.go b/pkg/monitoring/source_envelope.go
@@ -9,11 +9,12 @@ import (
 
 	"github.com/gagliardetto/solana-go"
 	"github.com/gagliardetto/solana-go/rpc"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
-	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/event"
-	pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
 	"github.com/smartcontractkit/libocr/offchainreporting2/types"
 	"go.uber.org/multierr"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
+	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/event"
+	pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
 )
 
 func NewEnvelopeSourceFactory(

diff --git a/pkg/monitoring/source_envelope_test.go b/pkg/monitoring/source_envelope_test.go
@@ -10,12 +10,13 @@ import (
 	bin "github.com/gagliardetto/binary"
 	"github.com/gagliardetto/solana-go"
 	"github.com/gagliardetto/solana-go/rpc"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
-	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
-	pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
 	"github.com/smartcontractkit/libocr/offchainreporting2/types"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
+	"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
+	pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
 )
 
 var (

diff --git a/pkg/monitoring/source_txresults.go b/pkg/monitoring/source_txresults.go
@@ -7,7 +7,8 @@ import (
 
 	"github.com/gagliardetto/solana-go"
 	"github.com/gagliardetto/solana-go/rpc"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
+
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
 func NewTxResultsSourceFactory(

diff --git a/pkg/monitoring/testutils.go b/pkg/monitoring/testutils.go
@@ -7,8 +7,9 @@ import (
 	"time"
 
 	"github.com/gagliardetto/solana-go"
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
-	relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
 // Generators

diff --git a/pkg/solana/cache_test.go b/pkg/solana/cache_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"

diff --git a/pkg/solana/chain.go b/pkg/solana/chain.go
@@ -15,13 +15,13 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/multierr"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/chains"
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
-	"github.com/smartcontractkit/chainlink-relay/pkg/loop"
-	"github.com/smartcontractkit/chainlink-relay/pkg/services"
-	"github.com/smartcontractkit/chainlink-relay/pkg/types"
-	relaytypes "github.com/smartcontractkit/chainlink-relay/pkg/types"
-	"github.com/smartcontractkit/chainlink-relay/pkg/utils"
+	"github.com/smartcontractkit/chainlink-common/pkg/chains"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	relaytypes "github.com/smartcontractkit/chainlink-common/pkg/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"

diff --git a/pkg/solana/chain_test.go b/pkg/solana/chain_test.go
@@ -13,12 +13,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/utils"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
 	solcfg "github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/db"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 )
 
 const TestSolanaGenesisHashTemplate = `{"jsonrpc":"2.0","result":"%s","id":1}`

diff --git a/pkg/solana/client/client_test.go b/pkg/solana/client/client_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/db"

diff --git a/pkg/solana/client/test_helpers.go b/pkg/solana/client/test_helpers.go
@@ -9,9 +9,10 @@ import (
 
 	"github.com/gagliardetto/solana-go"
 	"github.com/gagliardetto/solana-go/rpc"
-	"github.com/smartcontractkit/chainlink-relay/pkg/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 )
 
 // SetupLocalSolNode sets up a local solana node via solana cli, and returns the url

diff --git a/pkg/solana/client/test_helpers_test.go b/pkg/solana/client/test_helpers_test.go
@@ -5,11 +5,12 @@ import (
 	"time"
 
 	"github.com/gagliardetto/solana-go"
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
-	"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
-	"github.com/smartcontractkit/chainlink-solana/pkg/solana/db"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
+	"github.com/smartcontractkit/chainlink-solana/pkg/solana/db"
 )
 
 func TestSetupLocalSolNode_SimultaneousNetworks(t *testing.T) {

diff --git a/pkg/solana/cmd/chainlink-solana/main.go b/pkg/solana/cmd/chainlink-solana/main.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/go-plugin"
 	"github.com/pelletier/go-toml/v2"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/loop"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana"
 )
 

diff --git a/pkg/solana/config.go b/pkg/solana/config.go
@@ -10,8 +10,8 @@ import (
 	"go.uber.org/multierr"
 	"golang.org/x/exp/slices"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/config"
-	relaytypes "github.com/smartcontractkit/chainlink-relay/pkg/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/config"
+	relaytypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 
 	solcfg "github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
 	soldb "github.com/smartcontractkit/chainlink-solana/pkg/solana/db"

diff --git a/pkg/solana/config/config.go b/pkg/solana/config/config.go
@@ -7,8 +7,8 @@ import (
 	"github.com/gagliardetto/solana-go/rpc"
 	"go.uber.org/multierr"
 
-	relaycfg "github.com/smartcontractkit/chainlink-relay/pkg/config"
-	"github.com/smartcontractkit/chainlink-relay/pkg/utils"
+	relaycfg "github.com/smartcontractkit/chainlink-common/pkg/config"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/db"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/logger"

diff --git a/pkg/solana/db/db.go b/pkg/solana/db/db.go
@@ -8,7 +8,7 @@ import (
 
 	"gopkg.in/guregu/null.v4"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/utils"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 )
 
 type Node struct {

diff --git a/pkg/solana/fees/recent_fees.go b/pkg/solana/fees/recent_fees.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/utils"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
 )
 

diff --git a/pkg/solana/logger/logger.go b/pkg/solana/logger/logger.go
@@ -1,6 +1,6 @@
 package logger
 
-import "github.com/smartcontractkit/chainlink-relay/pkg/logger"
+import "github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 // Logger is an alias for backwards compatibility.
 type Logger = logger.Logger
diff --git a/pkg/solana/monitor/balance.go b/pkg/solana/monitor/balance.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/gagliardetto/solana-go"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
-	"github.com/smartcontractkit/chainlink-relay/pkg/types"
-	"github.com/smartcontractkit/chainlink-relay/pkg/utils"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	solanaClient "github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
 )

diff --git a/pkg/solana/monitor/balance_test.go b/pkg/solana/monitor/balance_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink-relay/pkg/logger"
-	"github.com/smartcontractkit/chainlink-relay/pkg/utils/tests"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/client/mocks"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/internal"
 )