Merge branch 'main' into PRT-add-cache-to-protocol-e2e

.github/workflows/lint.yml

@@ -12,14 +12,14 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Install Go
         uses: actions/setup-go@v5
         with:
           go-version: 1.20.5
 
-      - name: Checkout code
-        uses: actions/checkout@v4
-
       - name: Lint
         uses: golangci/golangci-lint-action@v4
         with:

.github/workflows/proto.yml

@@ -23,15 +23,15 @@ jobs:
   #       with:
   #         input: "proto"
 
-  break-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: bufbuild/[email protected]
-      - uses: bufbuild/buf-breaking-action@v1
-        with:
-          input: "proto"
-          against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"
+  # break-check:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: bufbuild/[email protected]
+  #     - uses: bufbuild/buf-breaking-action@v1
+  #       with:
+  #         input: "proto"
+  #         against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"
 
   validate-check:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Publish Lava Release
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+(-[a-zA-Z0-9]+)?'
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
   workflow_dispatch:
     inputs:
       release_tag:

Makefile

@@ -193,10 +193,10 @@ ifeq (static,$(findstring static,$(LAVA_BUILD_OPTIONS)))
 endif
 
 ifeq (mask_consumer_logs,$(findstring mask_consumer_logs,$(LAVA_BUILD_OPTIONS)))
-  ldflags += -X github.com/lavanet/lava/v3/protocol/common.ReturnMaskedErrors=true
+  ldflags += -X github.com/lavanet/lava/v4/protocol/common.ReturnMaskedErrors=true
 endif
 ifeq (debug_mutex,$(findstring debug_mutex,$(LAVA_BUILD_OPTIONS)))
-  ldflags += -X github.com/lavanet/lava/v3/utils.TimeoutMutex=true
+  ldflags += -X github.com/lavanet/lava/v4/utils.TimeoutMutex=true
 endif
 
 ifeq (cleveldb,$(findstring cleveldb,$(LAVA_BUILD_OPTIONS)))
@@ -207,12 +207,12 @@ endif
 
 ifeq (release,$(findstring release,$(LAVA_BUILD_OPTIONS)))
   $(info Building With Production Flag)
-  ldflags += -X github.com/lavanet/lava/v3/utils.ExtendedLogLevel=production
+  ldflags += -X github.com/lavanet/lava/v4/utils.ExtendedLogLevel=production
 endif
 
 ifeq (debug_payment_e2e,$(findstring debug_payment_e2e,$(LAVA_BUILD_OPTIONS)))
   $(info Building With Debug Payment E2E Flag. Making a month 2 minutes)
-  ldflags += -X github.com/lavanet/lava/v3/utils.DebugPaymentE2E=debug_payment_e2e
+  ldflags += -X github.com/lavanet/lava/v4/utils.DebugPaymentE2E=debug_payment_e2e
 endif
 
 ifeq (,$(findstring nostrip,$(LAVA_BUILD_OPTIONS)))

app/ante.go

