From 889de6eb7ddcd4b7f751103ea36836d616adc7f0 Mon Sep 17 00:00:00 2001 From: Matee ullah Malik Date: Fri, 16 May 2025 08:13:29 +0500 Subject: [PATCH 1/3] Update lumera dependencies to v1 --- go.mod | 5 +++-- go.sum | 4 ++-- pkg/lumera/modules/action/action_mock.go | 2 +- pkg/lumera/modules/action/impl.go | 2 +- pkg/lumera/modules/action/interface.go | 2 +- pkg/lumera/modules/action_msg/impl.go | 2 +- pkg/lumera/modules/supernode/impl.go | 2 +- pkg/lumera/modules/supernode/interface.go | 2 +- pkg/lumera/modules/supernode/supernode_mock.go | 2 +- pkg/testutil/lumera.go | 4 ++-- sdk/adapters/lumera/adapter.go | 4 ++-- supernode/services/cascade/adaptors/lumera.go | 5 +++-- supernode/services/cascade/adaptors/mocks/lumera_mock.go | 4 ++-- supernode/services/cascade/helper.go | 2 +- tests/system/e2e_cascade_test.go | 2 +- 15 files changed, 23 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index a3746feb..2f680eef 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,11 @@ module github.com/LumeraProtocol/supernode go 1.24.1 -replace "github.com/LumeraProtocol/supernode/supernode" => ./supernode +replace github.com/LumeraProtocol/supernode/supernode => ./supernode + require ( cosmossdk.io/math v1.5.3 - github.com/LumeraProtocol/lumera v0.4.5 + github.com/LumeraProtocol/lumera v1.0.1 github.com/LumeraProtocol/rq-go v0.2.1 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/cenkalti/backoff/v4 v4.3.0 diff --git a/go.sum b/go.sum index 16648967..f5046837 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/LumeraProtocol/lumera v0.4.5 h1:eeDeUFMKYAbCKDZVZzPsFpdiypoWsFUD37fd49EyGSE= -github.com/LumeraProtocol/lumera v0.4.5/go.mod h1:c1M+sjewuCvxw+pznwlspUzenDJI8Y+suKB3RFKS2Wo= +github.com/LumeraProtocol/lumera v1.0.1 h1:gnSbyQfVeYS2pCvR2AxrD8UWR++IEVYz4ywk3GiI25k= +github.com/LumeraProtocol/lumera v1.0.1/go.mod h1:c1M+sjewuCvxw+pznwlspUzenDJI8Y+suKB3RFKS2Wo= github.com/LumeraProtocol/rq-go v0.2.1 h1:8B3UzRChLsGMmvZ+UVbJsJj6JZzL9P9iYxbdUwGsQI4= github.com/LumeraProtocol/rq-go v0.2.1/go.mod h1:APnKCZRh1Es2Vtrd2w4kCLgAyaL5Bqrkz/BURoRJ+O8= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= diff --git a/pkg/lumera/modules/action/action_mock.go b/pkg/lumera/modules/action/action_mock.go index 7f643155..09ad9ac7 100644 --- a/pkg/lumera/modules/action/action_mock.go +++ b/pkg/lumera/modules/action/action_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - types "github.com/LumeraProtocol/lumera/x/action/types" + types "github.com/LumeraProtocol/lumera/x/action/v1/types" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/lumera/modules/action/impl.go b/pkg/lumera/modules/action/impl.go index c4e66960..4b3cd8f7 100644 --- a/pkg/lumera/modules/action/impl.go +++ b/pkg/lumera/modules/action/impl.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/LumeraProtocol/lumera/x/action/types" + "github.com/LumeraProtocol/lumera/x/action/v1/types" "google.golang.org/grpc" ) diff --git a/pkg/lumera/modules/action/interface.go b/pkg/lumera/modules/action/interface.go index 3b90f493..cda90d4f 100644 --- a/pkg/lumera/modules/action/interface.go +++ b/pkg/lumera/modules/action/interface.go @@ -4,7 +4,7 @@ package action import ( "context" - "github.com/LumeraProtocol/lumera/x/action/types" + "github.com/LumeraProtocol/lumera/x/action/v1/types" "google.golang.org/grpc" ) diff --git a/pkg/lumera/modules/action_msg/impl.go b/pkg/lumera/modules/action_msg/impl.go index 98ddb7b8..af970529 100644 --- a/pkg/lumera/modules/action_msg/impl.go +++ b/pkg/lumera/modules/action_msg/impl.go @@ -6,7 +6,7 @@ import ( "strconv" actionapi "github.com/LumeraProtocol/lumera/api/lumera/action" - actiontypes "github.com/LumeraProtocol/lumera/x/action/types" + actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" "github.com/LumeraProtocol/supernode/pkg/logtrace" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" diff --git a/pkg/lumera/modules/supernode/impl.go b/pkg/lumera/modules/supernode/impl.go index 3ebac493..42917582 100644 --- a/pkg/lumera/modules/supernode/impl.go +++ b/pkg/lumera/modules/supernode/impl.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "github.com/LumeraProtocol/lumera/x/supernode/types" + "github.com/LumeraProtocol/lumera/x/supernode/v1/types" "github.com/LumeraProtocol/supernode/pkg/errors" "google.golang.org/grpc" diff --git a/pkg/lumera/modules/supernode/interface.go b/pkg/lumera/modules/supernode/interface.go index 5c447137..54d1eb39 100644 --- a/pkg/lumera/modules/supernode/interface.go +++ b/pkg/lumera/modules/supernode/interface.go @@ -4,7 +4,7 @@ package supernode import ( "context" - "github.com/LumeraProtocol/lumera/x/supernode/types" + "github.com/LumeraProtocol/lumera/x/supernode/v1/types" "google.golang.org/grpc" ) diff --git a/pkg/lumera/modules/supernode/supernode_mock.go b/pkg/lumera/modules/supernode/supernode_mock.go index 682043a7..8cc67cae 100644 --- a/pkg/lumera/modules/supernode/supernode_mock.go +++ b/pkg/lumera/modules/supernode/supernode_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - types "github.com/LumeraProtocol/lumera/x/supernode/types" + types "github.com/LumeraProtocol/lumera/x/supernode/v1/types" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/testutil/lumera.go b/pkg/testutil/lumera.go index 163022f5..a0f8ce61 100644 --- a/pkg/testutil/lumera.go +++ b/pkg/testutil/lumera.go @@ -3,8 +3,8 @@ package testutil import ( "context" - "github.com/LumeraProtocol/lumera/x/action/types" - supernodeTypes "github.com/LumeraProtocol/lumera/x/supernode/types" + "github.com/LumeraProtocol/lumera/x/action/v1/types" + supernodeTypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" "github.com/LumeraProtocol/supernode/pkg/lumera" "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action" "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action_msg" diff --git a/sdk/adapters/lumera/adapter.go b/sdk/adapters/lumera/adapter.go index 0514b6b4..9a27c240 100644 --- a/sdk/adapters/lumera/adapter.go +++ b/sdk/adapters/lumera/adapter.go @@ -6,9 +6,9 @@ import ( "github.com/LumeraProtocol/supernode/sdk/log" - actiontypes "github.com/LumeraProtocol/lumera/x/action/types" + actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" - sntypes "github.com/LumeraProtocol/lumera/x/supernode/types" + sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" lumeraclient "github.com/LumeraProtocol/supernode/pkg/lumera" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/golang/protobuf/proto" diff --git a/supernode/services/cascade/adaptors/lumera.go b/supernode/services/cascade/adaptors/lumera.go index fb79bae1..f3ed46f2 100644 --- a/supernode/services/cascade/adaptors/lumera.go +++ b/supernode/services/cascade/adaptors/lumera.go @@ -2,8 +2,9 @@ package adaptors import ( "context" - actiontypes "github.com/LumeraProtocol/lumera/x/action/types" - sntypes "github.com/LumeraProtocol/lumera/x/supernode/types" + + actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" + sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" "github.com/LumeraProtocol/supernode/pkg/lumera" "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action_msg" ) diff --git a/supernode/services/cascade/adaptors/mocks/lumera_mock.go b/supernode/services/cascade/adaptors/mocks/lumera_mock.go index 67943f75..e2f9399e 100644 --- a/supernode/services/cascade/adaptors/mocks/lumera_mock.go +++ b/supernode/services/cascade/adaptors/mocks/lumera_mock.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - types "github.com/LumeraProtocol/lumera/x/action/types" - types0 "github.com/LumeraProtocol/lumera/x/supernode/types" + types "github.com/LumeraProtocol/lumera/x/action/v1/types" + types0 "github.com/LumeraProtocol/lumera/x/supernode/v1/types" action_msg "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action_msg" gomock "github.com/golang/mock/gomock" ) diff --git a/supernode/services/cascade/helper.go b/supernode/services/cascade/helper.go index 07b29739..09e35978 100644 --- a/supernode/services/cascade/helper.go +++ b/supernode/services/cascade/helper.go @@ -7,7 +7,7 @@ import ( "strings" "cosmossdk.io/math" - actiontypes "github.com/LumeraProtocol/lumera/x/action/types" + actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" "github.com/LumeraProtocol/supernode/pkg/codec" "github.com/LumeraProtocol/supernode/pkg/errors" "github.com/LumeraProtocol/supernode/pkg/logtrace" diff --git a/tests/system/e2e_cascade_test.go b/tests/system/e2e_cascade_test.go index fdef64d0..01952602 100644 --- a/tests/system/e2e_cascade_test.go +++ b/tests/system/e2e_cascade_test.go @@ -21,7 +21,7 @@ import ( "github.com/LumeraProtocol/supernode/sdk/action" "github.com/LumeraProtocol/supernode/sdk/event" - "github.com/LumeraProtocol/lumera/x/action/types" + "github.com/LumeraProtocol/lumera/x/action/v1/types" sdkconfig "github.com/LumeraProtocol/supernode/sdk/config" "github.com/stretchr/testify/require" From 6f58a1dc5a42f332f4f54690e10a8c73019caa04 Mon Sep 17 00:00:00 2001 From: Matee ullah Malik Date: Fri, 16 May 2025 08:17:36 +0500 Subject: [PATCH 2/3] Fix go mod --- tests/system/go.mod | 2 +- tests/system/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system/go.mod b/tests/system/go.mod index 44221737..e703007e 100644 --- a/tests/system/go.mod +++ b/tests/system/go.mod @@ -27,7 +27,7 @@ require ( require ( cosmossdk.io/math v1.5.3 - github.com/LumeraProtocol/lumera v0.4.5 + github.com/LumeraProtocol/lumera v1.0.1 github.com/LumeraProtocol/supernode v0.0.0-00010101000000-000000000000 github.com/cometbft/cometbft v0.38.17 github.com/tidwall/gjson v1.14.2 diff --git a/tests/system/go.sum b/tests/system/go.sum index a3a1b9e5..4b11edb7 100644 --- a/tests/system/go.sum +++ b/tests/system/go.sum @@ -73,8 +73,8 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 h1:8nn+rsCvTq9axyEh382S0PFLBeaFwNsT43IrPWzctRU= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1/go.mod h1:viRWSEhtMZqz1rhwmOVKkWl6SwmVowfL9O2YR5gI2PE= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/LumeraProtocol/lumera v0.4.5 h1:eeDeUFMKYAbCKDZVZzPsFpdiypoWsFUD37fd49EyGSE= -github.com/LumeraProtocol/lumera v0.4.5/go.mod h1:c1M+sjewuCvxw+pznwlspUzenDJI8Y+suKB3RFKS2Wo= +github.com/LumeraProtocol/lumera v1.0.1 h1:gnSbyQfVeYS2pCvR2AxrD8UWR++IEVYz4ywk3GiI25k= +github.com/LumeraProtocol/lumera v1.0.1/go.mod h1:c1M+sjewuCvxw+pznwlspUzenDJI8Y+suKB3RFKS2Wo= github.com/LumeraProtocol/rq-go v0.2.1 h1:8B3UzRChLsGMmvZ+UVbJsJj6JZzL9P9iYxbdUwGsQI4= github.com/LumeraProtocol/rq-go v0.2.1/go.mod h1:APnKCZRh1Es2Vtrd2w4kCLgAyaL5Bqrkz/BURoRJ+O8= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= From 623e3760a053396e6563f68f4352ae7b7d79c183 Mon Sep 17 00:00:00 2001 From: Matee ullah Malik Date: Fri, 16 May 2025 08:29:07 +0500 Subject: [PATCH 3/3] skip checksum check --- .github/workflows/build&relase.yml | 4 ++++ .github/workflows/tests.yml | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build&relase.yml b/.github/workflows/build&relase.yml index 74c5192b..5f154439 100644 --- a/.github/workflows/build&relase.yml +++ b/.github/workflows/build&relase.yml @@ -62,6 +62,8 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libwebp-dev + # Fix for Lumera module checksum issue + go env -w GOPRIVATE=github.com/LumeraProtocol/lumera - name: Build binary run: | @@ -149,6 +151,8 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libwebp-dev + # Fix for Lumera module checksum issue + go env -w GOPRIVATE=github.com/LumeraProtocol/lumera - name: Build Release Version run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 27e71c69..ec5fc461 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,9 @@ jobs: uses: ./.github/actions/setup-env - name: Install dependencies - run: go mod download + run: | + go env -w GOPRIVATE=github.com/LumeraProtocol/lumera + go mod download - name: Run unit tests run: go test $(go list ./... | grep -v '/tests') -v @@ -37,7 +39,9 @@ jobs: uses: ./.github/actions/setup-env - name: Install dependencies - run: go mod download + run: | + go env -w GOPRIVATE=github.com/LumeraProtocol/lumera + go mod download - name: Run integration tests run: go test -v ./tests/integration/... @@ -55,8 +59,9 @@ jobs: - name: Install dependencies run: | + go env -w GOPRIVATE=github.com/LumeraProtocol/lumera go mod download - cd tests/system && go mod download + cd tests/system && go env -w GOPRIVATE=github.com/LumeraProtocol/lumera && go mod download - name: Install Lumera run: |