@@ -5,10 +5,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	dualstakingante "github.com/lavanet/lava/v3/x/dualstaking/ante"
-	dualstakingkeeper "github.com/lavanet/lava/v3/x/dualstaking/keeper"
-	specante "github.com/lavanet/lava/v3/x/spec/ante"
-	"github.com/lavanet/lava/v3/x/spec/keeper"
+	dualstakingante "github.com/lavanet/lava/v4/x/dualstaking/ante"
+	dualstakingkeeper "github.com/lavanet/lava/v4/x/dualstaking/keeper"
+	specante "github.com/lavanet/lava/v4/x/spec/ante"
+	"github.com/lavanet/lava/v4/x/spec/keeper"
 )
 
 func NewAnteHandler(accountKeeper ante.AccountKeeper, bankKeeper authtypes.BankKeeper, dualstakingKeeper dualstakingkeeper.Keeper, signModeHandler signing.SignModeHandler, feegrantKeeper ante.FeegrantKeeper, specKeeper keeper.Keeper, sigGasConsumer ante.SignatureVerificationGasConsumer) sdk.AnteHandler {

app/app.go

@@ -15,13 +15,13 @@ import (
 	v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
-	"github.com/lavanet/lava/v3/utils"
-	"github.com/lavanet/lava/v3/x/fixationstore"
-	fixationkeeper "github.com/lavanet/lava/v3/x/fixationstore/keeper"
-	fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types"
-	"github.com/lavanet/lava/v3/x/timerstore"
-	timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper"
-	timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types"
+	"github.com/lavanet/lava/v4/utils"
+	"github.com/lavanet/lava/v4/x/fixationstore"
+	fixationkeeper "github.com/lavanet/lava/v4/x/fixationstore/keeper"
+	fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types"
+	"github.com/lavanet/lava/v4/x/timerstore"
+	timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper"
+	timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types"
 
 	"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
 	packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
@@ -113,48 +113,48 @@ import (
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 	ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
-	"github.com/lavanet/lava/v3/app/keepers"
-	appparams "github.com/lavanet/lava/v3/app/params"
-	"github.com/lavanet/lava/v3/app/upgrades"
-	"github.com/lavanet/lava/v3/docs"
-	conflictmodule "github.com/lavanet/lava/v3/x/conflict"
-	conflictmodulekeeper "github.com/lavanet/lava/v3/x/conflict/keeper"
-	conflictmoduletypes "github.com/lavanet/lava/v3/x/conflict/types"
-	downtimemodule "github.com/lavanet/lava/v3/x/downtime"
-	downtimemodulekeeper "github.com/lavanet/lava/v3/x/downtime/keeper"
-	downtimemoduletypes "github.com/lavanet/lava/v3/x/downtime/types"
-	dualstakingmodule "github.com/lavanet/lava/v3/x/dualstaking"
-	dualstakingmodulekeeper "github.com/lavanet/lava/v3/x/dualstaking/keeper"
-	dualstakingmoduletypes "github.com/lavanet/lava/v3/x/dualstaking/types"
-	epochstoragemodule "github.com/lavanet/lava/v3/x/epochstorage"
-	epochstoragemodulekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper"
-	epochstoragemoduletypes "github.com/lavanet/lava/v3/x/epochstorage/types"
-	pairingmodule "github.com/lavanet/lava/v3/x/pairing"
-	pairingmoduleclient "github.com/lavanet/lava/v3/x/pairing/client"
-	pairingmodulekeeper "github.com/lavanet/lava/v3/x/pairing/keeper"
-	pairingmoduletypes "github.com/lavanet/lava/v3/x/pairing/types"
-	plansmodule "github.com/lavanet/lava/v3/x/plans"
-	plansmoduleclient "github.com/lavanet/lava/v3/x/plans/client"
-	plansmodulekeeper "github.com/lavanet/lava/v3/x/plans/keeper"
-	plansmoduletypes "github.com/lavanet/lava/v3/x/plans/types"
-	projectsmodule "github.com/lavanet/lava/v3/x/projects"
-	projectsmodulekeeper "github.com/lavanet/lava/v3/x/projects/keeper"
-	projectsmoduletypes "github.com/lavanet/lava/v3/x/projects/types"
-	protocolmodule "github.com/lavanet/lava/v3/x/protocol"
-	protocolmoduleclient "github.com/lavanet/lava/v3/x/protocol/client/cli"
-	protocolmodulekeeper "github.com/lavanet/lava/v3/x/protocol/keeper"
-	protocolmoduletypes "github.com/lavanet/lava/v3/x/protocol/types"
-	rewardsmodule "github.com/lavanet/lava/v3/x/rewards"
-	rewardsmoduleclient "github.com/lavanet/lava/v3/x/rewards/client/cli"
-	rewardsmodulekeeper "github.com/lavanet/lava/v3/x/rewards/keeper"
-	rewardsmoduletypes "github.com/lavanet/lava/v3/x/rewards/types"
-	specmodule "github.com/lavanet/lava/v3/x/spec"
-	specmoduleclient "github.com/lavanet/lava/v3/x/spec/client"
-	specmodulekeeper "github.com/lavanet/lava/v3/x/spec/keeper"
-	specmoduletypes "github.com/lavanet/lava/v3/x/spec/types"
-	subscriptionmodule "github.com/lavanet/lava/v3/x/subscription"
-	subscriptionmodulekeeper "github.com/lavanet/lava/v3/x/subscription/keeper"
-	subscriptionmoduletypes "github.com/lavanet/lava/v3/x/subscription/types"
+	"github.com/lavanet/lava/v4/app/keepers"
+	appparams "github.com/lavanet/lava/v4/app/params"
+	"github.com/lavanet/lava/v4/app/upgrades"
+	"github.com/lavanet/lava/v4/docs"
+	conflictmodule "github.com/lavanet/lava/v4/x/conflict"
+	conflictmodulekeeper "github.com/lavanet/lava/v4/x/conflict/keeper"
+	conflictmoduletypes "github.com/lavanet/lava/v4/x/conflict/types"
+	downtimemodule "github.com/lavanet/lava/v4/x/downtime"
+	downtimemodulekeeper "github.com/lavanet/lava/v4/x/downtime/keeper"
+	downtimemoduletypes "github.com/lavanet/lava/v4/x/downtime/types"
+	dualstakingmodule "github.com/lavanet/lava/v4/x/dualstaking"
+	dualstakingmodulekeeper "github.com/lavanet/lava/v4/x/dualstaking/keeper"
+	dualstakingmoduletypes "github.com/lavanet/lava/v4/x/dualstaking/types"
+	epochstoragemodule "github.com/lavanet/lava/v4/x/epochstorage"
+	epochstoragemodulekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper"
+	epochstoragemoduletypes "github.com/lavanet/lava/v4/x/epochstorage/types"
+	pairingmodule "github.com/lavanet/lava/v4/x/pairing"
+	pairingmoduleclient "github.com/lavanet/lava/v4/x/pairing/client"
+	pairingmodulekeeper "github.com/lavanet/lava/v4/x/pairing/keeper"
+	pairingmoduletypes "github.com/lavanet/lava/v4/x/pairing/types"
+	plansmodule "github.com/lavanet/lava/v4/x/plans"
+	plansmoduleclient "github.com/lavanet/lava/v4/x/plans/client"
+	plansmodulekeeper "github.com/lavanet/lava/v4/x/plans/keeper"
+	plansmoduletypes "github.com/lavanet/lava/v4/x/plans/types"
+	projectsmodule "github.com/lavanet/lava/v4/x/projects"
+	projectsmodulekeeper "github.com/lavanet/lava/v4/x/projects/keeper"
+	projectsmoduletypes "github.com/lavanet/lava/v4/x/projects/types"
+	protocolmodule "github.com/lavanet/lava/v4/x/protocol"
+	protocolmoduleclient "github.com/lavanet/lava/v4/x/protocol/client/cli"
+	protocolmodulekeeper "github.com/lavanet/lava/v4/x/protocol/keeper"
+	protocolmoduletypes "github.com/lavanet/lava/v4/x/protocol/types"
+	rewardsmodule "github.com/lavanet/lava/v4/x/rewards"
+	rewardsmoduleclient "github.com/lavanet/lava/v4/x/rewards/client/cli"
+	rewardsmodulekeeper "github.com/lavanet/lava/v4/x/rewards/keeper"
+	rewardsmoduletypes "github.com/lavanet/lava/v4/x/rewards/types"
+	specmodule "github.com/lavanet/lava/v4/x/spec"
+	specmoduleclient "github.com/lavanet/lava/v4/x/spec/client"
+	specmodulekeeper "github.com/lavanet/lava/v4/x/spec/keeper"
+	specmoduletypes "github.com/lavanet/lava/v4/x/spec/types"
+	subscriptionmodule "github.com/lavanet/lava/v4/x/subscription"
+	subscriptionmodulekeeper "github.com/lavanet/lava/v4/x/subscription/keeper"
+	subscriptionmoduletypes "github.com/lavanet/lava/v4/x/subscription/types"
 	"github.com/spf13/cast"
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 )
@@ -166,43 +166,8 @@ const (
 
 // Upgrades add here future upgrades (upgrades.Upgrade)
 var Upgrades = []upgrades.Upgrade{
-	upgrades.Upgrade_0_22_0,
-	upgrades.Upgrade_0_23_0,
-	upgrades.Upgrade_0_23_2,
-	upgrades.Upgrade_0_23_4,
-	upgrades.Upgrade_0_23_5,
-	upgrades.Upgrade_0_24_0,
-	upgrades.Upgrade_0_25_0,
-	upgrades.Upgrade_0_25_1,
-	upgrades.Upgrade_0_25_2,
-	upgrades.Upgrade_0_26_0,
-	upgrades.Upgrade_0_26_1,
-	upgrades.Upgrade_0_26_2,
-	upgrades.Upgrade_0_27_0,
-	upgrades.Upgrade_0_30_0,
-	upgrades.Upgrade_0_30_1,
-	upgrades.Upgrade_0_30_2,
-	upgrades.Upgrade_0_31_0,
-	upgrades.Upgrade_0_31_1,
-	upgrades.Upgrade_0_32_0,
-	upgrades.Upgrade_0_32_3,
-	upgrades.Upgrade_0_33_0,
-	upgrades.Upgrade_0_34_0,
-	upgrades.Upgrade_0_35_0,
-	upgrades.Upgrade_1_0_0,
-	upgrades.Upgrade_1_0_1,
-	upgrades.Upgrade_1_1_0,
-	upgrades.Upgrade_1_2_0,
-	upgrades.Upgrade_2_0_0,
-	upgrades.Upgrade_2_1_0,
-	upgrades.Upgrade_2_1_1,
-	upgrades.Upgrade_2_1_3,
-	upgrades.Upgrade_2_2_0,
-	upgrades.Upgrade_2_4_0,
-	upgrades.Upgrade_2_5_0,
-	upgrades.Upgrade_3_0_0,
-	upgrades.Upgrade_3_0_1,
 	upgrades.Upgrade_3_1_0,
+	upgrades.Upgrade_4_0_0,
 }
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals

app/encoding.go

@@ -6,7 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/std"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 
-	"github.com/lavanet/lava/v3/app/params"
+	"github.com/lavanet/lava/v4/app/params"
 )
 
 // makeEncodingConfig creates an EncodingConfig for an amino based test configuration.

app/keepers/lavaKeepers.go

@@ -20,19 +20,19 @@ import (
 	icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper"
 	ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
-	conflictmodulekeeper "github.com/lavanet/lava/v3/x/conflict/keeper"
-	downtimemodulekeeper "github.com/lavanet/lava/v3/x/downtime/keeper"
-	dualstakingmodulekeeper "github.com/lavanet/lava/v3/x/dualstaking/keeper"
-	epochstoragemodulekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper"
-	fixationkeeper "github.com/lavanet/lava/v3/x/fixationstore/keeper"
-	pairingmodulekeeper "github.com/lavanet/lava/v3/x/pairing/keeper"
-	plansmodulekeeper "github.com/lavanet/lava/v3/x/plans/keeper"
-	projectsmodulekeeper "github.com/lavanet/lava/v3/x/projects/keeper"
-	protocolmodulekeeper "github.com/lavanet/lava/v3/x/protocol/keeper"
-	rewardsmodulekeeper "github.com/lavanet/lava/v3/x/rewards/keeper"
-	specmodulekeeper "github.com/lavanet/lava/v3/x/spec/keeper"
-	subscriptionmodulekeeper "github.com/lavanet/lava/v3/x/subscription/keeper"
-	timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper"
+	conflictmodulekeeper "github.com/lavanet/lava/v4/x/conflict/keeper"
+	downtimemodulekeeper "github.com/lavanet/lava/v4/x/downtime/keeper"
+	dualstakingmodulekeeper "github.com/lavanet/lava/v4/x/dualstaking/keeper"
+	epochstoragemodulekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper"
+	fixationkeeper "github.com/lavanet/lava/v4/x/fixationstore/keeper"
+	pairingmodulekeeper "github.com/lavanet/lava/v4/x/pairing/keeper"
+	plansmodulekeeper "github.com/lavanet/lava/v4/x/plans/keeper"
+	projectsmodulekeeper "github.com/lavanet/lava/v4/x/projects/keeper"
+	protocolmodulekeeper "github.com/lavanet/lava/v4/x/protocol/keeper"
+	rewardsmodulekeeper "github.com/lavanet/lava/v4/x/rewards/keeper"
+	specmodulekeeper "github.com/lavanet/lava/v4/x/spec/keeper"
+	subscriptionmodulekeeper "github.com/lavanet/lava/v4/x/subscription/keeper"
+	timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper"
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 )
 

app/simulation_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	"github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
 	"github.com/cosmos/ibc-go/v7/testing/simapp"
-	"github.com/lavanet/lava/v3/app"
+	"github.com/lavanet/lava/v4/app"
 	"github.com/stretchr/testify/require"
 )