diff --git a/Makefile b/Makefile index 2380521d62..0d813507a1 100644 --- a/Makefile +++ b/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))) diff --git a/app/ante.go b/app/ante.go index 4d8d1933b2..3291f11c59 100644 --- a/app/ante.go +++ b/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 { diff --git a/app/app.go b/app/app.go index 448114bdd4..d219fb6c69 100644 --- a/app/app.go +++ b/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 ) @@ -167,7 +167,8 @@ const ( // Upgrades add here future upgrades (upgrades.Upgrade) var Upgrades = []upgrades.Upgrade{ upgrades.Upgrade_3_1_0, - upgrades.Upgrade_3_2_0, + upgrades.Upgrade_4_0_0, + upgrades.Upgrade_4_1_0, } // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals diff --git a/app/encoding.go b/app/encoding.go index efbddbc411..2e2d4ef0a5 100644 --- a/app/encoding.go +++ b/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. diff --git a/app/keepers/lavaKeepers.go b/app/keepers/lavaKeepers.go index 32a47e57e5..e9e7ff3123 100644 --- a/app/keepers/lavaKeepers.go +++ b/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 ) diff --git a/app/simulation_test.go b/app/simulation_test.go index 8d7e60fb77..73fb5dc02f 100644 --- a/app/simulation_test.go +++ b/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" ) diff --git a/app/upgrades/empty_upgrades.go b/app/upgrades/empty_upgrades.go index a0f05aee56..3cb03b74e0 100644 --- a/app/upgrades/empty_upgrades.go +++ b/app/upgrades/empty_upgrades.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/lavanet/lava/v3/app/keepers" + "github.com/lavanet/lava/v4/app/keepers" ) func defaultUpgradeHandler( @@ -45,3 +45,15 @@ var Upgrade_3_2_0 = Upgrade{ CreateUpgradeHandler: defaultUpgradeHandler, StoreUpgrades: store.StoreUpgrades{}, } + +var Upgrade_4_0_0 = Upgrade{ + UpgradeName: "v4.0.0", + CreateUpgradeHandler: defaultUpgradeHandler, + StoreUpgrades: store.StoreUpgrades{}, +} + +var Upgrade_4_1_0 = Upgrade{ + UpgradeName: "v4.1.0", + CreateUpgradeHandler: defaultUpgradeHandler, + StoreUpgrades: store.StoreUpgrades{}, +} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index ae8bea3dbf..3120ddc6c8 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/lavanet/lava/v3/app/keepers" + "github.com/lavanet/lava/v4/app/keepers" ) type BaseAppParamManager interface { diff --git a/app/upgrades/upgrade_0_35_0.go b/app/upgrades/upgrade_0_35_0.go index c468fe9c27..76ebe64cf6 100644 --- a/app/upgrades/upgrade_0_35_0.go +++ b/app/upgrades/upgrade_0_35_0.go @@ -6,9 +6,9 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gogoproto/proto" ibctypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - "github.com/lavanet/lava/v3/app/keepers" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/app/keepers" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) func v_35_0( diff --git a/cmd/common/warning_log_command_wrapper.go b/cmd/common/warning_log_command_wrapper.go index 277bc107c9..2598fca776 100644 --- a/cmd/common/warning_log_command_wrapper.go +++ b/cmd/common/warning_log_command_wrapper.go @@ -1,7 +1,7 @@ package common import ( - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/spf13/cobra" ) diff --git a/cmd/lavad/cmd/config.go b/cmd/lavad/cmd/config.go index 2e01650e2f..fadda3af4a 100644 --- a/cmd/lavad/cmd/config.go +++ b/cmd/lavad/cmd/config.go @@ -3,7 +3,7 @@ package cmd import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/app" + "github.com/lavanet/lava/v4/app" ) func InitSDKConfig() { diff --git a/cmd/lavad/cmd/root.go b/cmd/lavad/cmd/root.go index c24111464d..24845d6302 100644 --- a/cmd/lavad/cmd/root.go +++ b/cmd/lavad/cmd/root.go @@ -34,17 +34,17 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - cmdcommon "github.com/lavanet/lava/v3/cmd/common" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + cmdcommon "github.com/lavanet/lava/v4/cmd/common" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" "github.com/spf13/cast" "github.com/spf13/cobra" "github.com/spf13/pflag" // this line is used by starport scaffolding # root/moduleImport - "github.com/lavanet/lava/v3/app" - appparams "github.com/lavanet/lava/v3/app/params" + "github.com/lavanet/lava/v4/app" + appparams "github.com/lavanet/lava/v4/app/params" ) // NewRootCmd creates a new root command for a Cosmos SDK application diff --git a/cmd/lavad/main.go b/cmd/lavad/main.go index a1c3488b60..922fc26361 100644 --- a/cmd/lavad/main.go +++ b/cmd/lavad/main.go @@ -8,14 +8,14 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/lavanet/lava/v3/app" - cmdcommon "github.com/lavanet/lava/v3/cmd/common" - "github.com/lavanet/lava/v3/cmd/lavad/cmd" - "github.com/lavanet/lava/v3/protocol/badgegenerator" - "github.com/lavanet/lava/v3/protocol/rpcconsumer" - "github.com/lavanet/lava/v3/protocol/rpcprovider" - "github.com/lavanet/lava/v3/protocol/statetracker" - utilscli "github.com/lavanet/lava/v3/utils/cli" + "github.com/lavanet/lava/v4/app" + cmdcommon "github.com/lavanet/lava/v4/cmd/common" + "github.com/lavanet/lava/v4/cmd/lavad/cmd" + "github.com/lavanet/lava/v4/protocol/badgegenerator" + "github.com/lavanet/lava/v4/protocol/rpcconsumer" + "github.com/lavanet/lava/v4/protocol/rpcprovider" + "github.com/lavanet/lava/v4/protocol/statetracker" + utilscli "github.com/lavanet/lava/v4/utils/cli" "github.com/spf13/cobra" ) diff --git a/cmd/lavap/main.go b/cmd/lavap/main.go index c6eaaba8e0..e57f91651b 100644 --- a/cmd/lavap/main.go +++ b/cmd/lavap/main.go @@ -9,19 +9,19 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/cmd/lavad/cmd" - "github.com/lavanet/lava/v3/ecosystem/cache" - "github.com/lavanet/lava/v3/protocol/badgegenerator" - "github.com/lavanet/lava/v3/protocol/badgeserver" - "github.com/lavanet/lava/v3/protocol/loadtest" - "github.com/lavanet/lava/v3/protocol/monitoring" - "github.com/lavanet/lava/v3/protocol/performance/connection" - validators "github.com/lavanet/lava/v3/protocol/performance/validators" - "github.com/lavanet/lava/v3/protocol/rpcconsumer" - "github.com/lavanet/lava/v3/protocol/rpcprovider" - "github.com/lavanet/lava/v3/protocol/statetracker" - "github.com/lavanet/lava/v3/protocol/upgrade" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/cmd/lavad/cmd" + "github.com/lavanet/lava/v4/ecosystem/cache" + "github.com/lavanet/lava/v4/protocol/badgegenerator" + "github.com/lavanet/lava/v4/protocol/badgeserver" + "github.com/lavanet/lava/v4/protocol/loadtest" + "github.com/lavanet/lava/v4/protocol/monitoring" + "github.com/lavanet/lava/v4/protocol/performance/connection" + validators "github.com/lavanet/lava/v4/protocol/performance/validators" + "github.com/lavanet/lava/v4/protocol/rpcconsumer" + "github.com/lavanet/lava/v4/protocol/rpcprovider" + "github.com/lavanet/lava/v4/protocol/statetracker" + "github.com/lavanet/lava/v4/protocol/upgrade" "github.com/spf13/cobra" ) @@ -73,6 +73,7 @@ func main() { testCmd.AddCommand(connection.CreateTestConnectionServerCobraCommand()) testCmd.AddCommand(connection.CreateTestConnectionProbeCobraCommand()) testCmd.AddCommand(monitoring.CreateHealthCobraCommand()) + testCmd.AddCommand(monitoring.CreateChainHeightsCommand()) testCmd.AddCommand(loadtest.CreateTestLoadCobraCommand()) rootCmd.AddCommand(cache.CreateCacheCobraCommand()) diff --git a/cmd/lavavisor/main.go b/cmd/lavavisor/main.go index ff18141ac2..93895f0b72 100644 --- a/cmd/lavavisor/main.go +++ b/cmd/lavavisor/main.go @@ -6,10 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/cmd/lavad/cmd" - lvcmd "github.com/lavanet/lava/v3/ecosystem/lavavisor/cmd" - "github.com/lavanet/lava/v3/protocol/upgrade" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/cmd/lavad/cmd" + lvcmd "github.com/lavanet/lava/v4/ecosystem/lavavisor/cmd" + "github.com/lavanet/lava/v4/protocol/upgrade" "github.com/spf13/cobra" ) diff --git a/config/provider_examples/strk_example.yml b/config/provider_examples/strk_example.yml new file mode 100644 index 0000000000..111bfaac07 --- /dev/null +++ b/config/provider_examples/strk_example.yml @@ -0,0 +1,17 @@ +endpoints: + - api-interface: jsonrpc + chain-id: STRK + network-address: + address: "127.0.0.1:2220" + node-urls: + - url: /ws + internal-path: "" + - url: /ws/rpc/v0_6 + internal-path: "/rpc/v0_6" + + - url: + internal-path: "" + - url: /rpc/v0_5 + internal-path: "/rpc/v0_5" + - url: /rpc/v0_6 + internal-path: "/rpc/v0_6" diff --git a/cookbook/specs/celestia.json b/cookbook/specs/celestia.json index 1d2f46d6bf..a4117cd787 100644 --- a/cookbook/specs/celestia.json +++ b/cookbook/specs/celestia.json @@ -31,6 +31,132 @@ "add_on": "" }, "apis": [ + { + "name": "/celestia/minfee/v1/min_gas_price", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "/ibc/apps/packetforward/v1/params", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "/celestia/core/v1/tx/{tx_id}", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "/cosmos/mint/v1beta1/inflation_rate", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "/cosmos/mint/v1beta1/genesis_time", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "/signal/v1/tally/{version}", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "/signal/v1/upgrade", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, { "name": "/blob/v1/params", "block_parsing": { @@ -382,6 +508,24 @@ }, "extra_compute_units": 0 }, + { + "name": "celestia.core.v1.tx.Tx/TxStatus", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": false, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, { "name": "celestia.qgb.v1.Query/LatestValsetRequestBeforeNonce", "block_parsing": { @@ -418,6 +562,24 @@ }, "extra_compute_units": 0 }, + { + "name": "packetforward.v1.Query/Params", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, { "name": "celestia.qgb.v1.Query/LatestDataCommitment", "block_parsing": { @@ -454,6 +616,60 @@ }, "extra_compute_units": 0 }, + { + "name": "celestia.signal.v1.Query/GetUpgrade", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "celestia.signal.v1.Query/VersionTally", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "celestia.minfee.v1.Querycelestia.minfee.v1.Query/NetworkMinGasPrice", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, { "name": "celestia.mint.v1.Query/GenesisTime", "block_parsing": { diff --git a/cookbook/specs/lava.json b/cookbook/specs/lava.json index f127039ea4..a833151b52 100644 --- a/cookbook/specs/lava.json +++ b/cookbook/specs/lava.json @@ -1456,6 +1456,42 @@ "stateful": 0 }, "extra_compute_units": 0 + }, + { + "name": "/lavanet/lava/subscription/estimated_provider_rewards/{provider}/{amount_delegator}", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "/lavanet/lava/epochstorage/provider_metadata/{provider}", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 } ], "headers": [], @@ -2888,6 +2924,42 @@ "stateful": 0 }, "extra_compute_units": 0 + }, + { + "name": "lavanet.lava.epochstorage.Query/ProviderMetaData", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "lavanet.lava.subscription.Query/EstimatedProviderRewards", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 } ], "headers": [], diff --git a/cookbook/specs/lava_mainnet.json b/cookbook/specs/lava_mainnet.json index 403bb183d9..465c52cba3 100644 --- a/cookbook/specs/lava_mainnet.json +++ b/cookbook/specs/lava_mainnet.json @@ -1438,6 +1438,42 @@ "stateful": 0 }, "extra_compute_units": 0 + }, + { + "name": "/lavanet/lava/epochstorage/provider_metadata/{provider}", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "/lavanet/lava/subscription/estimated_provider_rewards/{provider}/{amount_delegator}", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 } ], "headers": [], @@ -2852,6 +2888,42 @@ "stateful": 0 }, "extra_compute_units": 0 + }, + { + "name": "lavanet.lava.subscription.Query/EstimatedProviderRewards", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "lavanet.lava.epochstorage.Query/ProviderMetaData", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 } ], "headers": [], diff --git a/cookbook/specs/starknet.json b/cookbook/specs/starknet.json index 567b740a84..651bf0ade8 100644 --- a/cookbook/specs/starknet.json +++ b/cookbook/specs/starknet.json @@ -601,6 +601,87 @@ } ] }, + { + "enabled": false, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "WS-ONLY", + "type": "POST", + "add_on": "" + }, + "apis": [ + { + "name": "pathfinder_subscribe", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 1000, + "enabled": true, + "category": { + "deterministic": false, + "local": true, + "subscription": true, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "pathfinder_unsubscribe", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": false, + "local": true, + "subscription": true, + "stateful": 0 + }, + "extra_compute_units": 0 + } + ], + "parse_directives": [ + { + "function_tag": "SUBSCRIBE", + "api_name": "pathfinder_subscribe" + }, + { + "function_template": "{\"jsonrpc\":\"2.0\",\"method\":\"pathfinder_unsubscribe\",\"params\":[%s],\"id\":1}", + "function_tag": "UNSUBSCRIBE", + "api_name": "pathfinder_unsubscribe" + } + ] + }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/ws", + "type": "POST", + "add_on": "" + }, + "inheritance_apis": [ + { + "api_interface": "jsonrpc", + "internal_path": "", + "type": "POST", + "add_on": "" + }, + { + "api_interface": "jsonrpc", + "internal_path": "WS-ONLY", + "type": "POST", + "add_on": "" + } + ] + }, { "enabled": true, "collection_data": { @@ -635,6 +716,69 @@ } ] }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/ws/rpc/v0_6", + "type": "POST", + "add_on": "" + }, + "inheritance_apis": [ + { + "api_interface": "jsonrpc", + "internal_path": "/rpc/v0_6", + "type": "POST", + "add_on": "" + }, + { + "api_interface": "jsonrpc", + "internal_path": "WS-ONLY", + "type": "POST", + "add_on": "" + } + ] + }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/rpc/v0_7", + "type": "POST", + "add_on": "" + }, + "inheritance_apis": [ + { + "api_interface": "jsonrpc", + "internal_path": "", + "type": "POST", + "add_on": "" + } + ] + }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/ws/rpc/v0_7", + "type": "POST", + "add_on": "" + }, + "inheritance_apis": [ + { + "api_interface": "jsonrpc", + "internal_path": "/rpc/v0_7", + "type": "POST", + "add_on": "" + }, + { + "api_interface": "jsonrpc", + "internal_path": "WS-ONLY", + "type": "POST", + "add_on": "" + } + ] + }, { "enabled": true, "collection_data": { @@ -724,6 +868,93 @@ ] } ] + }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/rpc/pathfinder/v0.1", + "type": "POST", + "add_on": "" + }, + "apis": [ + { + "name": "pathfinder_version", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "pathfinder_getProof", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "pathfinder_getTransactionStatus", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + } + ], + "verifications": [ + { + "name": "enabled", + "parse_directive": { + "function_template": "{\"jsonrpc\":\"2.0\",\"method\":\"pathfinder_version\",\"params\":[],\"id\":1}", + "function_tag": "VERIFICATION", + "result_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "api_name": "pathfinder_version" + }, + "values": [ + { + "expected_value": "*", + "severity": "Warning" + } + ] + } + ] } ] }, @@ -768,6 +999,29 @@ } ] }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/ws", + "type": "POST", + "add_on": "" + }, + "apis": [], + "headers": [], + "inheritance_apis": [], + "parse_directives": [], + "verifications": [ + { + "name": "chain-id", + "values": [ + { + "expected_value": "0x534e5f5345504f4c4941" + } + ] + } + ] + }, { "enabled": true, "collection_data": { @@ -791,6 +1045,29 @@ } ] }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/ws/rpc/v0_6", + "type": "POST", + "add_on": "" + }, + "apis": [], + "headers": [], + "inheritance_apis": [], + "parse_directives": [], + "verifications": [ + { + "name": "chain-id", + "values": [ + { + "expected_value": "0x534e5f5345504f4c4941" + } + ] + } + ] + }, { "enabled": true, "collection_data": { @@ -813,6 +1090,52 @@ ] } ] + }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/rpc/v0_7", + "type": "POST", + "add_on": "" + }, + "apis": [], + "headers": [], + "inheritance_apis": [], + "parse_directives": [], + "verifications": [ + { + "name": "chain-id", + "values": [ + { + "expected_value": "0x534e5f5345504f4c4941" + } + ] + } + ] + }, + { + "enabled": true, + "collection_data": { + "api_interface": "jsonrpc", + "internal_path": "/ws/rpc/v0_7", + "type": "POST", + "add_on": "" + }, + "apis": [], + "headers": [], + "inheritance_apis": [], + "parse_directives": [], + "verifications": [ + { + "name": "chain-id", + "values": [ + { + "expected_value": "0x534e5f5345504f4c4941" + } + ] + } + ] } ] } diff --git a/cookbook/specs/tendermint.json b/cookbook/specs/tendermint.json index 3472a379f8..f47eb69b0e 100644 --- a/cookbook/specs/tendermint.json +++ b/cookbook/specs/tendermint.json @@ -573,6 +573,45 @@ "stateful": 0 }, "extra_compute_units": 0 + }, + { + "name": "header", + "block_parsing": { + "parser_arg": [ + "height", + "=", + "0" + ], + "parser_func": "PARSE_DICTIONARY_OR_ORDERED", + "default_value": "latest" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 + }, + { + "name": "header_by_hash", + "block_parsing": { + "parser_arg": [ + "latest" + ], + "parser_func": "DEFAULT" + }, + "compute_units": 10, + "enabled": true, + "category": { + "deterministic": true, + "local": false, + "subscription": false, + "stateful": 0 + }, + "extra_compute_units": 0 } ], "headers": [], diff --git a/ecosystem/cache/cache_test.go b/ecosystem/cache/cache_test.go index f65ccbfee2..e274628c16 100644 --- a/ecosystem/cache/cache_test.go +++ b/ecosystem/cache/cache_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/ecosystem/cache" - "github.com/lavanet/lava/v3/ecosystem/cache/format" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/ecosystem/cache" + "github.com/lavanet/lava/v4/ecosystem/cache/format" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" "github.com/tidwall/gjson" ) diff --git a/ecosystem/cache/command.go b/ecosystem/cache/command.go index ae95ff35dc..5742d8ec0e 100644 --- a/ecosystem/cache/command.go +++ b/ecosystem/cache/command.go @@ -3,7 +3,7 @@ package cache import ( "context" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/rs/zerolog" "github.com/spf13/cobra" ) diff --git a/ecosystem/cache/format/formatter.go b/ecosystem/cache/format/formatter.go index ec84b0281c..9689ad2bb7 100644 --- a/ecosystem/cache/format/formatter.go +++ b/ecosystem/cache/format/formatter.go @@ -1,7 +1,7 @@ package format import ( - spectypes "github.com/lavanet/lava/v3/x/spec/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) // input formatter works on the input data diff --git a/ecosystem/cache/format/formatter_test.go b/ecosystem/cache/format/formatter_test.go index 8672a5e412..5877a54662 100644 --- a/ecosystem/cache/format/formatter_test.go +++ b/ecosystem/cache/format/formatter_test.go @@ -3,7 +3,7 @@ package format import ( "testing" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/ecosystem/cache/format/jsonrpc.go b/ecosystem/cache/format/jsonrpc.go index f01a363ba9..4d22c8f01c 100644 --- a/ecosystem/cache/format/jsonrpc.go +++ b/ecosystem/cache/format/jsonrpc.go @@ -3,7 +3,7 @@ package format import ( "encoding/json" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/tidwall/gjson" "github.com/tidwall/sjson" ) diff --git a/ecosystem/cache/handlers.go b/ecosystem/cache/handlers.go index c3f09ab260..248225c168 100644 --- a/ecosystem/cache/handlers.go +++ b/ecosystem/cache/handlers.go @@ -13,12 +13,12 @@ import ( sdkerrors "cosmossdk.io/errors" "github.com/dgraph-io/ristretto" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/ecosystem/cache/metrics.go b/ecosystem/cache/metrics.go index 5f716f1536..0effe943ca 100644 --- a/ecosystem/cache/metrics.go +++ b/ecosystem/cache/metrics.go @@ -4,8 +4,8 @@ import ( "net/http" "sync" - "github.com/lavanet/lava/v3/utils" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/ecosystem/cache/server.go b/ecosystem/cache/server.go index fd867b303c..73e9037902 100644 --- a/ecosystem/cache/server.go +++ b/ecosystem/cache/server.go @@ -11,13 +11,13 @@ import ( "syscall" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/utils/lavaslices" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/utils/lavaslices" "github.com/dgraph-io/ristretto" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/pflag" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" diff --git a/ecosystem/lavavisor/cmd/create-service.go b/ecosystem/lavavisor/cmd/create-service.go index b37aa7729a..d72e08a3d0 100644 --- a/ecosystem/lavavisor/cmd/create-service.go +++ b/ecosystem/lavavisor/cmd/create-service.go @@ -9,12 +9,12 @@ import ( "strings" "github.com/cosmos/cosmos-sdk/client/flags" - processmanager "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/process" - lvutil "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/util" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" + processmanager "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/process" + lvutil "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/util" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/ecosystem/lavavisor/cmd/init.go b/ecosystem/lavavisor/cmd/init.go index 9b245e9552..8c38b669a0 100644 --- a/ecosystem/lavavisor/cmd/init.go +++ b/ecosystem/lavavisor/cmd/init.go @@ -7,11 +7,11 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/app" - processmanager "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/process" - lvstatetracker "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/state" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/app" + processmanager "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/process" + lvstatetracker "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/state" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/utils" "github.com/spf13/cobra" ) diff --git a/ecosystem/lavavisor/cmd/pod.go b/ecosystem/lavavisor/cmd/pod.go index 0293b5db60..320f0328d3 100644 --- a/ecosystem/lavavisor/cmd/pod.go +++ b/ecosystem/lavavisor/cmd/pod.go @@ -8,12 +8,12 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/app" - processmanager "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/process" - lvstatetracker "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/state" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/app" + processmanager "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/process" + lvstatetracker "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/state" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" "github.com/spf13/cobra" ) diff --git a/ecosystem/lavavisor/cmd/start.go b/ecosystem/lavavisor/cmd/start.go index b9f53c498f..7533a24e97 100644 --- a/ecosystem/lavavisor/cmd/start.go +++ b/ecosystem/lavavisor/cmd/start.go @@ -14,16 +14,16 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/app" - processmanager "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/process" - lvstatetracker "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/state" - lvutil "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/util" - "github.com/lavanet/lava/v3/utils/rand" - - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/app" + processmanager "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/process" + lvstatetracker "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/state" + lvutil "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/util" + "github.com/lavanet/lava/v4/utils/rand" + + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" "github.com/spf13/cobra" "gopkg.in/yaml.v2" ) diff --git a/ecosystem/lavavisor/cmd/wrap.go b/ecosystem/lavavisor/cmd/wrap.go index 3787ede0bb..f817a94d02 100644 --- a/ecosystem/lavavisor/cmd/wrap.go +++ b/ecosystem/lavavisor/cmd/wrap.go @@ -8,12 +8,12 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/app" - processmanager "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/process" - lvstatetracker "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/state" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/app" + processmanager "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/process" + lvstatetracker "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/state" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/ecosystem/lavavisor/pkg/process/fetcher.go b/ecosystem/lavavisor/pkg/process/fetcher.go index c209d2f114..8846f28b09 100644 --- a/ecosystem/lavavisor/pkg/process/fetcher.go +++ b/ecosystem/lavavisor/pkg/process/fetcher.go @@ -10,9 +10,9 @@ import ( "runtime" "strings" - lvutil "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/util" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + lvutil "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/util" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) type ProtocolBinaryFetcher struct { diff --git a/ecosystem/lavavisor/pkg/process/fetcher_without_build.go b/ecosystem/lavavisor/pkg/process/fetcher_without_build.go index 2b066e968d..3eddc5896c 100644 --- a/ecosystem/lavavisor/pkg/process/fetcher_without_build.go +++ b/ecosystem/lavavisor/pkg/process/fetcher_without_build.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - lvutil "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/util" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + lvutil "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/util" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) type ProtocolBinaryFetcherWithoutBuild struct { diff --git a/ecosystem/lavavisor/pkg/process/linker.go b/ecosystem/lavavisor/pkg/process/linker.go index a456089821..122c3fc809 100644 --- a/ecosystem/lavavisor/pkg/process/linker.go +++ b/ecosystem/lavavisor/pkg/process/linker.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) // TODOs: diff --git a/ecosystem/lavavisor/pkg/process/process_manager.go b/ecosystem/lavavisor/pkg/process/process_manager.go index 59eb3d398f..240f0a7ebf 100644 --- a/ecosystem/lavavisor/pkg/process/process_manager.go +++ b/ecosystem/lavavisor/pkg/process/process_manager.go @@ -7,9 +7,9 @@ import ( "os/user" "strings" - protocolVersion "github.com/lavanet/lava/v3/protocol/upgrade" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + protocolVersion "github.com/lavanet/lava/v4/protocol/upgrade" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) func ReloadDaemon() error { diff --git a/ecosystem/lavavisor/pkg/process/version_monitor.go b/ecosystem/lavavisor/pkg/process/version_monitor.go index dca8941d54..417327925d 100644 --- a/ecosystem/lavavisor/pkg/process/version_monitor.go +++ b/ecosystem/lavavisor/pkg/process/version_monitor.go @@ -12,10 +12,10 @@ import ( "syscall" "time" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) type ProtocolBinaryFetcherInf interface { diff --git a/ecosystem/lavavisor/pkg/state/lavavisor_state_tracker.go b/ecosystem/lavavisor/pkg/state/lavavisor_state_tracker.go index 935ca00f4c..b460d47b5e 100644 --- a/ecosystem/lavavisor/pkg/state/lavavisor_state_tracker.go +++ b/ecosystem/lavavisor/pkg/state/lavavisor_state_tracker.go @@ -6,12 +6,12 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/statetracker" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/statetracker" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) // Lava visor doesn't require complicated state tracker, it just needs to periodically fetch the protocol version. diff --git a/ecosystem/lavavisor/pkg/util/common.go b/ecosystem/lavavisor/pkg/util/common.go index bcc0b443ff..3cbc41fae1 100644 --- a/ecosystem/lavavisor/pkg/util/common.go +++ b/ecosystem/lavavisor/pkg/util/common.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) func ExpandTilde(path string) (string, error) { diff --git a/go.mod b/go.mod index 82fc25f95b..0bf47fc345 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/lavanet/lava/v3 +module github.com/lavanet/lava/v4 go 1.20 diff --git a/proto/lavanet/lava/conflict/conflict_data.proto b/proto/lavanet/lava/conflict/conflict_data.proto index a15fba9517..7e8f3a5fb9 100644 --- a/proto/lavanet/lava/conflict/conflict_data.proto +++ b/proto/lavanet/lava/conflict/conflict_data.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.conflict; -option go_package = "github.com/lavanet/lava/v3/x/conflict/types"; +option go_package = "github.com/lavanet/lava/v4/x/conflict/types"; import "gogoproto/gogo.proto"; import "lavanet/lava/pairing/relay.proto"; diff --git a/proto/lavanet/lava/conflict/conflict_vote.proto b/proto/lavanet/lava/conflict/conflict_vote.proto index b8a987b5c7..0ab7e767a6 100644 --- a/proto/lavanet/lava/conflict/conflict_vote.proto +++ b/proto/lavanet/lava/conflict/conflict_vote.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.conflict; -option go_package = "github.com/lavanet/lava/v3/x/conflict/types"; +option go_package = "github.com/lavanet/lava/v4/x/conflict/types"; import "gogoproto/gogo.proto"; message Provider { diff --git a/proto/lavanet/lava/conflict/genesis.proto b/proto/lavanet/lava/conflict/genesis.proto index 8f23c09249..f33663387e 100644 --- a/proto/lavanet/lava/conflict/genesis.proto +++ b/proto/lavanet/lava/conflict/genesis.proto @@ -6,7 +6,7 @@ import "lavanet/lava/conflict/params.proto"; import "lavanet/lava/conflict/conflict_vote.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/conflict/types"; +option go_package = "github.com/lavanet/lava/v4/x/conflict/types"; // GenesisState defines the conflict module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/conflict/params.proto b/proto/lavanet/lava/conflict/params.proto index 1c72ac1f73..3b0193eba2 100644 --- a/proto/lavanet/lava/conflict/params.proto +++ b/proto/lavanet/lava/conflict/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.conflict; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/conflict/types"; +option go_package = "github.com/lavanet/lava/v4/x/conflict/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/conflict/query.proto b/proto/lavanet/lava/conflict/query.proto index 981464852f..be1e7bd62d 100644 --- a/proto/lavanet/lava/conflict/query.proto +++ b/proto/lavanet/lava/conflict/query.proto @@ -8,7 +8,7 @@ import "lavanet/lava/conflict/conflict_vote.proto"; // this line is used by starport scaffolding # 1 import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/conflict/types"; +option go_package = "github.com/lavanet/lava/v4/x/conflict/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/conflict/tx.proto b/proto/lavanet/lava/conflict/tx.proto index 275283d6b3..3fd86dcc8b 100644 --- a/proto/lavanet/lava/conflict/tx.proto +++ b/proto/lavanet/lava/conflict/tx.proto @@ -6,7 +6,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "lavanet/lava/conflict/conflict_data.proto"; -option go_package = "github.com/lavanet/lava/v3/x/conflict/types"; +option go_package = "github.com/lavanet/lava/v4/x/conflict/types"; // Msg defines the Msg service. diff --git a/proto/lavanet/lava/downtime/v1/downtime.proto b/proto/lavanet/lava/downtime/v1/downtime.proto index a38fc4d948..9a1e961f5a 100644 --- a/proto/lavanet/lava/downtime/v1/downtime.proto +++ b/proto/lavanet/lava/downtime/v1/downtime.proto @@ -2,7 +2,7 @@ syntax="proto3"; package lavanet.lava.downtime.v1; -option go_package = "github.com/lavanet/lava/v3/x/downtime/v1"; +option go_package = "github.com/lavanet/lava/v4/x/downtime/v1"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/lavanet/lava/downtime/v1/genesis.proto b/proto/lavanet/lava/downtime/v1/genesis.proto index cce5ce9c60..05b665a40e 100644 --- a/proto/lavanet/lava/downtime/v1/genesis.proto +++ b/proto/lavanet/lava/downtime/v1/genesis.proto @@ -2,7 +2,7 @@ syntax="proto3"; package lavanet.lava.downtime.v1; -option go_package = "github.com/lavanet/lava/v3/x/downtime/v1"; +option go_package = "github.com/lavanet/lava/v4/x/downtime/v1"; import "lavanet/lava/downtime/v1/downtime.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/lavanet/lava/downtime/v1/query.proto b/proto/lavanet/lava/downtime/v1/query.proto index a868c1ee9d..f456f2058e 100644 --- a/proto/lavanet/lava/downtime/v1/query.proto +++ b/proto/lavanet/lava/downtime/v1/query.proto @@ -2,7 +2,7 @@ syntax="proto3"; package lavanet.lava.downtime.v1; -option go_package = "github.com/lavanet/lava/v3/x/downtime/v1"; +option go_package = "github.com/lavanet/lava/v4/x/downtime/v1"; import "google/protobuf/duration.proto"; import "lavanet/lava/downtime/v1/downtime.proto"; diff --git a/proto/lavanet/lava/dualstaking/delegate.proto b/proto/lavanet/lava/dualstaking/delegate.proto index 8926254f89..70761df8ea 100644 --- a/proto/lavanet/lava/dualstaking/delegate.proto +++ b/proto/lavanet/lava/dualstaking/delegate.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.dualstaking; -option go_package = "github.com/lavanet/lava/v3/x/dualstaking/types"; +option go_package = "github.com/lavanet/lava/v4/x/dualstaking/types"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/lavanet/lava/dualstaking/delegator_reward.proto b/proto/lavanet/lava/dualstaking/delegator_reward.proto index c48be80aa6..3d77a8f2c1 100644 --- a/proto/lavanet/lava/dualstaking/delegator_reward.proto +++ b/proto/lavanet/lava/dualstaking/delegator_reward.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.dualstaking; -option go_package = "github.com/lavanet/lava/v3/x/dualstaking/types"; +option go_package = "github.com/lavanet/lava/v4/x/dualstaking/types"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/lavanet/lava/dualstaking/genesis.proto b/proto/lavanet/lava/dualstaking/genesis.proto index 1c37aac064..2498802909 100644 --- a/proto/lavanet/lava/dualstaking/genesis.proto +++ b/proto/lavanet/lava/dualstaking/genesis.proto @@ -6,7 +6,7 @@ import "lavanet/lava/dualstaking/params.proto"; import "lavanet/lava/dualstaking/delegator_reward.proto"; import "lavanet/lava/dualstaking/delegate.proto"; -option go_package = "github.com/lavanet/lava/v3/x/dualstaking/types"; +option go_package = "github.com/lavanet/lava/v4/x/dualstaking/types"; // GenesisState defines the dualstaking module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/dualstaking/params.proto b/proto/lavanet/lava/dualstaking/params.proto index e1e1743c2d..3284720e82 100644 --- a/proto/lavanet/lava/dualstaking/params.proto +++ b/proto/lavanet/lava/dualstaking/params.proto @@ -4,7 +4,7 @@ package lavanet.lava.dualstaking; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/lavanet/lava/v3/x/dualstaking/types"; +option go_package = "github.com/lavanet/lava/v4/x/dualstaking/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/dualstaking/query.proto b/proto/lavanet/lava/dualstaking/query.proto index a0892a84f3..a4ee622253 100644 --- a/proto/lavanet/lava/dualstaking/query.proto +++ b/proto/lavanet/lava/dualstaking/query.proto @@ -8,7 +8,7 @@ import "lavanet/lava/dualstaking/params.proto"; import "lavanet/lava/dualstaking/delegate.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/lavanet/lava/v3/x/dualstaking/types"; +option go_package = "github.com/lavanet/lava/v4/x/dualstaking/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/dualstaking/tx.proto b/proto/lavanet/lava/dualstaking/tx.proto index c336515085..cf54420366 100644 --- a/proto/lavanet/lava/dualstaking/tx.proto +++ b/proto/lavanet/lava/dualstaking/tx.proto @@ -5,7 +5,7 @@ import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/dualstaking/types"; +option go_package = "github.com/lavanet/lava/v4/x/dualstaking/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/epochstorage/endpoint.proto b/proto/lavanet/lava/epochstorage/endpoint.proto index 4becb06744..c388066284 100644 --- a/proto/lavanet/lava/epochstorage/endpoint.proto +++ b/proto/lavanet/lava/epochstorage/endpoint.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.epochstorage; -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; message Endpoint { string iPPORT = 1; diff --git a/proto/lavanet/lava/epochstorage/epoch_details.proto b/proto/lavanet/lava/epochstorage/epoch_details.proto index ce17f3d7b0..84655f4d22 100644 --- a/proto/lavanet/lava/epochstorage/epoch_details.proto +++ b/proto/lavanet/lava/epochstorage/epoch_details.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.epochstorage; -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; message EpochDetails { uint64 startBlock = 1; diff --git a/proto/lavanet/lava/epochstorage/fixated_params.proto b/proto/lavanet/lava/epochstorage/fixated_params.proto index 1219e73588..3b74569998 100644 --- a/proto/lavanet/lava/epochstorage/fixated_params.proto +++ b/proto/lavanet/lava/epochstorage/fixated_params.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.epochstorage; -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; import "gogoproto/gogo.proto"; import "lavanet/lava/epochstorage/params.proto"; diff --git a/proto/lavanet/lava/epochstorage/genesis.proto b/proto/lavanet/lava/epochstorage/genesis.proto index 24887b662a..2058ca96db 100644 --- a/proto/lavanet/lava/epochstorage/genesis.proto +++ b/proto/lavanet/lava/epochstorage/genesis.proto @@ -8,7 +8,7 @@ import "lavanet/lava/epochstorage/epoch_details.proto"; import "lavanet/lava/epochstorage/fixated_params.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; // GenesisState defines the epochstorage module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/epochstorage/params.proto b/proto/lavanet/lava/epochstorage/params.proto index ba0125cfe2..35e4d9a6b2 100644 --- a/proto/lavanet/lava/epochstorage/params.proto +++ b/proto/lavanet/lava/epochstorage/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.epochstorage; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/epochstorage/provider_metadata.proto b/proto/lavanet/lava/epochstorage/provider_metadata.proto index 449c3989ac..44c6c1c7b3 100644 --- a/proto/lavanet/lava/epochstorage/provider_metadata.proto +++ b/proto/lavanet/lava/epochstorage/provider_metadata.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.epochstorage; -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "amino/amino.proto"; diff --git a/proto/lavanet/lava/epochstorage/query.proto b/proto/lavanet/lava/epochstorage/query.proto index 8598ce9ec0..343f49e013 100644 --- a/proto/lavanet/lava/epochstorage/query.proto +++ b/proto/lavanet/lava/epochstorage/query.proto @@ -12,7 +12,7 @@ import "lavanet/lava/epochstorage/provider_metadata.proto"; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/epochstorage/stake_entry.proto b/proto/lavanet/lava/epochstorage/stake_entry.proto index 999ab14af8..ab3763165f 100644 --- a/proto/lavanet/lava/epochstorage/stake_entry.proto +++ b/proto/lavanet/lava/epochstorage/stake_entry.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.epochstorage; -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; import "lavanet/lava/epochstorage/endpoint.proto"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/lavanet/lava/epochstorage/stake_storage.proto b/proto/lavanet/lava/epochstorage/stake_storage.proto index df52ff7f15..d9c77adaa3 100644 --- a/proto/lavanet/lava/epochstorage/stake_storage.proto +++ b/proto/lavanet/lava/epochstorage/stake_storage.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.epochstorage; -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; import "lavanet/lava/epochstorage/stake_entry.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/lavanet/lava/epochstorage/tx.proto b/proto/lavanet/lava/epochstorage/tx.proto index 0ec83063a6..fb68023d26 100644 --- a/proto/lavanet/lava/epochstorage/tx.proto +++ b/proto/lavanet/lava/epochstorage/tx.proto @@ -3,7 +3,7 @@ package lavanet.lava.epochstorage; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/lavanet/lava/v3/x/epochstorage/types"; +option go_package = "github.com/lavanet/lava/v4/x/epochstorage/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/fixationstore/fixation.proto b/proto/lavanet/lava/fixationstore/fixation.proto index d818ffcef9..9de50af4d2 100644 --- a/proto/lavanet/lava/fixationstore/fixation.proto +++ b/proto/lavanet/lava/fixationstore/fixation.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.fixationstore; -option go_package = "github.com/lavanet/lava/v3/x/fixationstore/types"; +option go_package = "github.com/lavanet/lava/v4/x/fixationstore/types"; import "gogoproto/gogo.proto"; import "lavanet/lava/timerstore/timer.proto"; diff --git a/proto/lavanet/lava/fixationstore/query.proto b/proto/lavanet/lava/fixationstore/query.proto index ed18f49a1b..9c7d2338a3 100644 --- a/proto/lavanet/lava/fixationstore/query.proto +++ b/proto/lavanet/lava/fixationstore/query.proto @@ -3,7 +3,7 @@ package lavanet.lava.fixationstore; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/lavanet/lava/v3/x/fixationstore/types"; +option go_package = "github.com/lavanet/lava/v4/x/fixationstore/types"; import "lavanet/lava/fixationstore/fixation.proto"; diff --git a/proto/lavanet/lava/pairing/account_info.proto b/proto/lavanet/lava/pairing/account_info.proto index 2167c19f20..5c12bac236 100644 --- a/proto/lavanet/lava/pairing/account_info.proto +++ b/proto/lavanet/lava/pairing/account_info.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.pairing; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; import "gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; diff --git a/proto/lavanet/lava/pairing/badges.proto b/proto/lavanet/lava/pairing/badges.proto index 04d1ec5e08..5ae429813e 100644 --- a/proto/lavanet/lava/pairing/badges.proto +++ b/proto/lavanet/lava/pairing/badges.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.pairing; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; import "lavanet/lava/pairing/relay.proto"; import "lavanet/lava/pairing/query.proto"; diff --git a/proto/lavanet/lava/pairing/debug_query.proto b/proto/lavanet/lava/pairing/debug_query.proto index 07cd88fd80..74ee82485b 100644 --- a/proto/lavanet/lava/pairing/debug_query.proto +++ b/proto/lavanet/lava/pairing/debug_query.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.pairing; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; import "gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; diff --git a/proto/lavanet/lava/pairing/epoch_cu.proto b/proto/lavanet/lava/pairing/epoch_cu.proto index 300d0009af..827d5b10ec 100644 --- a/proto/lavanet/lava/pairing/epoch_cu.proto +++ b/proto/lavanet/lava/pairing/epoch_cu.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.pairing; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; // UniqueEpochSession is used to detect double spend attacks // It's kept in a epoch-prefixed store with a unique index: provider, project ID, chain ID and session ID diff --git a/proto/lavanet/lava/pairing/genesis.proto b/proto/lavanet/lava/pairing/genesis.proto index f514d7f4d7..5d6ba2868b 100644 --- a/proto/lavanet/lava/pairing/genesis.proto +++ b/proto/lavanet/lava/pairing/genesis.proto @@ -9,7 +9,7 @@ import "lavanet/lava/timerstore/timer.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; message BadgeUsedCu { bytes badge_used_cu_key = 1; diff --git a/proto/lavanet/lava/pairing/params.proto b/proto/lavanet/lava/pairing/params.proto index 2558297ee2..efb0e9c5af 100644 --- a/proto/lavanet/lava/pairing/params.proto +++ b/proto/lavanet/lava/pairing/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.pairing; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/pairing/query.proto b/proto/lavanet/lava/pairing/query.proto index 63f4b897e9..0f806dd49e 100644 --- a/proto/lavanet/lava/pairing/query.proto +++ b/proto/lavanet/lava/pairing/query.proto @@ -15,7 +15,7 @@ import "lavanet/lava/subscription/subscription.proto"; import "lavanet/lava/projects/project.proto"; import "lavanet/lava/downtime/v1/downtime.proto"; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/pairing/relay.proto b/proto/lavanet/lava/pairing/relay.proto index e0a93038a4..a74bd761ee 100644 --- a/proto/lavanet/lava/pairing/relay.proto +++ b/proto/lavanet/lava/pairing/relay.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.pairing; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; import "gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; diff --git a/proto/lavanet/lava/pairing/relayCache.proto b/proto/lavanet/lava/pairing/relayCache.proto index 7ac885d2b4..c6f2686f96 100644 --- a/proto/lavanet/lava/pairing/relayCache.proto +++ b/proto/lavanet/lava/pairing/relayCache.proto @@ -4,7 +4,7 @@ import "gogoproto/gogo.proto"; import "lavanet/lava/pairing/relay.proto"; import "google/protobuf/empty.proto"; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; service RelayerCache { rpc GetRelay (RelayCacheGet) returns (CacheRelayReply) {} diff --git a/proto/lavanet/lava/pairing/tx.proto b/proto/lavanet/lava/pairing/tx.proto index 987f3805ab..6392d65ff8 100644 --- a/proto/lavanet/lava/pairing/tx.proto +++ b/proto/lavanet/lava/pairing/tx.proto @@ -8,7 +8,7 @@ import "lavanet/lava/pairing/relay.proto"; import "cosmos/staking/v1beta1/staking.proto"; import "amino/amino.proto"; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/pairing/unstake_proposal.proto b/proto/lavanet/lava/pairing/unstake_proposal.proto index a34c0de8b5..dc72c9d429 100644 --- a/proto/lavanet/lava/pairing/unstake_proposal.proto +++ b/proto/lavanet/lava/pairing/unstake_proposal.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.pairing; -option go_package = "github.com/lavanet/lava/v3/x/pairing/types"; +option go_package = "github.com/lavanet/lava/v4/x/pairing/types"; import "gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; diff --git a/proto/lavanet/lava/plans/genesis.proto b/proto/lavanet/lava/plans/genesis.proto index ef2153d09f..109ddd76bf 100644 --- a/proto/lavanet/lava/plans/genesis.proto +++ b/proto/lavanet/lava/plans/genesis.proto @@ -6,7 +6,7 @@ import "lavanet/lava/plans/params.proto"; import "lavanet/lava/fixationstore/fixation.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/plans/types"; +option go_package = "github.com/lavanet/lava/v4/x/plans/types"; // GenesisState defines the plan module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/plans/params.proto b/proto/lavanet/lava/plans/params.proto index a2af3ed1fd..7d32961307 100644 --- a/proto/lavanet/lava/plans/params.proto +++ b/proto/lavanet/lava/plans/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.plans; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/plans/types"; +option go_package = "github.com/lavanet/lava/v4/x/plans/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/plans/plan.proto b/proto/lavanet/lava/plans/plan.proto index 41a51bc72a..868ce19be6 100644 --- a/proto/lavanet/lava/plans/plan.proto +++ b/proto/lavanet/lava/plans/plan.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.plans; -option go_package = "github.com/lavanet/lava/v3/x/plans/types"; +option go_package = "github.com/lavanet/lava/v4/x/plans/types"; option (gogoproto.equal_all) = true; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/lavanet/lava/plans/plans_proposal.proto b/proto/lavanet/lava/plans/plans_proposal.proto index 1d2b0153b0..0e5749c4b4 100644 --- a/proto/lavanet/lava/plans/plans_proposal.proto +++ b/proto/lavanet/lava/plans/plans_proposal.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.plans; -option go_package = "github.com/lavanet/lava/v3/x/plans/types"; +option go_package = "github.com/lavanet/lava/v4/x/plans/types"; option (gogoproto.equal_all) = true; import "gogoproto/gogo.proto"; diff --git a/proto/lavanet/lava/plans/policy.proto b/proto/lavanet/lava/plans/policy.proto index 9288633c3b..21fc9fe440 100644 --- a/proto/lavanet/lava/plans/policy.proto +++ b/proto/lavanet/lava/plans/policy.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.plans; -option go_package = "github.com/lavanet/lava/v3/x/plans/types"; +option go_package = "github.com/lavanet/lava/v4/x/plans/types"; option (gogoproto.equal_all) = true; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/lavanet/lava/plans/query.proto b/proto/lavanet/lava/plans/query.proto index e5d9c0c8f0..d4b04085fd 100644 --- a/proto/lavanet/lava/plans/query.proto +++ b/proto/lavanet/lava/plans/query.proto @@ -9,7 +9,7 @@ import "lavanet/lava/plans/params.proto"; import "cosmos/base/v1beta1/coin.proto"; import "lavanet/lava/plans/plan.proto"; -option go_package = "github.com/lavanet/lava/v3/x/plans/types"; +option go_package = "github.com/lavanet/lava/v4/x/plans/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/plans/tx.proto b/proto/lavanet/lava/plans/tx.proto index 43a079719f..3e8dc0dd31 100644 --- a/proto/lavanet/lava/plans/tx.proto +++ b/proto/lavanet/lava/plans/tx.proto @@ -3,7 +3,7 @@ package lavanet.lava.plans; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/lavanet/lava/v3/x/plans/types"; +option go_package = "github.com/lavanet/lava/v4/x/plans/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/projects/genesis.proto b/proto/lavanet/lava/projects/genesis.proto index a4098366c1..7b7c629c09 100644 --- a/proto/lavanet/lava/projects/genesis.proto +++ b/proto/lavanet/lava/projects/genesis.proto @@ -6,7 +6,7 @@ import "lavanet/lava/projects/params.proto"; import "lavanet/lava/fixationstore/fixation.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/projects/types"; +option go_package = "github.com/lavanet/lava/v4/x/projects/types"; // GenesisState defines the projects module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/projects/params.proto b/proto/lavanet/lava/projects/params.proto index 6bd65e4228..377df458e6 100644 --- a/proto/lavanet/lava/projects/params.proto +++ b/proto/lavanet/lava/projects/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.projects; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/projects/types"; +option go_package = "github.com/lavanet/lava/v4/x/projects/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/projects/project.proto b/proto/lavanet/lava/projects/project.proto index 36439a0327..509d266b25 100644 --- a/proto/lavanet/lava/projects/project.proto +++ b/proto/lavanet/lava/projects/project.proto @@ -4,7 +4,7 @@ package lavanet.lava.projects; import "gogoproto/gogo.proto"; import "lavanet/lava/plans/policy.proto"; option (gogoproto.equal_all) = true; -option go_package = "github.com/lavanet/lava/v3/x/projects/types"; +option go_package = "github.com/lavanet/lava/v4/x/projects/types"; message Project { string index = 1; // unique id that will be the combination of subscription address and project name, cannot be changed once created diff --git a/proto/lavanet/lava/projects/query.proto b/proto/lavanet/lava/projects/query.proto index ed9612be1c..fd3e6ed45b 100644 --- a/proto/lavanet/lava/projects/query.proto +++ b/proto/lavanet/lava/projects/query.proto @@ -7,7 +7,7 @@ import "lavanet/lava/projects/params.proto"; import "lavanet/lava/projects/project.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/lavanet/lava/v3/x/projects/types"; +option go_package = "github.com/lavanet/lava/v4/x/projects/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/projects/tx.proto b/proto/lavanet/lava/projects/tx.proto index ae1ec4ac00..e3fec5cb1f 100644 --- a/proto/lavanet/lava/projects/tx.proto +++ b/proto/lavanet/lava/projects/tx.proto @@ -8,7 +8,7 @@ import "gogoproto/gogo.proto"; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/lavanet/lava/v3/x/projects/types"; +option go_package = "github.com/lavanet/lava/v4/x/projects/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/protocol/genesis.proto b/proto/lavanet/lava/protocol/genesis.proto index 635fe4bfc6..d77e54ceec 100644 --- a/proto/lavanet/lava/protocol/genesis.proto +++ b/proto/lavanet/lava/protocol/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "lavanet/lava/protocol/params.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/protocol/types"; +option go_package = "github.com/lavanet/lava/v4/x/protocol/types"; // GenesisState defines the protocol module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/protocol/params.proto b/proto/lavanet/lava/protocol/params.proto index 4ab0f5fb11..31b7d358f2 100644 --- a/proto/lavanet/lava/protocol/params.proto +++ b/proto/lavanet/lava/protocol/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.protocol; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/protocol/types"; +option go_package = "github.com/lavanet/lava/v4/x/protocol/types"; // Params defines the parameters for the module. message Version { diff --git a/proto/lavanet/lava/protocol/query.proto b/proto/lavanet/lava/protocol/query.proto index 169ed783d7..ed4bb864f1 100644 --- a/proto/lavanet/lava/protocol/query.proto +++ b/proto/lavanet/lava/protocol/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "lavanet/lava/protocol/params.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/lavanet/lava/v3/x/protocol/types"; +option go_package = "github.com/lavanet/lava/v4/x/protocol/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/protocol/tx.proto b/proto/lavanet/lava/protocol/tx.proto index 3f819e92f1..4b0067332a 100644 --- a/proto/lavanet/lava/protocol/tx.proto +++ b/proto/lavanet/lava/protocol/tx.proto @@ -4,7 +4,7 @@ import "amino/amino.proto"; // this line is used by starport scaffolding # proto/tx/import import "lavanet/lava/protocol/params.proto"; -option go_package = "github.com/lavanet/lava/v3/x/protocol/types"; +option go_package = "github.com/lavanet/lava/v4/x/protocol/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/rewards/base_pay.proto b/proto/lavanet/lava/rewards/base_pay.proto index f6d48d7e57..ec07185330 100644 --- a/proto/lavanet/lava/rewards/base_pay.proto +++ b/proto/lavanet/lava/rewards/base_pay.proto @@ -6,7 +6,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/rewards/types"; +option go_package = "github.com/lavanet/lava/v4/x/rewards/types"; // aggregated rewards for the provider through out the month message BasePay { diff --git a/proto/lavanet/lava/rewards/genesis.proto b/proto/lavanet/lava/rewards/genesis.proto index a03eca36d1..c07b1a7ff4 100644 --- a/proto/lavanet/lava/rewards/genesis.proto +++ b/proto/lavanet/lava/rewards/genesis.proto @@ -9,7 +9,7 @@ import "lavanet/lava/rewards/params.proto"; import "lavanet/lava/timerstore/timer.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/rewards/types"; +option go_package = "github.com/lavanet/lava/v4/x/rewards/types"; // GenesisState defines the rewards module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/rewards/iprpc.proto b/proto/lavanet/lava/rewards/iprpc.proto index a9e633151c..498ea1f391 100644 --- a/proto/lavanet/lava/rewards/iprpc.proto +++ b/proto/lavanet/lava/rewards/iprpc.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.rewards; -option go_package = "github.com/lavanet/lava/v3/x/rewards/types"; +option go_package = "github.com/lavanet/lava/v4/x/rewards/types"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/lavanet/lava/rewards/params.proto b/proto/lavanet/lava/rewards/params.proto index a74e5d5820..314184c3d5 100644 --- a/proto/lavanet/lava/rewards/params.proto +++ b/proto/lavanet/lava/rewards/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.rewards; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/rewards/types"; +option go_package = "github.com/lavanet/lava/v4/x/rewards/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/rewards/query.proto b/proto/lavanet/lava/rewards/query.proto index feed9a9554..8756e2db2d 100644 --- a/proto/lavanet/lava/rewards/query.proto +++ b/proto/lavanet/lava/rewards/query.proto @@ -10,7 +10,7 @@ import "lavanet/lava/rewards/iprpc.proto"; import "lavanet/lava/rewards/params.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/lavanet/lava/v3/x/rewards/types"; +option go_package = "github.com/lavanet/lava/v4/x/rewards/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/rewards/tx.proto b/proto/lavanet/lava/rewards/tx.proto index 2580267e21..e6930bd1b2 100644 --- a/proto/lavanet/lava/rewards/tx.proto +++ b/proto/lavanet/lava/rewards/tx.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/lavanet/lava/v3/x/rewards/types"; +option go_package = "github.com/lavanet/lava/v4/x/rewards/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/spec/api_collection.proto b/proto/lavanet/lava/spec/api_collection.proto index 27750346b6..1dc6b74b92 100644 --- a/proto/lavanet/lava/spec/api_collection.proto +++ b/proto/lavanet/lava/spec/api_collection.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.spec; -option go_package = "github.com/lavanet/lava/v3/x/spec/types"; +option go_package = "github.com/lavanet/lava/v4/x/spec/types"; option (gogoproto.equal_all) = true; import "gogoproto/gogo.proto"; diff --git a/proto/lavanet/lava/spec/genesis.proto b/proto/lavanet/lava/spec/genesis.proto index 78aa1d3c01..9001cf7029 100644 --- a/proto/lavanet/lava/spec/genesis.proto +++ b/proto/lavanet/lava/spec/genesis.proto @@ -7,7 +7,7 @@ import "lavanet/lava/spec/spec.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/spec/types"; +option go_package = "github.com/lavanet/lava/v4/x/spec/types"; // GenesisState defines the spec module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/spec/params.proto b/proto/lavanet/lava/spec/params.proto index 2b87d017f7..2d51f8344f 100644 --- a/proto/lavanet/lava/spec/params.proto +++ b/proto/lavanet/lava/spec/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.spec; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/spec/types"; +option go_package = "github.com/lavanet/lava/v4/x/spec/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/spec/query.proto b/proto/lavanet/lava/spec/query.proto index 90c305e69c..55b9f1987b 100644 --- a/proto/lavanet/lava/spec/query.proto +++ b/proto/lavanet/lava/spec/query.proto @@ -8,7 +8,7 @@ import "lavanet/lava/spec/params.proto"; import "lavanet/lava/spec/spec.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/lavanet/lava/v3/x/spec/types"; +option go_package = "github.com/lavanet/lava/v4/x/spec/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/spec/spec.proto b/proto/lavanet/lava/spec/spec.proto index 5f85b1ae77..069ca5374e 100644 --- a/proto/lavanet/lava/spec/spec.proto +++ b/proto/lavanet/lava/spec/spec.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.spec; -option go_package = "github.com/lavanet/lava/v3/x/spec/types"; +option go_package = "github.com/lavanet/lava/v4/x/spec/types"; option (gogoproto.equal_all) = true; import "gogoproto/gogo.proto"; diff --git a/proto/lavanet/lava/spec/spec_add_proposal.proto b/proto/lavanet/lava/spec/spec_add_proposal.proto index acb66b2e9b..cdc9358670 100644 --- a/proto/lavanet/lava/spec/spec_add_proposal.proto +++ b/proto/lavanet/lava/spec/spec_add_proposal.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.spec; -option go_package = "github.com/lavanet/lava/v3/x/spec/types"; +option go_package = "github.com/lavanet/lava/v4/x/spec/types"; option (gogoproto.equal_all) = true; import "gogoproto/gogo.proto"; diff --git a/proto/lavanet/lava/spec/tx.proto b/proto/lavanet/lava/spec/tx.proto index 5b48e3b7b4..c6606c9f08 100644 --- a/proto/lavanet/lava/spec/tx.proto +++ b/proto/lavanet/lava/spec/tx.proto @@ -3,7 +3,7 @@ package lavanet.lava.spec; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/lavanet/lava/v3/x/spec/types"; +option go_package = "github.com/lavanet/lava/v4/x/spec/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/subscription/adjustment.proto b/proto/lavanet/lava/subscription/adjustment.proto index 18e2596688..1ca7947968 100644 --- a/proto/lavanet/lava/subscription/adjustment.proto +++ b/proto/lavanet/lava/subscription/adjustment.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.subscription; -option go_package = "github.com/lavanet/lava/v3/x/subscription/types"; +option go_package = "github.com/lavanet/lava/v4/x/subscription/types"; message Adjustment { string index = 1; diff --git a/proto/lavanet/lava/subscription/cu_tracker.proto b/proto/lavanet/lava/subscription/cu_tracker.proto index 311005ed50..2e45639c9d 100644 --- a/proto/lavanet/lava/subscription/cu_tracker.proto +++ b/proto/lavanet/lava/subscription/cu_tracker.proto @@ -4,7 +4,7 @@ package lavanet.lava.subscription; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/subscription/types"; +option go_package = "github.com/lavanet/lava/v4/x/subscription/types"; message TrackedCu { uint64 cu = 1; // CU counter for CU after QoS consideration diff --git a/proto/lavanet/lava/subscription/genesis.proto b/proto/lavanet/lava/subscription/genesis.proto index d3256e3b20..e2efe85285 100644 --- a/proto/lavanet/lava/subscription/genesis.proto +++ b/proto/lavanet/lava/subscription/genesis.proto @@ -8,7 +8,7 @@ import "lavanet/lava/fixationstore/fixation.proto"; import "lavanet/lava/timerstore/timer.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/lavanet/lava/v3/x/subscription/types"; +option go_package = "github.com/lavanet/lava/v4/x/subscription/types"; // GenesisState defines the subscription module's genesis state. message GenesisState { diff --git a/proto/lavanet/lava/subscription/params.proto b/proto/lavanet/lava/subscription/params.proto index 30ce7bd1da..3c1ca20124 100644 --- a/proto/lavanet/lava/subscription/params.proto +++ b/proto/lavanet/lava/subscription/params.proto @@ -3,7 +3,7 @@ package lavanet.lava.subscription; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/subscription/types"; +option go_package = "github.com/lavanet/lava/v4/x/subscription/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/lavanet/lava/subscription/query.proto b/proto/lavanet/lava/subscription/query.proto index 3817e48070..5447bf6571 100644 --- a/proto/lavanet/lava/subscription/query.proto +++ b/proto/lavanet/lava/subscription/query.proto @@ -11,7 +11,7 @@ import "lavanet/lava/subscription/params.proto"; import "lavanet/lava/subscription/subscription.proto"; import "amino/amino.proto"; -option go_package = "github.com/lavanet/lava/v3/x/subscription/types"; +option go_package = "github.com/lavanet/lava/v4/x/subscription/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/lavanet/lava/subscription/subscription.proto b/proto/lavanet/lava/subscription/subscription.proto index fb9e3a0f9b..c33f163f75 100644 --- a/proto/lavanet/lava/subscription/subscription.proto +++ b/proto/lavanet/lava/subscription/subscription.proto @@ -4,7 +4,7 @@ package lavanet.lava.subscription; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/subscription/types"; +option go_package = "github.com/lavanet/lava/v4/x/subscription/types"; message Subscription { string creator = 1; // creator pays for the subscription diff --git a/proto/lavanet/lava/subscription/tx.proto b/proto/lavanet/lava/subscription/tx.proto index d1904ff6fa..b8c445b5bd 100644 --- a/proto/lavanet/lava/subscription/tx.proto +++ b/proto/lavanet/lava/subscription/tx.proto @@ -5,7 +5,7 @@ package lavanet.lava.subscription; import "amino/amino.proto"; import "lavanet/lava/projects/project.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/lavanet/lava/v3/x/subscription/types"; +option go_package = "github.com/lavanet/lava/v4/x/subscription/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/lavanet/lava/timerstore/query.proto b/proto/lavanet/lava/timerstore/query.proto index bcca79e9a3..63e4f22365 100644 --- a/proto/lavanet/lava/timerstore/query.proto +++ b/proto/lavanet/lava/timerstore/query.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.timerstore; -option go_package = "github.com/lavanet/lava/v3/x/timerstore/types"; +option go_package = "github.com/lavanet/lava/v4/x/timerstore/types"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; diff --git a/proto/lavanet/lava/timerstore/timer.proto b/proto/lavanet/lava/timerstore/timer.proto index 2e7e8b628d..4cc277177f 100644 --- a/proto/lavanet/lava/timerstore/timer.proto +++ b/proto/lavanet/lava/timerstore/timer.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package lavanet.lava.timerstore; -option go_package = "github.com/lavanet/lava/v3/x/timerstore/types"; +option go_package = "github.com/lavanet/lava/v4/x/timerstore/types"; import "gogoproto/gogo.proto"; message GenesisState { diff --git a/protocol/badgegenerator/badgeserver.go b/protocol/badgegenerator/badgeserver.go index 55860f638d..15ae681bac 100644 --- a/protocol/badgegenerator/badgeserver.go +++ b/protocol/badgegenerator/badgeserver.go @@ -14,11 +14,11 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server/grpc/gogoreflection" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" diff --git a/protocol/badgegenerator/grpc/grpcfetcher.go b/protocol/badgegenerator/grpc/grpcfetcher.go index b96e31d7f1..b5774de438 100644 --- a/protocol/badgegenerator/grpc/grpcfetcher.go +++ b/protocol/badgegenerator/grpc/grpcfetcher.go @@ -8,8 +8,8 @@ import ( _ "github.com/cosmos/cosmos-sdk/types/query" retry "github.com/grpc-ecosystem/go-grpc-middleware/retry" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/protocol/badgegenerator/ipservice.go b/protocol/badgegenerator/ipservice.go index a24f1a8530..1fdb180be1 100644 --- a/protocol/badgegenerator/ipservice.go +++ b/protocol/badgegenerator/ipservice.go @@ -12,7 +12,7 @@ import ( "github.com/praserx/ipconv" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type IpService struct { diff --git a/protocol/badgegenerator/models.go b/protocol/badgegenerator/models.go index dacf6a25be..e7cb46d635 100644 --- a/protocol/badgegenerator/models.go +++ b/protocol/badgegenerator/models.go @@ -1,6 +1,6 @@ package badgegenerator -import "github.com/lavanet/lava/v3/x/pairing/types" +import "github.com/lavanet/lava/v4/x/pairing/types" type ProjectConfiguration struct { ProjectPublicKey string `json:"project_public_key"` diff --git a/protocol/badgegenerator/server.go b/protocol/badgegenerator/server.go index 9cecaff972..7906b33696 100644 --- a/protocol/badgegenerator/server.go +++ b/protocol/badgegenerator/server.go @@ -12,12 +12,12 @@ import ( "google.golang.org/grpc/metadata" btcSecp256k1 "github.com/btcsuite/btcd/btcec/v2" - "github.com/lavanet/lava/v3/protocol/badgegenerator/grpc" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/badgegenerator/grpc" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const dummyApiInterface = "badgeApiInterface" diff --git a/protocol/badgegenerator/tracker.go b/protocol/badgegenerator/tracker.go index e65970f54b..aa82c5f90c 100644 --- a/protocol/badgegenerator/tracker.go +++ b/protocol/badgegenerator/tracker.go @@ -6,11 +6,11 @@ import ( cosmosclient "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/statetracker" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/statetracker" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" ) // adding 3 blocks delay, to update the epoch. diff --git a/protocol/badgeserver/badgeserver.go b/protocol/badgeserver/badgeserver.go index 0a6db7fa28..61a0dce966 100644 --- a/protocol/badgeserver/badgeserver.go +++ b/protocol/badgeserver/badgeserver.go @@ -15,12 +15,12 @@ import ( "github.com/cosmos/cosmos-sdk/server/grpc/gogoreflection" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" diff --git a/protocol/badgeserver/ipservice.go b/protocol/badgeserver/ipservice.go index 912077a142..727b2925ca 100644 --- a/protocol/badgeserver/ipservice.go +++ b/protocol/badgeserver/ipservice.go @@ -12,7 +12,7 @@ import ( "github.com/praserx/ipconv" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type IpService struct { diff --git a/protocol/badgeserver/models.go b/protocol/badgeserver/models.go index 4f073763a7..b85d6ecdf8 100644 --- a/protocol/badgeserver/models.go +++ b/protocol/badgeserver/models.go @@ -1,6 +1,6 @@ package badgeserver -import "github.com/lavanet/lava/v3/x/pairing/types" +import "github.com/lavanet/lava/v4/x/pairing/types" type GelocationToProjectsConfiguration map[string]map[string]*ProjectConfiguration diff --git a/protocol/badgeserver/server.go b/protocol/badgeserver/server.go index c778204473..e09245f944 100644 --- a/protocol/badgeserver/server.go +++ b/protocol/badgeserver/server.go @@ -11,12 +11,12 @@ import ( btcSecp256k1 "github.com/btcsuite/btcd/btcec/v2" "github.com/cosmos/cosmos-sdk/client" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const dummyApiInterface = "badgeApiInterface" diff --git a/protocol/badgeserver/tracker.go b/protocol/badgeserver/tracker.go index fbaf86e624..9b13ddee42 100644 --- a/protocol/badgeserver/tracker.go +++ b/protocol/badgeserver/tracker.go @@ -6,11 +6,11 @@ import ( cosmosclient "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/statetracker" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/statetracker" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" ) // adding 3 blocks delay, to update the epoch. diff --git a/protocol/chainlib/base_chain_parser.go b/protocol/chainlib/base_chain_parser.go index 2dae4a14ac..487d545aba 100644 --- a/protocol/chainlib/base_chain_parser.go +++ b/protocol/chainlib/base_chain_parser.go @@ -8,12 +8,13 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" - epochstorage "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + epochstorage "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type PolicyInf interface { @@ -29,7 +30,7 @@ type BaseChainParser struct { serverApis map[ApiKey]ApiContainer apiCollections map[CollectionKey]*spectypes.ApiCollection headers map[ApiKey]*spectypes.Header - verifications map[VerificationKey][]VerificationContainer + verifications map[VerificationKey]map[string][]VerificationContainer // map[VerificationKey]map[InternalPath][]VerificationContainer allowedAddons map[string]bool extensionParser extensionslib.ExtensionParser active bool @@ -201,7 +202,7 @@ func (bcp *BaseChainParser) SeparateAddonsExtensions(supported []string) (addons } // gets all verifications for an endpoint supporting multiple addons and extensions -func (bcp *BaseChainParser) GetVerifications(supported []string) (retVerifications []VerificationContainer, err error) { +func (bcp *BaseChainParser) GetVerifications(supported []string, internalPath string, apiInterface string) (retVerifications []VerificationContainer, err error) { // addons will contains extensions and addons, // extensions must exist in all verifications, addons must be split because they are separated addons, extensions, err := bcp.SeparateAddonsExtensions(supported) @@ -212,24 +213,27 @@ func (bcp *BaseChainParser) GetVerifications(supported []string) (retVerificatio extensions = []string{""} } addons = append(addons, "") // always add the empty addon + for _, addon := range addons { for _, extension := range extensions { verificationKey := VerificationKey{ Extension: extension, Addon: addon, } - verifications, ok := bcp.verifications[verificationKey] + collectionVerifications, ok := bcp.verifications[verificationKey] if ok { - retVerifications = append(retVerifications, verifications...) + if verifications, ok := collectionVerifications[internalPath]; ok { + retVerifications = append(retVerifications, verifications...) + } } } } - return + return retVerifications, nil } func (bcp *BaseChainParser) Construct(spec spectypes.Spec, internalPaths map[string]struct{}, taggedApis map[spectypes.FUNCTION_TAG]TaggedContainer, serverApis map[ApiKey]ApiContainer, apiCollections map[CollectionKey]*spectypes.ApiCollection, headers map[ApiKey]*spectypes.Header, - verifications map[VerificationKey][]VerificationContainer, + verifications map[VerificationKey]map[string][]VerificationContainer, ) { bcp.spec = spec bcp.internalPaths = internalPaths @@ -263,6 +267,22 @@ func (bcp *BaseChainParser) GetParsingByTag(tag spectypes.FUNCTION_TAG) (parsing return val.Parsing, val.ApiCollection, ok } +func (bcp *BaseChainParser) IsTagInCollection(tag spectypes.FUNCTION_TAG, collectionKey CollectionKey) bool { + bcp.rwLock.RLock() + defer bcp.rwLock.RUnlock() + + apiCollection, ok := bcp.apiCollections[collectionKey] + return ok && lavaslices.ContainsPredicate(apiCollection.ParseDirectives, func(elem *spectypes.ParseDirective) bool { + return elem.FunctionTag == tag + }) +} + +func (bcp *BaseChainParser) GetAllInternalPaths() []string { + bcp.rwLock.RLock() + defer bcp.rwLock.RUnlock() + return lavaslices.KeysSlice(bcp.internalPaths) +} + func (bcp *BaseChainParser) ExtensionParsing(addon string, parsedMessageArg *baseChainMessageContainer, extensionInfo extensionslib.ExtensionInfo) { if extensionInfo.ExtensionOverride == nil { // consumer side extension parsing. to set the extension based on the latest block and the request @@ -350,13 +370,13 @@ func (apip *BaseChainParser) getApiCollection(connectionType, internalPath, addo return api, nil } -func getServiceApis(spec spectypes.Spec, rpcInterface string) (retInternalPaths map[string]struct{}, retServerApis map[ApiKey]ApiContainer, retTaggedApis map[spectypes.FUNCTION_TAG]TaggedContainer, retApiCollections map[CollectionKey]*spectypes.ApiCollection, retHeaders map[ApiKey]*spectypes.Header, retVerifications map[VerificationKey][]VerificationContainer) { +func getServiceApis(spec spectypes.Spec, rpcInterface string) (retInternalPaths map[string]struct{}, retServerApis map[ApiKey]ApiContainer, retTaggedApis map[spectypes.FUNCTION_TAG]TaggedContainer, retApiCollections map[CollectionKey]*spectypes.ApiCollection, retHeaders map[ApiKey]*spectypes.Header, retVerifications map[VerificationKey]map[string][]VerificationContainer) { retInternalPaths = map[string]struct{}{} serverApis := map[ApiKey]ApiContainer{} taggedApis := map[spectypes.FUNCTION_TAG]TaggedContainer{} headers := map[ApiKey]*spectypes.Header{} apiCollections := map[CollectionKey]*spectypes.ApiCollection{} - verifications := map[VerificationKey][]VerificationContainer{} + verifications := map[VerificationKey]map[string][]VerificationContainer{} if spec.Enabled { for _, apiCollection := range spec.ApiCollections { if !apiCollection.Enabled { @@ -385,7 +405,7 @@ func getServiceApis(spec spectypes.Spec, rpcInterface string) (retInternalPaths if !api.Enabled { continue } - // + // TODO: find a better spot for this (more optimized, precompile regex, etc) if rpcInterface == spectypes.APIInterfaceRest { re := regexp.MustCompile(`{[^}]+}`) @@ -455,6 +475,7 @@ func getServiceApis(spec spectypes.Spec, rpcInterface string) (retInternalPaths } verCont := VerificationContainer{ + InternalPath: apiCollection.CollectionData.InternalPath, ConnectionType: apiCollection.CollectionData.Type, Name: verification.Name, ParseDirective: *verification.ParseDirective, @@ -464,10 +485,13 @@ func getServiceApis(spec spectypes.Spec, rpcInterface string) (retInternalPaths Severity: parseValue.Severity, } + internalPath := apiCollection.CollectionData.InternalPath if extensionVerifications, ok := verifications[verificationKey]; !ok { - verifications[verificationKey] = []VerificationContainer{verCont} + verifications[verificationKey] = map[string][]VerificationContainer{internalPath: {verCont}} + } else if collectionVerifications, ok := extensionVerifications[internalPath]; !ok { + verifications[verificationKey][internalPath] = []VerificationContainer{verCont} } else { - verifications[verificationKey] = append(extensionVerifications, verCont) + verifications[verificationKey][internalPath] = append(collectionVerifications, verCont) } } } diff --git a/protocol/chainlib/base_chain_parser_test.go b/protocol/chainlib/base_chain_parser_test.go new file mode 100644 index 0000000000..8339cd2688 --- /dev/null +++ b/protocol/chainlib/base_chain_parser_test.go @@ -0,0 +1,142 @@ +package chainlib + +import ( + reflect "reflect" + "strconv" + "testing" + + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + "github.com/stretchr/testify/require" +) + +func TestGetVerifications(t *testing.T) { + verifications := map[VerificationKey]map[string][]VerificationContainer{ + { + Extension: "", + Addon: "", + }: { + "/x": { + {InternalPath: "/x"}, + }, + "": { + {InternalPath: ""}, + }, + }, + { + Extension: "", + Addon: "addon1", + }: { + "/x": { + {InternalPath: "/x"}, + }, + "": { + {InternalPath: ""}, + }, + }, + { + Extension: "ext1", + Addon: "addon1", + }: { + "/x": { + {InternalPath: "/x"}, + }, + "": { + {InternalPath: ""}, + }, + }, + { + Extension: "ext1", + Addon: "", + }: { + "/x": { + {InternalPath: "/x"}, + }, + "": { + {InternalPath: ""}, + }, + }, + } + + playBook := []struct { + Extension string + Addon string + InternalPath string + }{ + { + Extension: "", + Addon: "", + InternalPath: "", + }, + { + Extension: "", + Addon: "", + InternalPath: "/x", + }, + { + Extension: "ext1", + Addon: "addon1", + InternalPath: "", + }, + { + Extension: "ext1", + Addon: "addon1", + InternalPath: "/x", + }, + { + Extension: "", + Addon: "addon1", + InternalPath: "", + }, + { + Extension: "", + Addon: "addon1", + InternalPath: "/x", + }, + { + Extension: "ext1", + Addon: "", + InternalPath: "", + }, + { + Extension: "ext1", + Addon: "", + InternalPath: "/x", + }, + } + + baseChainParser := BaseChainParser{ + verifications: verifications, + allowedAddons: map[string]bool{"addon1": true}, + } + baseChainParser.extensionParser = extensionslib.NewExtensionParser(map[string]struct{}{"ext1": {}}, nil) + + for idx, play := range playBook { + for _, apiInterface := range []string{spectypes.APIInterfaceJsonRPC, spectypes.APIInterfaceTendermintRPC, spectypes.APIInterfaceRest, spectypes.APIInterfaceGrpc} { + t.Run("GetVerifications "+strconv.Itoa(idx), func(t *testing.T) { + var supported []string + if play.Extension == "" && play.Addon == "" { + supported = []string{""} + } else if play.Extension == "" { + supported = []string{play.Addon} + } else if play.Addon == "" { + supported = []string{play.Extension} + } else { + supported = []string{play.Extension, play.Addon} + } + + actualVerifications, err := baseChainParser.GetVerifications(supported, play.InternalPath, apiInterface) + require.NoError(t, err) + + expectedVerificationKey := VerificationKey{Extension: play.Extension, Addon: play.Addon} + expectedVerifications := verifications[expectedVerificationKey][play.InternalPath] + // add the empty addon to the expected verifications + if play.Addon != "" { + expectedVerificationKey.Addon = "" + expectedVerifications = append(expectedVerifications, verifications[expectedVerificationKey][play.InternalPath]...) + } + require.True(t, reflect.DeepEqual(expectedVerifications, actualVerifications), "expected: %v, actual: %v", expectedVerifications, actualVerifications) + }) + } + } +} diff --git a/protocol/chainlib/chain_fetcher.go b/protocol/chainlib/chain_fetcher.go index 9a5d6c421b..a99408e690 100644 --- a/protocol/chainlib/chain_fetcher.go +++ b/protocol/chainlib/chain_fetcher.go @@ -9,16 +9,16 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/golang/protobuf/proto" - formatter "github.com/lavanet/lava/v3/ecosystem/cache/format" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/protocol/performance" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + formatter "github.com/lavanet/lava/v4/ecosystem/cache/format" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/protocol/performance" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "golang.org/x/exp/slices" ) @@ -49,7 +49,7 @@ func (cf *ChainFetcher) FetchEndpoint() lavasession.RPCProviderEndpoint { func (cf *ChainFetcher) Validate(ctx context.Context) error { for _, url := range cf.endpoint.NodeUrls { addons := url.Addons - verifications, err := cf.chainParser.GetVerifications(addons) + verifications, err := cf.chainParser.GetVerifications(addons, url.InternalPath, cf.endpoint.ApiInterface) if err != nil { return err } @@ -167,7 +167,8 @@ func (cf *ChainFetcher) Verify(ctx context.Context, verification VerificationCon } } - chainMessage, err := CraftChainMessage(parsing, collectionType, cf.chainParser, &CraftData{Path: path, Data: data, ConnectionType: collectionType}, cf.ChainFetcherMetadata()) + craftData := &CraftData{Path: path, Data: data, ConnectionType: collectionType, InternalPath: verification.InternalPath} + chainMessage, err := CraftChainMessage(parsing, collectionType, cf.chainParser, craftData, cf.ChainFetcherMetadata()) if err != nil { return utils.LavaFormatError("[-] verify failed creating chainMessage", err, []utils.Attribute{{Key: "chainID", Value: cf.endpoint.ChainID}, {Key: "APIInterface", Value: cf.endpoint.ApiInterface}}...) } @@ -253,6 +254,7 @@ func (cf *ChainFetcher) Verify(ctx context.Context, verification VerificationCon utils.LogAttr("rawData", parsedInput.GetRawParsedData()), utils.LogAttr("verificationKey", verification.VerificationKey), utils.LogAttr("apiInterface", cf.endpoint.ApiInterface), + utils.LogAttr("internalPath", proxyUrl.InternalPath), ) return nil } @@ -455,7 +457,7 @@ type DummyChainFetcher struct { func (cf *DummyChainFetcher) Validate(ctx context.Context) error { for _, url := range cf.endpoint.NodeUrls { addons := url.Addons - verifications, err := cf.chainParser.GetVerifications(addons) + verifications, err := cf.chainParser.GetVerifications(addons, url.InternalPath, cf.endpoint.ApiInterface) if err != nil { return err } diff --git a/protocol/chainlib/chain_fetcher_mock.go b/protocol/chainlib/chain_fetcher_mock.go index 41ee39c660..d65c807e7c 100644 --- a/protocol/chainlib/chain_fetcher_mock.go +++ b/protocol/chainlib/chain_fetcher_mock.go @@ -12,7 +12,7 @@ import ( context "context" reflect "reflect" - lavasession "github.com/lavanet/lava/v3/protocol/lavasession" + lavasession "github.com/lavanet/lava/v4/protocol/lavasession" gomock "go.uber.org/mock/gomock" ) diff --git a/protocol/chainlib/chain_fetcher_test.go b/protocol/chainlib/chain_fetcher_test.go index 87606f6f0f..db8cfca1ec 100644 --- a/protocol/chainlib/chain_fetcher_test.go +++ b/protocol/chainlib/chain_fetcher_test.go @@ -3,7 +3,7 @@ package chainlib import ( "testing" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/chainlib/chain_message.go b/protocol/chainlib/chain_message.go index 66f89c2555..399d7694c7 100644 --- a/protocol/chainlib/chain_message.go +++ b/protocol/chainlib/chain_message.go @@ -4,12 +4,12 @@ import ( "math" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type updatableRPCInput interface { @@ -38,6 +38,10 @@ type baseChainMessageContainer struct { resultErrorParsingMethod func(data []byte, httpStatusCode int) (hasError bool, errorMessage string) } +func (bcnc *baseChainMessageContainer) GetRequestedBlocksHashes() []string { + return bcnc.requestedBlockHashes +} + func (bcnc *baseChainMessageContainer) SubscriptionIdExtractor(reply *rpcclient.JsonrpcMessage) string { return bcnc.msg.SubscriptionIdExtractor(reply) } @@ -179,6 +183,7 @@ type CraftData struct { Path string Data []byte ConnectionType string + InternalPath string } func CraftChainMessage(parsing *spectypes.ParseDirective, connectionType string, chainParser ChainParser, craftData *CraftData, metadata []pairingtypes.Metadata) (ChainMessageForSend, error) { diff --git a/protocol/chainlib/chain_message_queries.go b/protocol/chainlib/chain_message_queries.go index 9f3fb77a3b..c05ef27093 100644 --- a/protocol/chainlib/chain_message_queries.go +++ b/protocol/chainlib/chain_message_queries.go @@ -1,8 +1,8 @@ package chainlib import ( - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/x/spec/types" ) func ShouldSendToAllProviders(chainMessage ChainMessage) bool { diff --git a/protocol/chainlib/chain_message_test.go b/protocol/chainlib/chain_message_test.go new file mode 100644 index 0000000000..5e988623b7 --- /dev/null +++ b/protocol/chainlib/chain_message_test.go @@ -0,0 +1,106 @@ +package chainlib + +import ( + "fmt" + "net/http" + "testing" + + testcommon "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/x/spec/types" + "github.com/stretchr/testify/require" +) + +func TestCraftChainMessage(t *testing.T) { + type play struct { + apiInterface string + craftData *CraftData + } + + expectedInternalPath := "/x" + method := "banana" + + playBook := []play{ + { + apiInterface: types.APIInterfaceJsonRPC, + craftData: &CraftData{ + Path: method, + Data: []byte(fmt.Sprintf(`{"jsonrpc":"2.0","method":"%s","params":[],"id":1}`, method)), + ConnectionType: http.MethodPost, + InternalPath: expectedInternalPath, + }, + }, + { + apiInterface: types.APIInterfaceTendermintRPC, + craftData: &CraftData{ + Path: method, + Data: []byte(fmt.Sprintf(`{"jsonrpc":"2.0","method":"%s","params":[],"id":1}`, method)), + ConnectionType: "", + InternalPath: expectedInternalPath, + }, + }, + { + apiInterface: types.APIInterfaceRest, + craftData: &CraftData{ + Data: []byte(method), + ConnectionType: http.MethodGet, + InternalPath: expectedInternalPath, + }, + }, + { + apiInterface: types.APIInterfaceRest, + craftData: &CraftData{ + Path: method, + Data: []byte(`{"data":"banana"}`), + ConnectionType: http.MethodPost, + InternalPath: expectedInternalPath, + }, + }, + { + apiInterface: types.APIInterfaceGrpc, + craftData: &CraftData{ + Path: method, + ConnectionType: "", + InternalPath: expectedInternalPath, + }, + }, + } + + for _, play := range playBook { + runName := play.apiInterface + if play.craftData.ConnectionType != "" { + runName += "_" + play.craftData.ConnectionType + } + + t.Run(runName, func(t *testing.T) { + chainParser, err := NewChainParser(play.apiInterface) + require.NoError(t, err) + + spec := testcommon.CreateMockSpec() + spec.ApiCollections = []*types.ApiCollection{ + { + Enabled: true, + CollectionData: types.CollectionData{ + ApiInterface: play.apiInterface, + Type: play.craftData.ConnectionType, + InternalPath: expectedInternalPath, + }, + Apis: []*types.Api{ + { + Name: method, + ComputeUnits: 100, + Enabled: true, + }, + }, + }, + } + chainParser.SetSpec(spec) + + chainMsg, err := CraftChainMessage(&types.ParseDirective{ApiName: method}, play.craftData.ConnectionType, chainParser, play.craftData, nil) + require.NoError(t, err) + require.NotNil(t, chainMsg) + + internalPath := chainMsg.GetApiCollection().CollectionData.InternalPath + require.Equal(t, expectedInternalPath, internalPath) + }) + } +} diff --git a/protocol/chainlib/chain_router.go b/protocol/chainlib/chain_router.go index 3c958da9f2..cbad7305e6 100644 --- a/protocol/chainlib/chain_router.go +++ b/protocol/chainlib/chain_router.go @@ -2,25 +2,19 @@ package chainlib import ( "context" - "net/url" "strings" "sync" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) -type MethodRoute struct { - lavasession.RouterKey - method string -} - type chainRouterEntry struct { ChainProxy addonsSupported map[string]struct{} @@ -39,16 +33,18 @@ func (cre *chainRouterEntry) isSupporting(addon string) bool { type chainRouterImpl struct { lock *sync.RWMutex - chainProxyRouter map[lavasession.RouterKey][]chainRouterEntry + chainProxyRouter map[string][]chainRouterEntry // key is routing key } -func (cri *chainRouterImpl) GetChainProxySupporting(ctx context.Context, addon string, extensions []string, method string) (ChainProxy, error) { +func (cri *chainRouterImpl) GetChainProxySupporting(ctx context.Context, addon string, extensions []string, method string, internalPath string) (ChainProxy, error) { cri.lock.RLock() defer cri.lock.RUnlock() // check if that specific method has a special route, if it does apply it to the router key wantedRouterKey := lavasession.NewRouterKey(extensions) - if chainProxyEntries, ok := cri.chainProxyRouter[wantedRouterKey]; ok { + wantedRouterKey.ApplyInternalPath(internalPath) + wantedRouterKeyStr := wantedRouterKey.String() + if chainProxyEntries, ok := cri.chainProxyRouter[wantedRouterKeyStr]; ok { for _, chainRouterEntry := range chainProxyEntries { if chainRouterEntry.isSupporting(addon) { // check if the method is supported @@ -58,30 +54,34 @@ func (cri *chainRouterImpl) GetChainProxySupporting(ctx context.Context, addon s } utils.LavaFormatTrace("chainProxy supporting method routing selected", utils.LogAttr("addon", addon), - utils.LogAttr("wantedRouterKey", wantedRouterKey), + utils.LogAttr("wantedRouterKey", wantedRouterKeyStr), utils.LogAttr("method", method), ) } - if wantedRouterKey != lavasession.GetEmptyRouterKey() { // add trailer only when router key is not default (||) - grpc.SetTrailer(ctx, metadata.Pairs(RPCProviderNodeExtension, string(wantedRouterKey))) + if wantedRouterKeyStr != lavasession.GetEmptyRouterKey().String() { // add trailer only when router key is not default (||) + grpc.SetTrailer(ctx, metadata.Pairs(RPCProviderNodeExtension, wantedRouterKeyStr)) } return chainRouterEntry.ChainProxy, nil } utils.LavaFormatTrace("chainProxy supporting extensions but not supporting addon", utils.LogAttr("addon", addon), - utils.LogAttr("wantedRouterKey", wantedRouterKey), + utils.LogAttr("wantedRouterKey", wantedRouterKeyStr), ) } // no support for this addon return nil, utils.LavaFormatError("no chain proxy supporting requested addon", nil, utils.Attribute{Key: "addon", Value: addon}) } // no support for these extensions - return nil, utils.LavaFormatError("no chain proxy supporting requested extensions", nil, utils.Attribute{Key: "extensions", Value: extensions}) + return nil, utils.LavaFormatError("no chain proxy supporting requested extensions and internal path", nil, + utils.LogAttr("extensions", extensions), + utils.LogAttr("internalPath", internalPath), + utils.LogAttr("supported", cri.chainProxyRouter), + ) } func (cri chainRouterImpl) ExtensionsSupported(extensions []string) bool { - routerKey := lavasession.NewRouterKey(extensions) + routerKey := lavasession.NewRouterKey(extensions).String() _, ok := cri.chainProxyRouter[routerKey] return ok } @@ -89,7 +89,7 @@ func (cri chainRouterImpl) ExtensionsSupported(extensions []string) bool { func (cri chainRouterImpl) SendNodeMsg(ctx context.Context, ch chan interface{}, chainMessage ChainMessageForSend, extensions []string) (relayReply *RelayReplyWrapper, subscriptionID string, relayReplyServer *rpcclient.ClientSubscription, proxyUrl common.NodeUrl, chainId string, err error) { // add the parsed addon from the apiCollection addon := chainMessage.GetApiCollection().CollectionData.AddOn - selectedChainProxy, err := cri.GetChainProxySupporting(ctx, addon, extensions, chainMessage.GetApi().Name) + selectedChainProxy, err := cri.GetChainProxySupporting(ctx, addon, extensions, chainMessage.GetApi().Name, chainMessage.GetApiCollection().CollectionData.InternalPath) if err != nil { return nil, "", nil, common.NodeUrl{}, "", err } @@ -98,11 +98,66 @@ func (cri chainRouterImpl) SendNodeMsg(ctx context.Context, ch chan interface{}, return relayReply, subscriptionID, relayReplyServer, proxyUrl, chainId, err } +func (cri *chainRouterImpl) autoGenerateMissingInternalPaths(isWs bool, nodeUrl common.NodeUrl, routerKey lavasession.RouterKey, autoGeneratedInternalPaths map[string]struct{}, rpcProviderEndpoint lavasession.RPCProviderEndpoint, chainParser ChainParser, returnedBatch map[string]lavasession.RPCProviderEndpoint) error { + baseUrl := nodeUrl.Url + for _, internalPath := range chainParser.GetAllInternalPaths() { + if internalPath == "" { + // skip the root since we've already added it + continue + } + + autoGeneratedInternalPaths[internalPath] = struct{}{} + + nodeUrl.InternalPath = internalPath // add internal path to the nodeUrl + nodeUrl.Url = baseUrl + internalPath + routerKey.ApplyInternalPath(internalPath) + if isWs { + addons, _, err := chainParser.SeparateAddonsExtensions(nodeUrl.Addons) + if err != nil { + return err + } + + lookForSubscriptionTag := func() bool { + for _, connectionType := range []string{"POST", ""} { + if len(addons) == 0 { + addons = append(addons, "") + } + + for _, addon := range addons { + // check subscription exists, we only care for subscription API's because otherwise we use http anyway. + collectionKey := CollectionKey{ + InternalPath: internalPath, + Addon: addon, + ConnectionType: connectionType, + } + + if chainParser.IsTagInCollection(spectypes.FUNCTION_TAG_SUBSCRIBE, collectionKey) { + return true + } + } + } + return false + } + + if !lookForSubscriptionTag() { + continue + } + } + + cri.setRouterKeyInBatch(nodeUrl, returnedBatch, routerKey, rpcProviderEndpoint, false) // will not override existing entries + } + + return nil +} + // batch nodeUrls with the same addons together in a copy -func (cri *chainRouterImpl) BatchNodeUrlsByServices(rpcProviderEndpoint lavasession.RPCProviderEndpoint) (map[lavasession.RouterKey]lavasession.RPCProviderEndpoint, error) { - returnedBatch := map[lavasession.RouterKey]lavasession.RPCProviderEndpoint{} - routesToCheck := map[lavasession.RouterKey]bool{} +func (cri *chainRouterImpl) BatchNodeUrlsByServices(rpcProviderEndpoint lavasession.RPCProviderEndpoint, chainParser ChainParser) (map[string]lavasession.RPCProviderEndpoint, error) { + returnedBatch := map[string]lavasession.RPCProviderEndpoint{} + routesToCheck := map[string]bool{} methodRoutes := map[string]int{} + httpRootRouteSet := false + autoGeneratedInternalPaths := map[string]struct{}{} + for _, nodeUrl := range rpcProviderEndpoint.NodeUrls { routerKey := lavasession.NewRouterKey(nodeUrl.Addons) if len(nodeUrl.Methods) > 0 { @@ -114,10 +169,38 @@ func (cri *chainRouterImpl) BatchNodeUrlsByServices(rpcProviderEndpoint lavasess methodRoutes[methodRoutesUnique] = len(methodRoutes) existing = len(methodRoutes) } - routerKey = routerKey.ApplyMethodsRoute(existing) + routerKey.ApplyMethodsRoute(existing) + } + routerKey.ApplyInternalPath(nodeUrl.InternalPath) + isWs, err := IsUrlWebSocket(nodeUrl.Url) + // Some parsing may fail because of gRPC + if err == nil && isWs { + // now change the router key to fit the websocket extension key. + nodeUrl.Addons = append(nodeUrl.Addons, WebSocketExtension) + routerKey.SetExtensions(nodeUrl.Addons) + } + + _, isAlreadyAutoGenerated := autoGeneratedInternalPaths[nodeUrl.InternalPath] + cri.setRouterKeyInBatch(nodeUrl, returnedBatch, routerKey, rpcProviderEndpoint, isAlreadyAutoGenerated) // will override existing entries + + if nodeUrl.InternalPath == "" { // root path + if !isWs { + httpRootRouteSet = true + } + + err = cri.autoGenerateMissingInternalPaths(isWs, nodeUrl, routerKey, autoGeneratedInternalPaths, rpcProviderEndpoint, chainParser, returnedBatch) + if err != nil { + return nil, err + } } - cri.parseNodeUrl(nodeUrl, returnedBatch, routerKey, rpcProviderEndpoint) } + + // check if batch has http configured, if not, add a websocket one + // prefer one without internal path + if !httpRootRouteSet { + return nil, utils.LavaFormatError("HTTP/HTTPS is mandatory. It is recommended to configure both HTTP/HTTP and WS/WSS.", nil, utils.LogAttr("nodeUrls", rpcProviderEndpoint.NodeUrls)) + } + if len(returnedBatch) == 0 { return nil, utils.LavaFormatError("invalid batch, routes are empty", nil, utils.LogAttr("endpoint", rpcProviderEndpoint)) } @@ -127,52 +210,45 @@ func (cri *chainRouterImpl) BatchNodeUrlsByServices(rpcProviderEndpoint lavasess return nil, utils.LavaFormatError("invalid batch, missing regular route for method route", nil, utils.LogAttr("routerKey", routerKey)) } } + utils.LavaFormatDebug("batched nodeUrls by services", utils.LogAttr("batch", returnedBatch)) return returnedBatch, nil } -func (*chainRouterImpl) parseNodeUrl(nodeUrl common.NodeUrl, returnedBatch map[lavasession.RouterKey]lavasession.RPCProviderEndpoint, routerKey lavasession.RouterKey, rpcProviderEndpoint lavasession.RPCProviderEndpoint) { - u, err := url.Parse(nodeUrl.Url) - // Some parsing may fail because of gRPC - if err == nil && (u.Scheme == "ws" || u.Scheme == "wss") { - // if websocket, check if we have a router key for http already. if not add a websocket router key - // so in case we didn't get an http endpoint, we can use the ws one. - if _, ok := returnedBatch[routerKey]; !ok { - returnedBatch[routerKey] = lavasession.RPCProviderEndpoint{ - NetworkAddress: rpcProviderEndpoint.NetworkAddress, - ChainID: rpcProviderEndpoint.ChainID, - ApiInterface: rpcProviderEndpoint.ApiInterface, - Geolocation: rpcProviderEndpoint.Geolocation, - NodeUrls: []common.NodeUrl{nodeUrl}, - } - } - // now change the router key to fit the websocket extension key. - nodeUrl.Addons = append(nodeUrl.Addons, WebSocketExtension) - routerKey = lavasession.NewRouterKey(nodeUrl.Addons) - } - - if existingEndpoint, ok := returnedBatch[routerKey]; !ok { - returnedBatch[routerKey] = lavasession.RPCProviderEndpoint{ +func (*chainRouterImpl) setRouterKeyInBatch(nodeUrl common.NodeUrl, returnedBatch map[string]lavasession.RPCProviderEndpoint, routerKey lavasession.RouterKey, rpcProviderEndpoint lavasession.RPCProviderEndpoint, overrideExistingEntry bool) { + // if the router key does not exit, create it anyway + // if we need to override, override + // if it exists and we should not override, add the node url to the existing list + routerKeyString := routerKey.String() + if existingEndpoint, ok := returnedBatch[routerKeyString]; ok && !overrideExistingEntry { + // setting the incoming url first as it might be http while existing is websocket. (we prioritize http over ws when possible) + returnedBatch[routerKeyString] = lavasession.RPCProviderEndpoint{ NetworkAddress: rpcProviderEndpoint.NetworkAddress, ChainID: rpcProviderEndpoint.ChainID, ApiInterface: rpcProviderEndpoint.ApiInterface, Geolocation: rpcProviderEndpoint.Geolocation, - NodeUrls: []common.NodeUrl{nodeUrl}, + NodeUrls: append([]common.NodeUrl{nodeUrl}, existingEndpoint.NodeUrls...), } - } else { - // setting the incoming url first as it might be http while existing is websocket. (we prioritize http over ws when possible) - existingEndpoint.NodeUrls = append([]common.NodeUrl{nodeUrl}, existingEndpoint.NodeUrls...) - returnedBatch[routerKey] = existingEndpoint + + return + } + + returnedBatch[routerKeyString] = lavasession.RPCProviderEndpoint{ + NetworkAddress: rpcProviderEndpoint.NetworkAddress, + ChainID: rpcProviderEndpoint.ChainID, + ApiInterface: rpcProviderEndpoint.ApiInterface, + Geolocation: rpcProviderEndpoint.Geolocation, + NodeUrls: []common.NodeUrl{nodeUrl}, } } func newChainRouter(ctx context.Context, nConns uint, rpcProviderEndpoint lavasession.RPCProviderEndpoint, chainParser ChainParser, proxyConstructor func(context.Context, uint, lavasession.RPCProviderEndpoint, ChainParser) (ChainProxy, error)) (*chainRouterImpl, error) { - chainProxyRouter := map[lavasession.RouterKey][]chainRouterEntry{} + chainProxyRouter := map[string][]chainRouterEntry{} cri := chainRouterImpl{ lock: &sync.RWMutex{}, } - requiredMap := map[requirementSt]struct{}{} - supportedMap := map[requirementSt]struct{}{} - rpcProviderEndpointBatch, err := cri.BatchNodeUrlsByServices(rpcProviderEndpoint) + requiredMap := map[string]struct{}{} // key is requirement + supportedMap := map[string]requirement{} // key is requirement + rpcProviderEndpointBatch, err := cri.BatchNodeUrlsByServices(rpcProviderEndpoint, chainParser) if err != nil { return nil, err } @@ -185,19 +261,21 @@ func newChainRouter(ctx context.Context, nConns uint, rpcProviderEndpoint lavase // this function calculated all routing combinations and populates them for verification at the end of the function updateRouteCombinations := func(extensions, addons []string) (fullySupportedRouterKey lavasession.RouterKey) { allExtensionsRouterKey := lavasession.NewRouterKey(extensions) - requirement := requirementSt{ - extensions: allExtensionsRouterKey, - addon: "", + requirement := requirement{ + RouterKey: allExtensionsRouterKey, + addon: "", } for _, addon := range addons { populateRequiredForAddon(addon, extensions, requiredMap) requirement.addon = addon - supportedMap[requirement] = struct{}{} + supportedMap[requirement.String()] = requirement addonsSupportedMap[addon] = struct{}{} } return allExtensionsRouterKey } routerKey := updateRouteCombinations(extensions, addons) + routerKey.ApplyInternalPath(rpcProviderEndpointEntry.NodeUrls[0].InternalPath) + routerKeyStr := routerKey.String() methodsRouted := map[string]struct{}{} methods := rpcProviderEndpointEntry.NodeUrls[0].Methods if len(methods) > 0 { @@ -216,14 +294,14 @@ func newChainRouter(ctx context.Context, nConns uint, rpcProviderEndpoint lavase addonsSupported: addonsSupportedMap, methodsRouted: methodsRouted, } - if chainRouterEntries, ok := chainProxyRouter[routerKey]; !ok { - chainProxyRouter[routerKey] = []chainRouterEntry{chainRouterEntryInst} + if chainRouterEntries, ok := chainProxyRouter[routerKeyStr]; !ok { + chainProxyRouter[routerKeyStr] = []chainRouterEntry{chainRouterEntryInst} } else { if len(methodsRouted) > 0 { // if there are routed methods we want this in the beginning to intercept them - chainProxyRouter[routerKey] = append([]chainRouterEntry{chainRouterEntryInst}, chainRouterEntries...) + chainProxyRouter[routerKeyStr] = append([]chainRouterEntry{chainRouterEntryInst}, chainRouterEntries...) } else { - chainProxyRouter[routerKey] = append(chainRouterEntries, chainRouterEntryInst) + chainProxyRouter[routerKeyStr] = append(chainRouterEntries, chainRouterEntryInst) } } } @@ -234,9 +312,10 @@ func newChainRouter(ctx context.Context, nConns uint, rpcProviderEndpoint lavase _, apiCollection, hasSubscriptionInSpec := chainParser.GetParsingByTag(spectypes.FUNCTION_TAG_SUBSCRIBE) // validating we have websocket support for subscription supported specs. webSocketSupported := false - for key := range supportedMap { - if key.IsRequirementMet(WebSocketExtension) { + for _, requirement := range supportedMap { + if requirement.IsRequirementMet(WebSocketExtension) { webSocketSupported = true + break } } if hasSubscriptionInSpec && apiCollection.Enabled && !webSocketSupported { @@ -260,40 +339,37 @@ func newChainRouter(ctx context.Context, nConns uint, rpcProviderEndpoint lavase } cri.chainProxyRouter = chainProxyRouter + utils.LavaFormatDebug("chainRouter created", utils.LogAttr("chainProxyRouter", chainProxyRouter)) return &cri, nil } -type requirementSt struct { - extensions lavasession.RouterKey - addon string +type requirement struct { + lavasession.RouterKey + addon string } -func (rs *requirementSt) String() string { - return string(rs.extensions) + rs.addon +func (rs *requirement) String() string { + return rs.RouterKey.String() + "addon:" + rs.addon + lavasession.RouterKeySeparator } -func (rs *requirementSt) IsRequirementMet(requirement string) bool { - return strings.Contains(string(rs.extensions), requirement) || strings.Contains(rs.addon, requirement) +func (rs *requirement) IsRequirementMet(requirement string) bool { + return rs.RouterKey.HasExtension(requirement) || strings.Contains(rs.addon, requirement) } -func populateRequiredForAddon(addon string, extensions []string, required map[requirementSt]struct{}) { - if len(extensions) == 0 { - required[requirementSt{ - extensions: lavasession.NewRouterKey([]string{}), - addon: addon, - }] = struct{}{} - return +func populateRequiredForAddon(addon string, extensions []string, required map[string]struct{}) { + requirement := requirement{ + RouterKey: lavasession.NewRouterKey(extensions), + addon: addon, } - requirement := requirementSt{ - extensions: lavasession.NewRouterKey(extensions), - addon: addon, - } - if _, ok := required[requirement]; ok { + + requirementKey := requirement.String() + if _, ok := required[requirementKey]; ok { // already handled return } - required[requirement] = struct{}{} + + required[requirementKey] = struct{}{} for i := 0; i < len(extensions); i++ { extensionsWithoutI := make([]string, len(extensions)-1) copy(extensionsWithoutI[:i], extensions[:i]) diff --git a/protocol/chainlib/chain_router_test.go b/protocol/chainlib/chain_router_test.go index f04831775e..d7e2ca6cbe 100644 --- a/protocol/chainlib/chain_router_test.go +++ b/protocol/chainlib/chain_router_test.go @@ -2,6 +2,7 @@ package chainlib import ( "context" + "fmt" "log" "net" "os" @@ -14,14 +15,14 @@ import ( "github.com/gofiber/fiber/v2/middleware/compress" "github.com/gofiber/fiber/v2/middleware/favicon" "github.com/gofiber/websocket/v2" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - testcommon "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + testcommon "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) @@ -1110,7 +1111,7 @@ func TestChainRouterWithMethodRoutes(t *testing.T) { } chainMsg, err := chainParser.ParseMsg(api, nil, "", nil, extension) require.NoError(t, err) - chainProxy, err := chainRouter.GetChainProxySupporting(ctx, chainMsg.GetApiCollection().CollectionData.AddOn, common.GetExtensionNames(chainMsg.GetExtensions()), api) + chainProxy, err := chainRouter.GetChainProxySupporting(ctx, chainMsg.GetApiCollection().CollectionData.AddOn, common.GetExtensionNames(chainMsg.GetExtensions()), api, "") require.NoError(t, err) _, urlFromProxy := chainProxy.GetChainProxyInformation() require.Equal(t, url, urlFromProxy, "chainMsg: %+v, ---chainRouter: %+v", chainMsg, chainRouter) @@ -1202,3 +1203,846 @@ func TestMain(m *testing.M) { listener.Close() os.Exit(code) } + +func TestChainRouterWithInternalPaths(t *testing.T) { + type play struct { + name string + specApiCollections []*spectypes.ApiCollection + apiInterface string + nodeUrls []common.NodeUrl + expectedServicesToNodeUrls map[string][]common.NodeUrl + expectedError bool + } + + playBook := []play{} + + apiInterfaces := []string{spectypes.APIInterfaceJsonRPC, spectypes.APIInterfaceTendermintRPC} + for _, apiInterface := range apiInterfaces { + playBook = append(playBook, []play{ + { + name: "No internal paths in spec - single http node url configured", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + }, + }, + { + name: "No internal paths in spec - multiple http node urls configured", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + { + Url: "https://localhost:5678", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": { + {Url: "https://localhost:1234", InternalPath: ""}, + {Url: "https://localhost:5678", InternalPath: ""}, + }, + }, + }, + { + name: "No internal paths in spec - single ws node url - should error", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "wss://localhost:1234/ws", + InternalPath: "", + }, + }, + expectedError: true, + }, + { + name: "No internal paths in spec - both ws and http node urls", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + { + Url: "wss://localhost:1234/ws", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "|websocket|": {{Url: "wss://localhost:1234/ws", InternalPath: ""}}, + }, + }, + { + name: "With internal paths in spec - single http node url configured - not covering all internal paths", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/Y", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:1234/X", InternalPath: "/X"}}, + "||internal-path:/Y|": {{Url: "https://localhost:1234/Y", InternalPath: "/Y"}}, + }, + }, + { + name: "With internal paths in spec - multiple http node urls configured - covering some internal paths", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/Y", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + { + Url: "https://localhost:1234/X", + InternalPath: "/X", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:1234/X", InternalPath: "/X"}}, + "||internal-path:/Y|": {{Url: "https://localhost:1234/Y", InternalPath: "/Y"}}, + }, + }, + { + name: "With internal paths in spec - multiple http node urls configured - covering all internal paths", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/Y", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + { + Url: "https://localhost:1234/X", + InternalPath: "/X", + }, + { + Url: "https://localhost:1234/Y", + InternalPath: "/Y", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:1234/X", InternalPath: "/X"}}, + "||internal-path:/Y|": {{Url: "https://localhost:1234/Y", InternalPath: "/Y"}}, + }, + }, + { + name: "With internal paths in spec - multiple http node urls configured - no root internal path - should error", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/Y", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234/X", + InternalPath: "/X", + }, + { + Url: "https://localhost:1234/Y", + InternalPath: "/Y", + }, + }, + expectedError: true, + }, + { + name: "With internal paths in spec - multiple http node urls and ws configured - covering all internal paths", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/Y", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "wss://localhost:1234/ws", + InternalPath: "", + }, + { + Url: "https://localhost:5678", + InternalPath: "", + }, + { + Url: "https://localhost:5678/X", + InternalPath: "/X", + }, + { + Url: "https://localhost:9012/Y", + InternalPath: "/Y", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:5678", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:5678/X", InternalPath: "/X"}}, + "||internal-path:/Y|": {{Url: "https://localhost:9012/Y", InternalPath: "/Y"}}, + "|websocket|": {{Url: "wss://localhost:1234/ws", InternalPath: ""}}, + }, + }, + { + name: "With internal paths in spec - only root http and ws configured", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/Y", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + { + Url: "wss://localhost:1234", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:1234/X", InternalPath: "/X"}}, + "||internal-path:/Y|": {{Url: "https://localhost:1234/Y", InternalPath: "/Y"}}, + "|websocket|": {{Url: "wss://localhost:1234", InternalPath: ""}}, + }, + }, + { + name: "With internal paths in spec - only root http and ws and one out of two internal paths are configured", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/Y", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + { + Url: "https://localhost:5678/X", + InternalPath: "/X", + }, + { + Url: "wss://localhost:1234", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:5678/X", InternalPath: "/X"}}, + "||internal-path:/Y|": {{Url: "https://localhost:1234/Y", InternalPath: "/Y"}}, + "|websocket|": {{Url: "wss://localhost:1234", InternalPath: ""}}, + }, + }, + { + name: "With internal paths and ws internal paths in spec - only http is configured", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/WS", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + ParseDirectives: []*spectypes.ParseDirective{{ + FunctionTag: spectypes.FUNCTION_TAG_SUBSCRIBE, + }}, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:1234/X", InternalPath: "/X"}}, + "||internal-path:/WS|": {{Url: "https://localhost:1234/WS", InternalPath: "/WS"}}, + }, + }, + { + name: "With internal paths and ws internal paths in spec - http and ws is configured", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/WS", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + ParseDirectives: []*spectypes.ParseDirective{{ + FunctionTag: spectypes.FUNCTION_TAG_SUBSCRIBE, + }}, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + { + Url: "wss://localhost:5678", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:1234/X", InternalPath: "/X"}}, + "||internal-path:/WS|": {{Url: "https://localhost:1234/WS", InternalPath: "/WS"}}, + "|websocket|": {{Url: "wss://localhost:5678", InternalPath: ""}}, + "|websocket|internal-path:/WS|": {{Url: "wss://localhost:5678/WS", InternalPath: "/WS"}}, + }, + }, + { + name: "With internal paths and multiple ws internal paths in spec - http and ws is configured", + apiInterface: apiInterface, + specApiCollections: []*spectypes.ApiCollection{ + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/X", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + ParseDirectives: []*spectypes.ParseDirective{{ + FunctionTag: spectypes.FUNCTION_TAG_SUBSCRIBE, + }}, + }, + { + Enabled: true, + CollectionData: spectypes.CollectionData{ + ApiInterface: apiInterface, + InternalPath: "/WS", + Type: "POST", + AddOn: "", + }, + InheritanceApis: []*spectypes.CollectionData{ + { + ApiInterface: apiInterface, + InternalPath: "", + Type: "POST", + AddOn: "", + }, + }, + ParseDirectives: []*spectypes.ParseDirective{{ + FunctionTag: spectypes.FUNCTION_TAG_SUBSCRIBE, + }}, + }, + }, + nodeUrls: []common.NodeUrl{ + { + Url: "https://localhost:1234", + InternalPath: "", + }, + { + Url: "wss://localhost:1234", + InternalPath: "", + }, + }, + expectedServicesToNodeUrls: map[string][]common.NodeUrl{ + "||": {{Url: "https://localhost:1234", InternalPath: ""}}, + "||internal-path:/X|": {{Url: "https://localhost:1234/X", InternalPath: "/X"}}, + "||internal-path:/WS|": {{Url: "https://localhost:1234/WS", InternalPath: "/WS"}}, + "|websocket|": {{Url: "wss://localhost:1234", InternalPath: ""}}, + "|websocket|internal-path:/WS|": {{Url: "wss://localhost:1234/WS", InternalPath: "/WS"}}, + "|websocket|internal-path:/X|": {{Url: "wss://localhost:1234/X", InternalPath: "/X"}}, + }, + }, + }...) + } + + for _, play := range playBook { + t.Run(play.apiInterface+" - "+play.name, func(t *testing.T) { + chainParser, err := NewChainParser(play.apiInterface) + require.NoError(t, err) + + IgnoreSubscriptionNotConfiguredError = false + + spec := testcommon.CreateMockSpec() + spec.ApiCollections = play.specApiCollections + chainParser.SetSpec(spec) + + endpoint := lavasession.RPCProviderEndpoint{ + NetworkAddress: lavasession.NetworkAddressData{}, + ChainID: spec.Index, + ApiInterface: play.apiInterface, + Geolocation: 1, + NodeUrls: play.nodeUrls, + } + + chainRouter := &chainRouterImpl{} + + nodeUrlsByService, err := chainRouter.BatchNodeUrlsByServices(endpoint, chainParser) + if play.expectedError { + require.Error(t, err) + return + } + + require.NoError(t, err) + + require.Equal(t, len(play.expectedServicesToNodeUrls), len(nodeUrlsByService), nodeUrlsByService) + actualNodeUrlsCount := 0 + for routerKey, actualEndpoint := range nodeUrlsByService { + // Check that the router key is in the expected services + require.Contains(t, play.expectedServicesToNodeUrls, routerKey, routerKey) + actualNodeUrlsCount += len(actualEndpoint.NodeUrls) + + expectedNodeUrls := play.expectedServicesToNodeUrls[routerKey] + require.Len(t, actualEndpoint.NodeUrls, len(expectedNodeUrls), + fmt.Sprintf("RouterKey: %v, NodeUrls: %v", routerKey, actualEndpoint.NodeUrls)) + + for _, actualNodeUrl := range actualEndpoint.NodeUrls { + found := false + for _, expectedNodeUrls := range expectedNodeUrls { + if expectedNodeUrls.Url == actualNodeUrl.Url && expectedNodeUrls.InternalPath == actualNodeUrl.InternalPath { + found = true + break + } + } + require.True(t, found, actualNodeUrl) + } + } + }) + } +} diff --git a/protocol/chainlib/chainlib.go b/protocol/chainlib/chainlib.go index 44b8184405..93d604e773 100644 --- a/protocol/chainlib/chainlib.go +++ b/protocol/chainlib/chainlib.go @@ -5,14 +5,14 @@ import ( "fmt" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) var ( @@ -63,9 +63,11 @@ type ChainParser interface { DataReliabilityParams() (enabled bool, dataReliabilityThreshold uint32) ChainBlockStats() (allowedBlockLagForQosSync int64, averageBlockTime time.Duration, blockDistanceForFinalizedData, blocksInFinalizationProof uint32) GetParsingByTag(tag spectypes.FUNCTION_TAG) (parsing *spectypes.ParseDirective, apiCollection *spectypes.ApiCollection, existed bool) + IsTagInCollection(tag spectypes.FUNCTION_TAG, collectionKey CollectionKey) bool + GetAllInternalPaths() []string CraftMessage(parser *spectypes.ParseDirective, connectionType string, craftData *CraftData, metadata []pairingtypes.Metadata) (ChainMessageForSend, error) HandleHeaders(metadata []pairingtypes.Metadata, apiCollection *spectypes.ApiCollection, headersDirection spectypes.Header_HeaderType) (filtered []pairingtypes.Metadata, overwriteReqBlock string, ignoredMetadata []pairingtypes.Metadata) - GetVerifications(supported []string) ([]VerificationContainer, error) + GetVerifications(supported []string, internalPath string, apiInterface string) ([]VerificationContainer, error) SeparateAddonsExtensions(supported []string) (addons, extensions []string, err error) SetPolicy(policy PolicyInf, chainId string, apiInterface string) error Active() bool @@ -88,6 +90,7 @@ type ChainMessage interface { SetForceCacheRefresh(force bool) bool CheckResponseError(data []byte, httpStatusCode int) (hasError bool, errorMessage string) GetRawRequestHash() ([]byte, error) + GetRequestedBlocksHashes() []string ChainMessageForSend } diff --git a/protocol/chainlib/chainlib_mock.go b/protocol/chainlib/chainlib_mock.go index 8ba6c64410..fec033fe68 100644 --- a/protocol/chainlib/chainlib_mock.go +++ b/protocol/chainlib/chainlib_mock.go @@ -10,13 +10,13 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - rpcInterfaceMessages "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - rpcclient "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - extensionslib "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - common "github.com/lavanet/lava/v3/protocol/common" - metrics "github.com/lavanet/lava/v3/protocol/metrics" - types "github.com/lavanet/lava/v3/x/pairing/types" - types0 "github.com/lavanet/lava/v3/x/spec/types" + rpcInterfaceMessages "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + rpcclient "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + extensionslib "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + common "github.com/lavanet/lava/v4/protocol/common" + metrics "github.com/lavanet/lava/v4/protocol/metrics" + types "github.com/lavanet/lava/v4/x/pairing/types" + types0 "github.com/lavanet/lava/v4/x/spec/types" ) // MockChainParser is a mock of ChainParser interface. @@ -282,6 +282,14 @@ func (m *MockChainMessage) EXPECT() *MockChainMessageMockRecorder { return m.recorder } +// AppendHeader mocks base method. +func (m *MockChainMessage) GetRequestedBlocksHashes() []string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetRequestedBlocksHashes") + ret0, _ := ret[0].([]string) + return ret0 +} + // AppendHeader mocks base method. func (m *MockChainMessage) AppendHeader(metadata []types.Metadata) { m.ctrl.T.Helper() diff --git a/protocol/chainlib/chainproxy/common.go b/protocol/chainlib/chainproxy/common.go index ef410817ca..d0ddf9928e 100644 --- a/protocol/chainlib/chainproxy/common.go +++ b/protocol/chainlib/chainproxy/common.go @@ -5,9 +5,9 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/protocol/parser" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/parser" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( diff --git a/protocol/chainlib/chainproxy/connector.go b/protocol/chainlib/chainproxy/connector.go index 6f470d4742..c6926a0cb0 100644 --- a/protocol/chainlib/chainproxy/connector.go +++ b/protocol/chainlib/chainproxy/connector.go @@ -18,10 +18,10 @@ import ( "sync/atomic" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/protocol/chainlib/chainproxy/connector_test.go b/protocol/chainlib/chainproxy/connector_test.go index 651f09e4dd..e408ae2062 100644 --- a/protocol/chainlib/chainproxy/connector_test.go +++ b/protocol/chainlib/chainproxy/connector_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" - pb_pkg "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" + pb_pkg "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/protocol/chainlib/chainproxy/rpcInterfaceMessages/common.go b/protocol/chainlib/chainproxy/rpcInterfaceMessages/common.go index 96a79bc822..fb288637a2 100644 --- a/protocol/chainlib/chainproxy/rpcInterfaceMessages/common.go +++ b/protocol/chainlib/chainproxy/rpcInterfaceMessages/common.go @@ -4,9 +4,9 @@ import ( sdkerrors "cosmossdk.io/errors" "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/parser" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/parser" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) var WontCalculateBatchHash = sdkerrors.New("Wont calculate batch hash", 892, "wont calculate batch message hash") // on batches we just wont calculate hashes, meaning we wont retry. diff --git a/protocol/chainlib/chainproxy/rpcInterfaceMessages/grpcMessage.go b/protocol/chainlib/chainproxy/rpcInterfaceMessages/grpcMessage.go index 4d01346c94..9734f73327 100644 --- a/protocol/chainlib/chainproxy/rpcInterfaceMessages/grpcMessage.go +++ b/protocol/chainlib/chainproxy/rpcInterfaceMessages/grpcMessage.go @@ -13,12 +13,12 @@ import ( "github.com/jhump/protoreflect/desc" "github.com/jhump/protoreflect/dynamic" "github.com/jhump/protoreflect/grpcreflect" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - dyncodec "github.com/lavanet/lava/v3/protocol/chainlib/grpcproxy/dyncodec" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + dyncodec "github.com/lavanet/lava/v4/protocol/chainlib/grpcproxy/dyncodec" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" "google.golang.org/grpc/codes" "google.golang.org/protobuf/reflect/protoreflect" diff --git a/protocol/chainlib/chainproxy/rpcInterfaceMessages/grpcMessage_test.go b/protocol/chainlib/chainproxy/rpcInterfaceMessages/grpcMessage_test.go index 50da0ae37e..f049e1c793 100644 --- a/protocol/chainlib/chainproxy/rpcInterfaceMessages/grpcMessage_test.go +++ b/protocol/chainlib/chainproxy/rpcInterfaceMessages/grpcMessage_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/protocol/chainlib/chainproxy/rpcInterfaceMessages/jsonRPCMessage.go b/protocol/chainlib/chainproxy/rpcInterfaceMessages/jsonRPCMessage.go index 6eaa79ca0c..cc31752d3c 100644 --- a/protocol/chainlib/chainproxy/rpcInterfaceMessages/jsonRPCMessage.go +++ b/protocol/chainlib/chainproxy/rpcInterfaceMessages/jsonRPCMessage.go @@ -6,11 +6,11 @@ import ( "github.com/goccy/go-json" sdkerrors "cosmossdk.io/errors" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" ) var ErrFailedToConvertMessage = sdkerrors.New("RPC error", 1000, "failed to convert a message") @@ -56,7 +56,7 @@ func (jm JsonrpcMessage) CheckResponseError(data []byte, httpStatusCode int) (ha utils.LavaFormatWarning("Failed unmarshalling CheckError", err, utils.LogAttr("data", string(data))) return false, "" } - if result.Error == nil { + if result.Error == nil { // no error return false, "" } return result.Error.Message != "", result.Error.Message diff --git a/protocol/chainlib/chainproxy/rpcInterfaceMessages/jsonRPCMessage_test.go b/protocol/chainlib/chainproxy/rpcInterfaceMessages/jsonRPCMessage_test.go index 711b1a119a..f4113932fc 100644 --- a/protocol/chainlib/chainproxy/rpcInterfaceMessages/jsonRPCMessage_test.go +++ b/protocol/chainlib/chainproxy/rpcInterfaceMessages/jsonRPCMessage_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/protocol/chainlib/chainproxy/rpcInterfaceMessages/restMessage.go b/protocol/chainlib/chainproxy/rpcInterfaceMessages/restMessage.go index 39eeb7b9aa..1d5c18329a 100644 --- a/protocol/chainlib/chainproxy/rpcInterfaceMessages/restMessage.go +++ b/protocol/chainlib/chainproxy/rpcInterfaceMessages/restMessage.go @@ -6,11 +6,11 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" ) type RestMessage struct { diff --git a/protocol/chainlib/chainproxy/rpcInterfaceMessages/tendermintRPCMessage.go b/protocol/chainlib/chainproxy/rpcInterfaceMessages/tendermintRPCMessage.go index 76d0e3d633..f370f00cd0 100644 --- a/protocol/chainlib/chainproxy/rpcInterfaceMessages/tendermintRPCMessage.go +++ b/protocol/chainlib/chainproxy/rpcInterfaceMessages/tendermintRPCMessage.go @@ -6,12 +6,12 @@ import ( tenderminttypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/utils" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils/sigs" ) type TendermintrpcMessage struct { @@ -50,6 +50,37 @@ func (cp TendermintrpcMessage) GetParams() interface{} { return cp.Params } +type TendermintMessageResponseBody struct { + Code int `json:"code,omitempty"` + Log string `json:"log,omitempty"` +} + +type TendermintMessageResponse struct { + Response TendermintMessageResponseBody `json:"response,omitempty"` +} + +// returns if error exists and +func (jm TendermintrpcMessage) CheckResponseError(data []byte, httpStatusCode int) (hasError bool, errorMessage string) { + result := &JsonrpcMessage{} + err := json.Unmarshal(data, result) + if err != nil { + utils.LavaFormatWarning("Failed unmarshalling CheckError", err, utils.LogAttr("data", string(data))) + return false, "" + } + + if result.Error == nil { // no error + if result.Result != nil { // check if we got a tendermint error + tendermintResponse := &TendermintMessageResponse{} + err := json.Unmarshal(result.Result, tendermintResponse) + if err == nil { + return (tendermintResponse.Response.Code != 0 && tendermintResponse.Response.Log != ""), tendermintResponse.Response.Log + } + } + return false, "" + } + return result.Error.Message != "", result.Error.Message +} + func (tm TendermintrpcMessage) GetResult() json.RawMessage { if tm.Error != nil { utils.LavaFormatWarning("GetResult() Request got an error from the node", nil, utils.Attribute{Key: "error", Value: tm.Error}) diff --git a/protocol/chainlib/chainproxy/rpcInterfaceMessages/tendermintRPCMessage_test.go b/protocol/chainlib/chainproxy/rpcInterfaceMessages/tendermintRPCMessage_test.go index 756f9d1c70..59c355e506 100644 --- a/protocol/chainlib/chainproxy/rpcInterfaceMessages/tendermintRPCMessage_test.go +++ b/protocol/chainlib/chainproxy/rpcInterfaceMessages/tendermintRPCMessage_test.go @@ -7,7 +7,7 @@ import ( "testing" tenderminttypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/protocol/chainlib/chainproxy/rpcclient/client.go b/protocol/chainlib/chainproxy/rpcclient/client.go index 2950de5b82..c745f82ee2 100644 --- a/protocol/chainlib/chainproxy/rpcclient/client.go +++ b/protocol/chainlib/chainproxy/rpcclient/client.go @@ -29,7 +29,7 @@ import ( "github.com/goccy/go-json" "github.com/ethereum/go-ethereum/log" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) var ( diff --git a/protocol/chainlib/chainproxy/rpcclient/handler.go b/protocol/chainlib/chainproxy/rpcclient/handler.go index 5e9abe2412..bb1aa31199 100755 --- a/protocol/chainlib/chainproxy/rpcclient/handler.go +++ b/protocol/chainlib/chainproxy/rpcclient/handler.go @@ -27,7 +27,7 @@ import ( "github.com/goccy/go-json" "github.com/ethereum/go-ethereum/log" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) // handler handles JSON-RPC messages. There is one handler per connection. Note that @@ -242,6 +242,12 @@ func (h *handler) handleImmediate(msg *JsonrpcMessage) bool { return true } return false + case msg.isStarkNetPathfinderNotification(): + if strings.HasSuffix(msg.Method, notificationMethodSuffix) { + h.handleSubscriptionResultStarkNetPathfinder(msg) + return true + } + return false case msg.isResponse(): h.handleResponse(msg) h.log.Trace("Handled RPC response", "reqid", idForLog{msg.ID}, "duration", time.Since(start)) @@ -251,10 +257,31 @@ func (h *handler) handleImmediate(msg *JsonrpcMessage) bool { } } +func (h *handler) handleSubscriptionResultStarkNetPathfinder(msg *JsonrpcMessage) { + var result starkNetPathfinderSubscriptionResult + if err := json.Unmarshal(msg.Result, &result); err != nil { + utils.LavaFormatTrace("Dropping invalid starknet pathfinder subscription message", + utils.LogAttr("err", err), + utils.LogAttr("result", string(msg.Result)), + ) + h.log.Debug("Dropping invalid subscription message") + return + } + + id := strconv.Itoa(result.ID) + if h.clientSubs[id] != nil { + h.clientSubs[id].deliver(msg) + } +} + // handleSubscriptionResult processes subscription notifications. func (h *handler) handleSubscriptionResultEthereum(msg *JsonrpcMessage) { var result ethereumSubscriptionResult if err := json.Unmarshal(msg.Params, &result); err != nil { + utils.LavaFormatTrace("Dropping invalid ethereum subscription message", + utils.LogAttr("err", err), + utils.LogAttr("params", string(msg.Params)), + ) h.log.Debug("Dropping invalid subscription message") return } @@ -266,6 +293,10 @@ func (h *handler) handleSubscriptionResultEthereum(msg *JsonrpcMessage) { func (h *handler) handleSubscriptionResultTendermint(msg *JsonrpcMessage) { var result tendermintSubscriptionResult if err := json.Unmarshal(msg.Result, &result); err != nil { + utils.LavaFormatTrace("Dropping invalid tendermint subscription message", + utils.LogAttr("err", err), + utils.LogAttr("result", string(msg.Result)), + ) h.log.Debug("Dropping invalid subscription message") return } @@ -302,6 +333,15 @@ func (h *handler) handleResponse(msg *JsonrpcMessage) { } else if op.err = json.Unmarshal(msg.Result, &op.sub.subid); op.err == nil { go op.sub.run() h.clientSubs[op.sub.subid] = op.sub + } else { + // This is because StarkNet Pathfinder is returning an integer instead of a string in the result + var integerSubId int + if json.Unmarshal(msg.Result, &integerSubId) == nil { + op.err = nil + op.sub.subid = strconv.Itoa(integerSubId) + go op.sub.run() + h.clientSubs[op.sub.subid] = op.sub + } } } diff --git a/protocol/chainlib/chainproxy/rpcclient/http.go b/protocol/chainlib/chainproxy/rpcclient/http.go index 95317a7a9b..019882d865 100755 --- a/protocol/chainlib/chainproxy/rpcclient/http.go +++ b/protocol/chainlib/chainproxy/rpcclient/http.go @@ -31,8 +31,8 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/protocol/chainlib/chainproxy/rpcclient/json.go b/protocol/chainlib/chainproxy/rpcclient/json.go index 5984cc368b..d2c1c5d777 100755 --- a/protocol/chainlib/chainproxy/rpcclient/json.go +++ b/protocol/chainlib/chainproxy/rpcclient/json.go @@ -29,7 +29,7 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) const ( @@ -49,6 +49,11 @@ type ethereumSubscriptionResult struct { Result json.RawMessage `json:"result,omitempty"` } +type starkNetPathfinderSubscriptionResult struct { + ID int `json:"subscription"` + Result json.RawMessage `json:"result,omitempty"` +} + type tendermintSubscriptionResult struct { Query string `json:"query"` } @@ -68,8 +73,12 @@ type tendermintSubscribeReply struct { Query string `json:"query"` } +func (msg *JsonrpcMessage) isStarkNetPathfinderNotification() bool { + return msg.ID == nil && msg.Method != "" && msg.Result != nil +} + func (msg *JsonrpcMessage) isEthereumNotification() bool { - return msg.ID == nil && msg.Method != "" + return msg.ID == nil && msg.Method != "" && msg.Params != nil } func (msg *JsonrpcMessage) isTendermintNotification() bool { diff --git a/protocol/chainlib/chainproxy/rpcclient/service.go b/protocol/chainlib/chainproxy/rpcclient/service.go index e175e28be0..39be3d4632 100755 --- a/protocol/chainlib/chainproxy/rpcclient/service.go +++ b/protocol/chainlib/chainproxy/rpcclient/service.go @@ -26,7 +26,7 @@ import ( "unicode" "github.com/ethereum/go-ethereum/log" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) var ( diff --git a/protocol/chainlib/chainproxy/rpcclient/subscription.go b/protocol/chainlib/chainproxy/rpcclient/subscription.go index 6c9bf81f10..803ecc171c 100755 --- a/protocol/chainlib/chainproxy/rpcclient/subscription.go +++ b/protocol/chainlib/chainproxy/rpcclient/subscription.go @@ -32,7 +32,7 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) var ( diff --git a/protocol/chainlib/chainproxy/rpcclient/types.go b/protocol/chainlib/chainproxy/rpcclient/types.go index 21c4dd3374..9d9e2299ec 100755 --- a/protocol/chainlib/chainproxy/rpcclient/types.go +++ b/protocol/chainlib/chainproxy/rpcclient/types.go @@ -27,7 +27,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) // API describes the set of methods offered over the RPC interface diff --git a/protocol/chainlib/chainproxy/rpcclient/utils.go b/protocol/chainlib/chainproxy/rpcclient/utils.go index 67a5ed5aaf..eebed6d9c0 100644 --- a/protocol/chainlib/chainproxy/rpcclient/utils.go +++ b/protocol/chainlib/chainproxy/rpcclient/utils.go @@ -1,7 +1,7 @@ package rpcclient import ( - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils/sigs" ) func CreateHashFromParams(params []byte) string { diff --git a/protocol/chainlib/common.go b/protocol/chainlib/common.go index e2cfb01f80..08a7374b4a 100644 --- a/protocol/chainlib/common.go +++ b/protocol/chainlib/common.go @@ -5,6 +5,7 @@ import ( "fmt" "net" "net/http" + "net/url" "strings" "time" @@ -14,11 +15,11 @@ import ( "github.com/gofiber/fiber/v2/middleware/compress" "github.com/gofiber/fiber/v2/middleware/favicon" "github.com/gofiber/websocket/v2" - common "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + common "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc/metadata" ) @@ -30,11 +31,13 @@ const ( relayMsgLogMaxChars = 200 RPCProviderNodeAddressHash = "Lava-Provider-Node-Address-Hash" RPCProviderNodeExtension = "Lava-Provider-Node-Extension" + RpcProviderLoadRateHeader = "Lava-Provider-Load-Rate" RpcProviderUniqueIdHeader = "Lava-Provider-Unique-Id" WebSocketExtension = "websocket" ) var ( + TrailersToAddToHeaderResponse = []string{RPCProviderNodeExtension, RpcProviderLoadRateHeader} InvalidResponses = []string{"null", "", "nil", "undefined"} FailedSendingSubscriptionToClients = sdkerrors.New("failed Sending Subscription To Clients", 1015, "Failed Sending Subscription To Clients connection might have been closed by the user") NoActiveSubscriptionFound = sdkerrors.New("failed finding an active subscription on provider side", 1016, "no active subscriptions for hashed params.") @@ -51,6 +54,7 @@ type VerificationKey struct { } type VerificationContainer struct { + InternalPath string ConnectionType string Name string ParseDirective spectypes.ParseDirective @@ -433,3 +437,12 @@ func GetTimeoutInfo(chainMessage ChainMessageForSend) common.TimeoutInfo { Stateful: GetStateful(chainMessage), } } + +func IsUrlWebSocket(urlToParse string) (bool, error) { + u, err := url.Parse(urlToParse) + if err != nil { + return false, err + } + + return u.Scheme == "ws" || u.Scheme == "wss", nil +} diff --git a/protocol/chainlib/common_test.go b/protocol/chainlib/common_test.go index 1079574a61..2d7a9631ca 100644 --- a/protocol/chainlib/common_test.go +++ b/protocol/chainlib/common_test.go @@ -11,9 +11,9 @@ import ( "github.com/gofiber/fiber/v2" "github.com/gofiber/websocket/v2" websocket2 "github.com/gorilla/websocket" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -213,7 +213,7 @@ func TestExtractDappIDFromWebsocketConnection(t *testing.T) { testCase := testCase t.Run(testCase.name, func(t *testing.T) { - url := "ws://localhost:3000" + testCase.route + url := "ws://127.0.0.1:3000" + testCase.route dialer := &websocket2.Dialer{} conn, _, err := dialer.Dial(url, testCase.headers) if err != nil { diff --git a/protocol/chainlib/common_test_utils.go b/protocol/chainlib/common_test_utils.go index 5d8c833663..88b545a721 100644 --- a/protocol/chainlib/common_test_utils.go +++ b/protocol/chainlib/common_test_utils.go @@ -12,23 +12,23 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" "github.com/cosmos/cosmos-sdk/server/grpc/gogoreflection" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - testcommon "github.com/lavanet/lava/v3/testutil/common" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - specutils "github.com/lavanet/lava/v3/utils/keeper" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + testcommon "github.com/lavanet/lava/v4/testutil/common" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + specutils "github.com/lavanet/lava/v4/utils/keeper" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/protocol/chainlib/consumer_websocket_manager.go b/protocol/chainlib/consumer_websocket_manager.go index 5f47180489..6bf645cf4a 100644 --- a/protocol/chainlib/consumer_websocket_manager.go +++ b/protocol/chainlib/consumer_websocket_manager.go @@ -8,12 +8,12 @@ import ( "github.com/goccy/go-json" "github.com/gofiber/websocket/v2" - formatter "github.com/lavanet/lava/v3/ecosystem/cache/format" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + formatter "github.com/lavanet/lava/v4/ecosystem/cache/format" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/tidwall/gjson" ) diff --git a/protocol/chainlib/consumer_ws_subscription_manager.go b/protocol/chainlib/consumer_ws_subscription_manager.go index 102bd8240a..72ed94e3ee 100644 --- a/protocol/chainlib/consumer_ws_subscription_manager.go +++ b/protocol/chainlib/consumer_ws_subscription_manager.go @@ -7,15 +7,15 @@ import ( "sync" gojson "github.com/goccy/go-json" - rpcclient "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/protocopy" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + rpcclient "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/protocopy" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type unsubscribeRelayData struct { diff --git a/protocol/chainlib/consumer_ws_subscription_manager_test.go b/protocol/chainlib/consumer_ws_subscription_manager_test.go index cc39f4d3aa..08015c239f 100644 --- a/protocol/chainlib/consumer_ws_subscription_manager_test.go +++ b/protocol/chainlib/consumer_ws_subscription_manager_test.go @@ -11,16 +11,16 @@ import ( "time" gomock "github.com/golang/mock/gomock" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/provideroptimizer" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/provideroptimizer" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" gomockuber "go.uber.org/mock/gomock" diff --git a/protocol/chainlib/extensionslib/archive_parser_rule.go b/protocol/chainlib/extensionslib/archive_parser_rule.go index 13921346ac..d41964b0a7 100644 --- a/protocol/chainlib/extensionslib/archive_parser_rule.go +++ b/protocol/chainlib/extensionslib/archive_parser_rule.go @@ -1,7 +1,7 @@ package extensionslib import ( - spectypes "github.com/lavanet/lava/v3/x/spec/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type ArchiveParserRule struct { diff --git a/protocol/chainlib/extensionslib/extension_parser.go b/protocol/chainlib/extensionslib/extension_parser.go index 8ec0239a54..c8fc38db90 100644 --- a/protocol/chainlib/extensionslib/extension_parser.go +++ b/protocol/chainlib/extensionslib/extension_parser.go @@ -1,7 +1,7 @@ package extensionslib import ( - spectypes "github.com/lavanet/lava/v3/x/spec/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type ExtensionInfo struct { diff --git a/protocol/chainlib/grpc.go b/protocol/chainlib/grpc.go index 9b15d87a3c..926be7bcf3 100644 --- a/protocol/chainlib/grpc.go +++ b/protocol/chainlib/grpc.go @@ -14,11 +14,11 @@ import ( "github.com/goccy/go-json" "github.com/gogo/protobuf/jsonpb" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/chainlib/grpcproxy" - dyncodec "github.com/lavanet/lava/v3/protocol/chainlib/grpcproxy/dyncodec" - "github.com/lavanet/lava/v3/protocol/parser" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/chainlib/grpcproxy" + dyncodec "github.com/lavanet/lava/v4/protocol/chainlib/grpcproxy/dyncodec" + "github.com/lavanet/lava/v4/protocol/parser" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -29,15 +29,15 @@ import ( "github.com/jhump/protoreflect/desc" "github.com/jhump/protoreflect/dynamic" "github.com/jhump/protoreflect/grpcreflect" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" reflectionpbo "google.golang.org/grpc/reflection/grpc_reflection_v1alpha" "google.golang.org/grpc/status" ) @@ -128,7 +128,7 @@ func (apip *GrpcChainParser) ParseMsg(url string, data []byte, connectionType st // Check API is supported and save it in nodeMsg. apiCont, err := apip.getSupportedApi(url, connectionType) if err != nil { - return nil, utils.LavaFormatError("failed to getSupportedApi gRPC", err) + return nil, utils.LavaFormatError("failed to getSupportedApi gRPC", err, utils.LogAttr("url", url), utils.LogAttr("connectionType", connectionType)) } apiCollection, err := apip.getApiCollection(connectionType, apiCont.collectionKey.InternalPath, apiCont.collectionKey.Addon) diff --git a/protocol/chainlib/grpc_test.go b/protocol/chainlib/grpc_test.go index 68e5d2ece5..119ba64e84 100644 --- a/protocol/chainlib/grpc_test.go +++ b/protocol/chainlib/grpc_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/parser" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/parser" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/protocol/chainlib/grpcproxy/dyncodec/registry.go b/protocol/chainlib/grpcproxy/dyncodec/registry.go index 63aa527648..810a1c64c8 100644 --- a/protocol/chainlib/grpcproxy/dyncodec/registry.go +++ b/protocol/chainlib/grpcproxy/dyncodec/registry.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "google.golang.org/protobuf/reflect/protodesc" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/reflect/protoregistry" diff --git a/protocol/chainlib/grpcproxy/dyncodec/remote_grpc_reflection.go b/protocol/chainlib/grpcproxy/dyncodec/remote_grpc_reflection.go index 2e0e692388..4ec1ef6642 100644 --- a/protocol/chainlib/grpcproxy/dyncodec/remote_grpc_reflection.go +++ b/protocol/chainlib/grpcproxy/dyncodec/remote_grpc_reflection.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "google.golang.org/grpc" "google.golang.org/grpc/reflection/grpc_reflection_v1alpha" "google.golang.org/protobuf/proto" diff --git a/protocol/chainlib/grpcproxy/dyncodec/remote_relayer.go b/protocol/chainlib/grpcproxy/dyncodec/remote_relayer.go index 1ece97e57f..f8268cc170 100644 --- a/protocol/chainlib/grpcproxy/dyncodec/remote_relayer.go +++ b/protocol/chainlib/grpcproxy/dyncodec/remote_relayer.go @@ -3,7 +3,7 @@ package dyncodec import ( "context" - "github.com/lavanet/lava/v3/protocol/chainlib/grpcproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/grpcproxy" "google.golang.org/grpc/reflection/grpc_reflection_v1alpha" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" diff --git a/protocol/chainlib/grpcproxy/dyncodec/remotes_test.go b/protocol/chainlib/grpcproxy/dyncodec/remotes_test.go index 711277c022..c5ca216ad4 100644 --- a/protocol/chainlib/grpcproxy/dyncodec/remotes_test.go +++ b/protocol/chainlib/grpcproxy/dyncodec/remotes_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/lavanet/lava/v3/protocol/chainlib/grpcproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/grpcproxy/testproto" + "github.com/lavanet/lava/v4/protocol/chainlib/grpcproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/grpcproxy/testproto" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/protocol/chainlib/grpcproxy/grpcproxy.go b/protocol/chainlib/grpcproxy/grpcproxy.go index d9e86fa48b..030da061ac 100644 --- a/protocol/chainlib/grpcproxy/grpcproxy.go +++ b/protocol/chainlib/grpcproxy/grpcproxy.go @@ -7,8 +7,8 @@ import ( "github.com/gofiber/fiber/v2" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" "google.golang.org/grpc" diff --git a/protocol/chainlib/grpcproxy/grpcproxy_test.go b/protocol/chainlib/grpcproxy/grpcproxy_test.go index 2f766868bf..76b4ea999b 100644 --- a/protocol/chainlib/grpcproxy/grpcproxy_test.go +++ b/protocol/chainlib/grpcproxy/grpcproxy_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/lavanet/lava/v3/protocol/chainlib/grpcproxy/testproto" - "github.com/lavanet/lava/v3/protocol/common" + "github.com/lavanet/lava/v4/protocol/chainlib/grpcproxy/testproto" + "github.com/lavanet/lava/v4/protocol/common" "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" ) diff --git a/protocol/chainlib/jsonRPC.go b/protocol/chainlib/jsonRPC.go index 1c2809cbf9..39eedb17c9 100644 --- a/protocol/chainlib/jsonRPC.go +++ b/protocol/chainlib/jsonRPC.go @@ -14,18 +14,18 @@ import ( "github.com/gofiber/fiber/v2" "github.com/gofiber/websocket/v2" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/parser" - - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/parser" + + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const SEP = "&" @@ -61,7 +61,12 @@ func (apip *JsonRPCChainParser) getSupportedApi(name, connectionType string, int func (apip *JsonRPCChainParser) CraftMessage(parsing *spectypes.ParseDirective, connectionType string, craftData *CraftData, metadata []pairingtypes.Metadata) (ChainMessageForSend, error) { if craftData != nil { - chainMessage, err := apip.ParseMsg("", craftData.Data, craftData.ConnectionType, metadata, extensionslib.ExtensionInfo{LatestBlock: 0}) + path := craftData.Path + if craftData.InternalPath != "" { + path = craftData.InternalPath + } + + chainMessage, err := apip.ParseMsg(path, craftData.Data, craftData.ConnectionType, metadata, extensionslib.ExtensionInfo{LatestBlock: 0}) if err == nil { chainMessage.AppendHeader(metadata) } @@ -496,7 +501,7 @@ func (apil *JsonRPCChainListener) GetListeningAddress() string { type JrpcChainProxy struct { BaseChainProxy - conn map[string]*chainproxy.Connector + conn *chainproxy.Connector } func NewJrpcChainProxy(ctx context.Context, nConns uint, rpcProviderEndpoint lavasession.RPCProviderEndpoint, chainParser ChainParser) (ChainProxy, error) { @@ -504,7 +509,10 @@ func NewJrpcChainProxy(ctx context.Context, nConns uint, rpcProviderEndpoint lav return nil, utils.LavaFormatError("rpcProviderEndpoint.NodeUrl list is empty missing node url", nil, utils.Attribute{Key: "chainID", Value: rpcProviderEndpoint.ChainID}, utils.Attribute{Key: "ApiInterface", Value: rpcProviderEndpoint.ApiInterface}) } _, averageBlockTime, _, _ := chainParser.ChainBlockStats() + + // look for the first node url that has no internal path, otherwise take first node url nodeUrl := rpcProviderEndpoint.NodeUrls[0] + cp := &JrpcChainProxy{ BaseChainProxy: BaseChainProxy{ averageBlockTime: averageBlockTime, @@ -512,72 +520,30 @@ func NewJrpcChainProxy(ctx context.Context, nConns uint, rpcProviderEndpoint lav ErrorHandler: &JsonRPCErrorHandler{}, ChainID: rpcProviderEndpoint.ChainID, }, - conn: map[string]*chainproxy.Connector{}, + conn: nil, } validateEndpoints(rpcProviderEndpoint.NodeUrls, spectypes.APIInterfaceJsonRPC) - internalPaths := map[string]struct{}{} - jsonRPCChainParser, ok := chainParser.(*JsonRPCChainParser) - if ok { - internalPaths = jsonRPCChainParser.GetInternalPaths() - } - internalPathsLength := len(internalPaths) - if internalPathsLength > 0 && internalPathsLength == len(rpcProviderEndpoint.NodeUrls) { - return cp, cp.startWithSpecificInternalPaths(ctx, nConns, rpcProviderEndpoint.NodeUrls, internalPaths) - } else if internalPathsLength > 0 && len(rpcProviderEndpoint.NodeUrls) > 1 { - // provider provided specific endpoints but not enough to fill all requirements - return nil, utils.LavaFormatError("Internal Paths specified but not all paths provided", nil, utils.Attribute{Key: "required", Value: internalPaths}, utils.Attribute{Key: "provided", Value: rpcProviderEndpoint.NodeUrls}) - } - return cp, cp.start(ctx, nConns, nodeUrl, internalPaths) -} - -func (cp *JrpcChainProxy) startWithSpecificInternalPaths(ctx context.Context, nConns uint, nodeUrls []common.NodeUrl, internalPaths map[string]struct{}) error { - for _, url := range nodeUrls { - _, ok := internalPaths[url.InternalPath] - if !ok { - return utils.LavaFormatError("url.InternalPath was not found in internalPaths", nil, utils.Attribute{Key: "internalPaths", Value: internalPaths}, utils.Attribute{Key: "url.InternalPath", Value: url.InternalPath}) - } - utils.LavaFormatDebug("connecting", utils.Attribute{Key: "url", Value: url.String()}) - conn, err := chainproxy.NewConnector(ctx, nConns, url) - if err != nil { - return err - } - cp.conn[url.InternalPath] = conn - } - if len(cp.conn) != len(internalPaths) { - return utils.LavaFormatError("missing connectors for a chain with internal paths", nil, utils.Attribute{Key: "internalPaths", Value: internalPaths}, utils.Attribute{Key: "nodeUrls", Value: nodeUrls}) - } - return nil + return cp, cp.start(ctx, nConns, nodeUrl) } -func (cp *JrpcChainProxy) start(ctx context.Context, nConns uint, nodeUrl common.NodeUrl, internalPaths map[string]struct{}) error { - if len(internalPaths) == 0 { - internalPaths = map[string]struct{}{"": {}} // add default path +func (cp *JrpcChainProxy) start(ctx context.Context, nConns uint, nodeUrl common.NodeUrl) error { + conn, err := chainproxy.NewConnector(ctx, nConns, nodeUrl) + if err != nil { + return err } - basePath := nodeUrl.Url - for path := range internalPaths { - nodeUrl.Url = basePath + path - conn, err := chainproxy.NewConnector(ctx, nConns, nodeUrl) - if err != nil { - return err - } - cp.conn[path] = conn - if cp.conn == nil { - return errors.New("g_conn == nil") - } - } + cp.conn = conn return nil } func (cp *JrpcChainProxy) sendBatchMessage(ctx context.Context, nodeMessage *rpcInterfaceMessages.JsonrpcBatchMessage, chainMessage ChainMessageForSend) (relayReply *RelayReplyWrapper, err error) { - internalPath := chainMessage.GetApiCollection().CollectionData.InternalPath - rpc, err := cp.conn[internalPath].GetRpc(ctx, true) + rpc, err := cp.conn.GetRpc(ctx, true) if err != nil { return nil, err } - defer cp.conn[internalPath].ReturnRpc(rpc) + defer cp.conn.ReturnRpc(rpc) if len(nodeMessage.GetHeaders()) > 0 { for _, metadata := range nodeMessage.GetHeaders() { rpc.SetHeader(metadata.Name, metadata.Value) @@ -602,7 +568,7 @@ func (cp *JrpcChainProxy) sendBatchMessage(ctx context.Context, nodeMessage *rpc } replyMsgs := make([]rpcInterfaceMessages.JsonrpcMessage, len(batch)) for idx, element := range batch { - // convert them because batch elements can't be marshaled back to the user, they are missing tags and flieds + // convert them because batch elements can't be marshaled back to the user, they are missing tags and fields replyMsgs[idx], err = rpcInterfaceMessages.ConvertBatchElement(element) if err != nil { return nil, err @@ -637,20 +603,18 @@ func (cp *JrpcChainProxy) SendNodeMsg(ctx context.Context, ch chan interface{}, reply, err := cp.sendBatchMessage(ctx, batchMessage, chainMessage) return reply, "", nil, err } - internalPath := chainMessage.GetApiCollection().CollectionData.InternalPath - connector := cp.conn[internalPath] - rpc, err := connector.GetRpc(ctx, true) + + rpc, err := cp.conn.GetRpc(ctx, true) if err != nil { return nil, "", nil, err } - defer connector.ReturnRpc(rpc) + defer cp.conn.ReturnRpc(rpc) // appending hashed url - grpc.SetTrailer(ctx, metadata.Pairs(RPCProviderNodeAddressHash, connector.GetUrlHash())) + grpc.SetTrailer(ctx, metadata.Pairs(RPCProviderNodeAddressHash, cp.conn.GetUrlHash())) // Call our node var rpcMessage *rpcclient.JsonrpcMessage - var replyMessage *rpcInterfaceMessages.JsonrpcMessage var sub *rpcclient.ClientSubscription // support setting headers if len(nodeMessage.GetHeaders()) > 0 { @@ -671,41 +635,43 @@ func (cp *JrpcChainProxy) SendNodeMsg(ctx context.Context, ch chan interface{}, cp.NodeUrl.SetIpForwardingIfNecessary(ctx, rpc.SetHeader) rpcMessage, nodeErr = rpc.CallContext(connectCtx, nodeMessage.ID, nodeMessage.Method, nodeMessage.Params, true, nodeMessage.GetDisableErrorHandling()) - if err != nil { + if nodeErr != nil { // here we are getting an error for every code that is not 200-300 - if common.StatusCodeError504.Is(err) || common.StatusCodeError429.Is(err) || common.StatusCodeErrorStrict.Is(err) { - return nil, "", nil, utils.LavaFormatWarning("Received invalid status code", err, utils.Attribute{Key: "chainID", Value: cp.BaseChainProxy.ChainID}, utils.Attribute{Key: "apiName", Value: chainMessage.GetApi().Name}) + if common.StatusCodeError504.Is(nodeErr) || common.StatusCodeError429.Is(nodeErr) || common.StatusCodeErrorStrict.Is(nodeErr) { + return nil, "", nil, utils.LavaFormatWarning("Received invalid status code", nodeErr, utils.Attribute{Key: "chainID", Value: cp.BaseChainProxy.ChainID}, utils.Attribute{Key: "apiName", Value: chainMessage.GetApi().Name}) } // Validate if the error is related to the provider connection to the node or it is a valid error // in case the error is valid (e.g. bad input parameters) the error will return in the form of a valid error reply - if parsedError := cp.HandleNodeError(ctx, err); parsedError != nil { + if parsedError := cp.HandleNodeError(ctx, nodeErr); parsedError != nil { return nil, "", nil, parsedError } } } - var replyMsg rpcInterfaceMessages.JsonrpcMessage + var replyMsg *rpcInterfaceMessages.JsonrpcMessage // the error check here would only wrap errors not from the rpc - if nodeErr != nil { - utils.LavaFormatDebug("got error from node", utils.LogAttr("GUID", ctx), utils.LogAttr("nodeErr", nodeErr)) - return nil, "", nil, nodeErr + // try to parse node error as json message + rpcMessage = TryRecoverNodeErrorFromClientError(nodeErr) + if rpcMessage == nil { + utils.LavaFormatDebug("got error from node", utils.LogAttr("GUID", ctx), utils.LogAttr("nodeErr", nodeErr)) + return nil, "", nil, nodeErr + } } - replyMessage, err = rpcInterfaceMessages.ConvertJsonRPCMsg(rpcMessage) + replyMsg, err = rpcInterfaceMessages.ConvertJsonRPCMsg(rpcMessage) if err != nil { return nil, "", nil, utils.LavaFormatError("jsonRPC error", err, utils.Attribute{Key: "GUID", Value: ctx}) } // validate result is valid - if replyMessage.Error == nil { - responseIsNilValidationError := ValidateNilResponse(string(replyMessage.Result)) + if replyMsg.Error == nil { + responseIsNilValidationError := ValidateNilResponse(string(replyMsg.Result)) if responseIsNilValidationError != nil { return nil, "", nil, responseIsNilValidationError } } - replyMsg = *replyMessage - err = cp.ValidateRequestAndResponseIds(nodeMessage.ID, replyMessage.ID) + err = cp.ValidateRequestAndResponseIds(nodeMessage.ID, replyMsg.ID) if err != nil { return nil, "", nil, utils.LavaFormatError("jsonRPC ID mismatch error", err, utils.Attribute{Key: "GUID", Value: ctx}, diff --git a/protocol/chainlib/jsonRPC_test.go b/protocol/chainlib/jsonRPC_test.go index 7158e98704..84bdbe4836 100644 --- a/protocol/chainlib/jsonRPC_test.go +++ b/protocol/chainlib/jsonRPC_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - specutils "github.com/lavanet/lava/v3/utils/keeper" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + specutils "github.com/lavanet/lava/v4/utils/keeper" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -214,7 +214,7 @@ func TestAddonAndVerifications(t *testing.T) { require.NotNil(t, chainRouter) require.NotNil(t, chainFetcher) - verifications, err := chainParser.GetVerifications([]string{"debug"}) + verifications, err := chainParser.GetVerifications([]string{"debug"}, "", "jsonrpc") require.NoError(t, err) require.NotEmpty(t, verifications) for _, verification := range verifications { diff --git a/protocol/chainlib/node_error_handler.go b/protocol/chainlib/node_error_handler.go index 2946ad17d2..5d5d52bf4c 100644 --- a/protocol/chainlib/node_error_handler.go +++ b/protocol/chainlib/node_error_handler.go @@ -11,13 +11,13 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type genericErrorHandler struct{} @@ -139,6 +139,20 @@ func (geh *genericErrorHandler) ValidateRequestAndResponseIds(nodeMessageID json return nil } +func TryRecoverNodeErrorFromClientError(nodeErr error) *rpcclient.JsonrpcMessage { + // try to parse node error as json message + httpError, ok := nodeErr.(rpcclient.HTTPError) + if ok { + jsonMessage := &rpcclient.JsonrpcMessage{} + err := json.Unmarshal(httpError.Body, jsonMessage) + if err == nil { + utils.LavaFormatDebug("Successfully recovered HTTPError to node message", utils.LogAttr("jsonMessage", jsonMessage)) + return jsonMessage + } + } + return nil +} + type RestErrorHandler struct{ genericErrorHandler } // Validating if the error is related to the provider connection or not diff --git a/protocol/chainlib/node_error_handler_test.go b/protocol/chainlib/node_error_handler_test.go index 785c2346fc..ca46152020 100644 --- a/protocol/chainlib/node_error_handler_test.go +++ b/protocol/chainlib/node_error_handler_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/stretchr/testify/require" ) diff --git a/protocol/chainlib/protocol_message.go b/protocol/chainlib/protocol_message.go index fc9b1789d4..a69da9a074 100644 --- a/protocol/chainlib/protocol_message.go +++ b/protocol/chainlib/protocol_message.go @@ -3,8 +3,8 @@ package chainlib import ( "strings" - "github.com/lavanet/lava/v3/protocol/common" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/common" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) type UserData struct { diff --git a/protocol/chainlib/provider_node_subscription_manager.go b/protocol/chainlib/provider_node_subscription_manager.go index 21a8f9e8c9..c9802160e7 100644 --- a/protocol/chainlib/provider_node_subscription_manager.go +++ b/protocol/chainlib/provider_node_subscription_manager.go @@ -9,16 +9,16 @@ import ( "github.com/btcsuite/btcd/btcec/v2" sdk "github.com/cosmos/cosmos-sdk/types" gojson "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/protocopy" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/protocopy" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const SubscriptionTimeoutDuration = 15 * time.Minute diff --git a/protocol/chainlib/provider_node_subscription_manager_test.go b/protocol/chainlib/provider_node_subscription_manager_test.go index 9a8e24fb67..5a45a32369 100644 --- a/protocol/chainlib/provider_node_subscription_manager_test.go +++ b/protocol/chainlib/provider_node_subscription_manager_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/chainlib/rest.go b/protocol/chainlib/rest.go index ef73a98256..b66473972c 100644 --- a/protocol/chainlib/rest.go +++ b/protocol/chainlib/rest.go @@ -11,22 +11,22 @@ import ( "strings" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/utils" "google.golang.org/grpc" "google.golang.org/grpc/metadata" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/gofiber/fiber/v2" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/metrics" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/metrics" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type RestChainParser struct { @@ -47,7 +47,7 @@ func (apip *RestChainParser) CraftMessage(parsing *spectypes.ParseDirective, con var data []byte = nil urlPath := string(craftData.Data) if craftData.ConnectionType == http.MethodPost { - // on post we need to send the data provided in the templace with the api as method + // on post we need to send the data provided in the template with the api as method data = craftData.Data urlPath = craftData.Path } diff --git a/protocol/chainlib/rest_test.go b/protocol/chainlib/rest_test.go index 918888bf1a..1521ac445d 100644 --- a/protocol/chainlib/rest_test.go +++ b/protocol/chainlib/rest_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/parser" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/parser" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/protocol/chainlib/tendermintRPC.go b/protocol/chainlib/tendermintRPC.go index 67989518e5..844e6ee35d 100644 --- a/protocol/chainlib/tendermintRPC.go +++ b/protocol/chainlib/tendermintRPC.go @@ -15,17 +15,17 @@ import ( "github.com/gofiber/fiber/v2" "github.com/gofiber/websocket/v2" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) @@ -61,7 +61,12 @@ func (apip *TendermintChainParser) getSupportedApi(name, connectionType string) func (apip *TendermintChainParser) CraftMessage(parsing *spectypes.ParseDirective, connectionType string, craftData *CraftData, metadata []pairingtypes.Metadata) (ChainMessageForSend, error) { if craftData != nil { - chainMessage, err := apip.ParseMsg("", craftData.Data, craftData.ConnectionType, metadata, extensionslib.ExtensionInfo{LatestBlock: 0}) + path := craftData.Path + if craftData.InternalPath != "" { + path = craftData.InternalPath + } + + chainMessage, err := apip.ParseMsg(path, craftData.Data, craftData.ConnectionType, metadata, extensionslib.ExtensionInfo{LatestBlock: 0}) if err == nil { chainMessage.AppendHeader(metadata) } @@ -601,11 +606,11 @@ func NewtendermintRpcChainProxy(ctx context.Context, nConns uint, rpcProviderEnd ErrorHandler: &TendermintRPCErrorHandler{}, ChainID: rpcProviderEndpoint.ChainID, }, - conn: map[string]*chainproxy.Connector{}, + conn: nil, }, } - return cp, cp.start(ctx, nConns, nodeUrl, nil) + return cp, cp.start(ctx, nConns, nodeUrl) } func (cp *tendermintRpcChainProxy) SendNodeMsg(ctx context.Context, ch chan interface{}, chainMessage ChainMessageForSend) (relayReply *RelayReplyWrapper, subscriptionID string, relayReplyServer *rpcclient.ClientSubscription, err error) { @@ -646,8 +651,7 @@ func (cp *tendermintRpcChainProxy) SendURI(ctx context.Context, nodeMessage *rpc httpClient := cp.httpClient // appending hashed url - internalPath := chainMessage.GetApiCollection().GetCollectionData().InternalPath - grpc.SetTrailer(ctx, metadata.Pairs(RPCProviderNodeAddressHash, cp.conn[internalPath].GetUrlHash())) + grpc.SetTrailer(ctx, metadata.Pairs(RPCProviderNodeAddressHash, cp.conn.GetUrlHash())) // construct the url by concatenating the node url with the path variable url := cp.NodeUrl.Url + "/" + nodeMessage.Path @@ -723,23 +727,18 @@ func (cp *tendermintRpcChainProxy) SendURI(ctx context.Context, nodeMessage *rpc func (cp *tendermintRpcChainProxy) SendRPC(ctx context.Context, nodeMessage *rpcInterfaceMessages.TendermintrpcMessage, ch chan interface{}, chainMessage ChainMessageForSend) (relayReply *RelayReplyWrapper, subscriptionID string, relayReplyServer *rpcclient.ClientSubscription, err error) { // Get rpc connection from the connection pool var rpc *rpcclient.Client - internalPath := chainMessage.GetApiCollection().CollectionData.InternalPath - - connector := cp.conn[internalPath] - - rpc, err = connector.GetRpc(ctx, true) + rpc, err = cp.conn.GetRpc(ctx, true) if err != nil { return nil, "", nil, err } // return the rpc connection to the websocket pool after the function completes - defer connector.ReturnRpc(rpc) + defer cp.conn.ReturnRpc(rpc) // appending hashed url - grpc.SetTrailer(ctx, metadata.Pairs(RPCProviderNodeAddressHash, connector.GetUrlHash())) + grpc.SetTrailer(ctx, metadata.Pairs(RPCProviderNodeAddressHash, cp.conn.GetUrlHash())) // create variables for the rpc message and reply message var rpcMessage *rpcclient.JsonrpcMessage - var replyMessage *rpcInterfaceMessages.RPCResponse var sub *rpcclient.ClientSubscription if len(nodeMessage.GetHeaders()) > 0 { for _, metadata := range nodeMessage.GetHeaders() { @@ -768,13 +767,13 @@ func (cp *tendermintRpcChainProxy) SendRPC(ctx context.Context, nodeMessage *rpc cp.NodeUrl.SetIpForwardingIfNecessary(ctx, rpc.SetHeader) // perform the rpc call rpcMessage, nodeErr = rpc.CallContext(connectCtx, nodeMessage.ID, nodeMessage.Method, nodeMessage.Params, false, nodeMessage.GetDisableErrorHandling()) - if err != nil { - if common.StatusCodeError504.Is(err) || common.StatusCodeError429.Is(err) || common.StatusCodeErrorStrict.Is(err) { - return nil, "", nil, utils.LavaFormatWarning("Received invalid status code", err, utils.Attribute{Key: "chainID", Value: cp.BaseChainProxy.ChainID}, utils.Attribute{Key: "apiName", Value: chainMessage.GetApi().Name}) + if nodeErr != nil { + if common.StatusCodeError504.Is(nodeErr) || common.StatusCodeError429.Is(nodeErr) || common.StatusCodeErrorStrict.Is(nodeErr) { + return nil, "", nil, utils.LavaFormatWarning("Received invalid status code", nodeErr, utils.Attribute{Key: "chainID", Value: cp.BaseChainProxy.ChainID}, utils.Attribute{Key: "apiName", Value: chainMessage.GetApi().Name}) } // Validate if the error is related to the provider connection to the node or it is a valid error // in case the error is valid (e.g. bad input parameters) the error will return in the form of a valid error reply - if parsedError := cp.HandleNodeError(ctx, err); parsedError != nil { + if parsedError := cp.HandleNodeError(ctx, nodeErr); parsedError != nil { return nil, "", nil, parsedError } } @@ -782,27 +781,27 @@ func (cp *tendermintRpcChainProxy) SendRPC(ctx context.Context, nodeMessage *rpc var replyMsg *rpcInterfaceMessages.RPCResponse // the error check here would only wrap errors not from the rpc - if nodeErr != nil { - utils.LavaFormatDebug("got error from node", utils.LogAttr("GUID", ctx), utils.LogAttr("nodeErr", nodeErr)) - return nil, "", nil, nodeErr + rpcMessage = TryRecoverNodeErrorFromClientError(nodeErr) + if rpcMessage == nil { + utils.LavaFormatDebug("got error from node", utils.LogAttr("GUID", ctx), utils.LogAttr("nodeErr", nodeErr)) + return nil, "", nil, nodeErr + } } - replyMessage, err = rpcInterfaceMessages.ConvertTendermintMsg(rpcMessage) + replyMsg, err = rpcInterfaceMessages.ConvertTendermintMsg(rpcMessage) if err != nil { return nil, "", nil, utils.LavaFormatError("tendermintRPC error", err) } // if we didn't get a node error. - if replyMessage.Error == nil { + if replyMsg.Error == nil { // validate result is valid - responseIsNilValidationError := ValidateNilResponse(string(replyMessage.Result)) + responseIsNilValidationError := ValidateNilResponse(string(replyMsg.Result)) if responseIsNilValidationError != nil { return nil, "", nil, responseIsNilValidationError } } - replyMsg = replyMessage - err = cp.ValidateRequestAndResponseIds(nodeMessage.ID, rpcMessage.ID) if err != nil { return nil, "", nil, utils.LavaFormatError("tendermintRPC ID mismatch error", err, diff --git a/protocol/chainlib/tendermintRPC_test.go b/protocol/chainlib/tendermintRPC_test.go index ac98b20902..93e4930146 100644 --- a/protocol/chainlib/tendermintRPC_test.go +++ b/protocol/chainlib/tendermintRPC_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/protocol/chaintracker/chain_tracker.go b/protocol/chaintracker/chain_tracker.go index 29d6d390d6..02e792dd55 100644 --- a/protocol/chaintracker/chain_tracker.go +++ b/protocol/chaintracker/chain_tracker.go @@ -11,14 +11,14 @@ import ( "sync/atomic" "time" - rand "github.com/lavanet/lava/v3/utils/rand" + rand "github.com/lavanet/lava/v4/utils/rand" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" grpc "google.golang.org/grpc" diff --git a/protocol/chaintracker/chain_tracker_test.go b/protocol/chaintracker/chain_tracker_test.go index 1ebcf62a21..e0ce802685 100644 --- a/protocol/chaintracker/chain_tracker_test.go +++ b/protocol/chaintracker/chain_tracker_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - chaintracker "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - rand "github.com/lavanet/lava/v3/utils/rand" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + chaintracker "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + rand "github.com/lavanet/lava/v4/utils/rand" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/chaintracker/config.go b/protocol/chaintracker/config.go index b5e193cf8c..f226eb6528 100644 --- a/protocol/chaintracker/config.go +++ b/protocol/chaintracker/config.go @@ -3,7 +3,7 @@ package chaintracker import ( "time" - "github.com/lavanet/lava/v3/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/metrics" ) const ( diff --git a/protocol/chaintracker/wanted_block_data.go b/protocol/chaintracker/wanted_block_data.go index e44e87b65f..914bcd44a8 100644 --- a/protocol/chaintracker/wanted_block_data.go +++ b/protocol/chaintracker/wanted_block_data.go @@ -3,7 +3,7 @@ package chaintracker import ( fmt "fmt" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type BlockRange struct { diff --git a/protocol/chaintracker/wanted_block_data_test.go b/protocol/chaintracker/wanted_block_data_test.go index 51eefd4560..49f6bd621d 100644 --- a/protocol/chaintracker/wanted_block_data_test.go +++ b/protocol/chaintracker/wanted_block_data_test.go @@ -4,8 +4,8 @@ import ( fmt "fmt" "testing" - chaintracker "github.com/lavanet/lava/v3/protocol/chaintracker" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + chaintracker "github.com/lavanet/lava/v4/protocol/chaintracker" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/common/cobra_common.go b/protocol/common/cobra_common.go index 38213fbf40..338b003f67 100644 --- a/protocol/common/cobra_common.go +++ b/protocol/common/cobra_common.go @@ -3,7 +3,7 @@ package common import ( "time" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -46,6 +46,7 @@ const ( // websocket flags RateLimitWebSocketFlag = "rate-limit-websocket-requests-per-connection" BanDurationForWebsocketRateLimitExceededFlag = "ban-duration-for-websocket-rate-limit-exceeded" + RateLimitRequestPerSecondFlag = "rate-limit-requests-per-second" ) const ( diff --git a/protocol/common/collections.go b/protocol/common/collections.go index a1e31e2839..a6e5254ded 100644 --- a/protocol/common/collections.go +++ b/protocol/common/collections.go @@ -1,7 +1,7 @@ package common import ( - spectypes "github.com/lavanet/lava/v3/x/spec/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( diff --git a/protocol/common/conf.go b/protocol/common/conf.go index 5df9ebf1b9..483d6d0684 100644 --- a/protocol/common/conf.go +++ b/protocol/common/conf.go @@ -20,6 +20,7 @@ const ( MaximumConcurrentProvidersFlagName = "concurrent-providers" StatusCodeMetadataKey = "status-code" VersionMetadataKey = "lavap-version" + LavaChainIdMetadataKey = "lavap-chain-id" TimeOutForFetchingLavaBlocksFlag = "timeout-for-fetching-lava-blocks" ) diff --git a/protocol/common/endpoints.go b/protocol/common/endpoints.go index 435fcde26c..03998cc2ff 100644 --- a/protocol/common/endpoints.go +++ b/protocol/common/endpoints.go @@ -8,10 +8,10 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc/metadata" "google.golang.org/grpc/peer" ) @@ -76,7 +76,7 @@ func (nurl NodeUrl) String() string { urlStr := nurl.UrlStr() if len(nurl.Addons) > 0 { - return urlStr + ", addons: (" + strings.Join(nurl.Addons, ",") + ")" + return urlStr + ", addons: (" + strings.Join(nurl.Addons, ",") + ")" + ", internal-path: " + nurl.InternalPath } return urlStr } diff --git a/protocol/common/safe_channel_sender.go b/protocol/common/safe_channel_sender.go index 368ee395c4..4c8c603659 100644 --- a/protocol/common/safe_channel_sender.go +++ b/protocol/common/safe_channel_sender.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) const retryAttemptsForChannelWrite = 10 diff --git a/protocol/common/safe_sync_map.go b/protocol/common/safe_sync_map.go index 95263bcf84..47b25cf5ba 100644 --- a/protocol/common/safe_sync_map.go +++ b/protocol/common/safe_sync_map.go @@ -3,7 +3,7 @@ package common import ( "sync" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type SafeSyncMap[K, V any] struct { diff --git a/protocol/common/tx_parsing.go b/protocol/common/tx_parsing.go index b62f96a837..89e168bd6f 100644 --- a/protocol/common/tx_parsing.go +++ b/protocol/common/tx_parsing.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/spf13/pflag" ) diff --git a/protocol/integration/mocks.go b/protocol/integration/mocks.go index bfb4698acb..ab03f9fa2f 100644 --- a/protocol/integration/mocks.go +++ b/protocol/integration/mocks.go @@ -9,18 +9,18 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationconsensus" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/rpcprovider" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationconsensus" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/rpcprovider" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) type TxConflictDetectionMock func(context.Context, *conflicttypes.FinalizationConflict, *conflicttypes.ResponseConflict, common.ConflictHandlerInterface) error diff --git a/protocol/integration/protocol_test.go b/protocol/integration/protocol_test.go index ea3b21feb3..03ef7cdd2f 100644 --- a/protocol/integration/protocol_test.go +++ b/protocol/integration/protocol_test.go @@ -16,28 +16,28 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/lavanet/lava/v3/ecosystem/cache" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationconsensus" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/performance" - "github.com/lavanet/lava/v3/protocol/provideroptimizer" - "github.com/lavanet/lava/v3/protocol/rpcconsumer" - "github.com/lavanet/lava/v3/protocol/rpcprovider" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - "github.com/lavanet/lava/v3/protocol/rpcprovider/rewardserver" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/ecosystem/cache" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationconsensus" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/performance" + "github.com/lavanet/lava/v4/protocol/provideroptimizer" + "github.com/lavanet/lava/v4/protocol/rpcconsumer" + "github.com/lavanet/lava/v4/protocol/rpcprovider" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + "github.com/lavanet/lava/v4/protocol/rpcprovider/rewardserver" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" "github.com/stretchr/testify/require" "google.golang.org/grpc/connectivity" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) var ( @@ -344,7 +344,7 @@ func createRpcProvider(t *testing.T, ctx context.Context, rpcProviderOptions rpc chainTracker.StartAndServe(ctx) reliabilityManager := reliabilitymanager.NewReliabilityManager(chainTracker, &mockProviderStateTracker, rpcProviderOptions.account.Addr.String(), chainRouter, chainParser) mockReliabilityManager := NewMockReliabilityManager(reliabilityManager) - rpcProviderServer.ServeRPCRequests(ctx, rpcProviderEndpoint, chainParser, rws, providerSessionManager, mockReliabilityManager, rpcProviderOptions.account.SK, cache, chainRouter, &mockProviderStateTracker, rpcProviderOptions.account.Addr, rpcProviderOptions.lavaChainID, rpcprovider.DEFAULT_ALLOWED_MISSING_CU, nil, nil, nil, false) + rpcProviderServer.ServeRPCRequests(ctx, rpcProviderEndpoint, chainParser, rws, providerSessionManager, mockReliabilityManager, rpcProviderOptions.account.SK, cache, chainRouter, &mockProviderStateTracker, rpcProviderOptions.account.Addr, rpcProviderOptions.lavaChainID, rpcprovider.DEFAULT_ALLOWED_MISSING_CU, nil, nil, nil, false, nil) listener := rpcprovider.NewProviderListener(ctx, rpcProviderEndpoint.NetworkAddress, "/health") err = listener.RegisterReceiver(rpcProviderServer, rpcProviderEndpoint) require.NoError(t, err) diff --git a/protocol/lavaprotocol/finalizationconsensus/finalization_consensus.go b/protocol/lavaprotocol/finalizationconsensus/finalization_consensus.go index bd9ce1440c..fc12c0040b 100644 --- a/protocol/lavaprotocol/finalizationconsensus/finalization_consensus.go +++ b/protocol/lavaprotocol/finalizationconsensus/finalization_consensus.go @@ -10,11 +10,11 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) type ChainBlockStatsGetter interface { diff --git a/protocol/lavaprotocol/finalizationconsensus/finalization_consensus_test.go b/protocol/lavaprotocol/finalizationconsensus/finalization_consensus_test.go index aa6b694db5..9f2b1dbf48 100644 --- a/protocol/lavaprotocol/finalizationconsensus/finalization_consensus_test.go +++ b/protocol/lavaprotocol/finalizationconsensus/finalization_consensus_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/lavasession" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/lavasession" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/lavaprotocol/finalizationverification/finalization_verification.go b/protocol/lavaprotocol/finalizationverification/finalization_verification.go index 9b2ac088b3..1d2d18bd93 100644 --- a/protocol/lavaprotocol/finalizationverification/finalization_verification.go +++ b/protocol/lavaprotocol/finalizationverification/finalization_verification.go @@ -5,15 +5,15 @@ import ( "errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/protocolerrors" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/protocolerrors" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) func VerifyFinalizationData(reply *pairingtypes.RelayReply, relayRequest *pairingtypes.RelayRequest, providerAddr string, consumerAcc sdk.AccAddress, latestSessionBlock, blockDistanceForFinalization, blocksInFinalizationProof int64) (finalizedBlocks map[int64]string, errRet error) { diff --git a/protocol/lavaprotocol/relay_retries_manager.go b/protocol/lavaprotocol/relay_retries_manager.go index 5a1c852189..ca32c577d5 100644 --- a/protocol/lavaprotocol/relay_retries_manager.go +++ b/protocol/lavaprotocol/relay_retries_manager.go @@ -4,7 +4,7 @@ import ( "time" "github.com/dgraph-io/ristretto" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) // entries ttl duration diff --git a/protocol/lavaprotocol/request_builder.go b/protocol/lavaprotocol/request_builder.go index ed19cab900..1d00942355 100644 --- a/protocol/lavaprotocol/request_builder.go +++ b/protocol/lavaprotocol/request_builder.go @@ -6,14 +6,14 @@ import ( "encoding/binary" "github.com/btcsuite/btcd/btcec/v2" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - conflictconstruct "github.com/lavanet/lava/v3/x/conflict/types/construct" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + conflictconstruct "github.com/lavanet/lava/v4/x/conflict/types/construct" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type HeaderFilterer interface { diff --git a/protocol/lavaprotocol/response_builder.go b/protocol/lavaprotocol/response_builder.go index aade93b90a..6054c1d2d6 100644 --- a/protocol/lavaprotocol/response_builder.go +++ b/protocol/lavaprotocol/response_builder.go @@ -6,12 +6,12 @@ import ( btcSecp256k1 "github.com/btcsuite/btcd/btcec/v2" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/protocolerrors" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/protocolerrors" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) func CraftEmptyRPCResponseFromGenericMessage(message rpcInterfaceMessages.GenericMessage) (*rpcInterfaceMessages.RPCResponse, error) { diff --git a/protocol/lavaprotocol/response_builder_test.go b/protocol/lavaprotocol/response_builder_test.go index 84fa93b0a8..e8d545c706 100644 --- a/protocol/lavaprotocol/response_builder_test.go +++ b/protocol/lavaprotocol/response_builder_test.go @@ -6,11 +6,11 @@ import ( "encoding/json" "testing" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationverification" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationverification" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/lavaprotocol/reuqest_builder_test.go b/protocol/lavaprotocol/reuqest_builder_test.go index 3cd061e6da..8f49fb9add 100644 --- a/protocol/lavaprotocol/reuqest_builder_test.go +++ b/protocol/lavaprotocol/reuqest_builder_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/lavasession/active_subscription_provider_storage.go b/protocol/lavasession/active_subscription_provider_storage.go index 3849b7bbdf..701c57d1ad 100644 --- a/protocol/lavasession/active_subscription_provider_storage.go +++ b/protocol/lavasession/active_subscription_provider_storage.go @@ -3,7 +3,7 @@ package lavasession import ( "sync" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) // stores all providers that are currently used to stream subscriptions. diff --git a/protocol/lavasession/common.go b/protocol/lavasession/common.go index 9d5845a790..dc18f49950 100644 --- a/protocol/lavasession/common.go +++ b/protocol/lavasession/common.go @@ -17,10 +17,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/status" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/keeper/scores" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/keeper/scores" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/protocol/lavasession/common_test.go b/protocol/lavasession/common_test.go index 660ef08069..04ef330d5a 100644 --- a/protocol/lavasession/common_test.go +++ b/protocol/lavasession/common_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/protocol/lavasession/consumer_session_manager.go b/protocol/lavasession/consumer_session_manager.go index 970c27baa1..03169adcbb 100644 --- a/protocol/lavasession/consumer_session_manager.go +++ b/protocol/lavasession/consumer_session_manager.go @@ -10,13 +10,13 @@ import ( "time" sdkerrors "cosmossdk.io/errors" - "github.com/lavanet/lava/v3/protocol/common" - metrics "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/provideroptimizer" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/common" + metrics "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/provideroptimizer" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) @@ -52,7 +52,7 @@ type ConsumerSessionManager struct { // contains a sorted list of blocked addresses, sorted by their cu used this epoch for higher chance of response currentlyBlockedProviderAddresses []string - addonAddresses map[RouterKey][]string + addonAddresses map[string][]string // key is RouterKey.String() reportedProviders *ReportedProviders // pairingPurge - contains all pairings that are unwanted this epoch, keeps them in memory in order to avoid release. // (if a consumer session still uses one of them or we want to report it.) @@ -129,13 +129,13 @@ func (csm *ConsumerSessionManager) Initialized() bool { func (csm *ConsumerSessionManager) RemoveAddonAddresses(addon string, extensions []string) { if addon == "" && len(extensions) == 0 { // purge all - csm.addonAddresses = make(map[RouterKey][]string) + csm.addonAddresses = make(map[string][]string) } else { routerKey := NewRouterKey(append(extensions, addon)) if csm.addonAddresses == nil { - csm.addonAddresses = make(map[RouterKey][]string) + csm.addonAddresses = make(map[string][]string) } - csm.addonAddresses[routerKey] = []string{} + csm.addonAddresses[routerKey.String()] = []string{} } } @@ -153,10 +153,11 @@ func (csm *ConsumerSessionManager) CalculateAddonValidAddresses(addon string, ex // assuming csm is Rlocked func (csm *ConsumerSessionManager) getValidAddresses(addon string, extensions []string) (addresses []string) { routerKey := NewRouterKey(append(extensions, addon)) - if csm.addonAddresses == nil || csm.addonAddresses[routerKey] == nil { + routerKeyString := routerKey.String() + if csm.addonAddresses == nil || csm.addonAddresses[routerKeyString] == nil { return csm.CalculateAddonValidAddresses(addon, extensions) } - return csm.addonAddresses[routerKey] + return csm.addonAddresses[routerKeyString] } // After 2 epochs we need to close all open connections. @@ -332,7 +333,7 @@ func (csm *ConsumerSessionManager) setValidAddressesToDefaultValue(addon string, } } csm.RemoveAddonAddresses(addon, extensions) // refresh the list - csm.addonAddresses[NewRouterKey(append(extensions, addon))] = csm.CalculateAddonValidAddresses(addon, extensions) + csm.addonAddresses[NewRouterKey(append(extensions, addon)).String()] = csm.CalculateAddonValidAddresses(addon, extensions) } } @@ -375,11 +376,12 @@ func (csm *ConsumerSessionManager) cacheAddonAddresses(addon string, extensions csm.lock.Lock() // lock to set validAddresses[addon] if it's not cached defer csm.lock.Unlock() routerKey := NewRouterKey(append(extensions, addon)) - if csm.addonAddresses == nil || csm.addonAddresses[routerKey] == nil { + routerKeyString := routerKey.String() + if csm.addonAddresses == nil || csm.addonAddresses[routerKeyString] == nil { csm.RemoveAddonAddresses(addon, extensions) - csm.addonAddresses[routerKey] = csm.CalculateAddonValidAddresses(addon, extensions) + csm.addonAddresses[routerKeyString] = csm.CalculateAddonValidAddresses(addon, extensions) } - return csm.addonAddresses[routerKey] + return csm.addonAddresses[routerKeyString] } // validating we still have providers, otherwise reset valid addresses list @@ -433,7 +435,8 @@ func (csm *ConsumerSessionManager) GetSessions(ctx context.Context, cuNeededForS return nil, utils.LavaFormatError("failed getting sessions from used Providers", nil, utils.LogAttr("usedProviders", usedProviders), utils.LogAttr("endpoint", csm.rpcEndpoint)) } defer func() { usedProviders.AddUsed(consumerSessionMap, errRet) }() - initUnwantedProviders := usedProviders.GetUnwantedProvidersToSend() + routerKey := NewRouterKeyFromExtensions(extensions) + initUnwantedProviders := usedProviders.GetUnwantedProvidersToSend(routerKey) extensionNames := common.GetExtensionNames(extensions) // if pairing list is empty we reset the state. @@ -567,7 +570,7 @@ func (csm *ConsumerSessionManager) GetSessions(ctx context.Context, cuNeededForS // we don't want to update the reputation by it, so we null the rawQosReport rawQosReport = nil } - consumerSession.SetUsageForSession(cuNeededForSession, qosReport, rawQosReport, usedProviders) + consumerSession.SetUsageForSession(cuNeededForSession, qosReport, rawQosReport, usedProviders, routerKey) // We successfully added provider, we should ignore it if we need to fetch new tempIgnoredProviders.providers[providerAddress] = struct{}{} if len(sessions) == wantedSession { @@ -687,6 +690,7 @@ func (csm *ConsumerSessionManager) tryGetConsumerSessionWithProviderFromBlockedP // if we got here we validated the epoch is still the same epoch as we expected and we need to fetch a session from the blocked provider list. defer csm.lock.RUnlock() + routerKey := NewRouterKey(extensions) // csm.currentlyBlockedProviderAddresses is sorted by the provider with the highest cu used this epoch to the lowest // meaning if we fetch the first successful index this is probably the highest success ratio to get a response. for _, providerAddress := range csm.currentlyBlockedProviderAddresses { @@ -697,7 +701,7 @@ func (csm *ConsumerSessionManager) tryGetConsumerSessionWithProviderFromBlockedP consumerSessionsWithProvider := csm.pairing[providerAddress] // Add to ignored (no matter what) ignoredProviders.providers[providerAddress] = struct{}{} - usedProviders.AddUnwantedAddresses(providerAddress) // add the address to our unwanted providers to avoid infinite recursion + usedProviders.AddUnwantedAddresses(providerAddress, routerKey) // add the address to our unwanted providers to avoid infinite recursion // validate this provider has enough cu to be used if err := consumerSessionsWithProvider.validateComputeUnits(cuNeededForSession, virtualEpoch); err != nil { @@ -1020,6 +1024,7 @@ func (csm *ConsumerSessionManager) OnSessionDone( providersCount uint64, isHangingApi bool, reduceAvailability bool, + extensions []*spectypes.Extension, ) error { // release locks, update CU, relaynum etc.. if err := consumerSession.VerifyLock(); err != nil { diff --git a/protocol/lavasession/consumer_session_manager_test.go b/protocol/lavasession/consumer_session_manager_test.go index 9e7c340979..0d7096eb4c 100644 --- a/protocol/lavasession/consumer_session_manager_test.go +++ b/protocol/lavasession/consumer_session_manager_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/provideroptimizer" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/rand" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/provideroptimizer" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/rand" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/credentials" @@ -83,7 +83,7 @@ func TestHappyFlow(t *testing.T) { require.NotNil(t, cs) require.Equal(t, cs.Epoch, csm.currentEpoch) require.Equal(t, cs.Session.LatestRelayCu, cuForFirstRequest) - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) require.Equal(t, cs.Session.CuSum, cuForFirstRequest) require.Equal(t, cs.Session.LatestRelayCu, latestRelayCuAfterDone) @@ -416,7 +416,7 @@ func runOnSessionDoneForConsumerSessionMap(t *testing.T, css ConsumerSessionsMap require.NotNil(t, cs) require.Equal(t, cs.Epoch, csm.currentEpoch) require.Equal(t, cs.Session.LatestRelayCu, cuForFirstRequest) - err := csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err := csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) require.Equal(t, cs.Session.CuSum, cuForFirstRequest) require.Equal(t, cs.Session.LatestRelayCu, latestRelayCuAfterDone) @@ -448,7 +448,7 @@ func TestHappyFlowVirtualEpoch(t *testing.T) { require.NotNil(t, cs) require.Equal(t, cs.Epoch, csm.currentEpoch) require.Equal(t, cs.Session.LatestRelayCu, maxCuForVirtualEpoch*(virtualEpoch+1)) - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, maxCuForVirtualEpoch*(virtualEpoch+1), time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, maxCuForVirtualEpoch*(virtualEpoch+1), time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) require.Equal(t, cs.Session.CuSum, maxCuForVirtualEpoch*(virtualEpoch+1)) require.Equal(t, cs.Session.LatestRelayCu, latestRelayCuAfterDone) @@ -484,7 +484,7 @@ func TestPairingReset(t *testing.T) { require.NotNil(t, cs) require.Equal(t, cs.Epoch, csm.currentEpoch) require.Equal(t, cs.Session.LatestRelayCu, cuForFirstRequest) - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) require.Equal(t, cs.Session.CuSum, cuForFirstRequest) require.Equal(t, cs.Session.LatestRelayCu, latestRelayCuAfterDone) @@ -573,7 +573,7 @@ func TestPairingResetWithMultipleFailures(t *testing.T) { require.NotNil(t, cs) require.Equal(t, cs.Epoch, csm.currentEpoch) require.Equal(t, cs.Session.LatestRelayCu, cuForFirstRequest) - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) require.Equal(t, cs.Session.CuSum, cuForFirstRequest) require.Equal(t, cs.Session.LatestRelayCu, latestRelayCuAfterDone) @@ -619,7 +619,7 @@ func TestSuccessAndFailureOfSessionWithUpdatePairingsInTheMiddle(t *testing.T) { require.Equal(t, epoch, csm.currentEpoch) if rand.Intn(2) > 0 { - err = csm.OnSessionDone(cs, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) require.Equal(t, cs.CuSum, cuForFirstRequest) require.Equal(t, cs.LatestRelayCu, latestRelayCuAfterDone) @@ -653,7 +653,7 @@ func TestSuccessAndFailureOfSessionWithUpdatePairingsInTheMiddle(t *testing.T) { for j := numberOfAllowedSessionsPerConsumer / 2; j < numberOfAllowedSessionsPerConsumer; j++ { cs := sessionList[j].cs if rand.Intn(2) > 0 { - err = csm.OnSessionDone(cs, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) require.Equal(t, sessionListData[j].cuSum+cuForFirstRequest, cs.CuSum) require.Equal(t, cs.LatestRelayCu, latestRelayCuAfterDone) @@ -676,7 +676,7 @@ func successfulSession(ctx context.Context, csm *ConsumerSessionManager, t *test for _, cs := range css { require.NotNil(t, cs) time.Sleep(time.Duration((rand.Intn(500) + 1)) * time.Millisecond) - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) ch <- p } @@ -957,7 +957,7 @@ func TestPairingWithAddons(t *testing.T) { css, err := csm.GetSessions(ctx, cuForFirstRequest, NewUsedProviders(nil), servicedBlockNumber, addon, nil, common.NO_STATE, 0) // get a session require.NoError(t, err) for _, cs := range css { - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) } }) @@ -1032,7 +1032,7 @@ func TestPairingWithExtensions(t *testing.T) { css, err := csm.GetSessions(ctx, cuForFirstRequest, NewUsedProviders(nil), servicedBlockNumber, extensionOpt.addon, extensionsList, common.NO_STATE, 0) // get a session require.NoError(t, err) for _, cs := range css { - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) } }) @@ -1068,11 +1068,11 @@ func TestPairingWithStateful(t *testing.T) { require.NoError(t, err) require.Equal(t, allProviders, len(css)) for _, cs := range css { - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), numberOfProviders, numberOfProviders, false, false, nil) require.NoError(t, err) } usedProviders := NewUsedProviders(nil) - usedProviders.RemoveUsed(providerAddresses[0], nil) + usedProviders.RemoveUsed(providerAddresses[0], NewRouterKey(nil), nil) css, err = csm.GetSessions(ctx, cuForFirstRequest, usedProviders, servicedBlockNumber, addon, nil, common.CONSISTENCY_SELECT_ALL_PROVIDERS, 0) // get a session require.NoError(t, err) require.Equal(t, allProviders-1, len(css)) diff --git a/protocol/lavasession/consumer_types.go b/protocol/lavasession/consumer_types.go index 897c9b4664..22c6bed45c 100644 --- a/protocol/lavasession/consumer_types.go +++ b/protocol/lavasession/consumer_types.go @@ -8,11 +8,11 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/provideroptimizer" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/protocol/provideroptimizer" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" ) @@ -51,11 +51,11 @@ var ( ) type UsedProvidersInf interface { - RemoveUsed(providerAddress string, err error) + RemoveUsed(providerAddress string, routerKey RouterKey, err error) TryLockSelection(context.Context) error AddUsed(ConsumerSessionsMap, error) - GetUnwantedProvidersToSend() map[string]struct{} - AddUnwantedAddresses(address string) + GetUnwantedProvidersToSend(RouterKey) map[string]struct{} + AddUnwantedAddresses(address string, routerKey RouterKey) CurrentlyUsed() int } @@ -439,6 +439,7 @@ func (cswp *ConsumerSessionsWithProvider) GetConsumerSessionInstanceFromEndpoint Parent: cswp, EndpointConnection: endpointConnection, StaticProvider: cswp.StaticProvider, + routerKey: NewRouterKey(nil), } consumerSession.TryUseSession() // we must lock the session so other requests wont get it. diff --git a/protocol/lavasession/end_to_end_lavasession_test.go b/protocol/lavasession/end_to_end_lavasession_test.go index c3fc59dc68..40f4e91b3c 100644 --- a/protocol/lavasession/end_to_end_lavasession_test.go +++ b/protocol/lavasession/end_to_end_lavasession_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/common" + "github.com/lavanet/lava/v4/protocol/common" "github.com/stretchr/testify/require" ) @@ -72,7 +72,7 @@ func TestHappyFlowE2EEmergency(t *testing.T) { err = psm.OnSessionDone(sps, cs.Session.RelayNum-skippedRelays) require.NoError(t, err) - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, maxCuForVirtualEpoch, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), 1, 1, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, maxCuForVirtualEpoch, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), 1, 1, false, false, nil) require.NoError(t, err) } @@ -195,7 +195,7 @@ func prepareSessionsWithFirstRelay(t *testing.T, cuForFirstRequest uint64) (*Con require.NoError(t, err) // Consumer Side: - err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), 1, 1, false, false) + err = csm.OnSessionDone(cs.Session, servicedBlockNumber, cuForFirstRequest, time.Millisecond, cs.Session.CalculateExpectedLatency(2*time.Millisecond), (servicedBlockNumber - 1), 1, 1, false, false, nil) require.NoError(t, err) require.Equal(t, cs.Session.CuSum, cuForFirstRequest) require.Equal(t, cs.Session.LatestRelayCu, latestRelayCuAfterDone) diff --git a/protocol/lavasession/provider_session_manager.go b/protocol/lavasession/provider_session_manager.go index 2050400202..e2e198a286 100644 --- a/protocol/lavasession/provider_session_manager.go +++ b/protocol/lavasession/provider_session_manager.go @@ -5,9 +5,9 @@ import ( "sync" "sync/atomic" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) type ProviderSessionManager struct { diff --git a/protocol/lavasession/provider_session_manager_test.go b/protocol/lavasession/provider_session_manager_test.go index aa53a57114..00d8617e4a 100644 --- a/protocol/lavasession/provider_session_manager_test.go +++ b/protocol/lavasession/provider_session_manager_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/lavasession/provider_types.go b/protocol/lavasession/provider_types.go index a0576f106a..955abe4b3d 100644 --- a/protocol/lavasession/provider_types.go +++ b/protocol/lavasession/provider_types.go @@ -7,9 +7,9 @@ import ( "sync" "sync/atomic" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" ) type ProviderSessionsEpochData struct { diff --git a/protocol/lavasession/reported_providers.go b/protocol/lavasession/reported_providers.go index 5164670d44..6330fca572 100644 --- a/protocol/lavasession/reported_providers.go +++ b/protocol/lavasession/reported_providers.go @@ -4,9 +4,9 @@ import ( "sync" "time" - metrics "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + metrics "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/protocol/lavasession/router_key.go b/protocol/lavasession/router_key.go index 291e543235..175d60b921 100644 --- a/protocol/lavasession/router_key.go +++ b/protocol/lavasession/router_key.go @@ -4,34 +4,90 @@ import ( "sort" "strconv" "strings" + + "github.com/lavanet/lava/v4/utils/lavaslices" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( - sep = "|" - methodRouteSep = "method-route:" + RouterKeySeparator = "|" + methodRouteSep = "method-route:" + internalPathSep = "internal-path:" ) -type RouterKey string - -func (rk *RouterKey) ApplyMethodsRoute(routeNum int) RouterKey { - additionalPath := strconv.FormatInt(int64(routeNum), 10) - return RouterKey(string(*rk) + methodRouteSep + additionalPath) +type RouterKey struct { + methodsRouteUniqueKey int + uniqueExtensions []string + internalPath string } func NewRouterKey(extensions []string) RouterKey { + routerKey := RouterKey{} + routerKey.SetExtensions(extensions) + return routerKey +} + +func NewRouterKeyFromExtensions(extensions []*spectypes.Extension) RouterKey { + extensionsStr := lavaslices.Map(extensions, func(extension *spectypes.Extension) string { + return extension.Name + }) + + return NewRouterKey(extensionsStr) +} + +func GetEmptyRouterKey() RouterKey { + return NewRouterKey([]string{}) +} + +func (rk *RouterKey) SetExtensions(extensions []string) { // make sure addons have no repetitions - uniqueExtensions := map[string]struct{}{} - for _, extension := range extensions { - uniqueExtensions[extension] = struct{}{} + uniqueExtensions := map[string]struct{}{} // init with the empty extension + if len(extensions) == 0 { + uniqueExtensions[""] = struct{}{} + } else { + for _, extension := range extensions { + uniqueExtensions[extension] = struct{}{} + } } + uniqueExtensionsSlice := []string{} for addon := range uniqueExtensions { // we are sorting this anyway so we don't have to keep order uniqueExtensionsSlice = append(uniqueExtensionsSlice, addon) } + sort.Strings(uniqueExtensionsSlice) - return RouterKey(sep + strings.Join(uniqueExtensionsSlice, sep) + sep) + + rk.uniqueExtensions = uniqueExtensionsSlice } -func GetEmptyRouterKey() RouterKey { - return NewRouterKey([]string{}) +func (rk *RouterKey) ApplyMethodsRoute(routeNum int) { + rk.methodsRouteUniqueKey = routeNum +} + +func (rk *RouterKey) ApplyInternalPath(internalPath string) { + rk.internalPath = internalPath +} + +func (rk RouterKey) HasExtension(extension string) bool { + return lavaslices.Contains(rk.uniqueExtensions, extension) +} + +func (rk RouterKey) String() string { + // uniqueExtensions are sorted on init + retStr := rk.uniqueExtensions + if len(retStr) == 0 { + retStr = append(retStr, "") + } + + // if we have a route number, we add it to the key + if rk.methodsRouteUniqueKey != 0 { + retStr = append(retStr, methodRouteSep+strconv.FormatInt(int64(rk.methodsRouteUniqueKey), 10)) + } + + // if we have an internal path, we add it to the key + if rk.internalPath != "" { + retStr = append(retStr, internalPathSep+rk.internalPath) + } + + return RouterKeySeparator + strings.Join(retStr, RouterKeySeparator) + RouterKeySeparator } diff --git a/protocol/lavasession/router_key_test.go b/protocol/lavasession/router_key_test.go new file mode 100644 index 0000000000..cbd7983ebb --- /dev/null +++ b/protocol/lavasession/router_key_test.go @@ -0,0 +1,90 @@ +package lavasession + +import ( + "testing" + + spectypes "github.com/lavanet/lava/v4/x/spec/types" + "github.com/stretchr/testify/require" +) + +func TestRouterKey_SetExtensions(t *testing.T) { + rk := NewRouterKey([]string{"ext1", "ext2", "ext1"}) + require.Equal(t, "|ext1|ext2|", rk.String()) + + rk.SetExtensions([]string{"ext3", "ext2"}) + require.Equal(t, "|ext2|ext3|", rk.String()) +} + +func TestRouterKey_NewRouterKeyFromExtensions(t *testing.T) { + rk := NewRouterKeyFromExtensions([]*spectypes.Extension{ + {Name: "ext1"}, + {Name: "ext2"}, + {Name: "ext3"}, + }) + require.Equal(t, "|ext1|ext2|ext3|", rk.String()) +} + +func TestRouterKey_HasExtension(t *testing.T) { + rk := NewRouterKey([]string{"ext1", "ext2"}) + require.True(t, rk.HasExtension("ext1")) + require.False(t, rk.HasExtension("ext3")) +} + +func TestRouterKey_ApplyMethodsRoute(t *testing.T) { + rk := NewRouterKey([]string{}) + rk.ApplyMethodsRoute(42) + require.Equal(t, "||method-route:42|", rk.String()) +} + +func TestRouterKey_ApplyInternalPath(t *testing.T) { + rk := NewRouterKey([]string{}) + rk.ApplyInternalPath("/x") + require.Equal(t, "||internal-path:/x|", rk.String()) +} + +func TestRouterKey_String_NoExtensionsNoRouteNoPath(t *testing.T) { + rk := NewRouterKey([]string{}) + require.Equal(t, "||", rk.String()) +} + +func TestRouterKey_String_WithExtensionsNoRouteNoPath(t *testing.T) { + rk := NewRouterKey([]string{"ext2", "ext1"}) + require.Equal(t, "|ext1|ext2|", rk.String()) +} + +func TestRouterKey_String_WithExtensionsAndRouteNoPath(t *testing.T) { + rk := NewRouterKey([]string{"ext1", "ext2"}) + rk.ApplyMethodsRoute(42) + require.Equal(t, "|ext1|ext2|method-route:42|", rk.String()) +} + +func TestRouterKey_String_WithExtensionsRouteAndPath(t *testing.T) { + rk := NewRouterKey([]string{"ext1", "ext2"}) + rk.ApplyMethodsRoute(42) + rk.ApplyInternalPath("/x") + require.Equal(t, "|ext1|ext2|method-route:42|internal-path:/x|", rk.String()) +} + +func TestRouterKey_String_NoExtensionsWithRouteAndPath(t *testing.T) { + rk := NewRouterKey([]string{}) + rk.ApplyMethodsRoute(42) + rk.ApplyInternalPath("/x") + require.Equal(t, "||method-route:42|internal-path:/x|", rk.String()) +} + +func TestRouterKey_String_WithPathNoRouteNoExtensions(t *testing.T) { + rk := NewRouterKey([]string{}) + rk.ApplyInternalPath("/another/path") + require.Equal(t, "||internal-path:/another/path|", rk.String()) +} + +func TestGetEmptyRouterKey(t *testing.T) { + rk := GetEmptyRouterKey() + require.Equal(t, "||", rk.String()) +} + +func TestRouterKey_SetExtensions_EmptySlice(t *testing.T) { + rk := NewRouterKey([]string{}) + rk.SetExtensions([]string{}) + require.Equal(t, "||", rk.String()) +} diff --git a/protocol/lavasession/single_consumer_session.go b/protocol/lavasession/single_consumer_session.go index 3b757067e2..b81e18fd0e 100644 --- a/protocol/lavasession/single_consumer_session.go +++ b/protocol/lavasession/single_consumer_session.go @@ -7,8 +7,8 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) type SingleConsumerSession struct { @@ -25,9 +25,10 @@ type SingleConsumerSession struct { BlockListed bool // if session lost sync we blacklist it. ConsecutiveErrors []error errorsCount uint64 - relayProcessor UsedProvidersInf + usedProviders UsedProvidersInf providerUniqueId string StaticProvider bool + routerKey RouterKey } // returns the expected latency to a threshold. @@ -105,7 +106,7 @@ func (cs *SingleConsumerSession) CalculateQoS(latency, expectedLatency time.Dura } } -func (scs *SingleConsumerSession) SetUsageForSession(cuNeededForSession uint64, qoSExcellenceReport *pairingtypes.QualityOfServiceReport, rawQoSExcellenceReport *pairingtypes.QualityOfServiceReport, usedProviders UsedProvidersInf) error { +func (scs *SingleConsumerSession) SetUsageForSession(cuNeededForSession uint64, qoSExcellenceReport *pairingtypes.QualityOfServiceReport, rawQoSExcellenceReport *pairingtypes.QualityOfServiceReport, usedProviders UsedProvidersInf, routerKey RouterKey) error { scs.LatestRelayCu = cuNeededForSession // set latestRelayCu scs.RelayNum += RelayNumberIncrement // increase relayNum if scs.RelayNum > 1 { @@ -113,15 +114,17 @@ func (scs *SingleConsumerSession) SetUsageForSession(cuNeededForSession uint64, scs.QoSInfo.LastExcellenceQoSReport = qoSExcellenceReport scs.QoSInfo.LastExcellenceQoSReportRaw = rawQoSExcellenceReport } - scs.relayProcessor = usedProviders + scs.usedProviders = usedProviders + scs.routerKey = routerKey return nil } func (scs *SingleConsumerSession) Free(err error) { - if scs.relayProcessor != nil { - scs.relayProcessor.RemoveUsed(scs.Parent.PublicLavaAddress, err) - scs.relayProcessor = nil + if scs.usedProviders != nil { + scs.usedProviders.RemoveUsed(scs.Parent.PublicLavaAddress, scs.routerKey, err) + scs.usedProviders = nil } + scs.routerKey = NewRouterKey(nil) scs.EndpointConnection.decreaseSessionUsingConnection() scs.lock.Unlock() } @@ -132,7 +135,7 @@ func (session *SingleConsumerSession) TryUseSession() (blocked bool, ok bool) { session.lock.Unlock() return true, false } - if session.relayProcessor != nil { + if session.usedProviders != nil { utils.LavaFormatError("session misuse detected, usedProviders isn't nil, missing Free call, blocking", nil, utils.LogAttr("session", session.SessionId)) session.BlockListed = true session.lock.Unlock() diff --git a/protocol/lavasession/single_provider_session.go b/protocol/lavasession/single_provider_session.go index 3ea299d3c3..cfe62a508b 100644 --- a/protocol/lavasession/single_provider_session.go +++ b/protocol/lavasession/single_provider_session.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "time" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) const ( diff --git a/protocol/lavasession/used_providers.go b/protocol/lavasession/used_providers.go index dcf95d951e..97cc1fce8a 100644 --- a/protocol/lavasession/used_providers.go +++ b/protocol/lavasession/used_providers.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) const MaximumNumberOfSelectionLockAttempts = 500 @@ -25,22 +25,34 @@ func NewUsedProviders(blockedProviders BlockedProvidersInf) *UsedProviders { } } return &UsedProviders{ - providers: map[string]struct{}{}, - unwantedProviders: unwantedProviders, - blockOnSyncLoss: map[string]struct{}{}, - erroredProviders: map[string]struct{}{}, + uniqueUsedProviders: map[string]*UniqueUsedProviders{GetEmptyRouterKey().String(): { + providers: map[string]struct{}{}, + unwantedProviders: unwantedProviders, + blockOnSyncLoss: map[string]struct{}{}, + erroredProviders: map[string]struct{}{}, + }}, + // we keep the original unwanted providers so when we create more unique used providers + // we can reuse it as its the user's instructions. + originalUnwantedProviders: unwantedProviders, } } +// unique used providers are specific for an extension router key. +// meaning each extension router key has a different used providers struct +type UniqueUsedProviders struct { + providers map[string]struct{} + unwantedProviders map[string]struct{} + erroredProviders map[string]struct{} // providers who returned protocol errors (used to debug relays for now) + blockOnSyncLoss map[string]struct{} +} + type UsedProviders struct { - lock sync.RWMutex - providers map[string]struct{} - selecting bool - unwantedProviders map[string]struct{} - erroredProviders map[string]struct{} // providers who returned protocol errors (used to debug relays for now) - blockOnSyncLoss map[string]struct{} - sessionsLatestBatch int - batchNumber int + lock sync.RWMutex + uniqueUsedProviders map[string]*UniqueUsedProviders + originalUnwantedProviders map[string]struct{} + selecting bool + sessionsLatestBatch int + batchNumber int } func (up *UsedProviders) CurrentlyUsed() int { @@ -50,7 +62,11 @@ func (up *UsedProviders) CurrentlyUsed() int { } up.lock.RLock() defer up.lock.RUnlock() - return len(up.providers) + currentlyUsed := 0 + for _, uniqueUsedProviders := range up.uniqueUsedProviders { + currentlyUsed += len(uniqueUsedProviders.providers) + } + return currentlyUsed } func (up *UsedProviders) SessionsLatestBatch() int { @@ -81,13 +97,15 @@ func (up *UsedProviders) CurrentlyUsedAddresses() []string { up.lock.RLock() defer up.lock.RUnlock() addresses := []string{} - for addr := range up.providers { - addresses = append(addresses, addr) + for _, uniqueUsedProviders := range up.uniqueUsedProviders { + for addr := range uniqueUsedProviders.providers { + addresses = append(addresses, addr) + } } return addresses } -func (up *UsedProviders) UnwantedAddresses() []string { +func (up *UsedProviders) AllUnwantedAddresses() []string { if up == nil { utils.LavaFormatError("UsedProviders.UnwantedAddresses is nil, misuse detected", nil) return []string{} @@ -95,46 +113,69 @@ func (up *UsedProviders) UnwantedAddresses() []string { up.lock.RLock() defer up.lock.RUnlock() addresses := []string{} - for addr := range up.unwantedProviders { - addresses = append(addresses, addr) + for _, uniqueUsedProviders := range up.uniqueUsedProviders { + for addr := range uniqueUsedProviders.unwantedProviders { + addresses = append(addresses, addr) + } } return addresses } -func (up *UsedProviders) AddUnwantedAddresses(address string) { +// Use when locked. Checking wether a router key exists in unique used providers, +// if it does, return it. If it doesn't +// creating a new instance and returning it. +func (up *UsedProviders) createOrUseUniqueUsedProvidersForKey(key RouterKey) *UniqueUsedProviders { + keyString := key.String() + uniqueUsedProviders, ok := up.uniqueUsedProviders[keyString] + if !ok { + uniqueUsedProviders = &UniqueUsedProviders{ + providers: map[string]struct{}{}, + unwantedProviders: up.originalUnwantedProviders, + blockOnSyncLoss: map[string]struct{}{}, + erroredProviders: map[string]struct{}{}, + } + up.uniqueUsedProviders[keyString] = uniqueUsedProviders + } + return uniqueUsedProviders +} + +func (up *UsedProviders) AddUnwantedAddresses(address string, routerKey RouterKey) { if up == nil { utils.LavaFormatError("UsedProviders.AddUnwantedAddresses is nil, misuse detected", nil) return } up.lock.Lock() defer up.lock.Unlock() - up.unwantedProviders[address] = struct{}{} + uniqueUsedProviders := up.createOrUseUniqueUsedProvidersForKey(routerKey) + uniqueUsedProviders.unwantedProviders[address] = struct{}{} } -func (up *UsedProviders) RemoveUsed(provider string, err error) { +func (up *UsedProviders) RemoveUsed(provider string, routerKey RouterKey, err error) { if up == nil { return } up.lock.Lock() defer up.lock.Unlock() + uniqueUsedProviders := up.createOrUseUniqueUsedProvidersForKey(routerKey) + if err != nil { - up.erroredProviders[provider] = struct{}{} + uniqueUsedProviders.erroredProviders[provider] = struct{}{} if shouldRetryWithThisError(err) { - _, ok := up.blockOnSyncLoss[provider] + _, ok := uniqueUsedProviders.blockOnSyncLoss[provider] if !ok && IsSessionSyncLoss(err) { - up.blockOnSyncLoss[provider] = struct{}{} + uniqueUsedProviders.blockOnSyncLoss[provider] = struct{}{} utils.LavaFormatWarning("Identified SyncLoss in provider, allowing retry", err, utils.Attribute{Key: "address", Value: provider}) } else { - up.setUnwanted(provider) + up.setUnwanted(uniqueUsedProviders, provider) } } else { - up.setUnwanted(provider) + up.setUnwanted(uniqueUsedProviders, provider) } } else { // we got a valid response from this provider, no reason to keep using it - up.setUnwanted(provider) + up.setUnwanted(uniqueUsedProviders, provider) } - delete(up.providers, provider) + delete(uniqueUsedProviders.providers, provider) } func (up *UsedProviders) ClearUnwanted() { @@ -144,7 +185,9 @@ func (up *UsedProviders) ClearUnwanted() { up.lock.Lock() defer up.lock.Unlock() // this is nil safe - up.unwantedProviders = map[string]struct{}{} + for _, uniqueUsedProviders := range up.uniqueUsedProviders { + uniqueUsedProviders.unwantedProviders = map[string]struct{}{} + } } func (up *UsedProviders) AddUsed(sessions ConsumerSessionsMap, err error) { @@ -156,8 +199,15 @@ func (up *UsedProviders) AddUsed(sessions ConsumerSessionsMap, err error) { // this is nil safe if len(sessions) > 0 && err == nil { up.sessionsLatestBatch = 0 - for provider := range sessions { // the key for ConsumerSessionsMap is the provider public address - up.providers[provider] = struct{}{} + for provider, sessionInfo := range sessions { // the key for ConsumerSessionsMap is the provider public address + var routerKey RouterKey + if sessionInfo.Session != nil { + routerKey = sessionInfo.Session.routerKey + } else { + routerKey = NewRouterKey(nil) + } + uniqueUsedProviders := up.createOrUseUniqueUsedProvidersForKey(routerKey) + uniqueUsedProviders.providers[provider] = struct{}{} up.sessionsLatestBatch++ } // increase batch number @@ -167,11 +217,8 @@ func (up *UsedProviders) AddUsed(sessions ConsumerSessionsMap, err error) { } // called when already locked. -func (up *UsedProviders) setUnwanted(provider string) { - if up == nil { - return - } - up.unwantedProviders[provider] = struct{}{} +func (up *UsedProviders) setUnwanted(uniqueUsedProviders *UniqueUsedProviders, provider string) { + uniqueUsedProviders.unwantedProviders[provider] = struct{}{} } func (up *UsedProviders) TryLockSelection(ctx context.Context) error { @@ -206,28 +253,30 @@ func (up *UsedProviders) tryLockSelection() bool { return false } -func (up *UsedProviders) GetErroredProviders() map[string]struct{} { +func (up *UsedProviders) GetErroredProviders(routerKey RouterKey) map[string]struct{} { if up == nil { return map[string]struct{}{} } - up.lock.RLock() - defer up.lock.RUnlock() - return up.erroredProviders + up.lock.Lock() + defer up.lock.Unlock() + uniqueUsedProviders := up.createOrUseUniqueUsedProvidersForKey(routerKey) + return uniqueUsedProviders.erroredProviders } -func (up *UsedProviders) GetUnwantedProvidersToSend() map[string]struct{} { +func (up *UsedProviders) GetUnwantedProvidersToSend(routerKey RouterKey) map[string]struct{} { if up == nil { return map[string]struct{}{} } - up.lock.RLock() - defer up.lock.RUnlock() + up.lock.Lock() + defer up.lock.Unlock() + uniqueUsedProviders := up.createOrUseUniqueUsedProvidersForKey(routerKey) unwantedProvidersToSend := map[string]struct{}{} // block the currently used providers - for provider := range up.providers { + for provider := range uniqueUsedProviders.providers { unwantedProvidersToSend[provider] = struct{}{} } // block providers that we have a response for - for provider := range up.unwantedProviders { + for provider := range uniqueUsedProviders.unwantedProviders { unwantedProvidersToSend[provider] = struct{}{} } return unwantedProvidersToSend diff --git a/protocol/lavasession/used_providers_test.go b/protocol/lavasession/used_providers_test.go index 30f3c7a641..7f0adcb5be 100644 --- a/protocol/lavasession/used_providers_test.go +++ b/protocol/lavasession/used_providers_test.go @@ -20,35 +20,35 @@ func TestUsedProviders(t *testing.T) { require.False(t, canUseAgain) require.Zero(t, usedProviders.CurrentlyUsed()) require.Zero(t, usedProviders.SessionsLatestBatch()) - unwanted := usedProviders.GetUnwantedProvidersToSend() + unwanted := usedProviders.GetUnwantedProvidersToSend(NewRouterKey(nil)) require.Len(t, unwanted, 0) consumerSessionsMap := ConsumerSessionsMap{"test": &SessionInfo{}, "test2": &SessionInfo{}} usedProviders.AddUsed(consumerSessionsMap, nil) canUseAgain = usedProviders.tryLockSelection() require.True(t, canUseAgain) - unwanted = usedProviders.GetUnwantedProvidersToSend() + unwanted = usedProviders.GetUnwantedProvidersToSend(NewRouterKey(nil)) require.Len(t, unwanted, 2) require.Equal(t, 2, usedProviders.CurrentlyUsed()) canUseAgain = usedProviders.tryLockSelection() require.False(t, canUseAgain) consumerSessionsMap = ConsumerSessionsMap{"test3": &SessionInfo{}, "test4": &SessionInfo{}} usedProviders.AddUsed(consumerSessionsMap, nil) - unwanted = usedProviders.GetUnwantedProvidersToSend() + unwanted = usedProviders.GetUnwantedProvidersToSend(NewRouterKey(nil)) require.Len(t, unwanted, 4) require.Equal(t, 4, usedProviders.CurrentlyUsed()) // one provider gives a retry - usedProviders.RemoveUsed("test", status.Error(codes.Code(SessionOutOfSyncError.ABCICode()), "")) + usedProviders.RemoveUsed("test", NewRouterKey(nil), status.Error(codes.Code(SessionOutOfSyncError.ABCICode()), "")) require.Equal(t, 3, usedProviders.CurrentlyUsed()) - unwanted = usedProviders.GetUnwantedProvidersToSend() + unwanted = usedProviders.GetUnwantedProvidersToSend(NewRouterKey(nil)) require.Len(t, unwanted, 3) // one provider gives a result - usedProviders.RemoveUsed("test2", nil) - unwanted = usedProviders.GetUnwantedProvidersToSend() + usedProviders.RemoveUsed("test2", NewRouterKey(nil), nil) + unwanted = usedProviders.GetUnwantedProvidersToSend(NewRouterKey(nil)) require.Len(t, unwanted, 3) require.Equal(t, 2, usedProviders.CurrentlyUsed()) // one provider gives an error - usedProviders.RemoveUsed("test3", fmt.Errorf("bad")) - unwanted = usedProviders.GetUnwantedProvidersToSend() + usedProviders.RemoveUsed("test3", NewRouterKey(nil), fmt.Errorf("bad")) + unwanted = usedProviders.GetUnwantedProvidersToSend(NewRouterKey(nil)) require.Len(t, unwanted, 3) require.Equal(t, 1, usedProviders.CurrentlyUsed()) canUseAgain = usedProviders.tryLockSelection() @@ -74,7 +74,7 @@ func TestUsedProvidersAsync(t *testing.T) { defer cancel() canUseAgain := usedProviders.TryLockSelection(ctx) require.Nil(t, canUseAgain) - unwanted := usedProviders.GetUnwantedProvidersToSend() + unwanted := usedProviders.GetUnwantedProvidersToSend(NewRouterKey(nil)) require.Len(t, unwanted, 2) require.Equal(t, 2, usedProviders.CurrentlyUsed()) }) diff --git a/protocol/loadtest/testing.go b/protocol/loadtest/testing.go index f067fc0001..d2fcc0d239 100644 --- a/protocol/loadtest/testing.go +++ b/protocol/loadtest/testing.go @@ -13,7 +13,7 @@ import ( "time" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/protocol/metrics/metrics_consumer_manager.go b/protocol/metrics/consumer_metrics_manager.go similarity index 99% rename from protocol/metrics/metrics_consumer_manager.go rename to protocol/metrics/consumer_metrics_manager.go index ce88f2145b..b3ac3e910e 100644 --- a/protocol/metrics/metrics_consumer_manager.go +++ b/protocol/metrics/consumer_metrics_manager.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/protocol/metrics/metrics_consumer_manager_test.go b/protocol/metrics/consumer_metrics_manager_test.go similarity index 100% rename from protocol/metrics/metrics_consumer_manager_test.go rename to protocol/metrics/consumer_metrics_manager_test.go diff --git a/protocol/metrics/consumer_optimizer_qos_client.go b/protocol/metrics/consumer_optimizer_qos_client.go index ef20fed8bf..f204107e17 100644 --- a/protocol/metrics/consumer_optimizer_qos_client.go +++ b/protocol/metrics/consumer_optimizer_qos_client.go @@ -9,9 +9,9 @@ import ( "time" "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "golang.org/x/exp/maps" ) diff --git a/protocol/metrics/consumer_referrer_client.go b/protocol/metrics/consumer_referrer_client.go index dffb098a64..13bd0b0cd9 100644 --- a/protocol/metrics/consumer_referrer_client.go +++ b/protocol/metrics/consumer_referrer_client.go @@ -6,7 +6,7 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) const ( diff --git a/protocol/metrics/consumer_relayserver_client.go b/protocol/metrics/consumer_relayserver_client.go index 649270abec..06979988f7 100644 --- a/protocol/metrics/consumer_relayserver_client.go +++ b/protocol/metrics/consumer_relayserver_client.go @@ -10,7 +10,7 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type ConsumerRelayServerClient struct { diff --git a/protocol/metrics/consumer_reports_client.go b/protocol/metrics/consumer_reports_client.go index 0694b488e1..f13e7c3e3c 100644 --- a/protocol/metrics/consumer_reports_client.go +++ b/protocol/metrics/consumer_reports_client.go @@ -6,8 +6,8 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/protocol/metrics/consumer_reports_client_test.go b/protocol/metrics/consumer_reports_client_test.go index af9da90753..dfbc630290 100644 --- a/protocol/metrics/consumer_reports_client_test.go +++ b/protocol/metrics/consumer_reports_client_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/metrics/health_metrics.go b/protocol/metrics/health_metrics.go index a5d614a913..a84105dcc7 100644 --- a/protocol/metrics/health_metrics.go +++ b/protocol/metrics/health_metrics.go @@ -3,7 +3,7 @@ package metrics import ( "net/http" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/protocol/metrics/metricsService.go b/protocol/metrics/metrics_service.go similarity index 99% rename from protocol/metrics/metricsService.go rename to protocol/metrics/metrics_service.go index e5fc41b37a..b7c80f94b2 100644 --- a/protocol/metrics/metricsService.go +++ b/protocol/metrics/metrics_service.go @@ -9,7 +9,7 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type AggregatedMetric struct { diff --git a/protocol/metrics/metrics_test.go b/protocol/metrics/metrics_test.go index 5590def6a3..a474dc2dad 100644 --- a/protocol/metrics/metrics_test.go +++ b/protocol/metrics/metrics_test.go @@ -5,7 +5,7 @@ import ( "testing" ) -func Test_StorAaggregatedata_OnMetricService(t *testing.T) { +func Test_StoreAggregatedData_OnMetricService(t *testing.T) { // setup metricService := MetricService{ AggregatedMetricMap: &map[string]map[string]map[string]map[RelaySource]map[string]*AggregatedMetric{}, diff --git a/protocol/metrics/metrics_provider.go b/protocol/metrics/provider_metrics.go similarity index 88% rename from protocol/metrics/metrics_provider.go rename to protocol/metrics/provider_metrics.go index b5c3f0761b..3b5f863c50 100644 --- a/protocol/metrics/metrics_provider.go +++ b/protocol/metrics/provider_metrics.go @@ -3,7 +3,7 @@ package metrics import ( "sync" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/prometheus/client_golang/prometheus" ) @@ -22,6 +22,7 @@ type ProviderMetrics struct { totalRelaysServicedMetric *prometheus.CounterVec totalErroredMetric *prometheus.CounterVec consumerQoSMetric *prometheus.GaugeVec + loadRateMetric *prometheus.GaugeVec } func (pm *ProviderMetrics) AddRelay(consumerAddress string, cu uint64, qos *pairingtypes.QualityOfServiceReport) { @@ -49,6 +50,13 @@ func (pm *ProviderMetrics) AddRelay(consumerAddress string, cu uint64, qos *pair } } +func (pm *ProviderMetrics) SetLoadRate(loadRate float64) { + if pm == nil { + return + } + pm.loadRateMetric.WithLabelValues(pm.specID).Set(loadRate) +} + func (pm *ProviderMetrics) AddPayment(cu uint64) { if pm == nil { return @@ -72,6 +80,7 @@ func NewProviderMetrics(specID, apiInterface string, totalCUServicedMetric *prom totalRelaysServicedMetric *prometheus.CounterVec, totalErroredMetric *prometheus.CounterVec, consumerQoSMetric *prometheus.GaugeVec, + loadRateMetric *prometheus.GaugeVec, ) *ProviderMetrics { pm := &ProviderMetrics{ specID: specID, @@ -82,6 +91,7 @@ func NewProviderMetrics(specID, apiInterface string, totalCUServicedMetric *prom totalRelaysServicedMetric: totalRelaysServicedMetric, totalErroredMetric: totalErroredMetric, consumerQoSMetric: consumerQoSMetric, + loadRateMetric: loadRateMetric, } return pm } diff --git a/protocol/metrics/metrics_provider_manager.go b/protocol/metrics/provider_metrics_manager.go similarity index 85% rename from protocol/metrics/metrics_provider_manager.go rename to protocol/metrics/provider_metrics_manager.go index b71b90e664..8481b937b4 100644 --- a/protocol/metrics/metrics_provider_manager.go +++ b/protocol/metrics/provider_metrics_manager.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" - "github.com/lavanet/lava/v3/utils" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) @@ -41,6 +41,10 @@ type ProviderMetricsManager struct { endpointsHealthChecksOk uint64 relaysMonitors map[string]*RelaysMonitor relaysMonitorsLock sync.RWMutex + frozenStatusMetric *prometheus.GaugeVec + jailStatusMetric *prometheus.GaugeVec + jailedCountMetric *prometheus.GaugeVec + loadRateMetric *prometheus.GaugeVec } func NewProviderMetricsManager(networkAddress string) *ProviderMetricsManager { @@ -107,24 +111,47 @@ func NewProviderMetricsManager(networkAddress string) *ProviderMetricsManager { Help: "The total number of get latest block queries that succeeded by chainfetcher", }, []string{"spec"}) + loadRateMetric := prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "lava_provider_load_rate", + Help: "The load rate according to the load rate limit - Given Y simultaneous relay calls, a value of X and will measure Y/X load rate.", + }, []string{"spec"}) + fetchBlockSuccessMetric := prometheus.NewCounterVec(prometheus.CounterOpts{ Name: "lava_provider_fetch_block_success", Help: "The total number of get specific block queries that succeeded by chainfetcher", }, []string{"spec"}) + virtualEpochMetric := prometheus.NewGaugeVec(prometheus.GaugeOpts{ Name: "virtual_epoch", Help: "The current virtual epoch measured", }, []string{"spec"}) + endpointsHealthChecksOkMetric := prometheus.NewGauge(prometheus.GaugeOpts{ Name: "lava_provider_overall_health", Help: "At least one endpoint is healthy", }) endpointsHealthChecksOkMetric.Set(1) + frozenStatusMetric := prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "lava_provider_frozen_status", + Help: "Frozen: 1, Not Frozen: 0", + }, []string{"chainID"}) + + jailStatusMetric := prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "lava_provider_jail_status", + Help: "Jailed: 1, Not Jailed: 0", + }, []string{"chainID"}) + + jailedCountMetric := prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "lava_provider_jailed_count", + Help: "The amount of times the provider was jailed in the last 24 hours", + }, []string{"chainID"}) + protocolVersionMetric := prometheus.NewGaugeVec(prometheus.GaugeOpts{ Name: "lava_provider_protocol_version", Help: "The current running lavap version for the process. major := version / 1000000, minor := (version / 1000) % 1000 patch := version % 1000", }, []string{"version"}) + // Register the metrics with the Prometheus registry. prometheus.MustRegister(totalCUServicedMetric) prometheus.MustRegister(totalCUPaidMetric) @@ -141,6 +168,10 @@ func NewProviderMetricsManager(networkAddress string) *ProviderMetricsManager { prometheus.MustRegister(virtualEpochMetric) prometheus.MustRegister(endpointsHealthChecksOkMetric) prometheus.MustRegister(protocolVersionMetric) + prometheus.MustRegister(frozenStatusMetric) + prometheus.MustRegister(jailStatusMetric) + prometheus.MustRegister(jailedCountMetric) + prometheus.MustRegister(loadRateMetric) providerMetricsManager := &ProviderMetricsManager{ providerMetrics: map[string]*ProviderMetrics{}, @@ -161,6 +192,10 @@ func NewProviderMetricsManager(networkAddress string) *ProviderMetricsManager { endpointsHealthChecksOk: 1, protocolVersionMetric: protocolVersionMetric, relaysMonitors: map[string]*RelaysMonitor{}, + frozenStatusMetric: frozenStatusMetric, + jailStatusMetric: jailStatusMetric, + jailedCountMetric: jailedCountMetric, + loadRateMetric: loadRateMetric, } http.Handle("/metrics", promhttp.Handler()) @@ -209,7 +244,7 @@ func (pme *ProviderMetricsManager) AddProviderMetrics(specID, apiInterface strin } if pme.getProviderMetric(specID, apiInterface) == nil { - providerMetric := NewProviderMetrics(specID, apiInterface, pme.totalCUServicedMetric, pme.totalCUPaidMetric, pme.totalRelaysServicedMetric, pme.totalErroredMetric, pme.consumerQoSMetric) + providerMetric := NewProviderMetrics(specID, apiInterface, pme.totalCUServicedMetric, pme.totalCUPaidMetric, pme.totalRelaysServicedMetric, pme.totalErroredMetric, pme.consumerQoSMetric, pme.loadRateMetric) pme.setProviderMetric(providerMetric) endpoint := fmt.Sprintf("/metrics/%s/%s/health", specID, apiInterface) @@ -350,3 +385,27 @@ func (pme *ProviderMetricsManager) RegisterRelaysMonitor(chainID, apiInterface s defer pme.relaysMonitorsLock.Unlock() pme.relaysMonitors[chainID+apiInterface] = relaysMonitor } + +func (pme *ProviderMetricsManager) SetFrozenStatus(chain string, frozen bool) { + if pme == nil { + return + } + + pme.frozenStatusMetric.WithLabelValues(chain).Set(utils.Btof(frozen)) +} + +func (pme *ProviderMetricsManager) SetJailStatus(chain string, jailed bool) { + if pme == nil { + return + } + + pme.jailStatusMetric.WithLabelValues(chain).Set(utils.Btof(jailed)) +} + +func (pme *ProviderMetricsManager) SetJailedCount(chain string, jailedCount uint64) { + if pme == nil { + return + } + + pme.jailedCountMetric.WithLabelValues(chain).Set(float64(jailedCount)) +} diff --git a/protocol/metrics/queue_sender.go b/protocol/metrics/queue_sender.go index 16f41c2d7a..217b40c9e3 100644 --- a/protocol/metrics/queue_sender.go +++ b/protocol/metrics/queue_sender.go @@ -11,7 +11,7 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type QueueSender struct { diff --git a/protocol/metrics/relays_monitor.go b/protocol/metrics/relays_monitor.go index 542da952cb..ed505c779e 100644 --- a/protocol/metrics/relays_monitor.go +++ b/protocol/metrics/relays_monitor.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "time" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type RelaysMonitor struct { diff --git a/protocol/metrics/rpcconsumerlogs.go b/protocol/metrics/rpcconsumer_logs.go similarity index 98% rename from protocol/metrics/rpcconsumerlogs.go rename to protocol/metrics/rpcconsumer_logs.go index d441e75cd0..d09f988716 100644 --- a/protocol/metrics/rpcconsumerlogs.go +++ b/protocol/metrics/rpcconsumer_logs.go @@ -12,9 +12,9 @@ import ( "github.com/gofiber/fiber/v2" "github.com/gofiber/websocket/v2" "github.com/joho/godotenv" - "github.com/lavanet/lava/v3/protocol/parser" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/protocol/parser" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" "github.com/newrelic/go-agent/v3/newrelic" "google.golang.org/grpc/metadata" ) diff --git a/protocol/metrics/rpcconsumerlogs_test.go b/protocol/metrics/rpcconsumer_logs_test.go similarity index 98% rename from protocol/metrics/rpcconsumerlogs_test.go rename to protocol/metrics/rpcconsumer_logs_test.go index 1d9273bb22..2d09e15c65 100644 --- a/protocol/metrics/rpcconsumerlogs_test.go +++ b/protocol/metrics/rpcconsumer_logs_test.go @@ -9,7 +9,7 @@ import ( "github.com/gofiber/fiber/v2" "github.com/gofiber/websocket/v2" websocket2 "github.com/gorilla/websocket" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/stretchr/testify/assert" ) diff --git a/protocol/monitoring/alerting.go b/protocol/monitoring/alerting.go index 4ed3c256e4..d5daa8b07a 100644 --- a/protocol/monitoring/alerting.go +++ b/protocol/monitoring/alerting.go @@ -11,8 +11,8 @@ import ( "github.com/goccy/go-json" "github.com/dgraph-io/ristretto" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" ) const ( diff --git a/protocol/monitoring/chain_heights.go b/protocol/monitoring/chain_heights.go new file mode 100644 index 0000000000..0d4b31eb24 --- /dev/null +++ b/protocol/monitoring/chain_heights.go @@ -0,0 +1,172 @@ +package monitoring + +import ( + "context" + "fmt" + "runtime" + "sync" + "time" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/spf13/cobra" + "golang.org/x/sync/semaphore" + + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" +) + +const ( + chainIDFlag = "chain-id" + contFlag = "cont" +) + +func CreateChainHeightsCommand() *cobra.Command { + cmd := &cobra.Command{ + Use: "chain-heights ", + Short: "Get chain heights from all providers for a specific chain", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + // init + rand.InitRandomSeed() + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + logLevel, err := cmd.Flags().GetString(flags.FlagLogLevel) + if err != nil { + return fmt.Errorf("failed to read log level flag: %w", err) + } + utils.SetGlobalLoggingLevel(logLevel) + + // + // Get args + chainID := args[0] + cont, err := cmd.Flags().GetUint64(contFlag) + if err != nil { + return err + } + + // + // Run + for { + err := runChainHeights(cmd.Context(), clientCtx, chainID) + if err != nil { + return err + } + + if cont == 0 { + break + } + + time.Sleep(time.Duration(cont) * time.Second) + } + + return nil + }, + } + + cmd.Flags().Uint64(contFlag, 0, "Continuous mode: seconds to wait before repeating (0 for single run)") + flags.AddQueryFlagsToCmd(cmd) + cmd.Flags().String(flags.FlagLogLevel, "info", "The logging level (trace|debug|info|warn|error|fatal|panic)") + return cmd +} + +func runChainHeights(ctx context.Context, clientCtx client.Context, chainID string) error { + pairingQuerier := pairingtypes.NewQueryClient(clientCtx) + + // Get providers for the chain + providersResp, err := pairingQuerier.Providers(ctx, &pairingtypes.QueryProvidersRequest{ + ChainID: chainID, + }) + if err != nil { + return fmt.Errorf("failed to get providers for chain %s: %w", chainID, err) + } + if len(providersResp.StakeEntry) == 0 { + return fmt.Errorf("no providers found for chain %s", chainID) + } + + fmt.Printf("Chain Heights for %s:\n", chainID) + + // Determine the number of goroutines to use + maxGoroutines := runtime.NumCPU() - 2 + if maxGoroutines < 1 { + maxGoroutines = 1 + } + + // Create a semaphore to limit the number of concurrent goroutines + sem := semaphore.NewWeighted(int64(maxGoroutines)) + + var wg sync.WaitGroup + results := make(chan string, len(providersResp.StakeEntry)) + + for _, provider := range providersResp.StakeEntry { + if len(provider.Endpoints) == 0 || len(provider.Endpoints[0].GetSupportedServices()) == 0 { + continue + } + + wg.Add(1) + go func(provider types.StakeEntry) { + defer wg.Done() + + // Acquire semaphore + if err := sem.Acquire(ctx, 1); err != nil { + utils.LavaFormatError("Failed to acquire semaphore", err) + return + } + defer sem.Release(1) + + endpoint := provider.Endpoints[0] + service := endpoint.GetSupportedServices()[0] + height, err := probeProvider(ctx, endpoint.IPPORT, chainID, service.ApiInterface) + if err != nil { + utils.LavaFormatDebug("Error probing provider", utils.LogAttr("provider", provider.Address), utils.LogAttr("error", err)) + } else { + results <- fmt.Sprintf(" %s: %d", provider.Address, height) + } + }(provider) + } + + // Close the results channel when all goroutines are done + go func() { + wg.Wait() + close(results) + }() + + // Print results as they come in + for result := range results { + if result == "" { + continue + } + fmt.Println(result) + } + + fmt.Println() + + return nil +} + +func probeProvider(ctx context.Context, ipport, chainID, apiInterface string) (int64, error) { + cswp := lavasession.ConsumerSessionsWithProvider{} + relayerClient, conn, err := cswp.ConnectRawClientWithTimeout(ctx, ipport) + if err != nil { + return 0, err + } + defer conn.Close() + + probeReq := &pairingtypes.ProbeRequest{ + Guid: uint64(rand.Int63()), + SpecId: chainID, + ApiInterface: apiInterface, + } + + probeResp, err := relayerClient.Probe(ctx, probeReq) + if err != nil { + return 0, err + } + + return probeResp.LatestBlock, nil +} diff --git a/protocol/monitoring/health.go b/protocol/monitoring/health.go index 10d68d283c..b27837c3e8 100644 --- a/protocol/monitoring/health.go +++ b/protocol/monitoring/health.go @@ -11,19 +11,19 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/gogo/status" - lvutil "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/util" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/protocolerrors" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/rpcprovider" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" - subscriptiontypes "github.com/lavanet/lava/v3/x/subscription/types" + lvutil "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/util" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/protocolerrors" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/rpcprovider" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + subscriptiontypes "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/viper" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/protocol/monitoring/health_cmd.go b/protocol/monitoring/health_cmd.go index 6eee354d89..b0c8f9df29 100644 --- a/protocol/monitoring/health_cmd.go +++ b/protocol/monitoring/health_cmd.go @@ -13,12 +13,12 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/protocol/monitoring/health_results.go b/protocol/monitoring/health_results.go index e6e6671f74..b32d54e42d 100644 --- a/protocol/monitoring/health_results.go +++ b/protocol/monitoring/health_results.go @@ -4,9 +4,9 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils/lavaslices" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils/lavaslices" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type HealthResults struct { diff --git a/protocol/parser/parser.go b/protocol/parser/parser.go index 0eb958704f..8d5622e6a6 100644 --- a/protocol/parser/parser.go +++ b/protocol/parser/parser.go @@ -11,9 +11,9 @@ import ( "github.com/itchyny/gojq" sdkerrors "cosmossdk.io/errors" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( diff --git a/protocol/parser/parser_test.go b/protocol/parser/parser_test.go index c005804850..dbb06f2ddb 100644 --- a/protocol/parser/parser_test.go +++ b/protocol/parser/parser_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/performance/cache.go b/protocol/performance/cache.go index 172344e029..638644fbff 100644 --- a/protocol/performance/cache.go +++ b/protocol/performance/cache.go @@ -2,22 +2,56 @@ package performance import ( "context" + "sync" + "sync/atomic" "time" - "github.com/lavanet/lava/v3/protocol/lavasession" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) -type Cache struct { - client pairingtypes.RelayerCacheClient - address string +type relayerCacheClientStore struct { + client pairingtypes.RelayerCacheClient + lock sync.RWMutex + ctx context.Context + address string + reconnecting atomic.Bool } -func ConnectGRPCConnectionToRelayerCacheService(ctx context.Context, addr string) (*pairingtypes.RelayerCacheClient, error) { - connectCtx, cancel := context.WithTimeout(ctx, 3*time.Second) +const ( + reconnectInterval = 5 * time.Second +) + +func newRelayerCacheClientStore(ctx context.Context, address string) (*relayerCacheClientStore, error) { + clientStore := &relayerCacheClientStore{ + client: nil, + ctx: ctx, + address: address, + } + return clientStore, clientStore.connectClient() +} + +func (r *relayerCacheClientStore) getClient() pairingtypes.RelayerCacheClient { + if r == nil { + return nil + } + + r.lock.RLock() + defer r.lock.RUnlock() + + if r.client == nil { + go r.reconnectClient() + } + + return r.client // might be nil +} + +func (r *relayerCacheClientStore) connectGRPCConnectionToRelayerCacheService() (*pairingtypes.RelayerCacheClient, error) { + connectCtx, cancel := context.WithTimeout(r.ctx, 3*time.Second) defer cancel() - conn, err := lavasession.ConnectGRPCClient(connectCtx, addr, false, true, false) + conn, err := lavasession.ConnectGRPCClient(connectCtx, r.address, false, true, false) if err != nil { return nil, err } @@ -27,40 +61,91 @@ func ConnectGRPCConnectionToRelayerCacheService(ctx context.Context, addr string return &c, nil } -func InitCache(ctx context.Context, addr string) (*Cache, error) { - relayerCacheClient, err := ConnectGRPCConnectionToRelayerCacheService(ctx, addr) - if err != nil { - return &Cache{client: nil, address: addr}, err +func (r *relayerCacheClientStore) connectClient() error { + relayerCacheClient, err := r.connectGRPCConnectionToRelayerCacheService() + if err == nil { + utils.LavaFormatInfo("Connected to cache service", utils.LogAttr("address", r.address)) + func() { + r.lock.Lock() + defer r.lock.Unlock() + r.client = *relayerCacheClient + }() + + r.reconnecting.Store(false) + return nil // connected } - cache := Cache{client: *relayerCacheClient, address: addr} - return &cache, nil + + utils.LavaFormatDebug("Failed to connect to cache service", utils.LogAttr("address", r.address), utils.LogAttr("error", err)) + return err +} + +func (r *relayerCacheClientStore) reconnectClient() { + // This is a simple atomic operation to ensure that only one goroutine is reconnecting at a time. + // reconnecting.CompareAndSwap(false, true): + // if reconnecting == false { + // reconnecting = true + // return true -> reconnect + // } + // return false -> already reconnecting + if !r.reconnecting.CompareAndSwap(false, true) { + return + } + + for { + select { + case <-r.ctx.Done(): + return + case <-time.After(reconnectInterval): + if r.connectClient() != nil { + return + } + } + } +} + +type Cache struct { + clientStore *relayerCacheClientStore + address string + serviceCtx context.Context +} + +func InitCache(ctx context.Context, addr string) (*Cache, error) { + clientStore, err := newRelayerCacheClientStore(ctx, addr) + return &Cache{ + clientStore: clientStore, + address: addr, + serviceCtx: ctx, + }, err } func (cache *Cache) GetEntry(ctx context.Context, relayCacheGet *pairingtypes.RelayCacheGet) (reply *pairingtypes.CacheRelayReply, err error) { if cache == nil { - // TODO: try to connect again once in a while return nil, NotInitializedError } - if cache.client == nil { - return nil, NotConnectedError.Wrapf("No client connected to address: %s", cache.address) + + client := cache.clientStore.getClient() + if client == nil { + return nil, NotConnectedError } - // TODO: handle disconnections and error types here - return cache.client.GetRelay(ctx, relayCacheGet) + + reply, err = client.GetRelay(ctx, relayCacheGet) + return reply, err } func (cache *Cache) CacheActive() bool { - return cache != nil + return cache != nil && cache.clientStore.getClient() != nil } func (cache *Cache) SetEntry(ctx context.Context, cacheSet *pairingtypes.RelayCacheSet) error { if cache == nil { - // TODO: try to connect again once in a while return NotInitializedError } - if cache.client == nil { - return NotConnectedError.Wrapf("No client connected to address: %s", cache.address) + + client := cache.clientStore.getClient() + if client == nil { + return NotConnectedError } - // TODO: handle disconnections and SetRelay error types here - _, err := cache.client.SetRelay(ctx, cacheSet) + + _, err := client.SetRelay(ctx, cacheSet) return err } diff --git a/protocol/performance/connection/connection_cmd.go b/protocol/performance/connection/connection_cmd.go index b76b94b83a..d3223922ba 100644 --- a/protocol/performance/connection/connection_cmd.go +++ b/protocol/performance/connection/connection_cmd.go @@ -9,10 +9,10 @@ import ( "time" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" "github.com/spf13/viper" "golang.org/x/net/http2" diff --git a/protocol/performance/connection/prober.go b/protocol/performance/connection/prober.go index e5abadba4c..f2947006cb 100644 --- a/protocol/performance/connection/prober.go +++ b/protocol/performance/connection/prober.go @@ -5,9 +5,9 @@ import ( "fmt" "math/rand" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/protocol/performance/connection/server.go b/protocol/performance/connection/server.go index 4349ebbf9a..9a9b8fec1f 100644 --- a/protocol/performance/connection/server.go +++ b/protocol/performance/connection/server.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) type RelayerConnectionServer struct { diff --git a/protocol/performance/errors.go b/protocol/performance/errors.go index bb69cd3f51..1170f0b67f 100644 --- a/protocol/performance/errors.go +++ b/protocol/performance/errors.go @@ -6,5 +6,5 @@ import ( var ( NotConnectedError = sdkerrors.New("Not Connected Error", 700, "No Connection To grpc server") - NotInitializedError = sdkerrors.New("Not Initialised Error", 701, "to use cache run initCache") + NotInitializedError = sdkerrors.New("Not Initialized Error", 701, "to use cache run initCache") ) diff --git a/protocol/performance/pprofServer.go b/protocol/performance/pprofServer.go index 95b786d059..03c283685d 100644 --- a/protocol/performance/pprofServer.go +++ b/protocol/performance/pprofServer.go @@ -5,7 +5,7 @@ import ( "github.com/gofiber/fiber/v2" fiberpprof "github.com/gofiber/fiber/v2/middleware/pprof" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) const ( diff --git a/protocol/performance/validators/validators.go b/protocol/performance/validators/validators.go index ba406ec77e..e8329bdc8e 100644 --- a/protocol/performance/validators/validators.go +++ b/protocol/performance/validators/validators.go @@ -21,9 +21,9 @@ import ( "github.com/cosmos/cosmos-sdk/version" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/protocol/provideroptimizer/provider_optimizer.go b/protocol/provideroptimizer/provider_optimizer.go index 0d89897028..6f9198a9e9 100644 --- a/protocol/provideroptimizer/provider_optimizer.go +++ b/protocol/provideroptimizer/provider_optimizer.go @@ -8,13 +8,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/dgraph-io/ristretto" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/score" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/score" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "gonum.org/v1/gonum/mathext" ) diff --git a/protocol/provideroptimizer/provider_optimizer_test.go b/protocol/provideroptimizer/provider_optimizer_test.go index 859019590b..61e7a9c0e2 100644 --- a/protocol/provideroptimizer/provider_optimizer_test.go +++ b/protocol/provideroptimizer/provider_optimizer_test.go @@ -11,10 +11,10 @@ import ( "time" "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/provideroptimizer/selection_tier.go b/protocol/provideroptimizer/selection_tier.go index 09db293234..0da0915653 100644 --- a/protocol/provideroptimizer/selection_tier.go +++ b/protocol/provideroptimizer/selection_tier.go @@ -3,9 +3,9 @@ package provideroptimizer import ( "math" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/rand" ) type Entry struct { diff --git a/protocol/provideroptimizer/selection_tier_test.go b/protocol/provideroptimizer/selection_tier_test.go index 5c4720c442..0d4f5f97e7 100644 --- a/protocol/provideroptimizer/selection_tier_test.go +++ b/protocol/provideroptimizer/selection_tier_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/utils/rand" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/protocol/provideroptimizer/selection_weight.go b/protocol/provideroptimizer/selection_weight.go index 25e9e0c198..e0fdc30f38 100644 --- a/protocol/provideroptimizer/selection_weight.go +++ b/protocol/provideroptimizer/selection_weight.go @@ -3,8 +3,8 @@ package provideroptimizer import ( "sync" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" ) // SelectionWeighter is a utility to select an address based on a weight. diff --git a/protocol/provideroptimizer/selection_weight_test.go b/protocol/provideroptimizer/selection_weight_test.go index 9196920500..4dc06d1769 100644 --- a/protocol/provideroptimizer/selection_weight_test.go +++ b/protocol/provideroptimizer/selection_weight_test.go @@ -3,7 +3,7 @@ package provideroptimizer import ( "testing" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/utils/rand" "github.com/stretchr/testify/assert" ) diff --git a/protocol/rpcconsumer/consumer_consistency.go b/protocol/rpcconsumer/consumer_consistency.go index b1d8ba171f..e2e446a368 100644 --- a/protocol/rpcconsumer/consumer_consistency.go +++ b/protocol/rpcconsumer/consumer_consistency.go @@ -4,8 +4,8 @@ import ( "time" "github.com/dgraph-io/ristretto" - common "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" + common "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" ) // this class handles seen block values in requests diff --git a/protocol/rpcconsumer/consumer_consistency_test.go b/protocol/rpcconsumer/consumer_consistency_test.go index 3fdb3cd9fc..540a5e3ac3 100644 --- a/protocol/rpcconsumer/consumer_consistency_test.go +++ b/protocol/rpcconsumer/consumer_consistency_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - common "github.com/lavanet/lava/v3/protocol/common" + common "github.com/lavanet/lava/v4/protocol/common" "github.com/stretchr/testify/require" ) diff --git a/protocol/rpcconsumer/consumer_relay_state_machine.go b/protocol/rpcconsumer/consumer_relay_state_machine.go index 11c2d14a0a..706b5d5182 100644 --- a/protocol/rpcconsumer/consumer_relay_state_machine.go +++ b/protocol/rpcconsumer/consumer_relay_state_machine.go @@ -2,19 +2,19 @@ package rpcconsumer import ( context "context" + "sync/atomic" "time" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - common "github.com/lavanet/lava/v3/protocol/common" - lavasession "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + common "github.com/lavanet/lava/v4/protocol/common" + lavasession "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" ) type RelayStateMachine interface { GetProtocolMessage() chainlib.ProtocolMessage - ShouldRetry(numberOfRetriesLaunched int) bool GetDebugState() bool GetRelayTaskChannel() chan RelayStateSendInstructions UpdateBatch(err error) @@ -24,7 +24,6 @@ type RelayStateMachine interface { } type ConsumerRelaySender interface { - sendRelayToProvider(ctx context.Context, protocolMessage chainlib.ProtocolMessage, relayProcessor *RelayProcessor, analytics *metrics.RelayMetrics) (errRet error) getProcessingTimeout(chainMessage chainlib.ChainMessage) (processingTimeout time.Duration, relayTimeout time.Duration) GetChainIdAndApiInterface() (string, string) GetExtensionParser() *extensionslib.ExtensionParser @@ -86,7 +85,13 @@ func (crsm *ConsumerRelayStateMachine) GetSelection() Selection { return crsm.selection } -func (crsm *ConsumerRelayStateMachine) ShouldRetry(numberOfRetriesLaunched int) bool { +func (crsm *ConsumerRelayStateMachine) shouldRetryOnResult(numberOfRetriesLaunched int, numberOfNodeErrors uint64) bool { + shouldRetry := crsm.shouldRetryInner(numberOfRetriesLaunched) + // archive functionality will be added here. + return shouldRetry +} + +func (crsm *ConsumerRelayStateMachine) shouldRetryInner(numberOfRetriesLaunched int) bool { if numberOfRetriesLaunched >= MaximumNumberOfTickerRelayRetries { return false } @@ -94,6 +99,10 @@ func (crsm *ConsumerRelayStateMachine) ShouldRetry(numberOfRetriesLaunched int) return crsm.selection != BestResult } +func (crsm *ConsumerRelayStateMachine) shouldRetryTicker(numberOfRetriesLaunched int) bool { + return crsm.shouldRetryInner(numberOfRetriesLaunched) +} + func (crsm *ConsumerRelayStateMachine) GetDebugState() bool { return crsm.debugRelays } @@ -141,12 +150,15 @@ func (crsm *ConsumerRelayStateMachine) GetRelayTaskChannel() chan RelayStateSend } } + numberOfNodeErrorsAtomic := atomic.Uint64{} readResultsFromProcessor := func() { // ProcessResults is reading responses while blocking until the conditions are met utils.LavaFormatTrace("[StateMachine] Waiting for results", utils.LogAttr("batch", crsm.usedProviders.BatchNumber())) crsm.parentRelayProcessor.WaitForResults(processingCtx) // Decide if we need to resend or not - if crsm.parentRelayProcessor.HasRequiredNodeResults() { + metRequiredNodeResults, numberOfNodeErrors := crsm.parentRelayProcessor.HasRequiredNodeResults() + numberOfNodeErrorsAtomic.Store(uint64(numberOfNodeErrors)) + if metRequiredNodeResults { gotResults <- true } else { setArchiveOnSpecialApi() @@ -211,7 +223,7 @@ func (crsm *ConsumerRelayStateMachine) GetRelayTaskChannel() chan RelayStateSend return } // If should retry == true, send a new batch. (success == false) - if crsm.ShouldRetry(crsm.usedProviders.BatchNumber()) { + if crsm.shouldRetryOnResult(crsm.usedProviders.BatchNumber(), numberOfNodeErrorsAtomic.Load()) { utils.LavaFormatTrace("[StateMachine] success := <-gotResults - crsm.ShouldRetry(batchNumber)", utils.LogAttr("batch", crsm.usedProviders.BatchNumber())) relayTaskChannel <- RelayStateSendInstructions{protocolMessage: crsm.GetProtocolMessage()} } else { @@ -220,7 +232,7 @@ func (crsm *ConsumerRelayStateMachine) GetRelayTaskChannel() chan RelayStateSend go readResultsFromProcessor() case <-startNewBatchTicker.C: // Only trigger another batch for non BestResult relays or if we didn't pass the retry limit. - if crsm.ShouldRetry(crsm.usedProviders.BatchNumber()) { + if crsm.shouldRetryTicker(crsm.usedProviders.BatchNumber()) { setArchiveOnSpecialApi() utils.LavaFormatTrace("[StateMachine] ticker triggered", utils.LogAttr("batch", crsm.usedProviders.BatchNumber())) relayTaskChannel <- RelayStateSendInstructions{protocolMessage: crsm.GetProtocolMessage()} diff --git a/protocol/rpcconsumer/consumer_relay_state_machine_test.go b/protocol/rpcconsumer/consumer_relay_state_machine_test.go index 2b9ac5036f..231fc458ae 100644 --- a/protocol/rpcconsumer/consumer_relay_state_machine_test.go +++ b/protocol/rpcconsumer/consumer_relay_state_machine_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - lavasession "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + lavasession "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) @@ -96,7 +96,8 @@ func TestConsumerStateMachineHappyFlow(t *testing.T) { sendSuccessResp(relayProcessor, "lava4@test", time.Millisecond*1) case 4: require.True(t, task.IsDone()) - require.True(t, relayProcessor.HasRequiredNodeResults()) + results, _ := relayProcessor.HasRequiredNodeResults() + require.True(t, results) returnedResult, err := relayProcessor.ProcessingResult() require.NoError(t, err) require.Equal(t, string(returnedResult.Reply.Data), "ok") diff --git a/protocol/rpcconsumer/consumer_state_tracker_mock.go b/protocol/rpcconsumer/consumer_state_tracker_mock.go index 3e07da7bc5..11663b29e7 100644 --- a/protocol/rpcconsumer/consumer_state_tracker_mock.go +++ b/protocol/rpcconsumer/consumer_state_tracker_mock.go @@ -13,13 +13,13 @@ import ( context "context" reflect "reflect" - common "github.com/lavanet/lava/v3/protocol/common" - finalizationconsensus "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationconsensus" - lavasession "github.com/lavanet/lava/v3/protocol/lavasession" - updaters "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - types "github.com/lavanet/lava/v3/x/conflict/types" - types0 "github.com/lavanet/lava/v3/x/plans/types" - types1 "github.com/lavanet/lava/v3/x/protocol/types" + common "github.com/lavanet/lava/v4/protocol/common" + finalizationconsensus "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationconsensus" + lavasession "github.com/lavanet/lava/v4/protocol/lavasession" + updaters "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + types "github.com/lavanet/lava/v4/x/conflict/types" + types0 "github.com/lavanet/lava/v4/x/plans/types" + types1 "github.com/lavanet/lava/v4/x/protocol/types" gomock "go.uber.org/mock/gomock" ) diff --git a/protocol/rpcconsumer/relay_errors.go b/protocol/rpcconsumer/relay_errors.go index fabe404b72..2f8edbdfbd 100644 --- a/protocol/rpcconsumer/relay_errors.go +++ b/protocol/rpcconsumer/relay_errors.go @@ -6,8 +6,8 @@ import ( "strconv" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" ) type RelayErrors struct { diff --git a/protocol/rpcconsumer/relay_errors_test.go b/protocol/rpcconsumer/relay_errors_test.go index 53bd41e134..5e48db5975 100644 --- a/protocol/rpcconsumer/relay_errors_test.go +++ b/protocol/rpcconsumer/relay_errors_test.go @@ -5,7 +5,7 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/common" + "github.com/lavanet/lava/v4/protocol/common" "github.com/stretchr/testify/require" ) diff --git a/protocol/rpcconsumer/relay_processor.go b/protocol/rpcconsumer/relay_processor.go index f994fc71ea..589c054fcc 100644 --- a/protocol/rpcconsumer/relay_processor.go +++ b/protocol/rpcconsumer/relay_processor.go @@ -11,10 +11,10 @@ import ( "sync/atomic" sdktypes "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" ) type Selection int @@ -120,7 +120,7 @@ func (rp *RelayProcessor) String() string { usedProviders := rp.GetUsedProviders() currentlyUsedAddresses := usedProviders.CurrentlyUsedAddresses() - unwantedAddresses := usedProviders.UnwantedAddresses() + unwantedAddresses := usedProviders.AllUnwantedAddresses() return fmt.Sprintf("relayProcessor {%s, unwantedAddresses: %s,currentlyUsedAddresses:%s}", rp.ResultsManager.String(), strings.Join(unwantedAddresses, ";"), strings.Join(currentlyUsedAddresses, ";")) } @@ -214,9 +214,9 @@ func (rp *RelayProcessor) shouldRetryRelay(resultsCount int, hashErr error, node return true } -func (rp *RelayProcessor) HasRequiredNodeResults() bool { +func (rp *RelayProcessor) HasRequiredNodeResults() (bool, int) { if rp == nil { - return false + return false, 0 } rp.lock.RLock() defer rp.lock.RUnlock() @@ -236,17 +236,17 @@ func (rp *RelayProcessor) HasRequiredNodeResults() bool { go rp.metricsInf.SetNodeErrorRecoveredSuccessfullyMetric(chainId, apiInterface, strconv.Itoa(nodeErrors)) } } - return true + return true, nodeErrors } if rp.selection == Quorum { // We need a quorum of all node results if nodeErrors+resultsCount >= rp.requiredSuccesses { // Retry on node error flow: - return rp.shouldRetryRelay(resultsCount, hashErr, nodeErrors, hash) + return rp.shouldRetryRelay(resultsCount, hashErr, nodeErrors, hash), nodeErrors } } // on BestResult we want to retry if there is no success - return false + return false, nodeErrors } func (rp *RelayProcessor) handleResponse(response *relayResponse) { @@ -370,7 +370,7 @@ func (rp *RelayProcessor) ProcessingResult() (returnedResult *common.RelayResult } // this must be here before the lock because this function locks - allProvidersAddresses := rp.GetUsedProviders().UnwantedAddresses() + allProvidersAddresses := rp.GetUsedProviders().AllUnwantedAddresses() rp.lock.RLock() defer rp.lock.RUnlock() diff --git a/protocol/rpcconsumer/relay_processor_test.go b/protocol/rpcconsumer/relay_processor_test.go index f5f59aa986..a814a4a9f6 100644 --- a/protocol/rpcconsumer/relay_processor_test.go +++ b/protocol/rpcconsumer/relay_processor_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/protocol/lavasession" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/protocol/lavasession" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) @@ -42,7 +42,7 @@ var ( func sendSuccessResp(relayProcessor *RelayProcessor, provider string, delay time.Duration) { time.Sleep(delay) - relayProcessor.GetUsedProviders().RemoveUsed(provider, nil) + relayProcessor.GetUsedProviders().RemoveUsed(provider, lavasession.NewRouterKey(nil), nil) response := &relayResponse{ relayResult: common.RelayResult{ Request: &pairingtypes.RelayRequest{ @@ -60,7 +60,7 @@ func sendSuccessResp(relayProcessor *RelayProcessor, provider string, delay time func sendProtocolError(relayProcessor *RelayProcessor, provider string, delay time.Duration, err error) { time.Sleep(delay) - relayProcessor.GetUsedProviders().RemoveUsed(provider, err) + relayProcessor.GetUsedProviders().RemoveUsed(provider, lavasession.NewRouterKey(nil), err) response := &relayResponse{ relayResult: common.RelayResult{ Request: &pairingtypes.RelayRequest{ @@ -78,7 +78,7 @@ func sendProtocolError(relayProcessor *RelayProcessor, provider string, delay ti func sendNodeError(relayProcessor *RelayProcessor, provider string, delay time.Duration) { time.Sleep(delay) - relayProcessor.GetUsedProviders().RemoveUsed(provider, nil) + relayProcessor.GetUsedProviders().RemoveUsed(provider, lavasession.NewRouterKey(nil), nil) response := &relayResponse{ relayResult: common.RelayResult{ Request: &pairingtypes.RelayRequest{ @@ -187,7 +187,7 @@ func TestRelayProcessorNodeErrorRetryFlow(t *testing.T) { require.NoError(t, err) resultsOk := relayProcessor.HasResults() require.True(t, resultsOk) - requiredNodeResults := relayProcessor.HasRequiredNodeResults() + requiredNodeResults, _ := relayProcessor.HasRequiredNodeResults() require.False(t, requiredNodeResults) // check first retry go sendNodeError(relayProcessor, "lava@test", time.Millisecond*5) @@ -195,7 +195,7 @@ func TestRelayProcessorNodeErrorRetryFlow(t *testing.T) { require.NoError(t, err) resultsOk = relayProcessor.HasResults() require.True(t, resultsOk) - requiredNodeResults = relayProcessor.HasRequiredNodeResults() + requiredNodeResults, _ = relayProcessor.HasRequiredNodeResults() require.False(t, requiredNodeResults) // check first second retry @@ -204,7 +204,7 @@ func TestRelayProcessorNodeErrorRetryFlow(t *testing.T) { require.NoError(t, err) resultsOk = relayProcessor.HasResults() require.True(t, resultsOk) - requiredNodeResults = relayProcessor.HasRequiredNodeResults() + requiredNodeResults, _ = relayProcessor.HasRequiredNodeResults() require.True(t, requiredNodeResults) // 2nd relay, same inputs @@ -230,7 +230,7 @@ func TestRelayProcessorNodeErrorRetryFlow(t *testing.T) { require.NoError(t, err) resultsOk = relayProcessor.HasResults() require.True(t, resultsOk) - requiredNodeResults = relayProcessor.HasRequiredNodeResults() + requiredNodeResults, _ = relayProcessor.HasRequiredNodeResults() require.True(t, requiredNodeResults) // 3nd relay, different inputs @@ -256,7 +256,7 @@ func TestRelayProcessorNodeErrorRetryFlow(t *testing.T) { require.NoError(t, err) resultsOk = relayProcessor.HasResults() require.True(t, resultsOk) - requiredNodeResults = relayProcessor.HasRequiredNodeResults() + requiredNodeResults, _ = relayProcessor.HasRequiredNodeResults() // check our hashing mechanism works with different inputs require.False(t, requiredNodeResults) @@ -284,7 +284,7 @@ func TestRelayProcessorNodeErrorRetryFlow(t *testing.T) { require.NoError(t, err) resultsOk = relayProcessor.HasResults() require.True(t, resultsOk) - requiredNodeResults = relayProcessor.HasRequiredNodeResults() + requiredNodeResults, _ = relayProcessor.HasRequiredNodeResults() require.True(t, requiredNodeResults) // A way for us to break early from sleep, just waiting up to 5 seconds and breaking as soon as the value we expect is there. @@ -333,7 +333,7 @@ func TestRelayProcessorNodeErrorRetryFlow(t *testing.T) { require.NoError(t, err) resultsOk := relayProcessor.HasResults() require.True(t, resultsOk) - requiredNodeResults := relayProcessor.HasRequiredNodeResults() + requiredNodeResults, _ := relayProcessor.HasRequiredNodeResults() require.True(t, requiredNodeResults) relayCountOnNodeError = 2 }) @@ -520,14 +520,14 @@ func TestRelayProcessorStatefulApi(t *testing.T) { err := relayProcessor.WaitForResults(ctx) require.NoError(t, err) // Decide if we need to resend or not - if relayProcessor.HasRequiredNodeResults() { + if results, _ := relayProcessor.HasRequiredNodeResults(); results { break } time.Sleep(5 * time.Millisecond) } resultsOk := relayProcessor.HasResults() require.True(t, resultsOk) - resultsOk = relayProcessor.HasRequiredNodeResults() + resultsOk, _ = relayProcessor.HasRequiredNodeResults() require.True(t, resultsOk) protocolErrors := relayProcessor.ProtocolErrors() require.Equal(t, uint64(1), protocolErrors) diff --git a/protocol/rpcconsumer/relayer_client_mock.go b/protocol/rpcconsumer/relayer_client_mock.go index a40e5f1565..7ab5bed9ac 100644 --- a/protocol/rpcconsumer/relayer_client_mock.go +++ b/protocol/rpcconsumer/relayer_client_mock.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - types "github.com/lavanet/lava/v3/x/pairing/types" + types "github.com/lavanet/lava/v4/x/pairing/types" gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" diff --git a/protocol/rpcconsumer/results_manager.go b/protocol/rpcconsumer/results_manager.go index 6664ba6b35..8711442343 100644 --- a/protocol/rpcconsumer/results_manager.go +++ b/protocol/rpcconsumer/results_manager.go @@ -4,10 +4,10 @@ import ( "fmt" "sync" - "github.com/lavanet/lava/v3/protocol/chainlib" - common "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/utils" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + common "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/utils" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type ResultsManager interface { diff --git a/protocol/rpcconsumer/rpcconsumer.go b/protocol/rpcconsumer/rpcconsumer.go index b7af5a4fd4..bfd554925e 100644 --- a/protocol/rpcconsumer/rpcconsumer.go +++ b/protocol/rpcconsumer/rpcconsumer.go @@ -16,25 +16,25 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationconsensus" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/performance" - "github.com/lavanet/lava/v3/protocol/provideroptimizer" - "github.com/lavanet/lava/v3/protocol/rpcprovider" - "github.com/lavanet/lava/v3/protocol/statetracker" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/protocol/upgrade" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationconsensus" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/performance" + "github.com/lavanet/lava/v4/protocol/provideroptimizer" + "github.com/lavanet/lava/v4/protocol/rpcprovider" + "github.com/lavanet/lava/v4/protocol/statetracker" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/protocol/upgrade" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/protocol/rpcconsumer/rpcconsumer_server.go b/protocol/rpcconsumer/rpcconsumer_server.go index 6af0f617b4..3345ee6b33 100644 --- a/protocol/rpcconsumer/rpcconsumer_server.go +++ b/protocol/rpcconsumer/rpcconsumer_server.go @@ -14,25 +14,25 @@ import ( sdkerrors "cosmossdk.io/errors" "github.com/btcsuite/btcd/btcec/v2" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationconsensus" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationverification" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/protocolerrors" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/performance" - "github.com/lavanet/lava/v3/protocol/upgrade" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/protocopy" - "github.com/lavanet/lava/v3/utils/rand" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationconsensus" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationverification" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/protocolerrors" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/performance" + "github.com/lavanet/lava/v4/protocol/upgrade" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/protocopy" + "github.com/lavanet/lava/v4/utils/rand" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) @@ -604,10 +604,11 @@ func (rpccs *RPCConsumerServer) sendRelayToProvider( } if rpccs.debugRelays { + routerKey := lavasession.NewRouterKeyFromExtensions(extensions) utils.LavaFormatDebug("[Before Send] returned the following sessions", utils.LogAttr("sessions", sessions), - utils.LogAttr("usedProviders.GetUnwantedProvidersToSend", usedProviders.GetUnwantedProvidersToSend()), - utils.LogAttr("usedProviders.GetErroredProviders", usedProviders.GetErroredProviders()), + utils.LogAttr("usedProviders.GetUnwantedProvidersToSend", usedProviders.GetUnwantedProvidersToSend(routerKey)), + utils.LogAttr("usedProviders.GetErroredProviders", usedProviders.GetErroredProviders(routerKey)), utils.LogAttr("addons", addon), utils.LogAttr("extensions", extensions), utils.LogAttr("AllowSessionDegradation", relayProcessor.GetAllowSessionDegradation()), @@ -767,8 +768,11 @@ func (rpccs *RPCConsumerServer) sendRelayToProvider( // validate nodeError is matching our expectations for reducing availability. reduceAvailability = strings.Contains(string(localRelayResult.Reply.Data), "The node does not track the shard ID") } - errResponse = rpccs.consumerSessionManager.OnSessionDone(singleConsumerSession, latestBlock, chainlib.GetComputeUnits(protocolMessage), relayLatency, singleConsumerSession.CalculateExpectedLatency(expectedRelayTimeoutForQOS), expectedBH, numOfProviders, pairingAddressesLen, protocolMessage.GetApi().Category.HangingApi, reduceAvailability) // session done successfully + errResponse = rpccs.consumerSessionManager.OnSessionDone(singleConsumerSession, latestBlock, chainlib.GetComputeUnits(protocolMessage), relayLatency, singleConsumerSession.CalculateExpectedLatency(expectedRelayTimeoutForQOS), expectedBH, numOfProviders, pairingAddressesLen, protocolMessage.GetApi().Category.HangingApi, reduceAvailability, extensions) // session done successfully localRelayResult.IsNodeError = isNodeError + if rpccs.debugRelays { + utils.LavaFormatDebug("Result Code", utils.LogAttr("isNodeError", isNodeError), utils.LogAttr("StatusCode", localRelayResult.StatusCode)) + } if rpccs.cache.CacheActive() && rpcclient.ValidateStatusCodes(localRelayResult.StatusCode, true) == nil { // in case the error is a node error we don't want to cache if !isNodeError { @@ -1270,6 +1274,20 @@ func (rpccs *RPCConsumerServer) HandleDirectiveHeadersForMessage(chainMessage ch chainMessage.SetForceCacheRefresh(ok) } +// Iterating over metadataHeaders adding each trailer that fits the header if found to relayResult.Relay.Metadata +func (rpccs *RPCConsumerServer) getMetadataFromRelayTrailer(metadataHeaders []string, relayResult *common.RelayResult) { + for _, metadataHeader := range metadataHeaders { + trailerValue := relayResult.ProviderTrailer.Get(metadataHeader) + if len(trailerValue) > 0 { + extensionMD := pairingtypes.Metadata{ + Name: metadataHeader, + Value: trailerValue[0], + } + relayResult.Reply.Metadata = append(relayResult.Reply.Metadata, extensionMD) + } + } +} + func (rpccs *RPCConsumerServer) appendHeadersToRelayResult(ctx context.Context, relayResult *common.RelayResult, protocolErrors uint64, relayProcessor *RelayProcessor, protocolMessage chainlib.ProtocolMessage, apiName string) { if relayResult == nil { return @@ -1342,19 +1360,13 @@ func (rpccs *RPCConsumerServer) appendHeadersToRelayResult(ctx context.Context, } // fetch trailer information from the provider by using the provider trailer field. - providerNodeExtensions := relayResult.ProviderTrailer.Get(chainlib.RPCProviderNodeExtension) - if len(providerNodeExtensions) > 0 { - extensionMD := pairingtypes.Metadata{ - Name: chainlib.RPCProviderNodeExtension, - Value: providerNodeExtensions[0], - } - relayResult.Reply.Metadata = append(relayResult.Reply.Metadata, extensionMD) - } + rpccs.getMetadataFromRelayTrailer(chainlib.TrailersToAddToHeaderResponse, relayResult) directiveHeaders := protocolMessage.GetDirectiveHeaders() _, debugRelays := directiveHeaders[common.LAVA_DEBUG_RELAY] if debugRelays { - erroredProviders := relayProcessor.GetUsedProviders().GetErroredProviders() + routerKey := lavasession.NewRouterKeyFromExtensions(protocolMessage.GetExtensions()) + erroredProviders := relayProcessor.GetUsedProviders().GetErroredProviders(routerKey) if len(erroredProviders) > 0 { erroredProvidersArray := make([]string, len(erroredProviders)) idx := 0 diff --git a/protocol/rpcconsumer/rpcconsumer_server_test.go b/protocol/rpcconsumer/rpcconsumer_server_test.go index 87ef84266d..50ab71858a 100644 --- a/protocol/rpcconsumer/rpcconsumer_server_test.go +++ b/protocol/rpcconsumer/rpcconsumer_server_test.go @@ -7,18 +7,18 @@ import ( btcSecp256k1 "github.com/btcsuite/btcd/btcec/v2" "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationconsensus" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/provideroptimizer" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationconsensus" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/provideroptimizer" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" diff --git a/protocol/rpcconsumer/testing.go b/protocol/rpcconsumer/testing.go index 6c3683186e..e2477ae8d5 100644 --- a/protocol/rpcconsumer/testing.go +++ b/protocol/rpcconsumer/testing.go @@ -10,15 +10,15 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chaintracker" - commonlib "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/rpcprovider" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chaintracker" + commonlib "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/rpcprovider" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/protocol/rpcprovider/cors_test.go b/protocol/rpcprovider/cors_test.go index a1dc460c2b..cf9f99f77b 100644 --- a/protocol/rpcprovider/cors_test.go +++ b/protocol/rpcprovider/cors_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/rpcprovider/provider_listener.go b/protocol/rpcprovider/provider_listener.go index a0f0830523..79388f2beb 100644 --- a/protocol/rpcprovider/provider_listener.go +++ b/protocol/rpcprovider/provider_listener.go @@ -10,12 +10,12 @@ import ( "github.com/gogo/status" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/protocolerrors" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/protocolerrors" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" grpc "google.golang.org/grpc" diff --git a/protocol/rpcprovider/provider_listener_mock.go b/protocol/rpcprovider/provider_listener_mock.go index 504626fd03..2155d778f3 100644 --- a/protocol/rpcprovider/provider_listener_mock.go +++ b/protocol/rpcprovider/provider_listener_mock.go @@ -12,7 +12,7 @@ import ( context "context" reflect "reflect" - types "github.com/lavanet/lava/v3/x/pairing/types" + types "github.com/lavanet/lava/v4/x/pairing/types" gomock "go.uber.org/mock/gomock" ) diff --git a/protocol/rpcprovider/provider_load_manager.go b/protocol/rpcprovider/provider_load_manager.go new file mode 100644 index 0000000000..f21b221ad9 --- /dev/null +++ b/protocol/rpcprovider/provider_load_manager.go @@ -0,0 +1,55 @@ +package rpcprovider + +import ( + "context" + "strconv" + "sync/atomic" + + "github.com/lavanet/lava/v4/protocol/chainlib" + grpc "google.golang.org/grpc" + "google.golang.org/grpc/metadata" +) + +type ProviderLoadManager struct { + rateLimitThreshold uint64 + activeRequestsPerSecond atomic.Uint64 +} + +func NewProviderLoadManager(rateLimitThreshold uint64) *ProviderLoadManager { + if rateLimitThreshold == 0 { + return nil + } + loadManager := &ProviderLoadManager{rateLimitThreshold: rateLimitThreshold} + return loadManager +} + +func (loadManager *ProviderLoadManager) subtractRelayCall() { + if loadManager == nil { + return + } + loadManager.activeRequestsPerSecond.Add(^uint64(0)) +} + +func (loadManager *ProviderLoadManager) getProviderLoad(activeRequests uint64) float64 { + rateLimitThreshold := loadManager.rateLimitThreshold + if rateLimitThreshold == 0 { + return 0 + } + return float64(activeRequests) / float64(rateLimitThreshold) +} + +// Add relay count, calculate current load +func (loadManager *ProviderLoadManager) addAndSetRelayLoadToContextTrailer(ctx context.Context) float64 { + if loadManager == nil { + return 0 + } + activeRequestsPerSecond := loadManager.activeRequestsPerSecond.Add(1) + provideRelayLoad := loadManager.getProviderLoad(activeRequestsPerSecond) + if provideRelayLoad == 0 { + return provideRelayLoad + } + formattedProviderLoad := strconv.FormatFloat(provideRelayLoad, 'f', -1, 64) + trailerMd := metadata.Pairs(chainlib.RpcProviderLoadRateHeader, formattedProviderLoad) + grpc.SetTrailer(ctx, trailerMd) + return provideRelayLoad +} diff --git a/protocol/rpcprovider/provider_state_machine.go b/protocol/rpcprovider/provider_state_machine.go index 9b386c80f3..38a98e3e7d 100644 --- a/protocol/rpcprovider/provider_state_machine.go +++ b/protocol/rpcprovider/provider_state_machine.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) type ProviderRelaySender interface { diff --git a/protocol/rpcprovider/provider_state_machine_test.go b/protocol/rpcprovider/provider_state_machine_test.go index 4649a7426f..e5791e81a6 100644 --- a/protocol/rpcprovider/provider_state_machine_test.go +++ b/protocol/rpcprovider/provider_state_machine_test.go @@ -6,11 +6,11 @@ import ( "time" "github.com/golang/mock/gomock" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - types "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + types "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/rpcprovider/reliabilitymanager/reliability_manager.go b/protocol/rpcprovider/reliabilitymanager/reliability_manager.go index 6f6e719c0f..ce225613bc 100644 --- a/protocol/rpcprovider/reliabilitymanager/reliability_manager.go +++ b/protocol/rpcprovider/reliabilitymanager/reliability_manager.go @@ -10,15 +10,15 @@ import ( "github.com/goccy/go-json" terderminttypes "github.com/cometbft/cometbft/abci/types" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "golang.org/x/exp/slices" ) diff --git a/protocol/rpcprovider/reliabilitymanager/reliability_manager_test.go b/protocol/rpcprovider/reliabilitymanager/reliability_manager_test.go index 87813af9be..29ad44c3f6 100644 --- a/protocol/rpcprovider/reliabilitymanager/reliability_manager_test.go +++ b/protocol/rpcprovider/reliabilitymanager/reliability_manager_test.go @@ -10,20 +10,20 @@ import ( terderminttypes "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationverification" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - "github.com/lavanet/lava/v3/protocol/statetracker" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationverification" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + "github.com/lavanet/lava/v4/protocol/statetracker" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/rpcprovider/rewardserver/reward_db.go b/protocol/rpcprovider/rewardserver/reward_db.go index 81c4bdcbc5..c53705e812 100644 --- a/protocol/rpcprovider/rewardserver/reward_db.go +++ b/protocol/rpcprovider/rewardserver/reward_db.go @@ -9,8 +9,8 @@ import ( "github.com/goccy/go-json" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/protocol/rpcprovider/rewardserver/reward_db_test.go b/protocol/rpcprovider/rewardserver/reward_db_test.go index 9f6b16716d..6c9796bd72 100644 --- a/protocol/rpcprovider/rewardserver/reward_db_test.go +++ b/protocol/rpcprovider/rewardserver/reward_db_test.go @@ -7,9 +7,9 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/rpcprovider/rewardserver" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/protocol/rpcprovider/rewardserver" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/sigs" "github.com/stretchr/testify/require" ) diff --git a/protocol/rpcprovider/rewardserver/reward_server.go b/protocol/rpcprovider/rewardserver/reward_server.go index 76cf7673fb..f2c3ae3fb9 100644 --- a/protocol/rpcprovider/rewardserver/reward_server.go +++ b/protocol/rpcprovider/rewardserver/reward_server.go @@ -11,14 +11,14 @@ import ( terderminttypes "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/protocol/rpcprovider/rewardserver/reward_server_test.go b/protocol/rpcprovider/rewardserver/reward_server_test.go index e3c8bd3fe1..c86d920e45 100644 --- a/protocol/rpcprovider/rewardserver/reward_server_test.go +++ b/protocol/rpcprovider/rewardserver/reward_server_test.go @@ -7,16 +7,16 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" "golang.org/x/net/context" terderminttypes "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/rpcprovider/rpcprovider.go b/protocol/rpcprovider/rpcprovider.go index fa83eff13d..32aec0011e 100644 --- a/protocol/rpcprovider/rpcprovider.go +++ b/protocol/rpcprovider/rpcprovider.go @@ -16,26 +16,27 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/performance" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - "github.com/lavanet/lava/v3/protocol/rpcprovider/rewardserver" - "github.com/lavanet/lava/v3/protocol/statetracker" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/protocol/upgrade" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - epochstorage "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/performance" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + "github.com/lavanet/lava/v4/protocol/rpcprovider/rewardserver" + "github.com/lavanet/lava/v4/protocol/statetracker" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/protocol/upgrade" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + epochstorage "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -110,6 +111,7 @@ type rpcProviderStartOptions struct { healthCheckMetricsOptions *rpcProviderHealthCheckMetricsOptions staticProvider bool staticSpecPath string + relayLoadLimit uint64 } type rpcProviderHealthCheckMetricsOptions struct { @@ -123,24 +125,26 @@ type RPCProvider struct { rpcProviderListeners map[string]*ProviderListener lock sync.Mutex // all of the following members need to be concurrency proof - providerMetricsManager *metrics.ProviderMetricsManager - rewardServer *rewardserver.RewardServer - privKey *btcec.PrivateKey - lavaChainID string - addr sdk.AccAddress - blockMemorySize uint64 - chainMutexes map[string]*sync.Mutex - parallelConnections uint - cache *performance.Cache - shardID uint // shardID is a flag that allows setting up multiple provider databases of the same chain - chainTrackers *common.SafeSyncMap[string, *chaintracker.ChainTracker] - relaysMonitorAggregator *metrics.RelaysMonitorAggregator - relaysHealthCheckEnabled bool - relaysHealthCheckInterval time.Duration - grpcHealthCheckEndpoint string - providerUniqueId string - staticProvider bool - staticSpecPath string + providerMetricsManager *metrics.ProviderMetricsManager + rewardServer *rewardserver.RewardServer + privKey *btcec.PrivateKey + lavaChainID string + addr sdk.AccAddress + blockMemorySize uint64 + chainMutexes map[string]*sync.Mutex + parallelConnections uint + cache *performance.Cache + shardID uint // shardID is a flag that allows setting up multiple provider databases of the same chain + chainTrackers *common.SafeSyncMap[string, *chaintracker.ChainTracker] + relaysMonitorAggregator *metrics.RelaysMonitorAggregator + relaysHealthCheckEnabled bool + relaysHealthCheckInterval time.Duration + grpcHealthCheckEndpoint string + providerUniqueId string + staticProvider bool + staticSpecPath string + relayLoadLimit uint64 + providerLoadManagersPerChain *common.SafeSyncMap[string, *ProviderLoadManager] } func (rpcp *RPCProvider) Start(options *rpcProviderStartOptions) (err error) { @@ -165,7 +169,8 @@ func (rpcp *RPCProvider) Start(options *rpcProviderStartOptions) (err error) { rpcp.grpcHealthCheckEndpoint = options.healthCheckMetricsOptions.grpcHealthCheckEndpoint rpcp.staticProvider = options.staticProvider rpcp.staticSpecPath = options.staticSpecPath - + rpcp.relayLoadLimit = options.relayLoadLimit + rpcp.providerLoadManagersPerChain = &common.SafeSyncMap[string, *ProviderLoadManager]{} // single state tracker lavaChainFetcher := chainlib.NewLavaChainFetcher(ctx, options.clientCtx) providerStateTracker, err := statetracker.NewProviderStateTracker(ctx, options.txFactory, options.clientCtx, lavaChainFetcher, rpcp.providerMetricsManager) @@ -189,6 +194,7 @@ func (rpcp *RPCProvider) Start(options *rpcProviderStartOptions) (err error) { rpcp.providerStateTracker.RegisterForEpochUpdates(ctx, rpcp.rewardServer) rpcp.providerStateTracker.RegisterPaymentUpdatableForPayments(ctx, rpcp.rewardServer) } + keyName, err := sigs.GetKeyName(options.clientCtx) if err != nil { utils.LavaFormatFatal("failed getting key name from clientCtx", err) @@ -210,8 +216,13 @@ func (rpcp *RPCProvider) Start(options *rpcProviderStartOptions) (err error) { if err != nil { utils.LavaFormatFatal("failed unmarshaling public address", err, utils.Attribute{Key: "keyName", Value: keyName}, utils.Attribute{Key: "pubkey", Value: pubKey.Address()}) } + utils.LavaFormatInfo("RPCProvider pubkey: " + rpcp.addr.String()) + + rpcp.createAndRegisterFreezeUpdatersByOptions(ctx, options.clientCtx, rpcp.addr.String()) + utils.LavaFormatInfo("RPCProvider setting up endpoints", utils.Attribute{Key: "count", Value: strconv.Itoa(len(options.rpcProviderEndpoints))}) + blockMemorySize, err := rpcp.providerStateTracker.GetEpochSizeMultipliedByRecommendedEpochNumToCollectPayment(ctx) // get the number of blocks to keep in PSM. if err != nil { utils.LavaFormatFatal("Failed fetching GetEpochSizeMultipliedByRecommendedEpochNumToCollectPayment in RPCProvider Start", err) @@ -271,6 +282,12 @@ func (rpcp *RPCProvider) Start(options *rpcProviderStartOptions) (err error) { return nil } +func (rpcp *RPCProvider) createAndRegisterFreezeUpdatersByOptions(ctx context.Context, clientCtx client.Context, publicAddress string) { + queryClient := pairingtypes.NewQueryClient(clientCtx) + freezeJailUpdater := updaters.NewProviderFreezeJailUpdater(queryClient, publicAddress, rpcp.providerMetricsManager) + rpcp.providerStateTracker.RegisterForEpochUpdates(ctx, freezeJailUpdater) +} + func getActiveEndpoints(rpcProviderEndpoints []*lavasession.RPCProviderEndpoint, disabledEndpointsList []*lavasession.RPCProviderEndpoint) []*lavasession.RPCProviderEndpoint { activeEndpoints := map[*lavasession.RPCProviderEndpoint]struct{}{} for _, endpoint := range rpcProviderEndpoints { @@ -307,9 +324,7 @@ func (rpcp *RPCProvider) SetupProviderEndpoints(rpcProviderEndpoints []*lavasess wg.Add(parallelJobs) disabledEndpoints := make(chan *lavasession.RPCProviderEndpoint, parallelJobs) // validate static spec configuration is used only on a single chain setup. - chainIds := make(map[string]struct{}) for _, rpcProviderEndpoint := range rpcProviderEndpoints { - chainIds[rpcProviderEndpoint.ChainID] = struct{}{} setupEndpoint := func(rpcProviderEndpoint *lavasession.RPCProviderEndpoint, specValidator *SpecValidator) { defer wg.Done() err := rpcp.SetupEndpoint(context.Background(), rpcProviderEndpoint, specValidator) @@ -341,11 +356,20 @@ func GetAllAddonsAndExtensionsFromNodeUrlSlice(nodeUrls []common.NodeUrl) *Provi return policy } +func GetAllNodeUrlsInternalPaths(nodeUrls []common.NodeUrl) []string { + paths := []string{} + for _, nodeUrl := range nodeUrls { + paths = append(paths, nodeUrl.InternalPath) + } + return paths +} + func (rpcp *RPCProvider) SetupEndpoint(ctx context.Context, rpcProviderEndpoint *lavasession.RPCProviderEndpoint, specValidator *SpecValidator) error { err := rpcProviderEndpoint.Validate() if err != nil { return utils.LavaFormatError("[PANIC] panic severity critical error, aborting support for chain api due to invalid node url definition, continuing with others", err, utils.Attribute{Key: "endpoint", Value: rpcProviderEndpoint.String()}) } + chainID := rpcProviderEndpoint.ChainID apiInterface := rpcProviderEndpoint.ApiInterface providerSessionManager := lavasession.NewProviderSessionManager(rpcProviderEndpoint, rpcp.blockMemorySize) @@ -361,6 +385,18 @@ func (rpcp *RPCProvider) SetupEndpoint(ctx context.Context, rpcProviderEndpoint return utils.LavaFormatError("[PANIC] failed to RegisterForSpecUpdates, panic severity critical error, aborting support for chain api due to invalid chain parser, continuing with others", err, utils.Attribute{Key: "endpoint", Value: rpcProviderEndpoint.String()}) } + // warn if not all internal paths are configured + configuredInternalPaths := GetAllNodeUrlsInternalPaths(rpcProviderEndpoint.NodeUrls) + chainInternalPaths := chainParser.GetAllInternalPaths() + overConfiguredInternalPaths := lavaslices.Difference(configuredInternalPaths, chainInternalPaths) + if len(overConfiguredInternalPaths) > 0 { + utils.LavaFormatWarning("Some configured internal paths are not in the chain's spec", nil, + utils.LogAttr("chainID", chainID), + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("internalPaths", strings.Join(overConfiguredInternalPaths, ",")), + ) + } + // after registering for spec updates our chain parser contains the spec and we can add our addons and extensions to allow our provider to function properly providerPolicy := GetAllAddonsAndExtensionsFromNodeUrlSlice(rpcProviderEndpoint.NodeUrls) utils.LavaFormatDebug("supported services for provider", @@ -404,8 +440,8 @@ func (rpcp *RPCProvider) SetupEndpoint(ctx context.Context, rpcProviderEndpoint utils.Attribute{Key: "Chain", Value: rpcProviderEndpoint.ChainID}, utils.Attribute{Key: "apiInterface", Value: apiInterface}) } - // in order to utilize shared resources between chains we need go routines with the same chain to wait for one another here + var loadManager *ProviderLoadManager chainCommonSetup := func() error { rpcp.chainMutexes[chainID].Lock() defer rpcp.chainMutexes[chainID].Unlock() @@ -450,6 +486,12 @@ func (rpcp *RPCProvider) SetupEndpoint(ctx context.Context, rpcProviderEndpoint chainTracker = chainTrackerLoaded utils.LavaFormatDebug("reusing chain tracker", utils.Attribute{Key: "chain", Value: rpcProviderEndpoint.ChainID}) } + + // create provider load manager per chain ID + loadManager, _, err = rpcp.providerLoadManagersPerChain.LoadOrStore(rpcProviderEndpoint.ChainID, NewProviderLoadManager(rpcp.relayLoadLimit)) + if err != nil { + utils.LavaFormatError("Failed LoadOrStore providerLoadManagersPerChain", err, utils.LogAttr("chainId", rpcProviderEndpoint.ChainID), utils.LogAttr("rpcp.relayLoadLimit", rpcp.relayLoadLimit)) + } return nil } err = chainCommonSetup() @@ -485,8 +527,7 @@ func (rpcp *RPCProvider) SetupEndpoint(ctx context.Context, rpcProviderEndpoint utils.LavaFormatTrace("Creating provider node subscription manager", utils.LogAttr("rpcProviderEndpoint", rpcProviderEndpoint)) providerNodeSubscriptionManager = chainlib.NewProviderNodeSubscriptionManager(chainRouter, chainParser, rpcProviderServer, rpcp.privKey) } - - rpcProviderServer.ServeRPCRequests(ctx, rpcProviderEndpoint, chainParser, rpcp.rewardServer, providerSessionManager, reliabilityManager, rpcp.privKey, rpcp.cache, chainRouter, rpcp.providerStateTracker, rpcp.addr, rpcp.lavaChainID, DEFAULT_ALLOWED_MISSING_CU, providerMetrics, relaysMonitor, providerNodeSubscriptionManager, rpcp.staticProvider) + rpcProviderServer.ServeRPCRequests(ctx, rpcProviderEndpoint, chainParser, rpcp.rewardServer, providerSessionManager, reliabilityManager, rpcp.privKey, rpcp.cache, chainRouter, rpcp.providerStateTracker, rpcp.addr, rpcp.lavaChainID, DEFAULT_ALLOWED_MISSING_CU, providerMetrics, relaysMonitor, providerNodeSubscriptionManager, rpcp.staticProvider, loadManager) // set up grpc listener var listener *ProviderListener func() { @@ -717,6 +758,7 @@ rpcprovider 127.0.0.1:3333 OSMOSIS tendermintrpc "wss://www.node-path.com:80,htt if stickinessHeaderName != "" { RPCProviderStickinessHeaderName = stickinessHeaderName } + relayLoadLimit := viper.GetUint64(common.RateLimitRequestPerSecondFlag) prometheusListenAddr := viper.GetString(metrics.MetricsListenFlagName) rewardStoragePath := viper.GetString(rewardserver.RewardServerStorageFlagName) rewardTTL := viper.GetDuration(rewardserver.RewardTTLFlagName) @@ -754,6 +796,7 @@ rpcprovider 127.0.0.1:3333 OSMOSIS tendermintrpc "wss://www.node-path.com:80,htt &rpcProviderHealthCheckMetricsOptions, staticProvider, offlineSpecPath, + relayLoadLimit, } rpcProvider := RPCProvider{} @@ -790,7 +833,7 @@ rpcprovider 127.0.0.1:3333 OSMOSIS tendermintrpc "wss://www.node-path.com:80,htt cmdRPCProvider.Flags().BoolVar(&chainlib.IgnoreSubscriptionNotConfiguredError, chainlib.IgnoreSubscriptionNotConfiguredErrorFlag, chainlib.IgnoreSubscriptionNotConfiguredError, "ignore webSocket node url not configured error, when subscription is enabled in spec") cmdRPCProvider.Flags().IntVar(&numberOfRetriesAllowedOnNodeErrors, common.SetRelayCountOnNodeErrorFlag, 2, "set the number of retries attempt on node errors") cmdRPCProvider.Flags().String(common.UseStaticSpecFlag, "", "load offline spec provided path to spec file, used to test specs before they are proposed on chain, example for spec with inheritance: --use-static-spec ./cookbook/specs/ibc.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/evmos.json") - + cmdRPCProvider.Flags().Uint64(common.RateLimitRequestPerSecondFlag, 0, "Measuring the load relative to this number for feedback - per second - per chain - default unlimited. Given Y simultaneous relay calls, a value of X and will measure Y/X load rate.") common.AddRollingLogConfig(cmdRPCProvider) return cmdRPCProvider } diff --git a/protocol/rpcprovider/rpcprovider_server.go b/protocol/rpcprovider/rpcprovider_server.go index 539e728165..53765c3b6b 100644 --- a/protocol/rpcprovider/rpcprovider_server.go +++ b/protocol/rpcprovider/rpcprovider_server.go @@ -15,24 +15,24 @@ import ( "github.com/btcsuite/btcd/btcec/v2" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/status" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chainlib/extensionslib" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/protocolerrors" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/performance" - "github.com/lavanet/lava/v3/protocol/provideroptimizer" - rewardserver "github.com/lavanet/lava/v3/protocol/rpcprovider/rewardserver" - "github.com/lavanet/lava/v3/protocol/upgrade" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/protocopy" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chainlib/extensionslib" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/protocolerrors" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/performance" + "github.com/lavanet/lava/v4/protocol/provideroptimizer" + rewardserver "github.com/lavanet/lava/v4/protocol/rpcprovider/rewardserver" + "github.com/lavanet/lava/v4/protocol/upgrade" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/protocopy" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" grpc "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" @@ -71,6 +71,7 @@ type RPCProviderServer struct { providerUniqueId string StaticProvider bool providerStateMachine *ProviderStateMachine + providerLoadManager *ProviderLoadManager } type ReliabilityManagerInf interface { @@ -112,6 +113,7 @@ func (rpcps *RPCProviderServer) ServeRPCRequests( relaysMonitor *metrics.RelaysMonitor, providerNodeSubscriptionManager *chainlib.ProviderNodeSubscriptionManager, staticProvider bool, + providerLoadManager *ProviderLoadManager, ) { rpcps.cache = cache rpcps.chainRouter = chainRouter @@ -134,6 +136,7 @@ func (rpcps *RPCProviderServer) ServeRPCRequests( rpcps.relaysMonitor = relaysMonitor rpcps.providerNodeSubscriptionManager = providerNodeSubscriptionManager rpcps.providerStateMachine = NewProviderStateMachine(rpcProviderEndpoint.ChainID, lavaprotocol.NewRelayRetriesManager(), chainRouter) + rpcps.providerLoadManager = providerLoadManager rpcps.initRelaysMonitor(ctx) } @@ -180,7 +183,17 @@ func (rpcps *RPCProviderServer) craftChainMessage() (chainMessage chainlib.Chain // function used to handle relay requests from a consumer, it is called by a provider_listener by calling RegisterReceiver func (rpcps *RPCProviderServer) Relay(ctx context.Context, request *pairingtypes.RelayRequest) (*pairingtypes.RelayReply, error) { - grpc.SetTrailer(ctx, metadata.Pairs(chainlib.RpcProviderUniqueIdHeader, rpcps.providerUniqueId)) + // get the number of simultaneous relay calls + currentLoad := rpcps.providerLoadManager.addAndSetRelayLoadToContextTrailer(ctx) + defer func() { + // add load metric and subtract the load at the end of the relay using a routine. + go func() { + rpcps.providerLoadManager.subtractRelayCall() + rpcps.metrics.SetLoadRate(currentLoad) + }() + }() + trailerMd := metadata.Pairs(chainlib.RpcProviderUniqueIdHeader, rpcps.providerUniqueId) + grpc.SetTrailer(ctx, trailerMd) if request.RelayData == nil || request.RelaySession == nil { return nil, utils.LavaFormatWarning("invalid relay request, internal fields are nil", nil) } @@ -782,7 +795,7 @@ func (rpcps *RPCProviderServer) TryRelay(ctx context.Context, request *pairingty } } else if len(request.RelayData.Extensions) > 0 { // if cached, Add Archive trailer if requested by the consumer. - grpc.SetTrailer(ctx, metadata.Pairs(chainlib.RPCProviderNodeExtension, string(lavasession.NewRouterKey(request.RelayData.Extensions)))) + grpc.SetTrailer(ctx, metadata.Pairs(chainlib.RPCProviderNodeExtension, lavasession.NewRouterKey(request.RelayData.Extensions).String())) } if dataReliabilityEnabled { @@ -1208,6 +1221,7 @@ func (rpcps *RPCProviderServer) Probe(ctx context.Context, probeReq *pairingtype } trailer := metadata.Pairs(common.VersionMetadataKey, upgrade.GetCurrentVersion().ProviderVersion) trailer.Append(chainlib.RpcProviderUniqueIdHeader, rpcps.providerUniqueId) + trailer.Append(common.LavaChainIdMetadataKey, rpcps.lavaChainID) grpc.SetTrailer(ctx, trailer) // we ignore this error here since this code can be triggered not from grpc return probeReply, nil } diff --git a/protocol/rpcprovider/rpcprovider_server_test.go b/protocol/rpcprovider/rpcprovider_server_test.go index 88efa5ca7d..a18228b9ec 100644 --- a/protocol/rpcprovider/rpcprovider_server_test.go +++ b/protocol/rpcprovider/rpcprovider_server_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) @@ -129,7 +129,7 @@ func TestHandleConsistency(t *testing.T) { requestBlock: spectypes.LATEST_BLOCK, specId: "LAV1", err: nil, - timeout: 15 * time.Millisecond, // 150 is one way travel time + timeout: 20 * time.Millisecond, // 150 is one way travel time chainTrackerBlocks: []int64{100, 101}, changeTime: 100 * time.Second, sleep: true, diff --git a/protocol/rpcprovider/spec_validator.go b/protocol/rpcprovider/spec_validator.go index a19756d293..7cb0885779 100644 --- a/protocol/rpcprovider/spec_validator.go +++ b/protocol/rpcprovider/spec_validator.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( diff --git a/protocol/rpcprovider/spec_validator_test.go b/protocol/rpcprovider/spec_validator_test.go index c567266c26..7003b1b4c9 100644 --- a/protocol/rpcprovider/spec_validator_test.go +++ b/protocol/rpcprovider/spec_validator_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/lavasession" - testcommon "github.com/lavanet/lava/v3/testutil/common" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/lavasession" + testcommon "github.com/lavanet/lava/v4/testutil/common" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/protocol/rpcprovider/testing.go b/protocol/rpcprovider/testing.go index c7921aea24..a5bc7a863d 100644 --- a/protocol/rpcprovider/testing.go +++ b/protocol/rpcprovider/testing.go @@ -5,28 +5,28 @@ import ( "crypto/tls" "fmt" "net/http" - "os" - "os/signal" "strconv" "strings" "time" "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/config" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" "github.com/gogo/status" - lvutil "github.com/lavanet/lava/v3/ecosystem/lavavisor/pkg/util" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingcli "github.com/lavanet/lava/v3/x/pairing/client/cli" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/app" + lvutil "github.com/lavanet/lava/v4/ecosystem/lavavisor/pkg/util" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingcli "github.com/lavanet/lava/v4/x/pairing/client/cli" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/spf13/cobra" "github.com/spf13/viper" "golang.org/x/exp/slices" @@ -49,7 +49,7 @@ func validatePortNumber(ipPort string) string { } func PerformCORSCheck(endpoint epochstoragetypes.Endpoint) error { - utils.LavaFormatDebug("Checking CORS", utils.Attribute{Key: "endpoint", Value: endpoint}) + utils.LavaFormatDebug("Checking CORS", utils.LogAttr("endpoint", endpoint)) // Construct the URL for the RPC endpoint endpointURL := "https://" + endpoint.IPPORT // Providers must have HTTPS support @@ -86,7 +86,10 @@ func validateCORSHeaders(resp *http.Response) error { // Check for the presence of "Access-Control-Allow-Origin" header corsOrigin := resp.Header.Get("Access-Control-Allow-Origin") if corsOrigin != "*" { - return utils.LavaFormatError("CORS check failed. Expected 'Access-Control-Allow-Origin: *' but not found.", nil, utils.Attribute{Key: "returned code", Value: resp.StatusCode}, utils.Attribute{Key: "corsOrigin", Value: corsOrigin}) + return utils.LavaFormatError("CORS check failed. Expected 'Access-Control-Allow-Origin: *' but not found.", nil, + utils.LogAttr("returned code", resp.StatusCode), + utils.LogAttr("corsOrigin", corsOrigin), + ) } // Headers that must be present in "Access-Control-Allow-Headers" @@ -95,21 +98,17 @@ func validateCORSHeaders(resp *http.Response) error { corsHeaders := strings.ToLower(resp.Header.Get("Access-Control-Allow-Headers")) for _, requiredHeader := range requiredHeaders { if !strings.Contains(corsHeaders, strings.ToLower(requiredHeader)) { - return utils.LavaFormatError("CORS check failed. Expected 'Access-Control-Allow-Headers' are not present.", nil, utils.Attribute{Key: "corsHeaders", Value: corsHeaders}, utils.Attribute{Key: "requiredHeader", Value: requiredHeader}) + return utils.LavaFormatError("CORS check failed. Expected 'Access-Control-Allow-Headers' are not present.", nil, + utils.LogAttr("corsHeaders", corsHeaders), + utils.LogAttr("requiredHeader", requiredHeader), + ) } } return nil } -func startTesting(ctx context.Context, clientCtx client.Context, providerEntries []epochstoragetypes.StakeEntry, plainTextConnection bool) error { - ctx, cancel := context.WithCancel(ctx) - signalChan := make(chan os.Signal, 1) - signal.Notify(signalChan, os.Interrupt) - defer func() { - signal.Stop(signalChan) - cancel() - }() +func startTesting(ctx context.Context, clientCtx client.Context, lavaNetworkChainId string, providerEntries []epochstoragetypes.StakeEntry, plainTextConnection bool) error { goodChains := []string{} badChains := []string{} portValidation := []string{} @@ -121,7 +120,10 @@ func startTesting(ctx context.Context, clientCtx client.Context, providerEntries lavaVersion := param.GetParams().Version targetVersion := lvutil.ParseToSemanticVersion(lavaVersion.ProviderTarget) for _, providerEntry := range providerEntries { - utils.LavaFormatInfo("checking provider entry", utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "endpoints", Value: providerEntry.Endpoints}) + utils.LavaFormatInfo("checking provider entry", + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("endpoints", providerEntry.Endpoints), + ) for _, endpoint := range providerEntry.Endpoints { checkOneProvider := func(apiInterface string, addon string) (time.Duration, string, int64, error) { @@ -137,7 +139,12 @@ func startTesting(ctx context.Context, clientCtx client.Context, providerEntries utils.LavaFormatWarning("You are using plain text connection (disabled tls), no consumer can connect to it as all consumers use tls. this should be used for testing purposes only", nil) conn, err = grpc.DialContext(ctx, endpoint.IPPORT, grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(chainproxy.MaxCallRecvMsgSize))) if err != nil { - return 0, "", 0, utils.LavaFormatError("failed connecting to provider endpoint", err, utils.Attribute{Key: "apiInterface", Value: apiInterface}, utils.Attribute{Key: "addon", Value: addon}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}) + return 0, "", 0, utils.LavaFormatError("failed connecting to provider endpoint", err, + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + ) } relayerClient = pairingtypes.NewRelayerClient(conn) } else { @@ -149,10 +156,20 @@ func startTesting(ctx context.Context, clientCtx client.Context, providerEntries _, _, err := cswp.ConnectRawClientWithTimeout(ctx, endpoint.IPPORT) lavasession.AllowInsecureConnectionToProviders = false if err == nil { - return 0, "", 0, utils.LavaFormatError("provider endpoint is insecure when it should be secure", err, utils.Attribute{Key: "apiInterface", Value: apiInterface}, utils.Attribute{Key: "addon", Value: addon}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}) + return 0, "", 0, utils.LavaFormatError("provider endpoint is insecure when it should be secure", err, + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + ) } } - return 0, "", 0, utils.LavaFormatError("failed connecting to provider endpoint", err, utils.Attribute{Key: "apiInterface", Value: apiInterface}, utils.Attribute{Key: "addon", Value: addon}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}) + return 0, "", 0, utils.LavaFormatError("failed connecting to provider endpoint", err, + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + ) } } @@ -167,17 +184,52 @@ func startTesting(ctx context.Context, clientCtx client.Context, providerEntries var trailer metadata.MD probeResp, err := relayerClient.Probe(ctx, probeReq, grpc.Trailer(&trailer)) if err != nil { - return 0, "", 0, utils.LavaFormatError("failed probing provider endpoint", err, utils.Attribute{Key: "apiInterface", Value: apiInterface}, utils.Attribute{Key: "addon", Value: addon}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}) + return 0, "", 0, utils.LavaFormatError("failed probing provider endpoint", err, + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + ) } versions := strings.Join(trailer.Get(common.VersionMetadataKey), ",") relayLatency := time.Since(relaySentTime) if guid != probeResp.GetGuid() { - return 0, versions, 0, utils.LavaFormatError("probe returned invalid value", err, utils.Attribute{Key: "returnedGuid", Value: probeResp.GetGuid()}, utils.Attribute{Key: "guid", Value: guid}, utils.Attribute{Key: "apiInterface", Value: apiInterface}, utils.Attribute{Key: "addon", Value: addon}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}) + return 0, versions, 0, utils.LavaFormatError("probe returned invalid value", err, + utils.LogAttr("returnedGuid", probeResp.GetGuid()), + utils.LogAttr("guid", guid), + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + ) + } + + // chain id check - lava node chain id should be the same as the one we are probing + lavaChainIdFromProbeMD := trailer.Get(common.LavaChainIdMetadataKey) + if len(lavaChainIdFromProbeMD) > 0 { + lavaChainIdFromProbe := lavaChainIdFromProbeMD[0] + if lavaChainIdFromProbe != lavaNetworkChainId { + return 0, versions, 0, utils.LavaFormatError("lava chain id from probe does not match the configured network chain id", nil, + utils.LogAttr("returnedGuid", probeResp.GetGuid()), + utils.LogAttr("guid", guid), + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("lavaChainIdFromProbe", lavaChainIdFromProbe), + utils.LogAttr("networkChainId", lavaNetworkChainId), + ) + } } // CORS check if err := PerformCORSCheck(endpoint); err != nil { - return 0, versions, 0, utils.LavaFormatError("invalid CORS check", err, utils.Attribute{Key: "returnedGuid", Value: probeResp.GetGuid()}, utils.Attribute{Key: "guid", Value: guid}, utils.Attribute{Key: "apiInterface", Value: apiInterface}, utils.Attribute{Key: "addon", Value: addon}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}) + return 0, versions, 0, utils.LavaFormatError("invalid CORS check", err, + utils.LogAttr("returnedGuid", probeResp.GetGuid()), + utils.LogAttr("guid", guid), + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + ) } relayRequest := &pairingtypes.RelayRequest{ @@ -186,17 +238,27 @@ func startTesting(ctx context.Context, clientCtx client.Context, providerEntries } _, err = relayerClient.Relay(ctx, relayRequest) if err == nil { - return 0, "", 0, utils.LavaFormatError("relay Without signature did not error, unexpected", nil, utils.Attribute{Key: "apiInterface", Value: apiInterface}, utils.Attribute{Key: "addon", Value: addon}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}) + return 0, "", 0, utils.LavaFormatError("relay Without signature did not error, unexpected", nil, + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + ) } code := status.Code(err) if code != codes.Code(lavasession.EpochMismatchError.ABCICode()) { - return 0, versions, 0, utils.LavaFormatError("relay returned unexpected error", err, utils.Attribute{Key: "apiInterface", Value: apiInterface}, utils.Attribute{Key: "addon", Value: addon}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}) + return 0, versions, 0, utils.LavaFormatError("relay returned unexpected error", err, + utils.LogAttr("apiInterface", apiInterface), + utils.LogAttr("addon", addon), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + ) } return relayLatency, versions, probeResp.GetLatestBlock(), nil } endpointServices := endpoint.GetSupportedServices() if len(endpointServices) == 0 { - utils.LavaFormatWarning("endpoint has no supported services", nil, utils.Attribute{Key: "endpoint", Value: endpoint}) + utils.LavaFormatWarning("endpoint has no supported services", nil, utils.LogAttr("endpoint", endpoint)) } for _, endpointService := range endpointServices { probeLatency, version, latestBlockFromProbe, err := checkOneProvider(endpointService.ApiInterface, endpointService.Addon) @@ -209,7 +271,12 @@ func startTesting(ctx context.Context, clientCtx client.Context, providerEntries badChains = append(badChains, providerEntry.Chain+" "+endpointService.String()+" Version:"+version+" should be: "+lavaVersion.ProviderTarget) continue } - utils.LavaFormatInfo("successfully verified provider endpoint", utils.LogAttr("version", version), utils.Attribute{Key: "enspointService", Value: endpointService}, utils.Attribute{Key: "chainID", Value: providerEntry.Chain}, utils.Attribute{Key: "network address", Value: endpoint.IPPORT}, utils.Attribute{Key: "probe latency", Value: probeLatency}) + utils.LavaFormatInfo("successfully verified provider endpoint", utils.LogAttr("version", version), + utils.LogAttr("enspointService", endpointService), + utils.LogAttr("chainID", providerEntry.Chain), + utils.LogAttr("network address", endpoint.IPPORT), + utils.LogAttr("probe latency", probeLatency), + ) goodChains = append(goodChains, providerEntry.Chain+"-"+endpointService.String()+" version: "+version+" latest block: 0x"+strconv.FormatInt(latestBlockFromProbe, 16)) } } @@ -254,6 +321,16 @@ rpcprovider --from providerWallet --endpoints "provider-public-grpc:port,jsonrpc if err != nil { return err } + + if networkChainId == app.Name { + clientTomlConfig, err := config.ReadFromClientConfig(clientCtx) + if err == nil { + if clientTomlConfig.ChainID != "" { + networkChainId = clientTomlConfig.ChainID + } + } + } + logLevel, err := cmd.Flags().GetString(flags.FlagLogLevel) if err != nil { utils.LavaFormatFatal("failed to read log level flag", err) @@ -261,7 +338,7 @@ rpcprovider --from providerWallet --endpoints "provider-public-grpc:port,jsonrpc // setting the insecure option on provider dial, this should be used in development only! lavasession.AllowInsecureConnectionToProviders = viper.GetBool(lavasession.AllowInsecureConnectionToProvidersFlag) if lavasession.AllowInsecureConnectionToProviders { - utils.LavaFormatWarning("AllowInsecureConnectionToProviders is set to true, this should be used only in development", nil, utils.Attribute{Key: lavasession.AllowInsecureConnectionToProvidersFlag, Value: lavasession.AllowInsecureConnectionToProviders}) + utils.LavaFormatWarning("AllowInsecureConnectionToProviders is set to true, this should be used only in development", nil, utils.LogAttr(lavasession.AllowInsecureConnectionToProvidersFlag, lavasession.AllowInsecureConnectionToProviders)) } var address string @@ -282,7 +359,7 @@ rpcprovider --from providerWallet --endpoints "provider-public-grpc:port,jsonrpc } else { address = args[0] } - utils.LavaFormatInfo("RPCProvider Test started", utils.Attribute{Key: "address", Value: address}) + utils.LavaFormatInfo("RPCProvider Test started", utils.LogAttr("address", address)) utils.SetGlobalLoggingLevel(logLevel) clientCtx = clientCtx.WithChainID(networkChainId) @@ -292,6 +369,14 @@ rpcprovider --from providerWallet --endpoints "provider-public-grpc:port,jsonrpc if err != nil { return err } + + if resultStatus.NodeInfo.Network != networkChainId { + return utils.LavaFormatError("network chain id does not match the one in the node", nil, + utils.LogAttr("networkChainId", networkChainId), + utils.LogAttr("nodeNetwork", resultStatus.NodeInfo.Network), + ) + } + currentBlock := resultStatus.SyncInfo.LatestBlockHeight // get all chains provider is serving and their endpoints specQuerier := spectypes.NewQueryClient(clientCtx) @@ -330,11 +415,11 @@ rpcprovider --from providerWallet --endpoints "provider-public-grpc:port,jsonrpc ChainName: chainID, }) if err != nil { - return utils.LavaFormatError("failed reading on chain data in order to resolve endpoint", err, utils.Attribute{Key: "endpoint", Value: endpoints[0]}) + return utils.LavaFormatError("failed reading on chain data in order to resolve endpoint", err, utils.LogAttr("endpoint", endpoints[0])) } endpoints[0].ApiInterfaces = chainInfoResponse.Interfaces } - utils.LavaFormatDebug("endpoints to check", utils.Attribute{Key: "endpoints", Value: endpoints}) + utils.LavaFormatDebug("endpoints to check", utils.LogAttr("endpoints", endpoints)) providerEntry := epochstoragetypes.StakeEntry{ Endpoints: endpoints, Chain: chainID, @@ -353,7 +438,7 @@ rpcprovider --from providerWallet --endpoints "provider-public-grpc:port,jsonrpc for _, provider := range response.StakeEntry { if provider.Address == address { if provider.StakeAppliedBlock > uint64(currentBlock+1) { - utils.LavaFormatWarning("provider is Frozen", nil, utils.Attribute{Key: "chainID", Value: provider.Chain}) + utils.LavaFormatWarning("provider is Frozen", nil, utils.LogAttr("chainID", provider.Chain)) } stakedProviderChains = append(stakedProviderChains, provider) break @@ -363,10 +448,10 @@ rpcprovider --from providerWallet --endpoints "provider-public-grpc:port,jsonrpc } } if len(stakedProviderChains) == 0 { - utils.LavaFormatError("no active chains for provider", nil, utils.Attribute{Key: "address", Value: address}) + utils.LavaFormatError("no active chains for provider", nil, utils.LogAttr("address", address)) } - utils.LavaFormatDebug("checking chain entries", utils.Attribute{Key: "stakedProviderChains", Value: stakedProviderChains}) - return startTesting(ctx, clientCtx, stakedProviderChains, viper.GetBool(common.PlainTextConnection)) + utils.LavaFormatDebug("checking chain entries", utils.LogAttr("stakedProviderChains", stakedProviderChains)) + return startTesting(ctx, clientCtx, networkChainId, stakedProviderChains, viper.GetBool(common.PlainTextConnection)) }, } diff --git a/protocol/statetracker/consumer_state_tracker.go b/protocol/statetracker/consumer_state_tracker.go index 1f61a5f616..8ab2bd046e 100644 --- a/protocol/statetracker/consumer_state_tracker.go +++ b/protocol/statetracker/consumer_state_tracker.go @@ -6,16 +6,16 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationconsensus" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - updaters "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationconsensus" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + updaters "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) type ConsumerTxSenderInf interface { diff --git a/protocol/statetracker/emergency_tracker.go b/protocol/statetracker/emergency_tracker.go index b03f7b458a..1735d4acdb 100644 --- a/protocol/statetracker/emergency_tracker.go +++ b/protocol/statetracker/emergency_tracker.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/utils" - downtimev1 "github.com/lavanet/lava/v3/x/downtime/v1" + "github.com/lavanet/lava/v4/utils" + downtimev1 "github.com/lavanet/lava/v4/x/downtime/v1" ) const maxEpochsToStore = 3 diff --git a/protocol/statetracker/emergency_tracker_test.go b/protocol/statetracker/emergency_tracker_test.go index cc8589067f..c6ead534a5 100644 --- a/protocol/statetracker/emergency_tracker_test.go +++ b/protocol/statetracker/emergency_tracker_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - downtimev1 "github.com/lavanet/lava/v3/x/downtime/v1" + downtimev1 "github.com/lavanet/lava/v4/x/downtime/v1" "github.com/stretchr/testify/require" ) diff --git a/protocol/statetracker/events.go b/protocol/statetracker/events.go index 1283d633e2..9b41f74842 100644 --- a/protocol/statetracker/events.go +++ b/protocol/statetracker/events.go @@ -21,16 +21,16 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/version" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/rpcprovider/rewardserver" - updaters "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/rpcprovider/rewardserver" + updaters "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/protocol/statetracker/provider_state_tracker.go b/protocol/statetracker/provider_state_tracker.go index f91041589e..2dc0bbddcb 100644 --- a/protocol/statetracker/provider_state_tracker.go +++ b/protocol/statetracker/provider_state_tracker.go @@ -6,14 +6,14 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/metrics" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - updaters "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/metrics" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + updaters "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) // ProviderStateTracker PST is a class for tracking provider data from the lava blockchain, such as epoch changes. diff --git a/protocol/statetracker/state_tracker.go b/protocol/statetracker/state_tracker.go index 5ff1312702..c50639cb34 100644 --- a/protocol/statetracker/state_tracker.go +++ b/protocol/statetracker/state_tracker.go @@ -7,13 +7,13 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/chaintracker" - "github.com/lavanet/lava/v3/protocol/lavasession" - updaters "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - specutils "github.com/lavanet/lava/v3/utils/keeper" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/chaintracker" + "github.com/lavanet/lava/v4/protocol/lavasession" + updaters "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + specutils "github.com/lavanet/lava/v4/utils/keeper" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( diff --git a/protocol/statetracker/tx_sender.go b/protocol/statetracker/tx_sender.go index 95adefddd4..b0e42d5a5d 100644 --- a/protocol/statetracker/tx_sender.go +++ b/protocol/statetracker/tx_sender.go @@ -18,13 +18,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typestx "github.com/cosmos/cosmos-sdk/types/tx" "github.com/cosmos/cosmos-sdk/x/feegrant" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - updaters "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + updaters "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/protocol/statetracker/updaters/downtime_params_updater.go b/protocol/statetracker/updaters/downtime_params_updater.go index 7f01da443d..553a0aedf0 100644 --- a/protocol/statetracker/updaters/downtime_params_updater.go +++ b/protocol/statetracker/updaters/downtime_params_updater.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/utils" - downtimev1 "github.com/lavanet/lava/v3/x/downtime/v1" + "github.com/lavanet/lava/v4/utils" + downtimev1 "github.com/lavanet/lava/v4/x/downtime/v1" ) const ( diff --git a/protocol/statetracker/updaters/epoch_updater.go b/protocol/statetracker/updaters/epoch_updater.go index 4f6b5f27b3..74cdd504c0 100644 --- a/protocol/statetracker/updaters/epoch_updater.go +++ b/protocol/statetracker/updaters/epoch_updater.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "golang.org/x/net/context" ) diff --git a/protocol/statetracker/updaters/event_tracker.go b/protocol/statetracker/updaters/event_tracker.go index 7902935fb3..6f442a83af 100644 --- a/protocol/statetracker/updaters/event_tracker.go +++ b/protocol/statetracker/updaters/event_tracker.go @@ -10,12 +10,12 @@ import ( ctypes "github.com/cometbft/cometbft/rpc/core/types" "github.com/cosmos/cosmos-sdk/client" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - "github.com/lavanet/lava/v3/protocol/rpcprovider/rewardserver" - "github.com/lavanet/lava/v3/utils" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + "github.com/lavanet/lava/v4/protocol/rpcprovider/rewardserver" + "github.com/lavanet/lava/v4/utils" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( diff --git a/protocol/statetracker/updaters/finalization_consensus_updater.go b/protocol/statetracker/updaters/finalization_consensus_updater.go index e038626b4c..d6aa4bb1d6 100644 --- a/protocol/statetracker/updaters/finalization_consensus_updater.go +++ b/protocol/statetracker/updaters/finalization_consensus_updater.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/protocol/lavaprotocol/finalizationconsensus" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/lavaprotocol/finalizationconsensus" + "github.com/lavanet/lava/v4/utils" ) const ( diff --git a/protocol/statetracker/updaters/pairing_updater.go b/protocol/statetracker/updaters/pairing_updater.go index 5b74d3db26..661c2dc9d9 100644 --- a/protocol/statetracker/updaters/pairing_updater.go +++ b/protocol/statetracker/updaters/pairing_updater.go @@ -7,10 +7,10 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "golang.org/x/net/context" ) diff --git a/protocol/statetracker/updaters/pairing_updater_test.go b/protocol/statetracker/updaters/pairing_updater_test.go index 8cd5627f61..165eb37d14 100644 --- a/protocol/statetracker/updaters/pairing_updater_test.go +++ b/protocol/statetracker/updaters/pairing_updater_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/lavanet/lava/v3/protocol/common" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils/rand" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/protocol/common" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils/rand" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/protocol/statetracker/updaters/payment_updater.go b/protocol/statetracker/updaters/payment_updater.go index d8696d0eb6..ab99feb190 100644 --- a/protocol/statetracker/updaters/payment_updater.go +++ b/protocol/statetracker/updaters/payment_updater.go @@ -3,8 +3,8 @@ package updaters import ( "sync" - "github.com/lavanet/lava/v3/protocol/rpcprovider/rewardserver" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/rpcprovider/rewardserver" + "github.com/lavanet/lava/v4/utils" "golang.org/x/net/context" ) diff --git a/protocol/statetracker/updaters/policy_updater.go b/protocol/statetracker/updaters/policy_updater.go index a204890f50..17518cc082 100644 --- a/protocol/statetracker/updaters/policy_updater.go +++ b/protocol/statetracker/updaters/policy_updater.go @@ -5,10 +5,10 @@ import ( "sync" "time" - chainlib "github.com/lavanet/lava/v3/protocol/chainlib" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - plantypes "github.com/lavanet/lava/v3/x/plans/types" + chainlib "github.com/lavanet/lava/v4/protocol/chainlib" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + plantypes "github.com/lavanet/lava/v4/x/plans/types" ) const ( diff --git a/protocol/statetracker/updaters/provider_freeze_jail_updater.go b/protocol/statetracker/updaters/provider_freeze_jail_updater.go new file mode 100644 index 0000000000..69f24ad1ab --- /dev/null +++ b/protocol/statetracker/updaters/provider_freeze_jail_updater.go @@ -0,0 +1,71 @@ +package updaters + +import ( + "context" + "time" + + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + "google.golang.org/grpc" +) + +const ( + CallbackKeyForFreezeUpdate = "freeze-update" +) + +type ProviderPairingStatusStateQueryInf interface { + Provider(ctx context.Context, in *pairingtypes.QueryProviderRequest, opts ...grpc.CallOption) (*pairingtypes.QueryProviderResponse, error) +} + +type ProviderMetricsManagerInf interface { + SetFrozenStatus(string, bool) + SetJailStatus(string, bool) + SetJailedCount(string, uint64) +} + +type FrozenStatus uint64 + +const ( + AVAILABLE FrozenStatus = iota + FROZEN +) + +type ProviderFreezeJailUpdater struct { + pairingQueryClient ProviderPairingStatusStateQueryInf + metricsManager ProviderMetricsManagerInf + publicAddress string +} + +func NewProviderFreezeJailUpdater( + pairingQueryClient ProviderPairingStatusStateQueryInf, + publicAddress string, + metricsManager ProviderMetricsManagerInf, +) *ProviderFreezeJailUpdater { + return &ProviderFreezeJailUpdater{ + pairingQueryClient: pairingQueryClient, + publicAddress: publicAddress, + metricsManager: metricsManager, + } +} + +func (pfu *ProviderFreezeJailUpdater) UpdateEpoch(epoch uint64) { + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + response, err := pfu.pairingQueryClient.Provider(ctx, &pairingtypes.QueryProviderRequest{Address: pfu.publicAddress}) + cancel() + + if err != nil { + utils.LavaFormatError("Failed querying pairing client for provider", err) + return + } + + for _, provider := range response.StakeEntries { + if provider.Address != pfu.publicAddress || !provider.IsAddressVaultOrProvider(provider.Address) { + // should never happen, but just in case + continue + } + + pfu.metricsManager.SetJailedCount(provider.Chain, provider.Jails) + pfu.metricsManager.SetJailStatus(provider.Chain, provider.IsJailed(time.Now().UTC().Unix())) + pfu.metricsManager.SetFrozenStatus(provider.Chain, provider.IsFrozen() || provider.StakeAppliedBlock > epoch) + } +} diff --git a/protocol/statetracker/updaters/provider_freeze_jail_updater_mocks.go b/protocol/statetracker/updaters/provider_freeze_jail_updater_mocks.go new file mode 100644 index 0000000000..24b0738393 --- /dev/null +++ b/protocol/statetracker/updaters/provider_freeze_jail_updater_mocks.go @@ -0,0 +1,121 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: protocol/statetracker/updaters/provider_freeze_updater.go +// +// Generated by this command: +// +// mockgen -source=protocol/statetracker/updaters/provider_freeze_updater.go -destination protocol/statetracker/updaters/provider_freeze_updater_mocks.go -package updaters +// + +// Package updaters is a generated GoMock package. +package updaters + +import ( + context "context" + reflect "reflect" + + types "github.com/lavanet/lava/v4/x/pairing/types" + gomock "go.uber.org/mock/gomock" + grpc "google.golang.org/grpc" +) + +// MockProviderPairingStatusStateQueryInf is a mock of ProviderPairingStatusStateQueryInf interface. +type MockProviderPairingStatusStateQueryInf struct { + ctrl *gomock.Controller + recorder *MockProviderPairingStatusStateQueryInfMockRecorder +} + +// MockProviderPairingStatusStateQueryInfMockRecorder is the mock recorder for MockProviderPairingStatusStateQueryInf. +type MockProviderPairingStatusStateQueryInfMockRecorder struct { + mock *MockProviderPairingStatusStateQueryInf +} + +// NewMockProviderPairingStatusStateQueryInf creates a new mock instance. +func NewMockProviderPairingStatusStateQueryInf(ctrl *gomock.Controller) *MockProviderPairingStatusStateQueryInf { + mock := &MockProviderPairingStatusStateQueryInf{ctrl: ctrl} + mock.recorder = &MockProviderPairingStatusStateQueryInfMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockProviderPairingStatusStateQueryInf) EXPECT() *MockProviderPairingStatusStateQueryInfMockRecorder { + return m.recorder +} + +// Provider mocks base method. +func (m *MockProviderPairingStatusStateQueryInf) Provider(ctx context.Context, in *types.QueryProviderRequest, opts ...grpc.CallOption) (*types.QueryProviderResponse, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, in} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "Provider", varargs...) + ret0, _ := ret[0].(*types.QueryProviderResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Provider indicates an expected call of Provider. +func (mr *MockProviderPairingStatusStateQueryInfMockRecorder) Provider(ctx, in any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, in}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Provider", reflect.TypeOf((*MockProviderPairingStatusStateQueryInf)(nil).Provider), varargs...) +} + +// MockProviderMetricsManagerInf is a mock of ProviderMetricsManagerInf interface. +type MockProviderMetricsManagerInf struct { + ctrl *gomock.Controller + recorder *MockProviderMetricsManagerInfMockRecorder +} + +// MockProviderMetricsManagerInfMockRecorder is the mock recorder for MockProviderMetricsManagerInf. +type MockProviderMetricsManagerInfMockRecorder struct { + mock *MockProviderMetricsManagerInf +} + +// NewMockProviderMetricsManagerInf creates a new mock instance. +func NewMockProviderMetricsManagerInf(ctrl *gomock.Controller) *MockProviderMetricsManagerInf { + mock := &MockProviderMetricsManagerInf{ctrl: ctrl} + mock.recorder = &MockProviderMetricsManagerInfMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockProviderMetricsManagerInf) EXPECT() *MockProviderMetricsManagerInfMockRecorder { + return m.recorder +} + +// SetFrozenStatus mocks base method. +func (m *MockProviderMetricsManagerInf) SetFrozenStatus(arg0 string, arg1 bool) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "SetFrozenStatus", arg0, arg1) +} + +// SetFrozenStatus indicates an expected call of SetFrozenStatus. +func (mr *MockProviderMetricsManagerInfMockRecorder) SetFrozenStatus(arg0, arg1 any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetFrozenStatus", reflect.TypeOf((*MockProviderMetricsManagerInf)(nil).SetFrozenStatus), arg0, arg1) +} + +// SetJailStatus mocks base method. +func (m *MockProviderMetricsManagerInf) SetJailStatus(arg0 string, arg1 bool) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "SetJailStatus", arg0, arg1) +} + +// SetJailStatus indicates an expected call of SetJailStatus. +func (mr *MockProviderMetricsManagerInfMockRecorder) SetJailStatus(arg0, arg1 any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetJailStatus", reflect.TypeOf((*MockProviderMetricsManagerInf)(nil).SetJailStatus), arg0, arg1) +} + +// SetJailedCount mocks base method. +func (m *MockProviderMetricsManagerInf) SetJailedCount(arg0 string, arg1 uint64) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "SetJailedCount", arg0, arg1) +} + +// SetJailedCount indicates an expected call of SetJailedCount. +func (mr *MockProviderMetricsManagerInfMockRecorder) SetJailedCount(arg0, arg1 any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetJailedCount", reflect.TypeOf((*MockProviderMetricsManagerInf)(nil).SetJailedCount), arg0, arg1) +} diff --git a/protocol/statetracker/updaters/provider_freeze_jail_updater_test.go b/protocol/statetracker/updaters/provider_freeze_jail_updater_test.go new file mode 100644 index 0000000000..ce6c6f68be --- /dev/null +++ b/protocol/statetracker/updaters/provider_freeze_jail_updater_test.go @@ -0,0 +1,86 @@ +package updaters + +import ( + "testing" + "time" + + "github.com/lavanet/lava/v4/utils/rand" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + gomock "go.uber.org/mock/gomock" +) + +func TestFreezeJailMetricsOnEpochUpdate(t *testing.T) { + rand.InitRandomSeed() + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + specID := "test-spec" + address := "initial1" + epoch := uint64(100) + stakeAppliedBlock := uint64(10) + + stakeEntryList := []epochstoragetypes.StakeEntry{ + { + Address: address, + Chain: specID, + Endpoints: []epochstoragetypes.Endpoint{ + { + IPPORT: "1234567", + Geolocation: 1, + Addons: []string{}, + ApiInterfaces: []string{"banana"}, + Extensions: []string{}, + }, + }, + StakeAppliedBlock: stakeAppliedBlock, + }, + } + + response := &pairingtypes.QueryProviderResponse{StakeEntries: stakeEntryList} + + stateQuery := NewMockProviderPairingStatusStateQueryInf(ctrl) + metricManager := NewMockProviderMetricsManagerInf(ctrl) + + freezeUpdater := NewProviderFreezeJailUpdater(stateQuery, address, metricManager) + + expectAndRun := func(stakeAppliedBlock, jailedCount uint64, frozen bool, jailed bool) { + stakeEntryList[0].StakeAppliedBlock = stakeAppliedBlock + stakeEntryList[0].Jails = jailedCount + if jailed { + stakeEntryList[0].JailEndTime = time.Now().Add(time.Hour).UTC().Unix() + } + response = &pairingtypes.QueryProviderResponse{StakeEntries: stakeEntryList} + stateQuery. + EXPECT(). + Provider(gomock.Any(), gomock.Any(), gomock.Any()). + Return(response, nil). + AnyTimes() + + metricManager. + EXPECT(). + SetJailStatus(specID, jailed). + Times(1) + + metricManager. + EXPECT(). + SetFrozenStatus(specID, frozen). + Times(1) + + metricManager. + EXPECT(). + SetJailedCount(specID, jailedCount). + Times(1) + + freezeUpdater.UpdateEpoch(epoch) + } + + // Normal - no freeze, no jail + expectAndRun(stakeAppliedBlock, 0, false, false) + + // StakeAppliedBlock > epoch - frozen + expectAndRun(epoch+1, 0, true, false) + + // Jail status changed + jail count + expectAndRun(epoch-1, 1, false, true) +} diff --git a/protocol/statetracker/updaters/spec_updater.go b/protocol/statetracker/updaters/spec_updater.go index 6e1647e645..31c25bf8e3 100644 --- a/protocol/statetracker/updaters/spec_updater.go +++ b/protocol/statetracker/updaters/spec_updater.go @@ -7,9 +7,9 @@ import ( "sync/atomic" "time" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/utils" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/utils" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( diff --git a/protocol/statetracker/updaters/state_query.go b/protocol/statetracker/updaters/state_query.go index 5dc1973eb6..51cb45ec61 100644 --- a/protocol/statetracker/updaters/state_query.go +++ b/protocol/statetracker/updaters/state_query.go @@ -6,18 +6,18 @@ import ( "strconv" "time" - downtimev1 "github.com/lavanet/lava/v3/x/downtime/v1" + downtimev1 "github.com/lavanet/lava/v4/x/downtime/v1" "github.com/cosmos/cosmos-sdk/client" "github.com/dgraph-io/ristretto" - reliabilitymanager "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - "github.com/lavanet/lava/v3/utils" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + reliabilitymanager "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + "github.com/lavanet/lava/v4/utils" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/protocol/statetracker/updaters/updaters_mock.go b/protocol/statetracker/updaters/updaters_mock.go index 06d47acd1d..a2afc58a70 100644 --- a/protocol/statetracker/updaters/updaters_mock.go +++ b/protocol/statetracker/updaters/updaters_mock.go @@ -8,8 +8,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - lavasession "github.com/lavanet/lava/v3/protocol/lavasession" - types "github.com/lavanet/lava/v3/x/epochstorage/types" + lavasession "github.com/lavanet/lava/v4/protocol/lavasession" + types "github.com/lavanet/lava/v4/x/epochstorage/types" context "golang.org/x/net/context" ) diff --git a/protocol/statetracker/updaters/version_updater.go b/protocol/statetracker/updaters/version_updater.go index e9e1de86e7..642db23408 100644 --- a/protocol/statetracker/updaters/version_updater.go +++ b/protocol/statetracker/updaters/version_updater.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) const ( diff --git a/protocol/statetracker/updaters/vote_updater.go b/protocol/statetracker/updaters/vote_updater.go index a3a25c87a0..03bb445279 100644 --- a/protocol/statetracker/updaters/vote_updater.go +++ b/protocol/statetracker/updaters/vote_updater.go @@ -3,9 +3,9 @@ package updaters import ( "sync" - "github.com/lavanet/lava/v3/protocol/lavasession" - "github.com/lavanet/lava/v3/protocol/rpcprovider/reliabilitymanager" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/protocol/lavasession" + "github.com/lavanet/lava/v4/protocol/rpcprovider/reliabilitymanager" + "github.com/lavanet/lava/v4/utils" "golang.org/x/net/context" ) diff --git a/protocol/upgrade/protocol_version.go b/protocol/upgrade/protocol_version.go index 34bd0c1346..3f3ac18d03 100644 --- a/protocol/upgrade/protocol_version.go +++ b/protocol/upgrade/protocol_version.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" - "github.com/lavanet/lava/v3/protocol/statetracker/updaters" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/protocol/statetracker/updaters" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" ) type ProtocolVersion struct { diff --git a/scripts/automation_scripts/pure_proxy.py b/scripts/automation_scripts/pure_proxy.py index 4472727e23..f0197771cd 100644 --- a/scripts/automation_scripts/pure_proxy.py +++ b/scripts/automation_scripts/pure_proxy.py @@ -2,6 +2,7 @@ import aiohttp from aiohttp import web from functools import partial +import json port_url_map = { 5555: "http://localhost:1317", # Replace with actual target URLs @@ -21,6 +22,8 @@ async def proxy_handler(request, server_port): url += f"?{query_string}" print(f"Proxying request to: {url}") # Debug print + print(f"Request path: {path}") # Debug print + print(f"Request query: {query_string}") # Debug print print(f"Request headers: {request.headers}") # Debug print try: @@ -28,6 +31,21 @@ async def proxy_handler(request, server_port): method = request.method headers = {k: v for k, v in request.headers.items() if k.lower() not in ('host', 'content-length')} data = await request.read() + + # Print the data, decoding it as JSON if possible + try: + json_data = data.decode('utf-8') + print(f"Request data (raw): {json_data}") # Debug print + print("") + print("Copy for curl:") + print(f'curl -X POST -H "Content-Type: application/json" {target_url} --data {json_data} -v') + print("") + print("") + json_parsed_data = json.loads(json_data) + print(f"Request data (parsed JSON): {json.dumps(json_parsed_data, indent=2)}") # Debug print + except Exception as e: + print(f"Error decoding request data as JSON: {e}") + print(f"Request data (raw bytes): {data}") # Debug print async with session.request(method, url, headers=headers, data=data, allow_redirects=False) as resp: print(f"Response status: {resp.status}") # Debug print diff --git a/scripts/automation_scripts/update_cosmos_spec_from_grpc.py b/scripts/automation_scripts/update_cosmos_spec_from_grpc.py index e8ca25ea03..a145e5990a 100644 --- a/scripts/automation_scripts/update_cosmos_spec_from_grpc.py +++ b/scripts/automation_scripts/update_cosmos_spec_from_grpc.py @@ -39,7 +39,7 @@ def parse_endpoints_from_grpcurl(grpc_url: str) -> dict[str, list[str]]: print("### Parsing endpoints from gRPC service") endpoints: dict[str, list[str]] = {"grpc": [], "rest": []} - content = os.popen(f"grpcurl {grpc_url} describe").read() + content = os.popen(f"grpcurl --plaintext {grpc_url} describe").read() # Regex pattern to find services starting with their corresponding rpc and rest paths grpc_pattern = re.compile( @@ -55,13 +55,15 @@ def parse_endpoints_from_grpcurl(grpc_url: str) -> dict[str, list[str]]: service_name, service_content = service_match.groups() if ( - "cosmos" in service_content - or "cosmwasm" in service_content + "cosmwasm" in service_content or "ibc" in service_content or "grpc.reflection.v1alpha" in service_content ): continue + if "cosmos" in service_content and "evm" not in service_content: + continue + # Extracting all grpc paths for rpc_match in rpc_pattern.finditer(service_content): rpc_method = rpc_match.group(1) diff --git a/scripts/init_chain_commands.sh b/scripts/init_chain_commands.sh index e9ccefeeb5..295f201531 100755 --- a/scripts/init_chain_commands.sh +++ b/scripts/init_chain_commands.sh @@ -64,7 +64,7 @@ wait_count_blocks 2 echo; echo "#### Voting on plans del proposal ####" lavad tx gov vote $(latest_vote) yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE -echo; echo "#### Sending proposal for plans del ####" +echo; echo "#### Buy DefaultPlan subscription for user1 ####" lavad tx subscription buy DefaultPlan $(lavad keys show user1 -a) --enable-auto-renewal -y --from user1 --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE # wait_count_blocks 2 # lavad tx project set-policy $(lavad keys show user1 -a)-admin ./cookbook/projects/policy_all_chains_with_addon.yml -y --from user1 --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE diff --git a/scripts/pre_setups/init_lava_only_with_node_two_consumers.sh b/scripts/pre_setups/init_lava_only_with_node_rate_limit.sh similarity index 79% rename from scripts/pre_setups/init_lava_only_with_node_two_consumers.sh rename to scripts/pre_setups/init_lava_only_with_node_rate_limit.sh index 2ebffd14ea..4d35705eb0 100755 --- a/scripts/pre_setups/init_lava_only_with_node_two_consumers.sh +++ b/scripts/pre_setups/init_lava_only_with_node_rate_limit.sh @@ -20,7 +20,7 @@ echo "[Test Setup] sleeping 20 seconds for node to finish setup (if its not enou sleep 5 wait_for_lava_node_to_start -GASPRICE="0.000000001ulava" +GASPRICE="0.00002ulava" lavad tx gov submit-legacy-proposal spec-add ./cookbook/specs/ibc.json,./cookbook/specs/cosmoswasm.json,./cookbook/specs/tendermint.json,./cookbook/specs/cosmossdk.json,./cookbook/specs/cosmossdk_45.json,./cookbook/specs/cosmossdk_full.json,./cookbook/specs/ethermint.json,./cookbook/specs/ethereum.json,./cookbook/specs/cosmoshub.json,./cookbook/specs/lava.json,./cookbook/specs/osmosis.json,./cookbook/specs/fantom.json,./cookbook/specs/celo.json,./cookbook/specs/optimism.json,./cookbook/specs/arbitrum.json,./cookbook/specs/starknet.json,./cookbook/specs/aptos.json,./cookbook/specs/juno.json,./cookbook/specs/polygon.json,./cookbook/specs/evmos.json,./cookbook/specs/base.json,./cookbook/specs/canto.json,./cookbook/specs/sui.json,./cookbook/specs/solana.json,./cookbook/specs/bsc.json,./cookbook/specs/axelar.json,./cookbook/specs/avalanche.json,./cookbook/specs/fvm.json --lava-dev-test -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE & wait_next_block wait_next_block @@ -42,8 +42,6 @@ PROVIDER1_LISTENER="127.0.0.1:2220" lavad tx subscription buy DefaultPlan $(lavad keys show user1 -a) -y --from user1 --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE wait_next_block -lavad tx subscription buy DefaultPlan $(lavad keys show user2 -a) -y --from user2 --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE -wait_next_block lavad tx pairing stake-provider "LAV1" $PROVIDERSTAKE "$PROVIDER1_LISTENER,1" 1 $(operator_address) -y --from servicer1 --provider-moniker "dummyMoniker" --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE sleep_until_next_epoch @@ -53,17 +51,13 @@ screen -d -m -S provider1 bash -c "source ~/.bashrc; lavap rpcprovider \ $PROVIDER1_LISTENER LAV1 rest '$LAVA_REST' \ $PROVIDER1_LISTENER LAV1 tendermintrpc '$LAVA_RPC,$LAVA_RPC_WS' \ $PROVIDER1_LISTENER LAV1 grpc '$LAVA_GRPC' \ -$EXTRA_PROVIDER_FLAGS --geolocation 1 --log_level trace --from servicer1 --chain-id lava --metrics-listen-address ":7776" 2>&1 | tee $LOGS_DIR/PROVIDER1.log" && sleep 0.25 +$EXTRA_PROVIDER_FLAGS --geolocation 1 --log_level debug --from servicer1 --rate-limit-requests-per-second 10 --chain-id lava --metrics-listen-address ":7776" 2>&1 | tee $LOGS_DIR/PROVIDER1.log" && sleep 0.25 wait_next_block screen -d -m -S consumers bash -c "source ~/.bashrc; lavap rpcconsumer \ 127.0.0.1:3360 LAV1 rest 127.0.0.1:3361 LAV1 tendermintrpc 127.0.0.1:3362 LAV1 grpc \ -$EXTRA_PORTAL_FLAGS --geolocation 1 --log_level trace --from user1 --chain-id lava --add-api-method-metrics --allow-insecure-provider-dialing --metrics-listen-address ":7779" 2>&1 | tee $LOGS_DIR/CONSUMERS.log" && sleep 0.25 - -screen -d -m -S consumers2 bash -c "source ~/.bashrc; lavap rpcconsumer \ -127.0.0.1:3350 LAV1 rest 127.0.0.1:3351 LAV1 tendermintrpc 127.0.0.1:3352 LAV1 grpc \ -$EXTRA_PORTAL_FLAGS --geolocation 1 --log_level trace --from user2 --chain-id lava --add-api-method-metrics --allow-insecure-provider-dialing --metrics-listen-address ":7773" 2>&1 | tee $LOGS_DIR/CONSUMERS2.log" && sleep 0.25 +$EXTRA_PORTAL_FLAGS --geolocation 1 --log_level debug --from user1 --chain-id lava --add-api-method-metrics --allow-insecure-provider-dialing --metrics-listen-address ":7779" 2>&1 | tee $LOGS_DIR/CONSUMERS.log" && sleep 0.25 echo "--- setting up screens done ---" screen -ls \ No newline at end of file diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index dd94d98422..45439434e7 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -33,5 +33,5 @@ done cd .. # move proto files to the right places -cp -r github.com/lavanet/lava/v3/* ./ +cp -r github.com/lavanet/lava/v4/* ./ rm -rf github.com diff --git a/testutil/common/common.go b/testutil/common/common.go index b793e34757..ab88059c23 100644 --- a/testutil/common/common.go +++ b/testutil/common/common.go @@ -7,14 +7,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - conflictconstruct "github.com/lavanet/lava/v3/x/conflict/types/construct" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" - subscriptiontypes "github.com/lavanet/lava/v3/x/subscription/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + conflictconstruct "github.com/lavanet/lava/v4/x/conflict/types/construct" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + subscriptiontypes "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/testutil/common/mock.go b/testutil/common/mock.go index c20db79410..f1ef3441aa 100644 --- a/testutil/common/mock.go +++ b/testutil/common/mock.go @@ -2,9 +2,9 @@ package common import ( sdk "github.com/cosmos/cosmos-sdk/types" - commonconsts "github.com/lavanet/lava/v3/testutil/common/consts" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + commonconsts "github.com/lavanet/lava/v4/testutil/common/consts" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) func CreateMockSpec() spectypes.Spec { diff --git a/testutil/common/tester.go b/testutil/common/tester.go index 33b3cb54e4..9032bcf281 100644 --- a/testutil/common/tester.go +++ b/testutil/common/tester.go @@ -14,21 +14,21 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/utils" - specutils "github.com/lavanet/lava/v3/utils/keeper" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/sigs" - dualstakingante "github.com/lavanet/lava/v3/x/dualstaking/ante" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - fixationstoretypes "github.com/lavanet/lava/v3/x/fixationstore/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" - subscriptiontypes "github.com/lavanet/lava/v3/x/subscription/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/utils" + specutils "github.com/lavanet/lava/v4/utils/keeper" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/sigs" + dualstakingante "github.com/lavanet/lava/v4/x/dualstaking/ante" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + fixationstoretypes "github.com/lavanet/lava/v4/x/fixationstore/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + subscriptiontypes "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/testutil/e2e/allowedErrorList.go b/testutil/e2e/allowedErrorList.go index 5b083bae70..192e3eac1b 100644 --- a/testutil/e2e/allowedErrorList.go +++ b/testutil/e2e/allowedErrorList.go @@ -9,6 +9,7 @@ var allowedErrors = map[string]string{ "purging provider after all endpoints are disabled provider": "This error is allowed because it is caused by the initial bootup, continuous failure would be caught by the e2e so we can allowed this error.", "Provider Side Failed Sending Message, Reason: Unavailable": "This error is allowed because it is caused by the lavad restart to turn on emergency mode", "Maximum cu exceeded PrepareSessionForUsage": "This error is allowed because it is caused by switching between providers, continuous failure would be caught by the e2e so we can allowed this error.", + "Failed To Connect to cache at address": "This error is allowed because it is caused by cache being connected only during the test and not during the bootup", } var allowedErrorsDuringEmergencyMode = map[string]string{ diff --git a/testutil/e2e/paymentE2E.go b/testutil/e2e/paymentE2E.go index c63d1f1a1e..99bc108d50 100644 --- a/testutil/e2e/paymentE2E.go +++ b/testutil/e2e/paymentE2E.go @@ -13,14 +13,14 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/cmd/lavad/cmd" - commonconsts "github.com/lavanet/lava/v3/testutil/common/consts" - e2esdk "github.com/lavanet/lava/v3/testutil/e2e/sdk" - "github.com/lavanet/lava/v3/utils" - dualstakingTypes "github.com/lavanet/lava/v3/x/dualstaking/types" - epochStorageTypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingTypes "github.com/lavanet/lava/v3/x/pairing/types" - subscriptionTypes "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/cmd/lavad/cmd" + commonconsts "github.com/lavanet/lava/v4/testutil/common/consts" + e2esdk "github.com/lavanet/lava/v4/testutil/e2e/sdk" + "github.com/lavanet/lava/v4/utils" + dualstakingTypes "github.com/lavanet/lava/v4/x/dualstaking/types" + epochStorageTypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingTypes "github.com/lavanet/lava/v4/x/pairing/types" + subscriptionTypes "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/testutil/e2e/protocolE2E.go b/testutil/e2e/protocolE2E.go index 1fcc7a0616..541eb66a2c 100644 --- a/testutil/e2e/protocolE2E.go +++ b/testutil/e2e/protocolE2E.go @@ -30,14 +30,14 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" "github.com/gorilla/websocket" - commonconsts "github.com/lavanet/lava/v3/testutil/common/consts" - "github.com/lavanet/lava/v3/testutil/e2e/sdk" - "github.com/lavanet/lava/v3/utils" - epochStorageTypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingTypes "github.com/lavanet/lava/v3/x/pairing/types" - planTypes "github.com/lavanet/lava/v3/x/plans/types" - specTypes "github.com/lavanet/lava/v3/x/spec/types" - subscriptionTypes "github.com/lavanet/lava/v3/x/subscription/types" + commonconsts "github.com/lavanet/lava/v4/testutil/common/consts" + "github.com/lavanet/lava/v4/testutil/e2e/sdk" + "github.com/lavanet/lava/v4/utils" + epochStorageTypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingTypes "github.com/lavanet/lava/v4/x/pairing/types" + planTypes "github.com/lavanet/lava/v4/x/plans/types" + specTypes "github.com/lavanet/lava/v4/x/spec/types" + subscriptionTypes "github.com/lavanet/lava/v4/x/subscription/types" "golang.org/x/exp/slices" "google.golang.org/grpc" "google.golang.org/grpc/credentials" @@ -77,6 +77,8 @@ type lavaTest struct { wg sync.WaitGroup logPath string tokenDenom string + consumerCacheAddress string + providerCacheAddress string } func init() { @@ -339,8 +341,8 @@ func (lt *lavaTest) startJSONRPCProxy(ctx context.Context) { func (lt *lavaTest) startJSONRPCProvider(ctx context.Context) { for idx := 1; idx <= 5; idx++ { command := fmt.Sprintf( - "%s rpcprovider %s/jsonrpcProvider%d.yml --chain-id=lava --from servicer%d %s", - lt.protocolPath, providerConfigsFolder, idx, idx, lt.lavadArgs, + "%s rpcprovider %s/jsonrpcProvider%d.yml --cache-be %s --chain-id=lava --from servicer%d %s", + lt.protocolPath, providerConfigsFolder, idx, lt.providerCacheAddress, idx, lt.lavadArgs, ) logName := "03_EthProvider_" + fmt.Sprintf("%02d", idx) funcName := fmt.Sprintf("startJSONRPCProvider (provider %02d)", idx) @@ -358,8 +360,8 @@ func (lt *lavaTest) startJSONRPCProvider(ctx context.Context) { func (lt *lavaTest) startJSONRPCConsumer(ctx context.Context) { for idx, u := range []string{"user1"} { command := fmt.Sprintf( - "%s rpcconsumer %s/ethConsumer%d.yml --chain-id=lava --from %s %s", - lt.protocolPath, consumerConfigsFolder, idx+1, u, lt.lavadArgs+lt.consumerArgs, + "%s rpcconsumer %s/ethConsumer%d.yml --cache-be %s --chain-id=lava --from %s %s", + lt.protocolPath, consumerConfigsFolder, idx+1, lt.consumerCacheAddress, u, lt.lavadArgs+lt.consumerArgs, ) logName := "04_jsonConsumer_" + fmt.Sprintf("%02d", idx+1) funcName := fmt.Sprintf("startJSONRPCConsumer (consumer %02d)", idx+1) @@ -533,8 +535,8 @@ func jsonrpcTests(rpcURL string, testDuration time.Duration) error { func (lt *lavaTest) startLavaProviders(ctx context.Context) { for idx := 6; idx <= 10; idx++ { command := fmt.Sprintf( - "%s rpcprovider %s/lavaProvider%d --chain-id=lava --from servicer%d %s", - lt.protocolPath, providerConfigsFolder, idx, idx, lt.lavadArgs, + "%s rpcprovider %s/lavaProvider%d --cache-be %s --chain-id=lava --from servicer%d %s", + lt.protocolPath, providerConfigsFolder, idx, lt.providerCacheAddress, idx, lt.lavadArgs, ) logName := "05_LavaProvider_" + fmt.Sprintf("%02d", idx-5) funcName := fmt.Sprintf("startLavaProviders (provider %02d)", idx-5) @@ -552,8 +554,8 @@ func (lt *lavaTest) startLavaProviders(ctx context.Context) { func (lt *lavaTest) startLavaConsumer(ctx context.Context) { for idx, u := range []string{"user3"} { command := fmt.Sprintf( - "%s rpcconsumer %s/lavaConsumer%d.yml --chain-id=lava --from %s %s", - lt.protocolPath, consumerConfigsFolder, idx+1, u, lt.lavadArgs+lt.consumerArgs, + "%s rpcconsumer %s/lavaConsumer%d.yml --cache-be %s --chain-id=lava --from %s %s", + lt.protocolPath, consumerConfigsFolder, idx+1, lt.consumerCacheAddress, u, lt.lavadArgs+lt.consumerArgs, ) logName := "06_RPCConsumer_" + fmt.Sprintf("%02d", idx+1) funcName := fmt.Sprintf("startRPCConsumer (consumer %02d)", idx+1) @@ -562,6 +564,43 @@ func (lt *lavaTest) startLavaConsumer(ctx context.Context) { utils.LavaFormatInfo("startRPCConsumer OK") } +func (lt *lavaTest) startConsumerCache(ctx context.Context) { + command := fmt.Sprintf("%s cache %s --log_level debug", lt.protocolPath, lt.consumerCacheAddress) + logName := "08_Consumer_Cache" + funcName := "startConsumerCache" + + lt.execCommand(ctx, funcName, logName, command, false) + lt.checkCacheIsUp(ctx, lt.consumerCacheAddress, time.Minute) + utils.LavaFormatInfo(funcName + OKstr) +} + +func (lt *lavaTest) startProviderCache(ctx context.Context) { + command := fmt.Sprintf("%s cache %s --log_level debug", lt.protocolPath, lt.providerCacheAddress) + logName := "09_Provider_Cache" + funcName := "startProviderCache" + + lt.execCommand(ctx, funcName, logName, command, false) + lt.checkCacheIsUp(ctx, lt.providerCacheAddress, time.Minute) + utils.LavaFormatInfo(funcName + OKstr) +} + +func (lt *lavaTest) checkCacheIsUp(ctx context.Context, cacheAddress string, timeout time.Duration) { + for start := time.Now(); time.Since(start) < timeout; { + utils.LavaFormatInfo("Waiting Cache " + cacheAddress) + nctx, cancel := context.WithTimeout(ctx, time.Second) + grpcClient, err := grpc.DialContext(nctx, cacheAddress, grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials())) + if err != nil { + cancel() + time.Sleep(time.Second) + continue + } + cancel() + grpcClient.Close() + return + } + panic("checkCacheIsUp: Check Failed Cache didn't respond" + cacheAddress) +} + func (lt *lavaTest) startLavaEmergencyConsumer(ctx context.Context) { for idx, u := range []string{"user5"} { command := fmt.Sprintf( @@ -1394,16 +1433,18 @@ func runProtocolE2E(timeout time.Duration) { fmt.Println(err) } lt := &lavaTest{ - grpcConn: grpcConn, - lavadPath: gopath + "/bin/lavad", - protocolPath: gopath + "/bin/lavap", - lavadArgs: "--geolocation 1 --log_level debug", - consumerArgs: " --allow-insecure-provider-dialing", - logs: make(map[string]*sdk.SafeBuffer), - commands: make(map[string]*exec.Cmd), - providerType: make(map[string][]epochStorageTypes.Endpoint), - logPath: protocolLogsFolder, - tokenDenom: commonconsts.TestTokenDenom, + grpcConn: grpcConn, + lavadPath: gopath + "/bin/lavad", + protocolPath: gopath + "/bin/lavap", + lavadArgs: "--geolocation 1 --log_level debug", + consumerArgs: " --allow-insecure-provider-dialing", + logs: make(map[string]*sdk.SafeBuffer), + commands: make(map[string]*exec.Cmd), + providerType: make(map[string][]epochStorageTypes.Endpoint), + logPath: protocolLogsFolder, + tokenDenom: commonconsts.TestTokenDenom, + consumerCacheAddress: "127.0.0.1:2778", + providerCacheAddress: "127.0.0.1:2777", } // use defer to save logs in case the tests fail defer func() { @@ -1465,63 +1506,73 @@ func runProtocolE2E(timeout time.Duration) { lt.startLavaProviders(ctx) lt.startLavaConsumer(ctx) - // staked client then with subscription - repeat(1, func(n int) { - url := fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3) - lt.checkTendermintConsumer(url, time.Second*30) - url = fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3+1) - lt.checkRESTConsumer(url, time.Second*30) - url = fmt.Sprintf("127.0.0.1:334%d", (n-1)*3+2) - lt.checkGRPCConsumer(url, time.Second*30) - }) + runChecksAndTests := func() { + // staked client then with subscription + repeat(1, func(n int) { + url := fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3) + lt.checkTendermintConsumer(url, time.Second*15) + url = fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3+1) + lt.checkRESTConsumer(url, time.Second*15) + url = fmt.Sprintf("127.0.0.1:334%d", (n-1)*3+2) + lt.checkGRPCConsumer(url, time.Second*15) + }) - // staked client then with subscription - repeat(1, func(n int) { - url := fmt.Sprintf("http://127.0.0.1:333%d", n) - if err := jsonrpcTests(url, time.Second*30); err != nil { - panic(err) - } - }) - utils.LavaFormatInfo("JSONRPC TEST OK") + // staked client then with subscription + repeat(1, func(n int) { + url := fmt.Sprintf("http://127.0.0.1:333%d", n) + if err := jsonrpcTests(url, time.Second*15); err != nil { + panic(err) + } + }) + utils.LavaFormatInfo("JSONRPC TEST OK") - // staked client then with subscription - repeat(1, func(n int) { - url := fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3) - if err := tendermintTests(url, time.Second*30); err != nil { - panic(err) - } - }) - utils.LavaFormatInfo("TENDERMINTRPC TEST OK") + // staked client then with subscription + repeat(1, func(n int) { + url := fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3) + if err := tendermintTests(url, time.Second*15); err != nil { + panic(err) + } + }) + utils.LavaFormatInfo("TENDERMINTRPC TEST OK") - // staked client then with subscription - repeat(1, func(n int) { - url := fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3) - if err := tendermintURITests(url, time.Second*30); err != nil { - panic(err) - } - }) - utils.LavaFormatInfo("TENDERMINTRPC URI TEST OK") + // staked client then with subscription + repeat(1, func(n int) { + url := fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3) + if err := tendermintURITests(url, time.Second*15); err != nil { + panic(err) + } + }) + utils.LavaFormatInfo("TENDERMINTRPC URI TEST OK") - lt.lavaOverLava(ctx) + // staked client then with subscription + repeat(1, func(n int) { + url := fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3+1) + if err := restTests(url, time.Second*15); err != nil { + panic(err) + } + }) + utils.LavaFormatInfo("REST TEST OK") - // staked client then with subscription - repeat(1, func(n int) { - url := fmt.Sprintf("http://127.0.0.1:334%d", (n-1)*3+1) - if err := restTests(url, time.Second*30); err != nil { - panic(err) - } - }) - utils.LavaFormatInfo("REST TEST OK") + // staked client then with subscription + repeat(1, func(n int) { + url := fmt.Sprintf("127.0.0.1:334%d", (n-1)*3+2) + if err := grpcTests(url, time.Second*15); err != nil { + panic(err) + } + }) + utils.LavaFormatInfo("GRPC TEST OK") + } - // staked client then with subscription - // TODO: if set to 30 secs fails e2e need to investigate why. currently blocking PR's - repeat(1, func(n int) { - url := fmt.Sprintf("127.0.0.1:334%d", (n-1)*3+2) - if err := grpcTests(url, time.Second*5); err != nil { - panic(err) - } - }) - utils.LavaFormatInfo("GRPC TEST OK") + // run tests without cache + runChecksAndTests() + + lt.startConsumerCache(ctx) + lt.startProviderCache(ctx) + + // run tests with cache + runChecksAndTests() + + lt.lavaOverLava(ctx) lt.checkResponse("http://127.0.0.1:3340", "http://127.0.0.1:3341", "127.0.0.1:3342") diff --git a/testutil/e2e/proxy/proxy.go b/testutil/e2e/proxy/proxy.go index 0fb68c6e18..9eb9dde326 100644 --- a/testutil/e2e/proxy/proxy.go +++ b/testutil/e2e/proxy/proxy.go @@ -11,8 +11,8 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcInterfaceMessages" - "github.com/lavanet/lava/v3/protocol/chainlib/chainproxy/rpcclient" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcInterfaceMessages" + "github.com/lavanet/lava/v4/protocol/chainlib/chainproxy/rpcclient" ) // var mockFolder string = "testutil/e2e/proxy/mockMaps/" diff --git a/testutil/e2e/sdk/e2e.go b/testutil/e2e/sdk/e2e.go index c7e5147b44..1f452e737b 100644 --- a/testutil/e2e/sdk/e2e.go +++ b/testutil/e2e/sdk/e2e.go @@ -12,8 +12,8 @@ import ( "strings" "sync" - "github.com/lavanet/lava/v3/utils" - pairingTypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingTypes "github.com/lavanet/lava/v4/x/pairing/types" "golang.org/x/exp/slices" "google.golang.org/grpc" ) diff --git a/testutil/e2e/sdkE2E.go b/testutil/e2e/sdkE2E.go index 0af0bc8321..7492812b0f 100644 --- a/testutil/e2e/sdkE2E.go +++ b/testutil/e2e/sdkE2E.go @@ -10,10 +10,10 @@ import ( "strings" "time" - commonconsts "github.com/lavanet/lava/v3/testutil/common/consts" - "github.com/lavanet/lava/v3/testutil/e2e/sdk" - "github.com/lavanet/lava/v3/utils" - epochStorageTypes "github.com/lavanet/lava/v3/x/epochstorage/types" + commonconsts "github.com/lavanet/lava/v4/testutil/common/consts" + "github.com/lavanet/lava/v4/testutil/e2e/sdk" + "github.com/lavanet/lava/v4/utils" + epochStorageTypes "github.com/lavanet/lava/v4/x/epochstorage/types" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/testutil/keeper/conflict.go b/testutil/keeper/conflict.go index fadb72bc0f..beb8636a9b 100644 --- a/testutil/keeper/conflict.go +++ b/testutil/keeper/conflict.go @@ -10,9 +10,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/dualstaking.go b/testutil/keeper/dualstaking.go index c1c848ee5f..e6149d6f4b 100644 --- a/testutil/keeper/dualstaking.go +++ b/testutil/keeper/dualstaking.go @@ -12,12 +12,12 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" - epochstoragekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper" - fixationkeeper "github.com/lavanet/lava/v3/x/fixationstore/keeper" - speckeeper "github.com/lavanet/lava/v3/x/spec/keeper" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" + epochstoragekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper" + fixationkeeper "github.com/lavanet/lava/v4/x/fixationstore/keeper" + speckeeper "github.com/lavanet/lava/v4/x/spec/keeper" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/epochstorage.go b/testutil/keeper/epochstorage.go index 1b0a0f5a52..7cc584527a 100644 --- a/testutil/keeper/epochstorage.go +++ b/testutil/keeper/epochstorage.go @@ -12,8 +12,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/keepers_init.go b/testutil/keeper/keepers_init.go index 247aa2ab5a..b9e289b376 100644 --- a/testutil/keeper/keepers_init.go +++ b/testutil/keeper/keepers_init.go @@ -31,38 +31,38 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - commonconsts "github.com/lavanet/lava/v3/testutil/common/consts" - "github.com/lavanet/lava/v3/utils/sigs" - conflictkeeper "github.com/lavanet/lava/v3/x/conflict/keeper" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - downtimekeeper "github.com/lavanet/lava/v3/x/downtime/keeper" - downtimemoduletypes "github.com/lavanet/lava/v3/x/downtime/types" - downtimev1 "github.com/lavanet/lava/v3/x/downtime/v1" - dualstakingkeeper "github.com/lavanet/lava/v3/x/dualstaking/keeper" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" - epochstoragekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - fixationkeeper "github.com/lavanet/lava/v3/x/fixationstore/keeper" - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" - "github.com/lavanet/lava/v3/x/pairing" - pairingkeeper "github.com/lavanet/lava/v3/x/pairing/keeper" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - "github.com/lavanet/lava/v3/x/plans" - planskeeper "github.com/lavanet/lava/v3/x/plans/keeper" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectskeeper "github.com/lavanet/lava/v3/x/projects/keeper" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - protocolkeeper "github.com/lavanet/lava/v3/x/protocol/keeper" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - rewardskeeper "github.com/lavanet/lava/v3/x/rewards/keeper" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" - "github.com/lavanet/lava/v3/x/spec" - speckeeper "github.com/lavanet/lava/v3/x/spec/keeper" - spectypes "github.com/lavanet/lava/v3/x/spec/types" - subscriptionkeeper "github.com/lavanet/lava/v3/x/subscription/keeper" - subscriptiontypes "github.com/lavanet/lava/v3/x/subscription/types" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + commonconsts "github.com/lavanet/lava/v4/testutil/common/consts" + "github.com/lavanet/lava/v4/utils/sigs" + conflictkeeper "github.com/lavanet/lava/v4/x/conflict/keeper" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + downtimekeeper "github.com/lavanet/lava/v4/x/downtime/keeper" + downtimemoduletypes "github.com/lavanet/lava/v4/x/downtime/types" + downtimev1 "github.com/lavanet/lava/v4/x/downtime/v1" + dualstakingkeeper "github.com/lavanet/lava/v4/x/dualstaking/keeper" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" + epochstoragekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + fixationkeeper "github.com/lavanet/lava/v4/x/fixationstore/keeper" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/pairing" + pairingkeeper "github.com/lavanet/lava/v4/x/pairing/keeper" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + "github.com/lavanet/lava/v4/x/plans" + planskeeper "github.com/lavanet/lava/v4/x/plans/keeper" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectskeeper "github.com/lavanet/lava/v4/x/projects/keeper" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + protocolkeeper "github.com/lavanet/lava/v4/x/protocol/keeper" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + rewardskeeper "github.com/lavanet/lava/v4/x/rewards/keeper" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" + "github.com/lavanet/lava/v4/x/spec" + speckeeper "github.com/lavanet/lava/v4/x/spec/keeper" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + subscriptionkeeper "github.com/lavanet/lava/v4/x/subscription/keeper" + subscriptiontypes "github.com/lavanet/lava/v4/x/subscription/types" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/pairing.go b/testutil/keeper/pairing.go index 876fb8be5e..5c9a91ba30 100644 --- a/testutil/keeper/pairing.go +++ b/testutil/keeper/pairing.go @@ -12,13 +12,13 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - epochstoragemodule "github.com/lavanet/lava/v3/x/epochstorage" - epochstoragekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - fixationkeeper "github.com/lavanet/lava/v3/x/fixationstore/keeper" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" + epochstoragemodule "github.com/lavanet/lava/v4/x/epochstorage" + epochstoragekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + fixationkeeper "github.com/lavanet/lava/v4/x/fixationstore/keeper" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/plan.go b/testutil/keeper/plan.go index b9ec9e51a7..8a19802050 100644 --- a/testutil/keeper/plan.go +++ b/testutil/keeper/plan.go @@ -12,12 +12,12 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - epochstoragekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper" - fixationkeeper "github.com/lavanet/lava/v3/x/fixationstore/keeper" - "github.com/lavanet/lava/v3/x/plans/keeper" - "github.com/lavanet/lava/v3/x/plans/types" - speckeeper "github.com/lavanet/lava/v3/x/spec/keeper" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" + epochstoragekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper" + fixationkeeper "github.com/lavanet/lava/v4/x/fixationstore/keeper" + "github.com/lavanet/lava/v4/x/plans/keeper" + "github.com/lavanet/lava/v4/x/plans/types" + speckeeper "github.com/lavanet/lava/v4/x/spec/keeper" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/projects.go b/testutil/keeper/projects.go index 2dab70b6f8..ac818e7c55 100644 --- a/testutil/keeper/projects.go +++ b/testutil/keeper/projects.go @@ -12,11 +12,11 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - epochstoragekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper" - fixationkeeper "github.com/lavanet/lava/v3/x/fixationstore/keeper" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" + epochstoragekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper" + fixationkeeper "github.com/lavanet/lava/v4/x/fixationstore/keeper" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/protocol.go b/testutil/keeper/protocol.go index 5d19affa39..c0dea6a920 100644 --- a/testutil/keeper/protocol.go +++ b/testutil/keeper/protocol.go @@ -14,8 +14,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/x/protocol/keeper" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/keeper" + "github.com/lavanet/lava/v4/x/protocol/types" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/rewards.go b/testutil/keeper/rewards.go index 8d828b3b1f..4bf2afcc4e 100644 --- a/testutil/keeper/rewards.go +++ b/testutil/keeper/rewards.go @@ -18,13 +18,13 @@ import ( typesparams "github.com/cosmos/cosmos-sdk/x/params/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - downtimekeeper "github.com/lavanet/lava/v3/x/downtime/keeper" - downtimemoduletypes "github.com/lavanet/lava/v3/x/downtime/types" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" - epochstoragekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/rewards/keeper" - "github.com/lavanet/lava/v3/x/rewards/types" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" + downtimekeeper "github.com/lavanet/lava/v4/x/downtime/keeper" + downtimemoduletypes "github.com/lavanet/lava/v4/x/downtime/types" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" + epochstoragekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/rewards/keeper" + "github.com/lavanet/lava/v4/x/rewards/types" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" "github.com/stretchr/testify/require" ) diff --git a/testutil/keeper/subscription.go b/testutil/keeper/subscription.go index a1be7f77a0..6d27f976a1 100644 --- a/testutil/keeper/subscription.go +++ b/testutil/keeper/subscription.go @@ -12,14 +12,14 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - dualstakingkeeper "github.com/lavanet/lava/v3/x/dualstaking/keeper" - epochstoragekeeper "github.com/lavanet/lava/v3/x/epochstorage/keeper" - fixationkeeper "github.com/lavanet/lava/v3/x/fixationstore/keeper" - planskeeper "github.com/lavanet/lava/v3/x/plans/keeper" - projectskeeper "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" + dualstakingkeeper "github.com/lavanet/lava/v4/x/dualstaking/keeper" + epochstoragekeeper "github.com/lavanet/lava/v4/x/epochstorage/keeper" + fixationkeeper "github.com/lavanet/lava/v4/x/fixationstore/keeper" + planskeeper "github.com/lavanet/lava/v4/x/plans/keeper" + projectskeeper "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" "github.com/stretchr/testify/require" ) diff --git a/testutil/network/network.go b/testutil/network/network.go index c3ff8bcd2f..a1b72c2e92 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -20,7 +20,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/lavanet/lava/v3/app" + "github.com/lavanet/lava/v4/app" ) type ( diff --git a/utils/address.go b/utils/address.go index d284ad818d..8aee26eed4 100644 --- a/utils/address.go +++ b/utils/address.go @@ -3,7 +3,7 @@ package utils import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) func IsBech32Address(addr string) bool { diff --git a/utils/cli/multisend.go b/utils/cli/multisend.go index c69c3aa2f1..6fe0658c91 100644 --- a/utils/cli/multisend.go +++ b/utils/cli/multisend.go @@ -17,7 +17,7 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/utils/convert.go b/utils/convert.go new file mode 100644 index 0000000000..0a39cc7093 --- /dev/null +++ b/utils/convert.go @@ -0,0 +1,8 @@ +package utils + +func Btof(b bool) float64 { + if b { + return 1 + } + return 0 +} diff --git a/utils/keeper/spec.go b/utils/keeper/spec.go index 32735b78cb..b31d6d696e 100644 --- a/utils/keeper/spec.go +++ b/utils/keeper/spec.go @@ -17,9 +17,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/x/spec/client/utils" - "github.com/lavanet/lava/v3/x/spec/keeper" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/client/utils" + "github.com/lavanet/lava/v4/x/spec/keeper" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/utils/lavalog_test.go b/utils/lavalog_test.go index ca40e30422..9e46e60f78 100644 --- a/utils/lavalog_test.go +++ b/utils/lavalog_test.go @@ -4,7 +4,7 @@ import ( "testing" sdkerrors "cosmossdk.io/errors" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" "github.com/stretchr/testify/require" ) diff --git a/utils/lavaslices/slices.go b/utils/lavaslices/slices.go index abad07d4f1..56b385d38e 100644 --- a/utils/lavaslices/slices.go +++ b/utils/lavaslices/slices.go @@ -131,6 +131,15 @@ func Contains[T comparable](slice []T, elem T) bool { return false } +func ContainsPredicate[T comparable](slice []T, predicate func(elem T) bool) bool { + for _, e := range slice { + if predicate(e) { + return true + } + } + return false +} + // Remove removes the first instance (if exists) of elem from the slice, and // returns the new slice and indication if removal took place. func Remove[T comparable](slice []T, elem T) ([]T, bool) { @@ -237,6 +246,28 @@ func UnionByFunc[T ComparableByFunc](arrays ...[]T) []T { return res } +func Difference[T comparable](slice1, slice2 []T) []T { + // This function returns the difference between two slices + // (i.e., the elements that are in slice1 but not in slice2) + + // Create a map to store elements of the second slice for quick lookup + elementMap := make(map[T]bool) + for _, elem := range slice2 { + elementMap[elem] = true + } + + // Create a slice to hold the difference + diff := make([]T, 0) + for _, elem := range slice1 { + // If the element in slice1 is not in slice2, add it to the result + if !elementMap[elem] { + diff = append(diff, elem) + } + } + + return diff +} + func Map[T, V any](slice []T, filter func(T) V) []V { values := make([]V, len(slice)) for i := range slice { @@ -245,6 +276,14 @@ func Map[T, V any](slice []T, filter func(T) V) []V { return values } +func KeysSlice[T comparable, V any](in map[T]V) []T { + keys := []T{} + for k := range in { + keys = append(keys, k) + } + return keys +} + func Filter[T any](slice []T, filter func(T) bool) []T { values := make([]T, 0) for _, v := range slice { diff --git a/utils/lavaslices/slices_test.go b/utils/lavaslices/slices_test.go index 4a5880a8a2..8ae4f1bb39 100644 --- a/utils/lavaslices/slices_test.go +++ b/utils/lavaslices/slices_test.go @@ -2,6 +2,7 @@ package lavaslices import ( "math" + "reflect" "testing" "time" @@ -510,3 +511,56 @@ func TestSliceSplitter(t *testing.T) { } } } + +func TestDifference(t *testing.T) { + tests := []struct { + name string + slice1 []int + slice2 []int + expected []int + }{ + { + name: "Basic difference", + slice1: []int{1, 2, 3, 4}, + slice2: []int{3, 4, 5, 6}, + expected: []int{1, 2}, + }, + { + name: "No difference", + slice1: []int{1, 2, 3}, + slice2: []int{1, 2, 3}, + expected: []int{}, + }, + { + name: "All elements different", + slice1: []int{1, 2, 3}, + slice2: []int{4, 5, 6}, + expected: []int{1, 2, 3}, + }, + { + name: "Empty first slice", + slice1: []int{}, + slice2: []int{1, 2, 3}, + expected: []int{}, + }, + { + name: "Empty second slice", + slice1: []int{1, 2, 3}, + slice2: []int{}, + expected: []int{1, 2, 3}, + }, + { + name: "Mixed elements", + slice1: []int{1, 2, 2, 3, 4}, + slice2: []int{2, 4}, + expected: []int{1, 3}, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + result := Difference(tt.slice1, tt.slice2) + require.True(t, reflect.DeepEqual(result, tt.expected)) + }) + } +} diff --git a/utils/maps/maps.go b/utils/maps/maps.go index dff615f026..e6702b46fb 100644 --- a/utils/maps/maps.go +++ b/utils/maps/maps.go @@ -1,7 +1,7 @@ package maps import ( - "github.com/lavanet/lava/v3/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/lavaslices" "golang.org/x/exp/constraints" "golang.org/x/exp/maps" ) diff --git a/utils/protocopy/proto_copy.go b/utils/protocopy/proto_copy.go index 5abceb97fa..08c502d7db 100644 --- a/utils/protocopy/proto_copy.go +++ b/utils/protocopy/proto_copy.go @@ -1,7 +1,7 @@ package protocopy import ( - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type protoTypeOut interface { diff --git a/utils/protocopy/proto_copy_test.go b/utils/protocopy/proto_copy_test.go index 823f5b06c8..63712dc9d6 100644 --- a/utils/protocopy/proto_copy_test.go +++ b/utils/protocopy/proto_copy_test.go @@ -3,7 +3,7 @@ package protocopy import ( "testing" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/utils/sigs/sigs.go b/utils/sigs/sigs.go index cb737a5844..a50052502f 100644 --- a/utils/sigs/sigs.go +++ b/utils/sigs/sigs.go @@ -25,7 +25,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) type Account struct { diff --git a/x/conflict/client/cli/query.go b/x/conflict/client/cli/query.go index 2123cc991d..8ea94b196b 100644 --- a/x/conflict/client/cli/query.go +++ b/x/conflict/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/conflict/client/cli/query_conflict_vote.go b/x/conflict/client/cli/query_conflict_vote.go index 85bd0e3333..af4f644d7c 100644 --- a/x/conflict/client/cli/query_conflict_vote.go +++ b/x/conflict/client/cli/query_conflict_vote.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/spf13/cobra" ) diff --git a/x/conflict/client/cli/query_conflict_vote_test.go b/x/conflict/client/cli/query_conflict_vote_test.go index eadc1ff18e..217cf28bb2 100644 --- a/x/conflict/client/cli/query_conflict_vote_test.go +++ b/x/conflict/client/cli/query_conflict_vote_test.go @@ -12,10 +12,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/lavanet/lava/v3/testutil/network" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/conflict/client/cli" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/testutil/network" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/conflict/client/cli" + "github.com/lavanet/lava/v4/x/conflict/types" ) // Prevent strconv unused error diff --git a/x/conflict/client/cli/query_consumer_conflicts.go b/x/conflict/client/cli/query_consumer_conflicts.go index 17bcd5d166..b8d3703cc4 100644 --- a/x/conflict/client/cli/query_consumer_conflicts.go +++ b/x/conflict/client/cli/query_consumer_conflicts.go @@ -3,8 +3,8 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/spf13/cobra" ) diff --git a/x/conflict/client/cli/query_params.go b/x/conflict/client/cli/query_params.go index 54b61b4fd3..e4eb6cd315 100644 --- a/x/conflict/client/cli/query_params.go +++ b/x/conflict/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/spf13/cobra" ) diff --git a/x/conflict/client/cli/query_provider_conflicts.go b/x/conflict/client/cli/query_provider_conflicts.go index c299b9cd6a..a7749083af 100644 --- a/x/conflict/client/cli/query_provider_conflicts.go +++ b/x/conflict/client/cli/query_provider_conflicts.go @@ -3,8 +3,8 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/spf13/cobra" ) diff --git a/x/conflict/client/cli/tx.go b/x/conflict/client/cli/tx.go index cef4c40147..0d7db53465 100644 --- a/x/conflict/client/cli/tx.go +++ b/x/conflict/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/conflict/client/cli/tx_conflict_vote_commit.go b/x/conflict/client/cli/tx_conflict_vote_commit.go index f66a1feb40..da4ce50b51 100644 --- a/x/conflict/client/cli/tx_conflict_vote_commit.go +++ b/x/conflict/client/cli/tx_conflict_vote_commit.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/spf13/cobra" ) diff --git a/x/conflict/client/cli/tx_conflict_vote_reveal.go b/x/conflict/client/cli/tx_conflict_vote_reveal.go index e035d66dd6..6395d5a8ad 100644 --- a/x/conflict/client/cli/tx_conflict_vote_reveal.go +++ b/x/conflict/client/cli/tx_conflict_vote_reveal.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/spf13/cast" "github.com/spf13/cobra" ) diff --git a/x/conflict/client/cli/tx_detection.go b/x/conflict/client/cli/tx_detection.go index 12e60e8da2..e65a449f94 100644 --- a/x/conflict/client/cli/tx_detection.go +++ b/x/conflict/client/cli/tx_detection.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/spf13/cobra" ) diff --git a/x/conflict/genesis.go b/x/conflict/genesis.go index c50527a21f..cdfb45be35 100644 --- a/x/conflict/genesis.go +++ b/x/conflict/genesis.go @@ -2,8 +2,8 @@ package conflict import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/conflict/genesis_test.go b/x/conflict/genesis_test.go index ece34c0eef..80095f53d5 100644 --- a/x/conflict/genesis_test.go +++ b/x/conflict/genesis_test.go @@ -3,10 +3,10 @@ package conflict_test import ( "testing" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/conflict" - "github.com/lavanet/lava/v3/x/conflict/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/conflict" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/handler.go b/x/conflict/handler.go index 3ca99b0d85..f3043b67a9 100644 --- a/x/conflict/handler.go +++ b/x/conflict/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" ) // NewHandler ... diff --git a/x/conflict/keeper/conflict.go b/x/conflict/keeper/conflict.go index b1f5c19ae9..d6b6a36c62 100644 --- a/x/conflict/keeper/conflict.go +++ b/x/conflict/keeper/conflict.go @@ -6,13 +6,13 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/maps" - "github.com/lavanet/lava/v3/utils/sigs" - "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/maps" + "github.com/lavanet/lava/v4/utils/sigs" + "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) func (k Keeper) ValidateFinalizationConflict(ctx sdk.Context, conflictData *types.FinalizationConflict, clientAddr sdk.AccAddress) error { diff --git a/x/conflict/keeper/conflict_test.go b/x/conflict/keeper/conflict_test.go index adeaf26d63..4cf44e5518 100644 --- a/x/conflict/keeper/conflict_test.go +++ b/x/conflict/keeper/conflict_test.go @@ -4,9 +4,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/keeper/conflict_vote.go b/x/conflict/keeper/conflict_vote.go index 810c701b2a..903b5416f1 100644 --- a/x/conflict/keeper/conflict_vote.go +++ b/x/conflict/keeper/conflict_vote.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" ) // SetConflictVote set a specific conflictVote in the store from its index diff --git a/x/conflict/keeper/conflict_vote_test.go b/x/conflict/keeper/conflict_vote_test.go index f8458b6bb5..85a2c9809c 100644 --- a/x/conflict/keeper/conflict_vote_test.go +++ b/x/conflict/keeper/conflict_vote_test.go @@ -5,10 +5,10 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/keeper/grpc_query.go b/x/conflict/keeper/grpc_query.go index 504ce3baf0..f2c3b0c025 100644 --- a/x/conflict/keeper/grpc_query.go +++ b/x/conflict/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/conflict/keeper/grpc_query_conflict_vote.go b/x/conflict/keeper/grpc_query_conflict_vote.go index c798c27fff..567d4e7728 100644 --- a/x/conflict/keeper/grpc_query_conflict_vote.go +++ b/x/conflict/keeper/grpc_query_conflict_vote.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/conflict/keeper/grpc_query_conflict_vote_test.go b/x/conflict/keeper/grpc_query_conflict_vote_test.go index 9db99447fb..6ba799af4c 100644 --- a/x/conflict/keeper/grpc_query_conflict_vote_test.go +++ b/x/conflict/keeper/grpc_query_conflict_vote_test.go @@ -10,9 +10,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/conflict/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/conflict/types" ) // Prevent strconv unused error diff --git a/x/conflict/keeper/grpc_query_consumer_conflicts.go b/x/conflict/keeper/grpc_query_consumer_conflicts.go index 33c48909d3..3d87f93b90 100644 --- a/x/conflict/keeper/grpc_query_consumer_conflicts.go +++ b/x/conflict/keeper/grpc_query_consumer_conflicts.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/conflict/keeper/grpc_query_consumer_conflicts_test.go b/x/conflict/keeper/grpc_query_consumer_conflicts_test.go index 88717d200c..4767b28bf8 100644 --- a/x/conflict/keeper/grpc_query_consumer_conflicts_test.go +++ b/x/conflict/keeper/grpc_query_consumer_conflicts_test.go @@ -5,8 +5,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/keeper/grpc_query_params.go b/x/conflict/keeper/grpc_query_params.go index 248457fcbe..3e93809d26 100644 --- a/x/conflict/keeper/grpc_query_params.go +++ b/x/conflict/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/conflict/keeper/grpc_query_params_test.go b/x/conflict/keeper/grpc_query_params_test.go index 32e5742f40..68ab699adc 100644 --- a/x/conflict/keeper/grpc_query_params_test.go +++ b/x/conflict/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/keeper/grpc_query_provider_conflicts.go b/x/conflict/keeper/grpc_query_provider_conflicts.go index f011da5275..4bffb20ecf 100644 --- a/x/conflict/keeper/grpc_query_provider_conflicts.go +++ b/x/conflict/keeper/grpc_query_provider_conflicts.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/conflict/keeper/grpc_query_provider_conflicts_test.go b/x/conflict/keeper/grpc_query_provider_conflicts_test.go index fc43419fe2..db60ff297b 100644 --- a/x/conflict/keeper/grpc_query_provider_conflicts_test.go +++ b/x/conflict/keeper/grpc_query_provider_conflicts_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" ) // Prevent strconv unused error diff --git a/x/conflict/keeper/keeper.go b/x/conflict/keeper/keeper.go index 89094670f9..750d45e542 100644 --- a/x/conflict/keeper/keeper.go +++ b/x/conflict/keeper/keeper.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" ) type ( diff --git a/x/conflict/keeper/migrations.go b/x/conflict/keeper/migrations.go index 5aaf4934cb..62a037bd79 100644 --- a/x/conflict/keeper/migrations.go +++ b/x/conflict/keeper/migrations.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v5 "github.com/lavanet/lava/v3/x/conflict/migrations/v5" + v5 "github.com/lavanet/lava/v4/x/conflict/migrations/v5" ) type Migrator struct { diff --git a/x/conflict/keeper/msg_server.go b/x/conflict/keeper/msg_server.go index 8ac8dbe84f..8fe7ad9863 100644 --- a/x/conflict/keeper/msg_server.go +++ b/x/conflict/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" ) type msgServer struct { diff --git a/x/conflict/keeper/msg_server_conflict_vote_commit.go b/x/conflict/keeper/msg_server_conflict_vote_commit.go index 4c263230bf..73ec0b1f71 100644 --- a/x/conflict/keeper/msg_server_conflict_vote_commit.go +++ b/x/conflict/keeper/msg_server_conflict_vote_commit.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/conflict/types" ) func (k msgServer) ConflictVoteCommit(goCtx context.Context, msg *types.MsgConflictVoteCommit) (*types.MsgConflictVoteCommitResponse, error) { diff --git a/x/conflict/keeper/msg_server_conflict_vote_reveal.go b/x/conflict/keeper/msg_server_conflict_vote_reveal.go index a27bc4e12c..d6396bd7a1 100644 --- a/x/conflict/keeper/msg_server_conflict_vote_reveal.go +++ b/x/conflict/keeper/msg_server_conflict_vote_reveal.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + "github.com/lavanet/lava/v4/x/conflict/types" ) func (k msgServer) ConflictVoteReveal(goCtx context.Context, msg *types.MsgConflictVoteReveal) (*types.MsgConflictVoteRevealResponse, error) { diff --git a/x/conflict/keeper/msg_server_detection.go b/x/conflict/keeper/msg_server_detection.go index 5a2dbd3727..4429ee2fc8 100644 --- a/x/conflict/keeper/msg_server_detection.go +++ b/x/conflict/keeper/msg_server_detection.go @@ -8,9 +8,9 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/conflict/types" - pairingfilters "github.com/lavanet/lava/v3/x/pairing/keeper/filters" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/conflict/types" + pairingfilters "github.com/lavanet/lava/v4/x/pairing/keeper/filters" "golang.org/x/exp/slices" ) diff --git a/x/conflict/keeper/msg_server_detection_test.go b/x/conflict/keeper/msg_server_detection_test.go index a6709b1211..c2348d0271 100644 --- a/x/conflict/keeper/msg_server_detection_test.go +++ b/x/conflict/keeper/msg_server_detection_test.go @@ -5,15 +5,15 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - conflictconstruct "github.com/lavanet/lava/v3/x/conflict/types/construct" - "github.com/lavanet/lava/v3/x/pairing/types" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + conflictconstruct "github.com/lavanet/lava/v4/x/conflict/types/construct" + "github.com/lavanet/lava/v4/x/pairing/types" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/keeper/msg_server_test.go b/x/conflict/keeper/msg_server_test.go index 9b61dd7d83..3daa9219fb 100644 --- a/x/conflict/keeper/msg_server_test.go +++ b/x/conflict/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { diff --git a/x/conflict/keeper/params.go b/x/conflict/keeper/params.go index 07201b6dd6..4cec8831ee 100644 --- a/x/conflict/keeper/params.go +++ b/x/conflict/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" ) // GetParams get all parameters as types.Params diff --git a/x/conflict/keeper/params_test.go b/x/conflict/keeper/params_test.go index 1ca4277249..f37e879fc7 100644 --- a/x/conflict/keeper/params_test.go +++ b/x/conflict/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/keeper/vote.go b/x/conflict/keeper/vote.go index 24179f9429..528a0909fa 100644 --- a/x/conflict/keeper/vote.go +++ b/x/conflict/keeper/vote.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/conflict/types" "golang.org/x/exp/slices" ) diff --git a/x/conflict/keeper/vote_test.go b/x/conflict/keeper/vote_test.go index 4df3650f17..d83c7f99e9 100644 --- a/x/conflict/keeper/vote_test.go +++ b/x/conflict/keeper/vote_test.go @@ -3,12 +3,12 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/migrations/v5/migrations.go b/x/conflict/migrations/v5/migrations.go index d69d539f11..fcc5f87818 100644 --- a/x/conflict/migrations/v5/migrations.go +++ b/x/conflict/migrations/v5/migrations.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/x/conflict/module.go b/x/conflict/module.go index 06e533c5b0..c63e49ecd0 100644 --- a/x/conflict/module.go +++ b/x/conflict/module.go @@ -16,9 +16,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/conflict/client/cli" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/client/cli" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" ) var ( diff --git a/x/conflict/module_simulation.go b/x/conflict/module_simulation.go index 9cfed97f9a..43fea0d140 100644 --- a/x/conflict/module_simulation.go +++ b/x/conflict/module_simulation.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - conflictsimulation "github.com/lavanet/lava/v3/x/conflict/simulation" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/testutil/sample" + conflictsimulation "github.com/lavanet/lava/v4/x/conflict/simulation" + "github.com/lavanet/lava/v4/x/conflict/types" ) // avoid unused import issue diff --git a/x/conflict/simulation/conflict_vote_commit.go b/x/conflict/simulation/conflict_vote_commit.go index 4b32e498f0..e9bb19a51f 100644 --- a/x/conflict/simulation/conflict_vote_commit.go +++ b/x/conflict/simulation/conflict_vote_commit.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" ) func SimulateMsgConflictVoteCommit( diff --git a/x/conflict/simulation/conflict_vote_reveal.go b/x/conflict/simulation/conflict_vote_reveal.go index f7261a940d..f77bd6ce77 100644 --- a/x/conflict/simulation/conflict_vote_reveal.go +++ b/x/conflict/simulation/conflict_vote_reveal.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" ) func SimulateMsgConflictVoteReveal( diff --git a/x/conflict/simulation/detection.go b/x/conflict/simulation/detection.go index 1fc80120b9..6444cd204c 100644 --- a/x/conflict/simulation/detection.go +++ b/x/conflict/simulation/detection.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/conflict/keeper" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/keeper" + "github.com/lavanet/lava/v4/x/conflict/types" ) func SimulateMsgDetection( diff --git a/x/conflict/types/conflict_data.pb.go b/x/conflict/types/conflict_data.pb.go index e46d1c0f96..129bb39487 100644 --- a/x/conflict/types/conflict_data.pb.go +++ b/x/conflict/types/conflict_data.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/pairing/types" + types "github.com/lavanet/lava/v4/x/pairing/types" io "io" math "math" math_bits "math/bits" @@ -348,37 +348,37 @@ var fileDescriptor_db493e54bcd78171 = []byte{ // 521 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0x13, 0x31, 0x10, 0x8d, 0x93, 0x16, 0xa8, 0x9b, 0xaa, 0xa9, 0x95, 0x8a, 0xa8, 0x12, 0xab, 0xb2, 0xe2, 0xd0, - 0xaa, 0xd2, 0x6e, 0x43, 0x25, 0x0e, 0x88, 0x4b, 0x5b, 0x3e, 0x2a, 0x24, 0x2e, 0xe6, 0x82, 0x7a, - 0x59, 0x39, 0x1b, 0x67, 0x63, 0xe1, 0xae, 0x97, 0x1d, 0xa7, 0x22, 0xdc, 0xf8, 0x07, 0x48, 0xfc, - 0x27, 0xd4, 0x13, 0xea, 0x91, 0x23, 0x4a, 0xfe, 0x08, 0xb2, 0xbd, 0x09, 0xf9, 0x6a, 0x82, 0xc4, - 0x69, 0xc7, 0x33, 0xef, 0x3d, 0xcf, 0xce, 0x1b, 0x19, 0x1f, 0x4a, 0x76, 0xcd, 0x52, 0xae, 0x43, - 0xf3, 0x0d, 0x63, 0x95, 0x76, 0xa4, 0x88, 0xf5, 0x38, 0x88, 0xda, 0x4c, 0xb3, 0x20, 0xcb, 0x95, - 0x56, 0x64, 0xb7, 0x80, 0x06, 0xe6, 0x1b, 0x8c, 0x10, 0x7b, 0xf5, 0x44, 0x25, 0xca, 0x22, 0x42, - 0x13, 0x39, 0xf0, 0xde, 0xfe, 0x94, 0x6e, 0xc6, 0x44, 0x2e, 0xd2, 0x24, 0xcc, 0xb9, 0x64, 0x7d, - 0x87, 0xf0, 0x7f, 0x20, 0x5c, 0xa3, 0x1c, 0x32, 0x95, 0x02, 0x3f, 0x2f, 0xc4, 0xc8, 0x07, 0x4c, - 0x46, 0xc2, 0xd4, 0x60, 0x5f, 0x32, 0xcd, 0x8e, 0x1b, 0x68, 0x1f, 0x1d, 0x6c, 0x3e, 0x3d, 0x08, - 0x16, 0x36, 0x10, 0x9c, 0xcf, 0x12, 0xe8, 0x02, 0x8d, 0x85, 0xca, 0xcd, 0x46, 0xf9, 0xbf, 0x95, - 0x9b, 0xfe, 0x77, 0x84, 0x77, 0xe6, 0x90, 0xe4, 0x05, 0xbe, 0x9f, 0xf3, 0x4f, 0x3d, 0x0e, 0xba, - 0x68, 0xdf, 0x9f, 0xbe, 0xa4, 0x18, 0x49, 0x60, 0x19, 0xd4, 0x21, 0xe9, 0x88, 0x42, 0x9e, 0xe3, - 0xf5, 0x9c, 0x67, 0xb2, 0xdf, 0xa8, 0x58, 0xee, 0x93, 0x3b, 0x1a, 0xa4, 0x06, 0xf3, 0x8e, 0x6b, - 0x66, 0x6c, 0xa2, 0x8e, 0xf2, 0x76, 0xed, 0x41, 0xb9, 0x56, 0xf1, 0x6f, 0x10, 0xde, 0x9a, 0x2a, - 0x93, 0x23, 0x4c, 0xba, 0x0c, 0xba, 0x11, 0x93, 0xd2, 0xda, 0x1a, 0x99, 0x93, 0x6d, 0xae, 0x4a, - 0xb7, 0x4d, 0x7c, 0x2a, 0xa5, 0x69, 0xfd, 0x82, 0x41, 0x97, 0xd4, 0x70, 0x05, 0x44, 0x62, 0xe7, - 0x53, 0xa5, 0x26, 0x24, 0x8f, 0x71, 0x55, 0x32, 0xcd, 0x41, 0x47, 0x2d, 0xa9, 0xe2, 0x8f, 0xb6, - 0xb3, 0x0a, 0xdd, 0x74, 0xb9, 0x33, 0x93, 0x22, 0xcf, 0xf0, 0xc3, 0x8e, 0x48, 0x99, 0x14, 0x5f, - 0x78, 0xdb, 0xa1, 0xc0, 0x5e, 0xc2, 0xa1, 0xb1, 0x66, 0x85, 0x76, 0xc7, 0x65, 0x4b, 0x80, 0x0b, - 0x5b, 0x24, 0x8f, 0x30, 0x06, 0x91, 0x14, 0x8c, 0xc6, 0xba, 0x85, 0x6e, 0x80, 0x48, 0x1c, 0xc8, - 0xff, 0x89, 0x70, 0xfd, 0xb5, 0x23, 0x32, 0x2d, 0x54, 0x3a, 0xde, 0x96, 0x4b, 0x5c, 0xb7, 0x1b, - 0x15, 0x75, 0x26, 0xaa, 0xd1, 0xaa, 0x7d, 0xb1, 0x13, 0x9f, 0xd4, 0xa3, 0x24, 0x9f, 0x4d, 0x1d, - 0xdf, 0xa1, 0xbd, 0x6a, 0x63, 0xfe, 0x45, 0xbb, 0xe9, 0x7f, 0x2d, 0xe3, 0x9d, 0x39, 0xe4, 0xb2, - 0xe9, 0xa1, 0x65, 0xd3, 0x9b, 0x35, 0xa6, 0x3c, 0x6f, 0xcc, 0x21, 0xae, 0xc5, 0x2a, 0x85, 0xde, - 0x15, 0xcf, 0x23, 0xd6, 0x6e, 0xe7, 0x1c, 0xc0, 0xfa, 0xb7, 0x41, 0xb7, 0x47, 0xf9, 0x53, 0x97, - 0x26, 0x6f, 0xf0, 0x96, 0xfb, 0x6f, 0xe0, 0x00, 0x42, 0xa5, 0xd6, 0xb9, 0xe5, 0xdb, 0xfb, 0xde, - 0x21, 0x69, 0x35, 0x9f, 0x38, 0xad, 0x30, 0xf5, 0xec, 0xd5, 0xcd, 0xc0, 0x43, 0xb7, 0x03, 0x0f, - 0xfd, 0x1e, 0x78, 0xe8, 0xdb, 0xd0, 0x2b, 0xdd, 0x0e, 0xbd, 0xd2, 0xaf, 0xa1, 0x57, 0xba, 0x3c, - 0x4a, 0x84, 0xee, 0xf6, 0x5a, 0x41, 0xac, 0xae, 0xc2, 0xa9, 0x57, 0xe4, 0xfa, 0x24, 0xfc, 0xfc, - 0xf7, 0x89, 0xd2, 0xfd, 0x8c, 0x43, 0xeb, 0x9e, 0x7d, 0x4c, 0x4e, 0xfe, 0x04, 0x00, 0x00, 0xff, - 0xff, 0x98, 0xe0, 0xe0, 0xeb, 0xc8, 0x04, 0x00, 0x00, + 0xaa, 0xd2, 0x6e, 0x03, 0x88, 0x03, 0xe2, 0xd2, 0x96, 0x8f, 0x0a, 0x89, 0x8b, 0xb9, 0xa0, 0x5e, + 0x56, 0xce, 0xc6, 0xd9, 0x58, 0xb8, 0xeb, 0x65, 0xc7, 0xa9, 0x08, 0x37, 0xfe, 0x01, 0x12, 0xff, + 0x09, 0xf5, 0x84, 0x7a, 0xe4, 0x88, 0x92, 0x3f, 0x82, 0x6c, 0x6f, 0x42, 0xbe, 0x9a, 0x20, 0x71, + 0xda, 0xf1, 0xcc, 0x7b, 0xcf, 0xb3, 0xf3, 0x46, 0xc6, 0x87, 0x92, 0x5d, 0xb1, 0x94, 0xeb, 0xd0, + 0x7c, 0xc3, 0x58, 0xa5, 0x1d, 0x29, 0x62, 0x3d, 0x0e, 0xa2, 0x36, 0xd3, 0x2c, 0xc8, 0x72, 0xa5, + 0x15, 0xd9, 0x2d, 0xa0, 0x81, 0xf9, 0x06, 0x23, 0xc4, 0x5e, 0x3d, 0x51, 0x89, 0xb2, 0x88, 0xd0, + 0x44, 0x0e, 0xbc, 0xb7, 0x3f, 0xa5, 0x9b, 0x31, 0x91, 0x8b, 0x34, 0x09, 0x73, 0x2e, 0x59, 0xdf, + 0x21, 0xfc, 0x1f, 0x08, 0xd7, 0x28, 0x87, 0x4c, 0xa5, 0xc0, 0xcf, 0x0a, 0x31, 0xf2, 0x01, 0x93, + 0x91, 0x30, 0x35, 0xd8, 0x97, 0x4c, 0xb3, 0xe3, 0x06, 0xda, 0x47, 0x07, 0x9b, 0x8f, 0x0f, 0x82, + 0x85, 0x0d, 0x04, 0x67, 0xb3, 0x04, 0xba, 0x40, 0x63, 0xa1, 0x72, 0xb3, 0x51, 0xfe, 0x6f, 0xe5, + 0xa6, 0xff, 0x1d, 0xe1, 0x9d, 0x39, 0x24, 0x79, 0x81, 0xef, 0xe6, 0xfc, 0x53, 0x8f, 0x83, 0x2e, + 0xda, 0xf7, 0xa7, 0x2f, 0x29, 0x46, 0x12, 0x58, 0x06, 0x75, 0x48, 0x3a, 0xa2, 0x90, 0xe7, 0x78, + 0x3d, 0xe7, 0x99, 0xec, 0x37, 0x2a, 0x96, 0xfb, 0xe8, 0x96, 0x06, 0xa9, 0xc1, 0xbc, 0xe3, 0x9a, + 0x19, 0x9b, 0xa8, 0xa3, 0xbc, 0x5d, 0xbb, 0x57, 0xae, 0x55, 0xfc, 0x6b, 0x84, 0xb7, 0xa6, 0xca, + 0xe4, 0x08, 0x93, 0x2e, 0x83, 0x6e, 0xc4, 0xa4, 0xb4, 0xb6, 0x46, 0xe6, 0x64, 0x9b, 0xab, 0xd2, + 0x6d, 0x13, 0x9f, 0x48, 0x69, 0x5a, 0x3f, 0x67, 0xd0, 0x25, 0x35, 0x5c, 0x01, 0x91, 0xd8, 0xf9, + 0x54, 0xa9, 0x09, 0xc9, 0x43, 0x5c, 0x95, 0x4c, 0x73, 0xd0, 0x51, 0x4b, 0xaa, 0xf8, 0xa3, 0xed, + 0xac, 0x42, 0x37, 0x5d, 0xee, 0xd4, 0xa4, 0xc8, 0x33, 0x7c, 0xbf, 0x23, 0x52, 0x26, 0xc5, 0x17, + 0xde, 0x76, 0x28, 0xb0, 0x97, 0x70, 0x68, 0xac, 0x59, 0xa1, 0xdd, 0x71, 0xd9, 0x12, 0xe0, 0xdc, + 0x16, 0xc9, 0x03, 0x8c, 0x41, 0x24, 0x05, 0xa3, 0xb1, 0x6e, 0xa1, 0x1b, 0x20, 0x12, 0x07, 0xf2, + 0x7f, 0x22, 0x5c, 0x7f, 0xed, 0x88, 0x4c, 0x0b, 0x95, 0x8e, 0xb7, 0xe5, 0x02, 0xd7, 0xed, 0x46, + 0x45, 0x9d, 0x89, 0x6a, 0xb4, 0x6a, 0x5f, 0xec, 0xc4, 0x27, 0xf5, 0x28, 0xc9, 0x67, 0x53, 0xc7, + 0xb7, 0x68, 0xaf, 0xda, 0x98, 0x7f, 0xd1, 0x6e, 0xfa, 0x5f, 0xcb, 0x78, 0x67, 0x0e, 0xb9, 0x6c, + 0x7a, 0x68, 0xd9, 0xf4, 0x66, 0x8d, 0x29, 0xcf, 0x1b, 0x73, 0x88, 0x6b, 0xb1, 0x4a, 0xa1, 0x77, + 0xc9, 0xf3, 0x88, 0xb5, 0xdb, 0x39, 0x07, 0xb0, 0xfe, 0x6d, 0xd0, 0xed, 0x51, 0xfe, 0xc4, 0xa5, + 0xc9, 0x1b, 0xbc, 0xe5, 0xfe, 0x1b, 0x38, 0x80, 0x50, 0xa9, 0x75, 0x6e, 0xf9, 0xf6, 0xbe, 0x77, + 0x48, 0x5a, 0xcd, 0x27, 0x4e, 0x2b, 0x4c, 0x3d, 0x7d, 0x75, 0x3d, 0xf0, 0xd0, 0xcd, 0xc0, 0x43, + 0xbf, 0x07, 0x1e, 0xfa, 0x36, 0xf4, 0x4a, 0x37, 0x43, 0xaf, 0xf4, 0x6b, 0xe8, 0x95, 0x2e, 0x8e, + 0x12, 0xa1, 0xbb, 0xbd, 0x56, 0x10, 0xab, 0xcb, 0x70, 0xea, 0x15, 0xb9, 0x7a, 0x1a, 0x7e, 0xfe, + 0xfb, 0x44, 0xe9, 0x7e, 0xc6, 0xa1, 0x75, 0xc7, 0x3e, 0x26, 0x4f, 0xfe, 0x04, 0x00, 0x00, 0xff, + 0xff, 0xbe, 0x9b, 0x23, 0x33, 0xc8, 0x04, 0x00, 0x00, } func (m *ResponseConflict) Marshal() (dAtA []byte, err error) { diff --git a/x/conflict/types/conflict_vote.pb.go b/x/conflict/types/conflict_vote.pb.go index f103f79a79..ddd56f793b 100644 --- a/x/conflict/types/conflict_vote.pb.go +++ b/x/conflict/types/conflict_vote.pb.go @@ -281,33 +281,33 @@ var fileDescriptor_a96842d3d7b42db7 = []byte{ // 456 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x6e, 0x13, 0x31, 0x10, 0xcd, 0x36, 0x9b, 0x34, 0x99, 0xa4, 0x3d, 0x58, 0x05, 0x59, 0x05, 0x6d, 0x57, 0x11, 0x42, - 0x41, 0x48, 0xbb, 0x52, 0x7b, 0xe0, 0x0a, 0x21, 0x48, 0x20, 0x40, 0x42, 0x8b, 0xe0, 0xc0, 0x05, + 0x41, 0x48, 0xbb, 0x52, 0x41, 0xe2, 0x0a, 0x21, 0x48, 0x20, 0x40, 0x42, 0x8b, 0xe0, 0xc0, 0x05, 0xb9, 0xde, 0x69, 0x62, 0xb1, 0xd8, 0xc1, 0x76, 0xa2, 0x72, 0xe4, 0x0f, 0xf8, 0xac, 0x1e, 0x7b, 0xe4, 0x84, 0x50, 0xf2, 0x23, 0xc8, 0x5e, 0x27, 0x6d, 0x2a, 0x38, 0xf4, 0xe4, 0x79, 0xcf, 0x6f, - 0x9e, 0x67, 0xc6, 0x36, 0x3c, 0xaa, 0xd8, 0x82, 0x49, 0xb4, 0xb9, 0x5b, 0x73, 0xae, 0xe4, 0x59, - 0x25, 0xb8, 0xdd, 0x04, 0x9f, 0x17, 0xca, 0x62, 0x36, 0xd3, 0xca, 0x2a, 0x72, 0x27, 0x48, 0x33, + 0x9e, 0x67, 0xc6, 0x36, 0x3c, 0xa8, 0xd8, 0x82, 0x49, 0xb4, 0xb9, 0x5b, 0x73, 0xae, 0xe4, 0x69, + 0x25, 0xb8, 0xdd, 0x04, 0x9f, 0x17, 0xca, 0x62, 0x36, 0xd3, 0xca, 0x2a, 0x72, 0x2b, 0x48, 0x33, 0xb7, 0x66, 0x6b, 0xc5, 0xe1, 0xc1, 0x44, 0x4d, 0x94, 0x57, 0xe4, 0x2e, 0xaa, 0xc5, 0x83, 0xa7, 0xd0, 0x79, 0xa7, 0xd5, 0x42, 0x94, 0xa8, 0x09, 0x85, 0x5d, 0xc6, 0xb9, 0x9a, 0x4b, 0x4b, 0xa3, 0x34, 0x1a, 0x76, 0x8b, 0x35, 0x24, 0x87, 0xd0, 0xd1, 0x68, 0x66, 0x4a, 0x1a, 0xa4, 0x3b, 0x69, 0x34, 0xec, 0x17, 0x1b, 0x3c, 0x78, 0x03, 0xf1, 0x47, 0x65, 0xd1, 0x67, 0x97, 0xa5, 0x46, 0x63, - 0x36, 0xd9, 0x35, 0x24, 0x04, 0xe2, 0x97, 0xcc, 0x4c, 0x43, 0xa6, 0x8f, 0xc9, 0x5d, 0x68, 0x17, + 0x36, 0xd9, 0x35, 0x24, 0x04, 0xe2, 0x97, 0xcc, 0x4c, 0x43, 0xa6, 0x8f, 0xc9, 0x6d, 0x68, 0x17, 0x68, 0xe6, 0x95, 0xa5, 0xcd, 0x34, 0x1a, 0x36, 0x8b, 0x80, 0x06, 0x3f, 0x62, 0xe8, 0x3f, 0x0f, - 0x25, 0x7b, 0xdb, 0x03, 0x68, 0x09, 0x59, 0xe2, 0x79, 0x30, 0xad, 0x01, 0x79, 0x00, 0x7b, 0xbc, + 0x25, 0x7b, 0xdb, 0x03, 0x68, 0x09, 0x59, 0xe2, 0x59, 0x30, 0xad, 0x01, 0xb9, 0x07, 0x7b, 0xbc, 0x12, 0x28, 0xed, 0xb3, 0x70, 0xe4, 0x8e, 0xdf, 0xdd, 0x26, 0xc9, 0x00, 0xfa, 0x6e, 0x2e, 0x63, - 0x64, 0x65, 0x25, 0x24, 0xfa, 0xa3, 0xe2, 0x62, 0x8b, 0x23, 0x0f, 0x61, 0xdf, 0xe1, 0xf7, 0x96, - 0x69, 0x3b, 0xaa, 0x14, 0xff, 0x42, 0x63, 0xaf, 0xba, 0xc1, 0x92, 0xfb, 0xd0, 0x0d, 0x8c, 0x45, - 0xda, 0xf2, 0x35, 0x5f, 0x11, 0xae, 0x79, 0x3e, 0x65, 0x42, 0xbe, 0x1a, 0xd3, 0x76, 0xdd, 0x7c, + 0x64, 0x65, 0x25, 0x24, 0xfa, 0xa3, 0xe2, 0x62, 0x8b, 0x23, 0xf7, 0x61, 0xdf, 0xe1, 0xf7, 0x96, + 0x69, 0x3b, 0xaa, 0x14, 0xff, 0x42, 0x63, 0xaf, 0xba, 0xc6, 0x92, 0xbb, 0xd0, 0x0d, 0x8c, 0x45, + 0xda, 0xf2, 0x35, 0x5f, 0x12, 0xae, 0x79, 0x3e, 0x65, 0x42, 0xbe, 0x1a, 0xd3, 0x76, 0xdd, 0x7c, 0x80, 0xae, 0x51, 0x36, 0x13, 0x1f, 0x74, 0x45, 0x77, 0xfd, 0x46, 0x40, 0x24, 0x85, 0x9e, 0xc6, - 0x6f, 0x73, 0x34, 0x76, 0xcc, 0x2c, 0xa3, 0x1d, 0x3f, 0x9b, 0xeb, 0x94, 0xab, 0x3e, 0xc0, 0xba, - 0xae, 0x6e, 0x5d, 0xfd, 0x75, 0x8e, 0xbc, 0x86, 0xbd, 0x33, 0xa1, 0x8d, 0x5d, 0xdf, 0x21, 0x85, - 0x34, 0x1a, 0xf6, 0x8e, 0x8f, 0xb2, 0x7f, 0xbe, 0x81, 0x6c, 0x2d, 0x1b, 0xc5, 0x17, 0xbf, 0x8f, - 0x1a, 0xc5, 0x76, 0x2e, 0x79, 0x0b, 0xfb, 0x06, 0xb9, 0x92, 0xe5, 0xc6, 0xad, 0x77, 0x1b, 0xb7, - 0x1b, 0xc9, 0xe4, 0x09, 0xb4, 0xdc, 0x80, 0x0c, 0xed, 0xa7, 0xcd, 0x61, 0xef, 0xf8, 0xde, 0x7f, - 0x5c, 0xdc, 0x2d, 0x07, 0x87, 0x5a, 0x3f, 0x7a, 0x71, 0xb1, 0x4c, 0xa2, 0xcb, 0x65, 0x12, 0xfd, - 0x59, 0x26, 0xd1, 0xcf, 0x55, 0xd2, 0xb8, 0x5c, 0x25, 0x8d, 0x5f, 0xab, 0xa4, 0xf1, 0xe9, 0xf1, - 0x44, 0xd8, 0xe9, 0xfc, 0x34, 0xe3, 0xea, 0x6b, 0xbe, 0xf5, 0x21, 0x16, 0x27, 0xf9, 0xf9, 0xd5, - 0xaf, 0xb0, 0xdf, 0x67, 0x68, 0x4e, 0xdb, 0xfe, 0x85, 0x9f, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, - 0xad, 0x68, 0x22, 0xcf, 0x3b, 0x03, 0x00, 0x00, + 0x6f, 0x73, 0x34, 0x76, 0xcc, 0x2c, 0xa3, 0x1d, 0x3f, 0x9b, 0xab, 0x94, 0xab, 0x3e, 0xc0, 0xba, + 0xae, 0x6e, 0x5d, 0xfd, 0x55, 0x8e, 0xbc, 0x86, 0xbd, 0x53, 0xa1, 0x8d, 0x5d, 0xdf, 0x21, 0x85, + 0x34, 0x1a, 0xf6, 0x8e, 0x8f, 0xb2, 0x7f, 0xbe, 0x81, 0x6c, 0x2d, 0x1b, 0xc5, 0xe7, 0xbf, 0x8f, + 0x1a, 0xc5, 0x76, 0x2e, 0x79, 0x0b, 0xfb, 0x06, 0xb9, 0x92, 0xe5, 0xc6, 0xad, 0x77, 0x13, 0xb7, + 0x6b, 0xc9, 0xe4, 0x09, 0xb4, 0xdc, 0x80, 0x0c, 0xed, 0xa7, 0xcd, 0x61, 0xef, 0xf8, 0xce, 0x7f, + 0x5c, 0xdc, 0x2d, 0x07, 0x87, 0x5a, 0x3f, 0x7a, 0x71, 0xbe, 0x4c, 0xa2, 0x8b, 0x65, 0x12, 0xfd, + 0x59, 0x26, 0xd1, 0xcf, 0x55, 0xd2, 0xb8, 0x58, 0x25, 0x8d, 0x5f, 0xab, 0xa4, 0xf1, 0xe9, 0xe1, + 0x44, 0xd8, 0xe9, 0xfc, 0x24, 0xe3, 0xea, 0x6b, 0xbe, 0xf5, 0x21, 0x16, 0x8f, 0xf3, 0xb3, 0xcb, + 0x5f, 0x61, 0xbf, 0xcf, 0xd0, 0x9c, 0xb4, 0xfd, 0x0b, 0x7f, 0xf4, 0x37, 0x00, 0x00, 0xff, 0xff, + 0x8b, 0x13, 0xe1, 0x17, 0x3b, 0x03, 0x00, 0x00, } func (m *Provider) Marshal() (dAtA []byte, err error) { diff --git a/x/conflict/types/construct/types.go b/x/conflict/types/construct/types.go index 51d692cd72..2a04d84700 100644 --- a/x/conflict/types/construct/types.go +++ b/x/conflict/types/construct/types.go @@ -1,9 +1,9 @@ package construct import ( - "github.com/lavanet/lava/v3/utils/sigs" - "github.com/lavanet/lava/v3/x/conflict/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils/sigs" + "github.com/lavanet/lava/v4/x/conflict/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) func ConstructReplyMetadata(reply *pairingtypes.RelayReply, req *pairingtypes.RelayRequest) *types.ReplyMetadata { diff --git a/x/conflict/types/expected_keepers.go b/x/conflict/types/expected_keepers.go index 2750df0032..7190ebc54c 100644 --- a/x/conflict/types/expected_keepers.go +++ b/x/conflict/types/expected_keepers.go @@ -3,9 +3,9 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type PairingKeeper interface { diff --git a/x/conflict/types/genesis.pb.go b/x/conflict/types/genesis.pb.go index 84c71a8849..76b85d786b 100644 --- a/x/conflict/types/genesis.pb.go +++ b/x/conflict/types/genesis.pb.go @@ -99,8 +99,8 @@ var fileDescriptor_71a0ca73fa4559da = []byte{ 0xe3, 0x8c, 0xa4, 0x1c, 0x6a, 0x18, 0x86, 0x11, 0x4e, 0xae, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9d, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, - 0x8f, 0xe2, 0xe9, 0x32, 0x63, 0xfd, 0x0a, 0x84, 0xcf, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, - 0xc0, 0x5e, 0x36, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x70, 0x1d, 0x92, 0x22, 0x95, 0x01, 0x00, + 0x8f, 0xe2, 0xe9, 0x32, 0x13, 0xfd, 0x0a, 0x84, 0xcf, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, + 0xc0, 0x5e, 0x36, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x56, 0x66, 0x51, 0xfa, 0x95, 0x01, 0x00, 0x00, } diff --git a/x/conflict/types/genesis_test.go b/x/conflict/types/genesis_test.go index a2fbdaaebd..4c76d6900a 100644 --- a/x/conflict/types/genesis_test.go +++ b/x/conflict/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/conflict/types" + "github.com/lavanet/lava/v4/x/conflict/types" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/types/message_conflict_vote_commit_test.go b/x/conflict/types/message_conflict_vote_commit_test.go index d145a9c99f..c122a58275 100644 --- a/x/conflict/types/message_conflict_vote_commit_test.go +++ b/x/conflict/types/message_conflict_vote_commit_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/types/message_conflict_vote_reveal_test.go b/x/conflict/types/message_conflict_vote_reveal_test.go index fc4dd97f6d..b5e0b7f39e 100644 --- a/x/conflict/types/message_conflict_vote_reveal_test.go +++ b/x/conflict/types/message_conflict_vote_reveal_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/types/message_detection_test.go b/x/conflict/types/message_detection_test.go index 8e364117bf..b35d5809f0 100644 --- a/x/conflict/types/message_detection_test.go +++ b/x/conflict/types/message_detection_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/conflict/types/params.pb.go b/x/conflict/types/params.pb.go index 848ac29daa..141808cbf3 100644 --- a/x/conflict/types/params.pb.go +++ b/x/conflict/types/params.pb.go @@ -157,8 +157,8 @@ var fileDescriptor_a921a7b735ec6ed8 = []byte{ 0x16, 0xab, 0xc0, 0x4e, 0x00, 0x05, 0x73, 0x51, 0x31, 0xaa, 0x13, 0x98, 0x29, 0x73, 0x02, 0xc4, 0x48, 0x4c, 0x27, 0x60, 0xb1, 0xca, 0xc9, 0xf5, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, - 0x18, 0xa2, 0xb4, 0x91, 0xac, 0x45, 0xc9, 0x16, 0x65, 0xc6, 0xfa, 0x15, 0x88, 0xbc, 0x01, 0xb6, - 0x3f, 0x89, 0x0d, 0x9c, 0xdc, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x58, 0x87, 0x3a, + 0x18, 0xa2, 0xb4, 0x91, 0xac, 0x45, 0xc9, 0x16, 0x65, 0x26, 0xfa, 0x15, 0x88, 0xbc, 0x01, 0xb6, + 0x3f, 0x89, 0x0d, 0x9c, 0xdc, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x23, 0x44, 0xe2, 0x41, 0x03, 0x00, 0x00, } diff --git a/x/conflict/types/query.pb.go b/x/conflict/types/query.pb.go index e19022e44b..e3392bfeb3 100644 --- a/x/conflict/types/query.pb.go +++ b/x/conflict/types/query.pb.go @@ -546,9 +546,9 @@ var fileDescriptor_1179eb365bacd460 = []byte{ 0x3c, 0xd0, 0xf2, 0x02, 0x8a, 0x86, 0x41, 0x79, 0x01, 0x85, 0x53, 0xe0, 0xd2, 0x02, 0xd2, 0x81, 0x92, 0x2d, 0x20, 0xb5, 0xf5, 0xf6, 0x9e, 0x9d, 0xf7, 0x35, 0xe5, 0xa2, 0xaf, 0x29, 0xbf, 0xfa, 0x9a, 0xf2, 0x71, 0xa0, 0x55, 0x2e, 0x06, 0x5a, 0xe5, 0xc7, 0x40, 0xab, 0xbc, 0x7e, 0xe8, 0xb8, - 0xfc, 0x6d, 0xa7, 0x65, 0xd8, 0xcc, 0x1f, 0x8f, 0xdc, 0x6d, 0x90, 0x93, 0x51, 0x78, 0x7e, 0x1a, - 0xd2, 0xb8, 0x55, 0x15, 0x7f, 0x8f, 0x8d, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x30, 0xba, - 0xc9, 0x09, 0x08, 0x00, 0x00, + 0xfc, 0x6d, 0xa7, 0x65, 0xd8, 0xcc, 0x1f, 0x8f, 0xdc, 0x6d, 0x92, 0x93, 0x51, 0x78, 0x7e, 0x1a, + 0xd2, 0xb8, 0x55, 0x15, 0x7f, 0x8f, 0x8d, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x4b, 0x79, + 0x11, 0x09, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/conflict/types/relay_finalization.go b/x/conflict/types/relay_finalization.go index 66e75df0f1..b5e9f896e4 100644 --- a/x/conflict/types/relay_finalization.go +++ b/x/conflict/types/relay_finalization.go @@ -6,9 +6,9 @@ import ( tendermintcrypto "github.com/cometbft/cometbft/crypto" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) func NewRelayFinalizationFromReplyMetadataAndRelayRequest(reply ReplyMetadata, req pairingtypes.RelayRequest, consumerAddr sdk.AccAddress) RelayFinalization { diff --git a/x/conflict/types/tx.pb.go b/x/conflict/types/tx.pb.go index 772b6a8a61..b2f90f875e 100644 --- a/x/conflict/types/tx.pb.go +++ b/x/conflict/types/tx.pb.go @@ -375,7 +375,7 @@ var fileDescriptor_8d098f1e58e895a1 = []byte{ // 502 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbf, 0x6f, 0xd3, 0x40, 0x14, 0x8e, 0x63, 0x37, 0xa4, 0x47, 0x87, 0xf4, 0x94, 0x14, 0x2b, 0x08, 0x13, 0x85, 0x81, 0x40, - 0x90, 0x4f, 0x6d, 0x99, 0x3a, 0xb6, 0x05, 0x41, 0xa4, 0x2c, 0x1e, 0x3a, 0x20, 0xa1, 0xea, 0x6c, + 0x90, 0x4f, 0x2d, 0x9d, 0x3a, 0xb6, 0x05, 0x41, 0xa4, 0x2c, 0x1e, 0x3a, 0x20, 0xa1, 0xea, 0x6c, 0x2e, 0x8e, 0xa5, 0xf8, 0x5e, 0xe4, 0x3b, 0xac, 0xc0, 0xc2, 0xce, 0xc4, 0xc2, 0xc4, 0x3f, 0xc1, 0x9f, 0xc1, 0xd8, 0xb1, 0x23, 0x4a, 0x06, 0xfe, 0x0d, 0xe4, 0x1f, 0xe7, 0xba, 0xc4, 0x41, 0x81, 0x25, 0xf7, 0xee, 0xbd, 0x2f, 0xdf, 0xf7, 0xdd, 0x7b, 0xd6, 0x43, 0xd6, 0x8c, 0xc6, 0x94, 0x33, @@ -399,12 +399,12 @@ var fileDescriptor_8d098f1e58e895a1 = []byte{ 0x58, 0xea, 0x51, 0x77, 0xb2, 0x4b, 0x61, 0xdc, 0xd8, 0xce, 0x78, 0xa6, 0x5e, 0x61, 0x3c, 0x2b, 0x28, 0xe3, 0x47, 0xd7, 0x75, 0xa4, 0x8f, 0x85, 0x8f, 0xdf, 0xa2, 0xdd, 0x9b, 0x8f, 0xf2, 0xd1, 0x86, 0xd9, 0x97, 0x87, 0xd3, 0x1d, 0x6e, 0x01, 0x52, 0x32, 0x78, 0x81, 0x70, 0xc5, 0xf8, 0x9e, - 0x6d, 0xa6, 0x58, 0x47, 0x77, 0x9f, 0xff, 0x0b, 0x7a, 0x93, 0x72, 0x3e, 0x95, 0x2d, 0x95, 0x33, - 0xf4, 0xb6, 0xca, 0xb7, 0x5b, 0x7b, 0xfa, 0xe2, 0xc7, 0xd2, 0xd2, 0xae, 0x96, 0x96, 0xf6, 0x73, - 0x69, 0x69, 0x5f, 0x56, 0x56, 0xed, 0x6a, 0x65, 0xd5, 0xae, 0x57, 0x56, 0xed, 0xcd, 0xd0, 0x0f, - 0xe4, 0xf4, 0xbd, 0x6b, 0x7b, 0x10, 0x92, 0x5b, 0xbb, 0x23, 0x3e, 0x26, 0x8b, 0xd2, 0x02, 0xfb, - 0x30, 0x67, 0xc2, 0x6d, 0xa4, 0x9b, 0xe3, 0xf8, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6b, 0xcb, - 0x3e, 0xa1, 0xe6, 0x04, 0x00, 0x00, + 0x6d, 0xa6, 0x58, 0x47, 0x77, 0x8f, 0xff, 0x05, 0xbd, 0x49, 0x39, 0x9f, 0xca, 0x96, 0xca, 0x19, + 0x7a, 0x5b, 0xe5, 0xdb, 0xad, 0x3d, 0x7d, 0xf1, 0x63, 0x69, 0x69, 0x57, 0x4b, 0x4b, 0xfb, 0xb9, + 0xb4, 0xb4, 0x2f, 0x2b, 0xab, 0x76, 0xb5, 0xb2, 0x6a, 0xd7, 0x2b, 0xab, 0xf6, 0x66, 0xe8, 0x07, + 0x72, 0xfa, 0xde, 0xb5, 0x3d, 0x08, 0xc9, 0xad, 0xdd, 0x11, 0x1f, 0x93, 0x45, 0x69, 0x81, 0x7d, + 0x98, 0x33, 0xe1, 0x36, 0xd2, 0xcd, 0xf1, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0xb0, + 0xfd, 0x79, 0xe6, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/conflict/types/types.go b/x/conflict/types/types.go index f6719d9409..8080a019ff 100644 --- a/x/conflict/types/types.go +++ b/x/conflict/types/types.go @@ -2,7 +2,7 @@ package types import ( tendermintcrypto "github.com/cometbft/cometbft/crypto" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils/sigs" ) const ( diff --git a/x/downtime/client/cli/query.go b/x/downtime/client/cli/query.go index 15f51a2052..5a2bf388a6 100644 --- a/x/downtime/client/cli/query.go +++ b/x/downtime/client/cli/query.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/downtime/types" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" + "github.com/lavanet/lava/v4/x/downtime/types" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" "github.com/spf13/cobra" ) diff --git a/x/downtime/client/cli/tx.go b/x/downtime/client/cli/tx.go index 2a6f528b56..eb0a3a9d27 100644 --- a/x/downtime/client/cli/tx.go +++ b/x/downtime/client/cli/tx.go @@ -3,7 +3,7 @@ package cli import ( "fmt" - "github.com/lavanet/lava/v3/x/downtime/types" + "github.com/lavanet/lava/v4/x/downtime/types" "github.com/spf13/cobra" ) diff --git a/x/downtime/keeper/keeper.go b/x/downtime/keeper/keeper.go index 0682225953..096953e034 100644 --- a/x/downtime/keeper/keeper.go +++ b/x/downtime/keeper/keeper.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" gogowellknown "github.com/gogo/protobuf/types" - "github.com/lavanet/lava/v3/x/downtime/types" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" + "github.com/lavanet/lava/v4/x/downtime/types" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" ) type EpochStorageKeeper interface { diff --git a/x/downtime/keeper/keeper_test.go b/x/downtime/keeper/keeper_test.go index 90e649c447..c44472e8e0 100644 --- a/x/downtime/keeper/keeper_test.go +++ b/x/downtime/keeper/keeper_test.go @@ -5,9 +5,9 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/app" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/app" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/downtime/keeper/query_server.go b/x/downtime/keeper/query_server.go index e13616ae63..a7d7752082 100644 --- a/x/downtime/keeper/query_server.go +++ b/x/downtime/keeper/query_server.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" ) var _ v1.QueryServer = queryServer{} diff --git a/x/downtime/keeper/query_server_test.go b/x/downtime/keeper/query_server_test.go index 0f307451b9..f137dc2fb0 100644 --- a/x/downtime/keeper/query_server_test.go +++ b/x/downtime/keeper/query_server_test.go @@ -6,10 +6,10 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/app" - "github.com/lavanet/lava/v3/x/downtime/keeper" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/app" + "github.com/lavanet/lava/v4/x/downtime/keeper" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/downtime/module.go b/x/downtime/module.go index 847b258dd4..67657f655b 100644 --- a/x/downtime/module.go +++ b/x/downtime/module.go @@ -11,10 +11,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/lavanet/lava/v3/x/downtime/client/cli" - "github.com/lavanet/lava/v3/x/downtime/keeper" - "github.com/lavanet/lava/v3/x/downtime/types" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" + "github.com/lavanet/lava/v4/x/downtime/client/cli" + "github.com/lavanet/lava/v4/x/downtime/keeper" + "github.com/lavanet/lava/v4/x/downtime/types" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" "github.com/spf13/cobra" ) diff --git a/x/downtime/v1/downtime.pb.go b/x/downtime/v1/downtime.pb.go index fcc5cf9ef4..dcda87cc00 100644 --- a/x/downtime/v1/downtime.pb.go +++ b/x/downtime/v1/downtime.pb.go @@ -166,8 +166,8 @@ var fileDescriptor_17cbf2f7c6c4bd94 = []byte{ 0x67, 0x83, 0x5d, 0xc7, 0x12, 0x04, 0xe1, 0x08, 0xd9, 0x73, 0x71, 0x90, 0x63, 0x0f, 0x5c, 0x93, 0x93, 0xd3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x69, 0xa4, 0x67, 0x96, - 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa3, 0x44, 0x65, 0x99, 0xb1, 0x7e, 0x05, 0x72, - 0x7c, 0x26, 0xb1, 0x81, 0xad, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xce, 0xe5, 0xb7, 0x07, + 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa3, 0x44, 0x65, 0x99, 0x89, 0x7e, 0x05, 0x72, + 0x7c, 0x26, 0xb1, 0x81, 0xad, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x60, 0x7d, 0x0e, 0x71, 0xf2, 0x01, 0x00, 0x00, } diff --git a/x/downtime/v1/genesis.pb.go b/x/downtime/v1/genesis.pb.go index 58347bc009..169702c4ce 100644 --- a/x/downtime/v1/genesis.pb.go +++ b/x/downtime/v1/genesis.pb.go @@ -118,8 +118,8 @@ var fileDescriptor_6fd11efb3f8802bf = []byte{ 0x48, 0x2f, 0x48, 0xd6, 0xc9, 0xe9, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x34, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x51, 0x42, 0xb9, 0xcc, - 0x58, 0xbf, 0x02, 0x39, 0xa8, 0x93, 0xd8, 0xc0, 0x16, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x78, 0x60, 0x60, 0xda, 0xcf, 0x01, 0x00, 0x00, + 0x44, 0xbf, 0x02, 0x39, 0xa8, 0x93, 0xd8, 0xc0, 0x16, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, + 0xd6, 0xf8, 0xd9, 0xac, 0xcf, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/downtime/v1/query.pb.go b/x/downtime/v1/query.pb.go index c79bf4074c..f54cfb7e20 100644 --- a/x/downtime/v1/query.pb.go +++ b/x/downtime/v1/query.pb.go @@ -215,34 +215,34 @@ func init() { } var fileDescriptor_b667ee25520f3a08 = []byte{ - // 423 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x0b, 0xd3, 0x30, - 0x18, 0x86, 0x9b, 0xa1, 0x43, 0x32, 0x44, 0x8c, 0x13, 0x66, 0x19, 0x5d, 0x29, 0x82, 0x65, 0x68, - 0xe2, 0xb6, 0x8b, 0xe7, 0xb2, 0xbb, 0x3a, 0x6f, 0x5e, 0x4a, 0xda, 0xc5, 0xae, 0xd8, 0x36, 0x5d, - 0x9b, 0x56, 0xbd, 0x78, 0xf0, 0x17, 0x08, 0x7a, 0xf0, 0xec, 0x5f, 0xf1, 0xb2, 0xe3, 0xc0, 0x8b, - 0x27, 0x95, 0xcd, 0x1f, 0x22, 0x4d, 0xd3, 0xb9, 0x4d, 0xaa, 0x3b, 0x25, 0xbc, 0x79, 0xf3, 0x7c, - 0xef, 0xd7, 0x2f, 0x85, 0x77, 0x23, 0x5a, 0xd2, 0x84, 0x09, 0x52, 0xad, 0x64, 0xc9, 0x5f, 0x25, - 0x22, 0x8c, 0x19, 0x29, 0x27, 0x64, 0x5d, 0xb0, 0xec, 0x0d, 0x4e, 0x33, 0x2e, 0x38, 0x1a, 0x28, - 0x17, 0xae, 0x56, 0xdc, 0xb8, 0x70, 0x39, 0xd1, 0x8d, 0x80, 0xf3, 0x20, 0x62, 0x44, 0xfa, 0xbc, - 0xe2, 0x05, 0x59, 0x16, 0x19, 0x15, 0x21, 0x4f, 0xea, 0x9b, 0xfa, 0xbd, 0x56, 0xfe, 0x81, 0x52, - 0x1b, 0xfb, 0x01, 0x0f, 0xb8, 0xdc, 0x92, 0x6a, 0xa7, 0xd4, 0xa1, 0xc2, 0xd3, 0x34, 0x24, 0x34, - 0x49, 0xb8, 0x90, 0xec, 0xbc, 0x3e, 0xb5, 0x1c, 0xd8, 0x7f, 0x5a, 0xa5, 0x9c, 0x2b, 0xd4, 0x82, - 0xad, 0x0b, 0x96, 0x0b, 0x34, 0x86, 0x37, 0x59, 0xca, 0xfd, 0x95, 0x9b, 0x0b, 0x9a, 0x09, 0xd7, - 0x8b, 0xb8, 0xff, 0x72, 0x00, 0x4c, 0x60, 0x5f, 0x59, 0xdc, 0x90, 0x07, 0xcf, 0x2a, 0xdd, 0xa9, - 0x64, 0xeb, 0x2d, 0xbc, 0x7d, 0xc6, 0xc8, 0x53, 0x9e, 0xe4, 0x0c, 0x31, 0x38, 0xf4, 0x8b, 0xb8, - 0x88, 0xa8, 0x08, 0x4b, 0xe6, 0x36, 0x69, 0xdd, 0xa6, 0xbf, 0x41, 0xc7, 0x04, 0x76, 0x6f, 0x7a, - 0x07, 0xd7, 0x09, 0x71, 0xf3, 0x01, 0xf0, 0x5c, 0x19, 0x9c, 0x6b, 0x9b, 0xef, 0x23, 0xed, 0xd3, - 0x8f, 0x11, 0x58, 0xe8, 0x7f, 0x40, 0x4d, 0x99, 0xc6, 0x65, 0xf5, 0x21, 0x92, 0xf5, 0x9f, 0xd0, - 0x8c, 0xc6, 0xb9, 0xea, 0xc0, 0x7a, 0x0c, 0x6f, 0x9d, 0xa8, 0x2a, 0xd3, 0x23, 0xd8, 0x4d, 0xa5, - 0x22, 0xbb, 0xe9, 0x4d, 0x4d, 0xdc, 0x36, 0x18, 0xac, 0x6e, 0x2a, 0xff, 0xf4, 0x4b, 0x07, 0x5e, - 0x95, 0x44, 0xf4, 0x11, 0xc0, 0xde, 0x11, 0x1b, 0xdd, 0x6f, 0x67, 0xfc, 0x1d, 0x4c, 0x7f, 0x70, - 0xa1, 0xbb, 0x0e, 0x6c, 0xd9, 0xef, 0xbe, 0xfe, 0xfa, 0xd0, 0xb1, 0x90, 0x49, 0x5a, 0xdf, 0x41, - 0x1d, 0x10, 0x7d, 0x06, 0xf0, 0xfa, 0xc9, 0x20, 0x10, 0xfe, 0x4f, 0xa9, 0xb3, 0xa9, 0xeb, 0xe4, - 0x62, 0xbf, 0x0a, 0xf7, 0x50, 0x86, 0x1b, 0x23, 0x9b, 0xfc, 0xfb, 0x27, 0x38, 0x0c, 0xdf, 0x71, - 0x36, 0x3b, 0x03, 0x6c, 0x77, 0x06, 0xf8, 0xb9, 0x33, 0xc0, 0xfb, 0xbd, 0xa1, 0x6d, 0xf7, 0x86, - 0xf6, 0x6d, 0x6f, 0x68, 0xcf, 0xed, 0x20, 0x14, 0xab, 0xc2, 0xc3, 0x3e, 0x8f, 0x4f, 0x69, 0xe5, - 0x8c, 0xbc, 0x3e, 0x46, 0x7a, 0x5d, 0xf9, 0x52, 0x66, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x41, - 0xba, 0xc6, 0x24, 0x7a, 0x03, 0x00, 0x00, + // 425 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0xeb, 0xd3, 0x30, + 0x18, 0xc6, 0x9b, 0xa1, 0x43, 0x32, 0x44, 0x8c, 0x13, 0x66, 0x19, 0x5d, 0x29, 0x82, 0x65, 0x68, + 0xe2, 0xa6, 0x07, 0xcf, 0x65, 0x77, 0x75, 0xde, 0xbc, 0x94, 0xb4, 0x8b, 0x5d, 0xb1, 0x6d, 0xba, + 0x36, 0xad, 0x7a, 0xf1, 0xe0, 0x27, 0x10, 0xf4, 0xe0, 0xd9, 0xaf, 0xe2, 0x65, 0xc7, 0x81, 0x17, + 0x4f, 0x2a, 0x9b, 0x1f, 0x44, 0x9a, 0xa6, 0x73, 0x9b, 0xf4, 0xff, 0xdf, 0x29, 0xe1, 0xc9, 0x93, + 0xdf, 0xfb, 0xbc, 0x7d, 0x53, 0x78, 0x37, 0xa2, 0x25, 0x4d, 0x98, 0x20, 0xd5, 0x4a, 0x16, 0xfc, + 0x4d, 0x22, 0xc2, 0x98, 0x91, 0x72, 0x42, 0x56, 0x05, 0xcb, 0xde, 0xe1, 0x34, 0xe3, 0x82, 0xa3, + 0x81, 0x72, 0xe1, 0x6a, 0xc5, 0x8d, 0x0b, 0x97, 0x13, 0xdd, 0x08, 0x38, 0x0f, 0x22, 0x46, 0xa4, + 0xcf, 0x2b, 0x5e, 0x91, 0x45, 0x91, 0x51, 0x11, 0xf2, 0xa4, 0xbe, 0xa9, 0xdf, 0x6b, 0xe5, 0xef, + 0x29, 0xb5, 0xb1, 0x1f, 0xf0, 0x80, 0xcb, 0x2d, 0xa9, 0x76, 0x4a, 0x1d, 0x2a, 0x3c, 0x4d, 0x43, + 0x42, 0x93, 0x84, 0x0b, 0xc9, 0xce, 0xeb, 0x53, 0xcb, 0x81, 0xfd, 0xe7, 0x55, 0xca, 0x99, 0x42, + 0xcd, 0xd9, 0xaa, 0x60, 0xb9, 0x40, 0x63, 0x78, 0x93, 0xa5, 0xdc, 0x5f, 0xba, 0xb9, 0xa0, 0x99, + 0x70, 0xbd, 0x88, 0xfb, 0xaf, 0x07, 0xc0, 0x04, 0xf6, 0x95, 0xf9, 0x0d, 0x79, 0xf0, 0xa2, 0xd2, + 0x9d, 0x4a, 0xb6, 0xde, 0xc3, 0xdb, 0x27, 0x8c, 0x3c, 0xe5, 0x49, 0xce, 0x10, 0x83, 0x43, 0xbf, + 0x88, 0x8b, 0x88, 0x8a, 0xb0, 0x64, 0x6e, 0x93, 0xd6, 0x6d, 0xfa, 0x1b, 0x74, 0x4c, 0x60, 0xf7, + 0xa6, 0x77, 0x70, 0x9d, 0x10, 0x37, 0x1f, 0x00, 0xcf, 0x94, 0xc1, 0xb9, 0xb6, 0xfe, 0x39, 0xd2, + 0xbe, 0xfc, 0x1a, 0x81, 0xb9, 0xfe, 0x0f, 0xd4, 0x94, 0x69, 0x5c, 0x56, 0x1f, 0x22, 0x59, 0xff, + 0x19, 0xcd, 0x68, 0x9c, 0xab, 0x0e, 0xac, 0xa7, 0xf0, 0xd6, 0x91, 0xaa, 0x32, 0x3d, 0x81, 0xdd, + 0x54, 0x2a, 0xb2, 0x9b, 0xde, 0xd4, 0xc4, 0x6d, 0x83, 0xc1, 0xea, 0xa6, 0xf2, 0x4f, 0xbf, 0x75, + 0xe0, 0x55, 0x49, 0x44, 0x9f, 0x01, 0xec, 0x1d, 0xb0, 0xd1, 0xfd, 0x76, 0xc6, 0xff, 0xc1, 0xf4, + 0x07, 0x67, 0xba, 0xeb, 0xc0, 0x96, 0xfd, 0xe1, 0xfb, 0x9f, 0x4f, 0x1d, 0x0b, 0x99, 0xa4, 0xf5, + 0x1d, 0xd4, 0x01, 0xd1, 0x57, 0x00, 0xaf, 0x1f, 0x0d, 0x02, 0xe1, 0x4b, 0x4a, 0x9d, 0x4c, 0x5d, + 0x27, 0x67, 0xfb, 0x55, 0xb8, 0x87, 0x32, 0xdc, 0x18, 0xd9, 0xe4, 0xe2, 0x9f, 0x60, 0x3f, 0x7c, + 0xc7, 0x59, 0x6f, 0x0d, 0xb0, 0xd9, 0x1a, 0xe0, 0xf7, 0xd6, 0x00, 0x1f, 0x77, 0x86, 0xb6, 0xd9, + 0x19, 0xda, 0x8f, 0x9d, 0xa1, 0xbd, 0xb4, 0x83, 0x50, 0x2c, 0x0b, 0x0f, 0xfb, 0x3c, 0x3e, 0xa6, + 0x95, 0x8f, 0xc9, 0xdb, 0x43, 0xa4, 0xd7, 0x95, 0x2f, 0xe5, 0xd1, 0xdf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xef, 0x22, 0x7f, 0x52, 0x7a, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dualstaking/ante/disable_redelegation_hooks.go b/x/dualstaking/ante/disable_redelegation_hooks.go index b1e51d1cab..a2be62c0fa 100644 --- a/x/dualstaking/ante/disable_redelegation_hooks.go +++ b/x/dualstaking/ante/disable_redelegation_hooks.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" ) // RedelegationFlager sets the dualstaking redelegation flag when needed. diff --git a/x/dualstaking/ante/disable_redelegation_hooks_test.go b/x/dualstaking/ante/disable_redelegation_hooks_test.go index b13da36bf2..dee3f2f0f2 100644 --- a/x/dualstaking/ante/disable_redelegation_hooks_test.go +++ b/x/dualstaking/ante/disable_redelegation_hooks_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/testutil/common" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/x/dualstaking/ante" + "github.com/lavanet/lava/v4/testutil/common" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/x/dualstaking/ante" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/client/cli/query.go b/x/dualstaking/client/cli/query.go index c6db834104..78ff0ee07f 100644 --- a/x/dualstaking/client/cli/query.go +++ b/x/dualstaking/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/dualstaking/client/cli/query_delegator_providers.go b/x/dualstaking/client/cli/query_delegator_providers.go index 07a1e57411..5ed187d113 100644 --- a/x/dualstaking/client/cli/query_delegator_providers.go +++ b/x/dualstaking/client/cli/query_delegator_providers.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) const WithPendingDelegatorsFlagName = "with-pending" diff --git a/x/dualstaking/client/cli/query_delegator_rewards.go b/x/dualstaking/client/cli/query_delegator_rewards.go index 333418596b..461ecbb684 100644 --- a/x/dualstaking/client/cli/query_delegator_rewards.go +++ b/x/dualstaking/client/cli/query_delegator_rewards.go @@ -7,23 +7,22 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) const ( providerFlagName = "provider" - chainIDFlagName = "chain-id" ) func CmdQueryDelegatorRewards() *cobra.Command { cmd := &cobra.Command{ Use: "delegator-rewards [delegator]", Short: `shows all the rewards that can be claimed for a specific delegator. - Can be more specific using the optional --provider and --chain-id flags`, + show rewards from a specific provider using the optional --provider flag`, Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - var provider, chainID string + var provider string clientCtx, err := client.GetClientQueryContext(cmd) if err != nil { @@ -47,19 +46,9 @@ func CmdQueryDelegatorRewards() *cobra.Command { return err } - // check if the command includes --chain-id - chainIDFlag := cmd.Flags().Lookup(chainIDFlagName) - if chainIDFlag == nil { - return fmt.Errorf("%s flag wasn't found", chainIDFlagName) - } - if cmd.Flags().Changed(chainIDFlagName) { - chainID = chainIDFlag.Value.String() - } - res, err := queryClient.DelegatorRewards(cmd.Context(), &types.QueryDelegatorRewardsRequest{ Delegator: delegator, Provider: provider, - ChainId: chainID, }) if err != nil { return err @@ -71,7 +60,6 @@ func CmdQueryDelegatorRewards() *cobra.Command { flags.AddQueryFlagsToCmd(cmd) cmd.Flags().String(providerFlagName, "", "output rewards from a specific provider") - cmd.Flags().String(chainIDFlagName, "", "output rewards for a specific chain") return cmd } diff --git a/x/dualstaking/client/cli/query_params.go b/x/dualstaking/client/cli/query_params.go index 20adbfa204..8557d60189 100644 --- a/x/dualstaking/client/cli/query_params.go +++ b/x/dualstaking/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/dualstaking/client/cli/query_provider_delegators.go b/x/dualstaking/client/cli/query_provider_delegators.go index 84947c84df..adab61c917 100644 --- a/x/dualstaking/client/cli/query_provider_delegators.go +++ b/x/dualstaking/client/cli/query_provider_delegators.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) func CmdQueryProviderDelegators() *cobra.Command { diff --git a/x/dualstaking/client/cli/tx.go b/x/dualstaking/client/cli/tx.go index 1caeff6fa5..88df5847ba 100644 --- a/x/dualstaking/client/cli/tx.go +++ b/x/dualstaking/client/cli/tx.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/dualstaking/client/cli/tx_claim_rewards.go b/x/dualstaking/client/cli/tx_claim_rewards.go index da40ad0b0a..f18c9e36a8 100644 --- a/x/dualstaking/client/cli/tx_claim_rewards.go +++ b/x/dualstaking/client/cli/tx_claim_rewards.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/spf13/cobra" ) diff --git a/x/dualstaking/client/cli/tx_delegate.go b/x/dualstaking/client/cli/tx_delegate.go index fd57bd95d2..24f303bab0 100644 --- a/x/dualstaking/client/cli/tx_delegate.go +++ b/x/dualstaking/client/cli/tx_delegate.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/spf13/cobra" ) @@ -59,37 +59,30 @@ func CmdDelegate() *cobra.Command { return cmd } +// GetValidator gets a validator that is delegated by the `from` address +// The dualstaking mecahnism makes providers delegate to a validator when they're staking. +// Assuming that the `from` address (of the clientCtx) is a staked provider address, this +// function returns a validator that the provider is delegated to (the one with the largest delegation). func GetValidator(clientCtx client.Context) string { provider := clientCtx.GetFromAddress().String() q := stakingtypes.NewQueryClient(clientCtx) ctx := context.Background() - resD, err := q.DelegatorValidators(ctx, &stakingtypes.QueryDelegatorValidatorsRequest{DelegatorAddr: provider}) + resD, err := q.DelegatorDelegations(ctx, &stakingtypes.QueryDelegatorDelegationsRequest{DelegatorAddr: provider}) - if err == nil && len(resD.Validators) > 0 { - validatorBiggest := resD.Validators[0] - for _, validator := range resD.Validators { - if sdk.AccAddress(validator.OperatorAddress).String() == provider { - return validator.OperatorAddress + if err == nil && len(resD.DelegationResponses) > 0 { + delegationBiggest := resD.DelegationResponses[0] + for _, delegationResponse := range resD.DelegationResponses { + if sdk.AccAddress(delegationResponse.Delegation.ValidatorAddress).String() == provider { + return delegationResponse.Delegation.ValidatorAddress } - if validator.Tokens.GT(validatorBiggest.Tokens) { - validatorBiggest = validator + if delegationResponse.Balance.IsGTE(delegationBiggest.Balance) { + delegationBiggest = delegationResponse } } - return validatorBiggest.OperatorAddress - } - - resV, err := q.Validators(ctx, &stakingtypes.QueryValidatorsRequest{}) - if err != nil { - panic("failed to fetch list of validators") - } - validatorBiggest := resV.Validators[0] - for _, validator := range resV.Validators { - if sdk.AccAddress(validator.OperatorAddress).String() == provider { - return validator.OperatorAddress - } - if validator.Tokens.GT(validatorBiggest.Tokens) { - validatorBiggest = validator + if !delegationBiggest.Balance.IsZero() { + return delegationBiggest.Delegation.ValidatorAddress } } - return validatorBiggest.OperatorAddress + + return "" } diff --git a/x/dualstaking/client/cli/tx_redelegate.go b/x/dualstaking/client/cli/tx_redelegate.go index 109e48030d..458a0d1002 100644 --- a/x/dualstaking/client/cli/tx_redelegate.go +++ b/x/dualstaking/client/cli/tx_redelegate.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/spf13/cobra" ) diff --git a/x/dualstaking/client/cli/tx_unbond.go b/x/dualstaking/client/cli/tx_unbond.go index 49c9fe6e55..c4d92e9bb9 100644 --- a/x/dualstaking/client/cli/tx_unbond.go +++ b/x/dualstaking/client/cli/tx_unbond.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/spf13/cobra" ) diff --git a/x/dualstaking/genesis.go b/x/dualstaking/genesis.go index ae00d5de7c..3717518a73 100644 --- a/x/dualstaking/genesis.go +++ b/x/dualstaking/genesis.go @@ -2,8 +2,8 @@ package dualstaking import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/dualstaking/genesis_test.go b/x/dualstaking/genesis_test.go index 33087b7290..a1c50f5212 100644 --- a/x/dualstaking/genesis_test.go +++ b/x/dualstaking/genesis_test.go @@ -3,10 +3,10 @@ package dualstaking_test import ( "testing" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/dualstaking" - "github.com/lavanet/lava/v3/x/dualstaking/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/dualstaking" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/handler.go b/x/dualstaking/handler.go index 3e0e9cc374..0146f5a5b6 100644 --- a/x/dualstaking/handler.go +++ b/x/dualstaking/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) // NewHandler ... diff --git a/x/dualstaking/keeper/balance.go b/x/dualstaking/keeper/balance.go index 87d747340c..236a61978e 100644 --- a/x/dualstaking/keeper/balance.go +++ b/x/dualstaking/keeper/balance.go @@ -2,8 +2,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) func (k Keeper) BalanceDelegator(ctx sdk.Context, delegator sdk.AccAddress) (int, error) { diff --git a/x/dualstaking/keeper/delegate.go b/x/dualstaking/keeper/delegate.go index 7479532b8e..dfa1057876 100644 --- a/x/dualstaking/keeper/delegate.go +++ b/x/dualstaking/keeper/delegate.go @@ -21,11 +21,11 @@ import ( "cosmossdk.io/collections" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - lavaslices "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/x/dualstaking/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + lavaslices "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/x/dualstaking/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" "golang.org/x/exp/slices" ) diff --git a/x/dualstaking/keeper/delegate_test.go b/x/dualstaking/keeper/delegate_test.go index 0518f01771..eed57be7d6 100644 --- a/x/dualstaking/keeper/delegate_test.go +++ b/x/dualstaking/keeper/delegate_test.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + "github.com/lavanet/lava/v4/testutil/common" + commontypes "github.com/lavanet/lava/v4/utils/common/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/keeper/delegator_reward.go b/x/dualstaking/keeper/delegator_reward.go index e2ec897392..ae0259db70 100644 --- a/x/dualstaking/keeper/delegator_reward.go +++ b/x/dualstaking/keeper/delegator_reward.go @@ -5,9 +5,9 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) // SetDelegatorReward set a specific DelegatorReward in the store from its index diff --git a/x/dualstaking/keeper/delegator_reward_test.go b/x/dualstaking/keeper/delegator_reward_test.go index f5d2a3237b..2508283bdd 100644 --- a/x/dualstaking/keeper/delegator_reward_test.go +++ b/x/dualstaking/keeper/delegator_reward_test.go @@ -5,10 +5,10 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/keeper/grpc_query_delegator_providers.go b/x/dualstaking/keeper/grpc_query_delegator_providers.go index f94530c7d2..724a2d05e5 100644 --- a/x/dualstaking/keeper/grpc_query_delegator_providers.go +++ b/x/dualstaking/keeper/grpc_query_delegator_providers.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/dualstaking/keeper/grpc_query_delegator_providers_test.go b/x/dualstaking/keeper/grpc_query_delegator_providers_test.go index e546fa206c..26a3074e3b 100644 --- a/x/dualstaking/keeper/grpc_query_delegator_providers_test.go +++ b/x/dualstaking/keeper/grpc_query_delegator_providers_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/keeper/grpc_query_delegator_rewards.go b/x/dualstaking/keeper/grpc_query_delegator_rewards.go index 36dcd1a84b..bfb2025b6b 100644 --- a/x/dualstaking/keeper/grpc_query_delegator_rewards.go +++ b/x/dualstaking/keeper/grpc_query_delegator_rewards.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -17,20 +17,19 @@ func (k Keeper) DelegatorRewards(goCtx context.Context, req *types.QueryDelegato ctx := sdk.UnwrapSDKContext(goCtx) var rewards []types.DelegatorRewardInfo - resProviders, err := k.DelegatorProviders(goCtx, &types.QueryDelegatorProvidersRequest{Delegator: req.Delegator}) - if err != nil { - return nil, err - } - - for _, delegation := range resProviders.Delegations { - if delegation.Provider == req.Provider || req.Provider == "" { - delegatorReward, found := k.GetDelegatorReward(ctx, delegation.Provider, delegation.Delegator) - if found { - reward := types.DelegatorRewardInfo{ - Provider: delegation.Provider, + if req.Provider != "" { + reward, found := k.GetDelegatorReward(ctx, req.Provider, req.Delegator) + if found { + rewards = append(rewards, types.DelegatorRewardInfo{Provider: reward.Provider, Amount: reward.Amount}) + } + } else { + allRewards := k.GetAllDelegatorReward(ctx) + for _, delegatorReward := range allRewards { + if delegatorReward.Delegator == req.Delegator { + rewards = append(rewards, types.DelegatorRewardInfo{ + Provider: delegatorReward.Provider, Amount: delegatorReward.Amount, - } - rewards = append(rewards, reward) + }) } } } diff --git a/x/dualstaking/keeper/grpc_query_provider_delegators.go b/x/dualstaking/keeper/grpc_query_provider_delegators.go index 6d02347ac7..8f71aa8969 100644 --- a/x/dualstaking/keeper/grpc_query_provider_delegators.go +++ b/x/dualstaking/keeper/grpc_query_provider_delegators.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/dualstaking/keeper/grpc_query_provider_delegators_test.go b/x/dualstaking/keeper/grpc_query_provider_delegators_test.go index e60d13ef6f..2b62abb9e3 100644 --- a/x/dualstaking/keeper/grpc_query_provider_delegators_test.go +++ b/x/dualstaking/keeper/grpc_query_provider_delegators_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/keeper/helpers_test.go b/x/dualstaking/keeper/helpers_test.go index 9982176a50..61e1a6a710 100644 --- a/x/dualstaking/keeper/helpers_test.go +++ b/x/dualstaking/keeper/helpers_test.go @@ -4,10 +4,10 @@ import ( "testing" "cosmossdk.io/math" - "github.com/lavanet/lava/v3/testutil/common" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/common" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/keeper/hooks.go b/x/dualstaking/keeper/hooks.go index e693da97f1..4a556cd39c 100644 --- a/x/dualstaking/keeper/hooks.go +++ b/x/dualstaking/keeper/hooks.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) // Wrapper struct diff --git a/x/dualstaking/keeper/hooks_test.go b/x/dualstaking/keeper/hooks_test.go index f988230a56..0c837219a2 100644 --- a/x/dualstaking/keeper/hooks_test.go +++ b/x/dualstaking/keeper/hooks_test.go @@ -9,11 +9,11 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/utils/sigs" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/utils/sigs" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" ) diff --git a/x/dualstaking/keeper/keeper.go b/x/dualstaking/keeper/keeper.go index 111b388935..2010449bed 100644 --- a/x/dualstaking/keeper/keeper.go +++ b/x/dualstaking/keeper/keeper.go @@ -11,8 +11,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - collcompat "github.com/lavanet/lava/v3/utils/collcompat" - "github.com/lavanet/lava/v3/x/dualstaking/types" + collcompat "github.com/lavanet/lava/v4/utils/collcompat" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) type ( diff --git a/x/dualstaking/keeper/migrations.go b/x/dualstaking/keeper/migrations.go index 47a8eab23e..8966235507 100644 --- a/x/dualstaking/keeper/migrations.go +++ b/x/dualstaking/keeper/migrations.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) type Migrator struct { diff --git a/x/dualstaking/keeper/msg_server.go b/x/dualstaking/keeper/msg_server.go index 0a1fd6bdaa..448d20c622 100644 --- a/x/dualstaking/keeper/msg_server.go +++ b/x/dualstaking/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) type msgServer struct { diff --git a/x/dualstaking/keeper/msg_server_claim_rewards.go b/x/dualstaking/keeper/msg_server_claim_rewards.go index afa529647f..9f38eaea5b 100644 --- a/x/dualstaking/keeper/msg_server_claim_rewards.go +++ b/x/dualstaking/keeper/msg_server_claim_rewards.go @@ -4,9 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) func (k msgServer) ClaimRewards(goCtx context.Context, msg *types.MsgClaimRewards) (*types.MsgClaimRewardsResponse, error) { diff --git a/x/dualstaking/keeper/msg_server_delegate.go b/x/dualstaking/keeper/msg_server_delegate.go index eeeab8ab58..fdb823e4d2 100644 --- a/x/dualstaking/keeper/msg_server_delegate.go +++ b/x/dualstaking/keeper/msg_server_delegate.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) func (k msgServer) Delegate(goCtx context.Context, msg *types.MsgDelegate) (*types.MsgDelegateResponse, error) { diff --git a/x/dualstaking/keeper/msg_server_redelegate.go b/x/dualstaking/keeper/msg_server_redelegate.go index 2f11eaaa46..0c850104f2 100644 --- a/x/dualstaking/keeper/msg_server_redelegate.go +++ b/x/dualstaking/keeper/msg_server_redelegate.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) func (k msgServer) Redelegate(goCtx context.Context, msg *types.MsgRedelegate) (*types.MsgRedelegateResponse, error) { diff --git a/x/dualstaking/keeper/msg_server_test.go b/x/dualstaking/keeper/msg_server_test.go index 95e1be4373..a411106799 100644 --- a/x/dualstaking/keeper/msg_server_test.go +++ b/x/dualstaking/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/keeper/msg_server_unbond.go b/x/dualstaking/keeper/msg_server_unbond.go index 1d79bfe5b3..190dab7ae5 100644 --- a/x/dualstaking/keeper/msg_server_unbond.go +++ b/x/dualstaking/keeper/msg_server_unbond.go @@ -4,9 +4,9 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) func (k msgServer) Unbond(goCtx context.Context, msg *types.MsgUnbond) (*types.MsgUnbondResponse, error) { diff --git a/x/dualstaking/keeper/params.go b/x/dualstaking/keeper/params.go index 1fc16bfef7..cf1a1582a1 100644 --- a/x/dualstaking/keeper/params.go +++ b/x/dualstaking/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) // GetParams get all parameters as types.Params diff --git a/x/dualstaking/keeper/params_test.go b/x/dualstaking/keeper/params_test.go index d9e4f7c8a4..a0f1623321 100644 --- a/x/dualstaking/keeper/params_test.go +++ b/x/dualstaking/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/keeper/query.go b/x/dualstaking/keeper/query.go index 4db2a24f82..6f6f15dc52 100644 --- a/x/dualstaking/keeper/query.go +++ b/x/dualstaking/keeper/query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/dualstaking/keeper/query_params.go b/x/dualstaking/keeper/query_params.go index 8c007c0529..2000b827cf 100644 --- a/x/dualstaking/keeper/query_params.go +++ b/x/dualstaking/keeper/query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/dualstaking/keeper/query_params_test.go b/x/dualstaking/keeper/query_params_test.go index f2d722a7c8..6f029ce46e 100644 --- a/x/dualstaking/keeper/query_params_test.go +++ b/x/dualstaking/keeper/query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/keeper/slashing.go b/x/dualstaking/keeper/slashing.go index 00ae89c77f..3f5d35c330 100644 --- a/x/dualstaking/keeper/slashing.go +++ b/x/dualstaking/keeper/slashing.go @@ -3,8 +3,8 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) // balance delegators dualstaking after potential validators slashing diff --git a/x/dualstaking/module.go b/x/dualstaking/module.go index 31f43c1546..aecd7dda6a 100644 --- a/x/dualstaking/module.go +++ b/x/dualstaking/module.go @@ -17,9 +17,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/dualstaking/client/cli" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/client/cli" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) var ( diff --git a/x/dualstaking/module_simulation.go b/x/dualstaking/module_simulation.go index f191eafb13..beaddac229 100644 --- a/x/dualstaking/module_simulation.go +++ b/x/dualstaking/module_simulation.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - dualstakingsimulation "github.com/lavanet/lava/v3/x/dualstaking/simulation" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/testutil/sample" + dualstakingsimulation "github.com/lavanet/lava/v4/x/dualstaking/simulation" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) // avoid unused import issue diff --git a/x/dualstaking/simulation/claim_rewards.go b/x/dualstaking/simulation/claim_rewards.go index 34dc76ada5..bfbe077299 100644 --- a/x/dualstaking/simulation/claim_rewards.go +++ b/x/dualstaking/simulation/claim_rewards.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) func SimulateMsgClaimRewards( diff --git a/x/dualstaking/simulation/delegate.go b/x/dualstaking/simulation/delegate.go index b5cdda6057..bf12e20b40 100644 --- a/x/dualstaking/simulation/delegate.go +++ b/x/dualstaking/simulation/delegate.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/dualstaking/keeper" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/keeper" + "github.com/lavanet/lava/v4/x/dualstaking/types" ) func SimulateMsgDelegate( diff --git a/x/dualstaking/types/delegate.go b/x/dualstaking/types/delegate.go index ed211cf488..fe2b82e405 100644 --- a/x/dualstaking/types/delegate.go +++ b/x/dualstaking/types/delegate.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/collections" "cosmossdk.io/collections/indexes" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/lavaslices" ) var DelegationIndexPrefix = collections.NewPrefix(1) diff --git a/x/dualstaking/types/delegate.pb.go b/x/dualstaking/types/delegate.pb.go index 34ec8b0c40..fbe4c80497 100644 --- a/x/dualstaking/types/delegate.pb.go +++ b/x/dualstaking/types/delegate.pb.go @@ -149,23 +149,23 @@ var fileDescriptor_547eac7f30bf94d4 = []byte{ // 300 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xb1, 0x4e, 0xf3, 0x30, 0x14, 0x85, 0xe3, 0x3f, 0xfd, 0xab, 0xc6, 0x2c, 0x28, 0x62, 0x30, 0x55, 0x65, 0xa2, 0x2e, 0x94, - 0xc5, 0x56, 0xe9, 0xc0, 0x5e, 0x3a, 0x20, 0xc6, 0x8e, 0x6c, 0x4e, 0x6b, 0x05, 0x8b, 0xc6, 0x37, - 0x8a, 0x9d, 0x08, 0xde, 0x82, 0x77, 0xe0, 0x65, 0x3a, 0x76, 0x64, 0x42, 0x28, 0x79, 0x11, 0xe4, - 0x24, 0xa4, 0x74, 0xba, 0xf6, 0xb9, 0x47, 0xf7, 0x3b, 0x3a, 0xf8, 0x7a, 0x27, 0x4a, 0xa1, 0xa5, - 0xe5, 0x6e, 0xf2, 0x6d, 0x21, 0x76, 0xc6, 0x8a, 0x17, 0xa5, 0x13, 0xbe, 0x95, 0x3b, 0x99, 0x08, - 0x2b, 0x59, 0x96, 0x83, 0x85, 0x90, 0x74, 0x46, 0xe6, 0x26, 0xfb, 0x63, 0x1c, 0x5f, 0x24, 0x90, - 0x40, 0x63, 0xe2, 0xee, 0xd5, 0xfa, 0xc7, 0x74, 0x03, 0x26, 0x05, 0xc3, 0x63, 0x61, 0x24, 0x2f, - 0xe7, 0xb1, 0xb4, 0x62, 0xce, 0x37, 0xa0, 0x74, 0xbb, 0x9f, 0x7e, 0x20, 0x8c, 0x57, 0x2d, 0x42, - 0x81, 0x0e, 0xc7, 0x78, 0x94, 0xe5, 0x50, 0xaa, 0xad, 0xcc, 0x09, 0x8a, 0xd0, 0x2c, 0x58, 0xf7, - 0xff, 0x70, 0x82, 0x83, 0x2e, 0x0c, 0xe4, 0xc4, 0x6f, 0x96, 0x47, 0x21, 0xbc, 0xc3, 0x43, 0x91, - 0x42, 0xa1, 0x2d, 0x19, 0x44, 0x68, 0x76, 0x76, 0x7b, 0xc9, 0x5a, 0x32, 0x73, 0x64, 0xd6, 0x91, - 0xd9, 0x3d, 0x28, 0xbd, 0x1c, 0xec, 0xbf, 0xae, 0xbc, 0x75, 0x67, 0x77, 0x67, 0xad, 0x4a, 0xa5, - 0xb1, 0x22, 0xcd, 0xc8, 0xff, 0x08, 0xcd, 0xfc, 0xf5, 0x51, 0x78, 0x1c, 0x8c, 0xfe, 0x9d, 0xfb, - 0xd3, 0x1b, 0x1c, 0xac, 0x7a, 0xd2, 0x04, 0x07, 0xbf, 0x99, 0x0c, 0x41, 0x91, 0xef, 0x72, 0xf4, - 0xc2, 0xf2, 0x61, 0x5f, 0x51, 0x74, 0xa8, 0x28, 0xfa, 0xae, 0x28, 0x7a, 0xaf, 0xa9, 0x77, 0xa8, - 0xa9, 0xf7, 0x59, 0x53, 0xef, 0x89, 0x25, 0xca, 0x3e, 0x17, 0x31, 0xdb, 0x40, 0xca, 0x4f, 0xea, - 0x2e, 0x17, 0xfc, 0xf5, 0xa4, 0x73, 0xfb, 0x96, 0x49, 0x13, 0x0f, 0x9b, 0x86, 0x16, 0x3f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x2a, 0xdf, 0x39, 0x25, 0x9c, 0x01, 0x00, 0x00, + 0xc5, 0x56, 0x01, 0x89, 0xbd, 0x74, 0x40, 0x8c, 0x1d, 0xd9, 0x9c, 0xd6, 0x0a, 0x16, 0x8d, 0x6f, + 0x14, 0x3b, 0x11, 0xbc, 0x05, 0xef, 0xc0, 0xcb, 0x74, 0xec, 0xc8, 0x84, 0x50, 0xf2, 0x22, 0xc8, + 0x49, 0x48, 0xe9, 0x74, 0xed, 0x73, 0x8f, 0xee, 0x77, 0x74, 0xf0, 0xe5, 0x56, 0x94, 0x42, 0x4b, + 0xcb, 0xdd, 0xe4, 0x9b, 0x42, 0x6c, 0x8d, 0x15, 0x2f, 0x4a, 0x27, 0x7c, 0x23, 0xb7, 0x32, 0x11, + 0x56, 0xb2, 0x2c, 0x07, 0x0b, 0x21, 0xe9, 0x8c, 0xcc, 0x4d, 0xf6, 0xc7, 0x38, 0x3e, 0x4b, 0x20, + 0x81, 0xc6, 0xc4, 0xdd, 0xab, 0xf5, 0x8f, 0xe9, 0x1a, 0x4c, 0x0a, 0x86, 0xc7, 0xc2, 0x48, 0x5e, + 0xce, 0x63, 0x69, 0xc5, 0x9c, 0xaf, 0x41, 0xe9, 0x76, 0x3f, 0xfd, 0x40, 0x18, 0x2f, 0x5b, 0x84, + 0x02, 0x1d, 0x8e, 0xf1, 0x28, 0xcb, 0xa1, 0x54, 0x1b, 0x99, 0x13, 0x14, 0xa1, 0x59, 0xb0, 0xea, + 0xff, 0xe1, 0x04, 0x07, 0x5d, 0x18, 0xc8, 0x89, 0xdf, 0x2c, 0x0f, 0x42, 0x78, 0x87, 0x87, 0x22, + 0x85, 0x42, 0x5b, 0x32, 0x88, 0xd0, 0xec, 0xe4, 0xfa, 0x9c, 0xb5, 0x64, 0xe6, 0xc8, 0xac, 0x23, + 0xb3, 0x7b, 0x50, 0x7a, 0x31, 0xd8, 0x7d, 0x5d, 0x78, 0xab, 0xce, 0xee, 0xce, 0x5a, 0x95, 0x4a, + 0x63, 0x45, 0x9a, 0x91, 0xff, 0x11, 0x9a, 0xf9, 0xab, 0x83, 0xf0, 0x38, 0x18, 0xfd, 0x3b, 0xf5, + 0xa7, 0x57, 0x38, 0x58, 0xf6, 0xa4, 0x09, 0x0e, 0x7e, 0x33, 0x19, 0x82, 0x22, 0xdf, 0xe5, 0xe8, + 0x85, 0xc5, 0xc3, 0xae, 0xa2, 0x68, 0x5f, 0x51, 0xf4, 0x5d, 0x51, 0xf4, 0x5e, 0x53, 0x6f, 0x5f, + 0x53, 0xef, 0xb3, 0xa6, 0xde, 0x13, 0x4b, 0x94, 0x7d, 0x2e, 0x62, 0xb6, 0x86, 0x94, 0x1f, 0xd5, + 0x5d, 0xde, 0xf2, 0xd7, 0xa3, 0xce, 0xed, 0x5b, 0x26, 0x4d, 0x3c, 0x6c, 0x1a, 0xba, 0xf9, 0x09, + 0x00, 0x00, 0xff, 0xff, 0x97, 0xd6, 0x5f, 0xd7, 0x9c, 0x01, 0x00, 0x00, } func (m *Delegation) Marshal() (dAtA []byte, err error) { diff --git a/x/dualstaking/types/delegator_reward.pb.go b/x/dualstaking/types/delegator_reward.pb.go index d7e4c02c44..fd056fc316 100644 --- a/x/dualstaking/types/delegator_reward.pb.go +++ b/x/dualstaking/types/delegator_reward.pb.go @@ -94,26 +94,26 @@ func init() { } var fileDescriptor_c8b6da054bf40d1f = []byte{ - // 291 bytes of a gzipped FileDescriptorProto + // 292 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x31, 0x4e, 0xfb, 0x30, 0x18, 0xc5, 0xe3, 0x7f, 0xa3, 0xaa, 0xcd, 0x7f, 0x00, 0x45, 0x0c, 0x21, 0x42, 0x6e, 0xc5, 0x94, - 0x05, 0x9b, 0xd2, 0x1b, 0x14, 0x06, 0xc4, 0x98, 0x91, 0x05, 0x39, 0x89, 0x15, 0xa2, 0x26, 0xfe, - 0x22, 0xdb, 0x09, 0x70, 0x0b, 0xce, 0xc1, 0x01, 0x38, 0x43, 0xc7, 0x8e, 0x4c, 0x80, 0x92, 0x8b, - 0xa0, 0x38, 0xa1, 0xb4, 0xd3, 0xb3, 0xfd, 0x7d, 0xef, 0xfd, 0xac, 0xe7, 0xd0, 0x9c, 0xd5, 0x4c, - 0x70, 0x6d, 0x94, 0x26, 0x15, 0xcb, 0x95, 0x66, 0xeb, 0x4c, 0xa4, 0x34, 0xe1, 0x39, 0x4f, 0x99, - 0x06, 0xf9, 0x20, 0xf9, 0x13, 0x93, 0x09, 0x29, 0x25, 0x68, 0x70, 0xbd, 0xc1, 0x40, 0x3a, 0x25, - 0x7b, 0x06, 0xff, 0x24, 0x85, 0x14, 0xcc, 0x12, 0xed, 0x4e, 0xfd, 0xbe, 0x8f, 0x63, 0x50, 0x05, - 0x28, 0x1a, 0x31, 0xc5, 0x69, 0xbd, 0x88, 0xb8, 0x66, 0x0b, 0x1a, 0x43, 0x26, 0xfa, 0xf9, 0xf9, - 0x3b, 0x72, 0x8e, 0x6e, 0x7e, 0x51, 0xa1, 0x21, 0xb9, 0x67, 0xce, 0x74, 0x47, 0xf7, 0xd0, 0x1c, - 0x05, 0xd3, 0xf0, 0xef, 0xc1, 0xf5, 0x9d, 0x49, 0x29, 0xa1, 0xce, 0x12, 0x2e, 0xbd, 0x7f, 0x66, - 0xb8, 0xbb, 0xbb, 0xb1, 0x33, 0x66, 0x05, 0x54, 0x42, 0x7b, 0xf6, 0x7c, 0x14, 0xfc, 0xbf, 0x3a, - 0x25, 0x3d, 0x9e, 0x74, 0x78, 0x32, 0xe0, 0xc9, 0x35, 0x64, 0x62, 0x75, 0xb9, 0xf9, 0x9c, 0x59, - 0x6f, 0x5f, 0xb3, 0x20, 0xcd, 0xf4, 0x63, 0x15, 0x91, 0x18, 0x0a, 0x3a, 0xfc, 0xb5, 0x97, 0x0b, - 0x95, 0xac, 0xa9, 0x7e, 0x29, 0xb9, 0x32, 0x06, 0x15, 0x0e, 0xd1, 0x77, 0xf6, 0x64, 0x74, 0x6c, - 0xaf, 0x6e, 0x37, 0x0d, 0x46, 0xdb, 0x06, 0xa3, 0xef, 0x06, 0xa3, 0xd7, 0x16, 0x5b, 0xdb, 0x16, - 0x5b, 0x1f, 0x2d, 0xb6, 0xee, 0xc9, 0x5e, 0xe2, 0x41, 0xbd, 0xf5, 0x92, 0x3e, 0x1f, 0x74, 0x6c, - 0xd2, 0xa3, 0xb1, 0x69, 0x62, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x84, 0xf0, 0x2c, 0x8c, - 0x01, 0x00, 0x00, + 0x05, 0x9b, 0x02, 0x27, 0x28, 0x0c, 0x88, 0x31, 0x23, 0x0b, 0x72, 0x12, 0x2b, 0x44, 0x4d, 0xfc, + 0x45, 0xb6, 0x13, 0xe0, 0x16, 0x9c, 0x83, 0x03, 0x70, 0x86, 0x8e, 0x1d, 0x99, 0x00, 0x25, 0x17, + 0x41, 0x71, 0x42, 0x69, 0xa7, 0x67, 0xfb, 0xfb, 0xde, 0xfb, 0x59, 0xcf, 0xa1, 0x39, 0xab, 0x99, + 0xe0, 0xda, 0x28, 0x4d, 0x2a, 0x96, 0x2b, 0xcd, 0x56, 0x99, 0x48, 0x69, 0xc2, 0x73, 0x9e, 0x32, + 0x0d, 0xf2, 0x41, 0xf2, 0x27, 0x26, 0x13, 0x52, 0x4a, 0xd0, 0xe0, 0x7a, 0x83, 0x81, 0x74, 0x4a, + 0x76, 0x0c, 0xfe, 0x51, 0x0a, 0x29, 0x98, 0x25, 0xda, 0x9d, 0xfa, 0x7d, 0x1f, 0xc7, 0xa0, 0x0a, + 0x50, 0x34, 0x62, 0x8a, 0xd3, 0x7a, 0x11, 0x71, 0xcd, 0x16, 0x34, 0x86, 0x4c, 0xf4, 0xf3, 0xd3, + 0x77, 0xe4, 0x1c, 0xdc, 0xfc, 0xa2, 0x42, 0x43, 0x72, 0x4f, 0x9c, 0xe9, 0x96, 0xee, 0xa1, 0x39, + 0x0a, 0xa6, 0xe1, 0xdf, 0x83, 0xeb, 0x3b, 0x93, 0x52, 0x42, 0x9d, 0x25, 0x5c, 0x7a, 0xff, 0xcc, + 0x70, 0x7b, 0x77, 0x63, 0x67, 0xcc, 0x0a, 0xa8, 0x84, 0xf6, 0xec, 0xf9, 0x28, 0xf8, 0x7f, 0x71, + 0x4c, 0x7a, 0x3c, 0xe9, 0xf0, 0x64, 0xc0, 0x93, 0x6b, 0xc8, 0xc4, 0xf2, 0x7c, 0xfd, 0x39, 0xb3, + 0xde, 0xbe, 0x66, 0x41, 0x9a, 0xe9, 0xc7, 0x2a, 0x22, 0x31, 0x14, 0x74, 0xf8, 0x6b, 0x2f, 0x67, + 0x2a, 0x59, 0x51, 0xfd, 0x52, 0x72, 0x65, 0x0c, 0x2a, 0x1c, 0xa2, 0xef, 0xec, 0xc9, 0xe8, 0xd0, + 0x5e, 0xde, 0xae, 0x1b, 0x8c, 0x36, 0x0d, 0x46, 0xdf, 0x0d, 0x46, 0xaf, 0x2d, 0xb6, 0x36, 0x2d, + 0xb6, 0x3e, 0x5a, 0x6c, 0xdd, 0x93, 0x9d, 0xc4, 0xbd, 0x7a, 0xeb, 0x2b, 0xfa, 0xbc, 0xd7, 0xb1, + 0x49, 0x8f, 0xc6, 0xa6, 0x89, 0xcb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x87, 0x8d, 0x96, 0xde, + 0x8c, 0x01, 0x00, 0x00, } func (m *DelegatorReward) Marshal() (dAtA []byte, err error) { diff --git a/x/dualstaking/types/expected_keepers.go b/x/dualstaking/types/expected_keepers.go index e6e3851470..07ea58ebae 100644 --- a/x/dualstaking/types/expected_keepers.go +++ b/x/dualstaking/types/expected_keepers.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - fixationstoretypes "github.com/lavanet/lava/v3/x/fixationstore/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + fixationstoretypes "github.com/lavanet/lava/v4/x/fixationstore/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/dualstaking/types/genesis.pb.go b/x/dualstaking/types/genesis.pb.go index 672d9c0e41..5b2538efa9 100644 --- a/x/dualstaking/types/genesis.pb.go +++ b/x/dualstaking/types/genesis.pb.go @@ -111,8 +111,8 @@ var fileDescriptor_d5bca863c53f218f = []byte{ 0x62, 0xe1, 0x60, 0x16, 0x60, 0xf1, 0x62, 0xe1, 0x60, 0x11, 0x60, 0x75, 0xf2, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xbd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, - 0xe4, 0xfc, 0x5c, 0xd4, 0x48, 0x29, 0x33, 0xd6, 0xaf, 0x40, 0x09, 0xe8, 0x92, 0xca, 0x82, 0xd4, - 0xe2, 0x24, 0x36, 0x70, 0x30, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x19, 0x97, 0xa1, 0xc1, + 0xe4, 0xfc, 0x5c, 0xd4, 0x48, 0x29, 0x33, 0xd1, 0xaf, 0x40, 0x09, 0xe8, 0x92, 0xca, 0x82, 0xd4, + 0xe2, 0x24, 0x36, 0x70, 0x30, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x9e, 0xc7, 0x33, 0x41, 0x02, 0x00, 0x00, } diff --git a/x/dualstaking/types/genesis_test.go b/x/dualstaking/types/genesis_test.go index aaa1b556a9..2d12e1a4a8 100644 --- a/x/dualstaking/types/genesis_test.go +++ b/x/dualstaking/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/dualstaking/types" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/types/message_claim_rewards.go b/x/dualstaking/types/message_claim_rewards.go index 03317addd6..e84df5b8a8 100644 --- a/x/dualstaking/types/message_claim_rewards.go +++ b/x/dualstaking/types/message_claim_rewards.go @@ -4,7 +4,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) const TypeMsgClaimRewards = "claim_rewards" diff --git a/x/dualstaking/types/message_claim_rewards_test.go b/x/dualstaking/types/message_claim_rewards_test.go index 6b5f31f80d..46a287a187 100644 --- a/x/dualstaking/types/message_claim_rewards_test.go +++ b/x/dualstaking/types/message_claim_rewards_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/types/message_delegate.go b/x/dualstaking/types/message_delegate.go index 42de9f6c40..49d599d613 100644 --- a/x/dualstaking/types/message_delegate.go +++ b/x/dualstaking/types/message_delegate.go @@ -4,7 +4,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) const TypeMsgDelegate = "delegate" diff --git a/x/dualstaking/types/message_delegate_test.go b/x/dualstaking/types/message_delegate_test.go index 5b8916fcc1..f93768ef04 100644 --- a/x/dualstaking/types/message_delegate_test.go +++ b/x/dualstaking/types/message_delegate_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/types/message_redelegate.go b/x/dualstaking/types/message_redelegate.go index b354c148a1..798c945eb8 100644 --- a/x/dualstaking/types/message_redelegate.go +++ b/x/dualstaking/types/message_redelegate.go @@ -4,7 +4,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) const TypeMsgRedelegate = "redelegate" diff --git a/x/dualstaking/types/message_redelegate_test.go b/x/dualstaking/types/message_redelegate_test.go index d3c2e3e79f..bade24e0c1 100644 --- a/x/dualstaking/types/message_redelegate_test.go +++ b/x/dualstaking/types/message_redelegate_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/types/message_unbond.go b/x/dualstaking/types/message_unbond.go index 81b3f10e97..76f7213b6a 100644 --- a/x/dualstaking/types/message_unbond.go +++ b/x/dualstaking/types/message_unbond.go @@ -4,7 +4,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) const TypeMsgUnbond = "unbond" diff --git a/x/dualstaking/types/message_unbond_test.go b/x/dualstaking/types/message_unbond_test.go index 08bcf0dab0..9da5662f4a 100644 --- a/x/dualstaking/types/message_unbond_test.go +++ b/x/dualstaking/types/message_unbond_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/dualstaking/types/params.go b/x/dualstaking/types/params.go index 6644bacea6..57628469f0 100644 --- a/x/dualstaking/types/params.go +++ b/x/dualstaking/types/params.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" "gopkg.in/yaml.v2" ) diff --git a/x/dualstaking/types/params.pb.go b/x/dualstaking/types/params.pb.go index 442e098599..8fdc795cb9 100644 --- a/x/dualstaking/types/params.pb.go +++ b/x/dualstaking/types/params.pb.go @@ -123,25 +123,25 @@ func init() { } var fileDescriptor_df864e1276b03c21 = []byte{ - // 282 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x3f, 0x4b, 0xc3, 0x40, - 0x18, 0xc6, 0x73, 0x58, 0x0a, 0x9e, 0x53, 0xab, 0x43, 0xed, 0x70, 0x2d, 0x05, 0xa1, 0xd3, 0x1d, - 0x35, 0x9b, 0x63, 0x75, 0x70, 0x53, 0x5a, 0x70, 0x70, 0x09, 0x6f, 0x92, 0x6b, 0x7a, 0x78, 0xb9, - 0x37, 0xe4, 0xae, 0x41, 0xbf, 0x85, 0xa3, 0xa3, 0x1f, 0xa7, 0x63, 0x47, 0x27, 0x91, 0xe4, 0x8b, - 0x48, 0x92, 0x52, 0xda, 0xe9, 0xb9, 0x3f, 0xbf, 0xf7, 0x07, 0xef, 0x43, 0x6f, 0x34, 0x14, 0x60, - 0xa4, 0x13, 0x75, 0x8a, 0x78, 0x03, 0xda, 0x3a, 0x78, 0x53, 0x26, 0x11, 0x19, 0xe4, 0x90, 0x5a, - 0x9e, 0xe5, 0xe8, 0xb0, 0x3f, 0xd8, 0x63, 0xbc, 0x4e, 0x7e, 0x84, 0x0d, 0xaf, 0x12, 0x4c, 0xb0, - 0x81, 0x44, 0x7d, 0x6a, 0xf9, 0x21, 0x8b, 0xd0, 0xa6, 0x68, 0x45, 0x08, 0x56, 0x8a, 0x62, 0x16, - 0x4a, 0x07, 0x33, 0x11, 0xa1, 0x32, 0xed, 0xff, 0x24, 0xa0, 0xdd, 0xe7, 0xc6, 0xdf, 0x7f, 0xa2, - 0x97, 0xa9, 0x32, 0x81, 0x95, 0x7a, 0x15, 0xc4, 0x52, 0xcb, 0x04, 0x9c, 0x42, 0x33, 0x20, 0x63, - 0x32, 0xbd, 0xb8, 0xbd, 0xe6, 0xad, 0x87, 0xd7, 0x1e, 0xbe, 0xf7, 0xf0, 0x7b, 0x54, 0x66, 0xde, - 0xd9, 0xfe, 0x8e, 0xbc, 0x45, 0x2f, 0x55, 0x66, 0x29, 0xf5, 0xea, 0xe1, 0x30, 0x79, 0xd7, 0xf9, - 0xfa, 0x1e, 0x79, 0x13, 0x9f, 0xf6, 0x96, 0x1a, 0xec, 0x5a, 0xc6, 0x2f, 0xa0, 0x55, 0x0c, 0x0e, - 0x73, 0xdb, 0x67, 0x94, 0x16, 0x87, 0xdb, 0x80, 0x8c, 0xcf, 0xa6, 0xe7, 0x8b, 0xa3, 0x97, 0xf9, - 0xe3, 0xb6, 0x64, 0x64, 0x57, 0x32, 0xf2, 0x57, 0x32, 0xf2, 0x59, 0x31, 0x6f, 0x57, 0x31, 0xef, - 0xa7, 0x62, 0xde, 0x2b, 0x4f, 0x94, 0x5b, 0x6f, 0x42, 0x1e, 0x61, 0x2a, 0x4e, 0x1a, 0x2b, 0x7c, - 0xf1, 0x7e, 0x52, 0x9b, 0xfb, 0xc8, 0xa4, 0x0d, 0xbb, 0xcd, 0x9a, 0xfe, 0x7f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x9a, 0xb3, 0x87, 0x76, 0x5f, 0x01, 0x00, 0x00, + // 283 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xbd, 0x4e, 0xf3, 0x30, + 0x14, 0x86, 0x63, 0x7d, 0x55, 0xa5, 0xcf, 0x4c, 0x2d, 0x0c, 0xa1, 0x83, 0x5b, 0x55, 0x42, 0xea, + 0x64, 0xab, 0x94, 0x89, 0xb1, 0x30, 0xb0, 0x81, 0x5a, 0x89, 0x81, 0x25, 0x3a, 0x49, 0xdc, 0xd4, + 0xc2, 0xf1, 0x89, 0x62, 0x37, 0x82, 0xbb, 0x60, 0x64, 0xe4, 0x72, 0x3a, 0x76, 0x64, 0x42, 0x28, + 0xb9, 0x11, 0x94, 0xa4, 0xaa, 0xda, 0xe9, 0xf5, 0xcf, 0x73, 0x1e, 0xe9, 0xbc, 0xf4, 0x4a, 0x43, + 0x01, 0x46, 0x3a, 0x51, 0xa7, 0x88, 0x37, 0xa0, 0xad, 0x83, 0x57, 0x65, 0x12, 0x91, 0x41, 0x0e, + 0xa9, 0xe5, 0x59, 0x8e, 0x0e, 0xfb, 0xfe, 0x1e, 0xe3, 0x75, 0xf2, 0x23, 0x6c, 0x70, 0x91, 0x60, + 0x82, 0x0d, 0x24, 0xea, 0x53, 0xcb, 0x0f, 0x58, 0x84, 0x36, 0x45, 0x2b, 0x42, 0xb0, 0x52, 0x14, + 0xd3, 0x50, 0x3a, 0x98, 0x8a, 0x08, 0x95, 0x69, 0xff, 0xc7, 0x01, 0xed, 0x3e, 0x35, 0xfe, 0xfe, + 0x23, 0x3d, 0x4f, 0x95, 0x09, 0xac, 0xd4, 0xab, 0x20, 0x96, 0x5a, 0x26, 0xe0, 0x14, 0x1a, 0x9f, + 0x8c, 0xc8, 0xe4, 0xec, 0xfa, 0x92, 0xb7, 0x1e, 0x5e, 0x7b, 0xf8, 0xde, 0xc3, 0xef, 0x50, 0x99, + 0x79, 0x67, 0xfb, 0x33, 0xf4, 0x16, 0xbd, 0x54, 0x99, 0xa5, 0xd4, 0xab, 0xfb, 0xc3, 0xe4, 0x6d, + 0xe7, 0xf3, 0x6b, 0xe8, 0x8d, 0x67, 0xb4, 0xb7, 0xd4, 0x60, 0xd7, 0x32, 0x7e, 0x06, 0xad, 0x62, + 0x70, 0x98, 0xdb, 0x3e, 0xa3, 0xb4, 0x38, 0xdc, 0x7c, 0x32, 0xfa, 0x37, 0xf9, 0xbf, 0x38, 0x7a, + 0x99, 0x3f, 0x6c, 0x4b, 0x46, 0x76, 0x25, 0x23, 0xbf, 0x25, 0x23, 0x1f, 0x15, 0xf3, 0x76, 0x15, + 0xf3, 0xbe, 0x2b, 0xe6, 0xbd, 0xf0, 0x44, 0xb9, 0xf5, 0x26, 0xe4, 0x11, 0xa6, 0xe2, 0xa4, 0xb1, + 0xe2, 0x46, 0xbc, 0x9d, 0xd4, 0xe6, 0xde, 0x33, 0x69, 0xc3, 0x6e, 0xb3, 0xe6, 0xec, 0x2f, 0x00, + 0x00, 0xff, 0xff, 0x27, 0xba, 0xe1, 0x84, 0x5f, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/dualstaking/types/query.pb.go b/x/dualstaking/types/query.pb.go index ebdfedebcc..2c9bacbfb7 100644 --- a/x/dualstaking/types/query.pb.go +++ b/x/dualstaking/types/query.pb.go @@ -480,52 +480,52 @@ func init() { } var fileDescriptor_8393eed0cfbc46b2 = []byte{ - // 719 bytes of a gzipped FileDescriptorProto + // 720 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcf, 0x4f, 0x13, 0x41, 0x14, 0xc7, 0xbb, 0x2d, 0x96, 0x32, 0xf5, 0x40, 0x06, 0x0e, 0xa5, 0xc1, 0xa5, 0x6e, 0x30, 0x36, - 0x46, 0x76, 0x04, 0x12, 0x01, 0x4d, 0xfc, 0x81, 0x1c, 0xc4, 0x40, 0xc4, 0x26, 0x5c, 0xbc, 0x34, - 0xd3, 0xee, 0xb8, 0x4c, 0x68, 0x67, 0x96, 0x9d, 0x69, 0x91, 0x10, 0x2e, 0xfe, 0x03, 0x9a, 0x78, - 0xf5, 0x2f, 0xf0, 0x2f, 0x21, 0xd1, 0x03, 0x89, 0x17, 0xe3, 0x01, 0x0d, 0xf8, 0x87, 0x98, 0x9d, - 0x9d, 0xad, 0x5b, 0xca, 0xd2, 0x42, 0xa2, 0xa7, 0xa5, 0x6f, 0xde, 0x7b, 0xdf, 0xf7, 0x99, 0x97, - 0xef, 0x00, 0xa6, 0x1b, 0xb8, 0x8d, 0x19, 0x91, 0x28, 0xf8, 0x22, 0xa7, 0x85, 0x1b, 0x42, 0xe2, - 0x6d, 0xca, 0x5c, 0xb4, 0xd3, 0x22, 0xfe, 0x9e, 0xed, 0xf9, 0x5c, 0x72, 0x58, 0xd0, 0x59, 0x76, - 0xf0, 0xb5, 0x63, 0x59, 0xc5, 0x71, 0x97, 0xbb, 0x5c, 0x25, 0xa1, 0xe0, 0xaf, 0x30, 0xbf, 0x38, - 0xe9, 0x72, 0xee, 0x36, 0x08, 0xc2, 0x1e, 0x45, 0x98, 0x31, 0x2e, 0xb1, 0xa4, 0x9c, 0x09, 0x7d, - 0x7a, 0xa7, 0xce, 0x45, 0x93, 0x0b, 0x54, 0xc3, 0x82, 0x84, 0x32, 0xa8, 0x3d, 0x5b, 0x23, 0x12, - 0xcf, 0x22, 0x0f, 0xbb, 0x94, 0xa9, 0x64, 0x9d, 0x7b, 0x2b, 0x71, 0x3e, 0x0f, 0xfb, 0xb8, 0x19, - 0xb5, 0xbc, 0x9d, 0x98, 0xe6, 0x90, 0x06, 0x71, 0xb1, 0x24, 0x3a, 0xd1, 0x8c, 0x6b, 0x47, 0xaa, - 0x75, 0x4e, 0xb5, 0x9e, 0x35, 0x0e, 0xe0, 0xab, 0x60, 0xa2, 0x0d, 0xd5, 0xbd, 0x42, 0x76, 0x5a, - 0x44, 0x48, 0x6b, 0x13, 0x8c, 0x75, 0x45, 0x85, 0xc7, 0x99, 0x20, 0xf0, 0x11, 0xc8, 0x86, 0x53, - 0x14, 0x8c, 0x92, 0x51, 0xce, 0xcf, 0x95, 0xec, 0xa4, 0x7b, 0xb2, 0xc3, 0xca, 0xe5, 0xa1, 0xc3, - 0xe3, 0xa9, 0x54, 0x45, 0x57, 0x59, 0x18, 0x98, 0xaa, 0xed, 0x4a, 0x38, 0x23, 0xf7, 0x37, 0x7c, - 0xde, 0xa6, 0x0e, 0xf1, 0x23, 0x61, 0x38, 0x09, 0x46, 0x9c, 0xe8, 0x50, 0x89, 0x8c, 0x54, 0xfe, - 0x06, 0xe0, 0x4d, 0x70, 0x7d, 0x97, 0xca, 0xad, 0xaa, 0x47, 0x98, 0x43, 0x99, 0x5b, 0x48, 0x97, - 0x8c, 0x72, 0xae, 0x92, 0x0f, 0x62, 0x1b, 0x61, 0xc8, 0xe2, 0x60, 0x2a, 0x51, 0x42, 0x53, 0xac, - 0x81, 0xbc, 0x6e, 0x19, 0xec, 0xa8, 0x60, 0x94, 0x32, 0xe5, 0xfc, 0xdc, 0x74, 0x32, 0xca, 0x4a, - 0x27, 0x59, 0xe3, 0xc4, 0xcb, 0xad, 0xaa, 0x66, 0x8a, 0x74, 0x3a, 0xc2, 0x1d, 0xa6, 0x22, 0xc8, - 0x79, 0xfa, 0x50, 0x23, 0x75, 0x7e, 0x5f, 0x86, 0xe8, 0x3c, 0x81, 0x7f, 0x42, 0x24, 0xc0, 0x64, - 0xf7, 0x15, 0x56, 0xc8, 0x2e, 0xf6, 0x9d, 0x01, 0x77, 0x14, 0xa7, 0x4d, 0x9f, 0xa1, 0x9d, 0x00, - 0xb9, 0xfa, 0x16, 0xa6, 0xac, 0x4a, 0x9d, 0x42, 0x46, 0x9d, 0x0d, 0xab, 0xdf, 0xab, 0x8e, 0xc5, - 0xc0, 0x8d, 0x04, 0x51, 0xcd, 0xb8, 0x0e, 0x86, 0xfd, 0x30, 0xa4, 0xf9, 0x66, 0xfa, 0xf2, 0x45, - 0x4d, 0x56, 0xd9, 0x1b, 0xae, 0x41, 0xa3, 0x1e, 0xd6, 0x27, 0x03, 0x8c, 0x9d, 0x93, 0x76, 0xe1, - 0xb2, 0xea, 0x20, 0x8b, 0x9b, 0xbc, 0xc5, 0x64, 0x21, 0xa3, 0x26, 0x98, 0xb0, 0x43, 0x73, 0xd9, - 0x81, 0xb9, 0x6c, 0x6d, 0x2e, 0xfb, 0x19, 0xa7, 0x6c, 0xf9, 0x5e, 0xa0, 0xf6, 0xf9, 0xe7, 0x54, - 0xd9, 0xa5, 0x72, 0xab, 0x55, 0xb3, 0xeb, 0xbc, 0x89, 0xb4, 0x13, 0xc3, 0xcf, 0x8c, 0x70, 0xb6, - 0x91, 0xdc, 0xf3, 0x88, 0x50, 0x05, 0xa2, 0xa2, 0x5b, 0xbf, 0x18, 0xca, 0xa5, 0x47, 0x33, 0x73, - 0xc7, 0xc3, 0xe0, 0x9a, 0xba, 0x0f, 0xf8, 0xde, 0x00, 0xd9, 0xd0, 0x4c, 0xf0, 0x6e, 0x32, 0x71, - 0xaf, 0x87, 0x8b, 0x33, 0x03, 0x66, 0x87, 0xf7, 0x6b, 0x95, 0xdf, 0x7d, 0xfb, 0xfd, 0x31, 0x6d, - 0xc1, 0x12, 0xea, 0xf3, 0x02, 0xc1, 0xaf, 0x06, 0x80, 0xbd, 0xf6, 0x82, 0x8b, 0x7d, 0xf4, 0x12, - 0x4d, 0x5f, 0x5c, 0xba, 0x42, 0xa5, 0x9e, 0xfa, 0xa9, 0x9a, 0xfa, 0x21, 0x5c, 0x42, 0xfd, 0x1e, - 0x44, 0xee, 0x57, 0xa3, 0x45, 0x0a, 0xb4, 0xdf, 0x09, 0x1e, 0xc0, 0x2f, 0x06, 0x80, 0xbd, 0xde, - 0xea, 0x8b, 0x93, 0xe8, 0xf7, 0xbe, 0x38, 0xc9, 0x46, 0xb6, 0x9e, 0x28, 0x9c, 0x07, 0x70, 0xf1, - 0x82, 0x25, 0xe8, 0xea, 0x6a, 0x07, 0x41, 0xa0, 0xfd, 0x28, 0x78, 0x00, 0x7f, 0x18, 0x60, 0xf4, - 0xac, 0x87, 0xe0, 0xfd, 0x41, 0x2f, 0xb8, 0xdb, 0xe9, 0xc5, 0x85, 0x4b, 0xd7, 0x69, 0x8e, 0x4d, - 0xc5, 0xf1, 0x12, 0xae, 0x0f, 0xb2, 0x16, 0x6d, 0xc9, 0xf8, 0x52, 0x62, 0x44, 0x68, 0x3f, 0x7a, - 0x32, 0x0e, 0xe0, 0xa1, 0x01, 0xc6, 0xcf, 0x6a, 0xae, 0x51, 0x21, 0xff, 0x3f, 0xe0, 0x63, 0x05, - 0xb8, 0x04, 0x17, 0xae, 0x08, 0xb8, 0xfc, 0xfc, 0xf0, 0xc4, 0x34, 0x8e, 0x4e, 0x4c, 0xe3, 0xd7, - 0x89, 0x69, 0x7c, 0x38, 0x35, 0x53, 0x47, 0xa7, 0x66, 0xea, 0xfb, 0xa9, 0x99, 0x7a, 0x6d, 0xc7, - 0x9e, 0x8c, 0xae, 0xe6, 0xed, 0x79, 0xf4, 0xb6, 0x4b, 0x41, 0x3d, 0x1f, 0xb5, 0xac, 0xfa, 0x47, - 0x3e, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x70, 0x47, 0xc0, 0x97, 0xda, 0x08, 0x00, 0x00, + 0x46, 0x76, 0x04, 0x8d, 0x80, 0x26, 0xfe, 0x40, 0x0e, 0x62, 0x20, 0x62, 0x13, 0x2e, 0x5e, 0x9a, + 0x69, 0x77, 0x5c, 0x26, 0xb4, 0x33, 0xcb, 0xce, 0xb4, 0x48, 0x08, 0x17, 0xff, 0x01, 0x4d, 0xbc, + 0xfa, 0x17, 0xf8, 0x97, 0x90, 0xe8, 0x81, 0xc4, 0x8b, 0xf1, 0x80, 0x06, 0xfc, 0x43, 0xcc, 0xce, + 0xce, 0xd6, 0x2d, 0x65, 0x69, 0x21, 0xd1, 0xd3, 0xd2, 0x37, 0xef, 0xbd, 0xef, 0xfb, 0xcc, 0xcb, + 0x77, 0x00, 0xd3, 0x0d, 0xdc, 0xc6, 0x8c, 0x48, 0x14, 0x7c, 0x91, 0xd3, 0xc2, 0x0d, 0x21, 0xf1, + 0x16, 0x65, 0x2e, 0xda, 0x6e, 0x11, 0x7f, 0xd7, 0xf6, 0x7c, 0x2e, 0x39, 0x2c, 0xe8, 0x2c, 0x3b, + 0xf8, 0xda, 0xb1, 0xac, 0xe2, 0xb8, 0xcb, 0x5d, 0xae, 0x92, 0x50, 0xf0, 0x57, 0x98, 0x5f, 0x9c, + 0x74, 0x39, 0x77, 0x1b, 0x04, 0x61, 0x8f, 0x22, 0xcc, 0x18, 0x97, 0x58, 0x52, 0xce, 0x84, 0x3e, + 0xbd, 0x55, 0xe7, 0xa2, 0xc9, 0x05, 0xaa, 0x61, 0x41, 0x42, 0x19, 0xd4, 0x9e, 0xad, 0x11, 0x89, + 0x67, 0x91, 0x87, 0x5d, 0xca, 0x54, 0xb2, 0xce, 0xbd, 0x91, 0x38, 0x9f, 0x87, 0x7d, 0xdc, 0x8c, + 0x5a, 0xde, 0x4c, 0x4c, 0x73, 0x48, 0x83, 0xb8, 0x58, 0x12, 0x9d, 0x68, 0xc6, 0xb5, 0x23, 0xd5, + 0x3a, 0xa7, 0x5a, 0xcf, 0x1a, 0x07, 0xf0, 0x55, 0x30, 0xd1, 0xba, 0xea, 0x5e, 0x21, 0xdb, 0x2d, + 0x22, 0xa4, 0xb5, 0x01, 0xc6, 0xba, 0xa2, 0xc2, 0xe3, 0x4c, 0x10, 0xf8, 0x08, 0x64, 0xc3, 0x29, + 0x0a, 0x46, 0xc9, 0x28, 0xe7, 0xe7, 0x4a, 0x76, 0xd2, 0x3d, 0xd9, 0x61, 0xe5, 0xd2, 0xd0, 0xc1, + 0xd1, 0x54, 0xaa, 0xa2, 0xab, 0x2c, 0x0c, 0x4c, 0xd5, 0x76, 0x39, 0x9c, 0x91, 0xfb, 0xeb, 0x3e, + 0x6f, 0x53, 0x87, 0xf8, 0x91, 0x30, 0x9c, 0x04, 0x23, 0x4e, 0x74, 0xa8, 0x44, 0x46, 0x2a, 0x7f, + 0x03, 0xf0, 0x3a, 0xb8, 0xba, 0x43, 0xe5, 0x66, 0xd5, 0x23, 0xcc, 0xa1, 0xcc, 0x2d, 0xa4, 0x4b, + 0x46, 0x39, 0x57, 0xc9, 0x07, 0xb1, 0xf5, 0x30, 0x64, 0x71, 0x30, 0x95, 0x28, 0xa1, 0x29, 0x56, + 0x41, 0x5e, 0xb7, 0x0c, 0x76, 0x54, 0x30, 0x4a, 0x99, 0x72, 0x7e, 0x6e, 0x3a, 0x19, 0x65, 0xb9, + 0x93, 0xac, 0x71, 0xe2, 0xe5, 0x56, 0x55, 0x33, 0x45, 0x3a, 0x1d, 0xe1, 0x0e, 0x53, 0x11, 0xe4, + 0x3c, 0x7d, 0xa8, 0x91, 0x3a, 0xbf, 0x2f, 0x42, 0x74, 0x96, 0xc0, 0x3f, 0x21, 0x12, 0x60, 0xb2, + 0xfb, 0x0a, 0x2b, 0x64, 0x07, 0xfb, 0xce, 0x80, 0x3b, 0x8a, 0xd3, 0xa6, 0x4f, 0xd1, 0x4e, 0x80, + 0x5c, 0x7d, 0x13, 0x53, 0x56, 0xa5, 0x4e, 0x21, 0xa3, 0xce, 0x86, 0xd5, 0xef, 0x15, 0xc7, 0x62, + 0xe0, 0x5a, 0x82, 0xa8, 0x66, 0x5c, 0x03, 0xc3, 0x7e, 0x18, 0xd2, 0x7c, 0x33, 0x7d, 0xf9, 0xa2, + 0x26, 0x2b, 0xec, 0x0d, 0xd7, 0xa0, 0x51, 0x0f, 0xeb, 0x93, 0x01, 0xc6, 0xce, 0x48, 0x3b, 0x77, + 0x59, 0x75, 0x90, 0xc5, 0x4d, 0xde, 0x62, 0xb2, 0x90, 0x51, 0x13, 0x4c, 0xd8, 0xa1, 0xb9, 0xec, + 0xc0, 0x5c, 0xb6, 0x36, 0x97, 0xfd, 0x8c, 0x53, 0xb6, 0x74, 0x27, 0x50, 0xfb, 0xfc, 0x73, 0xaa, + 0xec, 0x52, 0xb9, 0xd9, 0xaa, 0xd9, 0x75, 0xde, 0x44, 0xda, 0x89, 0xe1, 0x67, 0x46, 0x38, 0x5b, + 0x48, 0xee, 0x7a, 0x44, 0xa8, 0x02, 0x51, 0xd1, 0xad, 0x5f, 0x0c, 0xe5, 0xd2, 0xa3, 0x99, 0xb9, + 0xa3, 0x61, 0x70, 0x45, 0xdd, 0x07, 0x7c, 0x6f, 0x80, 0x6c, 0x68, 0x26, 0x78, 0x3b, 0x99, 0xb8, + 0xd7, 0xc3, 0xc5, 0x99, 0x01, 0xb3, 0xc3, 0xfb, 0xb5, 0xca, 0xef, 0xbe, 0xfd, 0xfe, 0x98, 0xb6, + 0x60, 0x09, 0xf5, 0x79, 0x81, 0xe0, 0x57, 0x03, 0xc0, 0x5e, 0x7b, 0xc1, 0x85, 0x3e, 0x7a, 0x89, + 0xa6, 0x2f, 0x2e, 0x5e, 0xa2, 0x52, 0x4f, 0xfd, 0x54, 0x4d, 0xfd, 0x10, 0x2e, 0xa2, 0x7e, 0x0f, + 0x22, 0xf7, 0xab, 0xd1, 0x22, 0x05, 0xda, 0xeb, 0x04, 0xf7, 0xe1, 0x17, 0x03, 0xc0, 0x5e, 0x6f, + 0xf5, 0xc5, 0x49, 0xf4, 0x7b, 0x5f, 0x9c, 0x64, 0x23, 0x5b, 0x4f, 0x14, 0xce, 0x03, 0xb8, 0x70, + 0xce, 0x12, 0x74, 0x75, 0xb5, 0x83, 0x20, 0xd0, 0x5e, 0x14, 0xdc, 0x87, 0x3f, 0x0c, 0x30, 0x7a, + 0xda, 0x43, 0xf0, 0xfe, 0xa0, 0x17, 0xdc, 0xed, 0xf4, 0xe2, 0xfc, 0x85, 0xeb, 0x34, 0xc7, 0x86, + 0xe2, 0x78, 0x09, 0xd7, 0x06, 0x59, 0x8b, 0xb6, 0x64, 0x7c, 0x29, 0x31, 0x22, 0xb4, 0x17, 0x3d, + 0x19, 0xfb, 0xf0, 0xc0, 0x00, 0xe3, 0xa7, 0x35, 0x57, 0xa9, 0x90, 0xff, 0x1f, 0xf0, 0xb1, 0x02, + 0x5c, 0x84, 0xf3, 0x97, 0x04, 0x5c, 0x7a, 0x7e, 0x70, 0x6c, 0x1a, 0x87, 0xc7, 0xa6, 0xf1, 0xeb, + 0xd8, 0x34, 0x3e, 0x9c, 0x98, 0xa9, 0xc3, 0x13, 0x33, 0xf5, 0xfd, 0xc4, 0x4c, 0xbd, 0xb6, 0x63, + 0x4f, 0x46, 0x57, 0xf3, 0xf6, 0x3d, 0xf4, 0xb6, 0x4b, 0x41, 0x3d, 0x1f, 0xb5, 0xac, 0xfa, 0x47, + 0x7e, 0xf7, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x4e, 0xa6, 0x65, 0xda, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dualstaking/types/tx.pb.go b/x/dualstaking/types/tx.pb.go index 4d7cb76748..bd41c1de95 100644 --- a/x/dualstaking/types/tx.pb.go +++ b/x/dualstaking/types/tx.pb.go @@ -479,39 +479,39 @@ var fileDescriptor_29c4c178d368211c = []byte{ // 562 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x94, 0xcf, 0x6e, 0xd3, 0x40, 0x10, 0xc6, 0xe3, 0x26, 0x84, 0x66, 0xd2, 0x0a, 0xd5, 0x6d, 0x89, 0xe3, 0x82, 0x9b, 0xba, 0x42, - 0x14, 0x10, 0xbb, 0x4a, 0x7b, 0x40, 0xea, 0xb1, 0xe9, 0x01, 0x0e, 0x91, 0x50, 0x24, 0x2e, 0xbd, + 0x14, 0x10, 0xbb, 0x4a, 0x41, 0x42, 0xea, 0xb1, 0xe9, 0x01, 0x0e, 0x91, 0x50, 0x24, 0x2e, 0xbd, 0x94, 0x4d, 0xbc, 0x75, 0x2d, 0x6c, 0x4f, 0xe4, 0xdd, 0x84, 0xf2, 0x04, 0x48, 0x9c, 0xb8, 0xf2, 0x16, 0x3c, 0x46, 0x25, 0x0e, 0xf4, 0xc8, 0x09, 0xa1, 0xe4, 0xc0, 0x6b, 0x20, 0xff, 0x8d, 0x13, 0x84, 0x09, 0x47, 0x2e, 0xb1, 0x77, 0xf6, 0x9b, 0x19, 0xff, 0xbe, 0xcc, 0x2e, 0xec, 0xb9, 0x6c, 0xcc, 0x7c, 0x2e, 0x69, 0xf8, 0xa4, 0xd6, 0x88, 0xb9, 0x42, 0xb2, 0x37, 0x8e, 0x6f, 0x53, 0x79, - 0x45, 0x86, 0x01, 0x4a, 0x54, 0xb5, 0x44, 0x42, 0xc2, 0x27, 0xc9, 0x49, 0xf4, 0x0d, 0xe6, 0x39, + 0x49, 0x86, 0x01, 0x4a, 0x54, 0xb5, 0x44, 0x42, 0xc2, 0x27, 0xc9, 0x49, 0xf4, 0x0d, 0xe6, 0x39, 0x3e, 0xd2, 0xe8, 0x37, 0x16, 0xeb, 0xc6, 0x00, 0x85, 0x87, 0x82, 0xf6, 0x99, 0xe0, 0x74, 0xdc, 0xee, 0x73, 0xc9, 0xda, 0x74, 0x80, 0x8e, 0x9f, 0xec, 0x6f, 0xd9, 0x68, 0x63, 0xf4, 0x4a, 0xc3, - 0xb7, 0x38, 0x6a, 0x7e, 0x55, 0xa0, 0xde, 0x15, 0xf6, 0x29, 0x77, 0xb9, 0xcd, 0x24, 0x57, 0x35, - 0xb8, 0x3d, 0x08, 0x38, 0x93, 0x18, 0x68, 0x4a, 0x4b, 0x39, 0xa8, 0xf5, 0xd2, 0xa5, 0x7a, 0x0f, - 0x6a, 0x63, 0xe6, 0x3a, 0x56, 0xb4, 0x77, 0x2b, 0xda, 0x9b, 0x05, 0x54, 0x1d, 0x56, 0x87, 0x01, - 0x8e, 0x1d, 0x8b, 0x07, 0xda, 0x4a, 0xb4, 0x99, 0xad, 0xa3, 0x9a, 0x97, 0xcc, 0xf1, 0x5f, 0x9c, - 0x6a, 0xe5, 0xa4, 0x66, 0xbc, 0x54, 0x9f, 0x41, 0x95, 0x79, 0x38, 0xf2, 0xa5, 0x56, 0x69, 0x29, - 0x07, 0xf5, 0xc3, 0x26, 0x89, 0x21, 0x48, 0x08, 0x41, 0x12, 0x08, 0xd2, 0x41, 0xc7, 0x3f, 0xa9, - 0x5c, 0x7f, 0xdf, 0x2d, 0xf5, 0x12, 0xf9, 0x71, 0xf3, 0xc3, 0xcf, 0xcf, 0x8f, 0xb7, 0xf2, 0xa6, + 0xb7, 0x38, 0x6a, 0x7e, 0x55, 0xa0, 0xde, 0x15, 0xf6, 0x09, 0x77, 0xb9, 0xcd, 0x24, 0x57, 0x35, + 0xb8, 0x39, 0x08, 0x38, 0x93, 0x18, 0x68, 0x4a, 0x4b, 0x39, 0xa8, 0xf5, 0xd2, 0xa5, 0x7a, 0x07, + 0x6a, 0x63, 0xe6, 0x3a, 0x56, 0xb4, 0x77, 0x23, 0xda, 0x9b, 0x05, 0x54, 0x1d, 0x56, 0x87, 0x01, + 0x8e, 0x1d, 0x8b, 0x07, 0xda, 0x4a, 0xb4, 0x99, 0xad, 0xa3, 0x9a, 0x17, 0xcc, 0xf1, 0x5f, 0x9c, + 0x68, 0xe5, 0xa4, 0x66, 0xbc, 0x54, 0x9f, 0x41, 0x95, 0x79, 0x38, 0xf2, 0xa5, 0x56, 0x69, 0x29, + 0x07, 0xf5, 0xc3, 0x26, 0x89, 0x21, 0x48, 0x08, 0x41, 0x12, 0x08, 0xd2, 0x41, 0xc7, 0x3f, 0xae, + 0x5c, 0x7d, 0xdf, 0x2d, 0xf5, 0x12, 0xf9, 0x51, 0xf3, 0xc3, 0xcf, 0xcf, 0x0f, 0xb7, 0xf2, 0xa6, 0xa5, 0x04, 0xe6, 0x36, 0x6c, 0xe6, 0x80, 0x7a, 0x5c, 0x0c, 0xd1, 0x17, 0xdc, 0x7c, 0xbf, 0x02, - 0xeb, 0x5d, 0x61, 0xf7, 0xb8, 0xf5, 0x77, 0xd4, 0x7d, 0x58, 0xbf, 0x08, 0xd0, 0x3b, 0x5f, 0x20, + 0xeb, 0x5d, 0x61, 0xf7, 0xb8, 0xf5, 0x77, 0xd4, 0x7d, 0x58, 0x3f, 0x0f, 0xd0, 0x3b, 0x5b, 0x20, 0x5a, 0x0b, 0x83, 0x2f, 0x53, 0xaa, 0x5d, 0xa8, 0x4b, 0x9c, 0x49, 0x62, 0x32, 0x90, 0x98, 0x09, - 0xf6, 0x20, 0x4a, 0x38, 0x4f, 0xd9, 0x2b, 0x91, 0xa2, 0x1e, 0xc6, 0x3a, 0x09, 0xff, 0x7d, 0x00, + 0xf6, 0x20, 0x4a, 0x38, 0x4b, 0xd9, 0x2b, 0x91, 0xa2, 0x1e, 0xc6, 0x3a, 0x09, 0xff, 0x5d, 0x00, 0x89, 0x99, 0x20, 0x31, 0x55, 0x62, 0xe7, 0x37, 0x7b, 0xaa, 0xff, 0x66, 0xcf, 0x4e, 0x68, 0xcf, - 0xdd, 0xbc, 0x3d, 0x33, 0x6e, 0xb3, 0x01, 0xdb, 0x73, 0x46, 0x64, 0x16, 0x7d, 0x51, 0xa0, 0xd6, + 0xed, 0xbc, 0x3d, 0x33, 0x6e, 0xb3, 0x01, 0xdb, 0x73, 0x46, 0x64, 0x16, 0x7d, 0x51, 0xa0, 0xd6, 0x15, 0xf6, 0x2b, 0xbf, 0x8f, 0xbe, 0xf5, 0xbf, 0x4c, 0x42, 0x23, 0x44, 0x55, 0xf3, 0xa8, 0xf1, - 0xf7, 0x9b, 0x9b, 0xb0, 0x91, 0xc1, 0x64, 0x88, 0x0e, 0xdc, 0xe9, 0x0a, 0xbb, 0xe3, 0x32, 0xc7, - 0xeb, 0xf1, 0xb7, 0x2c, 0xb0, 0x44, 0x01, 0x67, 0x01, 0xc9, 0x71, 0x2b, 0x6c, 0xbb, 0x93, 0x6f, + 0xf7, 0x9b, 0x9b, 0xb0, 0x91, 0xc1, 0x64, 0x88, 0x0e, 0xdc, 0xea, 0x0a, 0xbb, 0xe3, 0x32, 0xc7, + 0xeb, 0xf1, 0xb7, 0x2c, 0xb0, 0x44, 0x01, 0x67, 0x01, 0xc9, 0x51, 0x2b, 0x6c, 0xbb, 0x93, 0x6f, 0xbb, 0x50, 0xd7, 0x6c, 0x42, 0x63, 0x21, 0x94, 0x7e, 0xc5, 0xe1, 0xa7, 0x32, 0x94, 0xbb, 0xc2, - 0x56, 0x5f, 0xc3, 0x6a, 0x76, 0xf0, 0x1e, 0x90, 0x3f, 0x1d, 0x76, 0x92, 0x1b, 0x67, 0xfd, 0xe9, - 0x52, 0xb2, 0xb4, 0x93, 0x7a, 0x01, 0x90, 0x9b, 0xf8, 0x87, 0x85, 0xc9, 0x33, 0xa1, 0x4e, 0x97, - 0x14, 0x66, 0x7d, 0xce, 0xa0, 0x9a, 0x8c, 0xcd, 0x7e, 0x61, 0x6a, 0x2c, 0xd2, 0x9f, 0x2c, 0x21, - 0xca, 0x6a, 0xbb, 0xb0, 0x36, 0xf7, 0x87, 0x3d, 0x2a, 0x4c, 0xce, 0x4b, 0xf5, 0xf6, 0xd2, 0xd2, - 0xb4, 0xdb, 0xc9, 0xf3, 0xeb, 0x89, 0xa1, 0xdc, 0x4c, 0x0c, 0xe5, 0xc7, 0xc4, 0x50, 0x3e, 0x4e, - 0x8d, 0xd2, 0xcd, 0xd4, 0x28, 0x7d, 0x9b, 0x1a, 0xa5, 0x33, 0x62, 0x3b, 0xf2, 0x72, 0xd4, 0x27, - 0x03, 0xf4, 0xe8, 0xdc, 0xdd, 0x3d, 0x3e, 0xa2, 0x57, 0xf3, 0x17, 0xf8, 0xbb, 0x21, 0x17, 0xfd, - 0x6a, 0x74, 0xc3, 0x1e, 0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x30, 0xf6, 0xff, 0xe9, 0x05, + 0x56, 0x5f, 0xc3, 0x6a, 0x76, 0xf0, 0xee, 0x91, 0x3f, 0x1d, 0x76, 0x92, 0x1b, 0x67, 0xfd, 0xf1, + 0x52, 0xb2, 0xb4, 0x93, 0x7a, 0x0e, 0x90, 0x9b, 0xf8, 0xfb, 0x85, 0xc9, 0x33, 0xa1, 0x4e, 0x97, + 0x14, 0x66, 0x7d, 0x4e, 0xa1, 0x9a, 0x8c, 0xcd, 0x7e, 0x61, 0x6a, 0x2c, 0xd2, 0x1f, 0x2d, 0x21, + 0xca, 0x6a, 0xbb, 0xb0, 0x36, 0xf7, 0x87, 0x3d, 0x28, 0x4c, 0xce, 0x4b, 0xf5, 0xf6, 0xd2, 0xd2, + 0xb4, 0xdb, 0xf1, 0xf3, 0xab, 0x89, 0xa1, 0x5c, 0x4f, 0x0c, 0xe5, 0xc7, 0xc4, 0x50, 0x3e, 0x4e, + 0x8d, 0xd2, 0xf5, 0xd4, 0x28, 0x7d, 0x9b, 0x1a, 0xa5, 0x53, 0x62, 0x3b, 0xf2, 0x62, 0xd4, 0x27, + 0x03, 0xf4, 0xe8, 0xdc, 0xdd, 0x3d, 0x7e, 0x4a, 0x2f, 0xe7, 0x2f, 0xf0, 0x77, 0x43, 0x2e, 0xfa, + 0xd5, 0xe8, 0x86, 0x7d, 0xf2, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x39, 0x90, 0x0d, 0xe9, 0x05, 0x00, 0x00, } diff --git a/x/epochstorage/client/cli/query.go b/x/epochstorage/client/cli/query.go index 1f0b91db88..370b4c087c 100644 --- a/x/epochstorage/client/cli/query.go +++ b/x/epochstorage/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/epochstorage/client/cli/query_epoch_details.go b/x/epochstorage/client/cli/query_epoch_details.go index 95be3d3a23..8b66dbc6b9 100644 --- a/x/epochstorage/client/cli/query_epoch_details.go +++ b/x/epochstorage/client/cli/query_epoch_details.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/spf13/cobra" ) diff --git a/x/epochstorage/client/cli/query_epoch_details_test.go b/x/epochstorage/client/cli/query_epoch_details_test.go index 5f1c32e820..fd55bafaa4 100644 --- a/x/epochstorage/client/cli/query_epoch_details_test.go +++ b/x/epochstorage/client/cli/query_epoch_details_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/status" - "github.com/lavanet/lava/v3/testutil/network" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/epochstorage/client/cli" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/testutil/network" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/epochstorage/client/cli" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) func networkWithEpochDetailsObjects(t *testing.T) (*network.Network, types.EpochDetails) { diff --git a/x/epochstorage/client/cli/query_fixated_params.go b/x/epochstorage/client/cli/query_fixated_params.go index 4fdd338cb1..d54281efa0 100644 --- a/x/epochstorage/client/cli/query_fixated_params.go +++ b/x/epochstorage/client/cli/query_fixated_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/spf13/cobra" ) diff --git a/x/epochstorage/client/cli/query_fixated_params_test.go b/x/epochstorage/client/cli/query_fixated_params_test.go index d0aee8617b..c7a8c1fe9e 100644 --- a/x/epochstorage/client/cli/query_fixated_params_test.go +++ b/x/epochstorage/client/cli/query_fixated_params_test.go @@ -12,10 +12,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/lavanet/lava/v3/testutil/network" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/epochstorage/client/cli" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/testutil/network" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/epochstorage/client/cli" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // Prevent strconv unused error diff --git a/x/epochstorage/client/cli/query_params.go b/x/epochstorage/client/cli/query_params.go index d202be1457..cbb2076a3a 100644 --- a/x/epochstorage/client/cli/query_params.go +++ b/x/epochstorage/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/spf13/cobra" ) diff --git a/x/epochstorage/client/cli/query_provider_metadata.go b/x/epochstorage/client/cli/query_provider_metadata.go index cf2a7bb355..a2d5b28d64 100644 --- a/x/epochstorage/client/cli/query_provider_metadata.go +++ b/x/epochstorage/client/cli/query_provider_metadata.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/spf13/cobra" ) diff --git a/x/epochstorage/client/cli/query_stake_storage.go b/x/epochstorage/client/cli/query_stake_storage.go index 6b8fb7a647..e4937381b6 100644 --- a/x/epochstorage/client/cli/query_stake_storage.go +++ b/x/epochstorage/client/cli/query_stake_storage.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/spf13/cobra" ) diff --git a/x/epochstorage/client/cli/tx.go b/x/epochstorage/client/cli/tx.go index a5ba2b68f8..1bbe74b2ef 100644 --- a/x/epochstorage/client/cli/tx.go +++ b/x/epochstorage/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/epochstorage/genesis.go b/x/epochstorage/genesis.go index 7b4b99fb71..f1a99ccd83 100644 --- a/x/epochstorage/genesis.go +++ b/x/epochstorage/genesis.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/epochstorage/genesis_test.go b/x/epochstorage/genesis_test.go index 8fa4e0ce0d..aaf6bf99d6 100644 --- a/x/epochstorage/genesis_test.go +++ b/x/epochstorage/genesis_test.go @@ -3,10 +3,10 @@ package epochstorage_test import ( "testing" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/epochstorage" - "github.com/lavanet/lava/v3/x/epochstorage/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/epochstorage" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/epochstorage/handler.go b/x/epochstorage/handler.go index 594bafaa4b..1baa17ab30 100644 --- a/x/epochstorage/handler.go +++ b/x/epochstorage/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // NewHandler ... diff --git a/x/epochstorage/keeper/epoch_details.go b/x/epochstorage/keeper/epoch_details.go index e1d63a061b..62d1c2c0d1 100644 --- a/x/epochstorage/keeper/epoch_details.go +++ b/x/epochstorage/keeper/epoch_details.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // SetEpochDetails set epochDetails in the store diff --git a/x/epochstorage/keeper/epoch_details_test.go b/x/epochstorage/keeper/epoch_details_test.go index 30fdcfea87..b0721ebd0d 100644 --- a/x/epochstorage/keeper/epoch_details_test.go +++ b/x/epochstorage/keeper/epoch_details_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) func createTestEpochDetails(keeper *keeper.Keeper, ctx sdk.Context) types.EpochDetails { diff --git a/x/epochstorage/keeper/epoch_start.go b/x/epochstorage/keeper/epoch_start.go index 0d04bd3466..2b2454aaa9 100644 --- a/x/epochstorage/keeper/epoch_start.go +++ b/x/epochstorage/keeper/epoch_start.go @@ -5,8 +5,8 @@ import ( "strconv" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // Function that calls all the functions that are supposed to run in epoch start diff --git a/x/epochstorage/keeper/fixated_params.go b/x/epochstorage/keeper/fixated_params.go index 60524261c3..3b8673a2c1 100644 --- a/x/epochstorage/keeper/fixated_params.go +++ b/x/epochstorage/keeper/fixated_params.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // SetFixatedParams set a specific fixatedParams in the store from its index diff --git a/x/epochstorage/keeper/fixated_params_test.go b/x/epochstorage/keeper/fixated_params_test.go index 26c4dbc0a9..5c41d6db5c 100644 --- a/x/epochstorage/keeper/fixated_params_test.go +++ b/x/epochstorage/keeper/fixated_params_test.go @@ -6,11 +6,11 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - common "github.com/lavanet/lava/v3/testutil/common" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + common "github.com/lavanet/lava/v4/testutil/common" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/epochstorage/keeper/grpc_query.go b/x/epochstorage/keeper/grpc_query.go index ba26ad670f..90fbe19e37 100644 --- a/x/epochstorage/keeper/grpc_query.go +++ b/x/epochstorage/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/epochstorage/keeper/grpc_query_epoch_details.go b/x/epochstorage/keeper/grpc_query_epoch_details.go index 936bdc3b45..a27db8f447 100644 --- a/x/epochstorage/keeper/grpc_query_epoch_details.go +++ b/x/epochstorage/keeper/grpc_query_epoch_details.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/epochstorage/keeper/grpc_query_epoch_details_test.go b/x/epochstorage/keeper/grpc_query_epoch_details_test.go index 652f3c78d3..9af0bf9be7 100644 --- a/x/epochstorage/keeper/grpc_query_epoch_details_test.go +++ b/x/epochstorage/keeper/grpc_query_epoch_details_test.go @@ -8,9 +8,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/epochstorage/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) func TestEpochDetailsQuery(t *testing.T) { diff --git a/x/epochstorage/keeper/grpc_query_fixated_params.go b/x/epochstorage/keeper/grpc_query_fixated_params.go index 1c75d59155..b40af3ff43 100644 --- a/x/epochstorage/keeper/grpc_query_fixated_params.go +++ b/x/epochstorage/keeper/grpc_query_fixated_params.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/epochstorage/keeper/grpc_query_fixated_params_test.go b/x/epochstorage/keeper/grpc_query_fixated_params_test.go index 0119d5405d..61bbcac28a 100644 --- a/x/epochstorage/keeper/grpc_query_fixated_params_test.go +++ b/x/epochstorage/keeper/grpc_query_fixated_params_test.go @@ -10,9 +10,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/epochstorage/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // Prevent strconv unused error diff --git a/x/epochstorage/keeper/grpc_query_params.go b/x/epochstorage/keeper/grpc_query_params.go index 8c55ccc592..1924aeb21a 100644 --- a/x/epochstorage/keeper/grpc_query_params.go +++ b/x/epochstorage/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/epochstorage/keeper/grpc_query_params_test.go b/x/epochstorage/keeper/grpc_query_params_test.go index c927a81114..5779e85022 100644 --- a/x/epochstorage/keeper/grpc_query_params_test.go +++ b/x/epochstorage/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/epochstorage/keeper/grpc_query_provider_metadata.go b/x/epochstorage/keeper/grpc_query_provider_metadata.go index 5587c2e2b9..cadec24b82 100644 --- a/x/epochstorage/keeper/grpc_query_provider_metadata.go +++ b/x/epochstorage/keeper/grpc_query_provider_metadata.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/epochstorage/keeper/grpc_query_stake_storage.go b/x/epochstorage/keeper/grpc_query_stake_storage.go index 4f05a5daf6..2668492852 100644 --- a/x/epochstorage/keeper/grpc_query_stake_storage.go +++ b/x/epochstorage/keeper/grpc_query_stake_storage.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/epochstorage/keeper/grpc_query_stake_storage_test.go b/x/epochstorage/keeper/grpc_query_stake_storage_test.go index d37f9d2224..6f3fc0f158 100644 --- a/x/epochstorage/keeper/grpc_query_stake_storage_test.go +++ b/x/epochstorage/keeper/grpc_query_stake_storage_test.go @@ -5,10 +5,10 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/epochstorage/keeper/keeper.go b/x/epochstorage/keeper/keeper.go index a289969d11..cfd32a1b52 100644 --- a/x/epochstorage/keeper/keeper.go +++ b/x/epochstorage/keeper/keeper.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/utils" - collcompat "github.com/lavanet/lava/v3/utils/collcompat" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/utils" + collcompat "github.com/lavanet/lava/v4/utils/collcompat" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) type ( diff --git a/x/epochstorage/keeper/migrations.go b/x/epochstorage/keeper/migrations.go index 7fd34bbf7a..b6871ef26f 100644 --- a/x/epochstorage/keeper/migrations.go +++ b/x/epochstorage/keeper/migrations.go @@ -9,10 +9,10 @@ import ( "cosmossdk.io/collections" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/epochstorage/types" - v3 "github.com/lavanet/lava/v3/x/epochstorage/types/migrations/v3" - v6 "github.com/lavanet/lava/v3/x/epochstorage/types/migrations/v6" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/epochstorage/types" + v3 "github.com/lavanet/lava/v4/x/epochstorage/types/migrations/v3" + v6 "github.com/lavanet/lava/v4/x/epochstorage/types/migrations/v6" ) type Migrator struct { diff --git a/x/epochstorage/keeper/msg_server.go b/x/epochstorage/keeper/msg_server.go index 90a744de6c..060a14266b 100644 --- a/x/epochstorage/keeper/msg_server.go +++ b/x/epochstorage/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) type msgServer struct { diff --git a/x/epochstorage/keeper/msg_server_test.go b/x/epochstorage/keeper/msg_server_test.go index 8b293afc7d..bb72301025 100644 --- a/x/epochstorage/keeper/msg_server_test.go +++ b/x/epochstorage/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { diff --git a/x/epochstorage/keeper/params.go b/x/epochstorage/keeper/params.go index 612dc7f960..13dc516a32 100644 --- a/x/epochstorage/keeper/params.go +++ b/x/epochstorage/keeper/params.go @@ -4,8 +4,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // GetParams get all parameters as types.Params diff --git a/x/epochstorage/keeper/params_test.go b/x/epochstorage/keeper/params_test.go index 2c8de2fe27..c7d1a3960b 100644 --- a/x/epochstorage/keeper/params_test.go +++ b/x/epochstorage/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/epochstorage/keeper/provider_metadata.go b/x/epochstorage/keeper/provider_metadata.go index 9c3db359b3..cfad8d0a07 100644 --- a/x/epochstorage/keeper/provider_metadata.go +++ b/x/epochstorage/keeper/provider_metadata.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) func (k Keeper) GetMetadata(ctx sdk.Context, provider string) (types.ProviderMetadata, error) { diff --git a/x/epochstorage/keeper/stake_entries.go b/x/epochstorage/keeper/stake_entries.go index ad2abcec6e..d99e24ec7f 100644 --- a/x/epochstorage/keeper/stake_entries.go +++ b/x/epochstorage/keeper/stake_entries.go @@ -7,9 +7,9 @@ import ( "cosmossdk.io/collections" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) /* ########## StakeEntry ############ */ diff --git a/x/epochstorage/keeper/stake_entries_test.go b/x/epochstorage/keeper/stake_entries_test.go index 0bdab37d08..8ddc2daed6 100644 --- a/x/epochstorage/keeper/stake_entries_test.go +++ b/x/epochstorage/keeper/stake_entries_test.go @@ -6,9 +6,9 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/epochstorage/module.go b/x/epochstorage/module.go index 8eae4a80a3..6e6cba0642 100644 --- a/x/epochstorage/module.go +++ b/x/epochstorage/module.go @@ -16,9 +16,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/epochstorage/client/cli" - "github.com/lavanet/lava/v3/x/epochstorage/keeper" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/client/cli" + "github.com/lavanet/lava/v4/x/epochstorage/keeper" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) var ( diff --git a/x/epochstorage/module_simulation.go b/x/epochstorage/module_simulation.go index 3e3bc02ff0..59cc07cb51 100644 --- a/x/epochstorage/module_simulation.go +++ b/x/epochstorage/module_simulation.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - epochstoragesimulation "github.com/lavanet/lava/v3/x/epochstorage/simulation" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/testutil/sample" + epochstoragesimulation "github.com/lavanet/lava/v4/x/epochstorage/simulation" + "github.com/lavanet/lava/v4/x/epochstorage/types" ) // avoid unused import issue diff --git a/x/epochstorage/types/endpoint.pb.go b/x/epochstorage/types/endpoint.pb.go index be42a42533..654f4ce9dc 100644 --- a/x/epochstorage/types/endpoint.pb.go +++ b/x/epochstorage/types/endpoint.pb.go @@ -121,9 +121,9 @@ var fileDescriptor_acb18a6b0d300ae9 = []byte{ 0x2b, 0x4a, 0x52, 0xf3, 0x8a, 0x33, 0x41, 0x46, 0xb0, 0x81, 0x95, 0x20, 0x89, 0x78, 0xb1, 0x70, 0x30, 0x09, 0x30, 0x3b, 0x79, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, - 0x7e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x4a, 0xa8, 0x94, 0x19, - 0xeb, 0x57, 0xa0, 0x06, 0x4d, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38, 0x60, 0x8c, 0x01, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x29, 0x1d, 0x0a, 0x96, 0x44, 0x01, 0x00, 0x00, + 0x7e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x4a, 0xa8, 0x94, 0x99, + 0xe8, 0x57, 0xa0, 0x06, 0x4d, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38, 0x60, 0x8c, 0x01, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x11, 0xb4, 0x28, 0x23, 0x44, 0x01, 0x00, 0x00, } func (m *Endpoint) Marshal() (dAtA []byte, err error) { diff --git a/x/epochstorage/types/epoch_details.pb.go b/x/epochstorage/types/epoch_details.pb.go index d34623e6c3..283b23f272 100644 --- a/x/epochstorage/types/epoch_details.pb.go +++ b/x/epochstorage/types/epoch_details.pb.go @@ -103,8 +103,8 @@ var fileDescriptor_5a742d00b5f6efc1 = []byte{ 0x2b, 0x30, 0x83, 0x54, 0xa1, 0x08, 0x3a, 0x79, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x7e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x8a, - 0x57, 0xcb, 0x8c, 0xf5, 0x2b, 0x50, 0xfd, 0x5b, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, - 0xa8, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x9a, 0x59, 0x4f, 0x07, 0x19, 0x01, 0x00, 0x00, + 0x57, 0xcb, 0x4c, 0xf4, 0x2b, 0x50, 0xfd, 0x5b, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, + 0xa8, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xf0, 0x6d, 0xb2, 0x19, 0x01, 0x00, 0x00, } func (m *EpochDetails) Marshal() (dAtA []byte, err error) { diff --git a/x/epochstorage/types/expected_keepers.go b/x/epochstorage/types/expected_keepers.go index d684d958cd..a6fa9a5c1e 100644 --- a/x/epochstorage/types/expected_keepers.go +++ b/x/epochstorage/types/expected_keepers.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type SpecKeeper interface { diff --git a/x/epochstorage/types/fixated_params.pb.go b/x/epochstorage/types/fixated_params.pb.go index 59f7b6bff9..ee7d94ac9c 100644 --- a/x/epochstorage/types/fixated_params.pb.go +++ b/x/epochstorage/types/fixated_params.pb.go @@ -105,8 +105,8 @@ var fileDescriptor_fa13bd82b46f86d2 = []byte{ 0xce, 0x96, 0x60, 0x56, 0x60, 0xd4, 0x60, 0x09, 0x42, 0x15, 0x74, 0xf2, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xfd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, - 0xfc, 0x5c, 0x7d, 0x14, 0x77, 0x97, 0x19, 0xeb, 0x57, 0xa0, 0x3a, 0xbe, 0xa4, 0xb2, 0x20, 0xb5, - 0x38, 0x89, 0x0d, 0xec, 0x78, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x96, 0xce, 0x7a, 0x27, + 0xfc, 0x5c, 0x7d, 0x14, 0x77, 0x97, 0x99, 0xe8, 0x57, 0xa0, 0x3a, 0xbe, 0xa4, 0xb2, 0x20, 0xb5, + 0x38, 0x89, 0x0d, 0xec, 0x78, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0x67, 0x58, 0x92, 0x47, 0x01, 0x00, 0x00, } diff --git a/x/epochstorage/types/genesis.pb.go b/x/epochstorage/types/genesis.pb.go index 883c298dcc..e87e6ab77e 100644 --- a/x/epochstorage/types/genesis.pb.go +++ b/x/epochstorage/types/genesis.pb.go @@ -120,8 +120,8 @@ var fileDescriptor_6b4c1a9bc1f09c0e = []byte{ 0xa8, 0x4b, 0x31, 0x0d, 0x72, 0xf2, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xfd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x94, 0xc8, 0x2a, - 0x33, 0xd6, 0xaf, 0x40, 0x8d, 0xb1, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x4c, 0x19, - 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x9c, 0x7e, 0xcc, 0xbb, 0x02, 0x00, 0x00, + 0x33, 0xd1, 0xaf, 0x40, 0x8d, 0xb1, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x4c, 0x19, + 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x54, 0x35, 0x5c, 0x79, 0xbb, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/epochstorage/types/genesis_test.go b/x/epochstorage/types/genesis_test.go index 9aea252088..4e8ba6da82 100644 --- a/x/epochstorage/types/genesis_test.go +++ b/x/epochstorage/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/epochstorage/types/params.pb.go b/x/epochstorage/types/params.pb.go index 1cdb46491c..172f5f2e81 100644 --- a/x/epochstorage/types/params.pb.go +++ b/x/epochstorage/types/params.pb.go @@ -109,8 +109,8 @@ var fileDescriptor_09513f4cf6e403e6 = []byte{ 0x46, 0x01, 0x26, 0x2f, 0x16, 0x0e, 0x56, 0x01, 0x36, 0x27, 0xcf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, 0x4f, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, - 0xd5, 0x47, 0x09, 0xe2, 0x32, 0x63, 0xfd, 0x0a, 0xd4, 0x70, 0x2e, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, - 0x62, 0x03, 0x07, 0x9b, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x92, 0x7f, 0x86, 0xb2, 0x91, 0x01, + 0xd5, 0x47, 0x09, 0xe2, 0x32, 0x13, 0xfd, 0x0a, 0xd4, 0x70, 0x2e, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, + 0x62, 0x03, 0x07, 0x9b, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xaa, 0xd6, 0xa4, 0x07, 0x91, 0x01, 0x00, 0x00, } diff --git a/x/epochstorage/types/provider_metadata.pb.go b/x/epochstorage/types/provider_metadata.pb.go index 873bcdbcd8..9ac94c6dcd 100644 --- a/x/epochstorage/types/provider_metadata.pb.go +++ b/x/epochstorage/types/provider_metadata.pb.go @@ -127,33 +127,33 @@ func init() { } var fileDescriptor_eea88d8dbfad23fd = []byte{ - // 401 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0x31, 0x6e, 0xdb, 0x30, - 0x18, 0x85, 0xcd, 0xc4, 0x71, 0x6b, 0x7a, 0x49, 0xd8, 0xa0, 0x50, 0x3c, 0x28, 0x46, 0xdb, 0xc1, - 0xe8, 0x40, 0xc2, 0xcd, 0x0d, 0xec, 0x2c, 0x05, 0x5a, 0x20, 0xd0, 0xd8, 0xc5, 0xf8, 0x45, 0x11, - 0x12, 0x51, 0x89, 0xbf, 0x20, 0x32, 0x42, 0x7b, 0x8b, 0x1e, 0xa3, 0x63, 0x8f, 0x91, 0xa9, 0xc8, - 0xd8, 0xa9, 0x28, 0xec, 0xa1, 0xd7, 0x08, 0x44, 0x51, 0x4e, 0xb2, 0x88, 0x7a, 0xff, 0x7b, 0x8f, - 0xfa, 0x20, 0x92, 0xae, 0x4a, 0x68, 0xc1, 0x28, 0x27, 0xba, 0x55, 0xa8, 0x1a, 0x65, 0x61, 0x1d, - 0x36, 0x90, 0x2b, 0x51, 0x37, 0xd8, 0xea, 0x4c, 0x35, 0xdb, 0x4a, 0x39, 0xc8, 0xc0, 0x01, 0xaf, - 0x1b, 0x74, 0xc8, 0x2e, 0x42, 0x85, 0x77, 0x2b, 0x7f, 0x5a, 0x99, 0x9f, 0xe7, 0x98, 0xa3, 0x4f, - 0x89, 0xee, 0xad, 0x2f, 0xcc, 0x63, 0x89, 0xb6, 0x42, 0x2b, 0x52, 0xb0, 0x4a, 0xb4, 0xab, 0x54, - 0x39, 0x58, 0x09, 0x89, 0xda, 0x04, 0xff, 0x0c, 0x2a, 0x6d, 0x50, 0xf8, 0x67, 0x18, 0xbd, 0x0b, - 0x15, 0xeb, 0xe0, 0xab, 0x36, 0xf9, 0xa1, 0x15, 0x74, 0x9f, 0x7a, 0xf3, 0xfb, 0x88, 0x9e, 0xde, - 0x04, 0xca, 0xcf, 0x01, 0x92, 0xcd, 0xe9, 0xcb, 0x81, 0x3c, 0x22, 0x0b, 0xb2, 0x9c, 0x26, 0x07, - 0xcd, 0xce, 0xe9, 0x49, 0x0b, 0xb7, 0xa5, 0x8b, 0x8e, 0xbc, 0xd1, 0x0b, 0xf6, 0x89, 0x9e, 0x39, - 0x74, 0x50, 0x6e, 0x33, 0x55, 0xaa, 0x1c, 0x9c, 0x46, 0x63, 0xa3, 0xe3, 0x05, 0x59, 0xce, 0x3e, - 0x5c, 0xf0, 0x1e, 0x84, 0x77, 0xec, 0x3c, 0x50, 0xf0, 0x0d, 0x6a, 0xb3, 0x1e, 0xdf, 0xfd, 0xbd, - 0x1c, 0x25, 0xa7, 0xbe, 0x79, 0xfd, 0x58, 0x64, 0xaf, 0xe9, 0x44, 0x16, 0xa0, 0x8d, 0x8d, 0xc6, - 0x8b, 0xe3, 0xe5, 0x34, 0x09, 0x8a, 0x09, 0xfa, 0x2a, 0xec, 0xaf, 0xb6, 0x12, 0xab, 0x4a, 0x5b, - 0xab, 0xd1, 0x44, 0x27, 0x0b, 0xb2, 0x1c, 0x27, 0x6c, 0xb0, 0x36, 0x07, 0x87, 0x5d, 0xd2, 0x59, - 0x09, 0xd6, 0x6d, 0x65, 0x01, 0x26, 0x57, 0xd1, 0xc4, 0x07, 0x69, 0x37, 0xda, 0xf8, 0x09, 0xbb, - 0xa1, 0xb3, 0x4c, 0x59, 0xd9, 0xe8, 0xba, 0xfb, 0x72, 0xf4, 0xc2, 0x13, 0xbf, 0x1d, 0x88, 0x87, - 0x5f, 0x35, 0x40, 0x5f, 0x3f, 0x46, 0xd7, 0xd3, 0x8e, 0xfd, 0xe7, 0xff, 0x5f, 0xef, 0x49, 0xf2, - 0x74, 0x8b, 0xf5, 0xc7, 0xbb, 0x5d, 0x4c, 0xee, 0x77, 0x31, 0xf9, 0xb7, 0x8b, 0xc9, 0x8f, 0x7d, - 0x3c, 0xba, 0xdf, 0xc7, 0xa3, 0x3f, 0xfb, 0x78, 0xf4, 0x45, 0xe4, 0xda, 0x15, 0xb7, 0x29, 0x97, - 0x58, 0x89, 0x67, 0x57, 0xa6, 0xbd, 0x12, 0xdf, 0x9e, 0xdf, 0x1b, 0xf7, 0xbd, 0x56, 0x36, 0x9d, - 0xf8, 0x23, 0xba, 0x7a, 0x08, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x00, 0x30, 0x06, 0x61, 0x02, 0x00, - 0x00, + // 402 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xc1, 0x6e, 0xd3, 0x30, + 0x1c, 0xc6, 0xeb, 0xad, 0x2b, 0xd4, 0xbd, 0x6c, 0x66, 0x42, 0x59, 0x0f, 0x59, 0x05, 0x1c, 0x2a, + 0x0e, 0xb6, 0x0a, 0x3c, 0x41, 0xbb, 0x0b, 0x12, 0x48, 0x53, 0x8e, 0x5c, 0xaa, 0x7f, 0x1c, 0x2b, + 0xb1, 0x48, 0xfc, 0x8f, 0x62, 0x2f, 0x82, 0xb7, 0xe0, 0x31, 0x38, 0xf2, 0x18, 0x3b, 0xa1, 0x1d, + 0x39, 0x21, 0xd4, 0x1e, 0x78, 0x8d, 0x29, 0x8e, 0xd3, 0x6d, 0x97, 0x38, 0xdf, 0xff, 0xfb, 0x3e, + 0xe7, 0xa7, 0xd8, 0x74, 0x55, 0x42, 0x0b, 0x46, 0x39, 0xd1, 0xad, 0x42, 0xd5, 0x28, 0x0b, 0xeb, + 0xb0, 0x81, 0x5c, 0x89, 0xba, 0xc1, 0x56, 0x67, 0xaa, 0xd9, 0x56, 0xca, 0x41, 0x06, 0x0e, 0x78, + 0xdd, 0xa0, 0x43, 0x76, 0x11, 0x2a, 0xbc, 0x5b, 0xf9, 0xe3, 0xca, 0xfc, 0x3c, 0xc7, 0x1c, 0x7d, + 0x4a, 0x74, 0x6f, 0x7d, 0x61, 0x1e, 0x4b, 0xb4, 0x15, 0x5a, 0x91, 0x82, 0x55, 0xa2, 0x5d, 0xa5, + 0xca, 0xc1, 0x4a, 0x48, 0xd4, 0x26, 0xf8, 0x67, 0x50, 0x69, 0x83, 0xc2, 0x3f, 0xc3, 0xe8, 0x4d, + 0xa8, 0x58, 0x07, 0x5f, 0xb5, 0xc9, 0x0f, 0xad, 0xa0, 0xfb, 0xd4, 0xab, 0xdf, 0x47, 0xf4, 0xf4, + 0x3a, 0x50, 0x7e, 0x0e, 0x90, 0x6c, 0x4e, 0x9f, 0x0f, 0xe4, 0x11, 0x59, 0x90, 0xe5, 0x34, 0x39, + 0x68, 0x76, 0x4e, 0x4f, 0x5a, 0xb8, 0x29, 0x5d, 0x74, 0xe4, 0x8d, 0x5e, 0xb0, 0x4f, 0xf4, 0xcc, + 0xa1, 0x83, 0x72, 0x9b, 0xa9, 0x52, 0xe5, 0xe0, 0x34, 0x1a, 0x1b, 0x1d, 0x2f, 0xc8, 0x72, 0xf6, + 0xee, 0x82, 0xf7, 0x20, 0xbc, 0x63, 0xe7, 0x81, 0x82, 0x6f, 0x50, 0x9b, 0xf5, 0xf8, 0xf6, 0xef, + 0xe5, 0x28, 0x39, 0xf5, 0xcd, 0xab, 0x87, 0x22, 0x7b, 0x49, 0x27, 0xb2, 0x00, 0x6d, 0x6c, 0x34, + 0x5e, 0x1c, 0x2f, 0xa7, 0x49, 0x50, 0x4c, 0xd0, 0x17, 0x61, 0x7f, 0xb5, 0x95, 0x58, 0x55, 0xda, + 0x5a, 0x8d, 0x26, 0x3a, 0x59, 0x90, 0xe5, 0x38, 0x61, 0x83, 0xb5, 0x39, 0x38, 0xec, 0x92, 0xce, + 0x4a, 0xb0, 0x6e, 0x2b, 0x0b, 0x30, 0xb9, 0x8a, 0x26, 0x3e, 0x48, 0xbb, 0xd1, 0xc6, 0x4f, 0xd8, + 0x35, 0x9d, 0x65, 0xca, 0xca, 0x46, 0xd7, 0xdd, 0x97, 0xa3, 0x67, 0x9e, 0xf8, 0xf5, 0x40, 0x3c, + 0xfc, 0xaa, 0x01, 0xfa, 0xea, 0x21, 0xba, 0x9e, 0x76, 0xec, 0x3f, 0xff, 0xff, 0x7a, 0x4b, 0x92, + 0xc7, 0x5b, 0xac, 0x3f, 0xde, 0xee, 0x62, 0x72, 0xb7, 0x8b, 0xc9, 0xbf, 0x5d, 0x4c, 0x7e, 0xec, + 0xe3, 0xd1, 0xdd, 0x3e, 0x1e, 0xfd, 0xd9, 0xc7, 0xa3, 0x2f, 0x22, 0xd7, 0xae, 0xb8, 0x49, 0xb9, + 0xc4, 0x4a, 0x3c, 0xb9, 0x32, 0xed, 0x07, 0xf1, 0xed, 0xe9, 0xbd, 0x71, 0xdf, 0x6b, 0x65, 0xd3, + 0x89, 0x3f, 0xa2, 0xf7, 0xf7, 0x01, 0x00, 0x00, 0xff, 0xff, 0x46, 0xa9, 0x12, 0xb3, 0x61, 0x02, + 0x00, 0x00, } func (m *ProviderMetadata) Marshal() (dAtA []byte, err error) { diff --git a/x/epochstorage/types/query.pb.go b/x/epochstorage/types/query.pb.go index 2247632086..53bd8ba747 100644 --- a/x/epochstorage/types/query.pb.go +++ b/x/epochstorage/types/query.pb.go @@ -672,58 +672,58 @@ func init() { } var fileDescriptor_60112e15fc266719 = []byte{ - // 807 bytes of a gzipped FileDescriptorProto + // 806 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcd, 0x4f, 0x13, 0x4d, - 0x1c, 0xc7, 0x3b, 0xf0, 0x40, 0x78, 0xe6, 0x81, 0x3c, 0x64, 0x1e, 0x0e, 0x8f, 0x15, 0xaa, 0xac, - 0x11, 0x79, 0x09, 0x3b, 0x94, 0x1a, 0x01, 0x2f, 0x04, 0x82, 0x10, 0x0f, 0x24, 0x50, 0x8c, 0x07, - 0x2f, 0xcd, 0xb4, 0x1d, 0xca, 0xc6, 0x76, 0xa7, 0x74, 0xa7, 0x0d, 0x84, 0x70, 0xf1, 0xe2, 0xd5, - 0xe8, 0x5f, 0x62, 0xe2, 0x41, 0x4d, 0xf4, 0x68, 0x38, 0x92, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x87, - 0x98, 0x9d, 0xfd, 0x2d, 0xdd, 0xb1, 0xbb, 0xdd, 0x45, 0x38, 0xb5, 0x3b, 0xfd, 0xbd, 0x7c, 0x7e, - 0x2f, 0xfb, 0xed, 0xe0, 0xbb, 0x55, 0xd6, 0x62, 0x36, 0x97, 0xd4, 0xfd, 0xa4, 0xbc, 0x2e, 0x4a, - 0x7b, 0x8e, 0x14, 0x0d, 0x56, 0xe1, 0x74, 0xbf, 0xc9, 0x1b, 0x87, 0x66, 0xbd, 0x21, 0xa4, 0x20, - 0x37, 0xc0, 0xcc, 0x74, 0x3f, 0xcd, 0xa0, 0x59, 0x7a, 0xb4, 0x22, 0x44, 0xa5, 0xca, 0x29, 0xab, - 0x5b, 0x94, 0xd9, 0xb6, 0x90, 0x4c, 0x5a, 0xc2, 0x76, 0x3c, 0xc7, 0xf4, 0x74, 0x49, 0x38, 0x35, - 0xe1, 0xd0, 0x22, 0x73, 0x20, 0x22, 0x6d, 0x65, 0x8b, 0x5c, 0xb2, 0x2c, 0xad, 0xb3, 0x8a, 0x65, - 0x2b, 0x63, 0xb0, 0x9d, 0x88, 0x66, 0xa9, 0xb3, 0x06, 0xab, 0xf9, 0x31, 0x67, 0xa3, 0xed, 0x1c, - 0xc9, 0x9e, 0xf3, 0x02, 0x3c, 0xc5, 0x9b, 0xab, 0x87, 0x42, 0x99, 0x4b, 0x66, 0x55, 0xfd, 0xe8, - 0x66, 0xb4, 0xf9, 0xae, 0x75, 0xc0, 0x24, 0x2f, 0x17, 0x34, 0x9a, 0x6c, 0x17, 0xea, 0x86, 0x68, - 0x59, 0x65, 0xde, 0x28, 0xd4, 0xb8, 0x64, 0x65, 0x26, 0x19, 0xb8, 0x64, 0x82, 0x4d, 0xf1, 0xdb, - 0x51, 0x12, 0x96, 0xdf, 0x88, 0x91, 0x8a, 0xa8, 0x08, 0xf5, 0x95, 0xba, 0xdf, 0xbc, 0x53, 0x63, - 0x04, 0x93, 0x6d, 0xb7, 0x81, 0x5b, 0x2a, 0x7b, 0x9e, 0xef, 0x37, 0xb9, 0x23, 0x8d, 0xa7, 0xf8, - 0x3f, 0xed, 0xd4, 0xa9, 0x0b, 0xdb, 0xe1, 0x64, 0x19, 0xf7, 0x7b, 0x94, 0xff, 0xa3, 0xdb, 0x68, - 0xf2, 0x9f, 0xf9, 0x71, 0x33, 0x72, 0x82, 0xa6, 0xe7, 0xba, 0xfa, 0xd7, 0xc9, 0xf7, 0x5b, 0xa9, - 0x3c, 0xb8, 0x19, 0x39, 0x7c, 0x53, 0xc5, 0xdd, 0xe0, 0x72, 0xc7, 0x6d, 0xea, 0x8e, 0x67, 0x0c, - 0x69, 0xc9, 0x08, 0xee, 0xb3, 0xec, 0x32, 0x3f, 0x50, 0xe1, 0xff, 0xce, 0x7b, 0x0f, 0xc6, 0x3e, - 0x1e, 0x0d, 0x77, 0x02, 0xaa, 0x6d, 0x3c, 0xe8, 0x04, 0xce, 0x81, 0xed, 0x5e, 0x17, 0xb6, 0x60, - 0x18, 0x20, 0xd4, 0x42, 0x18, 0x1c, 0x38, 0x57, 0xaa, 0xd5, 0x30, 0xce, 0x75, 0x8c, 0xdb, 0x7b, - 0x06, 0xf9, 0x26, 0x4c, 0xaf, 0xff, 0xa6, 0xdb, 0x7f, 0xd3, 0x5b, 0x73, 0x98, 0x82, 0xb9, 0xd5, - 0xf6, 0xcd, 0x07, 0x3c, 0x8d, 0x8f, 0x08, 0x4a, 0xeb, 0xc8, 0x13, 0x59, 0x5a, 0xef, 0x15, 0x4b, - 0x23, 0x1b, 0x1a, 0x7b, 0x0f, 0xf4, 0x2a, 0x8e, 0xdd, 0xe3, 0xd1, 0xe0, 0xc7, 0xda, 0xb3, 0x7c, - 0xe4, 0x12, 0xac, 0x79, 0x0b, 0xef, 0xaf, 0x50, 0x60, 0x6a, 0xfa, 0xcf, 0xed, 0xd2, 0x82, 0xe7, - 0x09, 0xa6, 0x16, 0x34, 0xf7, 0x4b, 0x0b, 0x9e, 0x19, 0xf7, 0xdb, 0x29, 0xd7, 0xbd, 0x97, 0x4a, - 0xdb, 0xea, 0x88, 0xf5, 0x6a, 0xe2, 0xb1, 0x08, 0x2f, 0x20, 0x7d, 0x82, 0x87, 0x76, 0x83, 0x3f, - 0x00, 0xea, 0x64, 0x17, 0x54, 0x2d, 0x10, 0xb0, 0xea, 0x41, 0x8c, 0xdd, 0xf6, 0xe8, 0x43, 0x61, - 0xaf, 0x6b, 0xc7, 0x3e, 0x23, 0xa8, 0xaf, 0x33, 0x51, 0x74, 0x7d, 0xbd, 0x57, 0xae, 0xef, 0xfa, - 0xf6, 0xec, 0x21, 0x34, 0x6a, 0x0b, 0x74, 0x6f, 0x93, 0x4b, 0xb6, 0xc6, 0x24, 0xf3, 0x1b, 0x95, - 0xc6, 0x03, 0xbe, 0x24, 0xc2, 0x60, 0x2f, 0x9e, 0x0d, 0x1b, 0x6a, 0xef, 0xf4, 0x85, 0xda, 0x37, - 0xf1, 0x80, 0x7f, 0x06, 0x65, 0xcf, 0x74, 0xd3, 0xb4, 0x40, 0x18, 0x57, 0x79, 0xa1, 0xf2, 0x8b, - 0x10, 0xf3, 0x2f, 0x31, 0xee, 0x53, 0x09, 0xc9, 0x6b, 0x84, 0xfb, 0xa1, 0x13, 0xb3, 0x5d, 0x22, - 0x76, 0x6a, 0x6f, 0xda, 0x4c, 0x6a, 0xee, 0x95, 0x60, 0x4c, 0xbd, 0xf8, 0xfa, 0xf3, 0x4d, 0xcf, - 0x1d, 0x32, 0x4e, 0xe3, 0xfe, 0xe9, 0xc8, 0x07, 0x84, 0x07, 0x83, 0x02, 0x41, 0x1e, 0xc4, 0xe5, - 0x0a, 0x17, 0xea, 0xf4, 0xc2, 0xa5, 0xfd, 0x00, 0x76, 0x51, 0xc1, 0xce, 0x93, 0x39, 0x9a, 0xf0, - 0xef, 0x96, 0x1e, 0xa9, 0xb7, 0xf4, 0x98, 0xbc, 0x43, 0xf8, 0xdf, 0x60, 0xc8, 0x95, 0x6a, 0x35, - 0x1e, 0x3f, 0x5c, 0xbf, 0xe3, 0xf1, 0x23, 0xf4, 0xd8, 0x98, 0x53, 0xf8, 0xd3, 0x64, 0x32, 0x29, - 0x3e, 0x79, 0x8b, 0x74, 0x9d, 0x4b, 0xd4, 0xf2, 0x10, 0x3d, 0x4d, 0xd4, 0xf2, 0x30, 0xa1, 0x4d, - 0xc4, 0xac, 0x5d, 0x59, 0xc8, 0x27, 0x84, 0x87, 0xb4, 0x37, 0x9c, 0x24, 0x49, 0x1e, 0xa6, 0x62, - 0xe9, 0xc5, 0xcb, 0x3b, 0x02, 0xf6, 0x92, 0xc2, 0xce, 0x91, 0x2c, 0x4d, 0x7a, 0x75, 0xba, 0x58, - 0x95, 0xf7, 0x08, 0x0f, 0x6b, 0x41, 0xdd, 0x5d, 0x49, 0x32, 0xf3, 0x3f, 0x2b, 0x21, 0x4a, 0x58, - 0x8d, 0xac, 0x2a, 0x61, 0x86, 0x4c, 0x25, 0x2e, 0x81, 0x7c, 0x41, 0x78, 0xf8, 0x77, 0xb1, 0x8a, - 0x47, 0x8f, 0x90, 0xc6, 0x78, 0xf4, 0x28, 0x5d, 0x34, 0x96, 0x15, 0xfa, 0x12, 0x59, 0xa0, 0x97, - 0xb8, 0x88, 0xd2, 0x23, 0xff, 0xe8, 0x78, 0xf5, 0xf1, 0xc9, 0x59, 0x06, 0x9d, 0x9e, 0x65, 0xd0, - 0x8f, 0xb3, 0x0c, 0x7a, 0x75, 0x9e, 0x49, 0x9d, 0x9e, 0x67, 0x52, 0xdf, 0xce, 0x33, 0xa9, 0x67, - 0xb4, 0x62, 0xc9, 0xbd, 0x66, 0xd1, 0x2c, 0x89, 0x9a, 0x1e, 0xbc, 0x95, 0xa3, 0x07, 0x7a, 0x06, - 0x79, 0x58, 0xe7, 0x4e, 0xb1, 0x5f, 0xdd, 0x54, 0x73, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xdb, - 0xdb, 0xbf, 0x35, 0x56, 0x0c, 0x00, 0x00, + 0x1c, 0xc7, 0x3b, 0xf0, 0x40, 0x78, 0xe6, 0x81, 0x3c, 0x64, 0xe4, 0xa0, 0x15, 0xaa, 0xac, 0x11, + 0x79, 0x09, 0x3b, 0x14, 0x88, 0x80, 0x17, 0x02, 0x41, 0x88, 0x07, 0x12, 0x28, 0xc6, 0x83, 0x97, + 0x66, 0xda, 0x0e, 0x65, 0x63, 0xbb, 0x53, 0xba, 0xd3, 0x06, 0x42, 0xb8, 0x78, 0xf1, 0x6a, 0xf4, + 0x2f, 0x31, 0xf1, 0xa0, 0x26, 0x7a, 0x34, 0x1c, 0x49, 0xbc, 0x78, 0x32, 0x06, 0xfc, 0x43, 0xcc, + 0xce, 0xfe, 0x96, 0xee, 0xd8, 0xdd, 0xee, 0x22, 0x9c, 0xda, 0x9d, 0xfe, 0x5e, 0x3e, 0xbf, 0x97, + 0xfd, 0x76, 0xf0, 0xfd, 0x0a, 0x6b, 0x32, 0x9b, 0x4b, 0xea, 0x7e, 0x52, 0x5e, 0x13, 0xc5, 0x3d, + 0x47, 0x8a, 0x3a, 0x2b, 0x73, 0xba, 0xdf, 0xe0, 0xf5, 0x43, 0xb3, 0x56, 0x17, 0x52, 0x90, 0x5b, + 0x60, 0x66, 0xba, 0x9f, 0x66, 0xd0, 0x2c, 0x3d, 0x5c, 0x16, 0xa2, 0x5c, 0xe1, 0x94, 0xd5, 0x2c, + 0xca, 0x6c, 0x5b, 0x48, 0x26, 0x2d, 0x61, 0x3b, 0x9e, 0x63, 0x7a, 0xb2, 0x28, 0x9c, 0xaa, 0x70, + 0x68, 0x81, 0x39, 0x10, 0x91, 0x36, 0xb3, 0x05, 0x2e, 0x59, 0x96, 0xd6, 0x58, 0xd9, 0xb2, 0x95, + 0x31, 0xd8, 0x8e, 0x45, 0xb3, 0xd4, 0x58, 0x9d, 0x55, 0xfd, 0x98, 0xd3, 0xd1, 0x76, 0x8e, 0x64, + 0x2f, 0x78, 0x1e, 0x9e, 0xe2, 0xcd, 0xd5, 0x43, 0xbe, 0xc4, 0x25, 0xb3, 0x2a, 0x7e, 0x74, 0x33, + 0xda, 0x7c, 0xd7, 0x3a, 0x60, 0x92, 0x97, 0xf2, 0x1a, 0x4d, 0xb6, 0x03, 0x75, 0x5d, 0x34, 0xad, + 0x12, 0xaf, 0xe7, 0xab, 0x5c, 0xb2, 0x12, 0x93, 0x0c, 0x5c, 0x32, 0xc1, 0xa6, 0xf8, 0xed, 0x28, + 0x0a, 0xcb, 0x6f, 0xc4, 0x50, 0x59, 0x94, 0x85, 0xfa, 0x4a, 0xdd, 0x6f, 0xde, 0xa9, 0x31, 0x84, + 0xc9, 0xb6, 0xdb, 0xc0, 0x2d, 0x95, 0x3d, 0xc7, 0xf7, 0x1b, 0xdc, 0x91, 0xc6, 0x33, 0x7c, 0x43, + 0x3b, 0x75, 0x6a, 0xc2, 0x76, 0x38, 0x59, 0xc6, 0xbd, 0x1e, 0xe5, 0x4d, 0x74, 0x17, 0x8d, 0xff, + 0x37, 0x3b, 0x6a, 0x46, 0x4e, 0xd0, 0xf4, 0x5c, 0x57, 0xff, 0x39, 0xf9, 0x71, 0x27, 0x95, 0x03, + 0x37, 0x63, 0x0e, 0xdf, 0x56, 0x71, 0x37, 0xb8, 0xdc, 0x71, 0x9b, 0xba, 0xe3, 0x19, 0x43, 0x5a, + 0x32, 0x84, 0x7b, 0x2c, 0xbb, 0xc4, 0x0f, 0x54, 0xf8, 0x7f, 0x73, 0xde, 0x83, 0xb1, 0x8f, 0x87, + 0xc3, 0x9d, 0x80, 0x6a, 0x1b, 0xf7, 0x3b, 0x81, 0x73, 0x60, 0x7b, 0xd0, 0x81, 0x2d, 0x18, 0x06, + 0x08, 0xb5, 0x10, 0x06, 0x07, 0xce, 0x95, 0x4a, 0x25, 0x8c, 0x73, 0x1d, 0xe3, 0xd6, 0x9e, 0x41, + 0xbe, 0x31, 0xd3, 0xeb, 0xbf, 0xe9, 0xf6, 0xdf, 0xf4, 0xd6, 0x1c, 0xa6, 0x60, 0x6e, 0xb5, 0x7c, + 0x73, 0x01, 0x4f, 0xe3, 0x13, 0x82, 0xd2, 0xda, 0xf2, 0x44, 0x96, 0xd6, 0x7d, 0xc5, 0xd2, 0xc8, + 0x86, 0xc6, 0xde, 0x05, 0xbd, 0x8a, 0x63, 0xf7, 0x78, 0x34, 0xf8, 0x91, 0xd6, 0x2c, 0x1f, 0xbb, + 0x04, 0x6b, 0xde, 0xc2, 0xfb, 0x2b, 0x14, 0x98, 0x9a, 0xfe, 0x73, 0xab, 0xb4, 0xe0, 0x79, 0x82, + 0xa9, 0x05, 0xcd, 0xfd, 0xd2, 0x82, 0x67, 0xc6, 0x7c, 0x2b, 0xe5, 0xba, 0xf7, 0x52, 0x69, 0x5b, + 0x1d, 0xb1, 0x5e, 0x0d, 0x3c, 0x12, 0xe1, 0x05, 0xa4, 0x4f, 0xf1, 0xc0, 0x6e, 0xf0, 0x07, 0x40, + 0x1d, 0xef, 0x80, 0xaa, 0x05, 0x02, 0x56, 0x3d, 0x88, 0xb1, 0xdb, 0x1a, 0x7d, 0x28, 0xec, 0x75, + 0xed, 0xd8, 0x17, 0x04, 0xf5, 0xb5, 0x27, 0x8a, 0xae, 0xaf, 0xfb, 0xca, 0xf5, 0x5d, 0xdf, 0x9e, + 0x3d, 0x82, 0x46, 0x6d, 0x81, 0xee, 0x6d, 0x72, 0xc9, 0xd6, 0x98, 0x64, 0x7e, 0xa3, 0xd2, 0xb8, + 0xcf, 0x97, 0x44, 0x18, 0xec, 0xc5, 0xb3, 0x61, 0x43, 0xed, 0xed, 0xbe, 0x50, 0xfb, 0x26, 0xee, + 0xf3, 0xcf, 0xa0, 0xec, 0xa9, 0x4e, 0x9a, 0x16, 0x08, 0xe3, 0x2a, 0x2f, 0x54, 0x7e, 0x11, 0x62, + 0xf6, 0x15, 0xc6, 0x3d, 0x2a, 0x21, 0x79, 0x83, 0x70, 0x2f, 0x74, 0x62, 0xba, 0x43, 0xc4, 0x76, + 0xed, 0x4d, 0x9b, 0x49, 0xcd, 0xbd, 0x12, 0x8c, 0x89, 0x97, 0xdf, 0x7e, 0xbd, 0xed, 0xba, 0x47, + 0x46, 0x69, 0xdc, 0x3f, 0x1d, 0xf9, 0x88, 0x70, 0x7f, 0x50, 0x20, 0xc8, 0xc3, 0xb8, 0x5c, 0xe1, + 0x42, 0x9d, 0x5e, 0xb8, 0xb4, 0x1f, 0xc0, 0x2e, 0x2a, 0xd8, 0x59, 0x32, 0x43, 0x13, 0xfe, 0xdd, + 0xd2, 0x23, 0xf5, 0x96, 0x1e, 0x93, 0xf7, 0x08, 0xff, 0x1f, 0x0c, 0xb9, 0x52, 0xa9, 0xc4, 0xe3, + 0x87, 0xeb, 0x77, 0x3c, 0x7e, 0x84, 0x1e, 0x1b, 0x33, 0x0a, 0x7f, 0x92, 0x8c, 0x27, 0xc5, 0x27, + 0xef, 0x90, 0xae, 0x73, 0x89, 0x5a, 0x1e, 0xa2, 0xa7, 0x89, 0x5a, 0x1e, 0x26, 0xb4, 0x89, 0x98, + 0xb5, 0x2b, 0x0b, 0xf9, 0x8c, 0xf0, 0x80, 0xf6, 0x86, 0x93, 0x24, 0xc9, 0xc3, 0x54, 0x2c, 0xbd, + 0x78, 0x79, 0x47, 0xc0, 0x5e, 0x52, 0xd8, 0x73, 0x24, 0x4b, 0x93, 0x5e, 0x9d, 0x2e, 0x56, 0xe5, + 0x03, 0xc2, 0x83, 0x5a, 0x50, 0x77, 0x57, 0x92, 0xcc, 0xfc, 0xef, 0x4a, 0x88, 0x12, 0x56, 0x23, + 0xab, 0x4a, 0x98, 0x22, 0x13, 0x89, 0x4b, 0x20, 0x5f, 0x11, 0x1e, 0xfc, 0x53, 0xac, 0xe2, 0xd1, + 0x23, 0xa4, 0x31, 0x1e, 0x3d, 0x4a, 0x17, 0x8d, 0x65, 0x85, 0xbe, 0x44, 0x16, 0xe8, 0x25, 0x2e, + 0xa2, 0xf4, 0xc8, 0x3f, 0x3a, 0x5e, 0x7d, 0x72, 0x72, 0x96, 0x41, 0xa7, 0x67, 0x19, 0xf4, 0xf3, + 0x2c, 0x83, 0x5e, 0x9f, 0x67, 0x52, 0xa7, 0xe7, 0x99, 0xd4, 0xf7, 0xf3, 0x4c, 0xea, 0x39, 0x2d, + 0x5b, 0x72, 0xaf, 0x51, 0x30, 0x8b, 0xa2, 0xaa, 0x07, 0x6f, 0xce, 0xd3, 0x03, 0x3d, 0x83, 0x3c, + 0xac, 0x71, 0xa7, 0xd0, 0xab, 0x6e, 0xaa, 0x73, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x72, + 0x9d, 0x80, 0x56, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/epochstorage/types/stake_entries.go b/x/epochstorage/types/stake_entries.go index 3fb2470bc7..6bedce637b 100644 --- a/x/epochstorage/types/stake_entries.go +++ b/x/epochstorage/types/stake_entries.go @@ -8,7 +8,7 @@ import ( "cosmossdk.io/collections" "cosmossdk.io/collections/indexes" "cosmossdk.io/math" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) var ( diff --git a/x/epochstorage/types/stake_entry.pb.go b/x/epochstorage/types/stake_entry.pb.go index 74eeb33f9b..d4f8e8cd95 100644 --- a/x/epochstorage/types/stake_entry.pb.go +++ b/x/epochstorage/types/stake_entry.pb.go @@ -242,41 +242,41 @@ var fileDescriptor_df6302d6b53c056e = []byte{ // 585 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x4e, 0xdc, 0x3c, 0x14, 0x9d, 0x40, 0x06, 0x66, 0x1c, 0x86, 0x6f, 0x30, 0x2c, 0x0c, 0x8b, 0x7c, 0x29, 0x54, 0x55, - 0xd4, 0x4a, 0xb1, 0x00, 0xf5, 0x01, 0x3a, 0x14, 0x2a, 0x58, 0x55, 0x29, 0xab, 0x6e, 0x22, 0x27, - 0xb1, 0x82, 0x4b, 0x62, 0x47, 0xb1, 0x19, 0x95, 0xb7, 0xe8, 0x23, 0x74, 0xd9, 0x65, 0x1f, 0x83, - 0x25, 0xcb, 0xae, 0xaa, 0x0a, 0x16, 0x7d, 0x8d, 0xca, 0x76, 0x32, 0x3f, 0x0b, 0xaa, 0x6e, 0x12, - 0x9f, 0x7b, 0x8e, 0xaf, 0xef, 0x39, 0xb2, 0xc1, 0xab, 0x92, 0x4c, 0x09, 0xa7, 0x0a, 0xeb, 0x3f, - 0xa6, 0xb5, 0xc8, 0xae, 0xa4, 0x12, 0x0d, 0x29, 0x28, 0x96, 0x8a, 0x5c, 0xd3, 0x84, 0x72, 0xd5, - 0xdc, 0x46, 0x75, 0x23, 0x94, 0x80, 0xbb, 0xad, 0x38, 0xd2, 0xff, 0x68, 0x51, 0xbc, 0x17, 0x3e, - 0xdd, 0x87, 0xf2, 0xbc, 0x16, 0x8c, 0x2b, 0xdb, 0x64, 0x6f, 0xa7, 0x10, 0x85, 0x30, 0x4b, 0xac, - 0x57, 0x6d, 0xd5, 0xcf, 0x84, 0xac, 0x84, 0xc4, 0x29, 0x91, 0x14, 0x4f, 0x0f, 0x53, 0xaa, 0xc8, - 0x21, 0xce, 0x04, 0xe3, 0x2d, 0xff, 0xbc, 0xe5, 0xf5, 0x50, 0x8c, 0x17, 0x33, 0x49, 0x8b, 0x5b, - 0xd5, 0x16, 0xa9, 0x18, 0x17, 0xd8, 0x7c, 0x6d, 0x69, 0xff, 0x6b, 0x1f, 0x80, 0x0f, 0xda, 0xc9, - 0xa9, 0x36, 0x02, 0x5f, 0x83, 0xbe, 0xf1, 0x85, 0x9c, 0xc0, 0x09, 0xbd, 0xa3, 0xdd, 0xc8, 0xf6, - 0x8d, 0xf4, 0xb9, 0x51, 0xdb, 0x34, 0x3a, 0x11, 0x8c, 0x4f, 0xdc, 0xbb, 0x9f, 0xff, 0xf7, 0x62, - 0xab, 0x86, 0x08, 0xac, 0x93, 0x3c, 0x6f, 0xa8, 0x94, 0x68, 0x25, 0x70, 0xc2, 0x61, 0xdc, 0x41, - 0x18, 0x81, 0x6d, 0x1b, 0x14, 0xa9, 0xeb, 0x92, 0xd1, 0x3c, 0x49, 0x4b, 0x91, 0x5d, 0xa3, 0xd5, - 0xc0, 0x09, 0xdd, 0x78, 0xcb, 0x50, 0x6f, 0x2c, 0x33, 0xd1, 0x04, 0x7c, 0x07, 0x86, 0x5d, 0x20, - 0x12, 0xb9, 0xc1, 0x6a, 0xe8, 0x1d, 0x1d, 0x44, 0x4f, 0xe6, 0x1a, 0x9d, 0xb6, 0xda, 0x76, 0x9c, - 0xf9, 0x5e, 0x18, 0x00, 0xaf, 0xa0, 0xa2, 0x14, 0x19, 0x51, 0x4c, 0x70, 0xd4, 0x0f, 0x9c, 0xb0, - 0x1f, 0x2f, 0x96, 0xe0, 0x0e, 0xe8, 0x67, 0x57, 0x84, 0x71, 0xb4, 0x66, 0x46, 0xb6, 0x40, 0x5b, - 0xa9, 0x04, 0x67, 0xd7, 0xb4, 0x41, 0x03, 0x6b, 0xa5, 0x85, 0xf0, 0x0c, 0x6c, 0xe6, 0xb4, 0xa4, - 0x05, 0x51, 0x34, 0x51, 0x42, 0x91, 0x12, 0x0d, 0xff, 0x2d, 0xa4, 0x51, 0xb7, 0xed, 0x52, 0xef, - 0x82, 0x18, 0x6c, 0xcf, 0xfa, 0x64, 0xa2, 0xaa, 0x98, 0x94, 0x7a, 0x42, 0xcf, 0x44, 0x02, 0x3b, - 0xea, 0x64, 0xc6, 0xc0, 0x73, 0xb0, 0x61, 0x52, 0x4b, 0x1a, 0x5a, 0x8b, 0x46, 0xa1, 0x91, 0x39, - 0xf6, 0xc5, 0x5f, 0x62, 0x31, 0x59, 0xc6, 0x46, 0x1d, 0x7b, 0xe9, 0x1c, 0x68, 0xcf, 0x53, 0x72, - 0x53, 0x2a, 0xb4, 0x69, 0x3d, 0x1b, 0x00, 0xdf, 0x03, 0x2f, 0xa7, 0x32, 0x6b, 0x58, 0x6d, 0xb2, - 0xfa, 0xcf, 0xf4, 0x3f, 0xe8, 0x6c, 0x75, 0x77, 0xa8, 0x73, 0xf6, 0x76, 0x2e, 0x9d, 0x0c, 0xb5, - 0xc1, 0x6f, 0xbf, 0xbf, 0xbf, 0x74, 0xe2, 0xc5, 0x16, 0xfa, 0x9c, 0x4f, 0x84, 0x95, 0x12, 0x8d, - 0x8d, 0x2b, 0x0b, 0xe0, 0x3e, 0x18, 0xe9, 0x45, 0x42, 0x79, 0x9e, 0x28, 0x56, 0x51, 0xb4, 0x15, - 0x38, 0xe1, 0x6a, 0xec, 0xe9, 0xe2, 0x29, 0xcf, 0x2f, 0x59, 0x45, 0x2f, 0xdc, 0xc1, 0xfa, 0x78, - 0x70, 0xe1, 0x0e, 0xc0, 0xd8, 0xbb, 0x70, 0x07, 0x1b, 0xe3, 0xd1, 0xfe, 0x19, 0xf0, 0x26, 0xcb, - 0x16, 0x8c, 0x57, 0x73, 0x45, 0xdd, 0xd8, 0x02, 0xf8, 0x0c, 0x6c, 0x94, 0x44, 0x51, 0xa9, 0xda, - 0x0b, 0xb6, 0x62, 0x48, 0xcf, 0xd6, 0xcc, 0xf6, 0xc9, 0xf9, 0xdd, 0x83, 0xef, 0xdc, 0x3f, 0xf8, - 0xce, 0xaf, 0x07, 0xdf, 0xf9, 0xf2, 0xe8, 0xf7, 0xee, 0x1f, 0xfd, 0xde, 0x8f, 0x47, 0xbf, 0xf7, - 0x11, 0x17, 0x4c, 0x5d, 0xdd, 0xa4, 0x51, 0x26, 0x2a, 0xbc, 0xf4, 0x50, 0xa7, 0xc7, 0xf8, 0xf3, - 0xf2, 0x6b, 0x55, 0xb7, 0x35, 0x95, 0xe9, 0x9a, 0x79, 0x3c, 0xc7, 0x7f, 0x02, 0x00, 0x00, 0xff, - 0xff, 0xa6, 0xec, 0xe6, 0x19, 0x1f, 0x04, 0x00, 0x00, + 0xd4, 0x4a, 0xb1, 0xa0, 0xed, 0x03, 0x74, 0x28, 0x54, 0xb0, 0xaa, 0x52, 0x56, 0xdd, 0x44, 0x4e, + 0x62, 0x05, 0x97, 0xc4, 0x8e, 0x62, 0x33, 0x2a, 0x6f, 0xd1, 0x47, 0xe8, 0xb2, 0xcb, 0x3e, 0x06, + 0x4b, 0x96, 0x5d, 0x55, 0x15, 0x2c, 0xfa, 0x1a, 0x95, 0xed, 0x64, 0x7e, 0x16, 0x54, 0xdd, 0x24, + 0x3e, 0xf7, 0x1c, 0x5f, 0xdf, 0x73, 0x64, 0x83, 0x17, 0x25, 0x99, 0x12, 0x4e, 0x15, 0xd6, 0x7f, + 0x4c, 0x6b, 0x91, 0x5d, 0x4a, 0x25, 0x1a, 0x52, 0x50, 0x2c, 0x15, 0xb9, 0xa2, 0x09, 0xe5, 0xaa, + 0xb9, 0x89, 0xea, 0x46, 0x28, 0x01, 0x77, 0x5b, 0x71, 0xa4, 0xff, 0xd1, 0xa2, 0x78, 0x2f, 0x7c, + 0xbc, 0x0f, 0xe5, 0x79, 0x2d, 0x18, 0x57, 0xb6, 0xc9, 0xde, 0x4e, 0x21, 0x0a, 0x61, 0x96, 0x58, + 0xaf, 0xda, 0xaa, 0x9f, 0x09, 0x59, 0x09, 0x89, 0x53, 0x22, 0x29, 0x9e, 0x1e, 0xa6, 0x54, 0x91, + 0x43, 0x9c, 0x09, 0xc6, 0x5b, 0xfe, 0x69, 0xcb, 0xeb, 0xa1, 0x18, 0x2f, 0x66, 0x92, 0x16, 0xb7, + 0xaa, 0x2d, 0x52, 0x31, 0x2e, 0xb0, 0xf9, 0xda, 0xd2, 0xfe, 0xd7, 0x3e, 0x00, 0x1f, 0xb4, 0x93, + 0x13, 0x6d, 0x04, 0xbe, 0x06, 0x7d, 0xe3, 0x0b, 0x39, 0x81, 0x13, 0x7a, 0x47, 0xbb, 0x91, 0xed, + 0x1b, 0xe9, 0x73, 0xa3, 0xb6, 0x69, 0x74, 0x2c, 0x18, 0x9f, 0xb8, 0xb7, 0x3f, 0xff, 0xef, 0xc5, + 0x56, 0x0d, 0x11, 0x58, 0x27, 0x79, 0xde, 0x50, 0x29, 0xd1, 0x4a, 0xe0, 0x84, 0xc3, 0xb8, 0x83, + 0x30, 0x02, 0xdb, 0x36, 0x28, 0x52, 0xd7, 0x25, 0xa3, 0x79, 0x92, 0x96, 0x22, 0xbb, 0x42, 0xab, + 0x81, 0x13, 0xba, 0xf1, 0x96, 0xa1, 0xde, 0x58, 0x66, 0xa2, 0x09, 0xf8, 0x0e, 0x0c, 0xbb, 0x40, + 0x24, 0x72, 0x83, 0xd5, 0xd0, 0x3b, 0x3a, 0x88, 0x1e, 0xcd, 0x35, 0x3a, 0x69, 0xb5, 0xed, 0x38, + 0xf3, 0xbd, 0x30, 0x00, 0x5e, 0x41, 0x45, 0x29, 0x32, 0xa2, 0x98, 0xe0, 0xa8, 0x1f, 0x38, 0x61, + 0x3f, 0x5e, 0x2c, 0xc1, 0x1d, 0xd0, 0xcf, 0x2e, 0x09, 0xe3, 0x68, 0xcd, 0x8c, 0x6c, 0x81, 0xb6, + 0x52, 0x09, 0xce, 0xae, 0x68, 0x83, 0x06, 0xd6, 0x4a, 0x0b, 0xe1, 0x29, 0xd8, 0xcc, 0x69, 0x49, + 0x0b, 0xa2, 0x68, 0xa2, 0x84, 0x22, 0x25, 0x1a, 0xfe, 0x5b, 0x48, 0xa3, 0x6e, 0xdb, 0x85, 0xde, + 0x05, 0x31, 0xd8, 0x9e, 0xf5, 0xc9, 0x44, 0x55, 0x31, 0x29, 0xf5, 0x84, 0x9e, 0x89, 0x04, 0x76, + 0xd4, 0xf1, 0x8c, 0x81, 0x67, 0x60, 0xc3, 0xa4, 0x96, 0x34, 0xb4, 0x16, 0x8d, 0x42, 0x23, 0x73, + 0xec, 0xb3, 0xbf, 0xc4, 0x62, 0xb2, 0x8c, 0x8d, 0x3a, 0xf6, 0xd2, 0x39, 0xd0, 0x9e, 0xa7, 0xe4, + 0xba, 0x54, 0x68, 0xd3, 0x7a, 0x36, 0x00, 0xbe, 0x07, 0x5e, 0x4e, 0x65, 0xd6, 0xb0, 0xda, 0x64, + 0xf5, 0x9f, 0xe9, 0x7f, 0xd0, 0xd9, 0xea, 0xee, 0x50, 0xe7, 0xec, 0xed, 0x5c, 0x3a, 0x19, 0x6a, + 0x83, 0xdf, 0x7e, 0x7f, 0x7f, 0xee, 0xc4, 0x8b, 0x2d, 0xf4, 0x39, 0x9f, 0x08, 0x2b, 0x25, 0x1a, + 0x1b, 0x57, 0x16, 0xc0, 0x7d, 0x30, 0xd2, 0x8b, 0x84, 0xf2, 0x3c, 0x51, 0xac, 0xa2, 0x68, 0x2b, + 0x70, 0xc2, 0xd5, 0xd8, 0xd3, 0xc5, 0x13, 0x9e, 0x5f, 0xb0, 0x8a, 0x9e, 0xbb, 0x83, 0xf5, 0xf1, + 0xe0, 0xdc, 0x1d, 0x80, 0xb1, 0x77, 0xee, 0x0e, 0x36, 0xc6, 0xa3, 0xfd, 0x53, 0xe0, 0x4d, 0x96, + 0x2d, 0x18, 0xaf, 0xe6, 0x8a, 0xba, 0xb1, 0x05, 0xf0, 0x09, 0xd8, 0x28, 0x89, 0xa2, 0x52, 0xb5, + 0x17, 0x6c, 0xc5, 0x90, 0x9e, 0xad, 0x99, 0xed, 0x93, 0xb3, 0xdb, 0x7b, 0xdf, 0xb9, 0xbb, 0xf7, + 0x9d, 0x5f, 0xf7, 0xbe, 0xf3, 0xe5, 0xc1, 0xef, 0xdd, 0x3d, 0xf8, 0xbd, 0x1f, 0x0f, 0x7e, 0xef, + 0x23, 0x2e, 0x98, 0xba, 0xbc, 0x4e, 0xa3, 0x4c, 0x54, 0x78, 0xe9, 0xa1, 0x4e, 0x5f, 0xe1, 0xcf, + 0xcb, 0xaf, 0x55, 0xdd, 0xd4, 0x54, 0xa6, 0x6b, 0xe6, 0xf1, 0xbc, 0xfc, 0x13, 0x00, 0x00, 0xff, + 0xff, 0x9e, 0x45, 0xc4, 0xac, 0x1f, 0x04, 0x00, 0x00, } func (m *StakeEntry) Marshal() (dAtA []byte, err error) { diff --git a/x/epochstorage/types/stake_storage.pb.go b/x/epochstorage/types/stake_storage.pb.go index a48dfd2f92..9fae4c82fa 100644 --- a/x/epochstorage/types/stake_storage.pb.go +++ b/x/epochstorage/types/stake_storage.pb.go @@ -106,9 +106,9 @@ var fileDescriptor_be7b78aecc265fd4 = []byte{ 0x4f, 0xce, 0xf6, 0x48, 0x2c, 0xce, 0x90, 0x60, 0x56, 0x60, 0xd4, 0xe0, 0x09, 0x42, 0x13, 0x75, 0xf2, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xfd, 0xf4, 0xcc, 0x92, - 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x94, 0x70, 0x28, 0x33, 0xd6, 0xaf, 0x40, 0x0d, + 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x94, 0x70, 0x28, 0x33, 0xd1, 0xaf, 0x40, 0x0d, 0x8c, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x8f, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x8a, 0x5d, 0xc5, 0xf7, 0x80, 0x01, 0x00, 0x00, + 0xff, 0xb2, 0xf4, 0xe7, 0x42, 0x80, 0x01, 0x00, 0x00, } func (m *StakeStorage) Marshal() (dAtA []byte, err error) { diff --git a/x/epochstorage/types/tx.pb.go b/x/epochstorage/types/tx.pb.go index ba02bab9ca..037a995829 100644 --- a/x/epochstorage/types/tx.pb.go +++ b/x/epochstorage/types/tx.pb.go @@ -35,9 +35,9 @@ var fileDescriptor_7051565dcc1777fe = []byte{ 0x7a, 0x20, 0x5a, 0x0f, 0x59, 0x8d, 0x11, 0x2b, 0x17, 0xb3, 0x6f, 0x71, 0xba, 0x93, 0xe7, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xe9, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, - 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa3, 0x58, 0x55, 0x66, 0xac, 0x5f, 0x81, 0x66, 0x5f, 0x65, 0x41, - 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x4e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x69, 0x2a, - 0x3d, 0x99, 0x00, 0x00, 0x00, + 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa3, 0x58, 0x55, 0x66, 0xa2, 0x5f, 0x81, 0x66, 0x5f, 0x65, 0x41, + 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x4e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, 0xc0, 0x08, + 0x88, 0x99, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/fixationstore/client/cli/query.go b/x/fixationstore/client/cli/query.go index 21d4889884..b136b76365 100644 --- a/x/fixationstore/client/cli/query.go +++ b/x/fixationstore/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/fixationstore/client/cli/query_all_indices.go b/x/fixationstore/client/cli/query_all_indices.go index ee0e0562e4..f1c81d9407 100644 --- a/x/fixationstore/client/cli/query_all_indices.go +++ b/x/fixationstore/client/cli/query_all_indices.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" "github.com/spf13/cobra" ) diff --git a/x/fixationstore/client/cli/query_entry.go b/x/fixationstore/client/cli/query_entry.go index 576fe7597b..d228ee7cfc 100644 --- a/x/fixationstore/client/cli/query_entry.go +++ b/x/fixationstore/client/cli/query_entry.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" "github.com/spf13/cobra" ) diff --git a/x/fixationstore/client/cli/query_store_keys.go b/x/fixationstore/client/cli/query_store_keys.go index 51d6ffe3f6..11bb8bd8ac 100644 --- a/x/fixationstore/client/cli/query_store_keys.go +++ b/x/fixationstore/client/cli/query_store_keys.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" "github.com/spf13/cobra" ) diff --git a/x/fixationstore/client/cli/query_versions.go b/x/fixationstore/client/cli/query_versions.go index 00fe55fdbb..d07a12f7b1 100644 --- a/x/fixationstore/client/cli/query_versions.go +++ b/x/fixationstore/client/cli/query_versions.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" "github.com/spf13/cobra" ) diff --git a/x/fixationstore/keeper/grpc_query_all_indices.go b/x/fixationstore/keeper/grpc_query_all_indices.go index 19b63b01a7..085ef2a8ab 100644 --- a/x/fixationstore/keeper/grpc_query_all_indices.go +++ b/x/fixationstore/keeper/grpc_query_all_indices.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/fixationstore/keeper/grpc_query_entry.go b/x/fixationstore/keeper/grpc_query_entry.go index de6b7a3f7f..7e325cef20 100644 --- a/x/fixationstore/keeper/grpc_query_entry.go +++ b/x/fixationstore/keeper/grpc_query_entry.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/fixationstore/keeper/grpc_query_store_keys.go b/x/fixationstore/keeper/grpc_query_store_keys.go index 3101f0d1c7..5946ec8a1e 100644 --- a/x/fixationstore/keeper/grpc_query_store_keys.go +++ b/x/fixationstore/keeper/grpc_query_store_keys.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/fixationstore/keeper/grpc_query_versions.go b/x/fixationstore/keeper/grpc_query_versions.go index 59e5b9e266..9332d2569e 100644 --- a/x/fixationstore/keeper/grpc_query_versions.go +++ b/x/fixationstore/keeper/grpc_query_versions.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/fixationstore/keeper/keeper.go b/x/fixationstore/keeper/keeper.go index dbe03e9c41..601464f9ab 100644 --- a/x/fixationstore/keeper/keeper.go +++ b/x/fixationstore/keeper/keeper.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/fixationstore/types" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" + "github.com/lavanet/lava/v4/x/fixationstore/types" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" ) func NewKeeper(cdc codec.BinaryCodec, tsKeeper *timerstorekeeper.Keeper, getStaleBlocks types.GetStaleBlocks) *Keeper { diff --git a/x/fixationstore/module.go b/x/fixationstore/module.go index 4cc5bd9652..7f85acaa57 100644 --- a/x/fixationstore/module.go +++ b/x/fixationstore/module.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/lavanet/lava/v3/x/fixationstore/client/cli" - "github.com/lavanet/lava/v3/x/fixationstore/keeper" - "github.com/lavanet/lava/v3/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/fixationstore/client/cli" + "github.com/lavanet/lava/v4/x/fixationstore/keeper" + "github.com/lavanet/lava/v4/x/fixationstore/types" "github.com/spf13/cobra" ) diff --git a/x/fixationstore/types/fixation.go b/x/fixationstore/types/fixation.go index 51cebdf0fe..fb83b99a1f 100644 --- a/x/fixationstore/types/fixation.go +++ b/x/fixationstore/types/fixation.go @@ -4,7 +4,7 @@ import ( "math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils/common/types" + "github.com/lavanet/lava/v4/utils/common/types" ) // SafeIndex is a sanitized string, i.e. contains only visible ascii characters diff --git a/x/fixationstore/types/fixation.pb.go b/x/fixationstore/types/fixation.pb.go index f7b0460879..744c9939c7 100644 --- a/x/fixationstore/types/fixation.pb.go +++ b/x/fixationstore/types/fixation.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/timerstore/types" + types "github.com/lavanet/lava/v4/x/timerstore/types" io "io" math "math" math_bits "math/bits" @@ -250,30 +250,30 @@ var fileDescriptor_872ca3cbd39027a3 = []byte{ // 416 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xcd, 0x8e, 0xd3, 0x30, 0x10, 0x8e, 0xb7, 0x69, 0x93, 0xf5, 0xae, 0x38, 0x58, 0x2b, 0x61, 0x82, 0x14, 0x42, 0x11, 0x52, - 0xe0, 0x90, 0xa0, 0xdd, 0x27, 0xe8, 0x4a, 0x08, 0x69, 0xd9, 0x53, 0xb8, 0x71, 0x59, 0xb9, 0xed, + 0xe0, 0x90, 0xa0, 0x85, 0x17, 0xe8, 0x4a, 0x08, 0x69, 0xd9, 0x53, 0xb8, 0x71, 0x59, 0xb9, 0xed, 0x6c, 0xb1, 0x48, 0xe3, 0x2a, 0x9e, 0x46, 0xed, 0x95, 0x27, 0xe0, 0x71, 0xb8, 0x72, 0xeb, 0xb1, 0x47, 0x4e, 0x08, 0xb5, 0x2f, 0x82, 0x62, 0xf7, 0x2f, 0x95, 0xba, 0x27, 0xcf, 0xe7, 0x99, 0xef, - 0x9b, 0xf9, 0xec, 0xa1, 0xef, 0x72, 0x51, 0x89, 0x02, 0x30, 0xad, 0xcf, 0xf4, 0x51, 0xce, 0x04, + 0x9b, 0xf9, 0xec, 0xa1, 0x6f, 0x72, 0x51, 0x89, 0x02, 0x30, 0xad, 0xcf, 0xf4, 0x41, 0xce, 0x04, 0x4a, 0x55, 0x68, 0x54, 0x25, 0xec, 0x50, 0x32, 0x29, 0x15, 0x2a, 0x16, 0x6c, 0x4a, 0x93, 0xfa, - 0x4c, 0x1a, 0xa5, 0xc1, 0xd5, 0x48, 0x8d, 0x94, 0x29, 0x4b, 0xeb, 0xc8, 0x32, 0x82, 0x37, 0x0d, + 0x4c, 0x1a, 0xa5, 0xc1, 0xd5, 0x48, 0x8d, 0x94, 0x29, 0x4b, 0xeb, 0xc8, 0x32, 0x82, 0x57, 0x0d, 0x71, 0x94, 0x63, 0x28, 0xad, 0xb2, 0x09, 0x6d, 0x51, 0xf7, 0x17, 0xa1, 0xed, 0x8f, 0x05, 0x96, 0x73, 0x76, 0x45, 0xdb, 0xb2, 0x18, 0xc2, 0x8c, 0x93, 0x88, 0xc4, 0xe7, 0x99, 0x05, 0xf5, 0x6d, - 0x3f, 0x57, 0x83, 0xef, 0xfc, 0x2c, 0x22, 0xb1, 0x9b, 0x59, 0xc0, 0x5e, 0x50, 0x5f, 0xa3, 0xc8, - 0xe1, 0x41, 0x20, 0x6f, 0x99, 0x84, 0x67, 0x70, 0x0f, 0x59, 0x40, 0xfd, 0x12, 0x1e, 0x07, 0x6a, + 0x3f, 0x57, 0x83, 0xef, 0xfc, 0x2c, 0x22, 0xb1, 0x9b, 0x59, 0xc0, 0x9e, 0x51, 0x5f, 0xa3, 0xc8, + 0xe1, 0x5e, 0x20, 0x6f, 0x99, 0x84, 0x67, 0x70, 0x0f, 0x59, 0x40, 0xfd, 0x12, 0x1e, 0x06, 0x6a, 0x5a, 0x20, 0x77, 0x4d, 0x6a, 0x87, 0x19, 0xa3, 0xee, 0x50, 0xa0, 0xe0, 0xed, 0x88, 0xc4, 0x97, - 0x99, 0x89, 0xd9, 0x4b, 0x7a, 0x3e, 0x84, 0x1c, 0xd0, 0x68, 0x75, 0x2c, 0xc1, 0x5e, 0xf4, 0xb0, - 0x4e, 0x4a, 0xfd, 0x90, 0x0b, 0x04, 0x8d, 0xdc, 0x8b, 0x48, 0xec, 0x67, 0xbe, 0xd4, 0xf7, 0x06, - 0x77, 0x7f, 0x10, 0xfa, 0xec, 0x13, 0x14, 0xa0, 0xa5, 0xae, 0x1d, 0x48, 0xd0, 0x27, 0x3c, 0x3c, - 0xa7, 0x5e, 0xad, 0x22, 0x2b, 0x30, 0x2e, 0xfc, 0xac, 0x23, 0xf5, 0xbd, 0xac, 0x80, 0xf5, 0xa8, - 0x07, 0x96, 0xc9, 0x5b, 0x51, 0x2b, 0xbe, 0xb8, 0x7e, 0x9d, 0x9c, 0x7e, 0xe5, 0xc4, 0x3c, 0xd3, - 0xad, 0xbb, 0xf8, 0xfb, 0xca, 0xc9, 0xb6, 0xbc, 0xee, 0x6f, 0x42, 0x2f, 0x37, 0x43, 0x7c, 0x41, - 0x81, 0xc0, 0x38, 0xf5, 0x2a, 0x28, 0xb5, 0x54, 0x85, 0x19, 0xc2, 0xcd, 0xb6, 0x90, 0xdd, 0xed, - 0xbb, 0x9d, 0x99, 0x6e, 0xef, 0x9f, 0xea, 0xd6, 0x74, 0x76, 0xd4, 0x96, 0x7d, 0xa6, 0x74, 0xff, - 0xa1, 0xe6, 0x0b, 0x2e, 0xae, 0xdf, 0x36, 0xe5, 0xf6, 0xf9, 0xe4, 0x70, 0xc0, 0x8d, 0xd2, 0x01, - 0xfd, 0xf6, 0x6e, 0xb1, 0x0a, 0xc9, 0x72, 0x15, 0x92, 0x7f, 0xab, 0x90, 0xfc, 0x5c, 0x87, 0xce, - 0x72, 0x1d, 0x3a, 0x7f, 0xd6, 0xa1, 0xf3, 0xf5, 0xc3, 0x48, 0xe2, 0xb7, 0x69, 0x3f, 0x19, 0xa8, - 0x71, 0xda, 0xd8, 0xa6, 0xea, 0x26, 0x9d, 0x1d, 0xed, 0x2b, 0xce, 0x27, 0xa0, 0xfb, 0x1d, 0xb3, - 0x56, 0x37, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x3e, 0x3e, 0x10, 0xda, 0x02, 0x00, 0x00, + 0x99, 0x89, 0xd9, 0x73, 0x7a, 0x3e, 0x84, 0x1c, 0xd0, 0x68, 0x75, 0x2c, 0xc1, 0x5e, 0xf4, 0xb0, + 0x4e, 0x4a, 0x7d, 0x9f, 0x0b, 0x04, 0x8d, 0xdc, 0x8b, 0x48, 0xec, 0x67, 0xbe, 0xd4, 0x77, 0x06, + 0x77, 0x7f, 0x10, 0xfa, 0xe4, 0x13, 0x14, 0xa0, 0xa5, 0xae, 0x1d, 0x48, 0xd0, 0x27, 0x3c, 0x3c, + 0xa5, 0x5e, 0xad, 0x22, 0x2b, 0x30, 0x2e, 0xfc, 0xac, 0x23, 0xf5, 0x9d, 0xac, 0x80, 0xf5, 0xa8, + 0x07, 0x96, 0xc9, 0x5b, 0x51, 0x2b, 0xbe, 0xb8, 0x7e, 0x99, 0x9c, 0x7e, 0xe5, 0xc4, 0x3c, 0xd3, + 0x8d, 0xbb, 0xf8, 0xfb, 0xc2, 0xc9, 0xb6, 0xbc, 0xee, 0x6f, 0x42, 0x2f, 0x37, 0x43, 0x7c, 0x41, + 0x81, 0xc0, 0x38, 0xf5, 0x2a, 0x28, 0xb5, 0x54, 0x85, 0x19, 0xc2, 0xcd, 0xb6, 0x90, 0xdd, 0xee, + 0xbb, 0x9d, 0x99, 0x6e, 0x6f, 0x1f, 0xeb, 0xd6, 0x74, 0x76, 0xd4, 0x96, 0x7d, 0xa6, 0x74, 0xff, + 0xa1, 0xe6, 0x0b, 0x2e, 0xae, 0x5f, 0x37, 0xe5, 0xf6, 0xf9, 0xe4, 0x70, 0xc0, 0x8d, 0xd2, 0x01, + 0xfd, 0xe6, 0x76, 0xb1, 0x0a, 0xc9, 0x72, 0x15, 0x92, 0x7f, 0xab, 0x90, 0xfc, 0x5c, 0x87, 0xce, + 0x72, 0x1d, 0x3a, 0x7f, 0xd6, 0xa1, 0xf3, 0xf5, 0xdd, 0x48, 0xe2, 0xb7, 0x69, 0x3f, 0x19, 0xa8, + 0x71, 0xda, 0xd8, 0xa6, 0xea, 0x43, 0x3a, 0x3b, 0xda, 0x57, 0x9c, 0x4f, 0x40, 0xf7, 0x3b, 0x66, + 0xad, 0xde, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xa4, 0x89, 0x38, 0xda, 0x02, 0x00, 0x00, } func (m *Entry) Marshal() (dAtA []byte, err error) { diff --git a/x/fixationstore/types/fixationstore.go b/x/fixationstore/types/fixationstore.go index 825d6a729b..6047cd3627 100644 --- a/x/fixationstore/types/fixationstore.go +++ b/x/fixationstore/types/fixationstore.go @@ -10,8 +10,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/utils" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) // FixationStore manages lists of entries with versions in the store. diff --git a/x/fixationstore/types/fixationstore_test.go b/x/fixationstore/types/fixationstore_test.go index 2eb837fca1..3c5080f797 100644 --- a/x/fixationstore/types/fixationstore_test.go +++ b/x/fixationstore/types/fixationstore_test.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/stretchr/testify/require" ) diff --git a/x/fixationstore/types/query.pb.go b/x/fixationstore/types/query.pb.go index c00f16fa80..232853364e 100644 --- a/x/fixationstore/types/query.pb.go +++ b/x/fixationstore/types/query.pb.go @@ -514,47 +514,47 @@ func init() { } var fileDescriptor_300bcc00a24e7b21 = []byte{ - // 639 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4f, 0x4f, 0x13, 0x4f, - 0x18, 0xc7, 0x3b, 0xd0, 0x85, 0xf6, 0xe1, 0xf2, 0x63, 0xc2, 0x0f, 0x36, 0xab, 0x59, 0xea, 0x1e, - 0x48, 0x3d, 0xb0, 0x03, 0xed, 0xc1, 0x8b, 0xd1, 0x94, 0xa0, 0xf8, 0x37, 0xd1, 0x35, 0xf1, 0x40, - 0x62, 0xc8, 0x42, 0x87, 0x65, 0xc3, 0xba, 0x53, 0x76, 0x07, 0xc2, 0xa6, 0xe1, 0xe2, 0x2b, 0x30, - 0xf1, 0x1d, 0xf8, 0x02, 0x3c, 0x79, 0x30, 0xf1, 0x0d, 0x70, 0x24, 0xf1, 0xe2, 0xc1, 0x18, 0x03, - 0xbe, 0x10, 0x33, 0x7f, 0x16, 0x4a, 0xc1, 0x2d, 0x55, 0x4f, 0xdd, 0x79, 0xe6, 0xf9, 0x3e, 0xdf, - 0xcf, 0x33, 0x33, 0x4f, 0x0a, 0x73, 0x91, 0xbf, 0xe7, 0xc7, 0x94, 0x13, 0xf1, 0x4b, 0x36, 0xc3, - 0x7d, 0x9f, 0x87, 0x2c, 0x4e, 0x39, 0x4b, 0x28, 0xd9, 0xd9, 0xa5, 0x49, 0xe6, 0x76, 0x12, 0xc6, - 0x19, 0xb6, 0x74, 0x9e, 0x2b, 0x7e, 0xdd, 0x73, 0x79, 0xd6, 0x54, 0xc0, 0x02, 0x26, 0xd3, 0x88, - 0xf8, 0x52, 0x0a, 0xeb, 0x7a, 0xc0, 0x58, 0x10, 0x51, 0xe2, 0x77, 0x42, 0xe2, 0xc7, 0x31, 0xe3, - 0x4a, 0xa1, 0x77, 0x6f, 0x16, 0xf8, 0xe6, 0x2b, 0x95, 0xea, 0x3c, 0x85, 0xe9, 0xe7, 0x82, 0xa4, - 0x15, 0x45, 0x0f, 0xe3, 0x76, 0xb8, 0x41, 0x53, 0x8f, 0xee, 0xec, 0xd2, 0x94, 0xe3, 0x6b, 0x50, - 0x95, 0x8a, 0xb5, 0x6d, 0x9a, 0x99, 0xa8, 0x86, 0xea, 0x55, 0xaf, 0x22, 0x03, 0x8f, 0x69, 0x86, - 0xa7, 0x61, 0xac, 0x93, 0xd0, 0xcd, 0x70, 0xdf, 0x1c, 0x91, 0x3b, 0x7a, 0xe5, 0x34, 0x61, 0xe6, - 0x42, 0xb9, 0xb4, 0xc3, 0xe2, 0x94, 0x62, 0x13, 0xc6, 0x43, 0x15, 0x32, 0x51, 0x6d, 0xb4, 0x5e, - 0xf5, 0xf2, 0xa5, 0x33, 0x03, 0xff, 0x4b, 0xd1, 0x0b, 0x5d, 0x3d, 0x47, 0x70, 0x1e, 0xc0, 0x64, - 0x1e, 0x6b, 0xc5, 0xed, 0x67, 0xd2, 0xe2, 0xcf, 0xb8, 0x7c, 0xdd, 0x66, 0x8f, 0x85, 0xc6, 0x5a, - 0x81, 0xf2, 0x36, 0xcd, 0x14, 0xd3, 0x44, 0x63, 0xde, 0xfd, 0xfd, 0x55, 0xb8, 0x17, 0x58, 0x96, - 0xca, 0x87, 0xdf, 0x67, 0x4b, 0x9e, 0x2c, 0xe0, 0xbc, 0x82, 0x29, 0x69, 0xf1, 0x92, 0x26, 0xa9, - 0x90, 0xfc, 0xcd, 0x39, 0xe2, 0xff, 0x60, 0x54, 0xa4, 0x8f, 0xca, 0xa0, 0xf8, 0x74, 0x56, 0xf5, - 0x21, 0x9d, 0x95, 0xd7, 0x0d, 0xb4, 0x60, 0x9c, 0xc6, 0x3c, 0x09, 0x69, 0xde, 0xc3, 0x8d, 0xa2, - 0x1e, 0xee, 0xc5, 0x3c, 0xc9, 0x34, 0x77, 0xae, 0x73, 0x3e, 0x20, 0x98, 0x94, 0xc5, 0xe5, 0xee, - 0xbf, 0x05, 0xc7, 0x53, 0x60, 0xac, 0x47, 0x6c, 0x63, 0xdb, 0x2c, 0xd7, 0x50, 0xbd, 0xec, 0xa9, - 0x85, 0x28, 0xbe, 0x15, 0xb6, 0xe9, 0x5a, 0xdb, 0xe7, 0xbe, 0x69, 0xd4, 0x50, 0xbd, 0xe2, 0x55, - 0x44, 0x60, 0xd9, 0xe7, 0x3e, 0x9e, 0x85, 0x89, 0x94, 0x27, 0x61, 0x1c, 0xa8, 0xed, 0x31, 0xb9, - 0x0d, 0x2a, 0x24, 0x12, 0x9c, 0x18, 0x70, 0x2f, 0xaf, 0x3e, 0x89, 0x5b, 0x60, 0x88, 0x8e, 0x14, - 0xec, 0x55, 0xce, 0xc1, 0x53, 0xf9, 0xfd, 0x7e, 0xaa, 0xa3, 0x1e, 0xbf, 0xc6, 0x37, 0x03, 0x0c, - 0x69, 0x88, 0x3f, 0x23, 0x80, 0xb3, 0xc7, 0x8d, 0x1b, 0x45, 0x1e, 0x97, 0x0f, 0x96, 0xd5, 0x1c, - 0x4a, 0xa3, 0x7a, 0x73, 0x96, 0xdf, 0x7c, 0xf9, 0xf9, 0x6e, 0xe4, 0x0e, 0xbe, 0x4d, 0x0a, 0x66, - 0xdb, 0x8f, 0xa2, 0x35, 0x3d, 0x54, 0xa4, 0x7b, 0x7a, 0x77, 0x07, 0xa4, 0xab, 0x2e, 0xe7, 0x00, - 0xbf, 0x47, 0x50, 0x3d, 0x1d, 0x01, 0xbc, 0x38, 0x10, 0xa4, 0x7f, 0x22, 0xad, 0xc6, 0x30, 0x12, - 0x8d, 0xee, 0x4a, 0xf4, 0x3a, 0x9e, 0x2b, 0x42, 0x3f, 0xa5, 0x4d, 0xf1, 0x27, 0x04, 0x95, 0xfc, - 0x95, 0xe3, 0x85, 0x81, 0x86, 0x7d, 0xf3, 0x66, 0x2d, 0x0e, 0xa1, 0xd0, 0x84, 0x2b, 0x92, 0xb0, - 0x85, 0xef, 0x16, 0x11, 0xee, 0x69, 0xd5, 0xa5, 0x27, 0x4b, 0xba, 0x62, 0x89, 0x3f, 0x22, 0x30, - 0xe4, 0xcb, 0xc2, 0xf3, 0x03, 0x29, 0x7a, 0x67, 0xcd, 0x72, 0xaf, 0x9a, 0xae, 0x89, 0x9f, 0x48, - 0xe2, 0xfb, 0x78, 0xb9, 0x88, 0x58, 0x4a, 0x0a, 0x70, 0x49, 0x57, 0xce, 0xe2, 0xc1, 0xd2, 0xa3, - 0xc3, 0x63, 0x1b, 0x1d, 0x1d, 0xdb, 0xe8, 0xc7, 0xb1, 0x8d, 0xde, 0x9e, 0xd8, 0xa5, 0xa3, 0x13, - 0xbb, 0xf4, 0xf5, 0xc4, 0x2e, 0xad, 0x2e, 0x04, 0x21, 0xdf, 0xda, 0x5d, 0x77, 0x37, 0xd8, 0xeb, - 0xf3, 0x4e, 0x7b, 0x4d, 0xb2, 0xdf, 0x67, 0xc7, 0xb3, 0x0e, 0x4d, 0xd7, 0xc7, 0xe4, 0xff, 0x4a, - 0xf3, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xa6, 0x59, 0xda, 0xfc, 0x06, 0x00, 0x00, + // 637 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4d, 0x4f, 0xd4, 0x40, + 0x18, 0xc7, 0x77, 0x60, 0x0b, 0xbb, 0x0f, 0x17, 0x99, 0x20, 0x34, 0xd5, 0x94, 0xb5, 0x07, 0xb2, + 0x1e, 0xe8, 0xc0, 0x62, 0xe2, 0xc5, 0x68, 0x96, 0xa0, 0xf8, 0x9a, 0x68, 0x4d, 0x3c, 0x90, 0x18, + 0x52, 0xd8, 0xa1, 0x34, 0xd4, 0xce, 0xd2, 0x0e, 0x84, 0x66, 0xc3, 0xc5, 0x4f, 0x60, 0xe2, 0x37, + 0xf0, 0x03, 0x78, 0xf2, 0x60, 0xe2, 0x17, 0xe0, 0x48, 0xe2, 0xc5, 0x83, 0x31, 0x06, 0xfc, 0x20, + 0x66, 0x5e, 0x0a, 0xcb, 0x82, 0x5d, 0x56, 0x3d, 0x6d, 0xe7, 0x99, 0xe7, 0xff, 0xfc, 0x7f, 0xcf, + 0xcc, 0x3c, 0x59, 0x98, 0x89, 0xfc, 0x5d, 0x3f, 0xa6, 0x9c, 0x88, 0x5f, 0xb2, 0x11, 0xee, 0xf9, + 0x3c, 0x64, 0x71, 0xca, 0x59, 0x42, 0xc9, 0xf6, 0x0e, 0x4d, 0x32, 0xb7, 0x9d, 0x30, 0xce, 0xb0, + 0xa5, 0xf3, 0x5c, 0xf1, 0xeb, 0x9e, 0xc9, 0xb3, 0x26, 0x02, 0x16, 0x30, 0x99, 0x46, 0xc4, 0x97, + 0x52, 0x58, 0xd7, 0x03, 0xc6, 0x82, 0x88, 0x12, 0xbf, 0x1d, 0x12, 0x3f, 0x8e, 0x19, 0x57, 0x0a, + 0xbd, 0x7b, 0xb3, 0xc0, 0x37, 0x5f, 0xa9, 0x54, 0xe7, 0x19, 0x4c, 0xbe, 0x10, 0x24, 0xcd, 0x28, + 0x7a, 0x14, 0xb7, 0xc2, 0x75, 0x9a, 0x7a, 0x74, 0x7b, 0x87, 0xa6, 0x1c, 0x5f, 0x83, 0xaa, 0x54, + 0xac, 0x6e, 0xd1, 0xcc, 0x44, 0x35, 0x54, 0xaf, 0x7a, 0x15, 0x19, 0x78, 0x42, 0x33, 0x3c, 0x09, + 0x23, 0xed, 0x84, 0x6e, 0x84, 0x7b, 0xe6, 0x90, 0xdc, 0xd1, 0x2b, 0x67, 0x01, 0xa6, 0xce, 0x95, + 0x4b, 0xdb, 0x2c, 0x4e, 0x29, 0x36, 0x61, 0x34, 0x54, 0x21, 0x13, 0xd5, 0x86, 0xeb, 0x55, 0x2f, + 0x5f, 0x3a, 0x53, 0x70, 0x55, 0x8a, 0x5e, 0xea, 0xea, 0x39, 0x82, 0xf3, 0x10, 0xc6, 0xf3, 0x58, + 0x33, 0x6e, 0x3d, 0x97, 0x16, 0x7f, 0xc7, 0xe5, 0xeb, 0x36, 0xbb, 0x2c, 0x34, 0xd6, 0x32, 0x94, + 0xb7, 0x68, 0xa6, 0x98, 0xc6, 0x1a, 0xb3, 0xee, 0x9f, 0xaf, 0xc2, 0x3d, 0xc7, 0xb2, 0x58, 0x3e, + 0xf8, 0x31, 0x5d, 0xf2, 0x64, 0x01, 0xe7, 0x35, 0x4c, 0x48, 0x8b, 0x57, 0x34, 0x49, 0x85, 0xe4, + 0x5f, 0xce, 0x11, 0x5f, 0x81, 0x61, 0x91, 0x3e, 0x2c, 0x83, 0xe2, 0xd3, 0x59, 0xd1, 0x87, 0x74, + 0x5a, 0x5e, 0x37, 0xd0, 0x84, 0x51, 0x1a, 0xf3, 0x24, 0xa4, 0x79, 0x0f, 0x37, 0x8a, 0x7a, 0xb8, + 0x1f, 0xf3, 0x24, 0xd3, 0xdc, 0xb9, 0xce, 0xf9, 0x88, 0x60, 0x5c, 0x16, 0x97, 0xbb, 0xff, 0x17, + 0x1c, 0x4f, 0x80, 0xb1, 0x16, 0xb1, 0xf5, 0x2d, 0xb3, 0x5c, 0x43, 0xf5, 0xb2, 0xa7, 0x16, 0xa2, + 0xf8, 0x66, 0xd8, 0xa2, 0xab, 0x2d, 0x9f, 0xfb, 0xa6, 0x51, 0x43, 0xf5, 0x8a, 0x57, 0x11, 0x81, + 0x25, 0x9f, 0xfb, 0x78, 0x1a, 0xc6, 0x52, 0x9e, 0x84, 0x71, 0xa0, 0xb6, 0x47, 0xe4, 0x36, 0xa8, + 0x90, 0x48, 0x70, 0x62, 0xc0, 0xdd, 0xbc, 0xfa, 0x24, 0x6e, 0x83, 0x21, 0x3a, 0x52, 0xb0, 0x97, + 0x39, 0x07, 0x4f, 0xe5, 0xf7, 0xfa, 0xa9, 0x8e, 0xba, 0xfc, 0x1a, 0xdf, 0x0d, 0x30, 0xa4, 0x21, + 0xfe, 0x82, 0x00, 0x4e, 0x1f, 0x37, 0x6e, 0x14, 0x79, 0x5c, 0x3c, 0x58, 0xd6, 0xc2, 0x40, 0x1a, + 0xd5, 0x9b, 0xb3, 0xf4, 0xf6, 0xeb, 0xaf, 0xf7, 0x43, 0x77, 0xf1, 0x1d, 0x52, 0x30, 0xdb, 0x7e, + 0x14, 0xad, 0xea, 0xa1, 0x22, 0x9d, 0x93, 0xbb, 0xdb, 0x27, 0x1d, 0x75, 0x39, 0xfb, 0xf8, 0x03, + 0x82, 0xea, 0xc9, 0x08, 0xe0, 0xf9, 0xbe, 0x20, 0xbd, 0x13, 0x69, 0x35, 0x06, 0x91, 0x68, 0x74, + 0x57, 0xa2, 0xd7, 0xf1, 0x4c, 0x11, 0xfa, 0x09, 0x6d, 0x8a, 0x3f, 0x23, 0xa8, 0xe4, 0xaf, 0x1c, + 0xcf, 0xf5, 0x35, 0xec, 0x99, 0x37, 0x6b, 0x7e, 0x00, 0x85, 0x26, 0x5c, 0x96, 0x84, 0x4d, 0x7c, + 0xaf, 0x88, 0x70, 0x57, 0xab, 0x2e, 0x3c, 0x59, 0xd2, 0x11, 0x4b, 0xfc, 0x09, 0x81, 0x21, 0x5f, + 0x16, 0x9e, 0xed, 0x4b, 0xd1, 0x3d, 0x6b, 0x96, 0x7b, 0xd9, 0x74, 0x4d, 0xfc, 0x54, 0x12, 0x3f, + 0xc0, 0x4b, 0x45, 0xc4, 0x52, 0x52, 0x80, 0x4b, 0x3a, 0x72, 0x16, 0xf7, 0x17, 0x1f, 0x1f, 0x1c, + 0xd9, 0xe8, 0xf0, 0xc8, 0x46, 0x3f, 0x8f, 0x6c, 0xf4, 0xee, 0xd8, 0x2e, 0x1d, 0x1e, 0xdb, 0xa5, + 0x6f, 0xc7, 0x76, 0x69, 0x65, 0x2e, 0x08, 0xf9, 0xe6, 0xce, 0x9a, 0xbb, 0xce, 0xde, 0x9c, 0x75, + 0xda, 0xbd, 0x45, 0xf6, 0x7a, 0xec, 0x78, 0xd6, 0xa6, 0xe9, 0xda, 0x88, 0xfc, 0x5f, 0x59, 0xf8, + 0x1d, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x3c, 0xee, 0xf2, 0xfc, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pairing/client/cli/query.go b/x/pairing/client/cli/query.go index e7cf42bb61..69e17c6c8d 100644 --- a/x/pairing/client/cli/query.go +++ b/x/pairing/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/pairing/client/cli/query_account_info.go b/x/pairing/client/cli/query_account_info.go index 64dc98f36b..7065137f78 100644 --- a/x/pairing/client/cli/query_account_info.go +++ b/x/pairing/client/cli/query_account_info.go @@ -7,14 +7,14 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" - projecttypes "github.com/lavanet/lava/v3/x/projects/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" - subscriptiontypes "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" + projecttypes "github.com/lavanet/lava/v4/x/projects/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + subscriptiontypes "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_debug_query.go b/x/pairing/client/cli/query_debug_query.go index e596ff3f6a..9a7a0b6503 100644 --- a/x/pairing/client/cli/query_debug_query.go +++ b/x/pairing/client/cli/query_debug_query.go @@ -10,11 +10,11 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" - "github.com/lavanet/lava/v3/x/pairing/types" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/pairing/types" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_effective_policy.go b/x/pairing/client/cli/query_effective_policy.go index 050c42117a..f7a4ce565c 100644 --- a/x/pairing/client/cli/query_effective_policy.go +++ b/x/pairing/client/cli/query_effective_policy.go @@ -3,9 +3,9 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_get_pairing.go b/x/pairing/client/cli/query_get_pairing.go index de6ab761c7..ae43b61b8e 100644 --- a/x/pairing/client/cli/query_get_pairing.go +++ b/x/pairing/client/cli/query_get_pairing.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_params.go b/x/pairing/client/cli/query_params.go index 104ea1fdbd..440ec16e87 100644 --- a/x/pairing/client/cli/query_params.go +++ b/x/pairing/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_provider.go b/x/pairing/client/cli/query_provider.go index 5401537286..b599de90c8 100644 --- a/x/pairing/client/cli/query_provider.go +++ b/x/pairing/client/cli/query_provider.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_provider_monthly_payout.go b/x/pairing/client/cli/query_provider_monthly_payout.go index 796c1556e5..c23ed63a33 100644 --- a/x/pairing/client/cli/query_provider_monthly_payout.go +++ b/x/pairing/client/cli/query_provider_monthly_payout.go @@ -3,8 +3,8 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_provider_pairing_chance.go b/x/pairing/client/cli/query_provider_pairing_chance.go index ecbab9388c..630180ab95 100644 --- a/x/pairing/client/cli/query_provider_pairing_chance.go +++ b/x/pairing/client/cli/query_provider_pairing_chance.go @@ -3,9 +3,9 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_providers.go b/x/pairing/client/cli/query_providers.go index 192a79a879..4acf648314 100644 --- a/x/pairing/client/cli/query_providers.go +++ b/x/pairing/client/cli/query_providers.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_providers_epoch_cu.go b/x/pairing/client/cli/query_providers_epoch_cu.go index bc8de3f00c..a79de4fa72 100644 --- a/x/pairing/client/cli/query_providers_epoch_cu.go +++ b/x/pairing/client/cli/query_providers_epoch_cu.go @@ -3,7 +3,7 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_sdk_pairing.go b/x/pairing/client/cli/query_sdk_pairing.go index 85daebb1c5..4683a0c5dd 100644 --- a/x/pairing/client/cli/query_sdk_pairing.go +++ b/x/pairing/client/cli/query_sdk_pairing.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_static_providers_list.go b/x/pairing/client/cli/query_static_providers_list.go index 4328d30179..d1f1db4fe2 100644 --- a/x/pairing/client/cli/query_static_providers_list.go +++ b/x/pairing/client/cli/query_static_providers_list.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_subscription_monthly_payout.go b/x/pairing/client/cli/query_subscription_monthly_payout.go index e007fefcd2..945b8b741f 100644 --- a/x/pairing/client/cli/query_subscription_monthly_payout.go +++ b/x/pairing/client/cli/query_subscription_monthly_payout.go @@ -3,8 +3,8 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_user_entry.go b/x/pairing/client/cli/query_user_entry.go index 7b5caef808..f34c2eb5b2 100644 --- a/x/pairing/client/cli/query_user_entry.go +++ b/x/pairing/client/cli/query_user_entry.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cast" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/query_verify_pairing.go b/x/pairing/client/cli/query_verify_pairing.go index 0c2bd8b640..03729a1353 100644 --- a/x/pairing/client/cli/query_verify_pairing.go +++ b/x/pairing/client/cli/query_verify_pairing.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cast" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx.go b/x/pairing/client/cli/tx.go index 545f50eb2e..82b7058c06 100644 --- a/x/pairing/client/cli/tx.go +++ b/x/pairing/client/cli/tx.go @@ -15,12 +15,12 @@ import ( "github.com/spf13/cobra" // "github.com/cosmos/cosmos-sdk/client/flags" - lavautils "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - dualstakingTypes "github.com/lavanet/lava/v3/x/dualstaking/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/client/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + lavautils "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + dualstakingTypes "github.com/lavanet/lava/v4/x/dualstaking/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/client/utils" + "github.com/lavanet/lava/v4/x/pairing/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/pairing/client/cli/tx_distribute_provider_stake.go b/x/pairing/client/cli/tx_distribute_provider_stake.go index 344af3d3ec..f8808b5275 100644 --- a/x/pairing/client/cli/tx_distribute_provider_stake.go +++ b/x/pairing/client/cli/tx_distribute_provider_stake.go @@ -12,9 +12,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx_freeze.go b/x/pairing/client/cli/tx_freeze.go index 5d92601d50..855b5bf351 100644 --- a/x/pairing/client/cli/tx_freeze.go +++ b/x/pairing/client/cli/tx_freeze.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx_modify_provider.go b/x/pairing/client/cli/tx_modify_provider.go index 66e9404011..f27a93f4e4 100644 --- a/x/pairing/client/cli/tx_modify_provider.go +++ b/x/pairing/client/cli/tx_modify_provider.go @@ -10,11 +10,11 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx_move_provider_stake.go b/x/pairing/client/cli/tx_move_provider_stake.go index 98b6386d8f..1a125d5d08 100644 --- a/x/pairing/client/cli/tx_move_provider_stake.go +++ b/x/pairing/client/cli/tx_move_provider_stake.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx_relay_payment.go b/x/pairing/client/cli/tx_relay_payment.go index 33f2e8d6af..ca40458597 100644 --- a/x/pairing/client/cli/tx_relay_payment.go +++ b/x/pairing/client/cli/tx_relay_payment.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx_simulate_relay_payment.go b/x/pairing/client/cli/tx_simulate_relay_payment.go index eb9899401a..3d9d5986ad 100644 --- a/x/pairing/client/cli/tx_simulate_relay_payment.go +++ b/x/pairing/client/cli/tx_simulate_relay_payment.go @@ -9,10 +9,10 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx_stake_provider.go b/x/pairing/client/cli/tx_stake_provider.go index 794007cd8c..7c377f03b2 100644 --- a/x/pairing/client/cli/tx_stake_provider.go +++ b/x/pairing/client/cli/tx_stake_provider.go @@ -13,11 +13,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/feegrant" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - conflicttypes "github.com/lavanet/lava/v3/x/conflict/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + conflicttypes "github.com/lavanet/lava/v4/x/conflict/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx_unfreeze.go b/x/pairing/client/cli/tx_unfreeze.go index 2bcbec29cb..3955d9ec6b 100644 --- a/x/pairing/client/cli/tx_unfreeze.go +++ b/x/pairing/client/cli/tx_unfreeze.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) diff --git a/x/pairing/client/cli/tx_unstake_provider.go b/x/pairing/client/cli/tx_unstake_provider.go index bb0ddbd799..c5f380a063 100644 --- a/x/pairing/client/cli/tx_unstake_provider.go +++ b/x/pairing/client/cli/tx_unstake_provider.go @@ -2,6 +2,7 @@ package cli import ( "context" + "fmt" "strconv" "strings" @@ -10,10 +11,10 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/feegrant" - "github.com/lavanet/lava/v3/utils" - dualstakingclient "github.com/lavanet/lava/v3/x/dualstaking/client/cli" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + dualstakingclient "github.com/lavanet/lava/v4/x/dualstaking/client/cli" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/spf13/cobra" ) @@ -43,6 +44,9 @@ func CmdUnstakeProvider() *cobra.Command { } else { validator = dualstakingclient.GetValidator(clientCtx) } + if validator == "" { + return fmt.Errorf("cannot unstake, the provider is not delegated to any validator.\nthe provider might have all zero delegations, to resolve please delegated to one of the validators a small amount") + } msgs := []sdk.Msg{} for _, chainID := range chainIDs { diff --git a/x/pairing/client/proposal_handler.go b/x/pairing/client/proposal_handler.go index 561959378f..b442f190b9 100644 --- a/x/pairing/client/proposal_handler.go +++ b/x/pairing/client/proposal_handler.go @@ -2,7 +2,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/lavanet/lava/v3/x/pairing/client/cli" + "github.com/lavanet/lava/v4/x/pairing/client/cli" ) var PairingUnstakeProposal = govclient.NewProposalHandler(cli.NewSubmitUnstakeProposalTxCmd) diff --git a/x/pairing/client/utils/utils.go b/x/pairing/client/utils/utils.go index 1ef0b6a98d..115de34671 100755 --- a/x/pairing/client/utils/utils.go +++ b/x/pairing/client/utils/utils.go @@ -4,7 +4,7 @@ import ( "os" "github.com/cosmos/cosmos-sdk/codec" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) type ( diff --git a/x/pairing/genesis.go b/x/pairing/genesis.go index d0b17726bf..595cbb5118 100644 --- a/x/pairing/genesis.go +++ b/x/pairing/genesis.go @@ -2,8 +2,8 @@ package pairing import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/pairing/genesis_test.go b/x/pairing/genesis_test.go index 9d5c7407ee..5424e4d5ed 100644 --- a/x/pairing/genesis_test.go +++ b/x/pairing/genesis_test.go @@ -3,10 +3,10 @@ package pairing_test import ( "testing" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/pairing" - "github.com/lavanet/lava/v3/x/pairing/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/pairing" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/handler.go b/x/pairing/handler.go index a472ebb735..b8ebc5684d 100644 --- a/x/pairing/handler.go +++ b/x/pairing/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) // NewHandler ... diff --git a/x/pairing/keeper/badge_used_cu.go b/x/pairing/keeper/badge_used_cu.go index 38cb3ff31c..2ba9434267 100644 --- a/x/pairing/keeper/badge_used_cu.go +++ b/x/pairing/keeper/badge_used_cu.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" - timertypes "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" + timertypes "github.com/lavanet/lava/v4/x/timerstore/types" ) // SetBadgeUsedCu set a specific badgeUsedCu in the store from its index diff --git a/x/pairing/keeper/badge_used_cu_test.go b/x/pairing/keeper/badge_used_cu_test.go index a1f6661414..31a4812884 100644 --- a/x/pairing/keeper/badge_used_cu_test.go +++ b/x/pairing/keeper/badge_used_cu_test.go @@ -5,10 +5,10 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/cu_tracker_test.go b/x/pairing/keeper/cu_tracker_test.go index d8f96c501d..46ba860cb8 100644 --- a/x/pairing/keeper/cu_tracker_test.go +++ b/x/pairing/keeper/cu_tracker_test.go @@ -6,12 +6,12 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/sigs" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/testutil/common" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/sigs" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/delegator_rewards_test.go b/x/pairing/keeper/delegator_rewards_test.go index b031a10846..e7038f9285 100644 --- a/x/pairing/keeper/delegator_rewards_test.go +++ b/x/pairing/keeper/delegator_rewards_test.go @@ -5,11 +5,11 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/sigs" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" - "github.com/lavanet/lava/v3/x/pairing/types" - subscriptiontypes "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/sigs" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" + "github.com/lavanet/lava/v4/x/pairing/types" + subscriptiontypes "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/discipline.go b/x/pairing/keeper/discipline.go index d6db6c2997..aa0f8d732a 100644 --- a/x/pairing/keeper/discipline.go +++ b/x/pairing/keeper/discipline.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) func (k Keeper) JailEntry(ctx sdk.Context, address string, chainID string, jailStartBlock, jailBlocks uint64, bail sdk.Coin) error { diff --git a/x/pairing/keeper/epoch_cu.go b/x/pairing/keeper/epoch_cu.go index 98c798f8b7..a7763b27db 100644 --- a/x/pairing/keeper/epoch_cu.go +++ b/x/pairing/keeper/epoch_cu.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/cachekv" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" ) // UniqueEpochSession is used to detect double spend attacks diff --git a/x/pairing/keeper/epoch_cu_test.go b/x/pairing/keeper/epoch_cu_test.go index aa69bae89e..f0a40f64d4 100644 --- a/x/pairing/keeper/epoch_cu_test.go +++ b/x/pairing/keeper/epoch_cu_test.go @@ -5,10 +5,10 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/epoch_payment.go b/x/pairing/keeper/epoch_payment.go index 488219bbd5..09ee4f07b3 100644 --- a/x/pairing/keeper/epoch_payment.go +++ b/x/pairing/keeper/epoch_payment.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) // AddEpochPayment adds a new epoch payment and returns the updated CU used between provider and project diff --git a/x/pairing/keeper/filters/addon_filter.go b/x/pairing/keeper/filters/addon_filter.go index d8be7adb99..d4025ecb96 100644 --- a/x/pairing/keeper/filters/addon_filter.go +++ b/x/pairing/keeper/filters/addon_filter.go @@ -4,9 +4,9 @@ import ( "sort" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) type AddonFilter struct { diff --git a/x/pairing/keeper/filters/filter.go b/x/pairing/keeper/filters/filter.go index 097ccee0cc..1ec9953132 100644 --- a/x/pairing/keeper/filters/filter.go +++ b/x/pairing/keeper/filters/filter.go @@ -4,11 +4,11 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingscores "github.com/lavanet/lava/v3/x/pairing/keeper/scores" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingscores "github.com/lavanet/lava/v4/x/pairing/keeper/scores" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) // The Filter interface allows creating filters that filter out providers in the pairing process. diff --git a/x/pairing/keeper/filters/filter_test.go b/x/pairing/keeper/filters/filter_test.go index b32e43b5c2..e84c2c877a 100644 --- a/x/pairing/keeper/filters/filter_test.go +++ b/x/pairing/keeper/filters/filter_test.go @@ -5,8 +5,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/filters/frozen_providers_filter.go b/x/pairing/keeper/filters/frozen_providers_filter.go index 5dc4bcd5fc..ea33310ee9 100644 --- a/x/pairing/keeper/filters/frozen_providers_filter.go +++ b/x/pairing/keeper/filters/frozen_providers_filter.go @@ -2,8 +2,8 @@ package filters import ( sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) type FrozenProvidersFilter struct{} diff --git a/x/pairing/keeper/filters/geolocation_filter.go b/x/pairing/keeper/filters/geolocation_filter.go index 8d614e0372..307f10d640 100644 --- a/x/pairing/keeper/filters/geolocation_filter.go +++ b/x/pairing/keeper/filters/geolocation_filter.go @@ -2,8 +2,8 @@ package filters import ( sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) // TODO: This filter is disabled (InitFilter always returns false) diff --git a/x/pairing/keeper/filters/selected_providers_filter.go b/x/pairing/keeper/filters/selected_providers_filter.go index ec15fcdc5f..8f0fbcedab 100644 --- a/x/pairing/keeper/filters/selected_providers_filter.go +++ b/x/pairing/keeper/filters/selected_providers_filter.go @@ -2,8 +2,8 @@ package filters import ( sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) type SelectedProvidersFilter struct { diff --git a/x/pairing/keeper/fixation_test.go b/x/pairing/keeper/fixation_test.go index b504bab17b..612da1af03 100644 --- a/x/pairing/keeper/fixation_test.go +++ b/x/pairing/keeper/fixation_test.go @@ -4,9 +4,9 @@ import ( "strconv" "testing" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/sigs" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/sigs" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/grpc_query.go b/x/pairing/keeper/grpc_query.go index cc13962edf..c421a0b6c3 100644 --- a/x/pairing/keeper/grpc_query.go +++ b/x/pairing/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/pairing/keeper/grpc_query_effective_policy.go b/x/pairing/keeper/grpc_query_effective_policy.go index 8a2d5ee29a..2ba07c03e2 100644 --- a/x/pairing/keeper/grpc_query_effective_policy.go +++ b/x/pairing/keeper/grpc_query_effective_policy.go @@ -5,8 +5,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/pairing/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_effective_policy_test.go b/x/pairing/keeper/grpc_query_effective_policy_test.go index a230c4b099..2b7d07e1b6 100644 --- a/x/pairing/keeper/grpc_query_effective_policy_test.go +++ b/x/pairing/keeper/grpc_query_effective_policy_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/testutil/common" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/testutil/common" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/grpc_query_get_pairing.go b/x/pairing/keeper/grpc_query_get_pairing.go index 42ab6c3d2d..88d49e2c55 100644 --- a/x/pairing/keeper/grpc_query_get_pairing.go +++ b/x/pairing/keeper/grpc_query_get_pairing.go @@ -6,9 +6,9 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_params.go b/x/pairing/keeper/grpc_query_params.go index 3c1bacc8fe..f060dbef67 100644 --- a/x/pairing/keeper/grpc_query_params.go +++ b/x/pairing/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_params_test.go b/x/pairing/keeper/grpc_query_params_test.go index 3fe74bce2a..be349519c9 100644 --- a/x/pairing/keeper/grpc_query_params_test.go +++ b/x/pairing/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/grpc_query_provider.go b/x/pairing/keeper/grpc_query_provider.go index bd2970c82c..69d107ff5e 100644 --- a/x/pairing/keeper/grpc_query_provider.go +++ b/x/pairing/keeper/grpc_query_provider.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_provider_monthly_payout.go b/x/pairing/keeper/grpc_query_provider_monthly_payout.go index 1268a2bd82..15c25fde77 100644 --- a/x/pairing/keeper/grpc_query_provider_monthly_payout.go +++ b/x/pairing/keeper/grpc_query_provider_monthly_payout.go @@ -5,10 +5,10 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" - subsciption "github.com/lavanet/lava/v3/x/subscription/keeper" - subsciptiontypes "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" + subsciption "github.com/lavanet/lava/v4/x/subscription/keeper" + subsciptiontypes "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_provider_pairing_chance.go b/x/pairing/keeper/grpc_query_provider_pairing_chance.go index b4081c7581..0e720395f8 100644 --- a/x/pairing/keeper/grpc_query_provider_pairing_chance.go +++ b/x/pairing/keeper/grpc_query_provider_pairing_chance.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_providers.go b/x/pairing/keeper/grpc_query_providers.go index 632f007311..440665cc60 100644 --- a/x/pairing/keeper/grpc_query_providers.go +++ b/x/pairing/keeper/grpc_query_providers.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_providers_epoch_cu.go b/x/pairing/keeper/grpc_query_providers_epoch_cu.go index 296ab3c7dc..76e7d389e4 100644 --- a/x/pairing/keeper/grpc_query_providers_epoch_cu.go +++ b/x/pairing/keeper/grpc_query_providers_epoch_cu.go @@ -5,7 +5,7 @@ import ( "sort" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_static_providers_list.go b/x/pairing/keeper/grpc_query_static_providers_list.go index 9ed0c061ec..28ad425ed5 100644 --- a/x/pairing/keeper/grpc_query_static_providers_list.go +++ b/x/pairing/keeper/grpc_query_static_providers_list.go @@ -5,9 +5,9 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_subscription_monthly_payout.go b/x/pairing/keeper/grpc_query_subscription_monthly_payout.go index cc1f50ad2d..7d9d0eeab4 100644 --- a/x/pairing/keeper/grpc_query_subscription_monthly_payout.go +++ b/x/pairing/keeper/grpc_query_subscription_monthly_payout.go @@ -6,10 +6,10 @@ import ( "sort" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" - subsciption "github.com/lavanet/lava/v3/x/subscription/keeper" - subsciptiontypes "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" + subsciption "github.com/lavanet/lava/v4/x/subscription/keeper" + subsciptiontypes "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_user_entry.go b/x/pairing/keeper/grpc_query_user_entry.go index f100d5f60c..6915cf8401 100644 --- a/x/pairing/keeper/grpc_query_user_entry.go +++ b/x/pairing/keeper/grpc_query_user_entry.go @@ -5,9 +5,9 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/grpc_query_verify_pairing.go b/x/pairing/keeper/grpc_query_verify_pairing.go index bb1deab9a3..b077894097 100644 --- a/x/pairing/keeper/grpc_query_verify_pairing.go +++ b/x/pairing/keeper/grpc_query_verify_pairing.go @@ -6,7 +6,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/helpers_test.go b/x/pairing/keeper/helpers_test.go index 78ca6c0360..ed1d64adcb 100644 --- a/x/pairing/keeper/helpers_test.go +++ b/x/pairing/keeper/helpers_test.go @@ -5,13 +5,13 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - testutil "github.com/lavanet/lava/v3/testutil/keeper" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/common" + testutil "github.com/lavanet/lava/v4/testutil/keeper" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/keeper.go b/x/pairing/keeper/keeper.go index 88642b77c0..62050236aa 100644 --- a/x/pairing/keeper/keeper.go +++ b/x/pairing/keeper/keeper.go @@ -4,15 +4,15 @@ import ( "fmt" storetypes "github.com/cosmos/cosmos-sdk/store/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" - "github.com/lavanet/lava/v3/x/pairing/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) type ( diff --git a/x/pairing/keeper/limitConsumer.go b/x/pairing/keeper/limitConsumer.go index 43062c85da..3578c25d54 100644 --- a/x/pairing/keeper/limitConsumer.go +++ b/x/pairing/keeper/limitConsumer.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) func (k Keeper) EnforceClientCUsUsageInEpoch(ctx sdk.Context, relayCU, epochAllowedCU, totalCUInEpochForUserProvider uint64, clientAddr sdk.AccAddress, chainID string, epoch uint64) (uint64, error) { diff --git a/x/pairing/keeper/limitConsumer_test.go b/x/pairing/keeper/limitConsumer_test.go index ada0c67360..68bb267905 100644 --- a/x/pairing/keeper/limitConsumer_test.go +++ b/x/pairing/keeper/limitConsumer_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/sigs" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/migrations.go b/x/pairing/keeper/migrations.go index d5f047be44..da8dafc7e7 100644 --- a/x/pairing/keeper/migrations.go +++ b/x/pairing/keeper/migrations.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" types1 "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils/lavaslices" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - v2 "github.com/lavanet/lava/v3/x/pairing/migrations/v2" + "github.com/lavanet/lava/v4/utils/lavaslices" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + v2 "github.com/lavanet/lava/v4/x/pairing/migrations/v2" ) type Migrator struct { diff --git a/x/pairing/keeper/migrations_test.go b/x/pairing/keeper/migrations_test.go index a5b7a5ee07..dd6250ea5f 100644 --- a/x/pairing/keeper/migrations_test.go +++ b/x/pairing/keeper/migrations_test.go @@ -4,8 +4,8 @@ import ( "testing" "cosmossdk.io/math" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/x/pairing/keeper" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/x/pairing/keeper" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/msg_server.go b/x/pairing/keeper/msg_server.go index 78e6f7d3dc..dd8e539a03 100644 --- a/x/pairing/keeper/msg_server.go +++ b/x/pairing/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) type msgServer struct { diff --git a/x/pairing/keeper/msg_server_freeze.go b/x/pairing/keeper/msg_server_freeze.go index e8ceb86d35..1be8599f50 100644 --- a/x/pairing/keeper/msg_server_freeze.go +++ b/x/pairing/keeper/msg_server_freeze.go @@ -7,9 +7,9 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) func (k msgServer) FreezeProvider(goCtx context.Context, msg *types.MsgFreezeProvider) (*types.MsgFreezeProviderResponse, error) { diff --git a/x/pairing/keeper/msg_server_freeze_test.go b/x/pairing/keeper/msg_server_freeze_test.go index 58d02387c8..3efe3631d4 100644 --- a/x/pairing/keeper/msg_server_freeze_test.go +++ b/x/pairing/keeper/msg_server_freeze_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/sigs" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/msg_server_move_provider_stake.go b/x/pairing/keeper/msg_server_move_provider_stake.go index 4eaa377492..7c9fb9b3d5 100644 --- a/x/pairing/keeper/msg_server_move_provider_stake.go +++ b/x/pairing/keeper/msg_server_move_provider_stake.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" ) func (k msgServer) MoveProviderStake(goCtx context.Context, msg *types.MsgMoveProviderStake) (*types.MsgMoveProviderStakeResponse, error) { diff --git a/x/pairing/keeper/msg_server_relay_payment.go b/x/pairing/keeper/msg_server_relay_payment.go index e4321d4494..a1ec9c0f3f 100644 --- a/x/pairing/keeper/msg_server_relay_payment.go +++ b/x/pairing/keeper/msg_server_relay_payment.go @@ -8,12 +8,12 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/utils/sigs" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/utils/sigs" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" ) type BadgeData struct { @@ -377,6 +377,7 @@ func (k EpochCuCache) updateProvidersComplainerCU(ctx sdk.Context, unresponsiveP "cu": strconv.FormatUint(complainerCuToAdd, 10), "epoch": strconv.FormatUint(epoch, 10), "total_complaint_this_epoch": strconv.FormatUint(pec.ComplainersCu, 10), + "chainID": chainID, } utils.LogLavaEvent(ctx, k.Logger(ctx), types.ProviderReportedEventName, details, "provider got reported by consumer") } diff --git a/x/pairing/keeper/msg_server_relay_payment_gov_test.go b/x/pairing/keeper/msg_server_relay_payment_gov_test.go index 6f1f8713cf..3370fdab89 100644 --- a/x/pairing/keeper/msg_server_relay_payment_gov_test.go +++ b/x/pairing/keeper/msg_server_relay_payment_gov_test.go @@ -5,11 +5,11 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/sigs" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/sigs" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/msg_server_relay_payment_test.go b/x/pairing/keeper/msg_server_relay_payment_test.go index 54d11afb53..2103c22bcb 100644 --- a/x/pairing/keeper/msg_server_relay_payment_test.go +++ b/x/pairing/keeper/msg_server_relay_payment_test.go @@ -4,13 +4,13 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - commonconsts "github.com/lavanet/lava/v3/testutil/common/consts" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/sigs" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/testutil/common" + commonconsts "github.com/lavanet/lava/v4/testutil/common/consts" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/sigs" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/msg_server_stake_provider.go b/x/pairing/keeper/msg_server_stake_provider.go index ab90632601..fbc049a17b 100644 --- a/x/pairing/keeper/msg_server_stake_provider.go +++ b/x/pairing/keeper/msg_server_stake_provider.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" ) func (k msgServer) StakeProvider(goCtx context.Context, msg *types.MsgStakeProvider) (*types.MsgStakeProviderResponse, error) { diff --git a/x/pairing/keeper/msg_server_stake_provider_test.go b/x/pairing/keeper/msg_server_stake_provider_test.go index d3046d47cd..ccacd1be01 100644 --- a/x/pairing/keeper/msg_server_stake_provider_test.go +++ b/x/pairing/keeper/msg_server_stake_provider_test.go @@ -7,11 +7,11 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/testutil/common" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/client/cli" - "github.com/lavanet/lava/v3/x/pairing/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/common" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/client/cli" + "github.com/lavanet/lava/v4/x/pairing/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/msg_server_stake_unstake_gov_test.go b/x/pairing/keeper/msg_server_stake_unstake_gov_test.go index c8a95d339b..a5d4174443 100644 --- a/x/pairing/keeper/msg_server_stake_unstake_gov_test.go +++ b/x/pairing/keeper/msg_server_stake_unstake_gov_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/msg_server_test.go b/x/pairing/keeper/msg_server_test.go index c1896c153a..e0ae4603a0 100644 --- a/x/pairing/keeper/msg_server_test.go +++ b/x/pairing/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) // TODO: use or delete this function diff --git a/x/pairing/keeper/msg_server_unfreeze.go b/x/pairing/keeper/msg_server_unfreeze.go index b7afb4851c..37d32129cb 100644 --- a/x/pairing/keeper/msg_server_unfreeze.go +++ b/x/pairing/keeper/msg_server_unfreeze.go @@ -5,8 +5,8 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" ) func (k msgServer) UnfreezeProvider(goCtx context.Context, msg *types.MsgUnfreezeProvider) (*types.MsgUnfreezeProviderResponse, error) { diff --git a/x/pairing/keeper/msg_server_unstake_provider.go b/x/pairing/keeper/msg_server_unstake_provider.go index c072618356..0b28b8e300 100644 --- a/x/pairing/keeper/msg_server_unstake_provider.go +++ b/x/pairing/keeper/msg_server_unstake_provider.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) func (k msgServer) UnstakeProvider(goCtx context.Context, msg *types.MsgUnstakeProvider) (*types.MsgUnstakeProviderResponse, error) { diff --git a/x/pairing/keeper/msg_server_unstake_provider_test.go b/x/pairing/keeper/msg_server_unstake_provider_test.go index 3bcff8ea12..32b89a2e3a 100644 --- a/x/pairing/keeper/msg_server_unstake_provider_test.go +++ b/x/pairing/keeper/msg_server_unstake_provider_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/testutil/common" + "github.com/lavanet/lava/v4/testutil/common" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/pairing.go b/x/pairing/keeper/pairing.go index 638c01648a..f90248e559 100644 --- a/x/pairing/keeper/pairing.go +++ b/x/pairing/keeper/pairing.go @@ -7,14 +7,14 @@ import ( cosmosmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingfilters "github.com/lavanet/lava/v3/x/pairing/keeper/filters" - pairingscores "github.com/lavanet/lava/v3/x/pairing/keeper/scores" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingfilters "github.com/lavanet/lava/v4/x/pairing/keeper/filters" + pairingscores "github.com/lavanet/lava/v4/x/pairing/keeper/scores" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) func (k Keeper) VerifyPairingData(ctx sdk.Context, chainID string, block uint64) (epoch uint64, providersType spectypes.Spec_ProvidersTypes, errorRet error) { diff --git a/x/pairing/keeper/pairing_cache.go b/x/pairing/keeper/pairing_cache.go index a3652babc8..dbaeef2933 100644 --- a/x/pairing/keeper/pairing_cache.go +++ b/x/pairing/keeper/pairing_cache.go @@ -3,8 +3,8 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) func (k Keeper) SetPairingRelayCache(ctx sdk.Context, project string, chainID string, epoch uint64, pairedProviders []epochstoragetypes.StakeEntry, allowedCu uint64) { diff --git a/x/pairing/keeper/pairing_cache_test.go b/x/pairing/keeper/pairing_cache_test.go index fb1f0829ef..74409cad18 100644 --- a/x/pairing/keeper/pairing_cache_test.go +++ b/x/pairing/keeper/pairing_cache_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/testutil/common" + "github.com/lavanet/lava/v4/testutil/common" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/pairing_immediately_test.go b/x/pairing/keeper/pairing_immediately_test.go index 260b9b1488..8c8454bef3 100644 --- a/x/pairing/keeper/pairing_immediately_test.go +++ b/x/pairing/keeper/pairing_immediately_test.go @@ -3,9 +3,9 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/lavaslices" - projectTypes "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/lavaslices" + projectTypes "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/pairing_next_epoch_time_block.go b/x/pairing/keeper/pairing_next_epoch_time_block.go index e454f7114d..881876704e 100644 --- a/x/pairing/keeper/pairing_next_epoch_time_block.go +++ b/x/pairing/keeper/pairing_next_epoch_time_block.go @@ -7,8 +7,8 @@ import ( "github.com/cometbft/cometbft/rpc/core" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/x/pairing/keeper/pairing_subscription_test.go b/x/pairing/keeper/pairing_subscription_test.go index b46c105e9a..2dc1bdd44a 100644 --- a/x/pairing/keeper/pairing_subscription_test.go +++ b/x/pairing/keeper/pairing_subscription_test.go @@ -3,11 +3,11 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/sigs" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/sigs" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/pairing_test.go b/x/pairing/keeper/pairing_test.go index 55e1024b95..c312411f1e 100644 --- a/x/pairing/keeper/pairing_test.go +++ b/x/pairing/keeper/pairing_test.go @@ -8,16 +8,16 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - specutils "github.com/lavanet/lava/v3/utils/keeper" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/sigs" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingscores "github.com/lavanet/lava/v3/x/pairing/keeper/scores" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/common" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + specutils "github.com/lavanet/lava/v4/utils/keeper" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/sigs" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingscores "github.com/lavanet/lava/v4/x/pairing/keeper/scores" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/params.go b/x/pairing/keeper/params.go index b7ca316905..2fd3570c43 100644 --- a/x/pairing/keeper/params.go +++ b/x/pairing/keeper/params.go @@ -4,8 +4,8 @@ import ( "strconv" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/types" ) // GetParams get all parameters as types.Params diff --git a/x/pairing/keeper/params_test.go b/x/pairing/keeper/params_test.go index 149c1b22a2..22eeb50164 100644 --- a/x/pairing/keeper/params_test.go +++ b/x/pairing/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/qos_excellence.go b/x/pairing/keeper/qos_excellence.go index 0dd7f16b89..ae58116dd3 100644 --- a/x/pairing/keeper/qos_excellence.go +++ b/x/pairing/keeper/qos_excellence.go @@ -4,8 +4,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) // TODO: implement UpdateProviderQos(payments) diff --git a/x/pairing/keeper/query_sdk_pairing.go b/x/pairing/keeper/query_sdk_pairing.go index cbe2ce3024..872825b5ae 100644 --- a/x/pairing/keeper/query_sdk_pairing.go +++ b/x/pairing/keeper/query_sdk_pairing.go @@ -5,7 +5,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pairing/keeper/scores/geo_req.go b/x/pairing/keeper/scores/geo_req.go index b658cd3781..df4aa2f43f 100644 --- a/x/pairing/keeper/scores/geo_req.go +++ b/x/pairing/keeper/scores/geo_req.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) // geo requirement that implements the ScoreReq interface diff --git a/x/pairing/keeper/scores/geo_req_test.go b/x/pairing/keeper/scores/geo_req_test.go index 725f724fd6..79f2cb1257 100644 --- a/x/pairing/keeper/scores/geo_req_test.go +++ b/x/pairing/keeper/scores/geo_req_test.go @@ -3,9 +3,9 @@ package scores import ( "testing" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/scores/pairing_score.go b/x/pairing/keeper/scores/pairing_score.go index 023f5b4be9..5f2d16e8d5 100644 --- a/x/pairing/keeper/scores/pairing_score.go +++ b/x/pairing/keeper/scores/pairing_score.go @@ -2,8 +2,8 @@ package scores import ( "cosmossdk.io/math" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/x/pairing/keeper/scores/qos_req.go b/x/pairing/keeper/scores/qos_req.go index 38d9a6f22c..8f6480b7aa 100644 --- a/x/pairing/keeper/scores/qos_req.go +++ b/x/pairing/keeper/scores/qos_req.go @@ -3,8 +3,8 @@ package scores import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) const qosReqName = "qos-req" diff --git a/x/pairing/keeper/scores/score.go b/x/pairing/keeper/scores/score.go index cce0bca8fc..e411f7f42b 100644 --- a/x/pairing/keeper/scores/score.go +++ b/x/pairing/keeper/scores/score.go @@ -42,10 +42,10 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/rand" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/rand" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) var uniformStrategy ScoreStrategy diff --git a/x/pairing/keeper/scores/score_req.go b/x/pairing/keeper/scores/score_req.go index 058d2d593b..986c374e6f 100644 --- a/x/pairing/keeper/scores/score_req.go +++ b/x/pairing/keeper/scores/score_req.go @@ -2,7 +2,7 @@ package scores import ( "cosmossdk.io/math" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) // ScoreReq is an interface for pairing requirement scoring diff --git a/x/pairing/keeper/scores/stake_req.go b/x/pairing/keeper/scores/stake_req.go index 74af1713fb..d186f75dd5 100644 --- a/x/pairing/keeper/scores/stake_req.go +++ b/x/pairing/keeper/scores/stake_req.go @@ -3,7 +3,7 @@ package scores import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) const stakeReqName = "stake-req" diff --git a/x/pairing/keeper/single_provider_test.go b/x/pairing/keeper/single_provider_test.go index 29c33cd6c9..2f5663e1fd 100644 --- a/x/pairing/keeper/single_provider_test.go +++ b/x/pairing/keeper/single_provider_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/x/pairing/client/cli" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/x/pairing/client/cli" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/staking.go b/x/pairing/keeper/staking.go index a2e0850e03..4e4d8ae221 100644 --- a/x/pairing/keeper/staking.go +++ b/x/pairing/keeper/staking.go @@ -7,12 +7,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" ) const ( diff --git a/x/pairing/keeper/unresponsive_provider.go b/x/pairing/keeper/unresponsive_provider.go index a1443d7b6c..be1384a402 100644 --- a/x/pairing/keeper/unresponsive_provider.go +++ b/x/pairing/keeper/unresponsive_provider.go @@ -8,9 +8,9 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) const ( diff --git a/x/pairing/keeper/unresponsive_provider_test.go b/x/pairing/keeper/unresponsive_provider_test.go index 28f34f1370..2f366d25b6 100644 --- a/x/pairing/keeper/unresponsive_provider_test.go +++ b/x/pairing/keeper/unresponsive_provider_test.go @@ -4,12 +4,12 @@ import ( "testing" "time" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/utils/rand" - "github.com/lavanet/lava/v3/utils/sigs" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/utils/rand" + "github.com/lavanet/lava/v4/utils/sigs" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/keeper/unstaking.go b/x/pairing/keeper/unstaking.go index c86bb75a48..3adbf00b81 100644 --- a/x/pairing/keeper/unstaking.go +++ b/x/pairing/keeper/unstaking.go @@ -6,9 +6,9 @@ import ( "strconv" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) func (k Keeper) UnstakeEntry(ctx sdk.Context, validator, chainID, creator, unstakeDescription string) error { diff --git a/x/pairing/keeper/unstaking_test.go b/x/pairing/keeper/unstaking_test.go index 7e0b3ebb5c..4ca0642f1b 100644 --- a/x/pairing/keeper/unstaking_test.go +++ b/x/pairing/keeper/unstaking_test.go @@ -5,9 +5,9 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - testutils "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/testutil/common" + testutils "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/migrations/v2/epoch_payments.go b/x/pairing/migrations/v2/epoch_payments.go index 4f99051035..93c6c75faa 100644 --- a/x/pairing/migrations/v2/epoch_payments.go +++ b/x/pairing/migrations/v2/epoch_payments.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" ) // RemoveAllEpochPayments removes all epochPayments diff --git a/x/pairing/module.go b/x/pairing/module.go index 8692ed8ade..fdb1b7bbe3 100644 --- a/x/pairing/module.go +++ b/x/pairing/module.go @@ -16,9 +16,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/pairing/client/cli" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/client/cli" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) var ( diff --git a/x/pairing/module_simulation.go b/x/pairing/module_simulation.go index ee5c80ce35..2d2e31c970 100644 --- a/x/pairing/module_simulation.go +++ b/x/pairing/module_simulation.go @@ -10,9 +10,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" types2 "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - pairingsimulation "github.com/lavanet/lava/v3/x/pairing/simulation" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/testutil/sample" + pairingsimulation "github.com/lavanet/lava/v4/x/pairing/simulation" + "github.com/lavanet/lava/v4/x/pairing/types" ) // avoid unused import issue diff --git a/x/pairing/proposal_handler.go b/x/pairing/proposal_handler.go index d0d2f4351d..9a919709df 100644 --- a/x/pairing/proposal_handler.go +++ b/x/pairing/proposal_handler.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) // NewPlanProposalsHandler creates a new governance Handler for a Plan diff --git a/x/pairing/simulation/freeze.go b/x/pairing/simulation/freeze.go index 9a46c5614c..c583ddb917 100644 --- a/x/pairing/simulation/freeze.go +++ b/x/pairing/simulation/freeze.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) func SimulateMsgFreeze( diff --git a/x/pairing/simulation/relay_payment.go b/x/pairing/simulation/relay_payment.go index 54267f6432..6cd2b08a8d 100644 --- a/x/pairing/simulation/relay_payment.go +++ b/x/pairing/simulation/relay_payment.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) func SimulateMsgRelayPayment( diff --git a/x/pairing/simulation/stake_provider.go b/x/pairing/simulation/stake_provider.go index dc11222b10..0eece3809b 100644 --- a/x/pairing/simulation/stake_provider.go +++ b/x/pairing/simulation/stake_provider.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) func SimulateMsgStakeProvider( diff --git a/x/pairing/simulation/unfreeze.go b/x/pairing/simulation/unfreeze.go index 2290520162..77256d7b20 100644 --- a/x/pairing/simulation/unfreeze.go +++ b/x/pairing/simulation/unfreeze.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) func SimulateMsgUnfreeze( diff --git a/x/pairing/simulation/unstake_provider.go b/x/pairing/simulation/unstake_provider.go index 17dc71b610..71f79e812a 100644 --- a/x/pairing/simulation/unstake_provider.go +++ b/x/pairing/simulation/unstake_provider.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/pairing/keeper" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/keeper" + "github.com/lavanet/lava/v4/x/pairing/types" ) func SimulateMsgUnstakeProvider( diff --git a/x/pairing/types/account_info.pb.go b/x/pairing/types/account_info.pb.go index f61ce4c3a8..bb98b15a49 100644 --- a/x/pairing/types/account_info.pb.go +++ b/x/pairing/types/account_info.pb.go @@ -8,10 +8,10 @@ import ( types3 "github.com/cosmos/cosmos-sdk/x/staking/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types4 "github.com/lavanet/lava/v3/x/dualstaking/types" - types "github.com/lavanet/lava/v3/x/epochstorage/types" - types2 "github.com/lavanet/lava/v3/x/projects/types" - types1 "github.com/lavanet/lava/v3/x/subscription/types" + types4 "github.com/lavanet/lava/v4/x/dualstaking/types" + types "github.com/lavanet/lava/v4/x/epochstorage/types" + types2 "github.com/lavanet/lava/v4/x/projects/types" + types1 "github.com/lavanet/lava/v4/x/subscription/types" _ "google.golang.org/protobuf/types/known/wrapperspb" io "io" math "math" @@ -141,35 +141,35 @@ var fileDescriptor_5569ac5696c70068 = []byte{ // 494 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xc1, 0x6e, 0xd3, 0x40, 0x10, 0x8d, 0x21, 0xa4, 0xc5, 0xe5, 0x00, 0x56, 0x40, 0x56, 0x0f, 0x26, 0x82, 0xa2, 0x46, 0x2d, - 0xda, 0x55, 0xdb, 0x3b, 0x12, 0xa5, 0x08, 0x71, 0x6b, 0x53, 0x89, 0x03, 0x17, 0x6b, 0x63, 0x4f, - 0x5c, 0x83, 0xbb, 0x63, 0xed, 0xae, 0x0d, 0xe1, 0x2b, 0xf8, 0xac, 0x1e, 0x7b, 0xe4, 0x84, 0x50, - 0xf2, 0x19, 0x5c, 0x90, 0xd7, 0xbb, 0x61, 0xf7, 0x08, 0x27, 0xcf, 0x68, 0xde, 0xbc, 0x99, 0x79, - 0xfb, 0x1c, 0xee, 0x57, 0xac, 0x65, 0x1c, 0x14, 0xed, 0xbe, 0xb4, 0x66, 0xa5, 0x28, 0x79, 0x41, - 0x59, 0x96, 0x61, 0xc3, 0x55, 0x5a, 0xf2, 0x05, 0x92, 0x5a, 0xa0, 0xc2, 0x68, 0x6c, 0x80, 0xa4, - 0xfb, 0x12, 0x03, 0xdc, 0x1d, 0x17, 0x58, 0xa0, 0x06, 0xd0, 0x2e, 0xea, 0xb1, 0xbb, 0x49, 0x81, - 0x58, 0x54, 0x40, 0x75, 0x36, 0x6f, 0x16, 0xf4, 0x8b, 0x60, 0x75, 0x0d, 0x42, 0x9a, 0xfa, 0xa1, - 0x37, 0x14, 0x6a, 0xcc, 0xae, 0xa4, 0x42, 0xc1, 0x0a, 0xa0, 0x52, 0xb1, 0xcf, 0x90, 0x02, 0x57, - 0x62, 0x69, 0xc0, 0xfe, 0x86, 0x79, 0xc3, 0xaa, 0x0e, 0xd3, 0x6d, 0x99, 0x43, 0x05, 0x05, 0x53, - 0x60, 0x80, 0x7b, 0x19, 0xca, 0x6b, 0x94, 0xd4, 0x96, 0xdb, 0xa3, 0x39, 0x28, 0x76, 0x64, 0x73, - 0x83, 0x7a, 0xe9, 0xd1, 0xc9, 0x66, 0x2e, 0x33, 0x51, 0xd6, 0xaa, 0x44, 0xee, 0x25, 0x06, 0xfd, - 0xdc, 0x97, 0x47, 0xe0, 0x27, 0xc8, 0x94, 0xb4, 0x41, 0x0f, 0x7a, 0xf6, 0x7b, 0x18, 0xc6, 0x17, - 0x0d, 0x88, 0xe5, 0xeb, 0x5e, 0xb6, 0xf7, 0x7c, 0x81, 0x33, 0x90, 0x35, 0x72, 0x09, 0xd1, 0xbb, - 0x70, 0xbb, 0x16, 0xd8, 0x96, 0x39, 0x88, 0x38, 0x98, 0xdc, 0x9d, 0xee, 0x1c, 0xbf, 0x20, 0x9e, - 0x94, 0xee, 0xf9, 0xe4, 0xb2, 0x3b, 0xff, 0x6d, 0x77, 0xfd, 0xe9, 0xf0, 0xe6, 0xe7, 0xd3, 0xc1, - 0x6c, 0xd3, 0x1c, 0xbd, 0x09, 0x47, 0x0b, 0x81, 0xdf, 0x80, 0xc7, 0x77, 0xfe, 0x9d, 0xc6, 0xb4, - 0x76, 0xdb, 0x34, 0x5c, 0x6b, 0x9c, 0xc7, 0xc3, 0xff, 0xd8, 0xc6, 0x36, 0x47, 0x17, 0xe1, 0x03, - 0x57, 0xae, 0xf8, 0xde, 0x24, 0x98, 0xee, 0x1c, 0xef, 0xfb, 0x64, 0x9e, 0xa0, 0x97, 0x4e, 0xa2, - 0xe9, 0x82, 0x99, 0x47, 0x11, 0xbd, 0x0a, 0xb7, 0x8c, 0xae, 0xf1, 0x48, 0xb3, 0x25, 0x3e, 0x9b, - 0x55, 0x9f, 0x9c, 0xf7, 0x81, 0x21, 0xb1, 0x4d, 0x51, 0x11, 0x3e, 0x31, 0x8e, 0x28, 0x91, 0xcb, - 0xb4, 0x65, 0x55, 0x99, 0x33, 0x85, 0x42, 0xc6, 0x5b, 0xfa, 0xd2, 0x03, 0xd2, 0x1b, 0x84, 0x58, - 0x43, 0x18, 0x83, 0x90, 0xb3, 0x4d, 0x97, 0x7d, 0x35, 0x73, 0xee, 0x63, 0x87, 0xef, 0xc3, 0x86, - 0x2e, 0x4a, 0x43, 0xb7, 0x90, 0xda, 0x17, 0x92, 0xf1, 0xb6, 0x9e, 0xb3, 0xe7, 0xaf, 0xed, 0x38, - 0xd6, 0x99, 0x64, 0x26, 0x8c, 0x1d, 0xa2, 0x73, 0xcb, 0x13, 0x1d, 0x86, 0x8f, 0x14, 0x2a, 0x56, - 0xa5, 0x4e, 0x35, 0xbe, 0x3f, 0x09, 0xa6, 0xc3, 0xd9, 0x43, 0x5d, 0xf8, 0xcb, 0x23, 0x4f, 0xcf, - 0x6e, 0x56, 0x49, 0x70, 0xbb, 0x4a, 0x82, 0x5f, 0xab, 0x24, 0xf8, 0xbe, 0x4e, 0x06, 0xb7, 0xeb, - 0x64, 0xf0, 0x63, 0x9d, 0x0c, 0x3e, 0x1e, 0x14, 0xa5, 0xba, 0x6a, 0xe6, 0x24, 0xc3, 0x6b, 0xea, - 0xf9, 0xb8, 0x3d, 0xa1, 0x5f, 0x37, 0xff, 0xba, 0x5a, 0xd6, 0x20, 0xe7, 0x23, 0x6d, 0xe5, 0x93, - 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x03, 0xf8, 0x2b, 0xe8, 0x10, 0x04, 0x00, 0x00, + 0xda, 0x55, 0x0b, 0x67, 0x24, 0x4a, 0x11, 0xe2, 0xd6, 0xa6, 0x12, 0x07, 0x2e, 0xd6, 0xc6, 0x9e, + 0xb8, 0x06, 0x77, 0xc7, 0xda, 0x5d, 0x1b, 0xc2, 0x57, 0xf0, 0x59, 0x3d, 0xf6, 0xc8, 0x09, 0xa1, + 0xe4, 0x33, 0xb8, 0x20, 0xaf, 0x77, 0xc3, 0xee, 0x11, 0x4e, 0x9e, 0xd1, 0xbc, 0x79, 0x33, 0xf3, + 0xf6, 0x39, 0xdc, 0xaf, 0x58, 0xcb, 0x38, 0x28, 0xda, 0x7d, 0x69, 0xcd, 0x4a, 0x51, 0xf2, 0x82, + 0xb2, 0x2c, 0xc3, 0x86, 0xab, 0xb4, 0xe4, 0x0b, 0x24, 0xb5, 0x40, 0x85, 0xd1, 0xd8, 0x00, 0x49, + 0xf7, 0x25, 0x06, 0xb8, 0x3b, 0x2e, 0xb0, 0x40, 0x0d, 0xa0, 0x5d, 0xd4, 0x63, 0x77, 0x93, 0x02, + 0xb1, 0xa8, 0x80, 0xea, 0x6c, 0xde, 0x2c, 0xe8, 0x17, 0xc1, 0xea, 0x1a, 0x84, 0x34, 0xf5, 0x43, + 0x6f, 0x28, 0xd4, 0x98, 0x5d, 0x4a, 0x85, 0x82, 0x15, 0x40, 0xa5, 0x62, 0x9f, 0x21, 0x05, 0xae, + 0xc4, 0xd2, 0x80, 0xfd, 0x0d, 0xf3, 0x86, 0x55, 0x1d, 0xa6, 0xdb, 0x32, 0x87, 0x0a, 0x0a, 0xa6, + 0xc0, 0x00, 0xf7, 0x32, 0x94, 0x57, 0x28, 0xa9, 0x2d, 0xb7, 0x47, 0x73, 0x50, 0xec, 0xc8, 0xe6, + 0x06, 0xf5, 0xdc, 0xa3, 0x93, 0xcd, 0x5c, 0x66, 0xa2, 0xac, 0x55, 0x89, 0xdc, 0x4b, 0x0c, 0xfa, + 0xa9, 0x2f, 0x8f, 0xc0, 0x4f, 0x90, 0x29, 0x69, 0x83, 0x1e, 0xf4, 0xe4, 0xf7, 0x30, 0x8c, 0xcf, + 0x1b, 0x10, 0xcb, 0xd7, 0xbd, 0x6c, 0xef, 0xf9, 0x02, 0x67, 0x20, 0x6b, 0xe4, 0x12, 0xa2, 0x77, + 0xe1, 0x76, 0x2d, 0xb0, 0x2d, 0x73, 0x10, 0x71, 0x30, 0xb9, 0x3d, 0xdd, 0x39, 0x7e, 0x46, 0x3c, + 0x29, 0xdd, 0xf3, 0xc9, 0x45, 0x77, 0xfe, 0xdb, 0xee, 0xfa, 0x93, 0xe1, 0xf5, 0xcf, 0xc7, 0x83, + 0xd9, 0xa6, 0x39, 0x7a, 0x13, 0x8e, 0x16, 0x02, 0xbf, 0x01, 0x8f, 0x6f, 0xfd, 0x3b, 0x8d, 0x69, + 0xed, 0xb6, 0x69, 0xb8, 0xd6, 0x38, 0x8f, 0x87, 0xff, 0xb1, 0x8d, 0x6d, 0x8e, 0xce, 0xc3, 0x7b, + 0xae, 0x5c, 0xf1, 0x9d, 0x49, 0x30, 0xdd, 0x39, 0xde, 0xf7, 0xc9, 0x3c, 0x41, 0x2f, 0x9c, 0x44, + 0xd3, 0x05, 0x33, 0x8f, 0x22, 0x7a, 0x15, 0x6e, 0x19, 0x5d, 0xe3, 0x91, 0x66, 0x4b, 0x7c, 0x36, + 0xab, 0x3e, 0x39, 0xeb, 0x03, 0x43, 0x62, 0x9b, 0xa2, 0x22, 0x7c, 0x64, 0x1c, 0x51, 0x22, 0x97, + 0x69, 0xcb, 0xaa, 0x32, 0x67, 0x0a, 0x85, 0x8c, 0xb7, 0xf4, 0xa5, 0x07, 0xa4, 0x37, 0x08, 0xb1, + 0x86, 0x30, 0x06, 0x21, 0xa7, 0x9b, 0x2e, 0xfb, 0x6a, 0xe6, 0xdc, 0x87, 0x0e, 0xdf, 0x87, 0x0d, + 0x5d, 0x94, 0x86, 0x6e, 0x21, 0xb5, 0x2f, 0x24, 0xe3, 0x6d, 0x3d, 0x67, 0xcf, 0x5f, 0xdb, 0x71, + 0xac, 0x33, 0xc9, 0x4c, 0x18, 0x3b, 0x44, 0x67, 0x96, 0x27, 0x3a, 0x0c, 0x1f, 0x28, 0x54, 0xac, + 0x4a, 0x9d, 0x6a, 0x7c, 0x77, 0x12, 0x4c, 0x87, 0xb3, 0xfb, 0xba, 0xf0, 0x97, 0x47, 0x9e, 0x9c, + 0x5e, 0xaf, 0x92, 0xe0, 0x66, 0x95, 0x04, 0xbf, 0x56, 0x49, 0xf0, 0x7d, 0x9d, 0x0c, 0x6e, 0xd6, + 0xc9, 0xe0, 0xc7, 0x3a, 0x19, 0x7c, 0x3c, 0x28, 0x4a, 0x75, 0xd9, 0xcc, 0x49, 0x86, 0x57, 0xd4, + 0xf3, 0x71, 0xfb, 0x92, 0x7e, 0xdd, 0xfc, 0xeb, 0x6a, 0x59, 0x83, 0x9c, 0x8f, 0xb4, 0x95, 0x5f, + 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0xab, 0x04, 0x7b, 0x26, 0x10, 0x04, 0x00, 0x00, } func (m *QueryAccountInfoResponse) Marshal() (dAtA []byte, err error) { diff --git a/x/pairing/types/badge_test.go b/x/pairing/types/badge_test.go index 755f98bbe0..4d6e0a47d2 100644 --- a/x/pairing/types/badge_test.go +++ b/x/pairing/types/badge_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils/sigs" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/types/badges.pb.go b/x/pairing/types/badges.pb.go index 762f5cf6d8..21dcef0610 100644 --- a/x/pairing/types/badges.pb.go +++ b/x/pairing/types/badges.pb.go @@ -9,8 +9,8 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/lavanet/lava/v3/x/epochstorage/types" - types "github.com/lavanet/lava/v3/x/spec/types" + _ "github.com/lavanet/lava/v4/x/epochstorage/types" + types "github.com/lavanet/lava/v4/x/spec/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -167,35 +167,35 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/pairing/badges.proto", fileDescriptor_5013dfba46b4caa4) } var fileDescriptor_5013dfba46b4caa4 = []byte{ - // 442 bytes of a gzipped FileDescriptorProto + // 443 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x41, 0x6f, 0xd3, 0x30, 0x14, 0x6e, 0x46, 0x19, 0x9a, 0xc7, 0x38, 0x58, 0x41, 0x54, 0x85, 0x85, 0x51, 0x2e, 0x68, 0x15, - 0x31, 0x74, 0xbf, 0x80, 0x0a, 0x69, 0xda, 0x0d, 0xb2, 0x1b, 0x97, 0xc8, 0x4d, 0x1e, 0x5e, 0x46, - 0x89, 0x3d, 0xdb, 0x19, 0x54, 0xe2, 0x17, 0x70, 0xe2, 0x67, 0xed, 0xd8, 0x23, 0x27, 0x84, 0xda, - 0x3f, 0x82, 0xfc, 0xec, 0x56, 0x0a, 0x04, 0x69, 0x97, 0xc4, 0x7e, 0xdf, 0x67, 0x7f, 0xef, 0xfb, - 0xfc, 0xc8, 0xb3, 0x39, 0xbf, 0xe6, 0x35, 0x58, 0xe6, 0xfe, 0x4c, 0xf1, 0x4a, 0x57, 0xb5, 0x60, - 0x33, 0x5e, 0x0a, 0x30, 0xa9, 0xd2, 0xd2, 0x4a, 0x1a, 0x07, 0x4a, 0xea, 0xfe, 0x69, 0xa0, 0x0c, - 0x8f, 0x3a, 0x0f, 0x6a, 0x98, 0xf3, 0x85, 0x3f, 0xf7, 0x1f, 0xc6, 0x55, 0x03, 0x7a, 0xc3, 0x88, - 0x85, 0x14, 0x12, 0x97, 0xcc, 0xad, 0x42, 0x35, 0x11, 0x52, 0x8a, 0x39, 0x30, 0xdc, 0xcd, 0x9a, - 0x8f, 0xec, 0x8b, 0xe6, 0x4a, 0x81, 0x0e, 0xfd, 0x0c, 0xc7, 0xad, 0x7b, 0x41, 0xc9, 0xe2, 0xc2, - 0x58, 0xa9, 0xb9, 0x00, 0x66, 0x2c, 0xff, 0x04, 0x39, 0xd4, 0x76, 0x2b, 0xf1, 0xa4, 0x45, 0x36, - 0x0a, 0x0a, 0xfc, 0x78, 0x74, 0xb4, 0x20, 0xf1, 0x29, 0xd4, 0xa0, 0xb9, 0x85, 0xa9, 0xb3, 0x9c, - 0xc1, 0x55, 0x03, 0xc6, 0xd2, 0xe7, 0xe4, 0x00, 0x23, 0xc8, 0x79, 0x59, 0x6a, 0x30, 0x66, 0x10, - 0x1d, 0x45, 0x2f, 0xf6, 0xb2, 0xfb, 0x58, 0x7c, 0xe3, 0x6b, 0xf4, 0x90, 0x10, 0xa5, 0xe5, 0x25, - 0x14, 0x36, 0xaf, 0xca, 0xc1, 0x0e, 0x32, 0xf6, 0x42, 0xe5, 0xac, 0xa4, 0x87, 0xe4, 0x9e, 0x53, - 0x72, 0xd8, 0x1d, 0x87, 0x4d, 0xfb, 0x37, 0xbf, 0x9e, 0x46, 0xd9, 0xae, 0x2b, 0x9e, 0x95, 0xa3, - 0xef, 0x3b, 0xe4, 0xe1, 0x5f, 0xda, 0x46, 0xc9, 0xda, 0x00, 0x7d, 0x4d, 0xee, 0xa2, 0x0e, 0x8a, - 0xee, 0x4f, 0x1e, 0xa7, 0x5d, 0xf9, 0xa7, 0xfe, 0x8c, 0x67, 0xd2, 0x9c, 0xc4, 0x02, 0x6c, 0x1e, - 0xb0, 0x5c, 0x87, 0xab, 0xb0, 0xa9, 0xfd, 0xc9, 0xcb, 0xee, 0x1b, 0xde, 0xbb, 0x97, 0x38, 0x05, - 0xfb, 0xce, 0xef, 0x37, 0xfa, 0x19, 0x15, 0xff, 0xd4, 0xe8, 0x2b, 0x12, 0xfb, 0x40, 0x4c, 0x25, - 0x6a, 0xd0, 0xdb, 0x5c, 0xd0, 0x59, 0x46, 0x11, 0x3b, 0x47, 0x68, 0x93, 0xce, 0x98, 0xf4, 0x9d, - 0xd3, 0x41, 0x1f, 0x5b, 0x78, 0xd4, 0x6e, 0x01, 0x9f, 0xe0, 0x5c, 0x41, 0x91, 0x21, 0x69, 0xf2, - 0x8d, 0x3c, 0x40, 0x3f, 0x21, 0x10, 0xa9, 0xe9, 0x25, 0x39, 0x68, 0xa5, 0x43, 0x8f, 0xbb, 0x4d, - 0x74, 0x3d, 0xdf, 0x70, 0x7c, 0x2b, 0xae, 0xb7, 0x36, 0xea, 0x4d, 0xdf, 0xde, 0xac, 0x92, 0x68, - 0xb9, 0x4a, 0xa2, 0xdf, 0xab, 0x24, 0xfa, 0xb1, 0x4e, 0x7a, 0xcb, 0x75, 0xd2, 0xfb, 0xb9, 0x4e, - 0x7a, 0x1f, 0x8e, 0x45, 0x65, 0x2f, 0x9a, 0x59, 0x5a, 0xc8, 0xcf, 0xac, 0x35, 0x48, 0xd7, 0x27, - 0xec, 0xeb, 0x76, 0xa4, 0xed, 0x42, 0x81, 0x99, 0xed, 0xe2, 0x48, 0x9d, 0xfc, 0x09, 0x00, 0x00, - 0xff, 0xff, 0xeb, 0xf8, 0xdb, 0x76, 0x52, 0x03, 0x00, 0x00, + 0x31, 0x14, 0xfe, 0x00, 0x15, 0xd2, 0xb4, 0x1b, 0x64, 0x37, 0x2e, 0x91, 0x9b, 0x3c, 0xbc, 0x8c, + 0x12, 0x7b, 0xb6, 0x33, 0xa8, 0xc4, 0x2f, 0xe0, 0xc4, 0xcf, 0xda, 0xb1, 0x47, 0x4e, 0x08, 0xb5, + 0x7f, 0x04, 0xf9, 0xd9, 0xad, 0x14, 0x08, 0xd2, 0x2e, 0x89, 0xfd, 0xbe, 0xcf, 0xfe, 0xde, 0xf7, + 0xf9, 0x91, 0x27, 0x73, 0x7e, 0xc5, 0x6b, 0xb0, 0xcc, 0xfd, 0x99, 0xe2, 0x95, 0xae, 0x6a, 0xc1, + 0x66, 0xbc, 0x14, 0x60, 0x52, 0xa5, 0xa5, 0x95, 0x34, 0x0e, 0x94, 0xd4, 0xfd, 0xd3, 0x40, 0x19, + 0x1e, 0x75, 0x1e, 0xd4, 0x30, 0xe7, 0x0b, 0x7f, 0xee, 0x3f, 0x8c, 0xcb, 0x06, 0xf4, 0x86, 0x11, + 0x0b, 0x29, 0x24, 0x2e, 0x99, 0x5b, 0x85, 0x6a, 0x22, 0xa4, 0x14, 0x73, 0x60, 0xb8, 0x9b, 0x35, + 0x1f, 0xd9, 0x17, 0xcd, 0x95, 0x02, 0x1d, 0xfa, 0x19, 0x8e, 0x5b, 0xf7, 0x82, 0x92, 0xc5, 0xb9, + 0xb1, 0x52, 0x73, 0x01, 0xcc, 0x58, 0xfe, 0x09, 0x72, 0xa8, 0xed, 0x56, 0xe2, 0x51, 0x8b, 0x6c, + 0x14, 0x14, 0xf8, 0xf1, 0xe8, 0x68, 0x41, 0xe2, 0x13, 0xa8, 0x41, 0x73, 0x0b, 0x53, 0x67, 0x39, + 0x83, 0xcb, 0x06, 0x8c, 0xa5, 0x4f, 0xc9, 0x01, 0x46, 0x90, 0xf3, 0xb2, 0xd4, 0x60, 0xcc, 0x20, + 0x3a, 0x8a, 0x9e, 0xed, 0x65, 0x77, 0xb1, 0xf8, 0xc6, 0xd7, 0xe8, 0x21, 0x21, 0x4a, 0xcb, 0x0b, + 0x28, 0x6c, 0x5e, 0x95, 0x83, 0x1d, 0x64, 0xec, 0x85, 0xca, 0x69, 0x49, 0x0f, 0xc9, 0x1d, 0xa7, + 0xe4, 0xb0, 0x5b, 0x0e, 0x9b, 0xf6, 0xaf, 0x7f, 0x3d, 0x8e, 0xb2, 0x5d, 0x57, 0x3c, 0x2d, 0x47, + 0xdf, 0x77, 0xc8, 0xfd, 0xbf, 0xb4, 0x8d, 0x92, 0xb5, 0x01, 0xfa, 0x92, 0xdc, 0x46, 0x1d, 0x14, + 0xdd, 0x9f, 0x3c, 0x4c, 0xbb, 0xf2, 0x4f, 0xfd, 0x19, 0xcf, 0xa4, 0x39, 0x89, 0x05, 0xd8, 0x3c, + 0x60, 0xb9, 0x0e, 0x57, 0x61, 0x53, 0xfb, 0x93, 0xe7, 0xdd, 0x37, 0xbc, 0x77, 0x2f, 0x71, 0x02, + 0xf6, 0x9d, 0xdf, 0x6f, 0xf4, 0x33, 0x2a, 0xfe, 0xa9, 0xd1, 0x17, 0x24, 0xf6, 0x81, 0x98, 0x4a, + 0xd4, 0xa0, 0xb7, 0xb9, 0xa0, 0xb3, 0x8c, 0x22, 0x76, 0x86, 0xd0, 0x26, 0x9d, 0x31, 0xe9, 0x3b, + 0xa7, 0x83, 0x3e, 0xb6, 0xf0, 0xa0, 0xdd, 0x02, 0x3e, 0xc1, 0x99, 0x82, 0x22, 0x43, 0xd2, 0xe4, + 0x1b, 0xb9, 0x87, 0x7e, 0x42, 0x20, 0x52, 0xd3, 0x0b, 0x72, 0xd0, 0x4a, 0x87, 0x1e, 0x77, 0x9b, + 0xe8, 0x7a, 0xbe, 0xe1, 0xf8, 0x46, 0x5c, 0x6f, 0x6d, 0xd4, 0x9b, 0xbe, 0xbd, 0x5e, 0x25, 0xd1, + 0x72, 0x95, 0x44, 0xbf, 0x57, 0x49, 0xf4, 0x63, 0x9d, 0xf4, 0x96, 0xeb, 0xa4, 0xf7, 0x73, 0x9d, + 0xf4, 0x3e, 0x1c, 0x8b, 0xca, 0x9e, 0x37, 0xb3, 0xb4, 0x90, 0x9f, 0x59, 0x6b, 0x90, 0xae, 0x5e, + 0xb3, 0xaf, 0xdb, 0x91, 0xb6, 0x0b, 0x05, 0x66, 0xb6, 0x8b, 0x23, 0xf5, 0xea, 0x4f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x43, 0x04, 0x8b, 0xb8, 0x52, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pairing/types/debug_query.pb.go b/x/pairing/types/debug_query.pb.go index 8cbf5c8a8f..2bbabcf459 100644 --- a/x/pairing/types/debug_query.pb.go +++ b/x/pairing/types/debug_query.pb.go @@ -8,10 +8,10 @@ import ( _ "github.com/cosmos/cosmos-sdk/x/staking/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/lavanet/lava/v3/x/dualstaking/types" - _ "github.com/lavanet/lava/v3/x/epochstorage/types" - _ "github.com/lavanet/lava/v3/x/projects/types" - _ "github.com/lavanet/lava/v3/x/subscription/types" + _ "github.com/lavanet/lava/v4/x/dualstaking/types" + _ "github.com/lavanet/lava/v4/x/epochstorage/types" + _ "github.com/lavanet/lava/v4/x/projects/types" + _ "github.com/lavanet/lava/v4/x/subscription/types" _ "google.golang.org/protobuf/types/known/wrapperspb" io "io" math "math" @@ -154,38 +154,38 @@ func init() { } var fileDescriptor_a315cb51b0edeaef = []byte{ - // 496 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0xcd, 0x6e, 0xd3, 0x4e, - 0x14, 0xc5, 0xe3, 0x7f, 0x3f, 0xfe, 0x74, 0x8a, 0x04, 0x32, 0x29, 0xb5, 0x82, 0x64, 0xca, 0x87, - 0xa0, 0x7c, 0x28, 0x43, 0x94, 0x05, 0x0b, 0xc4, 0x82, 0x28, 0x62, 0x85, 0x10, 0x64, 0xc9, 0xc6, - 0x1a, 0xdb, 0x37, 0x8e, 0xe9, 0x8d, 0xef, 0x30, 0x33, 0x76, 0xe9, 0x5b, 0xf0, 0x58, 0x2c, 0xbb, - 0x64, 0x89, 0x92, 0x35, 0xef, 0x80, 0x3c, 0xf6, 0x58, 0x18, 0xba, 0xf2, 0xdc, 0x7b, 0x7e, 0x67, - 0x4e, 0x74, 0x34, 0x61, 0x8f, 0x50, 0x54, 0xa2, 0x00, 0xc3, 0xeb, 0x2f, 0x97, 0x22, 0x57, 0x79, - 0x91, 0xf1, 0x14, 0xe2, 0x32, 0x8b, 0xbe, 0x94, 0xa0, 0x2e, 0xc6, 0x52, 0x91, 0x21, 0x7f, 0xd8, - 0x72, 0xe3, 0xfa, 0x3b, 0x6e, 0xb9, 0xd1, 0x30, 0xa3, 0x8c, 0x2c, 0xc0, 0xeb, 0x53, 0xc3, 0x8e, - 0xc2, 0x8c, 0x28, 0x43, 0xe0, 0x76, 0x8a, 0xcb, 0x25, 0x3f, 0x57, 0x42, 0x4a, 0x50, 0xba, 0xd5, - 0x9f, 0xf5, 0x32, 0x41, 0x52, 0xb2, 0xd2, 0x86, 0x94, 0xc8, 0x80, 0x6b, 0x23, 0xce, 0x20, 0x82, - 0xc2, 0xb8, 0xe0, 0xd1, 0xe3, 0x1e, 0x9c, 0x96, 0x02, 0x6b, 0xa6, 0xf9, 0x91, 0x08, 0x99, 0x30, - 0xd0, 0x82, 0x0f, 0x13, 0xd2, 0x6b, 0xd2, 0xdc, 0xc9, 0xd5, 0x24, 0x06, 0x23, 0x26, 0x6e, 0x6e, - 0xa9, 0xe7, 0xbd, 0xeb, 0x74, 0x19, 0xeb, 0x44, 0xe5, 0xd2, 0xe4, 0x54, 0xf4, 0x86, 0x96, 0x7e, - 0xd0, 0x6f, 0x47, 0xd1, 0x67, 0x48, 0x8c, 0x76, 0x87, 0x06, 0xba, 0xff, 0x6b, 0x87, 0x1d, 0x7f, - 0xac, 0xab, 0x9a, 0xd7, 0xad, 0xd9, 0xd3, 0x02, 0xb4, 0xa4, 0x42, 0x83, 0x7f, 0x8f, 0x5d, 0x8f, - 0x91, 0x92, 0xb3, 0x48, 0xc1, 0xb9, 0x50, 0x69, 0xe0, 0x9d, 0x78, 0xa7, 0xbb, 0x8b, 0x43, 0xbb, - 0x5b, 0xd8, 0x95, 0x3f, 0x61, 0x47, 0x95, 0xc0, 0x28, 0xcd, 0xb5, 0x89, 0x24, 0x11, 0x46, 0xb1, - 0x40, 0x51, 0x24, 0x10, 0xfc, 0x77, 0xe2, 0x9d, 0x1e, 0x2c, 0xfc, 0x4a, 0xe0, 0x3c, 0xd7, 0xe6, - 0x03, 0x11, 0xce, 0x1a, 0xc5, 0x9f, 0xb2, 0xdb, 0xb5, 0x45, 0x20, 0x52, 0xd2, 0xf7, 0xec, 0x58, - 0xcf, 0xad, 0x4a, 0xe0, 0x9b, 0x5a, 0xfc, 0xd3, 0xf4, 0x8a, 0x8d, 0xa4, 0xa2, 0x2a, 0x4f, 0x41, - 0x5d, 0x11, 0xb6, 0x6b, 0x8d, 0xc7, 0x8e, 0xf8, 0x3b, 0xf1, 0x35, 0xbb, 0xd3, 0x99, 0xaf, 0x88, - 0xdd, 0xb3, 0xee, 0xc0, 0x21, 0xff, 0x64, 0xbf, 0x60, 0xc3, 0xce, 0xbe, 0x2c, 0x11, 0x5d, 0x1d, - 0xfb, 0xb6, 0x0e, 0xdf, 0x69, 0x6f, 0x4b, 0xc4, 0xb6, 0x95, 0x97, 0xac, 0xbb, 0xad, 0x85, 0xa3, - 0x82, 0xa2, 0x98, 0x8a, 0x52, 0x07, 0xff, 0x5b, 0xd7, 0x91, 0xd3, 0x1b, 0xc7, 0x7b, 0x9a, 0xd5, - 0xa2, 0x3f, 0x64, 0x7b, 0xb6, 0xdd, 0xe0, 0x9a, 0xa5, 0x9a, 0xc1, 0xbf, 0xcb, 0x0e, 0xd7, 0x54, - 0x98, 0x95, 0x8e, 0x10, 0x96, 0x26, 0x38, 0xb0, 0x1a, 0x6b, 0x56, 0xef, 0x60, 0x69, 0xfc, 0x27, - 0xec, 0x66, 0x25, 0x30, 0x4f, 0x85, 0x21, 0x17, 0x18, 0x30, 0x4b, 0xdd, 0xe8, 0xf6, 0x4d, 0xd0, - 0x6c, 0xfe, 0x7d, 0x13, 0x7a, 0x97, 0x9b, 0xd0, 0xfb, 0xb9, 0x09, 0xbd, 0x6f, 0xdb, 0x70, 0x70, - 0xb9, 0x0d, 0x07, 0x3f, 0xb6, 0xe1, 0xe0, 0xd3, 0xd3, 0x2c, 0x37, 0xab, 0x32, 0x1e, 0x27, 0xb4, - 0xe6, 0xbd, 0x97, 0x53, 0x4d, 0xf9, 0xd7, 0xee, 0xcf, 0x65, 0x2e, 0x24, 0xe8, 0x78, 0xdf, 0x3e, - 0x9e, 0xe9, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9e, 0xb9, 0x56, 0xad, 0x81, 0x03, 0x00, 0x00, + // 495 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0xcd, 0x6e, 0xd3, 0x40, + 0x14, 0x85, 0x63, 0xfa, 0x03, 0x9d, 0x22, 0x81, 0x4c, 0x4a, 0xad, 0x20, 0x99, 0xf2, 0x23, 0x28, + 0x3f, 0xca, 0x10, 0x15, 0x89, 0x05, 0x62, 0x41, 0x14, 0xb1, 0x42, 0x08, 0xb2, 0x64, 0x63, 0x8d, + 0xed, 0x1b, 0xc7, 0xf4, 0xc6, 0x77, 0x98, 0x19, 0xbb, 0xf4, 0x2d, 0x78, 0x2c, 0x96, 0x5d, 0xb2, + 0x44, 0xc9, 0x9a, 0x77, 0x40, 0x1e, 0x7b, 0x2c, 0x0c, 0x5d, 0x79, 0xee, 0x3d, 0xdf, 0x99, 0x13, + 0x1d, 0x4d, 0xd8, 0x23, 0x14, 0x95, 0x28, 0xc0, 0xf0, 0xfa, 0xcb, 0xa5, 0xc8, 0x55, 0x5e, 0x64, + 0x3c, 0x85, 0xb8, 0xcc, 0xa2, 0xaf, 0x25, 0xa8, 0xf3, 0xb1, 0x54, 0x64, 0xc8, 0x1f, 0xb6, 0xdc, + 0xb8, 0xfe, 0x8e, 0x5b, 0x6e, 0x34, 0xcc, 0x28, 0x23, 0x0b, 0xf0, 0xfa, 0xd4, 0xb0, 0xa3, 0x30, + 0x23, 0xca, 0x10, 0xb8, 0x9d, 0xe2, 0x72, 0xc1, 0xcf, 0x94, 0x90, 0x12, 0x94, 0x6e, 0xf5, 0x67, + 0xbd, 0x4c, 0x90, 0x94, 0x2c, 0xb5, 0x21, 0x25, 0x32, 0xe0, 0xda, 0x88, 0x53, 0x88, 0xa0, 0x30, + 0x2e, 0x78, 0xf4, 0xb8, 0x07, 0xa7, 0xa5, 0xc0, 0x9a, 0x69, 0x7e, 0x24, 0x42, 0x26, 0x0c, 0xb4, + 0xe0, 0xc3, 0x84, 0xf4, 0x8a, 0x34, 0x77, 0x72, 0x35, 0x89, 0xc1, 0x88, 0x89, 0x9b, 0x5b, 0xea, + 0x79, 0xef, 0x3a, 0x5d, 0xc6, 0x3a, 0x51, 0xb9, 0x34, 0x39, 0x15, 0xbd, 0xa1, 0xa5, 0x1f, 0xf4, + 0xdb, 0x51, 0xf4, 0x05, 0x12, 0xa3, 0xdd, 0xa1, 0x81, 0xee, 0xff, 0xde, 0x62, 0x87, 0x9f, 0xea, + 0xaa, 0x66, 0x75, 0x6b, 0xf6, 0x34, 0x07, 0x2d, 0xa9, 0xd0, 0xe0, 0xdf, 0x63, 0xd7, 0x63, 0xa4, + 0xe4, 0x34, 0x52, 0x70, 0x26, 0x54, 0x1a, 0x78, 0x47, 0xde, 0xf1, 0xf6, 0x7c, 0xdf, 0xee, 0xe6, + 0x76, 0xe5, 0x4f, 0xd8, 0x41, 0x25, 0x30, 0x4a, 0x73, 0x6d, 0x22, 0x49, 0x84, 0x51, 0x2c, 0x50, + 0x14, 0x09, 0x04, 0x57, 0x8e, 0xbc, 0xe3, 0xbd, 0xb9, 0x5f, 0x09, 0x9c, 0xe5, 0xda, 0x7c, 0x24, + 0xc2, 0x69, 0xa3, 0xf8, 0x27, 0xec, 0x76, 0x6d, 0x11, 0x88, 0x94, 0xf4, 0x3d, 0x5b, 0xd6, 0x73, + 0xab, 0x12, 0xf8, 0xb6, 0x16, 0xff, 0x36, 0xbd, 0x66, 0x23, 0xa9, 0xa8, 0xca, 0x53, 0x50, 0x97, + 0x84, 0x6d, 0x5b, 0xe3, 0xa1, 0x23, 0xfe, 0x4d, 0x7c, 0xc3, 0xee, 0x74, 0xe6, 0x4b, 0x62, 0x77, + 0xac, 0x3b, 0x70, 0xc8, 0x7f, 0xd9, 0x2f, 0xd8, 0xb0, 0xb3, 0x2f, 0x4a, 0x44, 0x57, 0xc7, 0xae, + 0xad, 0xc3, 0x77, 0xda, 0xbb, 0x12, 0xb1, 0x6d, 0xe5, 0x15, 0xeb, 0x6e, 0x6b, 0xe1, 0xa8, 0xa0, + 0x28, 0xa6, 0xa2, 0xd4, 0xc1, 0x55, 0xeb, 0x3a, 0x70, 0x7a, 0xe3, 0xf8, 0x40, 0xd3, 0x5a, 0xf4, + 0x87, 0x6c, 0xc7, 0xb6, 0x1b, 0x5c, 0xb3, 0x54, 0x33, 0xf8, 0x77, 0xd9, 0xfe, 0x8a, 0x0a, 0xb3, + 0xd4, 0x11, 0xc2, 0xc2, 0x04, 0x7b, 0x56, 0x63, 0xcd, 0xea, 0x3d, 0x2c, 0x8c, 0xff, 0x84, 0xdd, + 0xac, 0x04, 0xe6, 0xa9, 0x30, 0xe4, 0x02, 0x03, 0x66, 0xa9, 0x1b, 0xdd, 0xbe, 0x09, 0x9a, 0xce, + 0x7e, 0xac, 0x43, 0xef, 0x62, 0x1d, 0x7a, 0xbf, 0xd6, 0xa1, 0xf7, 0x7d, 0x13, 0x0e, 0x2e, 0x36, + 0xe1, 0xe0, 0xe7, 0x26, 0x1c, 0x7c, 0x7e, 0x9a, 0xe5, 0x66, 0x59, 0xc6, 0xe3, 0x84, 0x56, 0xbc, + 0xf7, 0x72, 0xaa, 0x97, 0xfc, 0x5b, 0xf7, 0xe7, 0x32, 0xe7, 0x12, 0x74, 0xbc, 0x6b, 0x1f, 0xcf, + 0xc9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x45, 0x06, 0x63, 0x81, 0x03, 0x00, 0x00, } func (m *QueryDebugQueryResponse) Marshal() (dAtA []byte, err error) { diff --git a/x/pairing/types/epoch_cu.go b/x/pairing/types/epoch_cu.go index eec3cfeb8f..4f659ce4b4 100644 --- a/x/pairing/types/epoch_cu.go +++ b/x/pairing/types/epoch_cu.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/lavanet/lava/v3/utils" + "github.com/lavanet/lava/v4/utils" ) const ( diff --git a/x/pairing/types/epoch_cu.pb.go b/x/pairing/types/epoch_cu.pb.go index baf21315db..840fc1bd89 100644 --- a/x/pairing/types/epoch_cu.pb.go +++ b/x/pairing/types/epoch_cu.pb.go @@ -225,9 +225,9 @@ var fileDescriptor_c2abb0ec984ffb4c = []byte{ 0x9a, 0x8b, 0xb0, 0x9f, 0x8f, 0x8b, 0x09, 0xae, 0x8b, 0x29, 0xb9, 0xd4, 0xc9, 0xe5, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xb4, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, - 0x92, 0xf3, 0x73, 0xf5, 0x51, 0x02, 0xa6, 0xcc, 0x58, 0xbf, 0x02, 0x1e, 0x3a, 0x25, 0x95, 0x05, - 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0xb0, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x71, 0xca, - 0x79, 0x42, 0x01, 0x00, 0x00, + 0x92, 0xf3, 0x73, 0xf5, 0x51, 0x02, 0xa6, 0xcc, 0x44, 0xbf, 0x02, 0x1e, 0x3a, 0x25, 0x95, 0x05, + 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0xb0, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x64, 0x8d, 0x9a, + 0xb7, 0x42, 0x01, 0x00, 0x00, } func (m *UniqueEpochSession) Marshal() (dAtA []byte, err error) { diff --git a/x/pairing/types/expected_keepers.go b/x/pairing/types/expected_keepers.go index 815b33048e..076c7b0562 100644 --- a/x/pairing/types/expected_keepers.go +++ b/x/pairing/types/expected_keepers.go @@ -8,15 +8,15 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - fixationstoretypes "github.com/lavanet/lava/v3/x/fixationstore/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" - subscriptiontypes "github.com/lavanet/lava/v3/x/subscription/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + fixationstoretypes "github.com/lavanet/lava/v4/x/fixationstore/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + subscriptiontypes "github.com/lavanet/lava/v4/x/subscription/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) type SpecKeeper interface { diff --git a/x/pairing/types/genesis.go b/x/pairing/types/genesis.go index 8bf6eb57e5..430e2cc889 100644 --- a/x/pairing/types/genesis.go +++ b/x/pairing/types/genesis.go @@ -3,8 +3,8 @@ package types import ( "fmt" - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) // DefaultIndex is the default capability global index diff --git a/x/pairing/types/genesis.pb.go b/x/pairing/types/genesis.pb.go index 8ef380aec8..8c6886d4a6 100644 --- a/x/pairing/types/genesis.pb.go +++ b/x/pairing/types/genesis.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types1 "github.com/lavanet/lava/v3/x/fixationstore/types" - types "github.com/lavanet/lava/v3/x/timerstore/types" + types1 "github.com/lavanet/lava/v4/x/fixationstore/types" + types "github.com/lavanet/lava/v4/x/timerstore/types" io "io" math "math" math_bits "math/bits" @@ -483,7 +483,7 @@ var fileDescriptor_dbd1e49b8b57595b = []byte{ // 697 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xc1, 0x53, 0xd3, 0x4e, 0x18, 0x6d, 0x68, 0x5a, 0xc2, 0x57, 0x7e, 0x3f, 0xcb, 0x8a, 0x12, 0x2a, 0xc4, 0x12, 0xc7, 0x99, - 0xe2, 0x68, 0x32, 0x03, 0x8e, 0x07, 0x8f, 0xa0, 0x32, 0xa0, 0x07, 0x69, 0x61, 0x9c, 0xf1, 0x12, + 0xe2, 0x68, 0x32, 0x83, 0x8c, 0x07, 0x8f, 0xa0, 0x32, 0xa0, 0x07, 0x69, 0x61, 0x9c, 0xf1, 0x12, 0xd3, 0x64, 0x2d, 0xab, 0x34, 0x59, 0xb3, 0x49, 0x87, 0x9e, 0xfc, 0x17, 0xbc, 0x79, 0xf6, 0x1f, 0xf1, 0xcc, 0x91, 0xa3, 0x27, 0xc7, 0x81, 0x83, 0x7f, 0x83, 0x37, 0x27, 0x9b, 0x6d, 0x69, 0xda, 0x04, 0xc5, 0x71, 0x3c, 0x25, 0x9b, 0x7d, 0xdf, 0x7b, 0xdf, 0xcb, 0xbe, 0x6f, 0x16, 0xf4, 0x43, @@ -509,22 +509,22 @@ var fileDescriptor_dbd1e49b8b57595b = []byte{ 0xb4, 0x48, 0x95, 0xa6, 0x77, 0x19, 0x7a, 0x0f, 0xcb, 0xe3, 0x0a, 0x7e, 0x97, 0x1e, 0xda, 0xc4, 0xe3, 0xc9, 0x61, 0x2a, 0x70, 0xb1, 0x07, 0xbf, 0x23, 0x36, 0x28, 0x0c, 0xc6, 0x65, 0x6b, 0x34, 0x13, 0xe7, 0xc6, 0x0d, 0xf4, 0xe1, 0xc6, 0xb0, 0x01, 0xc7, 0xf7, 0x58, 0xd4, 0x4d, 0x79, 0xad, - 0x70, 0xf9, 0xfb, 0x17, 0xcb, 0x6f, 0x8a, 0xba, 0x4c, 0xcf, 0x2a, 0xcd, 0x46, 0xb1, 0x1d, 0x59, - 0x99, 0xaa, 0x16, 0x77, 0x64, 0xa5, 0x58, 0x95, 0x77, 0x64, 0x45, 0xae, 0x96, 0xf4, 0x4f, 0x12, - 0x2c, 0xe6, 0x1e, 0x14, 0x9a, 0x87, 0x12, 0x6f, 0x8c, 0x4f, 0x89, 0xdc, 0x4c, 0x16, 0xa8, 0x06, - 0xca, 0x40, 0x81, 0xcf, 0xd9, 0x4c, 0x73, 0xb8, 0x46, 0x2a, 0x4c, 0xd3, 0xc0, 0x7f, 0x83, 0x9d, - 0x50, 0x2d, 0xf2, 0xad, 0xc1, 0x12, 0x2d, 0x82, 0xe2, 0x1c, 0xd8, 0xc4, 0xb3, 0x88, 0xab, 0xca, - 0xc9, 0x16, 0x5f, 0x6f, 0xbb, 0x68, 0x19, 0x40, 0x44, 0x2a, 0xde, 0x2c, 0x71, 0xad, 0x19, 0xf1, - 0x65, 0xdb, 0xd5, 0x3f, 0x4b, 0x70, 0x3d, 0xfb, 0x90, 0xff, 0xa0, 0xc1, 0xd1, 0x36, 0x8a, 0xe9, - 0x36, 0x5e, 0xc0, 0xdc, 0x44, 0xf6, 0x78, 0xab, 0x13, 0xe3, 0x98, 0x13, 0xbd, 0xc1, 0x78, 0x8f, - 0x65, 0x4e, 0xff, 0x2e, 0x41, 0xfd, 0x57, 0xc1, 0xf9, 0xbb, 0x56, 0x7a, 0xb0, 0x94, 0x17, 0xf2, - 0xe0, 0xdc, 0x95, 0x79, 0xc9, 0x8c, 0x0b, 0x7f, 0x8b, 0x34, 0x0f, 0xa0, 0xff, 0x90, 0x40, 0xbb, - 0x38, 0xa3, 0xff, 0x2a, 0x53, 0x14, 0x6a, 0xf9, 0x53, 0xc6, 0x33, 0x56, 0x59, 0xbb, 0x77, 0xa9, - 0x21, 0x13, 0xee, 0x17, 0x72, 0xa6, 0x6b, 0xe3, 0xd1, 0xf1, 0xa9, 0x26, 0x9d, 0x9c, 0x6a, 0xd2, - 0xb7, 0x53, 0x4d, 0xfa, 0x70, 0xa6, 0x15, 0x4e, 0xce, 0xb4, 0xc2, 0x97, 0x33, 0xad, 0xf0, 0xf2, - 0x4e, 0x87, 0x84, 0x07, 0x51, 0xdb, 0x70, 0xfc, 0xae, 0x99, 0xba, 0x01, 0x7b, 0xeb, 0xe6, 0xd1, - 0xf0, 0x5a, 0x0d, 0xfb, 0x14, 0xb3, 0x76, 0x99, 0x5f, 0x82, 0xeb, 0x3f, 0x03, 0x00, 0x00, 0xff, - 0xff, 0x88, 0xf6, 0x58, 0xa8, 0xee, 0x07, 0x00, 0x00, + 0x70, 0xf9, 0xf5, 0x8b, 0xe5, 0x37, 0x45, 0x5d, 0xa6, 0x67, 0x95, 0x66, 0xa3, 0xd8, 0x8e, 0xac, + 0x4c, 0x55, 0x8b, 0x3b, 0xb2, 0x52, 0xac, 0xca, 0x3b, 0xb2, 0x22, 0x57, 0x4b, 0xfa, 0x27, 0x09, + 0x16, 0x73, 0x0f, 0x0a, 0xcd, 0x43, 0x89, 0x37, 0xc6, 0xa7, 0x44, 0x6e, 0x26, 0x0b, 0x54, 0x03, + 0x65, 0xa0, 0xc0, 0xe7, 0x6c, 0xa6, 0x39, 0x5c, 0x23, 0x15, 0xa6, 0x69, 0xe0, 0xbf, 0xc1, 0x4e, + 0xa8, 0x16, 0xf9, 0xd6, 0x60, 0x89, 0x16, 0x41, 0x71, 0x0e, 0x6c, 0xe2, 0x59, 0xc4, 0x55, 0xe5, + 0x64, 0x8b, 0xaf, 0xb7, 0x5d, 0xb4, 0x0c, 0x20, 0x22, 0x15, 0x6f, 0x96, 0xb8, 0xd6, 0x8c, 0xf8, + 0xb2, 0xed, 0xea, 0x9f, 0x25, 0xb8, 0x9e, 0x7d, 0xc8, 0x7f, 0xd0, 0xe0, 0x68, 0x1b, 0xc5, 0x74, + 0x1b, 0x2f, 0x60, 0x6e, 0x22, 0x7b, 0xbc, 0xd5, 0x89, 0x71, 0xcc, 0x89, 0xde, 0x60, 0xbc, 0xc7, + 0x32, 0xa7, 0x7f, 0x97, 0xa0, 0xfe, 0xab, 0xe0, 0xfc, 0x5d, 0x2b, 0x3d, 0x58, 0xca, 0x0b, 0x79, + 0x70, 0xee, 0xca, 0xbc, 0x64, 0xc6, 0x85, 0xbf, 0x45, 0x9a, 0x07, 0xd0, 0x7f, 0x48, 0xa0, 0x5d, + 0x9c, 0xd1, 0x7f, 0x95, 0x29, 0x0a, 0xb5, 0xfc, 0x29, 0xe3, 0x19, 0xab, 0xac, 0xdd, 0xbb, 0xd4, + 0x90, 0x09, 0xf7, 0x0b, 0x39, 0xd3, 0xb5, 0xf1, 0xe8, 0xf8, 0x54, 0x93, 0x4e, 0x4e, 0x35, 0xe9, + 0xdb, 0xa9, 0x26, 0x7d, 0x38, 0xd3, 0x0a, 0x27, 0x67, 0x5a, 0xe1, 0xcb, 0x99, 0x56, 0x78, 0x79, + 0xa7, 0x43, 0xc2, 0x83, 0xa8, 0x6d, 0x38, 0x7e, 0xd7, 0x4c, 0xdd, 0x80, 0xbd, 0x75, 0xf3, 0x68, + 0x78, 0xad, 0x86, 0x7d, 0x8a, 0x59, 0xbb, 0xcc, 0x2f, 0xc1, 0xfb, 0x3f, 0x03, 0x00, 0x00, 0xff, + 0xff, 0x20, 0x0a, 0x08, 0x66, 0xee, 0x07, 0x00, 0x00, } func (m *BadgeUsedCu) Marshal() (dAtA []byte, err error) { diff --git a/x/pairing/types/genesis_test.go b/x/pairing/types/genesis_test.go index dd37d32429..0a18e82419 100644 --- a/x/pairing/types/genesis_test.go +++ b/x/pairing/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/pairing/types" + "github.com/lavanet/lava/v4/x/pairing/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/types/message_freeze_test.go b/x/pairing/types/message_freeze_test.go index 2a15891e35..b14eff4be7 100644 --- a/x/pairing/types/message_freeze_test.go +++ b/x/pairing/types/message_freeze_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/types/message_relay_payment_test.go b/x/pairing/types/message_relay_payment_test.go index 16d505430f..01cb8388f2 100644 --- a/x/pairing/types/message_relay_payment_test.go +++ b/x/pairing/types/message_relay_payment_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/types/message_stake_provider.go b/x/pairing/types/message_stake_provider.go index 616ef44ad9..5193c828e3 100644 --- a/x/pairing/types/message_stake_provider.go +++ b/x/pairing/types/message_stake_provider.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" ) const TypeMsgStakeProvider = "stake_provider" diff --git a/x/pairing/types/message_stake_provider_test.go b/x/pairing/types/message_stake_provider_test.go index b0ee66e3b2..e5ecfe532a 100644 --- a/x/pairing/types/message_stake_provider_test.go +++ b/x/pairing/types/message_stake_provider_test.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/testutil/sample" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + "github.com/lavanet/lava/v4/testutil/sample" + commontypes "github.com/lavanet/lava/v4/utils/common/types" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/types/message_unfreeze_test.go b/x/pairing/types/message_unfreeze_test.go index 735f0f6d58..3e7c00cf9e 100644 --- a/x/pairing/types/message_unfreeze_test.go +++ b/x/pairing/types/message_unfreeze_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/types/message_unstake_provider_test.go b/x/pairing/types/message_unstake_provider_test.go index 91305349e3..d01e2dcd26 100644 --- a/x/pairing/types/message_unstake_provider_test.go +++ b/x/pairing/types/message_unstake_provider_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/pairing/types/params.pb.go b/x/pairing/types/params.pb.go index 840bb8e6d9..e41f25f268 100644 --- a/x/pairing/types/params.pb.go +++ b/x/pairing/types/params.pb.go @@ -87,30 +87,30 @@ var fileDescriptor_fc338fce33b3b67a = []byte{ // 417 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x31, 0x6f, 0xd4, 0x30, 0x14, 0xc7, 0x93, 0x9e, 0x7b, 0xf5, 0xa5, 0x2d, 0xb2, 0xa2, 0x0e, 0x27, 0x90, 0x92, 0x12, 0x24, - 0x54, 0x21, 0x11, 0x0f, 0xb7, 0x75, 0x0c, 0x65, 0xf1, 0x40, 0x8f, 0x03, 0x09, 0x89, 0xc5, 0x72, - 0x1c, 0x2b, 0x17, 0xd5, 0x8e, 0x23, 0xc7, 0x77, 0x90, 0x0f, 0xc0, 0xce, 0x08, 0x1b, 0x1f, 0xa7, - 0x63, 0x47, 0xc4, 0x10, 0xa1, 0xbb, 0x6f, 0x70, 0x9f, 0x00, 0x25, 0x39, 0x41, 0x91, 0x18, 0x98, - 0xfe, 0x19, 0x7e, 0xbf, 0xf7, 0xf2, 0x9e, 0x9f, 0xf7, 0x58, 0xb2, 0x35, 0x2b, 0x85, 0xc5, 0x5d, - 0xe2, 0x8a, 0x15, 0xa6, 0x28, 0x73, 0x5c, 0x31, 0xc3, 0x54, 0x1d, 0x57, 0x46, 0x5b, 0xed, 0x9f, - 0xed, 0x91, 0xb8, 0xcb, 0x78, 0x8f, 0x3c, 0x3c, 0xcb, 0x75, 0xae, 0x7b, 0x00, 0x77, 0x5f, 0x03, - 0x1b, 0x7d, 0x1d, 0x79, 0xe3, 0x79, 0x2f, 0xfb, 0xd7, 0x9e, 0x2f, 0x2a, 0xcd, 0x97, 0x89, 0xd4, - 0xfc, 0xa6, 0xbe, 0x5e, 0x0b, 0x23, 0x59, 0x35, 0x85, 0xe7, 0xee, 0x05, 0x48, 0xc2, 0x5d, 0x1b, - 0x3e, 0x6a, 0x98, 0x92, 0x97, 0x51, 0xcf, 0xd0, 0xb4, 0x87, 0xa8, 0x1e, 0xa8, 0x68, 0xf1, 0x0f, - 0xd5, 0x2f, 0xbd, 0xc9, 0x6b, 0xfd, 0xe6, 0x9d, 0x28, 0xf2, 0xa5, 0x9d, 0x9e, 0x9e, 0xbb, 0x17, - 0x93, 0x64, 0x7e, 0xdb, 0x86, 0xce, 0x8f, 0x36, 0x7c, 0x9a, 0x17, 0x76, 0xb9, 0x4a, 0x63, 0xae, - 0x15, 0xe6, 0xba, 0x56, 0xba, 0xde, 0xc7, 0xf3, 0x3a, 0xbb, 0xc1, 0xb6, 0xa9, 0x44, 0x1d, 0x5f, - 0x09, 0xbe, 0x6b, 0xc3, 0x60, 0xe8, 0x9a, 0x31, 0xcb, 0xa8, 0x11, 0xb2, 0x60, 0x69, 0x21, 0x0b, - 0xdb, 0x50, 0x23, 0x3e, 0x30, 0x93, 0x45, 0x8b, 0x3f, 0x2d, 0xfc, 0x4f, 0xae, 0xf7, 0xc4, 0x08, - 0xae, 0x95, 0x12, 0x65, 0x26, 0xb2, 0x97, 0xdd, 0x1f, 0xbd, 0x5a, 0xa9, 0xb7, 0xfa, 0x85, 0x96, - 0x52, 0x70, 0x3b, 0x67, 0x8d, 0x12, 0xa5, 0x9d, 0x3e, 0xe8, 0x47, 0x9a, 0xed, 0xda, 0x10, 0x0f, - 0xc5, 0xef, 0x49, 0x74, 0x18, 0xaf, 0x5c, 0x29, 0x6a, 0x35, 0xe5, 0x83, 0x48, 0xab, 0xc1, 0x8c, - 0x16, 0xff, 0x53, 0xff, 0x12, 0x7c, 0xf9, 0x16, 0x3a, 0x04, 0x40, 0x17, 0x1d, 0x10, 0x00, 0x0f, - 0xd0, 0x88, 0x00, 0x38, 0x42, 0x80, 0x00, 0x08, 0xd0, 0x21, 0x01, 0xf0, 0x10, 0x8d, 0x09, 0x80, - 0x63, 0x74, 0x44, 0x00, 0x3c, 0x42, 0x90, 0x00, 0x38, 0x41, 0x1e, 0x01, 0xd0, 0x43, 0xc7, 0x04, - 0xc0, 0x63, 0x74, 0x42, 0x00, 0x3c, 0x41, 0xa7, 0xc9, 0xd5, 0xed, 0x26, 0x70, 0xef, 0x36, 0x81, - 0xfb, 0x73, 0x13, 0xb8, 0x9f, 0xb7, 0x81, 0x73, 0xb7, 0x0d, 0x9c, 0xef, 0xdb, 0xc0, 0x79, 0xff, - 0xec, 0xde, 0xfa, 0xfe, 0xba, 0x87, 0xf5, 0x0c, 0x7f, 0xfc, 0x7d, 0x14, 0xfd, 0x1a, 0xd3, 0x71, - 0xff, 0xd0, 0xb3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0x4a, 0xff, 0x3d, 0x39, 0x02, 0x00, + 0x54, 0x21, 0x11, 0x0f, 0x65, 0xea, 0x18, 0xca, 0xe2, 0x81, 0x1e, 0x07, 0x12, 0x12, 0x8b, 0xe5, + 0x38, 0x56, 0x2e, 0xaa, 0x1d, 0x47, 0x8e, 0xef, 0x20, 0x1f, 0x80, 0x9d, 0x11, 0x36, 0x3e, 0x4e, + 0xc7, 0x8e, 0x88, 0x21, 0x42, 0x77, 0xdf, 0xe0, 0x3e, 0x01, 0x4a, 0x72, 0x82, 0x22, 0x31, 0x74, + 0xfa, 0x67, 0xf8, 0xfd, 0xde, 0xcb, 0x7b, 0x7e, 0xde, 0x63, 0xc9, 0x56, 0xac, 0x14, 0x16, 0x77, + 0x89, 0x2b, 0x56, 0x98, 0xa2, 0xcc, 0x71, 0xc5, 0x0c, 0x53, 0x75, 0x5c, 0x19, 0x6d, 0xb5, 0x7f, + 0xb2, 0x43, 0xe2, 0x2e, 0xe3, 0x1d, 0xf2, 0xf0, 0x24, 0xd7, 0xb9, 0xee, 0x01, 0xdc, 0x7d, 0x0d, + 0x6c, 0xf4, 0x6d, 0xe4, 0x8d, 0x67, 0xbd, 0xec, 0x5f, 0x79, 0xbe, 0xa8, 0x34, 0x5f, 0x24, 0x52, + 0xf3, 0xeb, 0xfa, 0x6a, 0x25, 0x8c, 0x64, 0xd5, 0x14, 0x9e, 0xba, 0x67, 0x20, 0x09, 0xb7, 0x6d, + 0xf8, 0xa8, 0x61, 0x4a, 0x5e, 0x44, 0x3d, 0x43, 0xd3, 0x1e, 0xa2, 0x7a, 0xa0, 0xa2, 0xf9, 0x7f, + 0x54, 0xbf, 0xf4, 0x26, 0x6f, 0xf4, 0xdb, 0xf7, 0xa2, 0xc8, 0x17, 0x76, 0x7a, 0x7c, 0xea, 0x9e, + 0x4d, 0x92, 0xd9, 0x4d, 0x1b, 0x3a, 0x3f, 0xdb, 0xf0, 0x69, 0x5e, 0xd8, 0xc5, 0x32, 0x8d, 0xb9, + 0x56, 0x98, 0xeb, 0x5a, 0xe9, 0x7a, 0x17, 0xcf, 0xeb, 0xec, 0x1a, 0xdb, 0xa6, 0x12, 0x75, 0x7c, + 0x29, 0xf8, 0xb6, 0x0d, 0x83, 0xa1, 0x6b, 0xc6, 0x2c, 0xa3, 0x46, 0xc8, 0x82, 0xa5, 0x85, 0x2c, + 0x6c, 0x43, 0x8d, 0xf8, 0xc8, 0x4c, 0x16, 0xcd, 0xff, 0xb6, 0xf0, 0x3f, 0xbb, 0xde, 0x13, 0x23, + 0xb8, 0x56, 0x4a, 0x94, 0x99, 0xc8, 0x5e, 0x75, 0x7f, 0xf4, 0x7a, 0xa9, 0xde, 0xe9, 0x97, 0x5a, + 0x4a, 0xc1, 0xed, 0x8c, 0x35, 0x4a, 0x94, 0x76, 0xfa, 0xa0, 0x1f, 0xe9, 0x7c, 0xdb, 0x86, 0x78, + 0x28, 0x7e, 0x47, 0xa2, 0xc3, 0x78, 0xe5, 0x52, 0x51, 0xab, 0x29, 0x1f, 0x44, 0x5a, 0x0d, 0x66, + 0x34, 0xbf, 0x4f, 0xfd, 0x0b, 0xf0, 0xf5, 0x7b, 0xe8, 0x10, 0x00, 0x5d, 0xb4, 0x47, 0x00, 0xdc, + 0x43, 0x23, 0x02, 0xe0, 0x08, 0x01, 0x02, 0x20, 0x40, 0xfb, 0x04, 0xc0, 0x7d, 0x34, 0x26, 0x00, + 0x8e, 0xd1, 0x01, 0x01, 0xf0, 0x00, 0x41, 0x02, 0xe0, 0x04, 0x79, 0x04, 0x40, 0x0f, 0x1d, 0x12, + 0x00, 0x0f, 0xd1, 0x11, 0x01, 0xf0, 0x08, 0x1d, 0x27, 0x97, 0x37, 0xeb, 0xc0, 0xbd, 0x5d, 0x07, + 0xee, 0xaf, 0x75, 0xe0, 0x7e, 0xd9, 0x04, 0xce, 0xed, 0x26, 0x70, 0x7e, 0x6c, 0x02, 0xe7, 0xc3, + 0xb3, 0x3b, 0xeb, 0xfb, 0xe7, 0x1e, 0x56, 0x2f, 0xf0, 0xa7, 0x3f, 0x47, 0xd1, 0xaf, 0x31, 0x1d, + 0xf7, 0x0f, 0x7d, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xe9, 0xb6, 0xaf, 0xf3, 0x39, 0x02, 0x00, 0x00, } diff --git a/x/pairing/types/query.pb.go b/x/pairing/types/query.pb.go index 883cf7c28c..f69bba8484 100644 --- a/x/pairing/types/query.pb.go +++ b/x/pairing/types/query.pb.go @@ -11,12 +11,12 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" - types "github.com/lavanet/lava/v3/x/epochstorage/types" - types1 "github.com/lavanet/lava/v3/x/plans/types" - _ "github.com/lavanet/lava/v3/x/projects/types" - types2 "github.com/lavanet/lava/v3/x/spec/types" - _ "github.com/lavanet/lava/v3/x/subscription/types" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" + types "github.com/lavanet/lava/v4/x/epochstorage/types" + types1 "github.com/lavanet/lava/v4/x/plans/types" + _ "github.com/lavanet/lava/v4/x/projects/types" + types2 "github.com/lavanet/lava/v4/x/spec/types" + _ "github.com/lavanet/lava/v4/x/subscription/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1581,7 +1581,7 @@ var fileDescriptor_9e149ce9d21da0d8 = []byte{ // 1807 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x6f, 0xdc, 0xc6, 0x15, 0x17, 0x57, 0xab, 0xb5, 0xf4, 0xf4, 0xc7, 0xc6, 0x44, 0xb2, 0xa5, 0xad, 0xb2, 0x5a, 0x53, - 0x49, 0xaa, 0x3f, 0xce, 0x32, 0x5a, 0xc7, 0x89, 0xa1, 0x28, 0x6e, 0x2b, 0xc9, 0x31, 0xa4, 0xaa, + 0x49, 0xaa, 0x3f, 0xce, 0x32, 0xda, 0xd8, 0x89, 0xa1, 0x28, 0x6e, 0x2b, 0xc9, 0x31, 0xa4, 0xaa, 0x8d, 0x44, 0xd5, 0x3d, 0x04, 0x05, 0x08, 0x8a, 0x9c, 0x5d, 0x31, 0xe2, 0x72, 0x18, 0x72, 0xb8, 0x96, 0x2a, 0x6c, 0x0b, 0xb4, 0x5f, 0xa0, 0x40, 0xdb, 0x43, 0x4f, 0xbd, 0x04, 0xe8, 0x29, 0xdf, 0xa0, 0xb7, 0x02, 0x45, 0x0e, 0x3d, 0x18, 0xe8, 0xa5, 0x28, 0x8a, 0xa0, 0xb0, 0x7b, 0x2e, 0xd0, @@ -1664,34 +1664,34 @@ var fileDescriptor_9e149ce9d21da0d8 = []byte{ 0xff, 0xf9, 0x6d, 0xa1, 0x82, 0x16, 0x95, 0x9c, 0x17, 0x3a, 0xf4, 0x07, 0x09, 0x26, 0xba, 0xa2, 0x65, 0x3d, 0x6f, 0xf9, 0x9e, 0x77, 0x93, 0xf2, 0xbd, 0xe1, 0x8c, 0x05, 0x9d, 0x0d, 0x46, 0x67, 0x1d, 0xad, 0xf6, 0xa1, 0x13, 0x01, 0x94, 0x4b, 0x71, 0xb7, 0x75, 0xd0, 0x1f, 0x25, 0x18, 0x8f, - 0x16, 0x42, 0x6b, 0x43, 0xec, 0x16, 0x31, 0x5b, 0x1f, 0xca, 0x56, 0x10, 0xdb, 0x64, 0xc4, 0xde, - 0x47, 0xf5, 0x7c, 0x62, 0xca, 0xa5, 0x50, 0x16, 0x9d, 0x04, 0xc3, 0x3f, 0x49, 0x00, 0xdd, 0xfe, - 0x8e, 0xee, 0x0d, 0x79, 0x0d, 0x70, 0x96, 0xd7, 0xbb, 0x34, 0xe4, 0x2d, 0xc6, 0xf3, 0x03, 0xf4, - 0x7e, 0x36, 0xcf, 0x26, 0x8e, 0x65, 0x77, 0x97, 0xa0, 0x72, 0xc9, 0xf5, 0x71, 0x07, 0xfd, 0x55, - 0x82, 0xe9, 0x94, 0xd2, 0x45, 0x4a, 0xce, 0xf6, 0x59, 0xaa, 0xbc, 0xfc, 0xde, 0xf0, 0x00, 0x41, - 0x59, 0x65, 0x94, 0x0f, 0xd0, 0x7e, 0x36, 0xe5, 0x36, 0x03, 0xe5, 0xb0, 0x56, 0x2e, 0xa3, 0xe8, - 0x77, 0x94, 0x4b, 0x26, 0xd3, 0x3a, 0xe8, 0xbf, 0x12, 0xcc, 0x65, 0x8a, 0x4e, 0xf4, 0xe1, 0x10, - 0xa7, 0x9e, 0xa5, 0x9e, 0xcb, 0x0f, 0xaf, 0x0f, 0x14, 0x0e, 0x9e, 0x30, 0x07, 0x7f, 0x86, 0x3e, - 0xcb, 0xcf, 0x9d, 0xc8, 0x45, 0x8d, 0xcb, 0xd9, 0x94, 0x5b, 0x5d, 0xa7, 0x13, 0xc2, 0x9b, 0x85, - 0x80, 0x09, 0xed, 0x0e, 0xfa, 0x52, 0x82, 0x89, 0x58, 0x94, 0xe6, 0x56, 0x68, 0xaf, 0x3a, 0xce, - 0xad, 0xd0, 0x2b, 0x3a, 0x77, 0x50, 0x82, 0x05, 0x7e, 0xf8, 0x2e, 0x13, 0x22, 0x32, 0x4b, 0xe1, - 0x2f, 0x12, 0xbc, 0x91, 0xa1, 0x42, 0xd1, 0x83, 0x1c, 0x0e, 0xfd, 0x25, 0x6f, 0xf9, 0x83, 0xeb, - 0xc2, 0x84, 0x13, 0x1f, 0x33, 0x27, 0x3e, 0x44, 0x0f, 0xb2, 0x9d, 0xf0, 0x19, 0xb4, 0xfb, 0xf6, - 0xa6, 0xd9, 0x96, 0x4f, 0x13, 0x5e, 0xfc, 0x59, 0x82, 0x9b, 0x3d, 0x42, 0x14, 0x6d, 0xe4, 0x50, - 0xc9, 0x16, 0xc2, 0xe5, 0xfa, 0x75, 0x20, 0x82, 0xf9, 0x36, 0x63, 0xbe, 0x85, 0x36, 0xb3, 0x99, - 0xe3, 0x08, 0x26, 0x14, 0xad, 0x72, 0x19, 0xdd, 0xc8, 0x1d, 0xe5, 0x92, 0x6b, 0xe9, 0x0e, 0xfa, - 0x5b, 0xa2, 0x38, 0x52, 0x77, 0xf2, 0x50, 0xc5, 0x91, 0x25, 0x05, 0x86, 0x2a, 0x8e, 0xcc, 0xeb, - 0x5f, 0xfe, 0x3e, 0x73, 0x68, 0x13, 0x3d, 0x1c, 0x50, 0x1c, 0x2d, 0x8e, 0xd6, 0xb8, 0x4a, 0x49, - 0x14, 0x07, 0xfa, 0x97, 0x04, 0x0b, 0x7d, 0x65, 0x06, 0xfa, 0x28, 0x2f, 0x45, 0x06, 0x28, 0x9c, - 0xf2, 0xd6, 0xab, 0x81, 0x85, 0x6b, 0xbb, 0xcc, 0xb5, 0x47, 0x68, 0xab, 0x4f, 0x96, 0x25, 0x16, - 0xb8, 0xe2, 0x5e, 0x7c, 0x6c, 0xe8, 0x77, 0x12, 0x40, 0xf7, 0xed, 0xe2, 0x35, 0xde, 0x1e, 0x57, - 0x5f, 0x59, 0xe4, 0x55, 0xc6, 0x78, 0x19, 0xdd, 0xed, 0xc3, 0xd8, 0x3c, 0x8b, 0x9a, 0x14, 0xfa, - 0x4a, 0x82, 0x5b, 0xbd, 0xea, 0x09, 0xd5, 0x87, 0xb9, 0xec, 0xd3, 0x52, 0xac, 0x7c, 0xff, 0x5a, - 0x18, 0x41, 0xf4, 0x3d, 0x46, 0x74, 0x0d, 0xad, 0x0c, 0xd0, 0x09, 0xfc, 0xb3, 0x8a, 0x66, 0x04, - 0xdb, 0xbb, 0x5f, 0xbf, 0xa8, 0x48, 0xcf, 0x5f, 0x54, 0xa4, 0x7f, 0xbf, 0xa8, 0x48, 0xbf, 0x79, - 0x59, 0x19, 0x79, 0xfe, 0xb2, 0x32, 0xf2, 0x8f, 0x97, 0x95, 0x91, 0xcf, 0xd6, 0x12, 0x9f, 0x19, - 0x52, 0xab, 0xb5, 0xef, 0x2b, 0xe7, 0xf1, 0x92, 0xec, 0x73, 0xc3, 0x49, 0x89, 0x7d, 0xf2, 0xbd, - 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0x0c, 0x10, 0x4d, 0x97, 0x17, 0x00, 0x00, + 0x16, 0x42, 0x6b, 0x43, 0xec, 0x16, 0x31, 0x5b, 0x1f, 0xca, 0x56, 0x10, 0xdb, 0x64, 0xc4, 0xee, + 0xa3, 0x7a, 0x3e, 0x31, 0xe5, 0x52, 0x28, 0x8b, 0x4e, 0x82, 0xe1, 0x9f, 0x24, 0x80, 0x6e, 0x7f, + 0x47, 0xf7, 0x86, 0xbc, 0x06, 0x38, 0xcb, 0xeb, 0x5d, 0x1a, 0xf2, 0x16, 0xe3, 0xf9, 0x01, 0xba, + 0x9f, 0xcd, 0xb3, 0x89, 0x63, 0xd9, 0xdd, 0x25, 0xa8, 0x5c, 0x72, 0x7d, 0xdc, 0x41, 0x7f, 0x95, + 0x60, 0x3a, 0xa5, 0x74, 0x91, 0x92, 0xb3, 0x7d, 0x96, 0x2a, 0x2f, 0xbf, 0x37, 0x3c, 0x40, 0x50, + 0x56, 0x19, 0xe5, 0x03, 0xb4, 0x9f, 0x4d, 0xb9, 0xcd, 0x40, 0x39, 0xac, 0x95, 0xcb, 0x28, 0xfa, + 0x1d, 0xe5, 0x92, 0xc9, 0xb4, 0x0e, 0xfa, 0xaf, 0x04, 0x73, 0x99, 0xa2, 0x13, 0x7d, 0x38, 0xc4, + 0xa9, 0x67, 0xa9, 0xe7, 0xf2, 0xc3, 0xeb, 0x03, 0x85, 0x83, 0x27, 0xcc, 0xc1, 0x9f, 0xa1, 0xcf, + 0xf2, 0x73, 0x27, 0x72, 0x51, 0xe3, 0x72, 0x36, 0xe5, 0x56, 0xd7, 0xe9, 0x84, 0xf0, 0x66, 0x21, + 0x60, 0x42, 0xbb, 0x83, 0xbe, 0x94, 0x60, 0x22, 0x16, 0xa5, 0xb9, 0x15, 0xda, 0xab, 0x8e, 0x73, + 0x2b, 0xf4, 0x8a, 0xce, 0x1d, 0x94, 0x60, 0x81, 0x1f, 0xbe, 0xcb, 0x84, 0x88, 0xcc, 0x52, 0xf8, + 0x8b, 0x04, 0x6f, 0x64, 0xa8, 0x50, 0xf4, 0x20, 0x87, 0x43, 0x7f, 0xc9, 0x5b, 0xfe, 0xe0, 0xba, + 0x30, 0xe1, 0xc4, 0xc7, 0xcc, 0x89, 0x0f, 0xd1, 0x83, 0x6c, 0x27, 0x7c, 0x06, 0xed, 0xbe, 0xbd, + 0x69, 0xb6, 0xe5, 0xd3, 0x84, 0x17, 0x7f, 0x96, 0xe0, 0x66, 0x8f, 0x10, 0x45, 0x1b, 0x39, 0x54, + 0xb2, 0x85, 0x70, 0xb9, 0x7e, 0x1d, 0x88, 0x60, 0xbe, 0xcd, 0x98, 0x6f, 0xa1, 0xcd, 0x6c, 0xe6, + 0x38, 0x82, 0x09, 0x45, 0xab, 0x5c, 0x46, 0x37, 0x72, 0x47, 0xb9, 0xe4, 0x5a, 0xba, 0x83, 0xfe, + 0x96, 0x28, 0x8e, 0xd4, 0x9d, 0x3c, 0x54, 0x71, 0x64, 0x49, 0x81, 0xa1, 0x8a, 0x23, 0xf3, 0xfa, + 0x97, 0xbf, 0xcf, 0x1c, 0xda, 0x44, 0x0f, 0x07, 0x14, 0x47, 0x8b, 0xa3, 0x35, 0xae, 0x52, 0x12, + 0xc5, 0x81, 0xfe, 0x25, 0xc1, 0x42, 0x5f, 0x99, 0x81, 0x3e, 0xca, 0x4b, 0x91, 0x01, 0x0a, 0xa7, + 0xbc, 0xf5, 0x6a, 0x60, 0xe1, 0xda, 0x2e, 0x73, 0xed, 0x11, 0xda, 0xea, 0x93, 0x65, 0x89, 0x05, + 0xae, 0xb8, 0x17, 0x1f, 0x1b, 0xfa, 0x9d, 0x04, 0xd0, 0x7d, 0xbb, 0x78, 0x8d, 0xb7, 0xc7, 0xd5, + 0x57, 0x16, 0x79, 0x95, 0x31, 0x5e, 0x46, 0x77, 0xfb, 0x30, 0x36, 0xcf, 0xa2, 0x26, 0x85, 0xbe, + 0x92, 0xe0, 0x56, 0xaf, 0x7a, 0x42, 0xf5, 0x61, 0x2e, 0xfb, 0xb4, 0x14, 0x2b, 0xbf, 0x7f, 0x2d, + 0x8c, 0x20, 0xfa, 0x1e, 0x23, 0xba, 0x86, 0x56, 0x06, 0xe8, 0x04, 0xfe, 0x59, 0x45, 0x33, 0x82, + 0xed, 0xdd, 0xaf, 0x5f, 0x54, 0xa4, 0xe7, 0x2f, 0x2a, 0xd2, 0xbf, 0x5f, 0x54, 0xa4, 0xdf, 0xbc, + 0xac, 0x8c, 0x3c, 0x7f, 0x59, 0x19, 0xf9, 0xc7, 0xcb, 0xca, 0xc8, 0x67, 0x6b, 0x89, 0xcf, 0x0c, + 0xa9, 0xd5, 0xda, 0xf7, 0x95, 0xf3, 0x78, 0x49, 0xf6, 0xb9, 0xe1, 0xa4, 0xc4, 0x3e, 0xf9, 0xbe, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbc, 0xf0, 0x40, 0x83, 0x97, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pairing/types/relay.pb.go b/x/pairing/types/relay.pb.go index df0b7b802d..49f66b8769 100644 --- a/x/pairing/types/relay.pb.go +++ b/x/pairing/types/relay.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/epochstorage/types" + types "github.com/lavanet/lava/v4/x/epochstorage/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -875,7 +875,7 @@ var fileDescriptor_a61d253b10eeeb9e = []byte{ // 1286 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x6e, 0x1b, 0xc5, 0x17, 0xcf, 0x3a, 0x76, 0x1c, 0x1f, 0x6f, 0xd3, 0x76, 0xda, 0xb4, 0x56, 0xaa, 0xbf, 0x93, 0xee, - 0x5f, 0x84, 0xa8, 0x80, 0x0d, 0x29, 0xe2, 0x02, 0x09, 0xa9, 0xb8, 0x8d, 0x20, 0x50, 0x68, 0xba, + 0x5f, 0x84, 0xa8, 0x80, 0x0d, 0xa1, 0xe2, 0x02, 0x09, 0xa9, 0xb8, 0x8d, 0x20, 0x50, 0x68, 0xba, 0x81, 0x9b, 0x4a, 0x68, 0x3b, 0xde, 0x9d, 0x6c, 0x86, 0xae, 0x77, 0x36, 0x33, 0xb3, 0x6e, 0xcd, 0x0b, 0x70, 0x85, 0xc4, 0x43, 0xf0, 0x04, 0x3c, 0x44, 0xd5, 0xcb, 0x5e, 0x22, 0x24, 0x2a, 0xd4, 0xbe, 0x01, 0xe2, 0x01, 0xd0, 0x99, 0x19, 0x7f, 0x35, 0x69, 0x51, 0x80, 0xab, 0x9d, 0xf9, 0xcd, @@ -927,33 +927,33 @@ var fileDescriptor_a61d253b10eeeb9e = []byte{ 0x75, 0xd0, 0x08, 0x67, 0x10, 0xdb, 0x05, 0x58, 0xee, 0xae, 0x04, 0xe6, 0x4a, 0x0d, 0x44, 0x6c, 0xc7, 0xf9, 0xc1, 0x43, 0x7e, 0xe7, 0xeb, 0x63, 0x36, 0xf0, 0xde, 0x7c, 0xe0, 0x37, 0x61, 0x25, 0xe1, 0x6a, 0xca, 0xb2, 0x72, 0x19, 0xf3, 0x12, 0x4a, 0x2e, 0xc1, 0x12, 0x93, 0x52, 0x48, 0xe5, - 0xfa, 0x8e, 0xdb, 0x61, 0x52, 0x4c, 0xde, 0x92, 0x48, 0x39, 0x86, 0x61, 0x02, 0xed, 0x07, 0xef, - 0xc3, 0xf2, 0x98, 0x00, 0xa4, 0x31, 0xa7, 0x83, 0x71, 0x6c, 0xcd, 0x1a, 0x49, 0x18, 0xd2, 0xac, - 0x64, 0x2e, 0x9e, 0x76, 0x13, 0xfc, 0xe4, 0xb9, 0xbe, 0x39, 0x7e, 0x63, 0x3e, 0xc1, 0x58, 0x62, - 0xa7, 0x72, 0xfd, 0xce, 0xe8, 0x68, 0x6e, 0x07, 0xaf, 0x6a, 0x10, 0xd3, 0x96, 0x8b, 0xf1, 0x9e, - 0x69, 0xc0, 0x3b, 0x00, 0x56, 0x91, 0x09, 0x5c, 0xc5, 0x68, 0xd9, 0x7c, 0x8d, 0x96, 0x99, 0x34, - 0x0d, 0x6d, 0xb3, 0xc4, 0xe5, 0x67, 0xd5, 0xe5, 0xc5, 0x73, 0xd5, 0xe0, 0x4f, 0x0f, 0xc0, 0xb9, - 0xe9, 0xde, 0x29, 0xa3, 0xd5, 0x9b, 0x49, 0x42, 0xd7, 0x5f, 0x2a, 0xd3, 0xfe, 0xf2, 0xf2, 0xcb, - 0x55, 0x3d, 0xd5, 0xcb, 0x55, 0xfb, 0x9b, 0x97, 0x4b, 0xf1, 0xd4, 0xfd, 0xe1, 0xb2, 0xb5, 0xa1, - 0x78, 0x6a, 0x85, 0xfe, 0x7d, 0xca, 0xba, 0x6b, 0xff, 0x5c, 0x81, 0x4b, 0x27, 0x37, 0x2f, 0x72, - 0x0f, 0xea, 0x78, 0x91, 0x3c, 0x1e, 0xd9, 0x28, 0xf7, 0x6e, 0xa0, 0x86, 0x5f, 0x9f, 0xad, 0x6f, - 0xa6, 0x5c, 0x1f, 0x96, 0xfd, 0x4e, 0x2c, 0x06, 0xdd, 0x58, 0xa8, 0x81, 0x50, 0xee, 0xf3, 0x8e, - 0x4a, 0x1e, 0x74, 0xb1, 0xe4, 0x55, 0xe7, 0x16, 0x8b, 0xff, 0x78, 0xb6, 0xbe, 0x32, 0xa2, 0x83, - 0xec, 0xc3, 0xe0, 0xb6, 0x55, 0x13, 0x84, 0x63, 0x85, 0x84, 0x83, 0x4f, 0x87, 0x94, 0x67, 0xb4, - 0xcf, 0xd1, 0xb4, 0xcd, 0x98, 0xde, 0xce, 0xa9, 0x0d, 0x5c, 0xb0, 0x06, 0x66, 0x75, 0x05, 0xe1, - 0x9c, 0x6a, 0x72, 0x17, 0xaa, 0x6a, 0x94, 0xc7, 0xb6, 0x4d, 0xf6, 0x3e, 0x3a, 0xb5, 0x89, 0xa6, - 0x35, 0x81, 0x3a, 0x82, 0xd0, 0xa8, 0x0a, 0x46, 0x70, 0x7e, 0xcf, 0xd2, 0x6b, 0x32, 0xe6, 0x26, - 0x8d, 0x0f, 0x19, 0xd9, 0x81, 0x3a, 0x4e, 0x56, 0x9c, 0x61, 0x61, 0x62, 0x40, 0xde, 0x98, 0x0f, - 0xc8, 0xec, 0x24, 0xd6, 0xd9, 0xc7, 0x49, 0x6c, 0x07, 0x07, 0x31, 0x17, 0x97, 0xf1, 0xbf, 0x18, - 0x77, 0x7c, 0x10, 0x1e, 0xb2, 0x24, 0x8a, 0x4b, 0x57, 0xc1, 0x0d, 0x87, 0xdc, 0x2c, 0xb7, 0xbf, - 0xaf, 0x40, 0xdd, 0x18, 0x65, 0x92, 0xdc, 0x81, 0x9a, 0x59, 0x92, 0xd7, 0x95, 0x8e, 0xab, 0xba, - 0xb5, 0x8d, 0xd7, 0xca, 0x14, 0xd9, 0x28, 0x58, 0x20, 0xf7, 0x60, 0xc5, 0x96, 0x5b, 0xd9, 0x57, - 0xb1, 0xe4, 0x7d, 0xf6, 0x5f, 0x69, 0x7e, 0xd7, 0x43, 0x67, 0xcd, 0x18, 0xf8, 0x2a, 0x95, 0xb3, - 0x63, 0xe8, 0xab, 0x54, 0x4e, 0xe7, 0xc8, 0x60, 0xa1, 0x77, 0xeb, 0xc9, 0xf3, 0xb6, 0xf7, 0xf4, - 0x79, 0xdb, 0xfb, 0xfd, 0x79, 0xdb, 0xfb, 0xf1, 0x45, 0x7b, 0xe1, 0xe9, 0x8b, 0xf6, 0xc2, 0x2f, - 0x2f, 0xda, 0x0b, 0xf7, 0xae, 0xcd, 0xc4, 0x76, 0x6e, 0x18, 0x1e, 0x5e, 0xef, 0x3e, 0x9a, 0x0c, - 0xe8, 0x26, 0xc6, 0xfd, 0x25, 0x33, 0x07, 0x5f, 0xff, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x4f, 0xea, - 0x8d, 0x16, 0xc5, 0x0b, 0x00, 0x00, + 0xfa, 0x8e, 0xdb, 0x61, 0x52, 0x4c, 0xde, 0x92, 0x48, 0x39, 0x86, 0x61, 0x02, 0xed, 0x07, 0xd7, + 0x61, 0x79, 0x4c, 0x00, 0xd2, 0x98, 0xd3, 0xc1, 0x38, 0xb6, 0x66, 0x8d, 0x24, 0x0c, 0x69, 0x56, + 0x32, 0x17, 0x4f, 0xbb, 0x09, 0x7e, 0xf2, 0x5c, 0xdf, 0x1c, 0xbf, 0x31, 0x9f, 0x60, 0x2c, 0xb1, + 0x53, 0xb9, 0x7e, 0x67, 0x74, 0x34, 0xb7, 0x83, 0x57, 0x35, 0x88, 0x69, 0xcb, 0xc5, 0x78, 0xcf, + 0x34, 0xe0, 0x1d, 0x00, 0xab, 0xc8, 0x04, 0xae, 0x62, 0xb4, 0x6c, 0xbe, 0x46, 0xcb, 0x4c, 0x9a, + 0x86, 0xb6, 0x59, 0xe2, 0xf2, 0xb3, 0xea, 0xf2, 0xe2, 0xb9, 0x6a, 0xf0, 0xa7, 0x07, 0xe0, 0xdc, + 0x74, 0xef, 0x94, 0xd1, 0xea, 0xcd, 0x24, 0xa1, 0xeb, 0x2f, 0x95, 0x69, 0x7f, 0x79, 0xf9, 0xe5, + 0xaa, 0x9e, 0xea, 0xe5, 0xaa, 0xfd, 0xcd, 0xcb, 0xa5, 0x78, 0xea, 0xfe, 0x70, 0xd9, 0xda, 0x50, + 0x3c, 0xb5, 0x42, 0xff, 0x3e, 0x65, 0xdd, 0xb5, 0x7f, 0xae, 0xc0, 0xa5, 0x93, 0x9b, 0x17, 0xb9, + 0x07, 0x75, 0xbc, 0x48, 0x1e, 0x8f, 0x6c, 0x94, 0x7b, 0x37, 0x50, 0xc3, 0xaf, 0xcf, 0xd6, 0x37, + 0x53, 0xae, 0x0f, 0xcb, 0x7e, 0x27, 0x16, 0x83, 0x6e, 0x2c, 0xd4, 0x40, 0x28, 0xf7, 0x79, 0x47, + 0x25, 0x0f, 0xba, 0x58, 0xf2, 0xaa, 0x73, 0x8b, 0xc5, 0x7f, 0x3c, 0x5b, 0x5f, 0x19, 0xd1, 0x41, + 0xf6, 0x61, 0x70, 0xdb, 0xaa, 0x09, 0xc2, 0xb1, 0x42, 0xc2, 0xc1, 0xa7, 0x43, 0xca, 0x33, 0xda, + 0xe7, 0x68, 0xda, 0x66, 0x4c, 0x6f, 0xe7, 0xd4, 0x06, 0x2e, 0x58, 0x03, 0xb3, 0xba, 0x82, 0x70, + 0x4e, 0x35, 0xb9, 0x0b, 0x55, 0x35, 0xca, 0x63, 0xdb, 0x26, 0x7b, 0x1f, 0x9d, 0xda, 0x44, 0xd3, + 0x9a, 0x40, 0x1d, 0x41, 0x68, 0x54, 0x05, 0x23, 0x38, 0xbf, 0x67, 0xe9, 0x35, 0x19, 0x73, 0x93, + 0xc6, 0x87, 0x8c, 0xec, 0x40, 0x1d, 0x27, 0x2b, 0xce, 0xb0, 0x30, 0x31, 0x20, 0x6f, 0xcc, 0x07, + 0x64, 0x76, 0x12, 0xeb, 0xec, 0xe3, 0x24, 0xb6, 0x83, 0x83, 0x98, 0x8b, 0xcb, 0xf8, 0x5f, 0x8c, + 0x3b, 0x3e, 0x08, 0x0f, 0x59, 0x12, 0xc5, 0xa5, 0xab, 0xe0, 0x86, 0x43, 0x6e, 0x96, 0xdb, 0xdf, + 0x57, 0xa0, 0x6e, 0x8c, 0x32, 0x49, 0xee, 0x40, 0xcd, 0x2c, 0xc9, 0xeb, 0x4a, 0xc7, 0x55, 0xdd, + 0xda, 0xc6, 0x6b, 0x65, 0x8a, 0x6c, 0x14, 0x2c, 0x90, 0x7b, 0xb0, 0x62, 0xcb, 0xad, 0xec, 0xab, + 0x58, 0xf2, 0x3e, 0xfb, 0xaf, 0x34, 0xbf, 0xeb, 0xa1, 0xb3, 0x66, 0x0c, 0x7c, 0x95, 0xca, 0xd9, + 0x31, 0xf4, 0x55, 0x2a, 0xa7, 0x73, 0x64, 0xb0, 0xd0, 0xbb, 0xf5, 0xe4, 0x79, 0xdb, 0x7b, 0xfa, + 0xbc, 0xed, 0xfd, 0xfe, 0xbc, 0xed, 0xfd, 0xf8, 0xa2, 0xbd, 0xf0, 0xf4, 0x45, 0x7b, 0xe1, 0x97, + 0x17, 0xed, 0x85, 0x7b, 0xd7, 0x66, 0x62, 0x3b, 0x37, 0x0c, 0x0f, 0xaf, 0x77, 0x1f, 0x4d, 0x06, + 0x74, 0x13, 0xe3, 0xfe, 0x92, 0x99, 0x83, 0xdf, 0xff, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x16, + 0xdd, 0xd8, 0xc5, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pairing/types/relayCache.pb.go b/x/pairing/types/relayCache.pb.go index c7061f6da5..d8d3cb13a2 100644 --- a/x/pairing/types/relayCache.pb.go +++ b/x/pairing/types/relayCache.pb.go @@ -501,53 +501,53 @@ func init() { var fileDescriptor_36fbab536e2bbad1 = []byte{ // 748 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x4e, 0xdb, 0x48, - 0x14, 0xce, 0x1f, 0xf9, 0x99, 0x24, 0x0b, 0x8c, 0x58, 0xe4, 0xcd, 0x2e, 0xd9, 0xac, 0x57, 0xfc, - 0x68, 0xb5, 0xb2, 0x25, 0x90, 0xf6, 0x6a, 0xa5, 0x5d, 0x51, 0x10, 0x41, 0x2a, 0x55, 0xeb, 0x50, - 0xa9, 0xea, 0x8d, 0x3b, 0x89, 0x0f, 0xf6, 0xa8, 0x8e, 0x27, 0xf5, 0x0c, 0x51, 0xe9, 0x53, 0xf4, - 0x05, 0xfa, 0x2c, 0xbd, 0xe5, 0x92, 0xcb, 0x5e, 0x54, 0x55, 0x05, 0x4f, 0xd1, 0xbb, 0xca, 0xc7, - 0x76, 0x20, 0xa9, 0x89, 0xa8, 0xca, 0x95, 0x3d, 0xdf, 0x7c, 0xe7, 0x9c, 0xf1, 0xf9, 0xbe, 0xf1, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0xd6, 0x9f, 0xf5, 0xb3, 0x92, 0x6a, 0x7b, 0xe1, 0x1a, 0xac, 0x5a, 0xab, 0x2a, 0x0b, 0xff, + 0xa0, 0x28, 0x48, 0xc0, 0x2d, 0x7a, 0x2a, 0x90, 0xc0, 0xb1, 0x61, 0x19, 0x88, 0x83, 0x84, 0x72, + 0x80, 0x20, 0x17, 0x66, 0x25, 0x8e, 0xc9, 0x45, 0x28, 0xae, 0xc2, 0x5d, 0x0b, 0x71, 0x9e, 0x22, + 0x2f, 0x90, 0x67, 0xc9, 0xd5, 0x47, 0x1f, 0x73, 0x08, 0x82, 0xc0, 0x7e, 0x8a, 0xdc, 0x02, 0x0e, + 0x49, 0xd9, 0x52, 0x68, 0xc1, 0x41, 0x7c, 0x22, 0xf7, 0xdb, 0x6f, 0x66, 0x96, 0xf3, 0x7d, 0xcb, 0x21, 0xeb, 0x3e, 0x1b, 0xb3, 0x00, 0x94, 0x19, 0x3d, 0xcd, 0x11, 0xe3, 0x21, 0x0f, 0x5c, 0x33, - 0x04, 0x9f, 0x9d, 0x3d, 0x60, 0x03, 0x0f, 0x8c, 0x51, 0x28, 0x94, 0xa0, 0x2b, 0x09, 0xcd, 0x88, + 0x04, 0x9f, 0x9d, 0x3e, 0x60, 0x03, 0x0f, 0x8c, 0x51, 0x28, 0x94, 0xa0, 0x2b, 0x09, 0xcd, 0x88, 0x9e, 0x46, 0x42, 0x6b, 0xad, 0xb8, 0xc2, 0x15, 0x48, 0x30, 0xa3, 0xb7, 0x98, 0xdb, 0xea, 0xdc, - 0x9e, 0x32, 0x61, 0xfc, 0xea, 0x0a, 0xe1, 0xfa, 0x60, 0xe2, 0xaa, 0x7f, 0x7a, 0x62, 0xc2, 0x70, - 0xa4, 0x92, 0x4d, 0xfd, 0x5d, 0x81, 0x2c, 0x62, 0x69, 0x2b, 0x8a, 0xb0, 0x60, 0xe4, 0x9f, 0xd1, - 0x7f, 0xc8, 0x42, 0x18, 0xbd, 0x68, 0xf9, 0x4e, 0x7e, 0xab, 0xbe, 0xdd, 0x31, 0xb2, 0x8e, 0x63, - 0x5c, 0x07, 0x58, 0x31, 0x9d, 0x3e, 0x21, 0xcb, 0x62, 0xa4, 0xb8, 0x08, 0x98, 0x6f, 0x0f, 0x41, - 0x31, 0x87, 0x29, 0xa6, 0x15, 0x3a, 0xc5, 0xad, 0xfa, 0x76, 0x3b, 0x3b, 0xc7, 0x51, 0xc2, 0xda, - 0x2d, 0x9d, 0x7f, 0xfa, 0x3d, 0x67, 0x2d, 0xa5, 0xe1, 0x29, 0x4e, 0xd7, 0x08, 0x91, 0x00, 0x81, - 0xdd, 0xf7, 0xc5, 0xe0, 0xa5, 0x56, 0xec, 0xe4, 0xb7, 0x8a, 0x56, 0x2d, 0x42, 0x76, 0x23, 0x80, + 0x9c, 0x32, 0x61, 0xfc, 0xea, 0x0a, 0xe1, 0xfa, 0x60, 0xe2, 0xaa, 0x7f, 0x72, 0x6c, 0xc2, 0x70, + 0xa4, 0x92, 0x4d, 0xfd, 0x5d, 0x81, 0x2c, 0x62, 0x69, 0x2b, 0x8a, 0xb0, 0x60, 0xe4, 0x9f, 0xd2, + 0xff, 0xc8, 0x42, 0x18, 0xbd, 0x68, 0xf9, 0x4e, 0x7e, 0xab, 0xbe, 0xdd, 0x31, 0xb2, 0x8e, 0x63, + 0x5c, 0x05, 0x58, 0x31, 0x9d, 0x3e, 0x21, 0xcb, 0x62, 0xa4, 0xb8, 0x08, 0x98, 0x6f, 0x0f, 0x41, + 0x31, 0x87, 0x29, 0xa6, 0x15, 0x3a, 0xc5, 0xad, 0xfa, 0x76, 0x3b, 0x3b, 0xc7, 0x61, 0xc2, 0xda, + 0x29, 0x9d, 0x7d, 0xfa, 0x3d, 0x67, 0x2d, 0xa5, 0xe1, 0x29, 0x4e, 0xd7, 0x08, 0x91, 0x00, 0x81, + 0xdd, 0xf7, 0xc5, 0xe0, 0xa5, 0x56, 0xec, 0xe4, 0xb7, 0x8a, 0x56, 0x2d, 0x42, 0x76, 0x22, 0x80, 0xbe, 0x20, 0x1a, 0xee, 0x48, 0xdb, 0x63, 0xd2, 0x03, 0x69, 0x2b, 0x61, 0x7b, 0xc0, 0x5d, 0x4f, - 0x49, 0xad, 0x84, 0x85, 0x37, 0xb3, 0x0b, 0x63, 0x78, 0x97, 0x49, 0xef, 0x58, 0x74, 0x91, 0x6f, + 0x49, 0xad, 0x84, 0x85, 0x37, 0xb3, 0x0b, 0x63, 0x78, 0x97, 0x49, 0xef, 0x48, 0x74, 0x91, 0x6f, 0xfd, 0x1c, 0x27, 0xea, 0x62, 0x9e, 0x14, 0x95, 0xfa, 0x43, 0x42, 0xb0, 0x3d, 0x4f, 0x25, 0x73, - 0x81, 0xfe, 0x46, 0x6a, 0xb8, 0xea, 0x72, 0x25, 0xb1, 0x3b, 0x25, 0xeb, 0x1a, 0xa0, 0x1d, 0x52, - 0xc7, 0xc5, 0x11, 0x97, 0x12, 0xa4, 0x56, 0xc0, 0xfd, 0x9b, 0x90, 0xee, 0xa5, 0xf1, 0x4c, 0x7a, - 0xf4, 0x7f, 0x52, 0x09, 0xe1, 0xd5, 0x29, 0x48, 0x95, 0x34, 0x7a, 0x63, 0x4e, 0xa3, 0x1f, 0x87, - 0x7c, 0xcc, 0x14, 0xec, 0x31, 0xc5, 0xac, 0x34, 0x8c, 0xfe, 0x42, 0xaa, 0x03, 0x8f, 0xf1, 0xc0, - 0xe6, 0x0e, 0x56, 0xab, 0x59, 0x15, 0x5c, 0x1f, 0x3a, 0xfa, 0xc7, 0x02, 0x69, 0x5a, 0x13, 0x5f, - 0x1d, 0x80, 0xa2, 0x7f, 0x90, 0x46, 0x12, 0x87, 0xcd, 0xc2, 0x9a, 0x0d, 0xab, 0x9e, 0x60, 0x78, - 0xa2, 0x35, 0x42, 0xb0, 0x0b, 0x31, 0xa1, 0x80, 0x84, 0x5a, 0x3f, 0x6d, 0x55, 0xf4, 0xf5, 0x27, - 0x3c, 0x60, 0x3e, 0x7f, 0x03, 0x0e, 0x6a, 0x51, 0xb5, 0xae, 0x01, 0xba, 0x49, 0x16, 0x93, 0x5c, - 0xe0, 0x24, 0x7a, 0x95, 0x50, 0xaf, 0x9f, 0x26, 0x70, 0x2c, 0xda, 0x06, 0x59, 0x94, 0x1e, 0x0b, - 0xc1, 0xb1, 0xa5, 0x62, 0x0a, 0xa2, 0xc3, 0x2f, 0xe0, 0xe1, 0x9b, 0x31, 0xdc, 0x8b, 0xd0, 0x43, - 0x67, 0xea, 0xeb, 0xca, 0x53, 0x5f, 0x37, 0x63, 0x8b, 0xca, 0xf7, 0xd8, 0xa2, 0x7a, 0x2f, 0xb6, - 0x78, 0x5f, 0xba, 0xd9, 0xde, 0xde, 0xbd, 0xb4, 0xf7, 0x5f, 0x52, 0x0d, 0x41, 0x8e, 0x44, 0x20, - 0x01, 0xbb, 0x7b, 0x97, 0x9b, 0x37, 0x89, 0x98, 0x16, 0xa7, 0x34, 0x2b, 0x4e, 0xe6, 0xd5, 0x5c, - 0xf8, 0xa1, 0xab, 0x99, 0x21, 0x63, 0x39, 0x4b, 0xc6, 0x0c, 0x5f, 0x54, 0x32, 0x7d, 0x71, 0x53, - 0xef, 0xda, 0x3c, 0xbd, 0xc9, 0xac, 0xde, 0x7f, 0x13, 0xca, 0xc6, 0x10, 0x32, 0x17, 0x62, 0x86, - 0xad, 0xf8, 0x10, 0xb4, 0x3a, 0xd2, 0x96, 0x92, 0x1d, 0x64, 0x1e, 0xf3, 0x21, 0x50, 0x9d, 0x34, - 0xb9, 0xb4, 0x03, 0xe1, 0x80, 0x0d, 0x61, 0x28, 0x42, 0xad, 0x81, 0xdd, 0xaa, 0x73, 0xf9, 0x48, - 0x38, 0xb0, 0x1f, 0x41, 0x73, 0x1d, 0xd4, 0xbc, 0x17, 0x07, 0xfd, 0x47, 0x96, 0xbf, 0xe1, 0x52, - 0x4a, 0x4a, 0x13, 0xf3, 0xd4, 0x2c, 0x7c, 0xa7, 0xab, 0xa4, 0x1c, 0x57, 0x46, 0xc7, 0x14, 0xad, - 0x64, 0xb5, 0xfd, 0x25, 0x4f, 0x1a, 0xe8, 0x04, 0x08, 0xd1, 0x84, 0xf4, 0x19, 0xa9, 0x1e, 0x80, - 0x42, 0x88, 0xfe, 0x39, 0xc7, 0x39, 0xe9, 0x1f, 0xa1, 0xb5, 0x9e, 0x4d, 0x9a, 0x19, 0x07, 0x7a, - 0x8e, 0x1e, 0x92, 0x6a, 0xef, 0xce, 0x99, 0x7b, 0xa0, 0x5a, 0xab, 0x46, 0x3c, 0x73, 0x8c, 0x74, - 0xe6, 0x18, 0xfb, 0xd1, 0xcc, 0xd1, 0x73, 0x74, 0x8f, 0x94, 0xbb, 0xc0, 0x7c, 0xe5, 0xd1, 0x5b, - 0x38, 0xad, 0xce, 0x9c, 0x53, 0xe1, 0x5f, 0x58, 0xcf, 0xed, 0xee, 0x9d, 0x5f, 0xb6, 0xf3, 0x17, - 0x97, 0xed, 0xfc, 0xe7, 0xcb, 0x76, 0xfe, 0xed, 0x55, 0x3b, 0x77, 0x71, 0xd5, 0xce, 0x7d, 0xb8, - 0x6a, 0xe7, 0x9e, 0xff, 0xe5, 0x72, 0xe5, 0x9d, 0xf6, 0x8d, 0x81, 0x18, 0x9a, 0x53, 0x93, 0x71, - 0xbc, 0x63, 0xbe, 0x9e, 0x8c, 0x47, 0x75, 0x36, 0x02, 0xd9, 0x2f, 0x63, 0xe5, 0x9d, 0xaf, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x29, 0x10, 0xa1, 0xf0, 0x96, 0x07, 0x00, 0x00, + 0x81, 0xfe, 0x46, 0x6a, 0xb8, 0xea, 0x72, 0x25, 0xb1, 0x3b, 0x25, 0xeb, 0x0a, 0xa0, 0x1d, 0x52, + 0xc7, 0xc5, 0x21, 0x97, 0x12, 0xa4, 0x56, 0xc0, 0xfd, 0xeb, 0x90, 0xee, 0xa5, 0xf1, 0x4c, 0x7a, + 0xf4, 0x3e, 0xa9, 0x84, 0xf0, 0xea, 0x04, 0xa4, 0x4a, 0x1a, 0xbd, 0x31, 0xa7, 0xd1, 0x8f, 0x43, + 0x3e, 0x66, 0x0a, 0x76, 0x99, 0x62, 0x56, 0x1a, 0x46, 0x7f, 0x21, 0xd5, 0x81, 0xc7, 0x78, 0x60, + 0x73, 0x07, 0xab, 0xd5, 0xac, 0x0a, 0xae, 0x0f, 0x1c, 0xfd, 0x63, 0x81, 0x34, 0xad, 0x89, 0xaf, + 0xf6, 0x41, 0xd1, 0x3f, 0x48, 0x23, 0x89, 0xc3, 0x66, 0x61, 0xcd, 0x86, 0x55, 0x4f, 0x30, 0x3c, + 0xd1, 0x1a, 0x21, 0xd8, 0x85, 0x98, 0x50, 0x40, 0x42, 0xad, 0x9f, 0xb6, 0x2a, 0xfa, 0xfa, 0x63, + 0x1e, 0x30, 0x9f, 0xbf, 0x01, 0x07, 0xb5, 0xa8, 0x5a, 0x57, 0x00, 0xdd, 0x24, 0x8b, 0x49, 0x2e, + 0x70, 0x12, 0xbd, 0x4a, 0xa8, 0xd7, 0x4f, 0x13, 0x38, 0x16, 0x6d, 0x83, 0x2c, 0x4a, 0x8f, 0x85, + 0xe0, 0xd8, 0x52, 0x31, 0x05, 0xd1, 0xe1, 0x17, 0xf0, 0xf0, 0xcd, 0x18, 0xee, 0x45, 0xe8, 0x81, + 0x33, 0xf5, 0x75, 0xe5, 0xa9, 0xaf, 0x9b, 0xb1, 0x45, 0xe5, 0x7b, 0x6c, 0x51, 0xbd, 0x13, 0x5b, + 0xbc, 0x2f, 0x5d, 0x6f, 0x6f, 0xef, 0x4e, 0xda, 0xfb, 0x3f, 0xa9, 0x86, 0x20, 0x47, 0x22, 0x90, + 0x80, 0xdd, 0xbd, 0xcd, 0xcd, 0x9b, 0x44, 0x4c, 0x8b, 0x53, 0x9a, 0x15, 0x27, 0xf3, 0x6a, 0x2e, + 0xfc, 0xd0, 0xd5, 0xcc, 0x90, 0xb1, 0x9c, 0x25, 0x63, 0x86, 0x2f, 0x2a, 0x99, 0xbe, 0xb8, 0xae, + 0x77, 0x6d, 0x9e, 0xde, 0x64, 0x56, 0xef, 0xbf, 0x09, 0x65, 0x63, 0x08, 0x99, 0x0b, 0x31, 0xc3, + 0x56, 0x7c, 0x08, 0x5a, 0x1d, 0x69, 0x4b, 0xc9, 0x0e, 0x32, 0x8f, 0xf8, 0x10, 0xa8, 0x4e, 0x9a, + 0x5c, 0xda, 0x81, 0x70, 0xc0, 0x86, 0x30, 0x14, 0xa1, 0xd6, 0xc0, 0x6e, 0xd5, 0xb9, 0x7c, 0x24, + 0x1c, 0xd8, 0x8b, 0xa0, 0xb9, 0x0e, 0x6a, 0xde, 0x89, 0x83, 0xee, 0x91, 0xe5, 0x6f, 0xb8, 0x94, + 0x92, 0xd2, 0xc4, 0x3c, 0x35, 0x0b, 0xdf, 0xe9, 0x2a, 0x29, 0xc7, 0x95, 0xd1, 0x31, 0x45, 0x2b, + 0x59, 0x6d, 0x7f, 0xc9, 0x93, 0x06, 0x3a, 0x01, 0x42, 0x34, 0x21, 0x7d, 0x46, 0xaa, 0xfb, 0xa0, + 0x10, 0xa2, 0x7f, 0xce, 0x71, 0x4e, 0xfa, 0x47, 0x68, 0xad, 0x67, 0x93, 0x66, 0xc6, 0x81, 0x9e, + 0xa3, 0x07, 0xa4, 0xda, 0xbb, 0x75, 0xe6, 0x1e, 0xa8, 0xd6, 0xaa, 0x11, 0xcf, 0x1c, 0x23, 0x9d, + 0x39, 0xc6, 0x5e, 0x34, 0x73, 0xf4, 0x1c, 0xdd, 0x25, 0xe5, 0x2e, 0x30, 0x5f, 0x79, 0xf4, 0x06, + 0x4e, 0xab, 0x33, 0xe7, 0x54, 0xf8, 0x17, 0xd6, 0x73, 0x3b, 0xbb, 0x67, 0x17, 0xed, 0xfc, 0xf9, + 0x45, 0x3b, 0xff, 0xf9, 0xa2, 0x9d, 0x7f, 0x7b, 0xd9, 0xce, 0x9d, 0x5f, 0xb6, 0x73, 0x1f, 0x2e, + 0xdb, 0xb9, 0xe7, 0x7f, 0xb9, 0x5c, 0x79, 0x27, 0x7d, 0x63, 0x20, 0x86, 0xe6, 0xd4, 0x64, 0x1c, + 0xff, 0x6b, 0xbe, 0x9e, 0x8c, 0x47, 0x75, 0x3a, 0x02, 0xd9, 0x2f, 0x63, 0xe5, 0x7f, 0xbe, 0x06, + 0x00, 0x00, 0xff, 0xff, 0x81, 0xec, 0xf1, 0x3e, 0x96, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pairing/types/relay_exchange.go b/x/pairing/types/relay_exchange.go index 27d2567fd7..429ad417b2 100644 --- a/x/pairing/types/relay_exchange.go +++ b/x/pairing/types/relay_exchange.go @@ -3,8 +3,8 @@ package types import ( "strings" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" ) // RelayExchange consists a relay request and its corresponding response diff --git a/x/pairing/types/relay_session.go b/x/pairing/types/relay_session.go index e11df66c77..7e73c341ec 100644 --- a/x/pairing/types/relay_session.go +++ b/x/pairing/types/relay_session.go @@ -1,7 +1,7 @@ package types import ( - "github.com/lavanet/lava/v3/utils/sigs" + "github.com/lavanet/lava/v4/utils/sigs" ) func (rs RelaySession) GetSignature() []byte { diff --git a/x/pairing/types/static_providers.pb.go b/x/pairing/types/static_providers.pb.go index 90b6db417f..d564dd2c72 100644 --- a/x/pairing/types/static_providers.pb.go +++ b/x/pairing/types/static_providers.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - types "github.com/lavanet/lava/v3/x/epochstorage/types" + types "github.com/lavanet/lava/v4/x/epochstorage/types" io "io" math "math" math_bits "math/bits" diff --git a/x/pairing/types/tx.pb.go b/x/pairing/types/tx.pb.go index 59b17da6ba..ba3636a161 100644 --- a/x/pairing/types/tx.pb.go +++ b/x/pairing/types/tx.pb.go @@ -12,7 +12,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types1 "github.com/lavanet/lava/v3/x/epochstorage/types" + types1 "github.com/lavanet/lava/v4/x/epochstorage/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -751,50 +751,50 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/pairing/tx.proto", fileDescriptor_07b85a84d2198a91) } var fileDescriptor_07b85a84d2198a91 = []byte{ - // 969 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x41, 0x73, 0xdb, 0x44, - 0x14, 0x8e, 0x12, 0xc5, 0xb1, 0x9f, 0xdb, 0xc4, 0xde, 0xb8, 0x44, 0x51, 0x52, 0x63, 0x54, 0x20, - 0x26, 0x03, 0x12, 0x49, 0x0f, 0xcc, 0xf8, 0xe8, 0x84, 0x32, 0xed, 0xd4, 0x43, 0x46, 0x19, 0x0e, - 0x70, 0xf1, 0xac, 0xa5, 0x45, 0x51, 0x63, 0x6b, 0x35, 0xda, 0xad, 0xa7, 0xe1, 0xcc, 0x89, 0x0b, - 0x70, 0xe1, 0x37, 0x70, 0xec, 0x7f, 0xe0, 0xd2, 0x63, 0x8f, 0x9c, 0x18, 0x26, 0x39, 0xf4, 0x6f, - 0x30, 0xbb, 0x5a, 0xc9, 0xb6, 0xec, 0x64, 0xcc, 0xc0, 0xc5, 0xd2, 0xee, 0xfb, 0xf6, 0x7d, 0xdf, - 0x7e, 0xfb, 0xde, 0x5a, 0xf0, 0x70, 0x88, 0xc7, 0x38, 0x22, 0xdc, 0x11, 0x4f, 0x27, 0xc6, 0x61, - 0x12, 0x46, 0x81, 0xc3, 0x5f, 0xd9, 0x71, 0x42, 0x39, 0x45, 0x0d, 0x15, 0xb6, 0xc5, 0xd3, 0x56, + // 970 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x41, 0x6f, 0xe3, 0x44, + 0x14, 0xae, 0x5b, 0x37, 0x4d, 0x5e, 0x76, 0xdb, 0x64, 0x9a, 0xa5, 0xae, 0xdb, 0x0d, 0xc1, 0x0b, + 0x34, 0x54, 0x60, 0xd3, 0x82, 0x84, 0x94, 0x63, 0x5a, 0x16, 0xed, 0x6a, 0x23, 0x2a, 0x57, 0x1c, + 0xe0, 0x12, 0x4d, 0xec, 0xc1, 0xf5, 0x36, 0xf1, 0x58, 0x9e, 0xd9, 0x68, 0xcb, 0x99, 0x13, 0x17, + 0xe0, 0xc2, 0x6f, 0xe0, 0xb8, 0xff, 0x81, 0xcb, 0x1e, 0xf7, 0xc8, 0x09, 0xa1, 0xf6, 0xb0, 0x7f, + 0x03, 0xcd, 0x78, 0xec, 0x24, 0x4e, 0x5a, 0x05, 0xc1, 0x25, 0xf6, 0xcc, 0xfb, 0xe6, 0x7d, 0xdf, + 0x7c, 0xf3, 0xde, 0xc4, 0xf0, 0x70, 0x88, 0xc7, 0x38, 0x22, 0xdc, 0x11, 0x4f, 0x27, 0xc6, 0x61, + 0x12, 0x46, 0x81, 0xc3, 0x5f, 0xda, 0x71, 0x42, 0x39, 0x45, 0x0d, 0x15, 0xb6, 0xc5, 0xd3, 0x56, 0x61, 0xb3, 0xe9, 0x51, 0x36, 0xa2, 0xcc, 0x19, 0x60, 0x46, 0x9c, 0xf1, 0xd1, 0x80, 0x70, 0x7c, 0xe4, 0x78, 0x34, 0x8c, 0xd2, 0x55, 0x66, 0x23, 0xa0, 0x01, 0x95, 0xaf, 0x8e, 0x78, 0x53, 0xb3, 0xed, 0x19, 0x2a, 0x12, 0x53, 0xef, 0x82, 0x71, 0x9a, 0xe0, 0x80, 0x38, 0x24, 0xf2, 0x63, 0x1a, - 0x46, 0x5c, 0x21, 0x5b, 0x0b, 0x45, 0x25, 0x64, 0x88, 0xaf, 0x14, 0xe2, 0x43, 0xa5, 0x80, 0x71, + 0x46, 0x5c, 0x21, 0x5b, 0x0b, 0x45, 0x25, 0x64, 0x88, 0xaf, 0x14, 0xe2, 0x7d, 0xa5, 0x80, 0x71, 0x7c, 0x29, 0x62, 0x99, 0x08, 0x35, 0x56, 0xa8, 0x3a, 0x1e, 0x85, 0x11, 0x75, 0xe4, 0x6f, 0x3a, 0x65, 0xfd, 0xac, 0x43, 0xad, 0xc7, 0x82, 0x73, 0x8e, 0x2f, 0xc9, 0x59, 0x42, 0xc7, 0xa1, 0x4f, 0x12, 0x64, 0xc0, 0x86, 0x97, 0x10, 0xcc, 0x69, 0x62, 0x68, 0x2d, 0xad, 0x5d, 0x71, 0xb3, 0xa1, - 0x8c, 0x5c, 0xe0, 0x30, 0x7a, 0x7a, 0x6a, 0xac, 0xaa, 0x48, 0x3a, 0x44, 0x5f, 0x40, 0x09, 0x8f, - 0xe8, 0xcb, 0x88, 0x1b, 0x6b, 0x2d, 0xad, 0x5d, 0x3d, 0xde, 0xb5, 0x53, 0x49, 0xb6, 0x30, 0xc5, - 0x56, 0x7a, 0xec, 0x13, 0x1a, 0x46, 0x5d, 0xfd, 0xcd, 0x5f, 0xef, 0xaf, 0xb8, 0x0a, 0x8e, 0xbe, + 0x8c, 0x5c, 0xe0, 0x30, 0x7a, 0x72, 0x6a, 0xac, 0xaa, 0x48, 0x3a, 0x44, 0x5f, 0x40, 0x09, 0x8f, + 0xe8, 0x8b, 0x88, 0x1b, 0x6b, 0x2d, 0xad, 0x5d, 0x3d, 0xde, 0xb5, 0x53, 0x49, 0xb6, 0x30, 0xc5, + 0x56, 0x7a, 0xec, 0x13, 0x1a, 0x46, 0x5d, 0xfd, 0xf5, 0x5f, 0xef, 0xae, 0xb8, 0x0a, 0x8e, 0xbe, 0x82, 0x4a, 0xb6, 0x5d, 0x66, 0xe8, 0xad, 0xb5, 0x76, 0xf5, 0xf8, 0x91, 0x3d, 0x63, 0xf3, 0xb4, 0x35, 0xf6, 0x97, 0x0a, 0xab, 0xb2, 0x4c, 0xd6, 0xa2, 0x16, 0x54, 0x03, 0x42, 0x87, 0xd4, 0xc3, - 0x3c, 0xa4, 0x91, 0xb1, 0xde, 0xd2, 0xda, 0xeb, 0xee, 0xf4, 0x14, 0x7a, 0x02, 0x9b, 0x3e, 0x19, + 0x3c, 0xa4, 0x91, 0xb1, 0xde, 0xd2, 0xda, 0xeb, 0xee, 0xf4, 0x14, 0x7a, 0x0c, 0x9b, 0x3e, 0x19, 0x92, 0x00, 0x73, 0xd2, 0x1f, 0x86, 0xa3, 0x90, 0x1b, 0x1b, 0xcb, 0x69, 0xbd, 0x9f, 0x2d, 0x7b, - 0x2e, 0x56, 0x21, 0x07, 0xb6, 0xf3, 0x3c, 0x1e, 0x1d, 0x8d, 0x42, 0xc6, 0x04, 0x63, 0xb9, 0xa5, + 0x26, 0x56, 0x21, 0x07, 0xb6, 0xf3, 0x3c, 0x1e, 0x1d, 0x8d, 0x42, 0xc6, 0x04, 0x63, 0xb9, 0xa5, 0xb5, 0x75, 0x17, 0x65, 0xa1, 0x93, 0x3c, 0x82, 0xf6, 0xa1, 0x32, 0xc6, 0xc3, 0xd0, 0x97, 0x96, 0x56, 0xa4, 0x71, 0x93, 0x09, 0x61, 0x2a, 0xf6, 0xfd, 0x84, 0x30, 0x66, 0x40, 0x6a, 0xaa, 0x1a, 0xa2, 0x33, 0xa8, 0xfa, 0x84, 0x79, 0x49, 0x18, 0xcb, 0x2d, 0x55, 0xa5, 0xda, 0x47, 0x99, 0xda, - 0xec, 0x70, 0x33, 0xc1, 0xa7, 0x13, 0x68, 0xb7, 0x22, 0x74, 0xff, 0xfe, 0xee, 0xf5, 0xa1, 0xe6, - 0x4e, 0xa7, 0xe8, 0x98, 0x3f, 0xbd, 0x7b, 0x7d, 0xf8, 0x20, 0x2b, 0xa1, 0x99, 0x63, 0x7f, 0xa6, + 0xec, 0x70, 0x33, 0xc1, 0xa7, 0x13, 0x68, 0xb7, 0x22, 0x74, 0xff, 0xfe, 0xf6, 0xd5, 0xa1, 0xe6, + 0x4e, 0xa7, 0xe8, 0x98, 0x3f, 0xbd, 0x7d, 0x75, 0xf8, 0x20, 0x2b, 0xa1, 0x99, 0x63, 0x7f, 0xaa, 0x97, 0x4b, 0xb5, 0x0d, 0xcb, 0x04, 0xa3, 0x58, 0x10, 0x2e, 0x61, 0x31, 0x8d, 0x18, 0xb1, 0x7e, 0xd4, 0x00, 0xf5, 0x58, 0xf0, 0x4d, 0xc4, 0xfe, 0x73, 0xbd, 0xcc, 0x58, 0xb2, 0x56, 0xb0, 0xa4, 0xb3, 0x2f, 0x64, 0xee, 0x64, 0x32, 0x0b, 0x7c, 0xd6, 0x3e, 0x98, 0xf3, 0x2a, 0x72, 0x91, 0xbf, 0xae, 0xc2, 0x56, 0x8f, 0x05, 0xae, 0x68, 0x8f, 0x33, 0x7c, 0x35, 0x22, 0x11, 0xbf, 0x43, 0x61, 0x07, 0x4a, 0xb2, 0x91, 0x98, 0xb1, 0x2a, 0x6b, 0xcf, 0xb2, 0x17, 0xb5, 0xb8, 0x2d, 0xb3, 0x9d, - 0x13, 0x79, 0x9c, 0xae, 0x5a, 0x81, 0x3e, 0x85, 0xfa, 0x94, 0xb7, 0xe7, 0x5c, 0x20, 0x0d, 0x5d, + 0x13, 0x79, 0x9c, 0xae, 0x5a, 0x81, 0x3e, 0x86, 0xfa, 0x94, 0xb7, 0xe7, 0x5c, 0x20, 0x0d, 0x5d, 0xe6, 0x9f, 0x0f, 0xa0, 0x6f, 0xa1, 0x31, 0xc4, 0x9c, 0x30, 0xde, 0x1f, 0x0c, 0xa9, 0x77, 0xd9, - 0x4f, 0x48, 0x4c, 0x13, 0xce, 0x8c, 0x75, 0xc9, 0x7b, 0xb0, 0x98, 0xf7, 0xb9, 0x5c, 0xd1, 0x15, + 0x4f, 0x48, 0x4c, 0x13, 0xce, 0x8c, 0x75, 0xc9, 0x7b, 0xb0, 0x98, 0xf7, 0x99, 0x5c, 0xd1, 0x15, 0x0b, 0x5c, 0x89, 0x77, 0xd1, 0xb0, 0x38, 0xc5, 0x3a, 0xbb, 0xc2, 0xae, 0x46, 0x66, 0xd7, 0xf4, - 0xce, 0x9f, 0xe9, 0xe5, 0xb5, 0x9a, 0x6e, 0x7d, 0x0d, 0xf5, 0xb9, 0x4c, 0x68, 0x07, 0x36, 0x58, - 0x4c, 0xbc, 0x7e, 0xe8, 0x2b, 0x53, 0x4a, 0x62, 0xf8, 0xd4, 0x47, 0x1f, 0xc0, 0xbd, 0x69, 0xa5, + 0xce, 0x9f, 0xea, 0xe5, 0xb5, 0x9a, 0x6e, 0x7d, 0x0d, 0xf5, 0xb9, 0x4c, 0x68, 0x07, 0x36, 0x58, + 0x4c, 0xbc, 0x7e, 0xe8, 0x2b, 0x53, 0x4a, 0x62, 0xf8, 0xc4, 0x47, 0xef, 0xc1, 0xbd, 0x69, 0xa5, 0xf2, 0xe8, 0x74, 0xb7, 0x3a, 0x45, 0x6c, 0x75, 0x61, 0xa7, 0xe0, 0x71, 0xe6, 0x3f, 0x3a, 0x80, - 0xad, 0x84, 0xbc, 0x20, 0x1e, 0x27, 0x7e, 0x5f, 0x59, 0x2b, 0xd2, 0x97, 0xdd, 0xcd, 0x6c, 0x5a, - 0x2e, 0x63, 0xd6, 0x18, 0xea, 0x3d, 0x16, 0x3c, 0x49, 0x08, 0xf9, 0x61, 0x99, 0x5a, 0x32, 0xa1, - 0x9c, 0x16, 0x8f, 0x9f, 0x9e, 0x55, 0xc5, 0xcd, 0xc7, 0xe8, 0x3d, 0x71, 0x8a, 0x98, 0xd1, 0x48, + 0xad, 0x84, 0x3c, 0x27, 0x1e, 0x27, 0x7e, 0x5f, 0x59, 0x2b, 0xd2, 0x97, 0xdd, 0xcd, 0x6c, 0x5a, + 0x2e, 0x63, 0xd6, 0x18, 0xea, 0x3d, 0x16, 0x3c, 0x4e, 0x08, 0xf9, 0x61, 0x99, 0x5a, 0x32, 0xa1, + 0x9c, 0x16, 0x8f, 0x9f, 0x9e, 0x55, 0xc5, 0xcd, 0xc7, 0xe8, 0x1d, 0x71, 0x8a, 0x98, 0xd1, 0x48, 0x95, 0x92, 0x1a, 0x75, 0xb6, 0x85, 0x31, 0x9b, 0x99, 0x31, 0x29, 0x95, 0xb5, 0x07, 0xbb, 0x73, 0xbc, 0x79, 0xf5, 0x0c, 0x60, 0x5b, 0xd6, 0xd6, 0xf7, 0xff, 0x83, 0xac, 0xce, 0x03, 0x41, 0x5f, 0x9b, 0x94, 0x71, 0x9a, 0xd4, 0x7a, 0x08, 0x7b, 0x0b, 0x38, 0x72, 0x09, 0x7f, 0x68, 0xd0, 0xe8, @@ -802,17 +802,17 @@ var fileDescriptor_07b85a84d2198a91 = []byte{ 0x89, 0x55, 0xa7, 0x95, 0x59, 0xe2, 0x9d, 0x88, 0xb1, 0x08, 0xfa, 0x8c, 0xab, 0x60, 0xea, 0x4f, 0xd9, 0x67, 0x3c, 0x0d, 0x4e, 0xee, 0x6d, 0xfd, 0x5f, 0xdd, 0xdb, 0x9d, 0xa6, 0xd8, 0xdb, 0x6e, 0xb6, 0xb7, 0x39, 0xb1, 0x56, 0x13, 0xf6, 0x17, 0x6d, 0x22, 0xdb, 0xe5, 0xf1, 0x6f, 0xeb, 0xb0, - 0xd6, 0x63, 0x01, 0x0a, 0xe0, 0xfe, 0xec, 0xbf, 0xcf, 0xc7, 0x8b, 0x3b, 0xa1, 0x78, 0x29, 0x99, + 0xd6, 0x63, 0x01, 0x0a, 0xe0, 0xfe, 0xec, 0xbf, 0xcf, 0x87, 0x8b, 0x3b, 0xa1, 0x78, 0x29, 0x99, 0xf6, 0x72, 0xb8, 0xbc, 0x2e, 0x47, 0xb0, 0x55, 0xbc, 0xb8, 0xda, 0xb7, 0xa6, 0x28, 0x20, 0xcd, - 0xcf, 0x97, 0x45, 0xe6, 0x74, 0x3e, 0xdc, 0x9b, 0xb9, 0x82, 0x3e, 0xba, 0x35, 0xc3, 0x34, 0xcc, - 0xfc, 0x6c, 0x29, 0x58, 0xce, 0xf2, 0x02, 0x36, 0x0b, 0x0d, 0x74, 0x70, 0x6b, 0x82, 0x59, 0xa0, - 0xe9, 0x2c, 0x09, 0xcc, 0xb9, 0x62, 0xa8, 0xcd, 0xf5, 0xc5, 0x27, 0x77, 0xf8, 0x32, 0x0b, 0x35, + 0x4f, 0x97, 0x45, 0xe6, 0x74, 0x3e, 0xdc, 0x9b, 0xb9, 0x82, 0x3e, 0xb8, 0x35, 0xc3, 0x34, 0xcc, + 0xfc, 0x64, 0x29, 0x58, 0xce, 0xf2, 0x1c, 0x36, 0x0b, 0x0d, 0x74, 0x70, 0x6b, 0x82, 0x59, 0xa0, + 0xe9, 0x2c, 0x09, 0xcc, 0xb9, 0x62, 0xa8, 0xcd, 0xf5, 0xc5, 0x47, 0x77, 0xf8, 0x32, 0x0b, 0x35, 0x8f, 0x96, 0x86, 0xe6, 0x8c, 0x0c, 0xea, 0xf3, 0x5d, 0x70, 0x78, 0x6b, 0x9e, 0x39, 0xac, 0x79, - 0xbc, 0x3c, 0x36, 0x23, 0xed, 0x9e, 0xbe, 0xb9, 0x6e, 0x6a, 0x6f, 0xaf, 0x9b, 0xda, 0xdf, 0xd7, - 0x4d, 0xed, 0x97, 0x9b, 0xe6, 0xca, 0xdb, 0x9b, 0xe6, 0xca, 0x9f, 0x37, 0xcd, 0x95, 0xef, 0x0e, - 0x83, 0x90, 0x5f, 0xbc, 0x1c, 0xd8, 0x1e, 0x1d, 0x39, 0x33, 0x9f, 0x64, 0xe3, 0xc7, 0xce, 0xab, - 0xc9, 0xc7, 0xe2, 0x55, 0x4c, 0xd8, 0xa0, 0x24, 0xbf, 0xaf, 0x1e, 0xff, 0x13, 0x00, 0x00, 0xff, - 0xff, 0x5b, 0x67, 0x92, 0xf3, 0x51, 0x0a, 0x00, 0x00, + 0xbc, 0x3c, 0x36, 0x23, 0xed, 0x9e, 0xbe, 0xbe, 0x6e, 0x6a, 0x6f, 0xae, 0x9b, 0xda, 0xdf, 0xd7, + 0x4d, 0xed, 0x97, 0x9b, 0xe6, 0xca, 0x9b, 0x9b, 0xe6, 0xca, 0x9f, 0x37, 0xcd, 0x95, 0xef, 0x0e, + 0x83, 0x90, 0x5f, 0xbc, 0x18, 0xd8, 0x1e, 0x1d, 0x39, 0x33, 0x9f, 0x64, 0xe3, 0xcf, 0x9d, 0x97, + 0x93, 0x8f, 0xc5, 0xab, 0x98, 0xb0, 0x41, 0x49, 0x7e, 0x5f, 0x7d, 0xf6, 0x4f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xf3, 0x9b, 0xc2, 0x3d, 0x51, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pairing/types/unstake_proposal.pb.go b/x/pairing/types/unstake_proposal.pb.go index fff454679e..b17721dd07 100644 --- a/x/pairing/types/unstake_proposal.pb.go +++ b/x/pairing/types/unstake_proposal.pb.go @@ -183,31 +183,31 @@ var fileDescriptor_d35cf592c1bb0d91 = []byte{ // 425 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x31, 0x6f, 0xd4, 0x30, 0x14, 0xc7, 0x93, 0xf6, 0x80, 0xd6, 0x27, 0x5a, 0x61, 0x6e, 0xb8, 0x9e, 0x50, 0x7a, 0xba, 0x85, - 0x02, 0x92, 0xad, 0xb6, 0x1b, 0x1b, 0xa5, 0x03, 0x95, 0x18, 0xaa, 0x22, 0x18, 0x90, 0xd0, 0xc9, - 0x49, 0x7c, 0x3e, 0x8b, 0x9c, 0x9f, 0x65, 0x3b, 0x01, 0xc4, 0x8e, 0x18, 0xf9, 0x08, 0x7c, 0x9c, - 0x8e, 0x1d, 0x99, 0x10, 0xba, 0xfb, 0x22, 0x28, 0x8e, 0x13, 0x40, 0x64, 0x72, 0xde, 0x7b, 0x3f, - 0xff, 0xf3, 0xf7, 0x7b, 0x0f, 0x3d, 0x29, 0x58, 0xc5, 0x14, 0x77, 0xb4, 0x3e, 0xa9, 0x66, 0xd2, - 0x48, 0x25, 0x68, 0xa9, 0xac, 0x63, 0xef, 0xf9, 0x5c, 0x1b, 0xd0, 0x60, 0x59, 0x41, 0xb4, 0x01, - 0x07, 0x78, 0x14, 0x60, 0x52, 0x9f, 0x24, 0xc0, 0x93, 0x91, 0x00, 0x01, 0x1e, 0xa0, 0xf5, 0x57, - 0xc3, 0x4e, 0x12, 0x01, 0x20, 0x0a, 0x4e, 0x7d, 0x94, 0x96, 0x0b, 0xfa, 0xc1, 0x30, 0xad, 0xb9, - 0xb1, 0x6d, 0x3d, 0x03, 0xbb, 0x02, 0x4b, 0x53, 0x66, 0x39, 0xad, 0x8e, 0x53, 0xee, 0xd8, 0x31, - 0xcd, 0x40, 0xaa, 0xa6, 0x3e, 0xfb, 0xb2, 0x85, 0xf6, 0x5f, 0x37, 0x36, 0x2e, 0x83, 0x0b, 0x3c, - 0x42, 0xb7, 0x9c, 0x74, 0x05, 0x1f, 0xc7, 0xd3, 0xf8, 0x68, 0xf7, 0xaa, 0x09, 0xf0, 0x14, 0x0d, - 0x73, 0x6e, 0x33, 0x23, 0xb5, 0x93, 0xa0, 0xc6, 0x5b, 0xbe, 0xf6, 0x77, 0x0a, 0xbf, 0x41, 0x7b, - 0xda, 0x40, 0x25, 0x73, 0x6e, 0xec, 0x5c, 0xaa, 0x05, 0x8c, 0xb7, 0xa7, 0xdb, 0x47, 0xc3, 0x93, - 0x47, 0xa4, 0xef, 0x41, 0xe4, 0x32, 0xb0, 0xe1, 0xf7, 0x17, 0x6a, 0x01, 0x67, 0x83, 0xeb, 0x9f, - 0x87, 0xd1, 0xd5, 0xdd, 0x4e, 0xa6, 0x4e, 0xe2, 0x77, 0x08, 0x9f, 0xf3, 0x82, 0x0b, 0xe6, 0xc0, - 0xd8, 0x57, 0x05, 0xb3, 0x4b, 0xa9, 0xc4, 0x78, 0xe0, 0xb5, 0x1f, 0xf6, 0x6b, 0x77, 0x7c, 0x8b, - 0x07, 0xe5, 0x1e, 0xa1, 0xa7, 0x83, 0xaf, 0xdf, 0x0f, 0xa3, 0xd9, 0x4b, 0x74, 0xbf, 0xc7, 0x10, - 0x9e, 0xa0, 0x9d, 0xd6, 0x4c, 0x68, 0x47, 0x17, 0xe3, 0x03, 0xb4, 0x93, 0x2d, 0x99, 0x54, 0x73, - 0x99, 0x87, 0x76, 0xdc, 0xf1, 0xf1, 0x45, 0x3e, 0xfb, 0x8c, 0xee, 0xfd, 0x67, 0x01, 0x3f, 0x40, - 0xbb, 0x79, 0x9b, 0x0c, 0x62, 0x7f, 0x12, 0xf8, 0x05, 0xda, 0xb7, 0x81, 0x9c, 0xb3, 0x15, 0x94, - 0xca, 0x79, 0xd1, 0xe1, 0xc9, 0x01, 0x69, 0x66, 0x48, 0xea, 0x19, 0x92, 0x30, 0x43, 0xf2, 0x1c, - 0xa4, 0x0a, 0x8f, 0xda, 0x6b, 0xef, 0x3d, 0xf3, 0xd7, 0xce, 0xce, 0xaf, 0xd7, 0x49, 0x7c, 0xb3, - 0x4e, 0xe2, 0x5f, 0xeb, 0x24, 0xfe, 0xb6, 0x49, 0xa2, 0x9b, 0x4d, 0x12, 0xfd, 0xd8, 0x24, 0xd1, - 0xdb, 0xc7, 0x42, 0xba, 0x65, 0x99, 0x92, 0x0c, 0x56, 0xf4, 0x9f, 0x8d, 0xac, 0x4e, 0xe9, 0xc7, - 0x6e, 0x2d, 0xdd, 0x27, 0xcd, 0x6d, 0x7a, 0xdb, 0x2f, 0xc8, 0xe9, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x3b, 0x9e, 0xac, 0x44, 0xbb, 0x02, 0x00, 0x00, + 0x02, 0x92, 0xad, 0x16, 0x26, 0x36, 0x4a, 0x07, 0x2a, 0x31, 0x54, 0x45, 0x30, 0x20, 0xa1, 0x93, + 0x93, 0xf8, 0x7c, 0x16, 0x39, 0x3f, 0xcb, 0x76, 0x02, 0x88, 0x1d, 0x31, 0xf2, 0x11, 0xf8, 0x38, + 0x1d, 0x3b, 0x32, 0x21, 0x74, 0xf7, 0x45, 0x50, 0x1c, 0x27, 0x80, 0xc8, 0xe4, 0xbc, 0xf7, 0x7e, + 0xfe, 0xe7, 0xef, 0xf7, 0x1e, 0x7a, 0x54, 0xb0, 0x8a, 0x29, 0xee, 0x68, 0x7d, 0x52, 0xcd, 0xa4, + 0x91, 0x4a, 0xd0, 0x52, 0x59, 0xc7, 0xde, 0xf3, 0xb9, 0x36, 0xa0, 0xc1, 0xb2, 0x82, 0x68, 0x03, + 0x0e, 0xf0, 0x28, 0xc0, 0xa4, 0x3e, 0x49, 0x80, 0x27, 0x23, 0x01, 0x02, 0x3c, 0x40, 0xeb, 0xaf, + 0x86, 0x9d, 0x24, 0x02, 0x40, 0x14, 0x9c, 0xfa, 0x28, 0x2d, 0x17, 0xf4, 0x83, 0x61, 0x5a, 0x73, + 0x63, 0xdb, 0x7a, 0x06, 0x76, 0x05, 0x96, 0xa6, 0xcc, 0x72, 0x5a, 0x1d, 0xa7, 0xdc, 0xb1, 0x63, + 0x9a, 0x81, 0x54, 0x4d, 0x7d, 0xf6, 0x65, 0x0b, 0xed, 0xbf, 0x6e, 0x6c, 0x5c, 0x04, 0x17, 0x78, + 0x84, 0x6e, 0x38, 0xe9, 0x0a, 0x3e, 0x8e, 0xa7, 0xf1, 0xd1, 0xee, 0x65, 0x13, 0xe0, 0x29, 0x1a, + 0xe6, 0xdc, 0x66, 0x46, 0x6a, 0x27, 0x41, 0x8d, 0xb7, 0x7c, 0xed, 0xef, 0x14, 0x7e, 0x83, 0xf6, + 0xb4, 0x81, 0x4a, 0xe6, 0xdc, 0xd8, 0xb9, 0x54, 0x0b, 0x18, 0x6f, 0x4f, 0xb7, 0x8f, 0x86, 0x27, + 0x0f, 0x48, 0xdf, 0x83, 0xc8, 0x45, 0x60, 0xc3, 0xef, 0xcf, 0xd5, 0x02, 0x4e, 0x07, 0x57, 0x3f, + 0x0f, 0xa3, 0xcb, 0xdb, 0x9d, 0x4c, 0x9d, 0xc4, 0xef, 0x10, 0x3e, 0xe3, 0x05, 0x17, 0xcc, 0x81, + 0xb1, 0xaf, 0x0a, 0x66, 0x97, 0x52, 0x89, 0xf1, 0xc0, 0x6b, 0xdf, 0xef, 0xd7, 0xee, 0xf8, 0x16, + 0x0f, 0xca, 0x3d, 0x42, 0x4f, 0x07, 0x5f, 0xbf, 0x1f, 0x46, 0xb3, 0x97, 0xe8, 0x6e, 0x8f, 0x21, + 0x3c, 0x41, 0x3b, 0xad, 0x99, 0xd0, 0x8e, 0x2e, 0xc6, 0x07, 0x68, 0x27, 0x5b, 0x32, 0xa9, 0xe6, + 0x32, 0x0f, 0xed, 0xb8, 0xe5, 0xe3, 0xf3, 0x7c, 0xf6, 0x19, 0xdd, 0xf9, 0xcf, 0x02, 0xbe, 0x87, + 0x76, 0xf3, 0x36, 0x19, 0xc4, 0xfe, 0x24, 0xf0, 0x0b, 0xb4, 0x6f, 0x03, 0x39, 0x67, 0x2b, 0x28, + 0x95, 0xf3, 0xa2, 0xc3, 0x93, 0x03, 0xd2, 0xcc, 0x90, 0xd4, 0x33, 0x24, 0x61, 0x86, 0xe4, 0x39, + 0x48, 0x15, 0x1e, 0xb5, 0xd7, 0xde, 0x7b, 0xe6, 0xaf, 0x9d, 0x9e, 0x5d, 0xad, 0x93, 0xf8, 0x7a, + 0x9d, 0xc4, 0xbf, 0xd6, 0x49, 0xfc, 0x6d, 0x93, 0x44, 0xd7, 0x9b, 0x24, 0xfa, 0xb1, 0x49, 0xa2, + 0xb7, 0x0f, 0x85, 0x74, 0xcb, 0x32, 0x25, 0x19, 0xac, 0xe8, 0x3f, 0x1b, 0x59, 0x3d, 0xa1, 0x1f, + 0xbb, 0xb5, 0x74, 0x9f, 0x34, 0xb7, 0xe9, 0x4d, 0xbf, 0x20, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, + 0xff, 0x93, 0x62, 0xfc, 0x8a, 0xbb, 0x02, 0x00, 0x00, } func (m *UnstakeProposal) Marshal() (dAtA []byte, err error) { diff --git a/x/plans/client/cli/query.go b/x/plans/client/cli/query.go index 4a428e7772..67c2c3379d 100644 --- a/x/plans/client/cli/query.go +++ b/x/plans/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/plans/client/cli/query_info.go b/x/plans/client/cli/query_info.go index dd70d9087b..df5317883d 100644 --- a/x/plans/client/cli/query_info.go +++ b/x/plans/client/cli/query_info.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/spf13/cobra" ) diff --git a/x/plans/client/cli/query_list.go b/x/plans/client/cli/query_list.go index 80a2da41ea..ae74cb4538 100644 --- a/x/plans/client/cli/query_list.go +++ b/x/plans/client/cli/query_list.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/spf13/cobra" ) diff --git a/x/plans/client/cli/query_params.go b/x/plans/client/cli/query_params.go index 978c713248..1091409ee5 100644 --- a/x/plans/client/cli/query_params.go +++ b/x/plans/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/spf13/cobra" ) diff --git a/x/plans/client/cli/tx.go b/x/plans/client/cli/tx.go index 50b20b1220..a23923744f 100644 --- a/x/plans/client/cli/tx.go +++ b/x/plans/client/cli/tx.go @@ -15,8 +15,8 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/plans/client/utils" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/client/utils" + "github.com/lavanet/lava/v4/x/plans/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/plans/client/proposal_handler.go b/x/plans/client/proposal_handler.go index 9e2eff4a19..32dd3965ad 100644 --- a/x/plans/client/proposal_handler.go +++ b/x/plans/client/proposal_handler.go @@ -2,7 +2,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/lavanet/lava/v3/x/plans/client/cli" + "github.com/lavanet/lava/v4/x/plans/client/cli" ) var PlansAddProposalHandler = govclient.NewProposalHandler(cli.NewSubmitPlansAddProposalTxCmd) diff --git a/x/plans/client/utils/utils.go b/x/plans/client/utils/utils.go index a2c4949562..8b29ba1356 100755 --- a/x/plans/client/utils/utils.go +++ b/x/plans/client/utils/utils.go @@ -6,9 +6,9 @@ import ( sdkerrors "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/utils/decoder" - "github.com/lavanet/lava/v3/x/plans/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/utils/decoder" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/mitchellh/mapstructure" ) diff --git a/x/plans/genesis.go b/x/plans/genesis.go index 644749f056..bf70a7dd8e 100644 --- a/x/plans/genesis.go +++ b/x/plans/genesis.go @@ -2,8 +2,8 @@ package plans import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/plans/keeper" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/keeper" + "github.com/lavanet/lava/v4/x/plans/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/plans/genesis_test.go b/x/plans/genesis_test.go index 1ac5b31be1..42f76e883d 100644 --- a/x/plans/genesis_test.go +++ b/x/plans/genesis_test.go @@ -3,10 +3,10 @@ package plans_test import ( "testing" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - plans "github.com/lavanet/lava/v3/x/plans" - "github.com/lavanet/lava/v3/x/plans/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + plans "github.com/lavanet/lava/v4/x/plans" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/plans/handler.go b/x/plans/handler.go index c8751846a0..1cc8037873 100644 --- a/x/plans/handler.go +++ b/x/plans/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/plans/keeper" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/keeper" + "github.com/lavanet/lava/v4/x/plans/types" ) // NewHandler ... diff --git a/x/plans/keeper/grpc_query.go b/x/plans/keeper/grpc_query.go index ef0611b5b2..705c439b46 100644 --- a/x/plans/keeper/grpc_query.go +++ b/x/plans/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/plans/keeper/grpc_query_info.go b/x/plans/keeper/grpc_query_info.go index e8f04a3121..52547d0c6c 100644 --- a/x/plans/keeper/grpc_query_info.go +++ b/x/plans/keeper/grpc_query_info.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/plans/keeper/grpc_query_list.go b/x/plans/keeper/grpc_query_list.go index 52a163d6f8..64b1797f71 100644 --- a/x/plans/keeper/grpc_query_list.go +++ b/x/plans/keeper/grpc_query_list.go @@ -5,8 +5,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/plans/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/plans/keeper/grpc_query_params.go b/x/plans/keeper/grpc_query_params.go index 64b728ecb7..134630043d 100644 --- a/x/plans/keeper/grpc_query_params.go +++ b/x/plans/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/plans/keeper/grpc_query_params_test.go b/x/plans/keeper/grpc_query_params_test.go index 816bb7c818..2e98a3a51c 100644 --- a/x/plans/keeper/grpc_query_params_test.go +++ b/x/plans/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/plans/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/plans/keeper/keeper.go b/x/plans/keeper/keeper.go index 8e982d3c0e..92897b1120 100644 --- a/x/plans/keeper/keeper.go +++ b/x/plans/keeper/keeper.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" - "github.com/lavanet/lava/v3/x/plans/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/plans/types" ) type ( diff --git a/x/plans/keeper/migrations.go b/x/plans/keeper/migrations.go index 5803a865af..4aba7e497f 100644 --- a/x/plans/keeper/migrations.go +++ b/x/plans/keeper/migrations.go @@ -4,11 +4,11 @@ import ( "math" sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/lavanet/lava/v3/x/plans/migrations/v2" - v3 "github.com/lavanet/lava/v3/x/plans/migrations/v3" - v7 "github.com/lavanet/lava/v3/x/plans/migrations/v7" - v8 "github.com/lavanet/lava/v3/x/plans/migrations/v8" - projectsv3 "github.com/lavanet/lava/v3/x/projects/migrations/v3" + v2 "github.com/lavanet/lava/v4/x/plans/migrations/v2" + v3 "github.com/lavanet/lava/v4/x/plans/migrations/v3" + v7 "github.com/lavanet/lava/v4/x/plans/migrations/v7" + v8 "github.com/lavanet/lava/v4/x/plans/migrations/v8" + projectsv3 "github.com/lavanet/lava/v4/x/projects/migrations/v3" ) type Migrator struct { diff --git a/x/plans/keeper/msg_server.go b/x/plans/keeper/msg_server.go index 7f1dfbbc11..b00aa4e3af 100644 --- a/x/plans/keeper/msg_server.go +++ b/x/plans/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" ) type msgServer struct { diff --git a/x/plans/keeper/msg_server_test.go b/x/plans/keeper/msg_server_test.go index b8a6935a8a..8b4a011f5a 100644 --- a/x/plans/keeper/msg_server_test.go +++ b/x/plans/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/plans/keeper" - "github.com/lavanet/lava/v3/x/plans/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/plans/keeper" + "github.com/lavanet/lava/v4/x/plans/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { diff --git a/x/plans/keeper/params.go b/x/plans/keeper/params.go index 9b6aef6fcf..ca94a9f835 100644 --- a/x/plans/keeper/params.go +++ b/x/plans/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" ) // GetParams get all parameters as types.Params diff --git a/x/plans/keeper/params_test.go b/x/plans/keeper/params_test.go index 2de3feefda..51a68ebd4d 100644 --- a/x/plans/keeper/params_test.go +++ b/x/plans/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/plans/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/plans/keeper/plan.go b/x/plans/keeper/plan.go index 257b64492e..cab1565eda 100644 --- a/x/plans/keeper/plan.go +++ b/x/plans/keeper/plan.go @@ -4,9 +4,9 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/plans/types" ) // AddPlan adds a new plan to the KVStore diff --git a/x/plans/keeper/plan_test.go b/x/plans/keeper/plan_test.go index 22cc49af92..0d509e424b 100644 --- a/x/plans/keeper/plan_test.go +++ b/x/plans/keeper/plan_test.go @@ -6,10 +6,10 @@ import ( "testing" "cosmossdk.io/math" - "github.com/lavanet/lava/v3/testutil/common" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/testutil/common" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/plans/migrations/v3/plan.pb.go b/x/plans/migrations/v3/plan.pb.go index cb16232ee3..a31305618f 100755 --- a/x/plans/migrations/v3/plan.pb.go +++ b/x/plans/migrations/v3/plan.pb.go @@ -8,7 +8,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - v3 "github.com/lavanet/lava/v3/x/projects/migrations/v3" + v3 "github.com/lavanet/lava/v4/x/projects/migrations/v3" io "io" math "math" math_bits "math/bits" diff --git a/x/plans/migrations/v7/plan.pb.go b/x/plans/migrations/v7/plan.pb.go index bdf0b1af9b..4b96aa4473 100755 --- a/x/plans/migrations/v7/plan.pb.go +++ b/x/plans/migrations/v7/plan.pb.go @@ -8,7 +8,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/lavanet/lava/v3/x/spec/types" + _ "github.com/lavanet/lava/v4/x/spec/types" io "io" math "math" math_bits "math/bits" diff --git a/x/plans/migrations/v7/policy.pb.go b/x/plans/migrations/v7/policy.pb.go index 28832a56b1..ec451522d3 100755 --- a/x/plans/migrations/v7/policy.pb.go +++ b/x/plans/migrations/v7/policy.pb.go @@ -8,7 +8,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/spec/types" + types "github.com/lavanet/lava/v4/x/spec/types" io "io" math "math" math_bits "math/bits" diff --git a/x/plans/migrations/v8/plan.pb.go b/x/plans/migrations/v8/plan.pb.go index a5c7e7fbe7..883481d13a 100644 --- a/x/plans/migrations/v8/plan.pb.go +++ b/x/plans/migrations/v8/plan.pb.go @@ -8,7 +8,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/lavanet/lava/v3/x/spec/types" + _ "github.com/lavanet/lava/v4/x/spec/types" io "io" math "math" math_bits "math/bits" diff --git a/x/plans/migrations/v8/policy.pb.go b/x/plans/migrations/v8/policy.pb.go index 5aedb997ce..ed334acfdf 100644 --- a/x/plans/migrations/v8/policy.pb.go +++ b/x/plans/migrations/v8/policy.pb.go @@ -8,7 +8,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/spec/types" + types "github.com/lavanet/lava/v4/x/spec/types" io "io" math "math" math_bits "math/bits" diff --git a/x/plans/migrations/v9/plan.pb.go b/x/plans/migrations/v9/plan.pb.go index db9f8b7ac3..e4f2b01f9b 100644 --- a/x/plans/migrations/v9/plan.pb.go +++ b/x/plans/migrations/v9/plan.pb.go @@ -8,7 +8,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/lavanet/lava/v3/x/spec/types" + _ "github.com/lavanet/lava/v4/x/spec/types" io "io" math "math" math_bits "math/bits" diff --git a/x/plans/migrations/v9/policy.pb.go b/x/plans/migrations/v9/policy.pb.go index e708f6edcc..5a43d1f1f6 100644 --- a/x/plans/migrations/v9/policy.pb.go +++ b/x/plans/migrations/v9/policy.pb.go @@ -8,7 +8,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/spec/types" + types "github.com/lavanet/lava/v4/x/spec/types" io "io" math "math" math_bits "math/bits" diff --git a/x/plans/module.go b/x/plans/module.go index dab6d6c741..51e5b60028 100644 --- a/x/plans/module.go +++ b/x/plans/module.go @@ -16,9 +16,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/plans/client/cli" - "github.com/lavanet/lava/v3/x/plans/keeper" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/client/cli" + "github.com/lavanet/lava/v4/x/plans/keeper" + "github.com/lavanet/lava/v4/x/plans/types" ) var ( diff --git a/x/plans/module_simulation.go b/x/plans/module_simulation.go index 43b31ba52c..229fc02022 100644 --- a/x/plans/module_simulation.go +++ b/x/plans/module_simulation.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - plansimulation "github.com/lavanet/lava/v3/x/plans/simulation" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/testutil/sample" + plansimulation "github.com/lavanet/lava/v4/x/plans/simulation" + "github.com/lavanet/lava/v4/x/plans/types" ) // avoid unused import issue diff --git a/x/plans/proposal_handler.go b/x/plans/proposal_handler.go index 70d66bc612..d8e9268432 100644 --- a/x/plans/proposal_handler.go +++ b/x/plans/proposal_handler.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/plans/keeper" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/plans/keeper" + "github.com/lavanet/lava/v4/x/plans/types" ) // NewPlanProposalsHandler creates a new governance Handler for a Plan diff --git a/x/plans/types/delproposal.go b/x/plans/types/delproposal.go index 14834283ba..b32d144f3a 100644 --- a/x/plans/types/delproposal.go +++ b/x/plans/types/delproposal.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" sdkerrors "cosmossdk.io/errors" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) const ( diff --git a/x/plans/types/errors.go b/x/plans/types/errors.go index d1c36298ca..977627a586 100644 --- a/x/plans/types/errors.go +++ b/x/plans/types/errors.go @@ -4,7 +4,7 @@ package types import ( sdkerrors "cosmossdk.io/errors" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) // x/plan module sentinel errors diff --git a/x/plans/types/expected_keepers.go b/x/plans/types/expected_keepers.go index 7992ed623c..e3435e2942 100644 --- a/x/plans/types/expected_keepers.go +++ b/x/plans/types/expected_keepers.go @@ -3,8 +3,8 @@ package types import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - fixationstoretypes "github.com/lavanet/lava/v3/x/fixationstore/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + fixationstoretypes "github.com/lavanet/lava/v4/x/fixationstore/types" ) type EpochStorageKeeper interface { diff --git a/x/plans/types/genesis.go b/x/plans/types/genesis.go index 3b56abdcd0..b4fc2b66c1 100644 --- a/x/plans/types/genesis.go +++ b/x/plans/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" ) // DefaultIndex is the default capability global index diff --git a/x/plans/types/genesis.pb.go b/x/plans/types/genesis.pb.go index 983cd25cd1..6730d52176 100644 --- a/x/plans/types/genesis.pb.go +++ b/x/plans/types/genesis.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/fixationstore/types" + types "github.com/lavanet/lava/v4/x/fixationstore/types" io "io" math "math" math_bits "math/bits" @@ -98,8 +98,8 @@ var fileDescriptor_714273f6abd9b14c = []byte{ 0x2d, 0x85, 0x1a, 0x04, 0xd3, 0xee, 0xe4, 0x74, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x1a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x28, 0x9e, - 0x2c, 0x33, 0xd6, 0xaf, 0x80, 0x06, 0x45, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x7f, - 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x05, 0x03, 0xb9, 0x79, 0x01, 0x00, 0x00, + 0x2c, 0x33, 0xd1, 0xaf, 0x80, 0x06, 0x45, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x7f, + 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x9d, 0xba, 0xcf, 0x79, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/plans/types/genesis_test.go b/x/plans/types/genesis_test.go index 0e23d4e7e0..8ab0295b73 100644 --- a/x/plans/types/genesis_test.go +++ b/x/plans/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/plans/types/geolocation_test.go b/x/plans/types/geolocation_test.go index d18d541821..a7506e7262 100644 --- a/x/plans/types/geolocation_test.go +++ b/x/plans/types/geolocation_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/utils/lavaslices" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/utils/lavaslices" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/plans/types/params.pb.go b/x/plans/types/params.pb.go index d8899d8303..63fa0cc280 100644 --- a/x/plans/types/params.pb.go +++ b/x/plans/types/params.pb.go @@ -74,9 +74,9 @@ var fileDescriptor_bb70e7895581f8ab = []byte{ 0xf1, 0x71, 0xb1, 0x05, 0x80, 0x75, 0x5a, 0xb1, 0xcc, 0x58, 0x20, 0xcf, 0xe0, 0xe4, 0x74, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x1a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, - 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x28, 0xf6, 0x97, 0x19, 0xeb, 0x57, 0x40, 0x1d, 0x51, 0x52, 0x59, - 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x36, 0xda, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x48, 0x2d, 0x55, - 0x6e, 0xa7, 0x00, 0x00, 0x00, + 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x28, 0xf6, 0x97, 0x99, 0xe8, 0x57, 0x40, 0x1d, 0x51, 0x52, 0x59, + 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x36, 0xda, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xb5, 0xec, + 0x18, 0xa7, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/plans/types/plan.pb.go b/x/plans/types/plan.pb.go index 183a9b882d..2f3682d88a 100644 --- a/x/plans/types/plan.pb.go +++ b/x/plans/types/plan.pb.go @@ -8,7 +8,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/lavanet/lava/v3/x/spec/types" + _ "github.com/lavanet/lava/v4/x/spec/types" io "io" math "math" math_bits "math/bits" @@ -206,45 +206,45 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/plans/plan.proto", fileDescriptor_64c3707a3b09a2e5) } var fileDescriptor_64c3707a3b09a2e5 = []byte{ - // 605 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xcf, 0x6e, 0xd3, 0x30, - 0x1c, 0x6e, 0xda, 0xb4, 0x4b, 0x9d, 0x75, 0x33, 0x86, 0x43, 0xa8, 0x20, 0xa9, 0x38, 0xa0, 0x8a, - 0x43, 0xa2, 0x31, 0x09, 0x89, 0x0b, 0x82, 0x8e, 0x6d, 0x52, 0x35, 0x89, 0x2a, 0xd3, 0x84, 0x04, - 0x48, 0x91, 0xeb, 0x5a, 0xc5, 0xe0, 0xc5, 0x51, 0xe2, 0x96, 0xed, 0x15, 0x38, 0xf1, 0x18, 0x3c, - 0xca, 0x8e, 0x3b, 0x72, 0x8a, 0x50, 0x77, 0xcb, 0x4b, 0x0c, 0xd9, 0xce, 0xd0, 0x0a, 0x88, 0x8b, - 0x3f, 0x7f, 0xbf, 0xef, 0xfb, 0xb5, 0xbf, 0x3f, 0x31, 0x78, 0xc8, 0xf1, 0x12, 0xa7, 0x54, 0x46, - 0x0a, 0xa3, 0x8c, 0xe3, 0xb4, 0xd0, 0x67, 0x98, 0xe5, 0x42, 0x0a, 0x84, 0x6a, 0x39, 0x54, 0x18, - 0x6a, 0xb9, 0x7f, 0x6f, 0x2e, 0xe6, 0x42, 0xcb, 0x91, 0xba, 0x19, 0x67, 0xdf, 0x27, 0xa2, 0x38, - 0x15, 0x45, 0x34, 0xc5, 0x05, 0x8d, 0x96, 0x3b, 0x53, 0x2a, 0xf1, 0x4e, 0x44, 0x04, 0xab, 0x7f, - 0xa9, 0xff, 0x78, 0xed, 0x8f, 0x8a, 0x8c, 0x92, 0x08, 0x67, 0x2c, 0x21, 0x82, 0x73, 0x4a, 0x24, - 0x13, 0x37, 0xbe, 0xe0, 0x5f, 0x05, 0x09, 0xce, 0xc8, 0xb9, 0x31, 0x3c, 0xfa, 0xda, 0x06, 0xf6, - 0x84, 0xe3, 0x14, 0x05, 0xa0, 0xcd, 0xd2, 0x19, 0x3d, 0xf3, 0xac, 0x81, 0x35, 0xec, 0x8e, 0xba, - 0x55, 0x19, 0x98, 0x40, 0x6c, 0x40, 0x19, 0xa6, 0x5c, 0x90, 0xcf, 0x5e, 0x6b, 0x60, 0x0d, 0x6d, - 0x63, 0xd0, 0x81, 0xd8, 0x00, 0x7a, 0x01, 0xda, 0x59, 0xce, 0x08, 0xf5, 0xec, 0x81, 0x35, 0x74, - 0x9f, 0xde, 0x0f, 0x4d, 0x0f, 0xa1, 0xea, 0x21, 0xac, 0x7b, 0x08, 0xf7, 0x04, 0x4b, 0x47, 0xbd, - 0x8b, 0x32, 0x68, 0xa8, 0x7c, 0xed, 0x8f, 0x0d, 0xa0, 0x67, 0xa0, 0x87, 0x39, 0x17, 0x5f, 0x12, - 0xb1, 0xa4, 0xf9, 0xa2, 0xa0, 0x9e, 0x33, 0xb0, 0x86, 0xce, 0xe8, 0x4e, 0x55, 0x06, 0xeb, 0x42, - 0xbc, 0xa9, 0xe9, 0x1b, 0xc3, 0xd0, 0x2e, 0xd8, 0xac, 0x85, 0x24, 0xc7, 0x92, 0x7a, 0x5d, 0x5d, - 0x1f, 0xac, 0xca, 0x60, 0x2d, 0x1e, 0xbb, 0x37, 0xe9, 0x58, 0x52, 0xb4, 0x03, 0xdc, 0x19, 0x2d, - 0x48, 0xce, 0x32, 0x35, 0x2d, 0xcf, 0xd5, 0x4d, 0x6f, 0x57, 0x65, 0x70, 0x3b, 0x1c, 0xdf, 0x26, - 0xe8, 0x01, 0xb0, 0xe5, 0x79, 0x46, 0xbd, 0x4d, 0xed, 0x75, 0xaa, 0x32, 0xd0, 0x3c, 0xd6, 0x27, - 0xfa, 0x00, 0xfa, 0x38, 0x4d, 0x17, 0x98, 0x27, 0x33, 0x56, 0x10, 0xb1, 0x48, 0x65, 0x92, 0xd1, - 0x9c, 0xd0, 0x54, 0xe2, 0x39, 0xf5, 0x7a, 0xba, 0x26, 0xbf, 0x2a, 0x83, 0xff, 0xb8, 0x62, 0xcf, - 0x68, 0xaf, 0x6b, 0x69, 0xf2, 0x5b, 0x41, 0x13, 0xe0, 0xaa, 0xe5, 0x25, 0x66, 0x77, 0xde, 0x96, - 0x9e, 0x70, 0x3f, 0xfc, 0xfb, 0x7b, 0x0a, 0x27, 0xda, 0x31, 0xba, 0x5b, 0x8f, 0xf8, 0x76, 0x5a, - 0x0c, 0x14, 0x31, 0x06, 0xf4, 0x1c, 0x6c, 0x65, 0xb9, 0xf8, 0x44, 0x89, 0x2c, 0x12, 0xce, 0x4e, - 0x99, 0xf4, 0xb6, 0x75, 0x8d, 0xa8, 0x2a, 0x83, 0x3f, 0x94, 0xb8, 0x77, 0xc3, 0x8f, 0x14, 0x55, - 0xa9, 0x7a, 0x01, 0x74, 0x96, 0x4c, 0x17, 0xe7, 0x34, 0x2f, 0x3c, 0x38, 0x68, 0x0d, 0xbb, 0x26, - 0x75, 0x5d, 0x89, 0x7b, 0x35, 0x1f, 0x69, 0x3a, 0xb6, 0x1d, 0x00, 0xdd, 0xb1, 0xed, 0x34, 0x61, - 0x6b, 0x6c, 0x3b, 0x6d, 0xd8, 0x19, 0xdb, 0x4e, 0x07, 0x6e, 0x8c, 0x6d, 0x67, 0x03, 0x3a, 0x4f, - 0xde, 0x03, 0xf7, 0x90, 0x0a, 0x2e, 0x08, 0xd6, 0x03, 0xdf, 0x00, 0xad, 0xc3, 0xa3, 0x63, 0xd8, - 0x50, 0x97, 0x93, 0xe3, 0x3d, 0x68, 0xa1, 0x0e, 0x68, 0xee, 0x9f, 0xc0, 0xa6, 0x09, 0xec, 0x43, - 0xdb, 0x5c, 0xde, 0x42, 0x47, 0x29, 0xaf, 0x0e, 0x20, 0xd4, 0x78, 0x0c, 0x07, 0x1a, 0x4f, 0xe0, - 0x4b, 0xe4, 0x80, 0xe6, 0xe1, 0x11, 0xbc, 0xbe, 0x6e, 0x8d, 0x0e, 0xbe, 0xaf, 0x7c, 0xeb, 0x62, - 0xe5, 0x5b, 0x97, 0x2b, 0xdf, 0xfa, 0xb9, 0xf2, 0xad, 0x6f, 0x57, 0x7e, 0xe3, 0xf2, 0xca, 0x6f, - 0xfc, 0xb8, 0xf2, 0x1b, 0xef, 0x86, 0x73, 0x26, 0x3f, 0x2e, 0xa6, 0x21, 0x11, 0xa7, 0xd1, 0xda, - 0x9b, 0x59, 0xee, 0x46, 0x67, 0xf5, 0xc3, 0x51, 0x7b, 0x2e, 0xa6, 0x1d, 0xfd, 0x70, 0x76, 0x7f, - 0x05, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x34, 0x06, 0x77, 0xec, 0x03, 0x00, 0x00, + // 607 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0x4f, 0x6f, 0xd3, 0x3e, + 0x18, 0x6e, 0xda, 0xb4, 0x4b, 0x9d, 0x75, 0xf3, 0xcf, 0x3f, 0x0e, 0xa1, 0x82, 0xa4, 0xe2, 0x80, + 0x2a, 0x0e, 0x89, 0xc6, 0x10, 0x12, 0x17, 0x04, 0x1d, 0xdb, 0xa4, 0x6a, 0x12, 0x55, 0xa6, 0x09, + 0x09, 0x90, 0x22, 0xd7, 0xb5, 0x8a, 0xc1, 0x8b, 0xa3, 0xc4, 0x2d, 0xdb, 0x57, 0xe0, 0xc4, 0xc7, + 0xe0, 0xa3, 0xec, 0xb8, 0x23, 0xa7, 0x08, 0x75, 0xb7, 0x7c, 0x89, 0x21, 0xdb, 0x19, 0x5a, 0x01, + 0x71, 0xf1, 0xe3, 0xe7, 0x7d, 0x9e, 0xb7, 0x7d, 0xff, 0xc4, 0xe0, 0x3e, 0xc7, 0x4b, 0x9c, 0x52, + 0x19, 0x29, 0x8c, 0x32, 0x8e, 0xd3, 0x42, 0x9f, 0x61, 0x96, 0x0b, 0x29, 0x10, 0xaa, 0xe5, 0x50, + 0x61, 0xa8, 0xe5, 0xfe, 0x9d, 0xb9, 0x98, 0x0b, 0x2d, 0x47, 0xea, 0x66, 0x9c, 0x7d, 0x9f, 0x88, + 0xe2, 0x54, 0x14, 0xd1, 0x14, 0x17, 0x34, 0x5a, 0xee, 0x4c, 0xa9, 0xc4, 0x3b, 0x11, 0x11, 0xac, + 0xfe, 0xa5, 0xfe, 0xc3, 0xb5, 0x3f, 0x2a, 0x32, 0x4a, 0x22, 0x9c, 0xb1, 0x84, 0x08, 0xce, 0x29, + 0x91, 0x4c, 0xdc, 0xf8, 0x82, 0xbf, 0x15, 0x24, 0x38, 0x23, 0xe7, 0xc6, 0xf0, 0xe0, 0x4b, 0x1b, + 0xd8, 0x13, 0x8e, 0x53, 0x14, 0x80, 0x36, 0x4b, 0x67, 0xf4, 0xcc, 0xb3, 0x06, 0xd6, 0xb0, 0x3b, + 0xea, 0x56, 0x65, 0x60, 0x02, 0xb1, 0x01, 0x65, 0x98, 0x72, 0x41, 0x3e, 0x79, 0xad, 0x81, 0x35, + 0xb4, 0x8d, 0x41, 0x07, 0x62, 0x03, 0xe8, 0x39, 0x68, 0x67, 0x39, 0x23, 0xd4, 0xb3, 0x07, 0xd6, + 0xd0, 0x7d, 0x7c, 0x37, 0x34, 0x3d, 0x84, 0xaa, 0x87, 0xb0, 0xee, 0x21, 0xdc, 0x13, 0x2c, 0x1d, + 0xf5, 0x2e, 0xca, 0xa0, 0xa1, 0xf2, 0xb5, 0x3f, 0x36, 0x80, 0x9e, 0x82, 0x1e, 0xe6, 0x5c, 0x7c, + 0x4e, 0xc4, 0x92, 0xe6, 0x8b, 0x82, 0x7a, 0xce, 0xc0, 0x1a, 0x3a, 0xa3, 0xff, 0xaa, 0x32, 0x58, + 0x17, 0xe2, 0x4d, 0x4d, 0x5f, 0x1b, 0x86, 0x76, 0xc1, 0x66, 0x2d, 0x24, 0x39, 0x96, 0xd4, 0xeb, + 0xea, 0xfa, 0x60, 0x55, 0x06, 0x6b, 0xf1, 0xd8, 0xbd, 0x49, 0xc7, 0x92, 0xa2, 0x1d, 0xe0, 0xce, + 0x68, 0x41, 0x72, 0x96, 0xa9, 0x69, 0x79, 0xae, 0x6e, 0x7a, 0xbb, 0x2a, 0x83, 0xdb, 0xe1, 0xf8, + 0x36, 0x41, 0xf7, 0x80, 0x2d, 0xcf, 0x33, 0xea, 0x6d, 0x6a, 0xaf, 0x53, 0x95, 0x81, 0xe6, 0xb1, + 0x3e, 0xd1, 0x7b, 0xd0, 0xc7, 0x69, 0xba, 0xc0, 0x3c, 0x99, 0xb1, 0x82, 0x88, 0x45, 0x2a, 0x93, + 0x8c, 0xe6, 0x84, 0xa6, 0x12, 0xcf, 0xa9, 0xd7, 0xd3, 0x35, 0xf9, 0x55, 0x19, 0xfc, 0xc3, 0x15, + 0x7b, 0x46, 0x7b, 0x55, 0x4b, 0x93, 0x5f, 0x0a, 0x9a, 0x00, 0x57, 0x2d, 0x2f, 0x31, 0xbb, 0xf3, + 0xb6, 0xf4, 0x84, 0xfb, 0xe1, 0x9f, 0xdf, 0x53, 0x38, 0xd1, 0x8e, 0xd1, 0xff, 0xf5, 0x88, 0x6f, + 0xa7, 0xc5, 0x40, 0x11, 0x63, 0x40, 0xcf, 0xc0, 0x56, 0x96, 0x8b, 0x8f, 0x94, 0xc8, 0x22, 0xe1, + 0xec, 0x94, 0x49, 0x6f, 0x5b, 0xd7, 0x88, 0xaa, 0x32, 0xf8, 0x4d, 0x89, 0x7b, 0x37, 0xfc, 0x48, + 0x51, 0x95, 0xaa, 0x17, 0x40, 0x67, 0xc9, 0x74, 0x71, 0x4e, 0xf3, 0xc2, 0x83, 0x83, 0xd6, 0xb0, + 0x6b, 0x52, 0xd7, 0x95, 0xb8, 0x57, 0xf3, 0x91, 0xa6, 0x63, 0xdb, 0x01, 0xd0, 0x1d, 0xdb, 0x4e, + 0x13, 0xb6, 0xc6, 0xb6, 0xd3, 0x86, 0x9d, 0xb1, 0xed, 0x74, 0xe0, 0xc6, 0xd8, 0x76, 0x36, 0xa0, + 0xf3, 0xe8, 0x1d, 0x70, 0x0f, 0xa9, 0xe0, 0x82, 0x60, 0x3d, 0xf0, 0x0d, 0xd0, 0x3a, 0x3c, 0x3a, + 0x86, 0x0d, 0x75, 0x39, 0x39, 0xde, 0x83, 0x16, 0xea, 0x80, 0xe6, 0xfe, 0x09, 0x6c, 0x9a, 0xc0, + 0x3e, 0xb4, 0xcd, 0xe5, 0x0d, 0x74, 0x94, 0xf2, 0xf2, 0x00, 0x42, 0x8d, 0xc7, 0x70, 0xa0, 0xf1, + 0x04, 0xbe, 0x40, 0x0e, 0x68, 0x1e, 0x1e, 0xc1, 0xeb, 0xeb, 0xd6, 0xe8, 0xe0, 0xdb, 0xca, 0xb7, + 0x2e, 0x56, 0xbe, 0x75, 0xb9, 0xf2, 0xad, 0x1f, 0x2b, 0xdf, 0xfa, 0x7a, 0xe5, 0x37, 0x2e, 0xaf, + 0xfc, 0xc6, 0xf7, 0x2b, 0xbf, 0xf1, 0x76, 0x38, 0x67, 0xf2, 0xc3, 0x62, 0x1a, 0x12, 0x71, 0x1a, + 0xad, 0xbd, 0x99, 0xe5, 0x93, 0xe8, 0xac, 0x7e, 0x38, 0x6a, 0xcf, 0xc5, 0xb4, 0xa3, 0x1f, 0xce, + 0xee, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa1, 0xac, 0xbf, 0x01, 0xec, 0x03, 0x00, 0x00, } func (this *Plan) Equal(that interface{}) bool { diff --git a/x/plans/types/plan_decode_test.go b/x/plans/types/plan_decode_test.go index a7a14ddfce..5e892702a0 100644 --- a/x/plans/types/plan_decode_test.go +++ b/x/plans/types/plan_decode_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/types" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/utils/decoder" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/utils/decoder" "github.com/mitchellh/mapstructure" "github.com/stretchr/testify/require" ) diff --git a/x/plans/types/plans_proposal.pb.go b/x/plans/types/plans_proposal.pb.go index 6643d4ad39..ab07a9093c 100644 --- a/x/plans/types/plans_proposal.pb.go +++ b/x/plans/types/plans_proposal.pb.go @@ -128,8 +128,8 @@ var fileDescriptor_781f7efff31affc8 = []byte{ 0x9a, 0x89, 0xec, 0x6e, 0x84, 0x9b, 0x9c, 0xdc, 0x56, 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, - 0xfc, 0x5c, 0x7d, 0x94, 0x18, 0x2b, 0x33, 0xd6, 0xaf, 0x80, 0x46, 0x5b, 0x49, 0x65, 0x41, 0x6a, - 0x71, 0x12, 0x1b, 0x38, 0xe2, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x67, 0x6f, 0xc1, 0xdc, + 0xfc, 0x5c, 0x7d, 0x94, 0x18, 0x2b, 0x33, 0xd1, 0xaf, 0x80, 0x46, 0x5b, 0x49, 0x65, 0x41, 0x6a, + 0x71, 0x12, 0x1b, 0x38, 0xe2, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xf7, 0x78, 0xaa, 0x2c, 0x02, 0x00, 0x00, } diff --git a/x/plans/types/policy.go b/x/plans/types/policy.go index c95891fd2a..0efe9edcd0 100644 --- a/x/plans/types/policy.go +++ b/x/plans/types/policy.go @@ -11,9 +11,9 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils/decoder" - "github.com/lavanet/lava/v3/utils/lavaslices" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" + "github.com/lavanet/lava/v4/utils/decoder" + "github.com/lavanet/lava/v4/utils/lavaslices" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" "github.com/mitchellh/mapstructure" ) diff --git a/x/plans/types/policy.pb.go b/x/plans/types/policy.pb.go index 564972fb3b..6e6abf096d 100644 --- a/x/plans/types/policy.pb.go +++ b/x/plans/types/policy.pb.go @@ -8,7 +8,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/spec/types" + types "github.com/lavanet/lava/v4/x/spec/types" io "io" math "math" math_bits "math/bits" @@ -280,50 +280,50 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/plans/policy.proto", fileDescriptor_c2388e0faa8deb9b) } var fileDescriptor_c2388e0faa8deb9b = []byte{ - // 680 bytes of a gzipped FileDescriptorProto + // 681 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xcd, 0x6e, 0xda, 0x4a, 0x18, 0x65, 0x02, 0x24, 0x30, 0x10, 0xc4, 0x9d, 0x9b, 0x1f, 0xdf, 0xdc, 0xca, 0xa6, 0x51, 0xd5, - 0xa2, 0x56, 0xb2, 0x95, 0x64, 0xd3, 0x6d, 0x8c, 0x5d, 0x15, 0x89, 0x34, 0x68, 0x48, 0xd2, 0xa8, - 0x8b, 0x58, 0x83, 0x99, 0x92, 0x91, 0x6c, 0xc6, 0xc5, 0x06, 0x91, 0x5d, 0x1f, 0xa1, 0x8f, 0xd1, - 0x07, 0xe8, 0xaa, 0x8b, 0xae, 0xb3, 0xcc, 0xb2, 0x2b, 0xab, 0x22, 0x3b, 0x3f, 0x45, 0xe5, 0xe1, - 0xd7, 0x09, 0xd9, 0x30, 0xdf, 0xcf, 0x39, 0xdf, 0x77, 0x80, 0x33, 0x03, 0x15, 0x87, 0x0c, 0x49, - 0x8f, 0x06, 0x5a, 0x7c, 0x6a, 0x9e, 0x43, 0x7a, 0xbe, 0xe6, 0x71, 0x87, 0xd9, 0x37, 0xaa, 0xd7, - 0xe7, 0x01, 0x47, 0x68, 0x0a, 0x50, 0xe3, 0x53, 0x15, 0x80, 0xbd, 0xad, 0x2e, 0xef, 0x72, 0xd1, - 0xd6, 0xe2, 0x68, 0x82, 0xdc, 0x93, 0x6d, 0xee, 0xbb, 0xdc, 0xd7, 0xda, 0xc4, 0xa7, 0xda, 0xf0, - 0xa0, 0x4d, 0x03, 0x72, 0xa0, 0xd9, 0x9c, 0xf5, 0xa6, 0xfd, 0x97, 0x89, 0x55, 0xbe, 0x47, 0x6d, - 0x8d, 0x78, 0xcc, 0xb2, 0xb9, 0xe3, 0x50, 0x3b, 0x60, 0x7c, 0x8a, 0xdb, 0xff, 0x95, 0x81, 0xeb, - 0x4d, 0x21, 0x01, 0x5d, 0xc1, 0x92, 0x7d, 0x4d, 0x58, 0xcf, 0x12, 0x92, 0x18, 0xf5, 0x25, 0x50, - 0x49, 0x57, 0x0b, 0x87, 0x8a, 0xfa, 0x58, 0x95, 0x5a, 0x8b, 0x91, 0x13, 0xa2, 0xbe, 0x73, 0x1b, - 0x2a, 0xa9, 0x28, 0x54, 0x1e, 0xd0, 0xf1, 0xa6, 0x3d, 0x07, 0x31, 0xea, 0xa3, 0xf7, 0xf0, 0xdf, - 0x2e, 0xe5, 0x0e, 0xb7, 0x49, 0xbc, 0xdf, 0xf2, 0xfa, 0xfc, 0x33, 0x73, 0xa8, 0xb4, 0x56, 0x01, - 0xd5, 0xac, 0xbe, 0x1b, 0x85, 0xca, 0xaa, 0x36, 0x46, 0x4b, 0xc5, 0xe6, 0xa4, 0x86, 0xde, 0xc2, - 0x52, 0xc0, 0x03, 0xe2, 0x58, 0xf6, 0xc0, 0x72, 0x98, 0xcb, 0x02, 0x29, 0x5d, 0x01, 0xd5, 0x8c, - 0x8e, 0x62, 0x11, 0xc9, 0x0e, 0x2e, 0x8a, 0xbc, 0x36, 0x68, 0xc4, 0x59, 0xcc, 0xa4, 0x1e, 0xb7, - 0xaf, 0x17, 0xcc, 0xcc, 0x82, 0x99, 0xec, 0xe0, 0xa2, 0xc8, 0x67, 0xcc, 0x06, 0xdc, 0x76, 0xc9, - 0x28, 0x96, 0x35, 0x64, 0x1d, 0xda, 0xf7, 0xad, 0x80, 0x5b, 0x1e, 0x61, 0x7d, 0x29, 0x2b, 0x06, - 0xfc, 0x17, 0x85, 0xca, 0x6a, 0x00, 0x46, 0x2e, 0x19, 0x35, 0x67, 0xd5, 0x33, 0xde, 0x24, 0xac, - 0x8f, 0xbe, 0x02, 0xb8, 0xeb, 0xd3, 0xf8, 0xaf, 0xa0, 0x9d, 0x25, 0x8a, 0xcb, 0x3b, 0x54, 0x5a, - 0xaf, 0x80, 0x6a, 0xe9, 0xf0, 0xcd, 0xaa, 0x5f, 0xbd, 0x65, 0x36, 0xcc, 0xda, 0x99, 0x69, 0x58, - 0x4d, 0x7c, 0x7a, 0x51, 0x37, 0x4c, 0xdc, 0xb2, 0x4e, 0x4e, 0x0d, 0x53, 0xff, 0x3f, 0x0a, 0x95, - 0xa7, 0xe6, 0xe1, 0xed, 0x59, 0x63, 0x2e, 0xe2, 0x84, 0x77, 0x28, 0x32, 0x21, 0x7a, 0xcc, 0x90, - 0x36, 0x2a, 0xe9, 0x6a, 0x5e, 0xdf, 0x89, 0x42, 0x65, 0x45, 0x17, 0xff, 0xf3, 0x68, 0xd4, 0xfe, - 0x0f, 0x00, 0x0b, 0x4b, 0x66, 0x40, 0xaf, 0x60, 0x6e, 0x62, 0x03, 0xd6, 0x91, 0x40, 0x05, 0x54, - 0xf3, 0x7a, 0x31, 0x0a, 0x95, 0x79, 0x0d, 0x6f, 0x88, 0xa8, 0xde, 0x41, 0xcf, 0x60, 0x86, 0x78, - 0xcc, 0x97, 0xd6, 0xc4, 0xc6, 0x5c, 0x14, 0x2a, 0x22, 0xc7, 0xe2, 0x13, 0x5d, 0xc1, 0x62, 0x9f, - 0x7e, 0x19, 0xb0, 0x3e, 0x75, 0x69, 0x2f, 0xf0, 0xa5, 0xb4, 0xb0, 0xe2, 0x8b, 0x27, 0xad, 0x88, - 0x17, 0x60, 0x7d, 0x6b, 0xea, 0xc7, 0xc4, 0x04, 0x9c, 0xc8, 0xf6, 0x7f, 0x02, 0x58, 0x7e, 0x48, - 0x44, 0xe7, 0x10, 0x2e, 0x2e, 0x88, 0x50, 0x5f, 0x38, 0x7c, 0x9e, 0x5c, 0x19, 0xdf, 0x24, 0xb5, - 0x36, 0x07, 0x19, 0x24, 0x20, 0x3a, 0x9a, 0xee, 0x5b, 0x22, 0xe3, 0xa5, 0x18, 0xa9, 0x10, 0xd2, - 0x51, 0x40, 0x7b, 0x3e, 0xe3, 0xbd, 0xd9, 0xf7, 0x2d, 0xc5, 0xf8, 0x45, 0x15, 0x2f, 0xc5, 0x48, - 0x81, 0x59, 0x97, 0x8d, 0x68, 0x47, 0xb8, 0x3a, 0xa7, 0xe7, 0xa3, 0x50, 0x99, 0x14, 0xf0, 0xe4, - 0x78, 0xfd, 0x01, 0xee, 0x3e, 0xe1, 0x04, 0x54, 0x80, 0x1b, 0xc7, 0x8d, 0xc6, 0xe9, 0x47, 0xd3, - 0x28, 0xa7, 0x50, 0x1e, 0x66, 0x4f, 0xea, 0x97, 0xa6, 0x51, 0x06, 0x68, 0x13, 0xe6, 0xcd, 0xcb, - 0x5a, 0xe3, 0xbc, 0x55, 0xbf, 0x30, 0xcb, 0x6b, 0xa8, 0x08, 0x73, 0x46, 0xbd, 0x75, 0xac, 0x37, - 0x4c, 0xa3, 0x9c, 0xd6, 0xdf, 0x7d, 0x1f, 0xcb, 0xe0, 0x76, 0x2c, 0x83, 0xbb, 0xb1, 0x0c, 0xfe, - 0x8c, 0x65, 0xf0, 0xed, 0x5e, 0x4e, 0xdd, 0xdd, 0xcb, 0xa9, 0xdf, 0xf7, 0x72, 0xea, 0x53, 0xb5, - 0xcb, 0x82, 0xeb, 0x41, 0x5b, 0xb5, 0xb9, 0xab, 0x25, 0x5e, 0x95, 0xe1, 0x91, 0x36, 0x9a, 0xbe, - 0x62, 0xc1, 0x8d, 0x47, 0xfd, 0xf6, 0xba, 0x78, 0x53, 0x8e, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, - 0x5e, 0x42, 0x45, 0xb0, 0xe8, 0x04, 0x00, 0x00, + 0xa2, 0x56, 0xb2, 0x95, 0xb4, 0x8b, 0x6e, 0x63, 0xec, 0xaa, 0x48, 0xa4, 0x41, 0x43, 0x92, 0x46, + 0x5d, 0xc4, 0x1a, 0xcc, 0x94, 0x8c, 0x64, 0x33, 0x2e, 0x36, 0x88, 0xec, 0xfa, 0x08, 0x7d, 0x8c, + 0x3e, 0x40, 0x57, 0x5d, 0x74, 0x9d, 0x65, 0x96, 0x5d, 0x59, 0x15, 0xd9, 0xf9, 0x29, 0x2a, 0x0f, + 0xbf, 0x4e, 0xc8, 0x86, 0xf9, 0x7e, 0xce, 0xf9, 0xbe, 0x03, 0x9c, 0x19, 0xa8, 0x38, 0x64, 0x48, + 0x7a, 0x34, 0xd0, 0xe2, 0x53, 0xf3, 0x1c, 0xd2, 0xf3, 0x35, 0x8f, 0x3b, 0xcc, 0xbe, 0x56, 0xbd, + 0x3e, 0x0f, 0x38, 0x42, 0x53, 0x80, 0x1a, 0x9f, 0xaa, 0x00, 0xec, 0x6d, 0x75, 0x79, 0x97, 0x8b, + 0xb6, 0x16, 0x47, 0x13, 0xe4, 0x9e, 0x6c, 0x73, 0xdf, 0xe5, 0xbe, 0xd6, 0x26, 0x3e, 0xd5, 0x86, + 0x07, 0x6d, 0x1a, 0x90, 0x03, 0xcd, 0xe6, 0xac, 0x37, 0xed, 0x3f, 0x4f, 0xac, 0xf2, 0x3d, 0x6a, + 0x6b, 0xc4, 0x63, 0x96, 0xcd, 0x1d, 0x87, 0xda, 0x01, 0xe3, 0x53, 0xdc, 0xfe, 0xaf, 0x0c, 0x5c, + 0x6f, 0x0a, 0x09, 0xe8, 0x12, 0x96, 0xec, 0x2b, 0xc2, 0x7a, 0x96, 0x90, 0xc4, 0xa8, 0x2f, 0x81, + 0x4a, 0xba, 0x5a, 0x38, 0x54, 0xd4, 0x87, 0xaa, 0xd4, 0x5a, 0x8c, 0x9c, 0x10, 0xf5, 0x9d, 0x9b, + 0x50, 0x49, 0x45, 0xa1, 0x72, 0x8f, 0x8e, 0x37, 0xed, 0x39, 0x88, 0x51, 0x1f, 0xbd, 0x87, 0xff, + 0x76, 0x29, 0x77, 0xb8, 0x4d, 0xe2, 0xfd, 0x96, 0xd7, 0xe7, 0x9f, 0x99, 0x43, 0xa5, 0xb5, 0x0a, + 0xa8, 0x66, 0xf5, 0xdd, 0x28, 0x54, 0x56, 0xb5, 0x31, 0x5a, 0x2a, 0x36, 0x27, 0x35, 0xf4, 0x16, + 0x96, 0x02, 0x1e, 0x10, 0xc7, 0xb2, 0x07, 0x96, 0xc3, 0x5c, 0x16, 0x48, 0xe9, 0x0a, 0xa8, 0x66, + 0x74, 0x14, 0x8b, 0x48, 0x76, 0x70, 0x51, 0xe4, 0xb5, 0x41, 0x23, 0xce, 0x62, 0x26, 0xf5, 0xb8, + 0x7d, 0xb5, 0x60, 0x66, 0x16, 0xcc, 0x64, 0x07, 0x17, 0x45, 0x3e, 0x63, 0x36, 0xe0, 0xb6, 0x4b, + 0x46, 0xb1, 0xac, 0x21, 0xeb, 0xd0, 0xbe, 0x6f, 0x05, 0xdc, 0xf2, 0x08, 0xeb, 0x4b, 0x59, 0x31, + 0xe0, 0xbf, 0x28, 0x54, 0x56, 0x03, 0x30, 0x72, 0xc9, 0xa8, 0x39, 0xab, 0x9e, 0xf2, 0x26, 0x61, + 0x7d, 0xf4, 0x15, 0xc0, 0x5d, 0x9f, 0xc6, 0x7f, 0x05, 0xed, 0x2c, 0x51, 0x5c, 0xde, 0xa1, 0xd2, + 0x7a, 0x05, 0x54, 0x4b, 0x87, 0xaf, 0x56, 0xfd, 0xea, 0x2d, 0xb3, 0x61, 0xd6, 0x4e, 0x4d, 0xc3, + 0x6a, 0xe2, 0x93, 0xf3, 0xba, 0x61, 0xe2, 0x96, 0x75, 0x7c, 0x62, 0x98, 0xfa, 0xff, 0x51, 0xa8, + 0x3c, 0x36, 0x0f, 0x6f, 0xcf, 0x1a, 0x73, 0x11, 0xc7, 0xbc, 0x43, 0x91, 0x09, 0xd1, 0x43, 0x86, + 0xb4, 0x51, 0x49, 0x57, 0xf3, 0xfa, 0x4e, 0x14, 0x2a, 0x2b, 0xba, 0xf8, 0x9f, 0x07, 0xa3, 0xf6, + 0x7f, 0x00, 0x58, 0x58, 0x32, 0x03, 0x7a, 0x01, 0x73, 0x13, 0x1b, 0xb0, 0x8e, 0x04, 0x2a, 0xa0, + 0x9a, 0xd7, 0x8b, 0x51, 0xa8, 0xcc, 0x6b, 0x78, 0x43, 0x44, 0xf5, 0x0e, 0x7a, 0x02, 0x33, 0xc4, + 0x63, 0xbe, 0xb4, 0x26, 0x36, 0xe6, 0xa2, 0x50, 0x11, 0x39, 0x16, 0x9f, 0xe8, 0x12, 0x16, 0xfb, + 0xf4, 0xcb, 0x80, 0xf5, 0xa9, 0x4b, 0x7b, 0x81, 0x2f, 0xa5, 0x85, 0x15, 0x9f, 0x3d, 0x6a, 0x45, + 0xbc, 0x00, 0xeb, 0x5b, 0x53, 0x3f, 0x26, 0x26, 0xe0, 0x44, 0xb6, 0xff, 0x13, 0xc0, 0xf2, 0x7d, + 0x22, 0x3a, 0x83, 0x70, 0x71, 0x41, 0x84, 0xfa, 0xc2, 0xe1, 0xd3, 0xe4, 0xca, 0xf8, 0x26, 0xa9, + 0xb5, 0x39, 0xc8, 0x20, 0x01, 0xd1, 0xd1, 0x74, 0xdf, 0x12, 0x19, 0x2f, 0xc5, 0x48, 0x85, 0x90, + 0x8e, 0x02, 0xda, 0xf3, 0x19, 0xef, 0xcd, 0xbe, 0x6f, 0x29, 0xc6, 0x2f, 0xaa, 0x78, 0x29, 0x46, + 0x0a, 0xcc, 0xba, 0x6c, 0x44, 0x3b, 0xc2, 0xd5, 0x39, 0x3d, 0x1f, 0x85, 0xca, 0xa4, 0x80, 0x27, + 0xc7, 0xcb, 0x0f, 0x70, 0xf7, 0x11, 0x27, 0xa0, 0x02, 0xdc, 0x38, 0x6a, 0x34, 0x4e, 0x3e, 0x9a, + 0x46, 0x39, 0x85, 0xf2, 0x30, 0x7b, 0x5c, 0xbf, 0x30, 0x8d, 0x32, 0x40, 0x9b, 0x30, 0x6f, 0x5e, + 0xd4, 0x1a, 0x67, 0xad, 0xfa, 0xb9, 0x59, 0x5e, 0x43, 0x45, 0x98, 0x33, 0xea, 0xad, 0x23, 0xbd, + 0x61, 0x1a, 0xe5, 0xb4, 0xfe, 0xee, 0xfb, 0x58, 0x06, 0x37, 0x63, 0x19, 0xdc, 0x8e, 0x65, 0xf0, + 0x67, 0x2c, 0x83, 0x6f, 0x77, 0x72, 0xea, 0xf6, 0x4e, 0x4e, 0xfd, 0xbe, 0x93, 0x53, 0x9f, 0xaa, + 0x5d, 0x16, 0x5c, 0x0d, 0xda, 0xaa, 0xcd, 0x5d, 0x2d, 0xf1, 0xaa, 0x0c, 0xdf, 0x68, 0xa3, 0xe9, + 0x2b, 0x16, 0x5c, 0x7b, 0xd4, 0x6f, 0xaf, 0x8b, 0x37, 0xe5, 0xf5, 0xdf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xf0, 0xda, 0xfc, 0xc6, 0xe8, 0x04, 0x00, 0x00, } func (this *Policy) Equal(that interface{}) bool { diff --git a/x/plans/types/query.pb.go b/x/plans/types/query.pb.go index af308f2eee..1927f6f0ef 100644 --- a/x/plans/types/query.pb.go +++ b/x/plans/types/query.pb.go @@ -358,38 +358,38 @@ var fileDescriptor_060142fb85a7e3eb = []byte{ // 539 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x5d, 0x6b, 0x13, 0x41, 0x14, 0xcd, 0x36, 0x1f, 0x98, 0x09, 0x88, 0x8e, 0x79, 0x58, 0x97, 0x76, 0x1b, 0x16, 0x6b, 0x83, - 0xe0, 0x0c, 0x49, 0x11, 0x04, 0xdf, 0xe2, 0x83, 0x14, 0x04, 0x6b, 0x7c, 0x13, 0xa1, 0x4c, 0xb6, - 0x93, 0x75, 0x60, 0x33, 0xb3, 0xdd, 0x99, 0x84, 0x16, 0x29, 0x42, 0x7e, 0x81, 0xe0, 0x9f, 0xea, - 0x63, 0xc1, 0x17, 0x9f, 0x44, 0x12, 0x7f, 0x88, 0xcc, 0xc7, 0xd2, 0x0d, 0xdd, 0xb6, 0x4f, 0x93, - 0xdc, 0x7b, 0xee, 0x39, 0x67, 0xce, 0x9d, 0x05, 0x61, 0x4a, 0x16, 0x84, 0x53, 0x85, 0xf5, 0x89, - 0xb3, 0x94, 0x70, 0x89, 0x4f, 0xe7, 0x34, 0x3f, 0x47, 0x59, 0x2e, 0x94, 0x80, 0xd0, 0xf5, 0x91, - 0x3e, 0x91, 0xe9, 0x07, 0xdd, 0x44, 0x24, 0xc2, 0xb4, 0xb1, 0xfe, 0x65, 0x91, 0xc1, 0x76, 0x22, - 0x44, 0x92, 0x52, 0x4c, 0x32, 0x86, 0x09, 0xe7, 0x42, 0x11, 0xc5, 0x04, 0x97, 0xae, 0xfb, 0x22, - 0x16, 0x72, 0x26, 0x24, 0x9e, 0x10, 0x49, 0xad, 0x00, 0x5e, 0x0c, 0x26, 0x54, 0x91, 0x01, 0xce, - 0x48, 0xc2, 0xb8, 0x01, 0x3b, 0xec, 0x6e, 0x85, 0xa7, 0x8c, 0xe4, 0x64, 0x56, 0x90, 0x85, 0x65, - 0xb2, 0x82, 0x26, 0x16, 0xac, 0x20, 0xd8, 0xa9, 0x22, 0x48, 0x89, 0x6b, 0x47, 0x5d, 0x00, 0x3f, - 0x6a, 0x07, 0x47, 0x86, 0x73, 0x4c, 0x4f, 0xe7, 0x54, 0xaa, 0xe8, 0x03, 0x78, 0xb2, 0x51, 0x95, - 0x99, 0xe0, 0x92, 0xc2, 0xd7, 0xa0, 0x65, 0xb5, 0x7d, 0xaf, 0xe7, 0xf5, 0x3b, 0xc3, 0x00, 0xdd, - 0x4c, 0x04, 0xd9, 0x99, 0x51, 0xe3, 0xf2, 0xcf, 0x6e, 0x6d, 0xec, 0xf0, 0x11, 0x04, 0x8f, 0x0c, - 0xe1, 0x7b, 0x26, 0x55, 0x21, 0xf2, 0x05, 0x3c, 0x2e, 0xd5, 0x9c, 0xc4, 0x3b, 0x00, 0x0c, 0xcd, - 0x31, 0xe3, 0x53, 0xe1, 0x7b, 0xbd, 0x7a, 0xbf, 0x33, 0x8c, 0xaa, 0x64, 0xf4, 0xd4, 0x21, 0x9f, - 0x8a, 0x4f, 0x2a, 0x9f, 0xc7, 0xca, 0xc9, 0xb5, 0x4d, 0x4f, 0x97, 0xa3, 0xef, 0xe0, 0xe1, 0x26, - 0x04, 0x76, 0x41, 0x93, 0xf1, 0x13, 0x7a, 0x66, 0xcc, 0xb7, 0xc7, 0xf6, 0x0f, 0xec, 0x81, 0xce, - 0x09, 0x95, 0x71, 0xce, 0x32, 0x9d, 0xba, 0xbf, 0x65, 0x7a, 0xe5, 0x12, 0x7c, 0x05, 0x9a, 0x59, - 0xce, 0x62, 0xea, 0xd7, 0xcd, 0xa5, 0x9f, 0x22, 0x9b, 0x38, 0xd2, 0x89, 0x23, 0x97, 0x38, 0x7a, - 0x2b, 0x18, 0x77, 0x26, 0x2c, 0x3a, 0x1a, 0xb8, 0x2b, 0x6b, 0x07, 0xee, 0xca, 0x70, 0xc7, 0xde, - 0xee, 0xb8, 0xec, 0xc3, 0x78, 0x3e, 0xd4, 0x85, 0xe8, 0xc8, 0x25, 0x62, 0x47, 0x5c, 0x22, 0x6f, - 0x40, 0xdb, 0xcd, 0x98, 0x40, 0xb4, 0x05, 0xbf, 0x32, 0xf7, 0x94, 0x14, 0x0e, 0x1e, 0x58, 0xca, - 0xa9, 0x18, 0x2e, 0xeb, 0xa0, 0x69, 0x28, 0xe1, 0x05, 0x68, 0xd9, 0xcd, 0xc0, 0xe7, 0x55, 0xd3, - 0x37, 0x1f, 0x41, 0xb0, 0x7f, 0x2f, 0xce, 0x3a, 0x8c, 0xa2, 0xe5, 0xaf, 0x7f, 0x3f, 0xb7, 0xb6, - 0x61, 0x80, 0x6f, 0x7d, 0xac, 0x70, 0x0e, 0x1a, 0x7a, 0x1d, 0xf0, 0xd9, 0xad, 0xa4, 0xa5, 0xa7, - 0x11, 0xec, 0xdd, 0x83, 0x72, 0xc2, 0x3d, 0x23, 0x1c, 0x40, 0xbf, 0x4a, 0x38, 0xd5, 0x72, 0x4b, - 0x0f, 0x34, 0x74, 0x10, 0x77, 0xe8, 0x96, 0xf6, 0x73, 0x87, 0x6e, 0x79, 0x25, 0xd1, 0x4b, 0xa3, - 0xbb, 0x0f, 0xf7, 0xaa, 0x74, 0xf5, 0x9e, 0xf0, 0xb7, 0xeb, 0x35, 0x5f, 0x8c, 0x46, 0x97, 0xab, - 0xd0, 0xbb, 0x5a, 0x85, 0xde, 0xdf, 0x55, 0xe8, 0xfd, 0x58, 0x87, 0xb5, 0xab, 0x75, 0x58, 0xfb, - 0xbd, 0x0e, 0x6b, 0x9f, 0xfb, 0x09, 0x53, 0x5f, 0xe7, 0x13, 0x14, 0x8b, 0xd9, 0x26, 0xd5, 0xe2, - 0x00, 0x9f, 0x39, 0x3e, 0x75, 0x9e, 0x51, 0x39, 0x69, 0x99, 0xcf, 0xf5, 0xe0, 0x7f, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x9b, 0x04, 0xb4, 0xee, 0xa4, 0x04, 0x00, 0x00, + 0xe0, 0x0c, 0x89, 0x0a, 0x82, 0x6f, 0xf1, 0x41, 0x0a, 0x82, 0x35, 0xbe, 0x89, 0x50, 0x26, 0xdb, + 0xc9, 0x3a, 0xb0, 0x99, 0xd9, 0xee, 0x4c, 0x42, 0x8b, 0x14, 0x21, 0xbf, 0x40, 0xf0, 0x4f, 0xf5, + 0xb1, 0xe0, 0x8b, 0x4f, 0x22, 0x89, 0x3f, 0x44, 0xe6, 0x63, 0xe9, 0x86, 0x6e, 0xdb, 0xa7, 0x49, + 0xee, 0x3d, 0xf7, 0x9c, 0x33, 0xe7, 0xce, 0x82, 0x30, 0x25, 0x0b, 0xc2, 0xa9, 0xc2, 0xfa, 0xc4, + 0x59, 0x4a, 0xb8, 0xc4, 0x27, 0x73, 0x9a, 0x9f, 0xa1, 0x2c, 0x17, 0x4a, 0x40, 0xe8, 0xfa, 0x48, + 0x9f, 0xc8, 0xf4, 0x83, 0x6e, 0x22, 0x12, 0x61, 0xda, 0x58, 0xff, 0xb2, 0xc8, 0x60, 0x3b, 0x11, + 0x22, 0x49, 0x29, 0x26, 0x19, 0xc3, 0x84, 0x73, 0xa1, 0x88, 0x62, 0x82, 0x4b, 0xd7, 0x7d, 0x16, + 0x0b, 0x39, 0x13, 0x12, 0x4f, 0x88, 0xa4, 0x56, 0x00, 0x2f, 0x06, 0x13, 0xaa, 0xc8, 0x00, 0x67, + 0x24, 0x61, 0xdc, 0x80, 0x1d, 0x76, 0xb7, 0xc2, 0x53, 0x46, 0x72, 0x32, 0x2b, 0xc8, 0xc2, 0x32, + 0x59, 0x41, 0x13, 0x0b, 0x56, 0x10, 0xec, 0x54, 0x11, 0xa4, 0xc4, 0xb5, 0xa3, 0x2e, 0x80, 0x1f, + 0xb5, 0x83, 0x43, 0xc3, 0x39, 0xa6, 0x27, 0x73, 0x2a, 0x55, 0xf4, 0x01, 0x3c, 0xda, 0xa8, 0xca, + 0x4c, 0x70, 0x49, 0xe1, 0x6b, 0xd0, 0xb2, 0xda, 0xbe, 0xd7, 0xf3, 0xfa, 0x9d, 0x61, 0x80, 0xae, + 0x27, 0x82, 0xec, 0xcc, 0xa8, 0x71, 0xf1, 0x67, 0xb7, 0x36, 0x76, 0xf8, 0x08, 0x82, 0x07, 0x86, + 0xf0, 0x3d, 0x93, 0xaa, 0x10, 0xf9, 0x02, 0x1e, 0x96, 0x6a, 0x4e, 0xe2, 0x1d, 0x00, 0x86, 0xe6, + 0x88, 0xf1, 0xa9, 0xf0, 0xbd, 0x5e, 0xbd, 0xdf, 0x19, 0x46, 0x55, 0x32, 0x7a, 0xea, 0x80, 0x4f, + 0xc5, 0x27, 0x95, 0xcf, 0x63, 0xe5, 0xe4, 0xda, 0xa6, 0xa7, 0xcb, 0xd1, 0x77, 0x70, 0x7f, 0x13, + 0x02, 0xbb, 0xa0, 0xc9, 0xf8, 0x31, 0x3d, 0x35, 0xe6, 0xdb, 0x63, 0xfb, 0x07, 0xf6, 0x40, 0xe7, + 0x98, 0xca, 0x38, 0x67, 0x99, 0x4e, 0xdd, 0xdf, 0x32, 0xbd, 0x72, 0x09, 0xbe, 0x02, 0xcd, 0x2c, + 0x67, 0x31, 0xf5, 0xeb, 0xe6, 0xd2, 0x8f, 0x91, 0x4d, 0x1c, 0xe9, 0xc4, 0x91, 0x4b, 0x1c, 0xbd, + 0x15, 0x8c, 0x3b, 0x13, 0x16, 0x1d, 0x0d, 0xdc, 0x95, 0xb5, 0x03, 0x77, 0x65, 0xb8, 0x63, 0x6f, + 0x77, 0x54, 0xf6, 0x61, 0x3c, 0x1f, 0xe8, 0x42, 0x74, 0xe8, 0x12, 0xb1, 0x23, 0x2e, 0x91, 0x37, + 0xa0, 0xed, 0x66, 0x4c, 0x20, 0xda, 0x82, 0x5f, 0x99, 0x7b, 0x4a, 0x0a, 0x07, 0xf7, 0x2c, 0xe5, + 0x54, 0x0c, 0x97, 0x75, 0xd0, 0x34, 0x94, 0xf0, 0x1c, 0xb4, 0xec, 0x66, 0xe0, 0xd3, 0xaa, 0xe9, + 0xeb, 0x8f, 0x20, 0xd8, 0xbf, 0x13, 0x67, 0x1d, 0x46, 0xd1, 0xf2, 0xd7, 0xbf, 0x9f, 0x5b, 0xdb, + 0x30, 0xc0, 0x37, 0x3e, 0x56, 0x38, 0x07, 0x0d, 0xbd, 0x0e, 0xf8, 0xe4, 0x46, 0xd2, 0xd2, 0xd3, + 0x08, 0xf6, 0xee, 0x40, 0x39, 0xe1, 0x9e, 0x11, 0x0e, 0xa0, 0x5f, 0x25, 0x9c, 0x6a, 0xb9, 0xa5, + 0x07, 0x1a, 0x3a, 0x88, 0x5b, 0x74, 0x4b, 0xfb, 0xb9, 0x45, 0xb7, 0xbc, 0x92, 0xe8, 0xb9, 0xd1, + 0xdd, 0x87, 0x7b, 0x55, 0xba, 0x7a, 0x4f, 0xf8, 0xdb, 0xd5, 0x9a, 0xcf, 0x47, 0xa3, 0x8b, 0x55, + 0xe8, 0x5d, 0xae, 0x42, 0xef, 0xef, 0x2a, 0xf4, 0x7e, 0xac, 0xc3, 0xda, 0xe5, 0x3a, 0xac, 0xfd, + 0x5e, 0x87, 0xb5, 0xcf, 0xfd, 0x84, 0xa9, 0xaf, 0xf3, 0x09, 0x8a, 0xc5, 0x6c, 0x93, 0x6a, 0xf1, + 0x12, 0x9f, 0x3a, 0x3e, 0x75, 0x96, 0x51, 0x39, 0x69, 0x99, 0xcf, 0xf5, 0xc5, 0xff, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x35, 0x9c, 0x0d, 0x98, 0xa4, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/plans/types/tx.pb.go b/x/plans/types/tx.pb.go index 22155bd1eb..13e0e65001 100644 --- a/x/plans/types/tx.pb.go +++ b/x/plans/types/tx.pb.go @@ -33,8 +33,8 @@ var fileDescriptor_3d5c4f7f9bf14ddd = []byte{ 0xe5, 0x62, 0xf6, 0x2d, 0x4e, 0x77, 0x72, 0x3a, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x14, 0xc3, - 0xcb, 0x8c, 0xf5, 0x2b, 0x60, 0x36, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x6d, 0x31, 0x06, - 0x04, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x7a, 0x3e, 0xa0, 0x84, 0x00, 0x00, 0x00, + 0xcb, 0x4c, 0xf4, 0x2b, 0x60, 0x36, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x6d, 0x31, 0x06, + 0x04, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xe2, 0x87, 0xd6, 0x84, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/projects/client/cli/query.go b/x/projects/client/cli/query.go index 8514f6d4fe..5b44fcbbfb 100644 --- a/x/projects/client/cli/query.go +++ b/x/projects/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/projects/client/cli/query_developer.go b/x/projects/client/cli/query_developer.go index 2ed25397d1..a3d3b11a37 100644 --- a/x/projects/client/cli/query_developer.go +++ b/x/projects/client/cli/query_developer.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/spf13/cobra" ) diff --git a/x/projects/client/cli/query_info.go b/x/projects/client/cli/query_info.go index f8605515e3..f37856558e 100644 --- a/x/projects/client/cli/query_info.go +++ b/x/projects/client/cli/query_info.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/spf13/cobra" ) diff --git a/x/projects/client/cli/query_params.go b/x/projects/client/cli/query_params.go index b4bac2c631..2f492c5318 100644 --- a/x/projects/client/cli/query_params.go +++ b/x/projects/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/spf13/cobra" ) diff --git a/x/projects/client/cli/tx.go b/x/projects/client/cli/tx.go index 65ce65c883..613d2303eb 100644 --- a/x/projects/client/cli/tx.go +++ b/x/projects/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/projects/client/cli/tx_add_keys.go b/x/projects/client/cli/tx_add_keys.go index ee9df2176c..88028c17e9 100644 --- a/x/projects/client/cli/tx_add_keys.go +++ b/x/projects/client/cli/tx_add_keys.go @@ -4,9 +4,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/decoder" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/decoder" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/spf13/cobra" ) diff --git a/x/projects/client/cli/tx_del_keys.go b/x/projects/client/cli/tx_del_keys.go index 9764224d90..2760d6466d 100644 --- a/x/projects/client/cli/tx_del_keys.go +++ b/x/projects/client/cli/tx_del_keys.go @@ -4,9 +4,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/decoder" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/decoder" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/spf13/cobra" ) diff --git a/x/projects/client/cli/tx_set_admin_policy.go b/x/projects/client/cli/tx_set_admin_policy.go index 68e97b99c1..ed29711bbb 100644 --- a/x/projects/client/cli/tx_set_admin_policy.go +++ b/x/projects/client/cli/tx_set_admin_policy.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - "github.com/lavanet/lava/v3/x/projects/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + "github.com/lavanet/lava/v4/x/projects/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/spf13/cobra" ) diff --git a/x/projects/client/cli/tx_set_subscription_policy.go b/x/projects/client/cli/tx_set_subscription_policy.go index 5b112989d0..44ee9dee78 100644 --- a/x/projects/client/cli/tx_set_subscription_policy.go +++ b/x/projects/client/cli/tx_set_subscription_policy.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - "github.com/lavanet/lava/v3/x/projects/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/spf13/cobra" ) diff --git a/x/projects/genesis.go b/x/projects/genesis.go index 1cd8381873..0aceec18e3 100644 --- a/x/projects/genesis.go +++ b/x/projects/genesis.go @@ -2,8 +2,8 @@ package projects import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/projects/genesis_test.go b/x/projects/genesis_test.go index aa1a7dd91d..f3b55dc000 100644 --- a/x/projects/genesis_test.go +++ b/x/projects/genesis_test.go @@ -3,10 +3,10 @@ package projects_test import ( "testing" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/projects" - "github.com/lavanet/lava/v3/x/projects/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/projects" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/projects/handler.go b/x/projects/handler.go index f871d6e062..300c2f9ee9 100644 --- a/x/projects/handler.go +++ b/x/projects/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" ) // NewHandler ... diff --git a/x/projects/keeper/creation.go b/x/projects/keeper/creation.go index a3f1c75741..fac8d9892a 100644 --- a/x/projects/keeper/creation.go +++ b/x/projects/keeper/creation.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + "github.com/lavanet/lava/v4/x/projects/types" ) // Keys management logic: diff --git a/x/projects/keeper/grpc_query.go b/x/projects/keeper/grpc_query.go index 5acb46a58c..e3217cd1e8 100644 --- a/x/projects/keeper/grpc_query.go +++ b/x/projects/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/projects/keeper/grpc_query_developer.go b/x/projects/keeper/grpc_query_developer.go index afcbabc832..4eb83290e7 100644 --- a/x/projects/keeper/grpc_query_developer.go +++ b/x/projects/keeper/grpc_query_developer.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/projects/keeper/grpc_query_info.go b/x/projects/keeper/grpc_query_info.go index f2863eead5..fe8843ca35 100644 --- a/x/projects/keeper/grpc_query_info.go +++ b/x/projects/keeper/grpc_query_info.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/projects/keeper/grpc_query_params.go b/x/projects/keeper/grpc_query_params.go index c6b8fa8a32..488eb6f251 100644 --- a/x/projects/keeper/grpc_query_params.go +++ b/x/projects/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/projects/keeper/grpc_query_params_test.go b/x/projects/keeper/grpc_query_params_test.go index baa195ee66..984bef36a3 100644 --- a/x/projects/keeper/grpc_query_params_test.go +++ b/x/projects/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/projects/keeper/keeper.go b/x/projects/keeper/keeper.go index c7e3c5c71e..d5bb2753f3 100644 --- a/x/projects/keeper/keeper.go +++ b/x/projects/keeper/keeper.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" - "github.com/lavanet/lava/v3/x/projects/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/projects/types" ) type ( diff --git a/x/projects/keeper/migrations.go b/x/projects/keeper/migrations.go index 56ca3d9181..614e364816 100644 --- a/x/projects/keeper/migrations.go +++ b/x/projects/keeper/migrations.go @@ -2,11 +2,11 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - v2 "github.com/lavanet/lava/v3/x/projects/migrations/v2" - v3 "github.com/lavanet/lava/v3/x/projects/migrations/v3" - v4 "github.com/lavanet/lava/v3/x/projects/migrations/v4" - v5 "github.com/lavanet/lava/v3/x/projects/migrations/v5" + "github.com/lavanet/lava/v4/utils" + v2 "github.com/lavanet/lava/v4/x/projects/migrations/v2" + v3 "github.com/lavanet/lava/v4/x/projects/migrations/v3" + v4 "github.com/lavanet/lava/v4/x/projects/migrations/v4" + v5 "github.com/lavanet/lava/v4/x/projects/migrations/v5" ) type Migrator struct { diff --git a/x/projects/keeper/msg_server.go b/x/projects/keeper/msg_server.go index 7a19567afe..4660291f90 100644 --- a/x/projects/keeper/msg_server.go +++ b/x/projects/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" ) type msgServer struct { diff --git a/x/projects/keeper/msg_server_add_project_keys.go b/x/projects/keeper/msg_server_add_project_keys.go index 12c35c9402..846ffee1b9 100644 --- a/x/projects/keeper/msg_server_add_project_keys.go +++ b/x/projects/keeper/msg_server_add_project_keys.go @@ -5,8 +5,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/projects/types" ) func (k msgServer) AddKeys(goCtx context.Context, msg *types.MsgAddKeys) (*types.MsgAddKeysResponse, error) { diff --git a/x/projects/keeper/msg_server_del_project_keys.go b/x/projects/keeper/msg_server_del_project_keys.go index dcc52f62da..b66f9c101d 100644 --- a/x/projects/keeper/msg_server_del_project_keys.go +++ b/x/projects/keeper/msg_server_del_project_keys.go @@ -5,8 +5,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/projects/types" ) func (k msgServer) DelKeys(goCtx context.Context, msg *types.MsgDelKeys) (*types.MsgDelKeysResponse, error) { diff --git a/x/projects/keeper/msg_server_set_admin_policy.go b/x/projects/keeper/msg_server_set_admin_policy.go index ce4d2e3579..acc2a72363 100644 --- a/x/projects/keeper/msg_server_set_admin_policy.go +++ b/x/projects/keeper/msg_server_set_admin_policy.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/projects/types" ) func (k msgServer) SetPolicy(goCtx context.Context, msg *types.MsgSetPolicy) (*types.MsgSetPolicyResponse, error) { diff --git a/x/projects/keeper/msg_server_set_subscription_policy.go b/x/projects/keeper/msg_server_set_subscription_policy.go index 82be4d4162..847bdfed18 100644 --- a/x/projects/keeper/msg_server_set_subscription_policy.go +++ b/x/projects/keeper/msg_server_set_subscription_policy.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/projects/types" ) func (k msgServer) SetSubscriptionPolicy(goCtx context.Context, msg *types.MsgSetSubscriptionPolicy) (*types.MsgSetSubscriptionPolicyResponse, error) { diff --git a/x/projects/keeper/msg_server_test.go b/x/projects/keeper/msg_server_test.go index e59ad3c3e3..48d64b9702 100644 --- a/x/projects/keeper/msg_server_test.go +++ b/x/projects/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { diff --git a/x/projects/keeper/params.go b/x/projects/keeper/params.go index 509087fc15..99c756bf74 100644 --- a/x/projects/keeper/params.go +++ b/x/projects/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" ) // GetParams get all parameters as types.Params diff --git a/x/projects/keeper/params_test.go b/x/projects/keeper/params_test.go index 74a710e0f3..ce29f7bcf5 100644 --- a/x/projects/keeper/params_test.go +++ b/x/projects/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/projects/keeper/project.go b/x/projects/keeper/project.go index a501053a73..e1c9007068 100644 --- a/x/projects/keeper/project.go +++ b/x/projects/keeper/project.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/utils" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + "github.com/lavanet/lava/v4/x/projects/types" ) // getProjectForBlock returns the version of a given project at a given block diff --git a/x/projects/keeper/project_test.go b/x/projects/keeper/project_test.go index 3de619f170..73c7bc28a5 100644 --- a/x/projects/keeper/project_test.go +++ b/x/projects/keeper/project_test.go @@ -7,11 +7,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/utils/sigs" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/testutil/common" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/utils/sigs" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/projects/module.go b/x/projects/module.go index 15697169d5..2e78ef4414 100644 --- a/x/projects/module.go +++ b/x/projects/module.go @@ -18,9 +18,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/projects/client/cli" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/client/cli" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" ) var ( diff --git a/x/projects/module_simulation.go b/x/projects/module_simulation.go index 45fd143daf..b2039803ff 100644 --- a/x/projects/module_simulation.go +++ b/x/projects/module_simulation.go @@ -10,9 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - projectssimulation "github.com/lavanet/lava/v3/x/projects/simulation" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/testutil/sample" + projectssimulation "github.com/lavanet/lava/v4/x/projects/simulation" + "github.com/lavanet/lava/v4/x/projects/types" ) // avoid unused import issue diff --git a/x/projects/simulation/add_project_keys.go b/x/projects/simulation/add_project_keys.go index 4190cfeb48..98f1b06a10 100644 --- a/x/projects/simulation/add_project_keys.go +++ b/x/projects/simulation/add_project_keys.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" ) func SimulateMsgAddKeys( diff --git a/x/projects/simulation/del_project_keys.go b/x/projects/simulation/del_project_keys.go index 518934f9de..272b112a64 100644 --- a/x/projects/simulation/del_project_keys.go +++ b/x/projects/simulation/del_project_keys.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" ) func SimulateMsgDelKeys( diff --git a/x/projects/simulation/set_admin_policy.go b/x/projects/simulation/set_admin_policy.go index c396ee3c85..90a10e8bc4 100644 --- a/x/projects/simulation/set_admin_policy.go +++ b/x/projects/simulation/set_admin_policy.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" ) func SimulateMsgSetPolicy( diff --git a/x/projects/simulation/set_subscription_policy.go b/x/projects/simulation/set_subscription_policy.go index 23d6d4826b..21fecf1405 100644 --- a/x/projects/simulation/set_subscription_policy.go +++ b/x/projects/simulation/set_subscription_policy.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/projects/keeper" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/keeper" + "github.com/lavanet/lava/v4/x/projects/types" ) func SimulateMsgSetSubscriptionPolicy( diff --git a/x/projects/types/expected_keepers.go b/x/projects/types/expected_keepers.go index 85486e945d..3c932ad2f5 100644 --- a/x/projects/types/expected_keepers.go +++ b/x/projects/types/expected_keepers.go @@ -3,7 +3,7 @@ package types import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - fixationstoretypes "github.com/lavanet/lava/v3/x/fixationstore/types" + fixationstoretypes "github.com/lavanet/lava/v4/x/fixationstore/types" ) type EpochStorageKeeper interface { diff --git a/x/projects/types/genesis.go b/x/projects/types/genesis.go index f7c5d72f9a..c8a1c3e2d1 100644 --- a/x/projects/types/genesis.go +++ b/x/projects/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" ) // this line is used by starport scaffolding # genesis/types/import diff --git a/x/projects/types/genesis.pb.go b/x/projects/types/genesis.pb.go index cfc0737457..efe101bd66 100644 --- a/x/projects/types/genesis.pb.go +++ b/x/projects/types/genesis.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/fixationstore/types" + types "github.com/lavanet/lava/v4/x/fixationstore/types" io "io" math "math" math_bits "math/bits" @@ -109,9 +109,9 @@ var fileDescriptor_159556069ba44164 = []byte{ 0x4b, 0xcd, 0xc9, 0x2f, 0x48, 0x2d, 0x72, 0x0b, 0x96, 0x60, 0x26, 0xcb, 0x40, 0x64, 0x23, 0x9c, 0x5c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x3b, 0x3d, 0xb3, 0x24, - 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0x25, 0xfc, 0xca, 0x8c, 0xf5, 0x2b, 0x10, 0x01, + 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0x25, 0xfc, 0xca, 0x4c, 0xf4, 0x2b, 0x10, 0x01, 0x5d, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x3d, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x82, 0xae, 0x4b, 0x9d, 0xe0, 0x01, 0x00, 0x00, + 0xff, 0xa4, 0xd5, 0x88, 0x45, 0xe0, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/projects/types/genesis_test.go b/x/projects/types/genesis_test.go index 7447729e61..e26c132dd2 100644 --- a/x/projects/types/genesis_test.go +++ b/x/projects/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/projects/types/message_add_keys_test.go b/x/projects/types/message_add_keys_test.go index e147567b9d..faaaed9e04 100644 --- a/x/projects/types/message_add_keys_test.go +++ b/x/projects/types/message_add_keys_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/projects/types/message_del_keys_test.go b/x/projects/types/message_del_keys_test.go index 9f82103498..e267de9f40 100644 --- a/x/projects/types/message_del_keys_test.go +++ b/x/projects/types/message_del_keys_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/projects/types/message_set_admin_policy.go b/x/projects/types/message_set_admin_policy.go index 0ff04c1643..d06f47ef00 100644 --- a/x/projects/types/message_set_admin_policy.go +++ b/x/projects/types/message_set_admin_policy.go @@ -4,7 +4,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) const TypeMsgSetPolicy = "set_admin_policy" diff --git a/x/projects/types/message_set_admin_policy_test.go b/x/projects/types/message_set_admin_policy_test.go index 09b8a6d53b..50ff9f75fe 100644 --- a/x/projects/types/message_set_admin_policy_test.go +++ b/x/projects/types/message_set_admin_policy_test.go @@ -4,8 +4,8 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/testutil/sample" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/projects/types/message_set_subscription_policy.go b/x/projects/types/message_set_subscription_policy.go index 4908d7f7b8..2feda77e0f 100644 --- a/x/projects/types/message_set_subscription_policy.go +++ b/x/projects/types/message_set_subscription_policy.go @@ -4,7 +4,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" ) const TypeMsgSetSubscriptionPolicy = "set_subscription_policy" diff --git a/x/projects/types/message_set_subscription_policy_test.go b/x/projects/types/message_set_subscription_policy_test.go index 0027b4bf0c..026b71c260 100644 --- a/x/projects/types/message_set_subscription_policy_test.go +++ b/x/projects/types/message_set_subscription_policy_test.go @@ -4,8 +4,8 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" - planstypes "github.com/lavanet/lava/v3/x/plans/types" + "github.com/lavanet/lava/v4/testutil/sample" + planstypes "github.com/lavanet/lava/v4/x/plans/types" "github.com/stretchr/testify/require" ) diff --git a/x/projects/types/params.pb.go b/x/projects/types/params.pb.go index 64356280ba..5f19eaf2bc 100644 --- a/x/projects/types/params.pb.go +++ b/x/projects/types/params.pb.go @@ -76,9 +76,9 @@ var fileDescriptor_acd952a9fad2273a = []byte{ 0x82, 0x28, 0x56, 0xe2, 0xe3, 0x62, 0x0b, 0x00, 0x6b, 0xb6, 0x62, 0x99, 0xb1, 0x40, 0x9e, 0xc1, 0xc9, 0xf5, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xb4, 0xd3, 0x33, 0x4b, - 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x51, 0x5c, 0x51, 0x66, 0xac, 0x5f, 0x81, 0x70, + 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x51, 0x5c, 0x51, 0x66, 0xa2, 0x5f, 0x81, 0x70, 0x4a, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x74, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x34, 0x35, 0x53, 0x21, 0xb0, 0x00, 0x00, 0x00, + 0xff, 0x12, 0x4e, 0x90, 0xf9, 0xb0, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/projects/types/project.go b/x/projects/types/project.go index 9289e67257..06b836b745 100644 --- a/x/projects/types/project.go +++ b/x/projects/types/project.go @@ -3,7 +3,7 @@ package types import ( "fmt" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) const ( diff --git a/x/projects/types/project.pb.go b/x/projects/types/project.pb.go index 6fbb6c71bc..40b5a5213d 100644 --- a/x/projects/types/project.pb.go +++ b/x/projects/types/project.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/plans/types" + types "github.com/lavanet/lava/v4/x/plans/types" io "io" math "math" math_bits "math/bits" @@ -333,38 +333,38 @@ var fileDescriptor_9027839604ae2915 = []byte{ // 546 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4f, 0x8f, 0xd2, 0x40, 0x14, 0x67, 0x68, 0x81, 0xf6, 0xc1, 0x26, 0xcd, 0x88, 0xd9, 0x4a, 0x4c, 0x8b, 0x78, 0x21, 0x9a, - 0xb4, 0x09, 0x7b, 0xf1, 0x2a, 0xc2, 0x81, 0x55, 0x81, 0x34, 0xc6, 0xc3, 0x5e, 0x48, 0xa1, 0x13, + 0xb4, 0x09, 0x7a, 0xf0, 0x2a, 0xc2, 0x81, 0x55, 0x81, 0x34, 0xc6, 0xc3, 0x5e, 0x48, 0xa1, 0x13, 0xb6, 0x02, 0x6d, 0xc3, 0x14, 0xb2, 0xbd, 0xf9, 0x11, 0xfc, 0x18, 0x26, 0x7e, 0x09, 0x8f, 0x7b, 0xdc, 0xa3, 0x27, 0x62, 0xe0, 0xc6, 0xa7, 0x30, 0xd3, 0x19, 0x16, 0x6a, 0x36, 0xd9, 0xbd, 0x74, - 0xe6, 0xbd, 0xf9, 0xbd, 0x7f, 0xfd, 0xfd, 0x1e, 0xbc, 0x9e, 0xbb, 0x6b, 0x37, 0x20, 0xb1, 0xcd, - 0x4e, 0x3b, 0x5a, 0x86, 0xdf, 0xc8, 0x24, 0xa6, 0x87, 0x8b, 0x15, 0x2d, 0xc3, 0x38, 0xc4, 0xcf, + 0xe6, 0xbd, 0xf9, 0xbd, 0x7f, 0xfd, 0xfd, 0x1e, 0xbc, 0x9c, 0xbb, 0x6b, 0x37, 0x20, 0xb1, 0xcd, + 0x4e, 0x3b, 0x5a, 0x86, 0xdf, 0xc8, 0x24, 0xa6, 0x87, 0x8b, 0x15, 0x2d, 0xc3, 0x38, 0xc4, 0x4f, 0x05, 0xc8, 0x62, 0xa7, 0x75, 0x00, 0xd5, 0xaa, 0xd3, 0x70, 0x1a, 0xa6, 0x08, 0x9b, 0xdd, 0x38, 0xb8, 0x66, 0x66, 0x33, 0xce, 0xdd, 0x80, 0xda, 0x51, 0x38, 0xf7, 0x27, 0x09, 0x07, 0x34, 0x7e, - 0x49, 0x50, 0x1a, 0xf2, 0x1c, 0xb8, 0x0a, 0x05, 0x3f, 0xf0, 0xc8, 0x8d, 0x8e, 0xea, 0xa8, 0xa9, + 0x49, 0x50, 0x1a, 0xf2, 0x1c, 0xb8, 0x0a, 0x05, 0x3f, 0xf0, 0xc8, 0xb5, 0x8e, 0xea, 0xa8, 0xa9, 0x3a, 0xdc, 0xc0, 0x0d, 0xa8, 0xd0, 0xd5, 0x98, 0x4e, 0x96, 0x7e, 0x14, 0xfb, 0x61, 0xa0, 0xe7, 0xd3, 0xc7, 0x8c, 0x0f, 0xeb, 0x50, 0x22, 0x81, 0x3b, 0x9e, 0x13, 0x4f, 0x97, 0xeb, 0xa8, 0xa9, - 0x38, 0x07, 0x13, 0x5f, 0x41, 0x45, 0xb4, 0x38, 0x9a, 0x91, 0x84, 0xea, 0x85, 0xba, 0xd4, 0x2c, - 0xb7, 0x5e, 0x59, 0x0f, 0x0e, 0x61, 0x89, 0x4e, 0x3e, 0x92, 0xa4, 0x5d, 0xbd, 0xdd, 0x98, 0xb9, - 0xfd, 0xc6, 0xcc, 0x84, 0x3b, 0xe5, 0xe8, 0x1e, 0x41, 0xf1, 0x00, 0x2a, 0xae, 0xb7, 0xf0, 0x83, + 0x38, 0x07, 0x13, 0x5f, 0x42, 0x45, 0xb4, 0x38, 0x9a, 0x91, 0x84, 0xea, 0x85, 0xba, 0xd4, 0x2c, + 0xb7, 0x5e, 0x58, 0xf7, 0x0e, 0x61, 0x89, 0x4e, 0x3e, 0x92, 0xa4, 0x5d, 0xbd, 0xd9, 0x98, 0xb9, + 0xfd, 0xc6, 0xcc, 0x84, 0x3b, 0xe5, 0xe8, 0x0e, 0x41, 0xf1, 0x00, 0x2a, 0xae, 0xb7, 0xf0, 0x83, 0x11, 0x9f, 0x48, 0x2f, 0xd6, 0x51, 0xb3, 0xdc, 0xaa, 0xfd, 0x97, 0x9b, 0xcd, 0x6c, 0x0d, 0x53, 0x44, 0x5b, 0x63, 0x09, 0x4f, 0x63, 0x9c, 0x72, 0x6a, 0xf1, 0x67, 0x7c, 0x0e, 0xa5, 0x15, 0x25, - 0xde, 0x68, 0xb2, 0xd2, 0x4b, 0x75, 0xd4, 0x94, 0x9d, 0x22, 0x33, 0x3f, 0xac, 0xb0, 0x07, 0xcf, - 0x4e, 0xe7, 0x3d, 0x14, 0x54, 0x1e, 0x2d, 0x78, 0xbe, 0xdf, 0x98, 0x0f, 0x85, 0x3a, 0xf8, 0xd4, - 0x29, 0xca, 0xd7, 0x40, 0xa1, 0x81, 0x1b, 0xd1, 0xeb, 0x30, 0xd6, 0xd5, 0xb4, 0xfe, 0xbd, 0x7d, - 0x29, 0x2b, 0x92, 0x26, 0x37, 0xbe, 0x23, 0x80, 0xe3, 0x3f, 0xc2, 0x2f, 0x40, 0x9a, 0x91, 0x84, + 0xde, 0x68, 0xb2, 0xd2, 0x4b, 0x75, 0xd4, 0x94, 0x9d, 0x22, 0x33, 0x3f, 0xac, 0xb0, 0x07, 0x4f, + 0x4e, 0xe7, 0x3d, 0x14, 0x54, 0x1e, 0x2c, 0x78, 0xbe, 0xdf, 0x98, 0xf7, 0x85, 0x3a, 0xf8, 0xd4, + 0x29, 0xca, 0xd7, 0x40, 0xa1, 0x81, 0x1b, 0xd1, 0xab, 0x30, 0xd6, 0xd5, 0xb4, 0xfe, 0x9d, 0x7d, + 0x21, 0x2b, 0x92, 0x26, 0x37, 0xbe, 0x23, 0x80, 0xe3, 0x3f, 0xc2, 0xcf, 0x40, 0x9a, 0x91, 0x84, 0xd3, 0xd5, 0x2e, 0xed, 0x37, 0x26, 0x33, 0x1d, 0xf6, 0xc1, 0x26, 0x14, 0x66, 0x7e, 0xe0, 0xd1, - 0x94, 0x8f, 0xb3, 0xb6, 0xba, 0xdf, 0x98, 0xdc, 0xe1, 0xf0, 0xa3, 0xf1, 0x06, 0xe4, 0x2f, 0x49, + 0x94, 0x8f, 0xb3, 0xb6, 0xba, 0xdf, 0x98, 0xdc, 0xe1, 0xf0, 0xa3, 0xf1, 0x0a, 0xe4, 0x2f, 0x49, 0x44, 0xb0, 0x02, 0x72, 0x7f, 0xd0, 0xef, 0x6a, 0x39, 0xac, 0x42, 0xe1, 0x7d, 0xe7, 0x73, 0xaf, - 0xaf, 0x21, 0x7c, 0x06, 0x6a, 0xa7, 0xfb, 0xb5, 0xfb, 0x69, 0x30, 0xec, 0x3a, 0x5a, 0xfe, 0x52, + 0xaf, 0x21, 0x7c, 0x06, 0x6a, 0xa7, 0xfb, 0xb5, 0xfb, 0x69, 0x30, 0xec, 0x3a, 0x5a, 0xfe, 0x42, 0x56, 0xf2, 0x9a, 0x24, 0x5a, 0x78, 0x07, 0x78, 0xc8, 0x94, 0xd3, 0x21, 0x6b, 0x32, 0x0f, 0x23, - 0xb2, 0xec, 0xb8, 0xb1, 0x8b, 0x5f, 0x82, 0x2a, 0x98, 0xe9, 0x75, 0x84, 0x7c, 0x8e, 0x0e, 0x1e, + 0xb2, 0xec, 0xb8, 0xb1, 0x8b, 0x9f, 0x83, 0x2a, 0x98, 0xe9, 0x75, 0x84, 0x7c, 0x8e, 0x0e, 0x1e, 0xdf, 0xf8, 0x8d, 0xa0, 0x2c, 0x9a, 0x4f, 0x63, 0x30, 0xc8, 0x81, 0xbb, 0x20, 0x02, 0x9e, 0xde, - 0x4f, 0x85, 0x24, 0x65, 0x85, 0xd4, 0x83, 0x53, 0xee, 0x75, 0xf9, 0xa9, 0x3a, 0x92, 0x99, 0x8e, - 0xb2, 0xba, 0x69, 0x41, 0x51, 0x10, 0x58, 0x78, 0x8c, 0x40, 0x47, 0x20, 0xf9, 0x08, 0xed, 0xde, - 0xcf, 0xad, 0x81, 0x6e, 0xb7, 0x06, 0xba, 0xdb, 0x1a, 0xe8, 0xef, 0xd6, 0x40, 0x3f, 0x76, 0x46, - 0xee, 0x6e, 0x67, 0xe4, 0xfe, 0xec, 0x8c, 0xdc, 0xd5, 0xdb, 0xa9, 0x1f, 0x5f, 0xaf, 0xc6, 0xd6, - 0x24, 0x5c, 0xd8, 0x99, 0xbd, 0x5b, 0x5f, 0xd8, 0x37, 0xc7, 0x75, 0x8e, 0x93, 0x88, 0xd0, 0x71, - 0x31, 0xdd, 0xbf, 0x8b, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x02, 0x73, 0x0b, 0x10, 0xf4, 0x03, + 0x4f, 0x85, 0x24, 0x65, 0x85, 0xd4, 0x83, 0x53, 0xee, 0x75, 0xf9, 0xb1, 0x3a, 0x92, 0x99, 0x8e, + 0xb2, 0xba, 0x69, 0x41, 0x51, 0x10, 0x58, 0x78, 0x88, 0x40, 0x47, 0x20, 0xf9, 0x08, 0xed, 0xde, + 0xcf, 0xad, 0x81, 0x6e, 0xb6, 0x06, 0xba, 0xdd, 0x1a, 0xe8, 0xef, 0xd6, 0x40, 0x3f, 0x76, 0x46, + 0xee, 0x76, 0x67, 0xe4, 0xfe, 0xec, 0x8c, 0xdc, 0xe5, 0xeb, 0xa9, 0x1f, 0x5f, 0xad, 0xc6, 0xd6, + 0x24, 0x5c, 0xd8, 0x99, 0xbd, 0x5b, 0xbf, 0xb5, 0xaf, 0x8f, 0xeb, 0x1c, 0x27, 0x11, 0xa1, 0xe3, + 0x62, 0xba, 0x7f, 0x6f, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0x24, 0x08, 0xc8, 0xc8, 0xf4, 0x03, 0x00, 0x00, } diff --git a/x/projects/types/query.pb.go b/x/projects/types/query.pb.go index 300d13c661..f47d340e8b 100644 --- a/x/projects/types/query.pb.go +++ b/x/projects/types/query.pb.go @@ -344,8 +344,8 @@ var fileDescriptor_e0c4357eb0c2f6e6 = []byte{ 0x19, 0x3c, 0x41, 0xe9, 0x57, 0xc3, 0x99, 0xb5, 0x4e, 0xae, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9d, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x8b, - 0x6a, 0x62, 0x99, 0xb1, 0x7e, 0x05, 0xc2, 0xd8, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, - 0x91, 0x60, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x5e, 0x2d, 0x1f, 0xcb, 0x04, 0x00, 0x00, + 0x6a, 0x62, 0x99, 0x89, 0x7e, 0x05, 0xc2, 0xd8, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, + 0x91, 0x60, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x25, 0xee, 0xc7, 0xcb, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/projects/types/tx.pb.go b/x/projects/types/tx.pb.go index 816524051e..37ffc128c0 100644 --- a/x/projects/types/tx.pb.go +++ b/x/projects/types/tx.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/plans/types" + types "github.com/lavanet/lava/v4/x/plans/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -431,35 +431,35 @@ var fileDescriptor_a4f8e20515314f9d = []byte{ // 488 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x31, 0x6f, 0xd3, 0x40, 0x14, 0xc7, 0x73, 0x35, 0x6a, 0xc9, 0x4b, 0x07, 0xb0, 0x12, 0xb0, 0x3c, 0x5c, 0x8d, 0xb3, 0x04, - 0x2a, 0xf9, 0xa4, 0x74, 0x40, 0xea, 0x46, 0x05, 0x0b, 0x55, 0xa4, 0xca, 0x1d, 0x90, 0x90, 0x10, - 0x72, 0xdc, 0x93, 0x31, 0xa4, 0x3e, 0xcb, 0x77, 0xad, 0xea, 0x91, 0x95, 0x05, 0x66, 0x56, 0x26, - 0x36, 0x3e, 0x46, 0xc7, 0x8e, 0x4c, 0x08, 0x25, 0x03, 0x5f, 0x03, 0x9d, 0x7d, 0x77, 0x49, 0xdb, - 0x24, 0x85, 0x4c, 0x5d, 0xec, 0xf7, 0xee, 0xfd, 0xef, 0x7f, 0xbf, 0xd3, 0x7b, 0x3a, 0xc0, 0xa3, - 0xe8, 0x34, 0xca, 0xa8, 0x20, 0xf2, 0x4f, 0xf2, 0x82, 0xbd, 0xa7, 0xb1, 0xe0, 0x44, 0x9c, 0x05, - 0x79, 0xc1, 0x04, 0xb3, 0x3b, 0xaa, 0x1e, 0xc8, 0x7f, 0xa0, 0xeb, 0xee, 0xfd, 0xe8, 0x38, 0xcd, - 0x18, 0xa9, 0xbe, 0xb5, 0xd2, 0xed, 0xce, 0x77, 0x52, 0x81, 0x12, 0x6d, 0x5d, 0x16, 0x8d, 0xa2, - 0x8c, 0x93, 0x9c, 0x8d, 0xd2, 0xb8, 0x54, 0x82, 0x76, 0xc2, 0x12, 0x56, 0x85, 0x44, 0x46, 0xf5, - 0xaa, 0xff, 0x0d, 0x01, 0x0c, 0x78, 0xf2, 0xec, 0xe8, 0x68, 0x9f, 0x96, 0xdc, 0x76, 0x60, 0x23, - 0x2e, 0x68, 0x24, 0x58, 0xe1, 0x20, 0x0f, 0xf5, 0x9a, 0xa1, 0x4e, 0x65, 0x45, 0x1d, 0xe8, 0xac, - 0xd5, 0x15, 0x95, 0xda, 0x2f, 0x61, 0x53, 0x85, 0x6f, 0x3f, 0xd0, 0x92, 0x3b, 0x96, 0x67, 0xf5, - 0x5a, 0xfd, 0x47, 0xc1, 0xdc, 0xfb, 0x05, 0x07, 0x75, 0xb0, 0x4f, 0xcb, 0xbd, 0x3b, 0xe7, 0xbf, - 0xb6, 0x1a, 0x61, 0x2b, 0x37, 0x2b, 0x7c, 0xb7, 0xf3, 0xe9, 0xcf, 0x8f, 0x27, 0xf7, 0xcc, 0x15, - 0x15, 0x96, 0xdf, 0x06, 0x7b, 0x0a, 0x19, 0x52, 0x9e, 0xb3, 0x8c, 0x53, 0xcd, 0xfe, 0x9c, 0x8e, - 0x6e, 0x23, 0xbb, 0xc2, 0x52, 0xec, 0x2a, 0x33, 0xec, 0x9f, 0x11, 0x6c, 0x0e, 0x78, 0x72, 0x48, - 0xc5, 0x41, 0xd5, 0xa4, 0x95, 0xe8, 0xfb, 0xb0, 0x5e, 0xb7, 0xd8, 0xb1, 0x3c, 0xd4, 0x6b, 0xf5, - 0xdd, 0x2b, 0xdc, 0x72, 0x08, 0x82, 0xda, 0x3f, 0x54, 0xca, 0xdd, 0x87, 0x92, 0xd2, 0x36, 0x94, - 0x06, 0xc0, 0x7f, 0x00, 0xed, 0x59, 0x20, 0x43, 0xfa, 0x1d, 0x81, 0x53, 0x17, 0x0e, 0x4f, 0x86, - 0x3c, 0x2e, 0xd2, 0x5c, 0xa4, 0x2c, 0xbb, 0x91, 0xda, 0x85, 0xbb, 0xfa, 0x10, 0x67, 0xcd, 0xb3, - 0x7a, 0xcd, 0xd0, 0xe4, 0x2b, 0x71, 0x77, 0x25, 0x37, 0x9e, 0xe5, 0xbe, 0x8e, 0xe3, 0xfb, 0xe0, - 0x2d, 0x42, 0xd5, 0xf7, 0xe9, 0x7f, 0xb5, 0xc0, 0x1a, 0xf0, 0xc4, 0x7e, 0x05, 0x1b, 0x7a, 0xea, - 0x17, 0xf5, 0x7b, 0x3a, 0x73, 0xee, 0xe3, 0x1b, 0x25, 0xfa, 0x00, 0x69, 0xac, 0x47, 0x72, 0x89, - 0xb1, 0x92, 0x2c, 0x33, 0xbe, 0x32, 0x33, 0xf6, 0x1b, 0x68, 0x4e, 0xe7, 0xa5, 0xbb, 0x78, 0x9f, - 0x11, 0xb9, 0xdb, 0xff, 0x20, 0x32, 0xf6, 0x1f, 0x11, 0x74, 0xe6, 0x77, 0x99, 0x2c, 0xb5, 0xb9, - 0xbe, 0xc1, 0x7d, 0xfa, 0x9f, 0x1b, 0x34, 0xc3, 0xde, 0x8b, 0xf3, 0x31, 0x46, 0x17, 0x63, 0x8c, - 0x7e, 0x8f, 0x31, 0xfa, 0x32, 0xc1, 0x8d, 0x8b, 0x09, 0x6e, 0xfc, 0x9c, 0xe0, 0xc6, 0xeb, 0xed, - 0x24, 0x15, 0xef, 0x4e, 0x86, 0x41, 0xcc, 0x8e, 0xc9, 0xa5, 0xa7, 0xee, 0x74, 0x87, 0x9c, 0xcd, - 0x3c, 0xaf, 0x65, 0x4e, 0xf9, 0x70, 0xbd, 0x7a, 0xdc, 0x76, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, - 0x23, 0x50, 0xf6, 0xad, 0x84, 0x05, 0x00, 0x00, + 0x2a, 0xf9, 0xa4, 0x80, 0x84, 0xd4, 0x8d, 0x0a, 0x16, 0xaa, 0x48, 0x95, 0x3b, 0x20, 0x21, 0x21, + 0xe4, 0xb8, 0x27, 0x63, 0x48, 0x7d, 0x96, 0xef, 0x5a, 0xd5, 0x23, 0x2b, 0x0b, 0xcc, 0xac, 0x4c, + 0x6c, 0x7c, 0x8c, 0x8e, 0x1d, 0x99, 0x10, 0x4a, 0x06, 0xbe, 0x06, 0x3a, 0xfb, 0xee, 0x92, 0xb6, + 0x49, 0x0a, 0x99, 0xba, 0xd8, 0xef, 0xdd, 0xfb, 0xdf, 0xff, 0x7e, 0xa7, 0xf7, 0x74, 0x80, 0x47, + 0xd1, 0x49, 0x94, 0x51, 0x41, 0xe4, 0x9f, 0xe4, 0x05, 0x7b, 0x4f, 0x63, 0xc1, 0x89, 0x38, 0x0d, + 0xf2, 0x82, 0x09, 0x66, 0x77, 0x54, 0x3d, 0x90, 0xff, 0x40, 0xd7, 0xdd, 0xbb, 0xd1, 0x51, 0x9a, + 0x31, 0x52, 0x7d, 0x6b, 0xa5, 0xdb, 0x9d, 0xef, 0xa4, 0x02, 0x25, 0xda, 0xba, 0x28, 0x1a, 0x45, + 0x19, 0x27, 0x39, 0x1b, 0xa5, 0x71, 0xa9, 0x04, 0xed, 0x84, 0x25, 0xac, 0x0a, 0x89, 0x8c, 0xea, + 0x55, 0xff, 0x1b, 0x02, 0x18, 0xf0, 0xe4, 0xd9, 0xe1, 0xe1, 0x1e, 0x2d, 0xb9, 0xed, 0xc0, 0x46, + 0x5c, 0xd0, 0x48, 0xb0, 0xc2, 0x41, 0x1e, 0xea, 0x35, 0x43, 0x9d, 0xca, 0x8a, 0x3a, 0xd0, 0x59, + 0xab, 0x2b, 0x2a, 0xb5, 0x5f, 0xc2, 0xa6, 0x0a, 0xdf, 0x7e, 0xa0, 0x25, 0x77, 0x2c, 0xcf, 0xea, + 0xb5, 0xfa, 0x0f, 0x82, 0xb9, 0xf7, 0x0b, 0xf6, 0xeb, 0x60, 0x8f, 0x96, 0xbb, 0xb7, 0xce, 0x7e, + 0x6d, 0x35, 0xc2, 0x56, 0x6e, 0x56, 0xf8, 0x4e, 0xe7, 0xd3, 0x9f, 0x1f, 0x8f, 0xee, 0x98, 0x2b, + 0x2a, 0x2c, 0xbf, 0x0d, 0xf6, 0x14, 0x32, 0xa4, 0x3c, 0x67, 0x19, 0xa7, 0x9a, 0xfd, 0x39, 0x1d, + 0xdd, 0x44, 0x76, 0x85, 0xa5, 0xd8, 0x55, 0x66, 0xd8, 0x3f, 0x23, 0xd8, 0x1c, 0xf0, 0xe4, 0x80, + 0x8a, 0xfd, 0xaa, 0x49, 0x2b, 0xd1, 0xf7, 0x61, 0xbd, 0x6e, 0xb1, 0x63, 0x79, 0xa8, 0xd7, 0xea, + 0xbb, 0x97, 0xb8, 0xe5, 0x10, 0x04, 0xb5, 0x7f, 0xa8, 0x94, 0x3b, 0xf7, 0x25, 0xa5, 0x6d, 0x28, + 0x0d, 0x80, 0x7f, 0x0f, 0xda, 0xb3, 0x40, 0x86, 0xf4, 0x3b, 0x02, 0xa7, 0x2e, 0x1c, 0x1c, 0x0f, + 0x79, 0x5c, 0xa4, 0xb9, 0x48, 0x59, 0x76, 0x2d, 0xb5, 0x0b, 0xb7, 0xf5, 0x21, 0xce, 0x9a, 0x67, + 0xf5, 0x9a, 0xa1, 0xc9, 0x57, 0xe2, 0xee, 0x4a, 0x6e, 0x3c, 0xcb, 0x7d, 0x15, 0xc7, 0xf7, 0xc1, + 0x5b, 0x84, 0xaa, 0xef, 0xd3, 0xff, 0x6a, 0x81, 0x35, 0xe0, 0x89, 0xfd, 0x0a, 0x36, 0xf4, 0xd4, + 0x2f, 0xea, 0xf7, 0x74, 0xe6, 0xdc, 0x87, 0xd7, 0x4a, 0xf4, 0x01, 0xd2, 0x58, 0x8f, 0xe4, 0x12, + 0x63, 0x25, 0x59, 0x66, 0x7c, 0x69, 0x66, 0xec, 0x37, 0xd0, 0x9c, 0xce, 0x4b, 0x77, 0xf1, 0x3e, + 0x23, 0x72, 0xb7, 0xff, 0x41, 0x64, 0xec, 0x3f, 0x22, 0xe8, 0xcc, 0xef, 0x32, 0x59, 0x6a, 0x73, + 0x75, 0x83, 0xfb, 0xf4, 0x3f, 0x37, 0x68, 0x86, 0xdd, 0x17, 0x67, 0x63, 0x8c, 0xce, 0xc7, 0x18, + 0xfd, 0x1e, 0x63, 0xf4, 0x65, 0x82, 0x1b, 0xe7, 0x13, 0xdc, 0xf8, 0x39, 0xc1, 0x8d, 0xd7, 0xdb, + 0x49, 0x2a, 0xde, 0x1d, 0x0f, 0x83, 0x98, 0x1d, 0x91, 0x0b, 0x4f, 0xdd, 0xc9, 0x13, 0x72, 0x3a, + 0xf3, 0xbc, 0x96, 0x39, 0xe5, 0xc3, 0xf5, 0xea, 0x71, 0x7b, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, + 0x05, 0x2b, 0x35, 0x75, 0x84, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/protocol/client/cli/query.go b/x/protocol/client/cli/query.go index f5c90dc65f..c067a1a03a 100644 --- a/x/protocol/client/cli/query.go +++ b/x/protocol/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/protocol/client/cli/query_params.go b/x/protocol/client/cli/query_params.go index cb0126f7f2..654bf698c6 100644 --- a/x/protocol/client/cli/query_params.go +++ b/x/protocol/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" "github.com/spf13/cobra" ) diff --git a/x/protocol/client/cli/tx.go b/x/protocol/client/cli/tx.go index 255b6be808..7b1c65cb96 100644 --- a/x/protocol/client/cli/tx.go +++ b/x/protocol/client/cli/tx.go @@ -14,7 +14,7 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/protocol/genesis.go b/x/protocol/genesis.go index 0a21e84e8e..9a0e4c7e9a 100644 --- a/x/protocol/genesis.go +++ b/x/protocol/genesis.go @@ -2,8 +2,8 @@ package protocol import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/protocol/keeper" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/keeper" + "github.com/lavanet/lava/v4/x/protocol/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/protocol/genesis_test.go b/x/protocol/genesis_test.go index f34d4a020f..219370c200 100644 --- a/x/protocol/genesis_test.go +++ b/x/protocol/genesis_test.go @@ -3,10 +3,10 @@ package protocol_test import ( "testing" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/protocol" - "github.com/lavanet/lava/v3/x/protocol/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/protocol" + "github.com/lavanet/lava/v4/x/protocol/types" "github.com/stretchr/testify/require" ) diff --git a/x/protocol/handler.go b/x/protocol/handler.go index c70ba89427..c8646de7ef 100644 --- a/x/protocol/handler.go +++ b/x/protocol/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/protocol/keeper" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/keeper" + "github.com/lavanet/lava/v4/x/protocol/types" ) // NewHandler ... diff --git a/x/protocol/keeper/grpc_query.go b/x/protocol/keeper/grpc_query.go index ec9d990ff7..92cbf8ce11 100644 --- a/x/protocol/keeper/grpc_query.go +++ b/x/protocol/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/protocol/keeper/grpc_query_params.go b/x/protocol/keeper/grpc_query_params.go index 0b04fa9dcd..2b045b146f 100644 --- a/x/protocol/keeper/grpc_query_params.go +++ b/x/protocol/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/protocol/keeper/grpc_query_params_test.go b/x/protocol/keeper/grpc_query_params_test.go index 8cc9da92df..b83d7e521b 100644 --- a/x/protocol/keeper/grpc_query_params_test.go +++ b/x/protocol/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/protocol/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/protocol/types" "github.com/stretchr/testify/require" ) diff --git a/x/protocol/keeper/keeper.go b/x/protocol/keeper/keeper.go index 04921f9284..32778a600a 100644 --- a/x/protocol/keeper/keeper.go +++ b/x/protocol/keeper/keeper.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" ) type ( diff --git a/x/protocol/keeper/migrations.go b/x/protocol/keeper/migrations.go index bab9c006ea..ecb53c31df 100644 --- a/x/protocol/keeper/migrations.go +++ b/x/protocol/keeper/migrations.go @@ -2,9 +2,9 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - protocoltypes "github.com/lavanet/lava/v3/x/protocol/types" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + protocoltypes "github.com/lavanet/lava/v4/x/protocol/types" + "github.com/lavanet/lava/v4/x/spec/types" ) type Migrator struct { diff --git a/x/protocol/keeper/msg_server.go b/x/protocol/keeper/msg_server.go index 41c7cf6136..9c1247e115 100644 --- a/x/protocol/keeper/msg_server.go +++ b/x/protocol/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" ) type msgServer struct { diff --git a/x/protocol/keeper/msg_server_set_version.go b/x/protocol/keeper/msg_server_set_version.go index 7f92bde565..b06750251b 100644 --- a/x/protocol/keeper/msg_server_set_version.go +++ b/x/protocol/keeper/msg_server_set_version.go @@ -6,7 +6,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" ) func (k msgServer) SetVersion(goCtx context.Context, msg *types.MsgSetVersion) (*types.MsgSetVersionResponse, error) { diff --git a/x/protocol/keeper/msg_server_test.go b/x/protocol/keeper/msg_server_test.go index f4b6b866fd..f047c5f4f7 100644 --- a/x/protocol/keeper/msg_server_test.go +++ b/x/protocol/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/protocol/keeper" - "github.com/lavanet/lava/v3/x/protocol/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/protocol/keeper" + "github.com/lavanet/lava/v4/x/protocol/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { diff --git a/x/protocol/keeper/params.go b/x/protocol/keeper/params.go index d9d031abf9..1cefeb9c36 100644 --- a/x/protocol/keeper/params.go +++ b/x/protocol/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" ) // GetParams get all parameters as types.Params diff --git a/x/protocol/keeper/params_test.go b/x/protocol/keeper/params_test.go index 138fe2b95e..0845651a20 100644 --- a/x/protocol/keeper/params_test.go +++ b/x/protocol/keeper/params_test.go @@ -6,8 +6,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/protocol/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/protocol/types" "github.com/stretchr/testify/require" ) diff --git a/x/protocol/module.go b/x/protocol/module.go index 0e648b1a3a..456c0e0e58 100644 --- a/x/protocol/module.go +++ b/x/protocol/module.go @@ -18,9 +18,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/protocol/client/cli" - "github.com/lavanet/lava/v3/x/protocol/keeper" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/client/cli" + "github.com/lavanet/lava/v4/x/protocol/keeper" + "github.com/lavanet/lava/v4/x/protocol/types" ) var ( @@ -217,10 +217,18 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { // panic:ok: at start up, migration cannot proceed anyhow panic(fmt.Errorf("%s: failed to register migration to v23: %w", types.ModuleName, err)) } + if err := cfg.RegisterMigration(types.ModuleName, 23, migrator.MigrateVersion); err != nil { + // panic:ok: at start up, migration cannot proceed anyhow + panic(fmt.Errorf("%s: failed to register migration to v24: %w", types.ModuleName, err)) + } + if err := cfg.RegisterMigration(types.ModuleName, 24, migrator.MigrateVersion); err != nil { + // panic:ok: at start up, migration cannot proceed anyhow + panic(fmt.Errorf("%s: failed to register migration to v25: %w", types.ModuleName, err)) + } } // ConsensusVersion implements ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 23 } +func (AppModule) ConsensusVersion() uint64 { return 25 } // RegisterInvariants registers the capability module's invariants. func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} diff --git a/x/protocol/module_simulation.go b/x/protocol/module_simulation.go index b271e3b8b7..60a67b4d0f 100644 --- a/x/protocol/module_simulation.go +++ b/x/protocol/module_simulation.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - protocolsimulation "github.com/lavanet/lava/v3/x/protocol/simulation" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/testutil/sample" + protocolsimulation "github.com/lavanet/lava/v4/x/protocol/simulation" + "github.com/lavanet/lava/v4/x/protocol/types" ) // avoid unused import issue diff --git a/x/protocol/types/genesis.pb.go b/x/protocol/types/genesis.pb.go index 2a7547f24f..49abbbff62 100644 --- a/x/protocol/types/genesis.pb.go +++ b/x/protocol/types/genesis.pb.go @@ -88,8 +88,8 @@ var fileDescriptor_5875ab05db1f379d = []byte{ 0x7b, 0xf2, 0x0c, 0x41, 0x50, 0x2d, 0x4e, 0xae, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9d, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f, 0xe2, - 0xaa, 0x32, 0x63, 0xfd, 0x0a, 0x84, 0xd3, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x7c, - 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x39, 0xdf, 0x5f, 0x12, 0x01, 0x00, 0x00, + 0xaa, 0x32, 0x13, 0xfd, 0x0a, 0x84, 0xd3, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x7c, + 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0x42, 0x1c, 0x87, 0x12, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/protocol/types/genesis_test.go b/x/protocol/types/genesis_test.go index 6c0e190074..95d8bceb7e 100644 --- a/x/protocol/types/genesis_test.go +++ b/x/protocol/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/protocol/types" + "github.com/lavanet/lava/v4/x/protocol/types" "github.com/stretchr/testify/require" ) diff --git a/x/protocol/types/message_set_version_test.go b/x/protocol/types/message_set_version_test.go index 2e0914307f..2a91fb283c 100644 --- a/x/protocol/types/message_set_version_test.go +++ b/x/protocol/types/message_set_version_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/protocol/types/params.go b/x/protocol/types/params.go index ea4d74eb03..ba2afd4a2a 100644 --- a/x/protocol/types/params.go +++ b/x/protocol/types/params.go @@ -12,7 +12,7 @@ import ( var _ paramtypes.ParamSet = (*Params)(nil) const ( - TARGET_VERSION = "3.2.1" + TARGET_VERSION = "4.1.1" MIN_VERSION = "3.1.0" ) diff --git a/x/protocol/types/params.pb.go b/x/protocol/types/params.pb.go index 6d9a00ab52..75e9bbb4a4 100644 --- a/x/protocol/types/params.pb.go +++ b/x/protocol/types/params.pb.go @@ -163,8 +163,8 @@ var fileDescriptor_e1924c66c5d42a94 = []byte{ 0xe4, 0x19, 0x82, 0x60, 0x9a, 0xac, 0x58, 0x66, 0x2c, 0x90, 0x67, 0x70, 0x72, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xed, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, - 0xe4, 0xfc, 0x5c, 0x7d, 0x94, 0x38, 0x2d, 0x33, 0xd6, 0xaf, 0x40, 0x44, 0x6c, 0x49, 0x65, 0x41, - 0x6a, 0x71, 0x12, 0x1b, 0x98, 0x6f, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x25, 0xae, 0xc4, 0xf8, + 0xe4, 0xfc, 0x5c, 0x7d, 0x94, 0x38, 0x2d, 0x33, 0xd1, 0xaf, 0x40, 0x44, 0x6c, 0x49, 0x65, 0x41, + 0x6a, 0x71, 0x12, 0x1b, 0x98, 0x6f, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x03, 0xd5, 0x07, 0x20, 0xfe, 0x01, 0x00, 0x00, } diff --git a/x/protocol/types/query.pb.go b/x/protocol/types/query.pb.go index 6a2d55d103..ae969e1df5 100644 --- a/x/protocol/types/query.pb.go +++ b/x/protocol/types/query.pb.go @@ -121,26 +121,26 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/protocol/query.proto", fileDescriptor_c616be00122ebd89) } var fileDescriptor_c616be00122ebd89 = []byte{ - // 299 bytes of a gzipped FileDescriptorProto + // 300 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x31, 0x4b, 0x03, 0x31, 0x14, 0x80, 0x2f, 0xa2, 0x1d, 0xe2, 0x16, 0x2b, 0x48, 0xb1, 0xa9, 0x1e, 0x08, 0x5a, 0x21, 0xa1, - 0xed, 0xe8, 0x56, 0x70, 0xd7, 0x8e, 0x6e, 0xb9, 0x12, 0xe2, 0x41, 0x9b, 0x97, 0x36, 0xb9, 0xc3, - 0xae, 0x0e, 0xce, 0x05, 0xff, 0x54, 0xc7, 0x82, 0x8b, 0x93, 0xc8, 0x9d, 0x3f, 0x44, 0x2e, 0x39, - 0x91, 0x62, 0x15, 0xa7, 0x97, 0xf7, 0xde, 0xf7, 0xbe, 0xbc, 0x04, 0x9f, 0x4e, 0x44, 0x2e, 0xb4, - 0x74, 0xbc, 0x8a, 0xdc, 0xcc, 0xc1, 0xc1, 0x18, 0x26, 0x7c, 0x96, 0xc9, 0xf9, 0x82, 0xf9, 0x94, - 0x1c, 0xd6, 0x08, 0xab, 0x22, 0xfb, 0x42, 0x5a, 0x4d, 0x05, 0x0a, 0x7c, 0xc6, 0xab, 0x53, 0x68, - 0xb4, 0x8e, 0x15, 0x80, 0x9a, 0x48, 0x2e, 0x4c, 0xca, 0x85, 0xd6, 0xe0, 0x84, 0x4b, 0x41, 0xdb, - 0xba, 0xdb, 0x1d, 0x83, 0x9d, 0x82, 0xe5, 0x89, 0xb0, 0x32, 0xdc, 0xc1, 0xf3, 0x5e, 0x22, 0x9d, - 0xe8, 0x71, 0x23, 0x54, 0xaa, 0x3d, 0x5c, 0xb3, 0xf1, 0xf6, 0xcd, 0x8c, 0x98, 0x8b, 0x69, 0xed, - 0x8b, 0x9b, 0x98, 0xdc, 0x56, 0x96, 0x1b, 0x5f, 0x1c, 0xc9, 0x59, 0x26, 0xad, 0x8b, 0x47, 0xf8, - 0x60, 0xa3, 0x6a, 0x0d, 0x68, 0x2b, 0xc9, 0x15, 0x6e, 0x84, 0xe1, 0x23, 0x74, 0x82, 0xce, 0xf7, - 0xfb, 0x6d, 0xb6, 0xf5, 0x61, 0x2c, 0x8c, 0x0d, 0x77, 0x57, 0x6f, 0x9d, 0x68, 0x54, 0x8f, 0xf4, - 0x97, 0x08, 0xef, 0x79, 0x29, 0x79, 0x42, 0xb8, 0x11, 0x10, 0x72, 0xf1, 0x8b, 0xe1, 0xe7, 0x4e, - 0xad, 0xee, 0x7f, 0xd0, 0xb0, 0x68, 0x7c, 0xf6, 0xf8, 0xf2, 0xf1, 0xbc, 0xd3, 0x21, 0x6d, 0xfe, - 0xd7, 0x17, 0x0c, 0xaf, 0x57, 0x05, 0x45, 0xeb, 0x82, 0xa2, 0xf7, 0x82, 0xa2, 0x65, 0x49, 0xa3, - 0x75, 0x49, 0xa3, 0xd7, 0x92, 0x46, 0x77, 0x97, 0x2a, 0x75, 0xf7, 0x59, 0xc2, 0xc6, 0x30, 0xdd, - 0x54, 0xe4, 0x03, 0xfe, 0xf0, 0xed, 0x71, 0x0b, 0x23, 0x6d, 0xd2, 0xf0, 0xf9, 0xe0, 0x33, 0x00, - 0x00, 0xff, 0xff, 0x48, 0x9f, 0x07, 0x48, 0x0a, 0x02, 0x00, 0x00, + 0xd5, 0xcd, 0xad, 0xe0, 0xae, 0x1d, 0xdd, 0x72, 0x25, 0xc4, 0x83, 0x36, 0x2f, 0x6d, 0x72, 0x87, + 0x5d, 0x1d, 0x9c, 0x0b, 0xfe, 0xa9, 0x8e, 0x05, 0x17, 0x27, 0x91, 0x3b, 0x7f, 0x88, 0x5c, 0x72, + 0x22, 0xc5, 0x2a, 0x4e, 0x2f, 0xef, 0xbd, 0xef, 0x7d, 0x79, 0x09, 0x3e, 0x1e, 0x8b, 0x5c, 0x68, + 0xe9, 0x78, 0x15, 0xb9, 0x99, 0x81, 0x83, 0x11, 0x8c, 0xf9, 0x34, 0x93, 0xb3, 0x39, 0xf3, 0x29, + 0xd9, 0xaf, 0x11, 0x56, 0x45, 0xf6, 0x85, 0xb4, 0x9a, 0x0a, 0x14, 0xf8, 0x8c, 0x57, 0xa7, 0xd0, + 0x68, 0x1d, 0x2a, 0x00, 0x35, 0x96, 0x5c, 0x98, 0x94, 0x0b, 0xad, 0xc1, 0x09, 0x97, 0x82, 0xb6, + 0x75, 0xb7, 0x3b, 0x02, 0x3b, 0x01, 0xcb, 0x13, 0x61, 0x65, 0xb8, 0x83, 0xe7, 0xbd, 0x44, 0x3a, + 0xd1, 0xe3, 0x46, 0xa8, 0x54, 0x7b, 0xb8, 0x66, 0xe3, 0xcd, 0x9b, 0x19, 0x31, 0x13, 0x93, 0xda, + 0x17, 0x37, 0x31, 0xb9, 0xad, 0x2c, 0x37, 0xbe, 0x38, 0x94, 0xd3, 0x4c, 0x5a, 0x17, 0x0f, 0xf1, + 0xde, 0x5a, 0xd5, 0x1a, 0xd0, 0x56, 0x92, 0x2b, 0xdc, 0x08, 0xc3, 0x07, 0xe8, 0x08, 0x9d, 0xee, + 0xf6, 0xdb, 0x6c, 0xe3, 0xc3, 0x58, 0x18, 0x1b, 0x6c, 0x2f, 0xdf, 0x3a, 0xd1, 0xb0, 0x1e, 0xe9, + 0x2f, 0x10, 0xde, 0xf1, 0x52, 0xf2, 0x84, 0x70, 0x23, 0x20, 0xe4, 0xec, 0x17, 0xc3, 0xcf, 0x9d, + 0x5a, 0xdd, 0xff, 0xa0, 0x61, 0xd1, 0xf8, 0xe4, 0xf1, 0xe5, 0xe3, 0x79, 0xab, 0x43, 0xda, 0xfc, + 0xaf, 0x2f, 0x18, 0x5c, 0x2f, 0x0b, 0x8a, 0x56, 0x05, 0x45, 0xef, 0x05, 0x45, 0x8b, 0x92, 0x46, + 0xab, 0x92, 0x46, 0xaf, 0x25, 0x8d, 0xee, 0xce, 0x55, 0xea, 0xee, 0xb3, 0x84, 0x8d, 0x60, 0xb2, + 0xae, 0xc8, 0x2f, 0xf9, 0xc3, 0xb7, 0xc7, 0xcd, 0x8d, 0xb4, 0x49, 0xc3, 0xe7, 0x17, 0x9f, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x6e, 0xe4, 0xc4, 0x90, 0x0a, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/protocol/types/tx.pb.go b/x/protocol/types/tx.pb.go index 86b1d06a84..b0343b8e56 100644 --- a/x/protocol/types/tx.pb.go +++ b/x/protocol/types/tx.pb.go @@ -140,8 +140,8 @@ var fileDescriptor_96fb5a36c35e2c61 = []byte{ 0x9d, 0x28, 0x46, 0x48, 0xe9, 0x10, 0xa3, 0x0a, 0x66, 0x91, 0x93, 0xeb, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x69, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, - 0xe7, 0xea, 0xa3, 0x84, 0x68, 0x99, 0xb1, 0x7e, 0x05, 0x52, 0x04, 0x55, 0x16, 0xa4, 0x16, 0x27, - 0xb1, 0x81, 0xf9, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x68, 0xb2, 0x40, 0x94, 0xc6, 0x01, + 0xe7, 0xea, 0xa3, 0x84, 0x68, 0x99, 0x89, 0x7e, 0x05, 0x52, 0x04, 0x55, 0x16, 0xa4, 0x16, 0x27, + 0xb1, 0x81, 0xf9, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0xc9, 0x83, 0x4c, 0xc6, 0x01, 0x00, 0x00, } diff --git a/x/rewards/abci.go b/x/rewards/abci.go index 6fdc73fd81..ee4c594f62 100644 --- a/x/rewards/abci.go +++ b/x/rewards/abci.go @@ -2,7 +2,7 @@ package rewards import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/keeper" + "github.com/lavanet/lava/v4/x/rewards/keeper" ) // BeginBlocker calculates the validators block rewards and transfers them to the fee collector diff --git a/x/rewards/client/cli/query.go b/x/rewards/client/cli/query.go index 4c22ab4175..d5c8a01c79 100644 --- a/x/rewards/client/cli/query.go +++ b/x/rewards/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/rewards/client/cli/query_block_reward.go b/x/rewards/client/cli/query_block_reward.go index 748043af4a..c4af3a30ad 100644 --- a/x/rewards/client/cli/query_block_reward.go +++ b/x/rewards/client/cli/query_block_reward.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/rewards/client/cli/query_iprpc_provider_reward_estimation.go b/x/rewards/client/cli/query_iprpc_provider_reward_estimation.go index e98de9706b..12c62fde13 100644 --- a/x/rewards/client/cli/query_iprpc_provider_reward_estimation.go +++ b/x/rewards/client/cli/query_iprpc_provider_reward_estimation.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/rewards/client/cli/query_iprpc_spec_reward.go b/x/rewards/client/cli/query_iprpc_spec_reward.go index e2b4c35bb3..511082aa90 100644 --- a/x/rewards/client/cli/query_iprpc_spec_reward.go +++ b/x/rewards/client/cli/query_iprpc_spec_reward.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/rewards/client/cli/query_params.go b/x/rewards/client/cli/query_params.go index 3b729b8f3c..a771dec008 100644 --- a/x/rewards/client/cli/query_params.go +++ b/x/rewards/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/rewards/client/cli/query_pools.go b/x/rewards/client/cli/query_pools.go index 5577194980..4a361801a2 100644 --- a/x/rewards/client/cli/query_pools.go +++ b/x/rewards/client/cli/query_pools.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/rewards/client/cli/query_show_iprpc_data.go b/x/rewards/client/cli/query_show_iprpc_data.go index fb78e66f59..afcd2777b8 100644 --- a/x/rewards/client/cli/query_show_iprpc_data.go +++ b/x/rewards/client/cli/query_show_iprpc_data.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/rewards/client/cli/query_spec_tracked_info.go b/x/rewards/client/cli/query_spec_tracked_info.go index 96f16a8253..7ba1acf6ec 100644 --- a/x/rewards/client/cli/query_spec_tracked_info.go +++ b/x/rewards/client/cli/query_spec_tracked_info.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/rewards/client/cli/tx.go b/x/rewards/client/cli/tx.go index 24136b28f1..b2f427761f 100644 --- a/x/rewards/client/cli/tx.go +++ b/x/rewards/client/cli/tx.go @@ -16,8 +16,8 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/x/rewards/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/rewards/client/cli/tx_fund_iprpc.go b/x/rewards/client/cli/tx_fund_iprpc.go index 8b154959b5..388eddc7cc 100644 --- a/x/rewards/client/cli/tx_fund_iprpc.go +++ b/x/rewards/client/cli/tx_fund_iprpc.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/spf13/cobra" ) diff --git a/x/rewards/genesis.go b/x/rewards/genesis.go index 09cbee5ade..e298b8af65 100644 --- a/x/rewards/genesis.go +++ b/x/rewards/genesis.go @@ -2,8 +2,8 @@ package rewards import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/keeper" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/keeper" + "github.com/lavanet/lava/v4/x/rewards/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/rewards/genesis_test.go b/x/rewards/genesis_test.go index 2c46066ffa..be5b54fc0c 100644 --- a/x/rewards/genesis_test.go +++ b/x/rewards/genesis_test.go @@ -4,9 +4,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/rewards/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/handler.go b/x/rewards/handler.go index 7f0b2a276c..144a63eae9 100644 --- a/x/rewards/handler.go +++ b/x/rewards/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/rewards/keeper" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/keeper" + "github.com/lavanet/lava/v4/x/rewards/types" ) // NewHandler ... diff --git a/x/rewards/keeper/base_pay.go b/x/rewards/keeper/base_pay.go index 36c2a7aebc..144b82c0b7 100644 --- a/x/rewards/keeper/base_pay.go +++ b/x/rewards/keeper/base_pay.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" ) // SetBasePay set a specific BasePay in the store from its index @@ -84,8 +84,10 @@ func (k Keeper) popAllBasePayForChain(ctx sdk.Context, chainID string) (list []t k.cdc.MustUnmarshal(iterator.Value(), &val) bs := types.BasePayKeyRecover(string(iterator.Key())) bs.BasePay = val - list = append(list, bs) - store.Delete(iterator.Key()) + if bs.ChainId == chainID { + list = append(list, bs) + store.Delete(iterator.Key()) + } } return diff --git a/x/rewards/keeper/grpc_query.go b/x/rewards/keeper/grpc_query.go index 217854e181..487a1fde88 100644 --- a/x/rewards/keeper/grpc_query.go +++ b/x/rewards/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/rewards/keeper/grpc_query_block_reward.go b/x/rewards/keeper/grpc_query_block_reward.go index 349f6c71df..af52c115c8 100644 --- a/x/rewards/keeper/grpc_query_block_reward.go +++ b/x/rewards/keeper/grpc_query_block_reward.go @@ -5,8 +5,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/rewards/keeper/grpc_query_iprpc_provider_reward.go b/x/rewards/keeper/grpc_query_iprpc_provider_reward.go index dea898b780..561c01b71f 100644 --- a/x/rewards/keeper/grpc_query_iprpc_provider_reward.go +++ b/x/rewards/keeper/grpc_query_iprpc_provider_reward.go @@ -5,7 +5,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/rewards/keeper/grpc_query_iprpc_spec_reward.go b/x/rewards/keeper/grpc_query_iprpc_spec_reward.go index 1591841406..01684a5b10 100644 --- a/x/rewards/keeper/grpc_query_iprpc_spec_reward.go +++ b/x/rewards/keeper/grpc_query_iprpc_spec_reward.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/rewards/keeper/grpc_query_params.go b/x/rewards/keeper/grpc_query_params.go index e74c87bd24..e88b83801e 100644 --- a/x/rewards/keeper/grpc_query_params.go +++ b/x/rewards/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/rewards/keeper/grpc_query_params_test.go b/x/rewards/keeper/grpc_query_params_test.go index d9e1c2eaf6..17cce90dd0 100644 --- a/x/rewards/keeper/grpc_query_params_test.go +++ b/x/rewards/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/rewards/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/keeper/grpc_query_pools.go b/x/rewards/keeper/grpc_query_pools.go index c9038f9b4e..1a6f3c70e5 100644 --- a/x/rewards/keeper/grpc_query_pools.go +++ b/x/rewards/keeper/grpc_query_pools.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/rewards/keeper/grpc_query_show_iprpc_data.go b/x/rewards/keeper/grpc_query_show_iprpc_data.go index b9eb5423cb..60dffbfc3c 100644 --- a/x/rewards/keeper/grpc_query_show_iprpc_data.go +++ b/x/rewards/keeper/grpc_query_show_iprpc_data.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/rewards/keeper/grpc_query_spec_tracked_info.go b/x/rewards/keeper/grpc_query_spec_tracked_info.go index 0d9cd5743b..9c96eeb675 100644 --- a/x/rewards/keeper/grpc_query_spec_tracked_info.go +++ b/x/rewards/keeper/grpc_query_spec_tracked_info.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/rewards/keeper/helpers_test.go b/x/rewards/keeper/helpers_test.go index b05eb7e8d7..06a836f119 100644 --- a/x/rewards/keeper/helpers_test.go +++ b/x/rewards/keeper/helpers_test.go @@ -9,14 +9,14 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/testutil/common" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/utils/sigs" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - "github.com/lavanet/lava/v3/x/projects/types" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/common" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/utils/sigs" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + "github.com/lavanet/lava/v4/x/projects/types" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) @@ -34,7 +34,7 @@ var ( sdk.NewCoin(commontypes.TokenDenom, sdk.NewInt(1100)), sdk.NewCoin(ibcDenom, sdk.NewInt(500)), ) - mockSpec2 string = "mock2" + mockSpec2 string = "mockspec2" ) type tester struct { diff --git a/x/rewards/keeper/iprpc.go b/x/rewards/keeper/iprpc.go index 4a3bdc8ee6..e8ce4cd503 100644 --- a/x/rewards/keeper/iprpc.go +++ b/x/rewards/keeper/iprpc.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" ) func (k Keeper) FundIprpc(ctx sdk.Context, creator string, duration uint64, fund sdk.Coins, spec string) error { diff --git a/x/rewards/keeper/iprpc_data.go b/x/rewards/keeper/iprpc_data.go index a0c5541da1..f29071fc9f 100644 --- a/x/rewards/keeper/iprpc_data.go +++ b/x/rewards/keeper/iprpc_data.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" ) func (k Keeper) SetIprpcData(ctx sdk.Context, cost sdk.Coin, subs []string) error { diff --git a/x/rewards/keeper/iprpc_data_test.go b/x/rewards/keeper/iprpc_data_test.go index 85de563c11..acd59f6fdc 100644 --- a/x/rewards/keeper/iprpc_data_test.go +++ b/x/rewards/keeper/iprpc_data_test.go @@ -5,17 +5,17 @@ import ( "testing" "cosmossdk.io/math" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/rewards/keeper" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/rewards/keeper" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/testutil/sample" ) // Prevent strconv unused error diff --git a/x/rewards/keeper/iprpc_reward.go b/x/rewards/keeper/iprpc_reward.go index 41602d88c2..82138786da 100644 --- a/x/rewards/keeper/iprpc_reward.go +++ b/x/rewards/keeper/iprpc_reward.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" ) // GetIprpcRewardsCurrentId get the total number of IprpcReward diff --git a/x/rewards/keeper/iprpc_test.go b/x/rewards/keeper/iprpc_test.go index 7cf2a6ccea..a1fba6cb94 100644 --- a/x/rewards/keeper/iprpc_test.go +++ b/x/rewards/keeper/iprpc_test.go @@ -6,9 +6,9 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/sigs" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/sigs" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/keeper/keeper.go b/x/rewards/keeper/keeper.go index 3969f63b2f..a74ef74d80 100644 --- a/x/rewards/keeper/keeper.go +++ b/x/rewards/keeper/keeper.go @@ -10,9 +10,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - collcompat "github.com/lavanet/lava/v3/utils/collcompat" - "github.com/lavanet/lava/v3/x/rewards/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + collcompat "github.com/lavanet/lava/v4/utils/collcompat" + "github.com/lavanet/lava/v4/x/rewards/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) type ( diff --git a/x/rewards/keeper/msg_server.go b/x/rewards/keeper/msg_server.go index e44a39ce58..d2a97b28b0 100644 --- a/x/rewards/keeper/msg_server.go +++ b/x/rewards/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" ) type msgServer struct { diff --git a/x/rewards/keeper/msg_server_fund_iprpc.go b/x/rewards/keeper/msg_server_fund_iprpc.go index 77ca0fb38e..8dca29ce4f 100644 --- a/x/rewards/keeper/msg_server_fund_iprpc.go +++ b/x/rewards/keeper/msg_server_fund_iprpc.go @@ -5,8 +5,8 @@ import ( "strconv" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" ) func (k msgServer) FundIprpc(goCtx context.Context, msg *types.MsgFundIprpc) (*types.MsgFundIprpcResponse, error) { diff --git a/x/rewards/keeper/msg_server_set_iprpc_data.go b/x/rewards/keeper/msg_server_set_iprpc_data.go index e87cc068b1..3f8313bbbc 100644 --- a/x/rewards/keeper/msg_server_set_iprpc_data.go +++ b/x/rewards/keeper/msg_server_set_iprpc_data.go @@ -7,8 +7,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" ) func (k msgServer) SetIprpcData(goCtx context.Context, msg *types.MsgSetIprpcData) (*types.MsgSetIprpcDataResponse, error) { diff --git a/x/rewards/keeper/msg_server_test.go b/x/rewards/keeper/msg_server_test.go index e152b10b53..da58116073 100644 --- a/x/rewards/keeper/msg_server_test.go +++ b/x/rewards/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/rewards/keeper" - "github.com/lavanet/lava/v3/x/rewards/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/rewards/keeper" + "github.com/lavanet/lava/v4/x/rewards/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { diff --git a/x/rewards/keeper/params.go b/x/rewards/keeper/params.go index ded8ea66cd..bb829422fd 100644 --- a/x/rewards/keeper/params.go +++ b/x/rewards/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" ) // GetParams get all parameters as types.Params diff --git a/x/rewards/keeper/params_test.go b/x/rewards/keeper/params_test.go index b3f7772e70..4346e571d6 100644 --- a/x/rewards/keeper/params_test.go +++ b/x/rewards/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/rewards/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/keeper/pool.go b/x/rewards/keeper/pool.go index 11326a2cdf..da9fccd546 100644 --- a/x/rewards/keeper/pool.go +++ b/x/rewards/keeper/pool.go @@ -4,7 +4,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" ) // TotalPoolTokens gets the total tokens supply from a pool diff --git a/x/rewards/keeper/pool_test.go b/x/rewards/keeper/pool_test.go index cec811e3fc..2516c47a26 100644 --- a/x/rewards/keeper/pool_test.go +++ b/x/rewards/keeper/pool_test.go @@ -7,11 +7,11 @@ import ( abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" distribution "github.com/cosmos/cosmos-sdk/x/distribution" - "github.com/lavanet/lava/v3/testutil/common" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/testutil/common" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/keeper/providers.go b/x/rewards/keeper/providers.go index c1138bef93..4ad9b0befd 100644 --- a/x/rewards/keeper/providers.go +++ b/x/rewards/keeper/providers.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) const DAY_SECONDS = 60 * 60 * 24 diff --git a/x/rewards/keeper/providers_test.go b/x/rewards/keeper/providers_test.go index f0bd069702..56b01aafdb 100644 --- a/x/rewards/keeper/providers_test.go +++ b/x/rewards/keeper/providers_test.go @@ -6,10 +6,10 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/lavanet/lava/v3/testutil/common" - "github.com/lavanet/lava/v3/utils/sigs" - "github.com/lavanet/lava/v3/x/rewards/types" - subscription "github.com/lavanet/lava/v3/x/subscription/keeper" + "github.com/lavanet/lava/v4/testutil/common" + "github.com/lavanet/lava/v4/utils/sigs" + "github.com/lavanet/lava/v4/x/rewards/types" + subscription "github.com/lavanet/lava/v4/x/subscription/keeper" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/keeper/rewards.go b/x/rewards/keeper/rewards.go index 4a8876d321..c4d0fdc080 100644 --- a/x/rewards/keeper/rewards.go +++ b/x/rewards/keeper/rewards.go @@ -9,9 +9,9 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/rewards/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/rewards/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) func (k Keeper) DistributeBlockReward(ctx sdk.Context) { diff --git a/x/rewards/module.go b/x/rewards/module.go index 094a535682..7ff6796541 100644 --- a/x/rewards/module.go +++ b/x/rewards/module.go @@ -16,9 +16,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/rewards/client/cli" - "github.com/lavanet/lava/v3/x/rewards/keeper" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/client/cli" + "github.com/lavanet/lava/v4/x/rewards/keeper" + "github.com/lavanet/lava/v4/x/rewards/types" ) var ( diff --git a/x/rewards/module_simulation.go b/x/rewards/module_simulation.go index 6504793ec2..a5f6613792 100644 --- a/x/rewards/module_simulation.go +++ b/x/rewards/module_simulation.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - rewardssimulation "github.com/lavanet/lava/v3/x/rewards/simulation" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/testutil/sample" + rewardssimulation "github.com/lavanet/lava/v4/x/rewards/simulation" + "github.com/lavanet/lava/v4/x/rewards/types" ) // avoid unused import issue diff --git a/x/rewards/types/base_pay.pb.go b/x/rewards/types/base_pay.pb.go index 09c60e6539..edcf9b9100 100644 --- a/x/rewards/types/base_pay.pb.go +++ b/x/rewards/types/base_pay.pb.go @@ -148,28 +148,28 @@ var fileDescriptor_a2fb0eb917a4ee4e = []byte{ // 375 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xc1, 0x4a, 0xeb, 0x40, 0x14, 0xcd, 0xbc, 0xd7, 0xf7, 0x52, 0x47, 0x04, 0x0d, 0x5d, 0xb4, 0x05, 0xd3, 0x52, 0x41, 0x8a, - 0xd0, 0x19, 0x6a, 0xb7, 0x22, 0x58, 0xbb, 0xc9, 0x4e, 0x82, 0x20, 0xb8, 0x09, 0x93, 0x64, 0x68, - 0x47, 0xdb, 0x4c, 0x48, 0x26, 0xb1, 0xfd, 0x04, 0x77, 0x7e, 0x8c, 0x1f, 0xd1, 0x95, 0x14, 0x57, - 0xe2, 0xa2, 0x48, 0xfb, 0x23, 0x92, 0x99, 0xb1, 0x58, 0x70, 0xe3, 0x26, 0xf7, 0x9e, 0x7b, 0x6f, - 0xce, 0x9d, 0xc3, 0xb9, 0xf0, 0x68, 0x4c, 0x72, 0x12, 0x51, 0x81, 0x8b, 0x88, 0x13, 0xfa, 0x40, - 0x92, 0x30, 0xc5, 0x3e, 0x49, 0xa9, 0x17, 0x93, 0x19, 0x8a, 0x13, 0x2e, 0xb8, 0x55, 0xd1, 0x43, - 0xa8, 0x88, 0x48, 0x0f, 0xd5, 0x0f, 0xc8, 0x84, 0x45, 0x1c, 0xcb, 0xaf, 0x1a, 0xac, 0xdb, 0x01, - 0x4f, 0x27, 0x5c, 0xfd, 0x8f, 0xf3, 0xae, 0x4f, 0x05, 0xe9, 0xe2, 0x80, 0xb3, 0x48, 0xf7, 0x6b, - 0xaa, 0xef, 0x49, 0x84, 0x15, 0xd0, 0xad, 0xca, 0x90, 0x0f, 0xb9, 0xaa, 0x17, 0x99, 0xaa, 0xb6, - 0x5e, 0x00, 0x34, 0xfb, 0x24, 0xa5, 0x57, 0x64, 0x66, 0xb9, 0xf0, 0x9f, 0xe0, 0x82, 0x8c, 0xab, - 0xa0, 0x09, 0xda, 0x3b, 0xfd, 0xb3, 0xf9, 0xb2, 0x61, 0xbc, 0x2f, 0x1b, 0xc7, 0x43, 0x26, 0x46, - 0x99, 0x8f, 0x02, 0x3e, 0xd1, 0x8c, 0x3a, 0x74, 0xd2, 0xf0, 0x1e, 0x8b, 0x59, 0x4c, 0x53, 0xe4, - 0x44, 0xe2, 0xf5, 0xb9, 0x03, 0xf5, 0x42, 0x27, 0x12, 0xae, 0xa2, 0xb2, 0xae, 0xe1, 0x9e, 0x4c, - 0x2e, 0xc2, 0xbb, 0x2c, 0x15, 0x34, 0xac, 0xfe, 0x91, 0xdc, 0xe8, 0x17, 0xdc, 0x03, 0x1a, 0xb8, - 0xdb, 0x24, 0x56, 0x0d, 0x96, 0x59, 0x9c, 0xc4, 0x81, 0x17, 0x64, 0xd5, 0xbf, 0x4d, 0xd0, 0x2e, - 0xb9, 0xa6, 0xc4, 0x97, 0x59, 0xeb, 0x11, 0xc0, 0x7d, 0x2d, 0xe8, 0x86, 0x89, 0x91, 0x13, 0x85, - 0x74, 0x6a, 0xd5, 0x61, 0x39, 0x4e, 0x78, 0xce, 0x42, 0x9a, 0x28, 0x71, 0xee, 0x06, 0x17, 0x5c, - 0xc1, 0x88, 0xb0, 0xc8, 0x63, 0xfa, 0x71, 0xae, 0x29, 0xb1, 0x13, 0x5a, 0xe7, 0xb0, 0xfc, 0x65, - 0x94, 0x5c, 0xb3, 0x7b, 0x7a, 0x88, 0x7e, 0x72, 0x0a, 0xe9, 0x85, 0xfd, 0x52, 0x21, 0xcb, 0x35, - 0x7d, 0x0d, 0x07, 0xf3, 0x95, 0x0d, 0x16, 0x2b, 0x1b, 0x7c, 0xac, 0x6c, 0xf0, 0xb4, 0xb6, 0x8d, - 0xc5, 0xda, 0x36, 0xde, 0xd6, 0xb6, 0x71, 0x7b, 0xf2, 0x4d, 0xf7, 0xd6, 0x81, 0xe4, 0x3d, 0x3c, - 0xdd, 0x5c, 0x89, 0xd4, 0xef, 0xff, 0x97, 0x4e, 0xf5, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x59, - 0xf7, 0xea, 0xe3, 0x4a, 0x02, 0x00, 0x00, + 0xd0, 0x19, 0xaa, 0x2e, 0x45, 0xb0, 0x76, 0x93, 0x9d, 0x04, 0x41, 0x70, 0x13, 0x26, 0xc9, 0xd0, + 0x8e, 0xb6, 0x99, 0x90, 0x4c, 0x62, 0xfb, 0x09, 0xee, 0xfc, 0x18, 0x3f, 0xa2, 0x2b, 0x29, 0xae, + 0xc4, 0x45, 0x91, 0xf6, 0x47, 0x24, 0x33, 0x63, 0xb1, 0xe0, 0xc6, 0x4d, 0xee, 0x3d, 0xf7, 0xde, + 0x9c, 0x3b, 0x87, 0x73, 0xe1, 0xc1, 0x88, 0xe4, 0x24, 0xa2, 0x02, 0x17, 0x11, 0x27, 0xf4, 0x81, + 0x24, 0x61, 0x8a, 0x7d, 0x92, 0x52, 0x2f, 0x26, 0x53, 0x14, 0x27, 0x5c, 0x70, 0xab, 0xa2, 0x87, + 0x50, 0x11, 0x91, 0x1e, 0xaa, 0xef, 0x91, 0x31, 0x8b, 0x38, 0x96, 0x5f, 0x35, 0x58, 0xb7, 0x03, + 0x9e, 0x8e, 0xb9, 0xfa, 0x1f, 0xe7, 0x5d, 0x9f, 0x0a, 0xd2, 0xc5, 0x01, 0x67, 0x91, 0xee, 0xd7, + 0x54, 0xdf, 0x93, 0x08, 0x2b, 0xa0, 0x5b, 0x95, 0x01, 0x1f, 0x70, 0x55, 0x2f, 0x32, 0x55, 0x6d, + 0xbd, 0x00, 0x68, 0xf6, 0x48, 0x4a, 0xaf, 0xc8, 0xd4, 0x72, 0xe1, 0x3f, 0xc1, 0x05, 0x19, 0x55, + 0x41, 0x13, 0xb4, 0xb7, 0x7a, 0x67, 0xb3, 0x45, 0xc3, 0x78, 0x5f, 0x34, 0x0e, 0x07, 0x4c, 0x0c, + 0x33, 0x1f, 0x05, 0x7c, 0xac, 0x19, 0x75, 0xe8, 0xa4, 0xe1, 0x3d, 0x16, 0xd3, 0x98, 0xa6, 0xc8, + 0x89, 0xc4, 0xeb, 0x73, 0x07, 0xea, 0x85, 0x4e, 0x24, 0x5c, 0x45, 0x65, 0x5d, 0xc3, 0x1d, 0x99, + 0x5c, 0x84, 0x77, 0x59, 0x2a, 0x68, 0x58, 0xfd, 0x23, 0xb9, 0xd1, 0x2f, 0xb8, 0xfb, 0x34, 0x70, + 0x37, 0x49, 0xac, 0x1a, 0x2c, 0xb3, 0x38, 0x89, 0x03, 0x2f, 0xc8, 0xaa, 0x7f, 0x9b, 0xa0, 0x5d, + 0x72, 0x4d, 0x89, 0x2f, 0xb3, 0xd6, 0x23, 0x80, 0xbb, 0x5a, 0xd0, 0x0d, 0x13, 0x43, 0x27, 0x0a, + 0xe9, 0xc4, 0xaa, 0xc3, 0x72, 0x9c, 0xf0, 0x9c, 0x85, 0x34, 0x51, 0xe2, 0xdc, 0x35, 0x2e, 0xb8, + 0x82, 0x21, 0x61, 0x91, 0xc7, 0xf4, 0xe3, 0x5c, 0x53, 0x62, 0x27, 0xb4, 0xce, 0x61, 0xf9, 0xcb, + 0x28, 0xb9, 0x66, 0xfb, 0x78, 0x1f, 0xfd, 0xe4, 0x14, 0xd2, 0x0b, 0x7b, 0xa5, 0x42, 0x96, 0x6b, + 0xfa, 0x1a, 0xf6, 0x67, 0x4b, 0x1b, 0xcc, 0x97, 0x36, 0xf8, 0x58, 0xda, 0xe0, 0x69, 0x65, 0x1b, + 0xf3, 0x95, 0x6d, 0xbc, 0xad, 0x6c, 0xe3, 0xf6, 0xe8, 0x9b, 0xee, 0x8d, 0x03, 0xc9, 0x4f, 0xf1, + 0x64, 0x7d, 0x25, 0x52, 0xbf, 0xff, 0x5f, 0x3a, 0x75, 0xf2, 0x19, 0x00, 0x00, 0xff, 0xff, 0xf1, + 0x0b, 0xba, 0x2d, 0x4a, 0x02, 0x00, 0x00, } func (m *BasePay) Marshal() (dAtA []byte, err error) { diff --git a/x/rewards/types/expected_keepers.go b/x/rewards/types/expected_keepers.go index ec722b8f9d..a59877db44 100644 --- a/x/rewards/types/expected_keepers.go +++ b/x/rewards/types/expected_keepers.go @@ -5,10 +5,10 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - v1 "github.com/lavanet/lava/v3/x/downtime/v1" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - spectypes "github.com/lavanet/lava/v3/x/spec/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + v1 "github.com/lavanet/lava/v4/x/downtime/v1" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/rewards/types/genesis.go b/x/rewards/types/genesis.go index a3c1332cf1..05a215b45e 100644 --- a/x/rewards/types/genesis.go +++ b/x/rewards/types/genesis.go @@ -4,8 +4,8 @@ import ( fmt "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/x/timerstore/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/x/timerstore/types" ) // this line is used by starport scaffolding # genesis/types/import diff --git a/x/rewards/types/genesis.pb.go b/x/rewards/types/genesis.pb.go index 440b87ca97..d3cebcb0cf 100644 --- a/x/rewards/types/genesis.pb.go +++ b/x/rewards/types/genesis.pb.go @@ -8,7 +8,7 @@ import ( types1 "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/timerstore/types" + types "github.com/lavanet/lava/v4/x/timerstore/types" io "io" math "math" math_bits "math/bits" @@ -127,35 +127,35 @@ func init() { } var fileDescriptor_02c24f4df31ca14e = []byte{ - // 442 bytes of a gzipped FileDescriptorProto + // 443 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x41, 0x6f, 0xd3, 0x30, 0x14, 0xc7, 0x1b, 0x52, 0x0a, 0xf3, 0x06, 0x48, 0xde, 0x90, 0xc2, 0x84, 0x42, 0x36, 0x04, 0x8a, - 0x38, 0xd8, 0x5a, 0x77, 0xe3, 0xd8, 0x82, 0x50, 0x25, 0x0e, 0x53, 0x0a, 0x42, 0xe2, 0x12, 0x39, - 0x99, 0xc9, 0x2c, 0x35, 0x76, 0xe4, 0xe7, 0x96, 0xf5, 0x5b, 0xf0, 0xb1, 0x76, 0xdc, 0x91, 0x13, - 0x42, 0xad, 0xc4, 0xe7, 0x40, 0xb1, 0x3d, 0xda, 0xa2, 0x9c, 0x6c, 0xbd, 0xf7, 0x7f, 0xbf, 0xf7, - 0xfe, 0xf6, 0x43, 0xa7, 0x33, 0xb6, 0x60, 0x92, 0x1b, 0xda, 0x9e, 0x54, 0xf3, 0xef, 0x4c, 0x5f, - 0x02, 0xad, 0xb8, 0xe4, 0x20, 0x80, 0x34, 0x5a, 0x19, 0x85, 0x8f, 0xbc, 0x86, 0xb4, 0x27, 0xf1, - 0x9a, 0xe3, 0xb8, 0x54, 0x50, 0x2b, 0xa0, 0x05, 0x03, 0x4e, 0x17, 0x67, 0x05, 0x37, 0xec, 0x8c, - 0x96, 0x4a, 0x48, 0x57, 0x75, 0x7c, 0x54, 0xa9, 0x4a, 0xd9, 0x2b, 0x6d, 0x6f, 0x3e, 0xfa, 0xb2, - 0xb3, 0x5f, 0xcb, 0xc8, 0x1b, 0xb6, 0xf4, 0xa2, 0xa4, 0x53, 0x24, 0x1a, 0xdd, 0x94, 0x5e, 0x71, - 0xd2, 0xa9, 0x68, 0x98, 0x66, 0x35, 0x74, 0x76, 0x32, 0xa2, 0xe6, 0x1a, 0x8c, 0xd2, 0xdc, 0x5d, - 0x9d, 0xe8, 0xf4, 0x4f, 0x88, 0x0e, 0x3e, 0x38, 0xb3, 0x53, 0xc3, 0x0c, 0xc7, 0x6f, 0xd1, 0xc0, - 0x51, 0xa2, 0x20, 0x09, 0xd2, 0xfd, 0xe1, 0x73, 0xd2, 0x65, 0x9e, 0x5c, 0x58, 0xcd, 0xa8, 0x7f, - 0xf3, 0xeb, 0x45, 0x2f, 0xf3, 0x15, 0xf8, 0x33, 0x7a, 0xa2, 0xf9, 0x37, 0x31, 0x9b, 0x65, 0x4e, - 0xf5, 0x69, 0x1a, 0xdd, 0xb3, 0x90, 0x57, 0xbb, 0x90, 0xcd, 0x2c, 0x64, 0xbb, 0xb7, 0xa7, 0xfd, - 0xcf, 0xc0, 0x13, 0xb4, 0x77, 0xf7, 0x3e, 0x10, 0x85, 0x49, 0x98, 0xee, 0x0f, 0x5f, 0x77, 0x4f, - 0x35, 0x62, 0xc0, 0x2f, 0xd8, 0xf2, 0x8b, 0x30, 0x57, 0x13, 0x79, 0xc9, 0xaf, 0x3d, 0xf1, 0x61, - 0xe1, 0xe2, 0x80, 0x29, 0x3a, 0xb4, 0xaf, 0x98, 0xc3, 0xbc, 0x80, 0x52, 0x8b, 0xc6, 0x08, 0x25, - 0x21, 0xea, 0x27, 0x61, 0xba, 0x97, 0x61, 0x9b, 0x9a, 0x6e, 0x67, 0xf0, 0x7b, 0xf4, 0xb8, 0x16, - 0x32, 0x77, 0x45, 0xa5, 0x02, 0x13, 0xdd, 0xb7, 0x8e, 0x9e, 0x11, 0xf7, 0xfb, 0xa4, 0x45, 0x13, - 0xff, 0xfb, 0x64, 0xac, 0x84, 0xf4, 0x3d, 0x0f, 0x6a, 0x21, 0x27, 0x6d, 0xd5, 0x58, 0x81, 0xc1, - 0x1f, 0xd1, 0x23, 0x87, 0xf0, 0x93, 0x46, 0x03, 0x6b, 0xe3, 0xa4, 0xdb, 0x86, 0xad, 0x73, 0xfe, - 0xef, 0x68, 0x62, 0x13, 0x02, 0x3c, 0x44, 0x4f, 0x77, 0x68, 0x79, 0x39, 0xd7, 0x9a, 0x4b, 0x13, - 0x3d, 0x48, 0x82, 0xb4, 0x9f, 0x1d, 0x6e, 0x8b, 0xc7, 0x2e, 0x35, 0x7a, 0x77, 0xb3, 0x8a, 0x83, - 0xdb, 0x55, 0x1c, 0xfc, 0x5e, 0xc5, 0xc1, 0x8f, 0x75, 0xdc, 0xbb, 0x5d, 0xc7, 0xbd, 0x9f, 0xeb, - 0xb8, 0xf7, 0xf5, 0x4d, 0x25, 0xcc, 0xd5, 0xbc, 0x20, 0xa5, 0xaa, 0xe9, 0xce, 0xca, 0x2c, 0xce, - 0xe9, 0xf5, 0xbf, 0xd5, 0x32, 0xcb, 0x86, 0x43, 0x31, 0xb0, 0x5b, 0x73, 0xfe, 0x37, 0x00, 0x00, - 0xff, 0xff, 0x4b, 0x52, 0xef, 0x5e, 0x36, 0x03, 0x00, 0x00, + 0x38, 0xd8, 0x5a, 0xe1, 0xc4, 0xb1, 0x05, 0xa1, 0x4a, 0x1c, 0xa6, 0x14, 0x84, 0xc4, 0x25, 0x72, + 0x32, 0x93, 0x59, 0x6a, 0xec, 0xc8, 0xcf, 0x2d, 0xeb, 0xb7, 0xe0, 0x63, 0xed, 0xb8, 0x23, 0x27, + 0x84, 0x5a, 0x89, 0xcf, 0x81, 0x62, 0x7b, 0xb4, 0x45, 0x39, 0xd9, 0x7a, 0xef, 0xff, 0x7e, 0xef, + 0xfd, 0xed, 0x87, 0x4e, 0x67, 0x6c, 0xc1, 0x24, 0x37, 0xb4, 0x3d, 0xa9, 0xe6, 0xdf, 0x99, 0xbe, + 0x00, 0x5a, 0x71, 0xc9, 0x41, 0x00, 0x69, 0xb4, 0x32, 0x0a, 0x1f, 0x79, 0x0d, 0x69, 0x4f, 0xe2, + 0x35, 0xc7, 0x71, 0xa9, 0xa0, 0x56, 0x40, 0x0b, 0x06, 0x9c, 0x2e, 0xce, 0x0a, 0x6e, 0xd8, 0x19, + 0x2d, 0x95, 0x90, 0xae, 0xea, 0xf8, 0xa8, 0x52, 0x95, 0xb2, 0x57, 0xda, 0xde, 0x7c, 0xf4, 0x79, + 0x67, 0xbf, 0x96, 0x91, 0x37, 0x6c, 0xe9, 0x45, 0x49, 0xa7, 0x48, 0x34, 0xba, 0x29, 0xbd, 0xe2, + 0xa4, 0x53, 0xd1, 0x30, 0xcd, 0x6a, 0xe8, 0xec, 0x64, 0x44, 0xcd, 0x35, 0x18, 0xa5, 0xb9, 0xbb, + 0x3a, 0xd1, 0xe9, 0x9f, 0x10, 0x1d, 0x7c, 0x70, 0x66, 0xa7, 0x86, 0x19, 0x8e, 0xdf, 0xa2, 0x81, + 0xa3, 0x44, 0x41, 0x12, 0xa4, 0xfb, 0xc3, 0xa7, 0xa4, 0xcb, 0x3c, 0x39, 0xb7, 0x9a, 0x51, 0xff, + 0xfa, 0xd7, 0xb3, 0x5e, 0xe6, 0x2b, 0xf0, 0x67, 0xf4, 0x48, 0xf3, 0x6f, 0x62, 0x36, 0xcb, 0x9c, + 0xea, 0xd3, 0x34, 0xba, 0x63, 0x21, 0x2f, 0x76, 0x21, 0x9b, 0x59, 0xc8, 0x76, 0x6f, 0x4f, 0xfb, + 0x9f, 0x81, 0x27, 0x68, 0xef, 0xf6, 0x7d, 0x20, 0x0a, 0x93, 0x30, 0xdd, 0x1f, 0xbe, 0xec, 0x9e, + 0x6a, 0xc4, 0x80, 0x9f, 0xb3, 0xe5, 0x17, 0x61, 0x2e, 0x27, 0xf2, 0x82, 0x5f, 0x79, 0xe2, 0xfd, + 0xc2, 0xc5, 0x01, 0x53, 0x74, 0x68, 0x5f, 0x31, 0x87, 0x79, 0x01, 0xa5, 0x16, 0x8d, 0x11, 0x4a, + 0x42, 0xd4, 0x4f, 0xc2, 0x74, 0x2f, 0xc3, 0x36, 0x35, 0xdd, 0xce, 0xe0, 0xf7, 0xe8, 0x61, 0x2d, + 0x64, 0xee, 0x8a, 0x4a, 0x05, 0x26, 0xba, 0x6b, 0x1d, 0x3d, 0x21, 0xee, 0xf7, 0x49, 0x8b, 0x26, + 0xfe, 0xf7, 0xc9, 0x58, 0x09, 0xe9, 0x7b, 0x1e, 0xd4, 0x42, 0x4e, 0xda, 0xaa, 0xb1, 0x02, 0x83, + 0x3f, 0xa2, 0x07, 0x0e, 0xe1, 0x27, 0x8d, 0x06, 0xd6, 0xc6, 0x49, 0xb7, 0x0d, 0x5b, 0xe7, 0xfc, + 0xdf, 0xd2, 0xc4, 0x26, 0x04, 0x78, 0x88, 0x1e, 0xef, 0xd0, 0xf2, 0x72, 0xae, 0x35, 0x97, 0x26, + 0xba, 0x97, 0x04, 0x69, 0x3f, 0x3b, 0xdc, 0x16, 0x8f, 0x5d, 0x6a, 0xf4, 0xee, 0x7a, 0x15, 0x07, + 0x37, 0xab, 0x38, 0xf8, 0xbd, 0x8a, 0x83, 0x1f, 0xeb, 0xb8, 0x77, 0xb3, 0x8e, 0x7b, 0x3f, 0xd7, + 0x71, 0xef, 0xeb, 0xab, 0x4a, 0x98, 0xcb, 0x79, 0x41, 0x4a, 0x55, 0xd3, 0x9d, 0x95, 0x59, 0xbc, + 0xa1, 0x57, 0xff, 0x56, 0xcb, 0x2c, 0x1b, 0x0e, 0xc5, 0xc0, 0x6e, 0xcd, 0xeb, 0xbf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xe3, 0xae, 0xbf, 0x90, 0x36, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/rewards/types/genesis_test.go b/x/rewards/types/genesis_test.go index c681f3270a..7ebf5b18b6 100644 --- a/x/rewards/types/genesis_test.go +++ b/x/rewards/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/rewards/types" + "github.com/lavanet/lava/v4/x/rewards/types" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/types/iprpc.pb.go b/x/rewards/types/iprpc.pb.go index cdb5ade74c..ae7c618d92 100644 --- a/x/rewards/types/iprpc.pb.go +++ b/x/rewards/types/iprpc.pb.go @@ -141,23 +141,23 @@ var fileDescriptor_1293618a311573f7 = []byte{ // 303 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x31, 0x4e, 0xc3, 0x30, 0x14, 0x86, 0x93, 0x10, 0x21, 0xea, 0x4a, 0x0c, 0x56, 0x87, 0xd2, 0xc1, 0x8d, 0x3a, 0x45, 0x48, - 0xd8, 0x94, 0xde, 0x20, 0x45, 0x48, 0xac, 0x61, 0x63, 0xa9, 0x12, 0xc7, 0x04, 0x0b, 0x1a, 0x5b, - 0x71, 0x1a, 0x60, 0xe2, 0x0a, 0x9c, 0x83, 0x93, 0x74, 0xec, 0xc8, 0x04, 0x28, 0xb9, 0x08, 0x7a, - 0x4e, 0x40, 0x20, 0x31, 0x3d, 0x4b, 0xff, 0xff, 0xbe, 0xf7, 0xfb, 0x47, 0xc1, 0x7d, 0x52, 0x27, - 0x85, 0xa8, 0x18, 0x4c, 0x56, 0x8a, 0x87, 0xa4, 0xcc, 0x0c, 0x93, 0xba, 0xd4, 0x9c, 0xea, 0x52, - 0x55, 0x0a, 0x8f, 0x7a, 0x07, 0x85, 0x49, 0x7b, 0xc7, 0x64, 0x94, 0xab, 0x5c, 0x59, 0x03, 0x83, - 0x57, 0xe7, 0x9d, 0x10, 0xae, 0xcc, 0x5a, 0x19, 0x96, 0x26, 0x46, 0xb0, 0x7a, 0x9e, 0x8a, 0x2a, - 0x99, 0x33, 0xae, 0x64, 0xd1, 0xe9, 0xb3, 0x14, 0x0d, 0x2f, 0x01, 0x1d, 0x5b, 0x0a, 0x3e, 0x44, - 0x9e, 0xcc, 0xc6, 0x6e, 0xe0, 0x86, 0x7e, 0xec, 0xc9, 0x0c, 0x2f, 0x11, 0x32, 0x5a, 0xf0, 0xd5, - 0xcd, 0xa6, 0xc8, 0xcc, 0xd8, 0x0b, 0xf6, 0xc2, 0xe1, 0x19, 0xa1, 0xff, 0xdd, 0xa7, 0x57, 0x5a, - 0x70, 0xb0, 0x45, 0xfe, 0xf6, 0x7d, 0xea, 0xc4, 0x03, 0xd8, 0xbb, 0x80, 0xb5, 0xd9, 0x33, 0x3a, - 0xf8, 0x16, 0x31, 0x46, 0x3e, 0x08, 0xf6, 0xc4, 0x20, 0xb6, 0x6f, 0xbc, 0x42, 0x3e, 0x68, 0x3d, - 0xfe, 0x88, 0x76, 0x91, 0x29, 0x44, 0xa6, 0x7d, 0x64, 0xba, 0x54, 0xb2, 0x88, 0x4e, 0x81, 0xfc, - 0xfa, 0x31, 0x0d, 0x73, 0x59, 0xdd, 0x6e, 0x52, 0xca, 0xd5, 0x9a, 0xf5, 0xff, 0xeb, 0xc6, 0x89, - 0xc9, 0xee, 0x58, 0xf5, 0xa4, 0x85, 0xb1, 0x0b, 0x26, 0xb6, 0xe0, 0xe8, 0x7c, 0xdb, 0x10, 0x77, - 0xd7, 0x10, 0xf7, 0xb3, 0x21, 0xee, 0x4b, 0x4b, 0x9c, 0x5d, 0x4b, 0x9c, 0xb7, 0x96, 0x38, 0xd7, - 0xc7, 0xbf, 0x48, 0x7f, 0x7a, 0xaf, 0x17, 0xec, 0xf1, 0xa7, 0x7c, 0x4b, 0x4c, 0xf7, 0x6d, 0x63, - 0x8b, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x47, 0xc4, 0x6b, 0xa8, 0xa1, 0x01, 0x00, 0x00, + 0xd8, 0x14, 0x38, 0x41, 0x8a, 0x90, 0x58, 0xc3, 0xc6, 0x52, 0x25, 0x8e, 0x09, 0x16, 0x34, 0xb6, + 0xe2, 0x34, 0xc0, 0xc4, 0x15, 0x38, 0x07, 0x27, 0xe9, 0xd8, 0x91, 0x09, 0x50, 0x72, 0x11, 0xf4, + 0x9c, 0x80, 0x40, 0x62, 0x7a, 0x96, 0xfe, 0xff, 0x7d, 0xef, 0xf7, 0x8f, 0x82, 0xfb, 0xa4, 0x4e, + 0x0a, 0x51, 0x31, 0x98, 0xac, 0x14, 0x0f, 0x49, 0x99, 0x19, 0x26, 0x75, 0xa9, 0x39, 0xd5, 0xa5, + 0xaa, 0x14, 0x1e, 0xf5, 0x0e, 0x0a, 0x93, 0xf6, 0x8e, 0xc9, 0x28, 0x57, 0xb9, 0xb2, 0x06, 0x06, + 0xaf, 0xce, 0x3b, 0x21, 0x5c, 0x99, 0x95, 0x32, 0x2c, 0x4d, 0x8c, 0x60, 0xf5, 0x3c, 0x15, 0x55, + 0x32, 0x67, 0x5c, 0xc9, 0xa2, 0xd3, 0x67, 0x29, 0x1a, 0x5e, 0x02, 0x3a, 0xb6, 0x14, 0xbc, 0x8f, + 0x3c, 0x99, 0x8d, 0xdd, 0xc0, 0x0d, 0xfd, 0xd8, 0x93, 0x19, 0x5e, 0x20, 0x64, 0xb4, 0xe0, 0xcb, + 0x9b, 0x75, 0x91, 0x99, 0xb1, 0x17, 0xec, 0x84, 0xc3, 0x13, 0x42, 0xff, 0xbb, 0x4f, 0xaf, 0xb4, + 0xe0, 0x60, 0x8b, 0xfc, 0xcd, 0xfb, 0xd4, 0x89, 0x07, 0xb0, 0x77, 0x01, 0x6b, 0xb3, 0x67, 0xb4, + 0xf7, 0x2d, 0x62, 0x8c, 0x7c, 0x10, 0xec, 0x89, 0x41, 0x6c, 0xdf, 0x78, 0x89, 0x7c, 0xd0, 0x7a, + 0xfc, 0x01, 0xed, 0x22, 0x53, 0x88, 0x4c, 0xfb, 0xc8, 0x74, 0xa1, 0x64, 0x11, 0x1d, 0x03, 0xf9, + 0xf5, 0x63, 0x1a, 0xe6, 0xb2, 0xba, 0x5d, 0xa7, 0x94, 0xab, 0x15, 0xeb, 0xff, 0xd7, 0x8d, 0x23, + 0x93, 0xdd, 0xb1, 0xea, 0x49, 0x0b, 0x63, 0x17, 0x4c, 0x6c, 0xc1, 0xd1, 0xf9, 0xa6, 0x21, 0xee, + 0xb6, 0x21, 0xee, 0x67, 0x43, 0xdc, 0x97, 0x96, 0x38, 0xdb, 0x96, 0x38, 0x6f, 0x2d, 0x71, 0xae, + 0x0f, 0x7f, 0x91, 0xfe, 0xf4, 0x5e, 0x9f, 0xb1, 0xc7, 0x9f, 0xf2, 0x2d, 0x31, 0xdd, 0xb5, 0x8d, + 0x9d, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0xef, 0x38, 0x3b, 0x66, 0xa1, 0x01, 0x00, 0x00, } func (m *IprpcReward) Marshal() (dAtA []byte, err error) { diff --git a/x/rewards/types/message_fund_iprpc_test.go b/x/rewards/types/message_fund_iprpc_test.go index 24a196edf4..8701bc245e 100644 --- a/x/rewards/types/message_fund_iprpc_test.go +++ b/x/rewards/types/message_fund_iprpc_test.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/types/message_set_iprpc_data_test.go b/x/rewards/types/message_set_iprpc_data_test.go index 46fd398a80..a723accffb 100644 --- a/x/rewards/types/message_set_iprpc_data_test.go +++ b/x/rewards/types/message_set_iprpc_data_test.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/sample" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + "github.com/lavanet/lava/v4/testutil/sample" + commontypes "github.com/lavanet/lava/v4/utils/common/types" "github.com/stretchr/testify/require" ) diff --git a/x/rewards/types/params.pb.go b/x/rewards/types/params.pb.go index 6d245a526a..1e53f187a4 100644 --- a/x/rewards/types/params.pb.go +++ b/x/rewards/types/params.pb.go @@ -80,34 +80,34 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/rewards/params.proto", fileDescriptor_12687c5fbcde5c39) } var fileDescriptor_12687c5fbcde5c39 = []byte{ - // 421 bytes of a gzipped FileDescriptorProto + // 422 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xbf, 0x8e, 0x94, 0x50, 0x14, 0xc6, 0x41, 0x67, 0x27, 0xd9, 0x5b, 0xe8, 0x2e, 0xd9, 0x02, 0x2d, 0x60, 0xc5, 0x68, 0x26, - 0x46, 0xa1, 0xd8, 0x6e, 0x4b, 0xdc, 0x58, 0x68, 0xb3, 0x41, 0x2b, 0x0b, 0x6f, 0x0e, 0x70, 0x17, + 0x46, 0xa1, 0xd0, 0x6a, 0x4b, 0xdc, 0x58, 0x68, 0xb3, 0x41, 0x2b, 0x0b, 0x6f, 0x0e, 0x70, 0x17, 0x6f, 0x04, 0x0e, 0xb9, 0xf7, 0xc2, 0x30, 0x6f, 0x61, 0x69, 0xe9, 0x33, 0x58, 0xfb, 0x00, 0x5b, 0x6e, 0x69, 0x2c, 0x26, 0x66, 0xe6, 0x0d, 0x7c, 0x02, 0xc3, 0x05, 0x9d, 0x7f, 0x8d, 0x93, 0xad, - 0xce, 0xe1, 0xcb, 0xc7, 0xf7, 0xfb, 0x02, 0x39, 0xe4, 0x51, 0x0e, 0x0d, 0x94, 0x4c, 0x05, 0xdd, + 0xce, 0xe1, 0xcb, 0xc7, 0xf7, 0xfb, 0x02, 0x39, 0xe4, 0x41, 0x0e, 0x0d, 0x94, 0x4c, 0x05, 0xdd, 0x0c, 0x04, 0x9b, 0x82, 0x48, 0x65, 0x50, 0x81, 0x80, 0x42, 0xfa, 0x95, 0x40, 0x85, 0xd6, 0xc9, - 0x60, 0xf1, 0xbb, 0xe9, 0x0f, 0x96, 0x87, 0x27, 0x19, 0x66, 0xa8, 0x0d, 0x41, 0xb7, 0xf5, 0x5e, - 0xef, 0xfb, 0x01, 0x19, 0x5f, 0xea, 0x97, 0xad, 0x86, 0x1c, 0x17, 0xbc, 0xa4, 0x31, 0x96, 0x29, - 0x4b, 0xa9, 0x02, 0x91, 0x31, 0x65, 0x9b, 0xa7, 0xe6, 0xe4, 0x30, 0x7c, 0x7d, 0x3d, 0x77, 0x8d, - 0x9f, 0x73, 0xf7, 0x69, 0xc6, 0xd5, 0xc7, 0x3a, 0xf6, 0x13, 0x2c, 0x82, 0x04, 0x65, 0x81, 0x72, - 0x18, 0x2f, 0x64, 0xfa, 0x29, 0x50, 0xb3, 0x8a, 0x49, 0xff, 0x82, 0x25, 0xbf, 0xe7, 0xae, 0x3d, - 0x83, 0x22, 0x3f, 0xf7, 0x76, 0x02, 0xbd, 0xe8, 0x7e, 0xc1, 0xcb, 0x50, 0x4b, 0xef, 0xb4, 0xa2, - 0xb9, 0xd0, 0x6e, 0x71, 0xef, 0xdc, 0x92, 0xbb, 0x1d, 0xd8, 0x71, 0xa1, 0xdd, 0xe0, 0xc6, 0x84, - 0xe4, 0x38, 0xa5, 0x57, 0x90, 0x28, 0x14, 0xf6, 0x5d, 0x0d, 0x7c, 0xb9, 0x37, 0xf0, 0xb8, 0x07, - 0xae, 0x92, 0xbc, 0xe8, 0x30, 0xc7, 0xe9, 0x2b, 0xbd, 0x5b, 0x33, 0x62, 0xe5, 0xec, 0x4a, 0x61, - 0xc3, 0x04, 0x8d, 0x6b, 0x51, 0x52, 0x01, 0x8a, 0xd9, 0x23, 0xcd, 0x7a, 0xb3, 0x37, 0xeb, 0xc1, + 0x60, 0xf1, 0xbb, 0xe9, 0x0f, 0x96, 0xfb, 0x27, 0x19, 0x66, 0xa8, 0x0d, 0x41, 0xb7, 0xf5, 0x5e, + 0xef, 0xfb, 0x01, 0x19, 0x5f, 0xe8, 0x97, 0xad, 0x86, 0x1c, 0x17, 0xbc, 0xa4, 0x31, 0x96, 0x29, + 0x4b, 0xa9, 0x02, 0x91, 0x31, 0x65, 0x9b, 0xa7, 0xe6, 0xe4, 0x30, 0x7c, 0x7d, 0x35, 0x77, 0x8d, + 0x9f, 0x73, 0xf7, 0x71, 0xc6, 0xd5, 0xc7, 0x3a, 0xf6, 0x13, 0x2c, 0x82, 0x04, 0x65, 0x81, 0x72, + 0x18, 0xcf, 0x64, 0xfa, 0x29, 0x50, 0xb3, 0x8a, 0x49, 0xff, 0x9c, 0x25, 0xbf, 0xe7, 0xae, 0x3d, + 0x83, 0x22, 0x3f, 0xf3, 0x76, 0x02, 0xbd, 0xe8, 0x6e, 0xc1, 0xcb, 0x50, 0x4b, 0xef, 0xb4, 0xa2, + 0xb9, 0xd0, 0x6e, 0x71, 0x6f, 0xdd, 0x90, 0xbb, 0x1d, 0xd8, 0x71, 0xa1, 0xdd, 0xe0, 0xc6, 0x84, + 0xe4, 0x38, 0xa5, 0x97, 0x90, 0x28, 0x14, 0xf6, 0x6d, 0x0d, 0x7c, 0xb9, 0x37, 0xf0, 0xb8, 0x07, + 0xae, 0x92, 0xbc, 0xe8, 0x30, 0xc7, 0xe9, 0x2b, 0xbd, 0x5b, 0x33, 0x62, 0xe5, 0xec, 0x52, 0x61, + 0xc3, 0x04, 0x8d, 0x6b, 0x51, 0x52, 0x01, 0x8a, 0xd9, 0x23, 0xcd, 0x7a, 0xb3, 0x37, 0xeb, 0xde, 0xc0, 0xda, 0x49, 0xf4, 0xa2, 0xa3, 0xbf, 0x62, 0x58, 0x8b, 0x32, 0x02, 0xc5, 0xac, 0x09, 0x39, - 0xea, 0xbe, 0x42, 0xff, 0xfb, 0x69, 0x8c, 0x28, 0x95, 0x7d, 0x70, 0x6a, 0x4e, 0x46, 0xd1, 0xbd, - 0x02, 0xda, 0x48, 0xcb, 0x61, 0xa7, 0x5a, 0xdf, 0x4c, 0xf2, 0xa4, 0x81, 0x9c, 0xa7, 0xa0, 0x50, + 0xea, 0xbe, 0x42, 0xff, 0xfb, 0x69, 0x8c, 0x28, 0x95, 0x7d, 0x70, 0x6a, 0x4e, 0x46, 0xd1, 0x9d, + 0x02, 0xda, 0x48, 0xcb, 0x61, 0xa7, 0x5a, 0xdf, 0x4c, 0xf2, 0xa8, 0x81, 0x9c, 0xa7, 0xa0, 0x50, 0x48, 0x2a, 0xeb, 0x58, 0x26, 0x82, 0x57, 0x8a, 0x63, 0x49, 0x2b, 0x10, 0x8a, 0x27, 0xbc, 0x82, - 0xee, 0xc9, 0x1e, 0xeb, 0xe2, 0x1f, 0xf6, 0x2e, 0xfe, 0xbc, 0x2f, 0xfe, 0x5f, 0x10, 0x2f, 0x7a, - 0xbc, 0xf2, 0xbd, 0x5d, 0xb3, 0x5d, 0xae, 0xbb, 0xce, 0x47, 0x5f, 0xbe, 0xba, 0x46, 0x78, 0x71, - 0xbd, 0x70, 0xcc, 0x9b, 0x85, 0x63, 0xfe, 0x5a, 0x38, 0xe6, 0xe7, 0xa5, 0x63, 0xdc, 0x2c, 0x1d, - 0xe3, 0xc7, 0xd2, 0x31, 0xde, 0x3f, 0x5b, 0x2b, 0xb7, 0x71, 0x32, 0xcd, 0x59, 0xd0, 0xfe, 0xbb, - 0x1b, 0x5d, 0x32, 0x1e, 0xeb, 0x5b, 0x38, 0xfb, 0x13, 0x00, 0x00, 0xff, 0xff, 0x42, 0x0f, 0x08, - 0xd6, 0x5c, 0x03, 0x00, 0x00, + 0xee, 0xc9, 0x1e, 0xeb, 0xe2, 0x1f, 0xf6, 0x2e, 0xfe, 0xb4, 0x2f, 0xfe, 0x5f, 0x10, 0x2f, 0x7a, + 0xb8, 0xf2, 0xbd, 0x5d, 0xb3, 0x5d, 0xac, 0xbb, 0xce, 0x46, 0x5f, 0xbe, 0xba, 0x46, 0x78, 0x7e, + 0xb5, 0x70, 0xcc, 0xeb, 0x85, 0x63, 0xfe, 0x5a, 0x38, 0xe6, 0xe7, 0xa5, 0x63, 0x5c, 0x2f, 0x1d, + 0xe3, 0xc7, 0xd2, 0x31, 0xde, 0x3f, 0x59, 0x2b, 0xb7, 0x71, 0x32, 0xcd, 0x8b, 0xa0, 0xfd, 0x77, + 0x37, 0xba, 0x64, 0x3c, 0xd6, 0xb7, 0xf0, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xea, 0xf3, + 0x58, 0x18, 0x5c, 0x03, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/rewards/types/query.pb.go b/x/rewards/types/query.pb.go index 270c6a3ab1..f60ebd819b 100644 --- a/x/rewards/types/query.pb.go +++ b/x/rewards/types/query.pb.go @@ -764,71 +764,71 @@ var fileDescriptor_15bce9a904340007 = []byte{ // 1069 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x6f, 0xdc, 0x44, 0x14, 0x8e, 0x9b, 0xdf, 0x93, 0xfe, 0x80, 0x49, 0xa4, 0x6e, 0x9c, 0x74, 0x9b, 0xba, 0x81, 0x6e, - 0x23, 0xc5, 0x4e, 0x52, 0xa9, 0x20, 0xaa, 0x42, 0xb5, 0x29, 0xa0, 0x95, 0x8a, 0x94, 0x3a, 0x91, - 0x90, 0xb8, 0x98, 0x59, 0x7b, 0x76, 0x77, 0x14, 0xaf, 0xc7, 0xf1, 0xcc, 0x26, 0x8d, 0xaa, 0x08, - 0x09, 0xc4, 0x81, 0x1b, 0x12, 0x12, 0xe2, 0xca, 0x81, 0x0b, 0x27, 0xfe, 0x01, 0xee, 0x3d, 0x56, - 0xe2, 0xc2, 0x09, 0x50, 0xc2, 0x5f, 0xc0, 0x5f, 0x80, 0xe6, 0xcd, 0x78, 0xbb, 0x49, 0x1c, 0x77, - 0xe1, 0x64, 0x7b, 0xe6, 0x7b, 0xef, 0x7d, 0xdf, 0xbc, 0x37, 0x9f, 0x8c, 0x96, 0x62, 0xb2, 0x4f, - 0x12, 0x2a, 0x3d, 0xf5, 0xf4, 0x32, 0x7a, 0x40, 0xb2, 0x48, 0x78, 0x7b, 0x3d, 0x9a, 0x1d, 0xba, - 0x69, 0xc6, 0x25, 0xc7, 0x73, 0x06, 0xe1, 0xaa, 0xa7, 0x6b, 0x10, 0xf6, 0x4a, 0xc8, 0x45, 0x97, - 0x0b, 0xaf, 0x49, 0x04, 0xd5, 0x70, 0x6f, 0x7f, 0xbd, 0x49, 0x25, 0x59, 0xf7, 0x52, 0xd2, 0x66, - 0x09, 0x91, 0x8c, 0x27, 0x3a, 0x83, 0x5d, 0x1d, 0xc4, 0xe6, 0xa8, 0x90, 0xb3, 0x7c, 0x7f, 0xae, - 0xcd, 0xdb, 0x1c, 0x5e, 0x3d, 0xf5, 0x66, 0x56, 0x17, 0xdb, 0x9c, 0xb7, 0x63, 0xea, 0x91, 0x94, - 0x79, 0x24, 0x49, 0xb8, 0x84, 0x94, 0xc2, 0xec, 0xde, 0x2e, 0xe4, 0xad, 0x2a, 0x04, 0x29, 0x31, - 0xd4, 0xed, 0x62, 0x71, 0x2c, 0xcd, 0xd2, 0xd0, 0x20, 0x6e, 0x15, 0x22, 0x52, 0x92, 0x91, 0xae, - 0xa9, 0xe4, 0xcc, 0x21, 0xfc, 0x54, 0xe9, 0xdb, 0x82, 0x45, 0x9f, 0xee, 0xf5, 0xa8, 0x90, 0xce, - 0x53, 0x34, 0x7b, 0x6a, 0x55, 0xa4, 0x3c, 0x11, 0x14, 0xbf, 0x87, 0x26, 0x74, 0x70, 0xc5, 0x5a, - 0xb2, 0x6a, 0x33, 0x1b, 0x8b, 0x6e, 0xd1, 0xe9, 0xb9, 0x3a, 0xaa, 0x3e, 0xf6, 0xe2, 0x8f, 0x9b, - 0x23, 0xbe, 0x89, 0x70, 0x66, 0xd1, 0x9b, 0x3a, 0x25, 0xe7, 0x71, 0xbf, 0xce, 0xd7, 0x16, 0x9a, - 0x52, 0x0b, 0x8d, 0xa4, 0xc5, 0x31, 0x46, 0x63, 0x09, 0xe9, 0x52, 0xc8, 0x3d, 0xed, 0xc3, 0x3b, - 0xa6, 0x68, 0xb2, 0x49, 0x62, 0x92, 0x84, 0xb4, 0x72, 0x69, 0x69, 0xb4, 0x36, 0xb3, 0x31, 0xef, - 0xea, 0xe3, 0x76, 0xd5, 0x61, 0xb8, 0xe6, 0xb8, 0xdd, 0x4d, 0xce, 0x92, 0xfa, 0x9a, 0xaa, 0xf7, - 0xf3, 0x9f, 0x37, 0x6b, 0x6d, 0x26, 0x3b, 0xbd, 0xa6, 0x1b, 0xf2, 0xae, 0x67, 0x7a, 0xa3, 0x1f, - 0xab, 0x22, 0xda, 0xf5, 0xe4, 0x61, 0x4a, 0x05, 0x04, 0x08, 0x3f, 0xcf, 0xed, 0xfc, 0x63, 0xe5, - 0xc7, 0xa0, 0xd9, 0xf5, 0xf5, 0x8e, 0xa7, 0x6a, 0xa1, 0x62, 0x41, 0xed, 0xea, 0x05, 0x72, 0x8d, - 0x00, 0x23, 0x58, 0x87, 0xe0, 0x65, 0x74, 0x55, 0xb2, 0x2e, 0x0d, 0x24, 0x0f, 0x32, 0xda, 0x62, - 0x71, 0x5c, 0xb9, 0xb4, 0x64, 0xd5, 0x46, 0xfd, 0xcb, 0x6a, 0x75, 0x87, 0xfb, 0xb0, 0x86, 0x1f, - 0x20, 0x9b, 0x0a, 0xc9, 0xba, 0x44, 0xd2, 0x28, 0x68, 0xc6, 0x3c, 0xdc, 0x15, 0x03, 0x11, 0xa3, - 0x10, 0x71, 0xbd, 0x8f, 0xa8, 0x03, 0xa0, 0x1f, 0xfc, 0x10, 0x2d, 0x90, 0x38, 0xe6, 0x21, 0x8c, - 0x4e, 0xa0, 0xca, 0x06, 0x5d, 0x9e, 0xc8, 0x8e, 0x08, 0x62, 0xda, 0x92, 0x95, 0x31, 0x88, 0xae, - 0xbc, 0x82, 0x28, 0xa2, 0x9f, 0x00, 0xe0, 0x09, 0x6d, 0x49, 0x67, 0x1e, 0x5d, 0x07, 0xcd, 0x90, - 0xd5, 0x07, 0x31, 0x79, 0x5f, 0xb6, 0x51, 0xe5, 0xfc, 0x96, 0x39, 0x94, 0x77, 0xd0, 0x84, 0x56, - 0x6e, 0x86, 0xa0, 0xa4, 0x23, 0x66, 0x02, 0x34, 0xdc, 0x59, 0x40, 0xf3, 0x90, 0x74, 0xbb, 0xc3, - 0x0f, 0x1a, 0x6a, 0x4a, 0x1f, 0x13, 0x49, 0xf2, 0x8a, 0xdf, 0x58, 0xc8, 0x2e, 0xda, 0xed, 0x77, - 0x62, 0xaa, 0xcb, 0x92, 0x20, 0xe4, 0x42, 0x0e, 0x5b, 0x76, 0xb2, 0xcb, 0x92, 0x4d, 0x2e, 0x24, - 0xf6, 0xd0, 0x2c, 0x5c, 0x8a, 0x40, 0xf4, 0x9a, 0x22, 0xcc, 0x58, 0x0a, 0x37, 0x0d, 0xe6, 0x69, - 0xda, 0xc7, 0xb0, 0xb5, 0x3d, 0xb8, 0xe3, 0xec, 0xa0, 0x05, 0x4d, 0x25, 0xa5, 0xe1, 0x4e, 0x46, - 0xc2, 0x5d, 0x1a, 0xa9, 0xfe, 0x1a, 0xaa, 0x78, 0x1e, 0x4d, 0x85, 0x1d, 0xc2, 0x92, 0x80, 0x45, - 0x66, 0x56, 0x27, 0xe1, 0xbb, 0x11, 0x61, 0x1b, 0x4d, 0xa5, 0x19, 0xdf, 0x67, 0x11, 0xcd, 0xa0, - 0xdd, 0xd3, 0x7e, 0xff, 0xdb, 0xf9, 0x1c, 0x2d, 0x16, 0x67, 0x35, 0x12, 0x1f, 0xa1, 0x31, 0x96, - 0xb4, 0xb8, 0x99, 0xb5, 0xb7, 0x8b, 0x67, 0xad, 0x4e, 0x04, 0xdd, 0x22, 0x87, 0x9f, 0x32, 0xd9, - 0x69, 0x24, 0x11, 0x7d, 0x66, 0xb4, 0x42, 0xa4, 0xf3, 0x31, 0xba, 0x0b, 0x15, 0xe0, 0xf8, 0xb6, - 0x4c, 0x5d, 0xdd, 0xbd, 0x0f, 0xf5, 0x08, 0x31, 0x9e, 0xe4, 0x2a, 0x06, 0xa9, 0x5a, 0x67, 0xa8, - 0xee, 0xa1, 0x95, 0x61, 0x12, 0x19, 0xe2, 0x9b, 0x08, 0x89, 0x94, 0x86, 0x41, 0xab, 0x97, 0x44, - 0xaf, 0xb9, 0x2a, 0x4a, 0xbb, 0x82, 0x19, 0xda, 0xd3, 0x2a, 0xee, 0x23, 0x15, 0xe6, 0xac, 0x9b, - 0x33, 0x87, 0x92, 0x0a, 0x76, 0x6a, 0x20, 0x95, 0x37, 0x28, 0x6c, 0xee, 0x0d, 0xea, 0xdd, 0xf9, - 0xde, 0x32, 0x27, 0x7a, 0x2e, 0xc6, 0x10, 0x7b, 0x82, 0xae, 0xe8, 0xc6, 0x9b, 0xf2, 0x86, 0xdb, - 0xad, 0x62, 0x6e, 0x90, 0x45, 0x67, 0x30, 0xf4, 0x2e, 0xb3, 0x57, 0x4b, 0x02, 0xd7, 0xd0, 0x1b, - 0x61, 0x2f, 0xcb, 0x68, 0x22, 0xf5, 0x2d, 0x53, 0xed, 0x57, 0x3d, 0x1e, 0xf3, 0xaf, 0x9a, 0x75, - 0xb8, 0x5b, 0x8d, 0x68, 0xe3, 0xa7, 0x69, 0x34, 0x0e, 0xc4, 0xf0, 0x57, 0x16, 0x9a, 0xd0, 0x6e, - 0x88, 0x6b, 0xc5, 0x55, 0xcf, 0x9b, 0xaf, 0x7d, 0x77, 0x08, 0xa4, 0x56, 0xe8, 0x2c, 0x7f, 0xf9, - 0xdb, 0xdf, 0xdf, 0x5d, 0xaa, 0xe2, 0x45, 0xaf, 0xc4, 0xe9, 0xf1, 0x17, 0x68, 0x1c, 0x7c, 0x0d, - 0xdf, 0x29, 0xcb, 0x3c, 0xe0, 0xcb, 0x76, 0xed, 0xf5, 0x40, 0xc3, 0xe0, 0x36, 0x30, 0xb8, 0x81, - 0x17, 0x2e, 0x60, 0x00, 0x75, 0x7f, 0xb0, 0xd0, 0xcc, 0x80, 0x95, 0xe0, 0xd5, 0x92, 0xf4, 0xe7, - 0xdd, 0xc8, 0x76, 0x87, 0x85, 0x1b, 0x4e, 0x2b, 0xc0, 0x69, 0x19, 0x3b, 0xc5, 0x9c, 0xc0, 0x66, - 0xcd, 0x4c, 0xe0, 0x1f, 0x2d, 0x74, 0xe5, 0x94, 0xe5, 0x60, 0xaf, 0xa4, 0x5a, 0x91, 0x75, 0xd9, - 0x6b, 0xc3, 0x07, 0x18, 0x82, 0xab, 0x40, 0xf0, 0x0e, 0x7e, 0xab, 0x98, 0xa0, 0xe8, 0xf0, 0x83, - 0x40, 0x4f, 0x6e, 0xa4, 0x18, 0xfd, 0x6a, 0xa1, 0x6b, 0x67, 0x5c, 0x03, 0xaf, 0x97, 0x15, 0x2d, - 0xf4, 0x2d, 0x7b, 0xe3, 0xbf, 0x84, 0x18, 0xa6, 0x9b, 0xc0, 0xf4, 0x21, 0x7e, 0x50, 0xcc, 0xf4, - 0x4c, 0x98, 0xf7, 0x3c, 0x37, 0xc6, 0x23, 0xef, 0x79, 0xee, 0x26, 0x47, 0xf8, 0xd8, 0x42, 0x37, - 0x4a, 0xad, 0x04, 0x7f, 0x50, 0x42, 0x6d, 0x18, 0x37, 0xb3, 0x1f, 0xfd, 0xff, 0x04, 0x46, 0xe9, - 0xfb, 0xa0, 0xf4, 0x5d, 0x7c, 0xdf, 0xbb, 0xf8, 0xb7, 0x2a, 0xc8, 0x35, 0x99, 0xe9, 0x19, 0x14, - 0xf9, 0x8b, 0x85, 0xae, 0x9d, 0x31, 0xa2, 0xd2, 0x26, 0x15, 0x1b, 0x5d, 0x69, 0x93, 0x2e, 0xf0, - 0x39, 0xe7, 0x3e, 0x50, 0x5f, 0xc3, 0x6e, 0x19, 0x75, 0xb0, 0xe8, 0x9c, 0xb6, 0xfa, 0x38, 0xaa, - 0x3f, 0x7e, 0x71, 0x5c, 0xb5, 0x5e, 0x1e, 0x57, 0xad, 0xbf, 0x8e, 0xab, 0xd6, 0xb7, 0x27, 0xd5, - 0x91, 0x97, 0x27, 0xd5, 0x91, 0xdf, 0x4f, 0xaa, 0x23, 0x9f, 0xad, 0x0c, 0xfc, 0x42, 0x9d, 0xca, - 0xb9, 0x7f, 0xcf, 0x7b, 0xd6, 0x4f, 0x0c, 0xbf, 0x52, 0xcd, 0x09, 0xf8, 0x91, 0xbc, 0xf7, 0x6f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xa1, 0xee, 0x6f, 0x6d, 0x6c, 0x0b, 0x00, 0x00, + 0x23, 0xc5, 0x4e, 0x02, 0x2a, 0x88, 0xaa, 0x50, 0x6d, 0x0a, 0x68, 0xa5, 0x22, 0xa5, 0x4e, 0x24, + 0x24, 0x2e, 0x66, 0xd6, 0x9e, 0xdd, 0x1d, 0xc5, 0xeb, 0x71, 0x3c, 0xb3, 0x49, 0xa3, 0x2a, 0x42, + 0x02, 0x71, 0xe0, 0x86, 0x84, 0x84, 0xb8, 0x72, 0xe0, 0xc2, 0x89, 0x7f, 0x80, 0x7b, 0x8f, 0x95, + 0xb8, 0x70, 0x02, 0x94, 0xf0, 0x17, 0xf0, 0x17, 0xa0, 0x79, 0x33, 0xde, 0x6e, 0x12, 0xc7, 0x5d, + 0x38, 0xd9, 0x9e, 0xf9, 0xde, 0x7b, 0xdf, 0x37, 0xef, 0xcd, 0x27, 0xa3, 0xa5, 0x98, 0xec, 0x93, + 0x84, 0x4a, 0x4f, 0x3d, 0xbd, 0x8c, 0x1e, 0x90, 0x2c, 0x12, 0xde, 0x5e, 0x8f, 0x66, 0x87, 0x6e, + 0x9a, 0x71, 0xc9, 0xf1, 0x9c, 0x41, 0xb8, 0xea, 0xe9, 0x1a, 0x84, 0xbd, 0x12, 0x72, 0xd1, 0xe5, + 0xc2, 0x6b, 0x12, 0x41, 0x35, 0xdc, 0xdb, 0x5f, 0x6f, 0x52, 0x49, 0xd6, 0xbd, 0x94, 0xb4, 0x59, + 0x42, 0x24, 0xe3, 0x89, 0xce, 0x60, 0x57, 0x07, 0xb1, 0x39, 0x2a, 0xe4, 0x2c, 0xdf, 0x9f, 0x6b, + 0xf3, 0x36, 0x87, 0x57, 0x4f, 0xbd, 0x99, 0xd5, 0xc5, 0x36, 0xe7, 0xed, 0x98, 0x7a, 0x24, 0x65, + 0x1e, 0x49, 0x12, 0x2e, 0x21, 0xa5, 0x30, 0xbb, 0xb7, 0x0b, 0x79, 0xab, 0x0a, 0x41, 0x4a, 0x0c, + 0x75, 0xbb, 0x58, 0x1c, 0x4b, 0xb3, 0x34, 0x34, 0x88, 0x5b, 0x85, 0x88, 0x94, 0x64, 0xa4, 0x6b, + 0x2a, 0x39, 0x73, 0x08, 0x3f, 0x51, 0xfa, 0xb6, 0x60, 0xd1, 0xa7, 0x7b, 0x3d, 0x2a, 0xa4, 0xf3, + 0x04, 0xcd, 0x9e, 0x5a, 0x15, 0x29, 0x4f, 0x04, 0xc5, 0xef, 0xa1, 0x09, 0x1d, 0x5c, 0xb1, 0x96, + 0xac, 0xda, 0xcc, 0xc6, 0xa2, 0x5b, 0x74, 0x7a, 0xae, 0x8e, 0xaa, 0x8f, 0x3d, 0xff, 0xe3, 0xe6, + 0x88, 0x6f, 0x22, 0x9c, 0x59, 0xf4, 0xba, 0x4e, 0xc9, 0x79, 0xdc, 0xaf, 0xf3, 0xb5, 0x85, 0xa6, + 0xd4, 0x42, 0x23, 0x69, 0x71, 0x8c, 0xd1, 0x58, 0x42, 0xba, 0x14, 0x72, 0x4f, 0xfb, 0xf0, 0x8e, + 0x29, 0x9a, 0x6c, 0x92, 0x98, 0x24, 0x21, 0xad, 0x5c, 0x5a, 0x1a, 0xad, 0xcd, 0x6c, 0xcc, 0xbb, + 0xfa, 0xb8, 0x5d, 0x75, 0x18, 0xae, 0x39, 0x6e, 0x77, 0x93, 0xb3, 0xa4, 0xbe, 0xa6, 0xea, 0xfd, + 0xfc, 0xe7, 0xcd, 0x5a, 0x9b, 0xc9, 0x4e, 0xaf, 0xe9, 0x86, 0xbc, 0xeb, 0x99, 0xde, 0xe8, 0xc7, + 0xaa, 0x88, 0x76, 0x3d, 0x79, 0x98, 0x52, 0x01, 0x01, 0xc2, 0xcf, 0x73, 0x3b, 0xff, 0x58, 0xf9, + 0x31, 0x68, 0x76, 0x7d, 0xbd, 0xe3, 0xa9, 0x5a, 0xa8, 0x58, 0x50, 0xbb, 0x7a, 0x81, 0x5c, 0x23, + 0xc0, 0x08, 0xd6, 0x21, 0x78, 0x19, 0x5d, 0x95, 0xac, 0x4b, 0x03, 0xc9, 0x83, 0x8c, 0xb6, 0x58, + 0x1c, 0x57, 0x2e, 0x2d, 0x59, 0xb5, 0x51, 0xff, 0xb2, 0x5a, 0xdd, 0xe1, 0x3e, 0xac, 0xe1, 0xfb, + 0xc8, 0xa6, 0x42, 0xb2, 0x2e, 0x91, 0x34, 0x0a, 0x9a, 0x31, 0x0f, 0x77, 0xc5, 0x40, 0xc4, 0x28, + 0x44, 0x5c, 0xef, 0x23, 0xea, 0x00, 0xe8, 0x07, 0x3f, 0x40, 0x0b, 0x24, 0x8e, 0x79, 0x08, 0xa3, + 0x13, 0xa8, 0xb2, 0x41, 0x97, 0x27, 0xb2, 0x23, 0x82, 0x98, 0xb6, 0x64, 0x65, 0x0c, 0xa2, 0x2b, + 0x2f, 0x21, 0x8a, 0xe8, 0x27, 0x00, 0x78, 0x4c, 0x5b, 0xd2, 0x99, 0x47, 0xd7, 0x41, 0x33, 0x64, + 0xf5, 0x41, 0x4c, 0xde, 0x97, 0x6d, 0x54, 0x39, 0xbf, 0x65, 0x0e, 0xe5, 0x1d, 0x34, 0xa1, 0x95, + 0x9b, 0x21, 0x28, 0xe9, 0x88, 0x99, 0x00, 0x0d, 0x77, 0x16, 0xd0, 0x3c, 0x24, 0xdd, 0xee, 0xf0, + 0x83, 0x86, 0x9a, 0xd2, 0x47, 0x44, 0x92, 0xbc, 0xe2, 0x37, 0x16, 0xb2, 0x8b, 0x76, 0xfb, 0x9d, + 0x98, 0xea, 0xb2, 0x24, 0x08, 0xb9, 0x90, 0xc3, 0x96, 0x9d, 0xec, 0xb2, 0x64, 0x93, 0x0b, 0x89, + 0x3d, 0x34, 0x0b, 0x97, 0x22, 0x10, 0xbd, 0xa6, 0x08, 0x33, 0x96, 0xc2, 0x4d, 0x83, 0x79, 0x9a, + 0xf6, 0x31, 0x6c, 0x6d, 0x0f, 0xee, 0x38, 0x3b, 0x68, 0x41, 0x53, 0x49, 0x69, 0xb8, 0x93, 0x91, + 0x70, 0x97, 0x46, 0xaa, 0xbf, 0x86, 0x2a, 0x9e, 0x47, 0x53, 0x61, 0x87, 0xb0, 0x24, 0x60, 0x91, + 0x99, 0xd5, 0x49, 0xf8, 0x6e, 0x44, 0xd8, 0x46, 0x53, 0x69, 0xc6, 0xf7, 0x59, 0x44, 0x33, 0x68, + 0xf7, 0xb4, 0xdf, 0xff, 0x76, 0x3e, 0x47, 0x8b, 0xc5, 0x59, 0x8d, 0xc4, 0x87, 0x68, 0x8c, 0x25, + 0x2d, 0x6e, 0x66, 0xed, 0xcd, 0xe2, 0x59, 0xab, 0x13, 0x41, 0xb7, 0xc8, 0xe1, 0xa7, 0x4c, 0x76, + 0x1a, 0x49, 0x44, 0x9f, 0x1a, 0xad, 0x10, 0xe9, 0x7c, 0x8c, 0xee, 0x42, 0x05, 0x38, 0xbe, 0x2d, + 0x53, 0x57, 0x77, 0xef, 0x43, 0x3d, 0x42, 0x8c, 0x27, 0xb9, 0x8a, 0x41, 0xaa, 0xd6, 0x19, 0xaa, + 0x7b, 0x68, 0x65, 0x98, 0x44, 0x86, 0xf8, 0x26, 0x42, 0x22, 0xa5, 0x61, 0xd0, 0xea, 0x25, 0xd1, + 0x2b, 0xae, 0x8a, 0xd2, 0xae, 0x60, 0x86, 0xf6, 0xb4, 0x8a, 0xfb, 0x48, 0x85, 0x39, 0xeb, 0xe6, + 0xcc, 0xa1, 0xa4, 0x82, 0x9d, 0x1a, 0x48, 0xe5, 0x0d, 0x0a, 0x9b, 0x7b, 0x83, 0x7a, 0x77, 0xbe, + 0xb7, 0xcc, 0x89, 0x9e, 0x8b, 0x31, 0xc4, 0x1e, 0xa3, 0x2b, 0xba, 0xf1, 0xa6, 0xbc, 0xe1, 0x76, + 0xab, 0x98, 0x1b, 0x64, 0xd1, 0x19, 0x0c, 0xbd, 0xcb, 0xec, 0xe5, 0x92, 0xc0, 0x35, 0xf4, 0x5a, + 0xd8, 0xcb, 0x32, 0x9a, 0x48, 0x7d, 0xcb, 0x54, 0xfb, 0x55, 0x8f, 0xc7, 0xfc, 0xab, 0x66, 0x1d, + 0xee, 0x56, 0x23, 0xda, 0xf8, 0x69, 0x1a, 0x8d, 0x03, 0x31, 0xfc, 0x95, 0x85, 0x26, 0xb4, 0x1b, + 0xe2, 0x5a, 0x71, 0xd5, 0xf3, 0xe6, 0x6b, 0xdf, 0x1d, 0x02, 0xa9, 0x15, 0x3a, 0xcb, 0x5f, 0xfe, + 0xf6, 0xf7, 0x77, 0x97, 0xaa, 0x78, 0xd1, 0x2b, 0x71, 0x7a, 0xfc, 0x05, 0x1a, 0x07, 0x5f, 0xc3, + 0x77, 0xca, 0x32, 0x0f, 0xf8, 0xb2, 0x5d, 0x7b, 0x35, 0xd0, 0x30, 0xb8, 0x0d, 0x0c, 0x6e, 0xe0, + 0x85, 0x0b, 0x18, 0x40, 0xdd, 0x1f, 0x2c, 0x34, 0x33, 0x60, 0x25, 0x78, 0xb5, 0x24, 0xfd, 0x79, + 0x37, 0xb2, 0xdd, 0x61, 0xe1, 0x86, 0xd3, 0x0a, 0x70, 0x5a, 0xc6, 0x4e, 0x31, 0x27, 0xb0, 0x59, + 0x33, 0x13, 0xf8, 0x47, 0x0b, 0x5d, 0x39, 0x65, 0x39, 0xd8, 0x2b, 0xa9, 0x56, 0x64, 0x5d, 0xf6, + 0xda, 0xf0, 0x01, 0x86, 0xe0, 0x2a, 0x10, 0xbc, 0x83, 0xdf, 0x28, 0x26, 0x28, 0x3a, 0xfc, 0x20, + 0xd0, 0x93, 0x1b, 0x29, 0x46, 0xbf, 0x5a, 0xe8, 0xda, 0x19, 0xd7, 0xc0, 0xeb, 0x65, 0x45, 0x0b, + 0x7d, 0xcb, 0xde, 0xf8, 0x2f, 0x21, 0x86, 0xe9, 0x26, 0x30, 0x7d, 0x80, 0xef, 0x17, 0x33, 0x3d, + 0x13, 0xe6, 0x3d, 0xcb, 0x8d, 0xf1, 0xc8, 0x7b, 0x96, 0xbb, 0xc9, 0x11, 0x3e, 0xb6, 0xd0, 0x8d, + 0x52, 0x2b, 0xc1, 0x1f, 0x94, 0x50, 0x1b, 0xc6, 0xcd, 0xec, 0x87, 0xff, 0x3f, 0x81, 0x51, 0xfa, + 0x3e, 0x28, 0x7d, 0x17, 0xdf, 0xf3, 0x2e, 0xfe, 0xad, 0x0a, 0x72, 0x4d, 0x66, 0x7a, 0x06, 0x45, + 0xfe, 0x62, 0xa1, 0x6b, 0x67, 0x8c, 0xa8, 0xb4, 0x49, 0xc5, 0x46, 0x57, 0xda, 0xa4, 0x0b, 0x7c, + 0xce, 0xb9, 0x07, 0xd4, 0xd7, 0xb0, 0x5b, 0x46, 0x1d, 0x2c, 0x3a, 0xa7, 0xad, 0x3e, 0x8e, 0xea, + 0x8f, 0x9e, 0x1f, 0x57, 0xad, 0x17, 0xc7, 0x55, 0xeb, 0xaf, 0xe3, 0xaa, 0xf5, 0xed, 0x49, 0x75, + 0xe4, 0xc5, 0x49, 0x75, 0xe4, 0xf7, 0x93, 0xea, 0xc8, 0x67, 0x2b, 0x03, 0xbf, 0x50, 0xa7, 0x72, + 0xee, 0xbf, 0xed, 0x3d, 0xed, 0x27, 0x86, 0x5f, 0xa9, 0xe6, 0x04, 0xfc, 0x48, 0xbe, 0xf5, 0x6f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x09, 0x12, 0x3f, 0xa3, 0x6c, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/rewards/types/tx.pb.go b/x/rewards/types/tx.pb.go index f2d1fa2370..d3d4236e3c 100644 --- a/x/rewards/types/tx.pb.go +++ b/x/rewards/types/tx.pb.go @@ -241,37 +241,37 @@ func init() { func init() { proto.RegisterFile("lavanet/lava/rewards/tx.proto", fileDescriptor_6a4c66e189226d78) } var fileDescriptor_6a4c66e189226d78 = []byte{ - // 478 bytes of a gzipped FileDescriptorProto + // 479 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4f, 0x6f, 0xd3, 0x30, 0x14, 0x6f, 0x68, 0xc5, 0xa8, 0xa9, 0x40, 0x98, 0x8a, 0xa5, 0xd1, 0xc8, 0xaa, 0x48, 0x48, 0x55, - 0xa5, 0xd9, 0x6c, 0xbb, 0xed, 0xb8, 0x0d, 0x24, 0x0e, 0xbd, 0x64, 0x37, 0x38, 0x4c, 0x4e, 0x62, - 0x65, 0x16, 0xc4, 0x8e, 0xf2, 0x9c, 0xb2, 0x7d, 0x05, 0x4e, 0x7c, 0x0e, 0x4e, 0x7c, 0x09, 0xa4, - 0x1e, 0x77, 0x44, 0x1c, 0x00, 0xb5, 0x07, 0xbe, 0x06, 0xb2, 0x93, 0xb4, 0x5d, 0xc5, 0x9f, 0x5d, - 0xf2, 0xfe, 0xfc, 0x5e, 0xde, 0xfb, 0xfd, 0x9e, 0x6d, 0xf4, 0xf4, 0x1d, 0x9b, 0x32, 0xc9, 0x35, - 0x35, 0x96, 0x16, 0xfc, 0x3d, 0x2b, 0x12, 0xa0, 0xfa, 0x92, 0xe4, 0x85, 0xd2, 0x0a, 0xf7, 0x6b, - 0x98, 0x18, 0x4b, 0x6a, 0xd8, 0x7b, 0xc4, 0x32, 0x21, 0x15, 0xb5, 0xdf, 0xaa, 0xd0, 0xf3, 0x63, - 0x05, 0x99, 0x02, 0x1a, 0x31, 0xe0, 0x74, 0xba, 0x1f, 0x71, 0xcd, 0xf6, 0x69, 0xac, 0x84, 0xac, - 0xf1, 0x7e, 0xaa, 0x52, 0x65, 0x5d, 0x6a, 0xbc, 0x2a, 0x1b, 0x7c, 0x71, 0xd0, 0xc3, 0x09, 0xa4, - 0x67, 0x5c, 0xbf, 0xca, 0x8b, 0x3c, 0x3e, 0x65, 0x9a, 0xe1, 0x1d, 0xd4, 0x65, 0xa5, 0xbe, 0x50, - 0x85, 0xd0, 0x57, 0xae, 0x33, 0x74, 0x46, 0xdd, 0x70, 0x95, 0xc0, 0x2f, 0xd0, 0x83, 0x4c, 0xc8, - 0x73, 0x61, 0xca, 0xcf, 0x63, 0x05, 0xda, 0xbd, 0x33, 0x74, 0x46, 0xf7, 0x0f, 0x06, 0xa4, 0x22, - 0x40, 0x0c, 0x01, 0x52, 0x13, 0x20, 0x27, 0x4a, 0xc8, 0xe3, 0xce, 0xec, 0xfb, 0x6e, 0x2b, 0xec, - 0x65, 0x42, 0xda, 0x21, 0x27, 0x0a, 0x34, 0xa6, 0xe8, 0x71, 0xd5, 0x02, 0xca, 0x08, 0xe2, 0x42, - 0xe4, 0x5a, 0x28, 0x09, 0x6e, 0x7b, 0xd8, 0x1e, 0x75, 0x43, 0x6c, 0xa1, 0xb3, 0x75, 0xe4, 0x68, - 0xe7, 0xc3, 0xaf, 0xcf, 0xe3, 0xed, 0x66, 0x3f, 0x1b, 0x9c, 0x83, 0x01, 0xda, 0xde, 0x48, 0x85, - 0x1c, 0x72, 0x25, 0x81, 0x07, 0xdf, 0x1c, 0xd4, 0x9b, 0x40, 0xfa, 0xb2, 0x94, 0x89, 0x05, 0xb1, - 0x8b, 0xb6, 0xe2, 0x82, 0x33, 0xad, 0x8a, 0x5a, 0x5d, 0x13, 0x62, 0x0f, 0xdd, 0x4b, 0xca, 0x82, - 0x99, 0x81, 0x56, 0x55, 0x27, 0x5c, 0xc6, 0x98, 0xa3, 0x2d, 0x96, 0xa9, 0x52, 0xea, 0x8a, 0xe4, - 0x3f, 0x05, 0x3f, 0x37, 0x82, 0x3f, 0xfd, 0xd8, 0x1d, 0xa5, 0x42, 0x5f, 0x94, 0x11, 0x89, 0x55, - 0x46, 0xeb, 0xe3, 0xa9, 0xcc, 0x1e, 0x24, 0x6f, 0xa9, 0xbe, 0xca, 0x39, 0xd8, 0x1f, 0x20, 0x6c, - 0x7a, 0x63, 0x8c, 0x3a, 0x90, 0xf3, 0xd8, 0xed, 0x58, 0x66, 0xd6, 0x3f, 0x1a, 0x18, 0xe9, 0xfd, - 0x35, 0xe9, 0x4b, 0x2d, 0xc1, 0x13, 0xd4, 0x5f, 0x8f, 0x1b, 0xd1, 0x07, 0x33, 0x07, 0xb5, 0x27, - 0x90, 0xe2, 0x04, 0xf5, 0x6e, 0x9c, 0xed, 0x33, 0xf2, 0xa7, 0xfb, 0x44, 0x36, 0x76, 0xe7, 0xed, - 0xdd, 0xaa, 0xac, 0x99, 0x86, 0xdf, 0xa0, 0xee, 0x6a, 0xbd, 0xc1, 0x5f, 0xff, 0x5d, 0xd6, 0x78, - 0xe3, 0xff, 0xd7, 0x34, 0xcd, 0x8f, 0x4f, 0x67, 0x73, 0xdf, 0xb9, 0x9e, 0xfb, 0xce, 0xcf, 0xb9, - 0xef, 0x7c, 0x5c, 0xf8, 0xad, 0xeb, 0x85, 0xdf, 0xfa, 0xba, 0xf0, 0x5b, 0xaf, 0xc7, 0x6b, 0xeb, - 0xbd, 0xf1, 0x8a, 0xa6, 0x87, 0xf4, 0x72, 0xf5, 0x94, 0xcc, 0x9a, 0xa3, 0xbb, 0xf6, 0xbe, 0x1f, - 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xb4, 0x25, 0xaf, 0x97, 0x6f, 0x03, 0x00, 0x00, + 0xa5, 0xd9, 0x6c, 0x70, 0xda, 0x71, 0x1b, 0x48, 0x1c, 0x7a, 0xc9, 0x6e, 0x70, 0x98, 0x9c, 0xc4, + 0xca, 0x2c, 0x88, 0x1d, 0xe5, 0x39, 0x65, 0xfb, 0x0a, 0x9c, 0xf8, 0x1c, 0x9c, 0xf8, 0x12, 0x48, + 0x3d, 0xee, 0x88, 0x38, 0x00, 0x6a, 0x0f, 0x7c, 0x0d, 0x64, 0x27, 0x69, 0xbb, 0x8a, 0x3f, 0xbb, + 0xe4, 0xfd, 0xf9, 0xbd, 0xbc, 0xf7, 0xfb, 0x3d, 0xdb, 0xe8, 0xf1, 0x3b, 0x36, 0x65, 0x92, 0x6b, + 0x6a, 0x2c, 0x2d, 0xf8, 0x7b, 0x56, 0x24, 0x40, 0xf5, 0x05, 0xc9, 0x0b, 0xa5, 0x15, 0xee, 0xd7, + 0x30, 0x31, 0x96, 0xd4, 0xb0, 0xf7, 0x80, 0x65, 0x42, 0x2a, 0x6a, 0xbf, 0x55, 0xa1, 0xe7, 0xc7, + 0x0a, 0x32, 0x05, 0x34, 0x62, 0xc0, 0xe9, 0x74, 0x3f, 0xe2, 0x9a, 0xed, 0xd3, 0x58, 0x09, 0x59, + 0xe3, 0xfd, 0x54, 0xa5, 0xca, 0xba, 0xd4, 0x78, 0x55, 0x36, 0xf8, 0xe2, 0xa0, 0xfb, 0x13, 0x48, + 0x4f, 0xb9, 0x7e, 0x95, 0x17, 0x79, 0x7c, 0xc2, 0x34, 0xc3, 0x3b, 0xa8, 0xcb, 0x4a, 0x7d, 0xae, + 0x0a, 0xa1, 0x2f, 0x5d, 0x67, 0xe8, 0x8c, 0xba, 0xe1, 0x2a, 0x81, 0x5f, 0xa0, 0x7b, 0x99, 0x90, + 0x67, 0xc2, 0x94, 0x9f, 0xc5, 0x0a, 0xb4, 0x7b, 0x6b, 0xe8, 0x8c, 0xee, 0x1e, 0x0c, 0x48, 0x45, + 0x80, 0x18, 0x02, 0xa4, 0x26, 0x40, 0x8e, 0x95, 0x90, 0x47, 0x9d, 0xd9, 0xf7, 0xdd, 0x56, 0xd8, + 0xcb, 0x84, 0xb4, 0x43, 0x8e, 0x15, 0x68, 0x4c, 0xd1, 0xc3, 0xaa, 0x05, 0x94, 0x11, 0xc4, 0x85, + 0xc8, 0xb5, 0x50, 0x12, 0xdc, 0xf6, 0xb0, 0x3d, 0xea, 0x86, 0xd8, 0x42, 0xa7, 0xeb, 0xc8, 0xe1, + 0xce, 0x87, 0x5f, 0x9f, 0xc7, 0xdb, 0xcd, 0x7e, 0x36, 0x38, 0x07, 0x03, 0xb4, 0xbd, 0x91, 0x0a, + 0x39, 0xe4, 0x4a, 0x02, 0x0f, 0xbe, 0x39, 0xa8, 0x37, 0x81, 0xf4, 0x65, 0x29, 0x13, 0x0b, 0x62, + 0x17, 0x6d, 0xc5, 0x05, 0x67, 0x5a, 0x15, 0xb5, 0xba, 0x26, 0xc4, 0x1e, 0xba, 0x93, 0x94, 0x05, + 0x33, 0x03, 0xad, 0xaa, 0x4e, 0xb8, 0x8c, 0x31, 0x47, 0x5b, 0x2c, 0x53, 0xa5, 0xd4, 0x15, 0xc9, + 0x7f, 0x0a, 0x7e, 0x6a, 0x04, 0x7f, 0xfa, 0xb1, 0x3b, 0x4a, 0x85, 0x3e, 0x2f, 0x23, 0x12, 0xab, + 0x8c, 0xd6, 0xc7, 0x53, 0x99, 0x3d, 0x48, 0xde, 0x52, 0x7d, 0x99, 0x73, 0xb0, 0x3f, 0x40, 0xd8, + 0xf4, 0xc6, 0x18, 0x75, 0x20, 0xe7, 0xb1, 0xdb, 0xb1, 0xcc, 0xac, 0x7f, 0x38, 0x30, 0xd2, 0xfb, + 0x6b, 0xd2, 0x97, 0x5a, 0x82, 0x47, 0xa8, 0xbf, 0x1e, 0x37, 0xa2, 0x0f, 0x66, 0x0e, 0x6a, 0x4f, + 0x20, 0xc5, 0x09, 0xea, 0x5d, 0x3b, 0xdb, 0x27, 0xe4, 0x4f, 0xf7, 0x89, 0x6c, 0xec, 0xce, 0xdb, + 0xbb, 0x51, 0x59, 0x33, 0x0d, 0xbf, 0x41, 0xdd, 0xd5, 0x7a, 0x83, 0xbf, 0xfe, 0xbb, 0xac, 0xf1, + 0xc6, 0xff, 0xaf, 0x69, 0x9a, 0x1f, 0x9d, 0xcc, 0xe6, 0xbe, 0x73, 0x35, 0xf7, 0x9d, 0x9f, 0x73, + 0xdf, 0xf9, 0xb8, 0xf0, 0x5b, 0x57, 0x0b, 0xbf, 0xf5, 0x75, 0xe1, 0xb7, 0x5e, 0x8f, 0xd7, 0xd6, + 0x7b, 0xed, 0x15, 0x4d, 0x9f, 0xd3, 0x8b, 0xd5, 0x53, 0x32, 0x6b, 0x8e, 0x6e, 0xdb, 0xfb, 0xfe, + 0xec, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xd9, 0xff, 0x59, 0x6f, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/spec/ante/ante.go b/x/spec/ante/ante.go index 2caf241dd6..9ed7b26b7b 100644 --- a/x/spec/ante/ante.go +++ b/x/spec/ante/ante.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/gogoproto/proto" - "github.com/lavanet/lava/v3/x/spec/keeper" + "github.com/lavanet/lava/v4/x/spec/keeper" "google.golang.org/protobuf/reflect/protoreflect" ) diff --git a/x/spec/ante/ante_test.go b/x/spec/ante/ante_test.go index 1cbc463c9a..bc90cce63c 100644 --- a/x/spec/ante/ante_test.go +++ b/x/spec/ante/ante_test.go @@ -12,12 +12,12 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/gogoproto/proto" - "github.com/lavanet/lava/v3/app" - specutils "github.com/lavanet/lava/v3/utils/keeper" - plantypes "github.com/lavanet/lava/v3/x/plans/types" - "github.com/lavanet/lava/v3/x/spec/ante" - spectypes "github.com/lavanet/lava/v3/x/spec/types" - subsciptiontypes "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/app" + specutils "github.com/lavanet/lava/v4/utils/keeper" + plantypes "github.com/lavanet/lava/v4/x/plans/types" + "github.com/lavanet/lava/v4/x/spec/ante" + spectypes "github.com/lavanet/lava/v4/x/spec/types" + subsciptiontypes "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/x/spec/client/cli/query.go b/x/spec/client/cli/query.go index cffa9657eb..444102e8cf 100644 --- a/x/spec/client/cli/query.go +++ b/x/spec/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/spec/client/cli/query_params.go b/x/spec/client/cli/query_params.go index f8d0dd5634..8e8b048166 100644 --- a/x/spec/client/cli/query_params.go +++ b/x/spec/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/spf13/cobra" ) diff --git a/x/spec/client/cli/query_show_all_chains.go b/x/spec/client/cli/query_show_all_chains.go index ae09657e9e..6bab361ce9 100644 --- a/x/spec/client/cli/query_show_all_chains.go +++ b/x/spec/client/cli/query_show_all_chains.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/spf13/cobra" ) diff --git a/x/spec/client/cli/query_show_chain_info.go b/x/spec/client/cli/query_show_chain_info.go index c3b48968c9..26abbe6e01 100644 --- a/x/spec/client/cli/query_show_chain_info.go +++ b/x/spec/client/cli/query_show_chain_info.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/spf13/cobra" ) diff --git a/x/spec/client/cli/query_spec.go b/x/spec/client/cli/query_spec.go index 0e5a4cf731..92abddc9a7 100644 --- a/x/spec/client/cli/query_spec.go +++ b/x/spec/client/cli/query_spec.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/spf13/cobra" ) diff --git a/x/spec/client/cli/query_spec_test.go b/x/spec/client/cli/query_spec_test.go index 28e707db1c..cf648aba25 100644 --- a/x/spec/client/cli/query_spec_test.go +++ b/x/spec/client/cli/query_spec_test.go @@ -12,10 +12,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/lavanet/lava/v3/testutil/network" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/spec/client/cli" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/network" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/spec/client/cli" + "github.com/lavanet/lava/v4/x/spec/types" ) // Prevent strconv unused error diff --git a/x/spec/client/cli/tx.go b/x/spec/client/cli/tx.go index f19d318330..635f41a7e9 100644 --- a/x/spec/client/cli/tx.go +++ b/x/spec/client/cli/tx.go @@ -14,9 +14,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags" - utilslib "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/spec/client/utils" - "github.com/lavanet/lava/v3/x/spec/types" + utilslib "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/spec/client/utils" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/spec/client/proposal_handler.go b/x/spec/client/proposal_handler.go index 13d8a3bf49..db78062038 100644 --- a/x/spec/client/proposal_handler.go +++ b/x/spec/client/proposal_handler.go @@ -2,7 +2,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/lavanet/lava/v3/x/spec/client/cli" + "github.com/lavanet/lava/v4/x/spec/client/cli" ) // SpecAddProposalHandler is the param change proposal handler. diff --git a/x/spec/client/utils/utils.go b/x/spec/client/utils/utils.go index 359092287d..10e676a950 100755 --- a/x/spec/client/utils/utils.go +++ b/x/spec/client/utils/utils.go @@ -10,9 +10,9 @@ import ( sdkerrors "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/x/spec/types" ) type ( diff --git a/x/spec/genesis.go b/x/spec/genesis.go index 8e83b04b55..e493be1ea9 100644 --- a/x/spec/genesis.go +++ b/x/spec/genesis.go @@ -2,8 +2,8 @@ package spec import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/spec/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/keeper" + "github.com/lavanet/lava/v4/x/spec/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/spec/genesis_test.go b/x/spec/genesis_test.go index 95b37a99eb..2c13a2403e 100644 --- a/x/spec/genesis_test.go +++ b/x/spec/genesis_test.go @@ -6,10 +6,10 @@ import ( types2 "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/gogoproto/proto" - "github.com/lavanet/lava/v3/testutil/nullify" - specutils "github.com/lavanet/lava/v3/utils/keeper" - "github.com/lavanet/lava/v3/x/spec" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/nullify" + specutils "github.com/lavanet/lava/v4/utils/keeper" + "github.com/lavanet/lava/v4/x/spec" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/spec/handler.go b/x/spec/handler.go index 13f8c69b72..71a327bbcd 100644 --- a/x/spec/handler.go +++ b/x/spec/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/spec/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/keeper" + "github.com/lavanet/lava/v4/x/spec/types" ) // NewHandler ... diff --git a/x/spec/keeper/grpc_query.go b/x/spec/keeper/grpc_query.go index 329a3e21e6..cffbdc0b1f 100644 --- a/x/spec/keeper/grpc_query.go +++ b/x/spec/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/spec/keeper/grpc_query_params.go b/x/spec/keeper/grpc_query_params.go index 79018aeab0..40b56f9479 100644 --- a/x/spec/keeper/grpc_query_params.go +++ b/x/spec/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/spec/keeper/grpc_query_params_test.go b/x/spec/keeper/grpc_query_params_test.go index 33a370aa46..693334f54b 100644 --- a/x/spec/keeper/grpc_query_params_test.go +++ b/x/spec/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - specutils "github.com/lavanet/lava/v3/utils/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + specutils "github.com/lavanet/lava/v4/utils/keeper" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/spec/keeper/grpc_query_show_all_chains.go b/x/spec/keeper/grpc_query_show_all_chains.go index ba3f4df556..07d420e113 100644 --- a/x/spec/keeper/grpc_query_show_all_chains.go +++ b/x/spec/keeper/grpc_query_show_all_chains.go @@ -5,8 +5,8 @@ import ( "sort" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/spec/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/spec/keeper/grpc_query_show_chain_info.go b/x/spec/keeper/grpc_query_show_chain_info.go index df70b6dafc..683f719a3f 100644 --- a/x/spec/keeper/grpc_query_show_chain_info.go +++ b/x/spec/keeper/grpc_query_show_chain_info.go @@ -5,8 +5,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/spec/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/spec/keeper/grpc_query_spec.go b/x/spec/keeper/grpc_query_spec.go index 32bcc57bb5..4d72f0295a 100644 --- a/x/spec/keeper/grpc_query_spec.go +++ b/x/spec/keeper/grpc_query_spec.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/spec/keeper/grpc_query_spec_test.go b/x/spec/keeper/grpc_query_spec_test.go index 94b4e2386c..7df8aadefe 100644 --- a/x/spec/keeper/grpc_query_spec_test.go +++ b/x/spec/keeper/grpc_query_spec_test.go @@ -10,9 +10,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/lavanet/lava/v3/testutil/nullify" - specutils "github.com/lavanet/lava/v3/utils/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/nullify" + specutils "github.com/lavanet/lava/v4/utils/keeper" + "github.com/lavanet/lava/v4/x/spec/types" ) // Prevent strconv unused error diff --git a/x/spec/keeper/keeper.go b/x/spec/keeper/keeper.go index 8964f7037c..86efa041f9 100644 --- a/x/spec/keeper/keeper.go +++ b/x/spec/keeper/keeper.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" ) type ( diff --git a/x/spec/keeper/migrations.go b/x/spec/keeper/migrations.go index 20a48ba86d..f39fdc02f5 100644 --- a/x/spec/keeper/migrations.go +++ b/x/spec/keeper/migrations.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/spec/types" - typesv1 "github.com/lavanet/lava/v3/x/spec/types/migrations/v1" + "github.com/lavanet/lava/v4/x/spec/types" + typesv1 "github.com/lavanet/lava/v4/x/spec/types/migrations/v1" ) type Migrator struct { diff --git a/x/spec/keeper/msg_server.go b/x/spec/keeper/msg_server.go index f5156769cf..3975d02f4e 100644 --- a/x/spec/keeper/msg_server.go +++ b/x/spec/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" ) type msgServer struct { diff --git a/x/spec/keeper/msg_server_test.go b/x/spec/keeper/msg_server_test.go index 7b9aaa3b0d..a75a189906 100644 --- a/x/spec/keeper/msg_server_test.go +++ b/x/spec/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - specutils "github.com/lavanet/lava/v3/utils/keeper" - "github.com/lavanet/lava/v3/x/spec/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + specutils "github.com/lavanet/lava/v4/utils/keeper" + "github.com/lavanet/lava/v4/x/spec/keeper" + "github.com/lavanet/lava/v4/x/spec/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { diff --git a/x/spec/keeper/params.go b/x/spec/keeper/params.go index f3309cdbb6..a975a6a12e 100644 --- a/x/spec/keeper/params.go +++ b/x/spec/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" ) // GetParams get all parameters as types.Params diff --git a/x/spec/keeper/params_test.go b/x/spec/keeper/params_test.go index 48d2a3b5b7..b621e40a5c 100644 --- a/x/spec/keeper/params_test.go +++ b/x/spec/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - specutils "github.com/lavanet/lava/v3/utils/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + specutils "github.com/lavanet/lava/v4/utils/keeper" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/spec/keeper/spec.go b/x/spec/keeper/spec.go index b52e77fe1a..fade6be0ef 100644 --- a/x/spec/keeper/spec.go +++ b/x/spec/keeper/spec.go @@ -9,10 +9,10 @@ import ( "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/sigs" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/sigs" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/spec/types" ) // SetSpec set a specific Spec in the store from its index diff --git a/x/spec/keeper/spec_test.go b/x/spec/keeper/spec_test.go index eeb4304e08..1fda3f3e03 100644 --- a/x/spec/keeper/spec_test.go +++ b/x/spec/keeper/spec_test.go @@ -9,13 +9,13 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/cmd/lavad/cmd" - "github.com/lavanet/lava/v3/testutil/common" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/spec/client/utils" - "github.com/lavanet/lava/v3/x/spec/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/cmd/lavad/cmd" + "github.com/lavanet/lava/v4/testutil/common" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/spec/client/utils" + "github.com/lavanet/lava/v4/x/spec/keeper" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/spec/module.go b/x/spec/module.go index a95e78642f..7fbe7731ce 100644 --- a/x/spec/module.go +++ b/x/spec/module.go @@ -16,9 +16,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/spec/client/cli" - "github.com/lavanet/lava/v3/x/spec/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/client/cli" + "github.com/lavanet/lava/v4/x/spec/keeper" + "github.com/lavanet/lava/v4/x/spec/types" ) var ( diff --git a/x/spec/module_simulation.go b/x/spec/module_simulation.go index cfedbe289f..63eb972e93 100644 --- a/x/spec/module_simulation.go +++ b/x/spec/module_simulation.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - specsimulation "github.com/lavanet/lava/v3/x/spec/simulation" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/testutil/sample" + specsimulation "github.com/lavanet/lava/v4/x/spec/simulation" + "github.com/lavanet/lava/v4/x/spec/types" ) // avoid unused import issue diff --git a/x/spec/proposal_handler.go b/x/spec/proposal_handler.go index f2632775b1..6038c6ff09 100644 --- a/x/spec/proposal_handler.go +++ b/x/spec/proposal_handler.go @@ -12,10 +12,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramkeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - "github.com/lavanet/lava/v3/utils" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - "github.com/lavanet/lava/v3/x/spec/keeper" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/utils" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + "github.com/lavanet/lava/v4/x/spec/keeper" + "github.com/lavanet/lava/v4/x/spec/types" ) // overwriting the params handler so we can add events and callbacks on specific params diff --git a/x/spec/types/api_collection.pb.go b/x/spec/types/api_collection.pb.go index 2cb76295ff..045d219b8f 100644 --- a/x/spec/types/api_collection.pb.go +++ b/x/spec/types/api_collection.pb.go @@ -1111,105 +1111,105 @@ var fileDescriptor_c9f7567a181f534f = []byte{ // 1613 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcf, 0x6f, 0xdb, 0xc8, 0x15, 0x36, 0x25, 0xea, 0xd7, 0xb3, 0x24, 0x4f, 0x26, 0x6e, 0xaa, 0x4d, 0xb3, 0x96, 0xcb, 0xdd, - 0x76, 0x03, 0x2f, 0x6a, 0xa3, 0x0e, 0x0a, 0x14, 0x8b, 0x16, 0x2d, 0x25, 0xd1, 0x89, 0x12, 0x59, + 0x76, 0x03, 0x2f, 0x6a, 0xa3, 0x4e, 0x0b, 0x14, 0x8b, 0x16, 0x2d, 0x25, 0xd1, 0x89, 0x12, 0x59, 0x32, 0x46, 0xb4, 0x5b, 0xf7, 0x42, 0x8c, 0xa9, 0xb1, 0x3c, 0x58, 0x8a, 0x24, 0xc8, 0xa1, 0x1b, 0x9f, 0xfb, 0x0f, 0xf4, 0x50, 0xa0, 0xff, 0x42, 0x81, 0x05, 0x0a, 0xf4, 0xbf, 0xd8, 0xe3, 0xde, 0xda, 0x93, 0x51, 0x24, 0x87, 0x02, 0x39, 0xe6, 0x52, 0xf4, 0x50, 0xa0, 0x98, 0x21, 0xf5, 0x83, - 0x89, 0xe2, 0x62, 0xf7, 0x24, 0xcd, 0xf7, 0xbe, 0xf9, 0xe6, 0xcd, 0x7b, 0x33, 0xdf, 0x48, 0xf0, - 0x63, 0x8f, 0x5e, 0x53, 0x9f, 0x89, 0x03, 0xf9, 0x79, 0x10, 0x87, 0xcc, 0x3d, 0xa0, 0x21, 0x77, - 0xdc, 0xc0, 0xf3, 0x98, 0x2b, 0x78, 0xe0, 0xef, 0x87, 0x51, 0x20, 0x02, 0x7c, 0x2f, 0xe3, 0xed, - 0xcb, 0xcf, 0x7d, 0xc9, 0x7b, 0xb8, 0x3d, 0x0d, 0xa6, 0x81, 0x8a, 0x1e, 0xc8, 0x6f, 0x29, 0xd1, - 0xf8, 0x6f, 0x11, 0x1a, 0x66, 0xc8, 0xbb, 0x0b, 0x01, 0xdc, 0x82, 0x0a, 0xf3, 0xe9, 0x85, 0xc7, - 0x26, 0x2d, 0x6d, 0x57, 0x7b, 0x5c, 0x25, 0xf3, 0x21, 0x3e, 0x81, 0xad, 0xe5, 0x42, 0xce, 0x84, - 0x0a, 0xda, 0x2a, 0xec, 0x6a, 0x8f, 0x37, 0x0f, 0x7f, 0xb8, 0xff, 0xde, 0x72, 0xfb, 0x4b, 0xc5, - 0x1e, 0x15, 0xb4, 0xa3, 0x7f, 0x7d, 0xdb, 0xde, 0x20, 0x4d, 0x37, 0x87, 0xe2, 0x3d, 0xd0, 0x69, - 0xc8, 0xe3, 0x56, 0x71, 0xb7, 0xf8, 0x78, 0xf3, 0xf0, 0xc1, 0x1a, 0x19, 0x33, 0xe4, 0x44, 0x71, - 0xf0, 0x13, 0xa8, 0x5c, 0x31, 0x3a, 0x61, 0x51, 0xdc, 0xd2, 0x15, 0xfd, 0xa3, 0x35, 0xf4, 0x67, - 0x8a, 0x41, 0xe6, 0x4c, 0x3c, 0x00, 0xc4, 0xfd, 0x2b, 0x16, 0x71, 0x41, 0x7d, 0x97, 0x39, 0x6a, - 0xb1, 0x92, 0x9a, 0xfd, 0xff, 0x73, 0x26, 0x5b, 0x2b, 0x53, 0x4d, 0x99, 0xc2, 0x00, 0x50, 0x48, - 0xa3, 0x98, 0x39, 0x13, 0x1e, 0x49, 0xde, 0x35, 0x8b, 0x5b, 0xe5, 0x0f, 0xaa, 0x9d, 0x48, 0x6a, - 0x6f, 0xce, 0x24, 0x5b, 0x61, 0x6e, 0x1c, 0xe3, 0x5f, 0x00, 0xb0, 0x97, 0x82, 0xf9, 0x31, 0x0f, - 0xfc, 0xb8, 0x55, 0x51, 0x3a, 0x8f, 0xd6, 0xe8, 0x58, 0x73, 0x12, 0x59, 0xe1, 0x63, 0x0b, 0x1a, - 0xd7, 0x2c, 0xe2, 0x97, 0xdc, 0xa5, 0x42, 0x09, 0x54, 0x95, 0x40, 0x7b, 0x8d, 0xc0, 0xd9, 0x0a, - 0x8f, 0xe4, 0x67, 0x19, 0xbf, 0x87, 0xda, 0x42, 0x1f, 0x63, 0xd0, 0x7d, 0x3a, 0x63, 0xaa, 0xef, - 0x35, 0xa2, 0xbe, 0xe3, 0xcf, 0x41, 0x8f, 0x12, 0x8f, 0xb5, 0x8a, 0xaa, 0xd3, 0xdf, 0x5f, 0x23, - 0x4f, 0x12, 0x8f, 0x11, 0x45, 0xc2, 0x9f, 0x40, 0xc3, 0x4d, 0x9c, 0x59, 0xe2, 0x09, 0x1e, 0x7a, - 0x9c, 0x45, 0x2d, 0x7d, 0x57, 0x7b, 0xac, 0x93, 0xba, 0x9b, 0x1c, 0x2f, 0xb0, 0xe7, 0x7a, 0xb5, - 0x80, 0x8a, 0xc6, 0x23, 0xd0, 0xe5, 0x44, 0xbc, 0x0d, 0xa5, 0x0b, 0x2f, 0x70, 0xbf, 0x54, 0x8b, - 0xea, 0x24, 0x1d, 0x18, 0x5f, 0x69, 0x50, 0x5f, 0x4d, 0x7b, 0x6d, 0x6a, 0xcf, 0x61, 0xeb, 0x9d, - 0x76, 0xdc, 0x71, 0x1e, 0xdf, 0xe9, 0x46, 0x33, 0xdf, 0x0d, 0xfc, 0x33, 0x28, 0x5f, 0x53, 0x2f, - 0x61, 0xf3, 0xb3, 0xf8, 0xf1, 0x87, 0x24, 0xce, 0x24, 0x8b, 0x64, 0xe4, 0xe7, 0x7a, 0x55, 0x47, - 0x25, 0xe3, 0x3f, 0x1a, 0xc0, 0x32, 0x88, 0x1f, 0x41, 0x6d, 0xd1, 0xa8, 0x2c, 0xe1, 0x25, 0x80, - 0x7f, 0x04, 0x4d, 0xf6, 0x32, 0x64, 0xae, 0x60, 0x13, 0x47, 0xa9, 0xa8, 0xa4, 0x6b, 0xa4, 0x31, - 0x47, 0x53, 0x91, 0xcf, 0x60, 0xcb, 0xa3, 0x82, 0xc5, 0xc2, 0x99, 0xf0, 0x58, 0x1d, 0x41, 0xd5, - 0x02, 0x9d, 0x34, 0x53, 0xb8, 0x97, 0xa1, 0x78, 0x08, 0xd5, 0x98, 0xc9, 0xa6, 0x8a, 0x1b, 0x55, - 0xee, 0xe6, 0xe1, 0xe1, 0x9d, 0xb9, 0xe7, 0x8e, 0xc3, 0x38, 0x9b, 0x49, 0x16, 0x1a, 0xc6, 0x4f, - 0x60, 0x7b, 0x1d, 0x03, 0x57, 0x41, 0x3f, 0xa2, 0xdc, 0x43, 0x1b, 0x78, 0x13, 0x2a, 0xbf, 0xa1, - 0x91, 0xcf, 0xfd, 0x29, 0xd2, 0x8c, 0xbf, 0x15, 0xa0, 0x99, 0xbf, 0x37, 0xf8, 0x0c, 0x1a, 0xd2, - 0x94, 0xb8, 0x2f, 0x58, 0x74, 0x49, 0xdd, 0xac, 0x69, 0x9d, 0x9f, 0xbe, 0xb9, 0x6d, 0xe7, 0x03, - 0x6f, 0x6f, 0xdb, 0x8f, 0x66, 0x34, 0x8c, 0x45, 0x94, 0xb8, 0x22, 0x89, 0xd8, 0x17, 0x46, 0x2e, - 0x6c, 0x90, 0x3a, 0x0d, 0x79, 0x7f, 0x3e, 0x94, 0xba, 0x2a, 0xe6, 0x53, 0xcf, 0x09, 0xa9, 0xb8, - 0x4a, 0x0b, 0x97, 0xea, 0xe6, 0x02, 0xef, 0xeb, 0xe6, 0xc2, 0x06, 0xa9, 0xcf, 0xc7, 0x27, 0x54, - 0x5c, 0xe1, 0x27, 0xa0, 0x8b, 0x9b, 0x30, 0xad, 0x6f, 0xad, 0xd3, 0x7e, 0x73, 0xdb, 0x56, 0xe3, - 0xb7, 0xb7, 0xed, 0xfb, 0x79, 0x15, 0x89, 0x1a, 0x44, 0x05, 0xf1, 0x17, 0x50, 0xa6, 0x93, 0x89, - 0x13, 0xf8, 0xaa, 0xe8, 0xb5, 0xce, 0x27, 0x6f, 0x6e, 0xdb, 0x19, 0xf2, 0xf6, 0xb6, 0xfd, 0xbd, - 0x77, 0xb6, 0xa5, 0x70, 0x83, 0x94, 0xe8, 0x64, 0x32, 0xf2, 0x8d, 0x7f, 0x69, 0x50, 0x4e, 0x9d, - 0x6a, 0xed, 0xb9, 0xfe, 0x39, 0xe8, 0x5f, 0x72, 0x7f, 0xa2, 0xb6, 0xd7, 0x3c, 0xfc, 0xf4, 0x83, - 0x36, 0x97, 0x7d, 0xd8, 0x37, 0x21, 0x23, 0x6a, 0x06, 0xee, 0x40, 0xfd, 0x32, 0xf1, 0x53, 0x7f, - 0x16, 0x74, 0xaa, 0x76, 0xd4, 0x5c, 0xeb, 0x09, 0x47, 0xa7, 0xc3, 0xae, 0xdd, 0x1f, 0x0d, 0x1d, - 0xdb, 0x7c, 0x4a, 0x36, 0xe7, 0x93, 0x6c, 0x3a, 0x35, 0x5e, 0x00, 0x2c, 0x75, 0x71, 0x03, 0x6a, - 0x21, 0x8d, 0x63, 0x27, 0x66, 0xfe, 0x04, 0x6d, 0xe0, 0x26, 0x80, 0x1a, 0x46, 0x2c, 0xf4, 0x6e, - 0x90, 0xb6, 0x08, 0x5f, 0x04, 0xe2, 0x0a, 0x15, 0xf0, 0x16, 0x6c, 0xaa, 0x21, 0x9f, 0xfa, 0x41, - 0xc4, 0x50, 0xd1, 0xf8, 0x77, 0x01, 0x8a, 0x66, 0xc8, 0xef, 0x78, 0x54, 0xe6, 0x05, 0x28, 0xac, - 0x14, 0x40, 0xda, 0x48, 0x30, 0x0b, 0x13, 0xc1, 0x9c, 0xc4, 0xe7, 0x22, 0xce, 0x4e, 0x7e, 0x3d, - 0x03, 0x4f, 0x25, 0x86, 0xf7, 0xe1, 0x3e, 0x7b, 0x29, 0x22, 0xea, 0xe4, 0xa9, 0xa9, 0xe3, 0xdc, - 0x53, 0xa1, 0xee, 0x2a, 0xdf, 0x84, 0xaa, 0x4b, 0x05, 0x9b, 0x06, 0xd1, 0x4d, 0xab, 0xac, 0x6c, - 0x62, 0x5d, 0x5d, 0xc6, 0x21, 0x73, 0xbb, 0x19, 0x2d, 0x7b, 0xb4, 0x16, 0xd3, 0x70, 0x1f, 0x1a, - 0xca, 0x9e, 0x1c, 0x69, 0x1e, 0xdc, 0x9f, 0xb6, 0x2a, 0x4a, 0x67, 0x67, 0x8d, 0x4e, 0x47, 0xf2, - 0xd4, 0xa5, 0x8b, 0x32, 0x99, 0xfa, 0xc5, 0x1c, 0xe2, 0xfe, 0x14, 0x7f, 0x0c, 0x20, 0xf8, 0x8c, - 0x05, 0x89, 0x70, 0x66, 0xd2, 0xbb, 0x65, 0xd2, 0xb5, 0x0c, 0x39, 0x8e, 0xf1, 0xaf, 0xa1, 0xa2, - 0x0c, 0x2a, 0x8a, 0x5b, 0x35, 0xe5, 0x47, 0xbb, 0x6b, 0xd6, 0x78, 0xca, 0x7c, 0x16, 0x71, 0x37, - 0xb7, 0xca, 0x7c, 0x9a, 0xf1, 0x55, 0x01, 0x9a, 0x79, 0xcf, 0x7b, 0xef, 0x74, 0x68, 0xdf, 0xfe, - 0x74, 0xe0, 0xcf, 0xe1, 0xde, 0x52, 0x83, 0xcd, 0x42, 0x69, 0x46, 0x59, 0xef, 0xd0, 0x82, 0x97, - 0xe1, 0xf8, 0x05, 0x34, 0x23, 0x16, 0x27, 0x9e, 0x58, 0x14, 0xac, 0xf8, 0x2d, 0x0a, 0xd6, 0x48, - 0xe7, 0xce, 0x2b, 0xf6, 0x11, 0x54, 0xa5, 0x3b, 0xa8, 0xc3, 0xa2, 0xae, 0x1c, 0xa9, 0xd0, 0x90, - 0x0f, 0xe5, 0x79, 0x59, 0xa9, 0x56, 0xe9, 0xbb, 0x55, 0xeb, 0xaf, 0x1a, 0x6c, 0xae, 0x64, 0x20, - 0xdb, 0x93, 0x86, 0x1c, 0x1a, 0xc9, 0x42, 0x15, 0xa5, 0x87, 0xa7, 0x88, 0x19, 0x4d, 0xf1, 0xaf, - 0xe4, 0x39, 0x57, 0x61, 0xb9, 0xe7, 0xec, 0xa2, 0xae, 0xdb, 0xd5, 0x89, 0x49, 0xc6, 0x16, 0x71, + 0x89, 0xe2, 0x62, 0x7b, 0x92, 0xe6, 0x7b, 0xdf, 0x7c, 0xf3, 0xe6, 0xbd, 0x99, 0x6f, 0x24, 0xf8, + 0xa1, 0x47, 0xaf, 0xa9, 0xcf, 0xc4, 0x81, 0xfc, 0x3c, 0x88, 0x43, 0xe6, 0x1e, 0xd0, 0x90, 0x3b, + 0x6e, 0xe0, 0x79, 0xcc, 0x15, 0x3c, 0xf0, 0xf7, 0xc3, 0x28, 0x10, 0x01, 0xbe, 0x97, 0xf1, 0xf6, + 0xe5, 0xe7, 0xbe, 0xe4, 0x3d, 0xdc, 0x9e, 0x06, 0xd3, 0x40, 0x45, 0x0f, 0xe4, 0xb7, 0x94, 0x68, + 0xfc, 0xa7, 0x08, 0x0d, 0x33, 0xe4, 0xdd, 0x85, 0x00, 0x6e, 0x41, 0x85, 0xf9, 0xf4, 0xc2, 0x63, + 0x93, 0x96, 0xb6, 0xab, 0x3d, 0xae, 0x92, 0xf9, 0x10, 0x9f, 0xc0, 0xd6, 0x72, 0x21, 0x67, 0x42, + 0x05, 0x6d, 0x15, 0x76, 0xb5, 0xc7, 0x9b, 0x87, 0xdf, 0xdf, 0x7f, 0x6f, 0xb9, 0xfd, 0xa5, 0x62, + 0x8f, 0x0a, 0xda, 0xd1, 0xbf, 0xbe, 0x6d, 0x6f, 0x90, 0xa6, 0x9b, 0x43, 0xf1, 0x1e, 0xe8, 0x34, + 0xe4, 0x71, 0xab, 0xb8, 0x5b, 0x7c, 0xbc, 0x79, 0xf8, 0x60, 0x8d, 0x8c, 0x19, 0x72, 0xa2, 0x38, + 0xf8, 0x09, 0x54, 0xae, 0x18, 0x9d, 0xb0, 0x28, 0x6e, 0xe9, 0x8a, 0xfe, 0xd1, 0x1a, 0xfa, 0x33, + 0xc5, 0x20, 0x73, 0x26, 0x1e, 0x00, 0xe2, 0xfe, 0x15, 0x8b, 0xb8, 0xa0, 0xbe, 0xcb, 0x1c, 0xb5, + 0x58, 0x49, 0xcd, 0xfe, 0xdf, 0x39, 0x93, 0xad, 0x95, 0xa9, 0xa6, 0x4c, 0x61, 0x00, 0x28, 0xa4, + 0x51, 0xcc, 0x9c, 0x09, 0x8f, 0x24, 0xef, 0x9a, 0xc5, 0xad, 0xf2, 0x07, 0xd5, 0x4e, 0x24, 0xb5, + 0x37, 0x67, 0x92, 0xad, 0x30, 0x37, 0x8e, 0xf1, 0xcf, 0x01, 0xd8, 0x4b, 0xc1, 0xfc, 0x98, 0x07, + 0x7e, 0xdc, 0xaa, 0x28, 0x9d, 0x47, 0x6b, 0x74, 0xac, 0x39, 0x89, 0xac, 0xf0, 0xb1, 0x05, 0x8d, + 0x6b, 0x16, 0xf1, 0x4b, 0xee, 0x52, 0xa1, 0x04, 0xaa, 0x4a, 0xa0, 0xbd, 0x46, 0xe0, 0x6c, 0x85, + 0x47, 0xf2, 0xb3, 0x8c, 0xdf, 0x41, 0x6d, 0xa1, 0x8f, 0x31, 0xe8, 0x3e, 0x9d, 0x31, 0xd5, 0xf7, + 0x1a, 0x51, 0xdf, 0xf1, 0xe7, 0xa0, 0x47, 0x89, 0xc7, 0x5a, 0x45, 0xd5, 0xe9, 0xef, 0xae, 0x91, + 0x27, 0x89, 0xc7, 0x88, 0x22, 0xe1, 0x4f, 0xa0, 0xe1, 0x26, 0xce, 0x2c, 0xf1, 0x04, 0x0f, 0x3d, + 0xce, 0xa2, 0x96, 0xbe, 0xab, 0x3d, 0xd6, 0x49, 0xdd, 0x4d, 0x8e, 0x17, 0xd8, 0x73, 0xbd, 0x5a, + 0x40, 0x45, 0xe3, 0x11, 0xe8, 0x72, 0x22, 0xde, 0x86, 0xd2, 0x85, 0x17, 0xb8, 0x5f, 0xaa, 0x45, + 0x75, 0x92, 0x0e, 0x8c, 0xaf, 0x34, 0xa8, 0xaf, 0xa6, 0xbd, 0x36, 0xb5, 0xe7, 0xb0, 0xf5, 0x4e, + 0x3b, 0xee, 0x38, 0x8f, 0xef, 0x74, 0xa3, 0x99, 0xef, 0x06, 0xfe, 0x29, 0x94, 0xaf, 0xa9, 0x97, + 0xb0, 0xf9, 0x59, 0xfc, 0xf8, 0x43, 0x12, 0x67, 0x92, 0x45, 0x32, 0xf2, 0x73, 0xbd, 0xaa, 0xa3, + 0x92, 0xf1, 0x6f, 0x0d, 0x60, 0x19, 0xc4, 0x8f, 0xa0, 0xb6, 0x68, 0x54, 0x96, 0xf0, 0x12, 0xc0, + 0x3f, 0x80, 0x26, 0x7b, 0x19, 0x32, 0x57, 0xb0, 0x89, 0xa3, 0x54, 0x54, 0xd2, 0x35, 0xd2, 0x98, + 0xa3, 0xa9, 0xc8, 0x67, 0xb0, 0xe5, 0x51, 0xc1, 0x62, 0xe1, 0x4c, 0x78, 0xac, 0x8e, 0xa0, 0x6a, + 0x81, 0x4e, 0x9a, 0x29, 0xdc, 0xcb, 0x50, 0x3c, 0x84, 0x6a, 0xcc, 0x64, 0x53, 0xc5, 0x8d, 0x2a, + 0x77, 0xf3, 0xf0, 0xf0, 0xce, 0xdc, 0x73, 0xc7, 0x61, 0x9c, 0xcd, 0x24, 0x0b, 0x0d, 0xe3, 0x47, + 0xb0, 0xbd, 0x8e, 0x81, 0xab, 0xa0, 0x1f, 0x51, 0xee, 0xa1, 0x0d, 0xbc, 0x09, 0x95, 0x5f, 0xd3, + 0xc8, 0xe7, 0xfe, 0x14, 0x69, 0xc6, 0x5f, 0x0b, 0xd0, 0xcc, 0xdf, 0x1b, 0x7c, 0x06, 0x0d, 0x69, + 0x4a, 0xdc, 0x17, 0x2c, 0xba, 0xa4, 0x6e, 0xd6, 0xb4, 0xce, 0x8f, 0xdf, 0xdc, 0xb6, 0xf3, 0x81, + 0xb7, 0xb7, 0xed, 0x47, 0x33, 0x1a, 0xc6, 0x22, 0x4a, 0x5c, 0x91, 0x44, 0xec, 0x0b, 0x23, 0x17, + 0x36, 0x48, 0x9d, 0x86, 0xbc, 0x3f, 0x1f, 0x4a, 0x5d, 0x15, 0xf3, 0xa9, 0xe7, 0x84, 0x54, 0x5c, + 0xa5, 0x85, 0x4b, 0x75, 0x73, 0x81, 0xf7, 0x75, 0x73, 0x61, 0x83, 0xd4, 0xe7, 0xe3, 0x13, 0x2a, + 0xae, 0xf0, 0x13, 0xd0, 0xc5, 0x4d, 0x98, 0xd6, 0xb7, 0xd6, 0x69, 0xbf, 0xb9, 0x6d, 0xab, 0xf1, + 0xdb, 0xdb, 0xf6, 0xfd, 0xbc, 0x8a, 0x44, 0x0d, 0xa2, 0x82, 0xf8, 0x0b, 0x28, 0xd3, 0xc9, 0xc4, + 0x09, 0x7c, 0x55, 0xf4, 0x5a, 0xe7, 0x93, 0x37, 0xb7, 0xed, 0x0c, 0x79, 0x7b, 0xdb, 0xfe, 0xce, + 0x3b, 0xdb, 0x52, 0xb8, 0x41, 0x4a, 0x74, 0x32, 0x19, 0xf9, 0xc6, 0x3f, 0x35, 0x28, 0xa7, 0x4e, + 0xb5, 0xf6, 0x5c, 0xff, 0x0c, 0xf4, 0x2f, 0xb9, 0x3f, 0x51, 0xdb, 0x6b, 0x1e, 0x7e, 0xfa, 0x41, + 0x9b, 0xcb, 0x3e, 0xec, 0x9b, 0x90, 0x11, 0x35, 0x03, 0x77, 0xa0, 0x7e, 0x99, 0xf8, 0xa9, 0x3f, + 0x0b, 0x3a, 0x55, 0x3b, 0x6a, 0xae, 0xf5, 0x84, 0xa3, 0xd3, 0x61, 0xd7, 0xee, 0x8f, 0x86, 0x8e, + 0x6d, 0x3e, 0x25, 0x9b, 0xf3, 0x49, 0x36, 0x9d, 0x1a, 0x2f, 0x00, 0x96, 0xba, 0xb8, 0x01, 0xb5, + 0x90, 0xc6, 0xb1, 0x13, 0x33, 0x7f, 0x82, 0x36, 0x70, 0x13, 0x40, 0x0d, 0x23, 0x16, 0x7a, 0x37, + 0x48, 0x5b, 0x84, 0x2f, 0x02, 0x71, 0x85, 0x0a, 0x78, 0x0b, 0x36, 0xd5, 0x90, 0x4f, 0xfd, 0x20, + 0x62, 0xa8, 0x68, 0xfc, 0xab, 0x00, 0x45, 0x33, 0xe4, 0x77, 0x3c, 0x2a, 0xf3, 0x02, 0x14, 0x56, + 0x0a, 0x20, 0x6d, 0x24, 0x98, 0x85, 0x89, 0x60, 0x4e, 0xe2, 0x73, 0x11, 0x67, 0x27, 0xbf, 0x9e, + 0x81, 0xa7, 0x12, 0xc3, 0xfb, 0x70, 0x9f, 0xbd, 0x14, 0x11, 0x75, 0xf2, 0xd4, 0xd4, 0x71, 0xee, + 0xa9, 0x50, 0x77, 0x95, 0x6f, 0x42, 0xd5, 0xa5, 0x82, 0x4d, 0x83, 0xe8, 0xa6, 0x55, 0x56, 0x36, + 0xb1, 0xae, 0x2e, 0xe3, 0x90, 0xb9, 0xdd, 0x8c, 0x96, 0x3d, 0x5a, 0x8b, 0x69, 0xb8, 0x0f, 0x0d, + 0x65, 0x4f, 0x8e, 0x34, 0x0f, 0xee, 0x4f, 0x5b, 0x15, 0xa5, 0xb3, 0xb3, 0x46, 0xa7, 0x23, 0x79, + 0xea, 0xd2, 0x45, 0x99, 0x4c, 0xfd, 0x62, 0x0e, 0x71, 0x7f, 0x8a, 0x3f, 0x06, 0x10, 0x7c, 0xc6, + 0x82, 0x44, 0x38, 0x33, 0xe9, 0xdd, 0x32, 0xe9, 0x5a, 0x86, 0x1c, 0xc7, 0xf8, 0x57, 0x50, 0x51, + 0x06, 0x15, 0xc5, 0xad, 0x9a, 0xf2, 0xa3, 0xdd, 0x35, 0x6b, 0x3c, 0x65, 0x3e, 0x8b, 0xb8, 0x9b, + 0x5b, 0x65, 0x3e, 0xcd, 0xf8, 0xaa, 0x00, 0xcd, 0xbc, 0xe7, 0xbd, 0x77, 0x3a, 0xb4, 0x6f, 0x7f, + 0x3a, 0xf0, 0xe7, 0x70, 0x6f, 0xa9, 0xc1, 0x66, 0xa1, 0x34, 0xa3, 0xac, 0x77, 0x68, 0xc1, 0xcb, + 0x70, 0xfc, 0x02, 0x9a, 0x11, 0x8b, 0x13, 0x4f, 0x2c, 0x0a, 0x56, 0xfc, 0x16, 0x05, 0x6b, 0xa4, + 0x73, 0xe7, 0x15, 0xfb, 0x08, 0xaa, 0xd2, 0x1d, 0xd4, 0x61, 0x51, 0x57, 0x8e, 0x54, 0x68, 0xc8, + 0x87, 0xf2, 0xbc, 0xac, 0x54, 0xab, 0xf4, 0xff, 0x55, 0xeb, 0x2f, 0x1a, 0x6c, 0xae, 0x64, 0x20, + 0xdb, 0x93, 0x86, 0x1c, 0x1a, 0xc9, 0x42, 0x15, 0xa5, 0x87, 0xa7, 0x88, 0x19, 0x4d, 0xf1, 0x2f, + 0xe5, 0x39, 0x57, 0x61, 0xb9, 0xe7, 0xec, 0xa2, 0xae, 0xdb, 0xd5, 0x89, 0x49, 0xc6, 0x16, 0x71, 0x64, 0x3d, 0x49, 0xa6, 0x78, 0x94, 0xf8, 0xae, 0x3c, 0xe1, 0x13, 0x76, 0x49, 0x65, 0x69, 0xd2, 0x37, 0x40, 0x79, 0x0f, 0xa9, 0x67, 0x60, 0xfa, 0x04, 0x3c, 0x84, 0x2a, 0xf3, 0xdd, 0x60, 0x22, - 0x0b, 0x97, 0xee, 0x78, 0x31, 0x36, 0xfe, 0xac, 0x41, 0x23, 0xb7, 0xa3, 0x45, 0xca, 0xa9, 0x35, - 0x66, 0xcf, 0x8e, 0x42, 0x94, 0xc9, 0x6d, 0x43, 0x69, 0xf5, 0xb5, 0x49, 0x07, 0xf8, 0x97, 0xf3, + 0x0b, 0x97, 0xee, 0x78, 0x31, 0x36, 0xfe, 0xa4, 0x41, 0x23, 0xb7, 0xa3, 0x45, 0xca, 0xa9, 0x35, + 0x66, 0xcf, 0x8e, 0x42, 0x94, 0xc9, 0x6d, 0x43, 0x69, 0xf5, 0xb5, 0x49, 0x07, 0xf8, 0x17, 0xf3, 0x49, 0x0b, 0x03, 0xbc, 0x73, 0x1f, 0xf6, 0xf9, 0x89, 0x95, 0x89, 0x2a, 0x77, 0xc0, 0xd9, 0x8f, 0x83, 0x34, 0x3b, 0xf5, 0x5d, 0x3d, 0xdd, 0xab, 0xb7, 0x08, 0x7f, 0x2a, 0xf7, 0x2a, 0x58, 0x34, 0xe3, 0x3e, 0x8f, 0x05, 0x77, 0x33, 0x07, 0xc8, 0x83, 0x32, 0x3f, 0x2f, 0x70, 0xa9, 0xa7, 0xf2, 0xab, 0x92, 0x74, 0x80, 0x0d, 0xa8, 0xc7, 0xc9, 0x45, 0xec, 0x46, 0x3c, 0x94, 0x27, 0x4b, 0x65, 0x58, 0x25, 0x39, 0x4c, 0x96, 0x29, 0x16, 0x54, 0xb0, 0xcb, 0xc4, 0x53, 0x89, 0x34, 0xc8, 0x62, 0x8c, 0xdb, 0xb0, 0x79, 0x45, 0xfd, 0x29, 0xf7, 0xa7, 0xf2, 0xb7, 0x5f, 0xab, 0xa4, 0xa6, 0x43, - 0x06, 0x99, 0x21, 0xdf, 0x33, 0xa0, 0x66, 0xfd, 0xd6, 0xb6, 0x86, 0xe3, 0xfe, 0x68, 0x28, 0x9f, + 0x06, 0x99, 0x21, 0xdf, 0x33, 0xa0, 0x66, 0xfd, 0xc6, 0xb6, 0x86, 0xe3, 0xfe, 0x68, 0x28, 0x9f, 0xb8, 0xe1, 0x68, 0x68, 0xa5, 0x4f, 0x9c, 0x49, 0xba, 0xcf, 0xfa, 0x67, 0x16, 0xd2, 0xf6, 0xfe, - 0xae, 0x41, 0x7d, 0xf5, 0x46, 0xe0, 0x3a, 0x54, 0x7b, 0xfd, 0xb1, 0xd9, 0x19, 0x58, 0x3d, 0xb4, + 0xa6, 0x41, 0x7d, 0xf5, 0x46, 0xe0, 0x3a, 0x54, 0x7b, 0xfd, 0xb1, 0xd9, 0x19, 0x58, 0x3d, 0xb4, 0x81, 0x11, 0xd4, 0x9f, 0x5a, 0xb6, 0xd3, 0x19, 0x8c, 0xba, 0x2f, 0x86, 0xa7, 0xc7, 0x48, 0xc3, 0xdb, 0x80, 0x16, 0x88, 0xd3, 0x39, 0x77, 0x24, 0x5a, 0xc0, 0x0f, 0xe1, 0xc1, 0xd8, 0xb2, 0x9d, 0x81, 0x69, 0x5b, 0x63, 0xdb, 0xe9, 0x0f, 0x9d, 0x63, 0xcb, 0x36, 0x7b, 0xa6, 0x6d, 0xa2, 0x22, 0x7e, 0x00, 0x38, 0x1f, 0xeb, 0x8c, 0x7a, 0xe7, 0x48, 0x97, 0xda, 0x67, 0x16, 0xe9, 0x1f, 0xf5, 0xbb, 0xa6, 0x5c, 0x1d, 0x95, 0x24, 0x53, 0x6a, 0x5b, 0x26, 0x19, 0xf4, 0x25, 0x57, 0x2d, 0x82, 0xca, 0xd2, 0x89, 0xc7, 0xa7, 0x9d, 0x71, 0x97, 0xf4, 0x3b, 0x16, 0xaa, 0x48, 0x27, 0x3e, 0x1d, - 0x2e, 0x81, 0x2a, 0xbe, 0x0f, 0x5b, 0x2b, 0x80, 0x63, 0x0e, 0x06, 0xa8, 0xb6, 0xf7, 0x27, 0x0d, + 0x2e, 0x81, 0x2a, 0xbe, 0x0f, 0x5b, 0x2b, 0x80, 0x63, 0x0e, 0x06, 0xa8, 0xb6, 0xf7, 0x47, 0x0d, 0x36, 0x57, 0x5a, 0x2b, 0x45, 0x86, 0x23, 0x27, 0x45, 0xd2, 0x9d, 0xa5, 0x7b, 0x48, 0xf3, 0x42, 0x1a, 0xc6, 0xd0, 0x4c, 0x91, 0xf9, 0xfa, 0xa8, 0x80, 0x01, 0xca, 0xc4, 0x1a, 0x9f, 0x0e, 0x6c, 0x54, 0xc4, 0xf7, 0xa0, 0xb1, 0x28, 0xa7, 0x63, 0x92, 0xa7, 0x48, 0x97, 0x4f, 0x46, 0xbf, 0x67, 0x0d, 0xed, 0xfe, 0x51, 0xdf, 0x22, 0xa8, 0x24, 0x29, 0x3d, 0xeb, 0xc8, 0x3c, 0x1d, 0xd8, 0xce, 0x99, 0x39, 0x38, 0xb5, 0x50, 0x59, 0x52, 0x52, 0xd5, 0x67, 0xe6, 0xf8, 0x19, 0xaa, 0xec, 0xfd, - 0x61, 0x99, 0x96, 0xac, 0x3b, 0xae, 0x41, 0xc9, 0x3a, 0x3e, 0xb1, 0xcf, 0xd3, 0x94, 0x54, 0x44, + 0x7e, 0x99, 0x96, 0xac, 0x3b, 0xae, 0x41, 0xc9, 0x3a, 0x3e, 0xb1, 0xcf, 0xd3, 0x94, 0x54, 0x44, 0x96, 0x55, 0xea, 0x6b, 0x72, 0x63, 0x29, 0xd2, 0x35, 0x87, 0xa3, 0x61, 0xbf, 0x6b, 0x0e, 0x50, - 0x41, 0x76, 0x20, 0x05, 0x7b, 0x7d, 0xd5, 0x36, 0x93, 0x9c, 0xa3, 0x22, 0x6e, 0xc3, 0x0f, 0xde, + 0x41, 0x76, 0x20, 0x05, 0x7b, 0x7d, 0xd5, 0x36, 0x93, 0x9c, 0xa3, 0x22, 0x6e, 0xc3, 0xf7, 0xde, 0x45, 0x9d, 0x11, 0x71, 0x46, 0xa4, 0x67, 0x11, 0xab, 0x87, 0x74, 0xd9, 0xf6, 0x2c, 0x37, 0x54, - 0xee, 0x58, 0x7f, 0x79, 0xb5, 0xa3, 0x7d, 0xfd, 0x6a, 0x47, 0xfb, 0xe6, 0xd5, 0x8e, 0xf6, 0xcf, - 0x57, 0x3b, 0xda, 0x1f, 0x5f, 0xef, 0x6c, 0x7c, 0xf3, 0x7a, 0x67, 0xe3, 0x1f, 0xaf, 0x77, 0x36, - 0x7e, 0xf7, 0xd9, 0x94, 0x8b, 0xab, 0xe4, 0x62, 0xdf, 0x0d, 0x66, 0x07, 0xb9, 0x3f, 0x65, 0xd7, - 0x4f, 0x0e, 0x5e, 0xa6, 0xff, 0xcc, 0xe4, 0x9d, 0x8a, 0x2f, 0xca, 0xea, 0x8f, 0xd6, 0x93, 0xff, - 0x05, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xb2, 0x04, 0x99, 0xbb, 0x0d, 0x00, 0x00, + 0xee, 0x58, 0x7f, 0x7e, 0xb5, 0xa3, 0x7d, 0xfd, 0x6a, 0x47, 0xfb, 0xe6, 0xd5, 0x8e, 0xf6, 0x8f, + 0x57, 0x3b, 0xda, 0x1f, 0x5e, 0xef, 0x6c, 0x7c, 0xf3, 0x7a, 0x67, 0xe3, 0xef, 0xaf, 0x77, 0x36, + 0x7e, 0xfb, 0xd9, 0x94, 0x8b, 0xab, 0xe4, 0x62, 0xdf, 0x0d, 0x66, 0x07, 0xb9, 0x3f, 0x65, 0xd7, + 0x3f, 0x39, 0x78, 0x99, 0xfe, 0x33, 0x93, 0x77, 0x2a, 0xbe, 0x28, 0xab, 0x3f, 0x5a, 0x4f, 0xfe, + 0x1b, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x8c, 0xdd, 0xfc, 0xbb, 0x0d, 0x00, 0x00, } func (this *ApiCollection) Equal(that interface{}) bool { diff --git a/x/spec/types/errors.go b/x/spec/types/errors.go index eb83388e72..21f82f9d6e 100644 --- a/x/spec/types/errors.go +++ b/x/spec/types/errors.go @@ -4,7 +4,7 @@ package types import ( sdkerrors "cosmossdk.io/errors" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) // x/spec module sentinel errors diff --git a/x/spec/types/genesis.pb.go b/x/spec/types/genesis.pb.go index b81b6b6b42..d07441a65e 100644 --- a/x/spec/types/genesis.pb.go +++ b/x/spec/types/genesis.pb.go @@ -105,9 +105,9 @@ var fileDescriptor_012a82932c0e5e6a = []byte{ 0xe7, 0xfc, 0xd2, 0xbc, 0x12, 0x09, 0x66, 0x05, 0x46, 0x0d, 0x96, 0x20, 0x84, 0x80, 0x93, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xa9, 0xa7, 0x67, 0x96, 0x64, 0x94, - 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa3, 0xf8, 0xb2, 0xcc, 0x58, 0xbf, 0x02, 0xe2, 0xd5, 0x92, - 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x67, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe5, - 0x12, 0xd0, 0xaa, 0x76, 0x01, 0x00, 0x00, + 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa3, 0xf8, 0xb2, 0xcc, 0x44, 0xbf, 0x02, 0xe2, 0xd5, 0x92, + 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x67, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa5, + 0x2c, 0x09, 0xcf, 0x76, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/spec/types/genesis_test.go b/x/spec/types/genesis_test.go index 5305f637a8..911a5b6bbc 100644 --- a/x/spec/types/genesis_test.go +++ b/x/spec/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/spec/types" + "github.com/lavanet/lava/v4/x/spec/types" "github.com/stretchr/testify/require" ) diff --git a/x/spec/types/params.pb.go b/x/spec/types/params.pb.go index d412d0e859..9df3b2894f 100644 --- a/x/spec/types/params.pb.go +++ b/x/spec/types/params.pb.go @@ -97,8 +97,8 @@ var fileDescriptor_ad2f67d2fb6b4afa = []byte{ 0x65, 0xc6, 0x02, 0x79, 0x06, 0x2f, 0x16, 0x0e, 0x46, 0x01, 0x26, 0x27, 0xc7, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x52, 0x4f, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, - 0xce, 0xcf, 0xd5, 0x47, 0x09, 0x9d, 0x32, 0x63, 0xfd, 0x0a, 0x48, 0x10, 0x95, 0x54, 0x16, 0xa4, - 0x16, 0x27, 0xb1, 0x81, 0x7d, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xd1, 0xd4, 0x0f, + 0xce, 0xcf, 0xd5, 0x47, 0x09, 0x9d, 0x32, 0x13, 0xfd, 0x0a, 0x48, 0x10, 0x95, 0x54, 0x16, 0xa4, + 0x16, 0x27, 0xb1, 0x81, 0x7d, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xef, 0x0d, 0x6a, 0x44, 0x01, 0x00, 0x00, } diff --git a/x/spec/types/query.pb.go b/x/spec/types/query.pb.go index 04c741ca09..3fa12f818d 100644 --- a/x/spec/types/query.pb.go +++ b/x/spec/types/query.pb.go @@ -636,60 +636,60 @@ func init() { proto.RegisterFile("lavanet/lava/spec/query.proto", fileDescriptor var fileDescriptor_fac9d1cad3c30379 = []byte{ // 857 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcd, 0x4b, 0x33, 0x47, - 0x1c, 0xc7, 0xb3, 0x49, 0x4c, 0x9e, 0x4c, 0x11, 0xda, 0x79, 0x02, 0x26, 0x1b, 0x5d, 0x75, 0x7d, - 0x89, 0x95, 0xba, 0x53, 0x15, 0x5a, 0x7a, 0x8c, 0x96, 0x8a, 0xa5, 0x88, 0x5d, 0x6f, 0x42, 0x09, - 0x93, 0x75, 0x4c, 0x16, 0x36, 0x3b, 0x6b, 0x76, 0x62, 0x6a, 0xc5, 0x8b, 0xb7, 0xde, 0x4a, 0x7b, - 0xe9, 0xb9, 0xf4, 0x8f, 0xf1, 0x28, 0xf4, 0xe2, 0xa9, 0x14, 0xd3, 0x3f, 0xa4, 0xcc, 0x4b, 0x92, - 0x5d, 0xb3, 0x1b, 0xa5, 0x3c, 0x17, 0xd7, 0x99, 0xdf, 0xcb, 0xf7, 0x33, 0xdf, 0x19, 0x7f, 0x08, - 0x96, 0x3c, 0x7c, 0x8d, 0x7d, 0xc2, 0x10, 0xff, 0xa2, 0x30, 0x20, 0x0e, 0xba, 0xea, 0x93, 0xde, - 0x8d, 0x15, 0xf4, 0x28, 0xa3, 0xf0, 0x13, 0x15, 0xb6, 0xf8, 0xd7, 0xe2, 0x61, 0xbd, 0xdc, 0xa6, - 0x6d, 0x2a, 0xa2, 0x88, 0xff, 0x26, 0x13, 0xf5, 0xc5, 0x36, 0xa5, 0x6d, 0x8f, 0x20, 0x1c, 0xb8, - 0x08, 0xfb, 0x3e, 0x65, 0x98, 0xb9, 0xd4, 0x0f, 0x55, 0x74, 0xdb, 0xa1, 0x61, 0x97, 0x86, 0xa8, - 0x85, 0x43, 0x22, 0xfb, 0xa3, 0xeb, 0xdd, 0x16, 0x61, 0x78, 0x17, 0x05, 0xb8, 0xed, 0xfa, 0x22, - 0x59, 0xe5, 0x1a, 0xd3, 0x44, 0x01, 0xee, 0xe1, 0xee, 0xa8, 0xd7, 0xe2, 0x74, 0x9c, 0xff, 0x90, - 0x51, 0xb3, 0x0c, 0xe0, 0xf7, 0xbc, 0xff, 0xa9, 0x28, 0xb1, 0xc9, 0x55, 0x9f, 0x84, 0xcc, 0x3c, - 0x01, 0xef, 0x63, 0xbb, 0x61, 0x40, 0xfd, 0x90, 0xc0, 0x2f, 0x41, 0x41, 0xb6, 0xae, 0x68, 0x2b, - 0xda, 0xd6, 0x47, 0x7b, 0x55, 0x6b, 0xea, 0xb8, 0x96, 0x2c, 0x39, 0xc8, 0x3f, 0xfc, 0xbd, 0x9c, - 0xb1, 0x55, 0xba, 0x89, 0x54, 0xbf, 0x23, 0xc2, 0xce, 0x02, 0xe2, 0x28, 0x19, 0x58, 0x01, 0xc5, - 0xc3, 0x0e, 0x76, 0xfd, 0xe3, 0xaf, 0x45, 0xc3, 0x92, 0x3d, 0x5a, 0x9a, 0xc7, 0xa0, 0x1c, 0x2f, - 0x50, 0x04, 0xbb, 0x20, 0xcf, 0xd7, 0x4a, 0x7f, 0x21, 0x41, 0x9f, 0x87, 0x95, 0xba, 0x48, 0x35, - 0x7f, 0x50, 0xda, 0x0d, 0xcf, 0x8b, 0x6a, 0x7f, 0x03, 0xc0, 0xc4, 0x4a, 0xd5, 0x6f, 0xd3, 0x92, - 0xbe, 0x5b, 0xdc, 0x77, 0x4b, 0xde, 0xab, 0xf2, 0xdd, 0x3a, 0xc5, 0x6d, 0xa2, 0x6a, 0xed, 0x48, - 0xa5, 0xf9, 0xab, 0xa6, 0x50, 0xc7, 0xfd, 0xa7, 0x50, 0x73, 0x6f, 0x44, 0x85, 0x47, 0x31, 0xa6, - 0xac, 0x60, 0xaa, 0xbf, 0xca, 0x24, 0xf5, 0x62, 0x50, 0x35, 0x50, 0x15, 0x4c, 0x67, 0x1d, 0x3a, - 0x68, 0x78, 0x9e, 0x70, 0x75, 0x7c, 0xb9, 0x0c, 0xe8, 0x49, 0x41, 0x85, 0x7d, 0x0a, 0xe6, 0x1d, - 0x71, 0x09, 0xfe, 0x25, 0xfd, 0xce, 0x0d, 0x59, 0x25, 0x2b, 0xf8, 0xb7, 0x93, 0xf8, 0xa3, 0x0d, - 0x78, 0xfe, 0x19, 0xeb, 0xf5, 0x1d, 0x66, 0xc7, 0x1b, 0x7c, 0x9b, 0x7f, 0xa7, 0x7d, 0x9c, 0x35, - 0xff, 0xd0, 0xc0, 0x42, 0x4a, 0x01, 0x5c, 0x04, 0x25, 0x51, 0x72, 0x82, 0xbb, 0x44, 0xbd, 0x84, - 0xc9, 0x06, 0x7f, 0x25, 0x8e, 0x7a, 0x25, 0x59, 0xf9, 0x4a, 0xd4, 0x12, 0xee, 0x81, 0x32, 0xf1, - 0x71, 0xcb, 0x23, 0x17, 0x8d, 0xc0, 0x3d, 0xf6, 0x19, 0xe9, 0x5d, 0x62, 0x87, 0x84, 0x95, 0xdc, - 0x4a, 0x6e, 0xab, 0x64, 0x27, 0xc6, 0x60, 0x0d, 0x94, 0x70, 0xe0, 0x36, 0x1d, 0xda, 0xf7, 0x59, - 0x25, 0xbf, 0xa2, 0x6d, 0xe5, 0xed, 0x77, 0x38, 0x70, 0x0f, 0xf9, 0xda, 0xfc, 0x2a, 0xe2, 0xdb, - 0xe1, 0xe8, 0x10, 0xa3, 0x17, 0x33, 0x93, 0xd2, 0x74, 0x40, 0xb1, 0x11, 0xb8, 0xfc, 0xc0, 0x3c, - 0xd1, 0x1d, 0x09, 0x0a, 0x89, 0x92, 0x3d, 0xd9, 0x80, 0xeb, 0x60, 0x3e, 0xec, 0x07, 0x01, 0xed, - 0x31, 0x81, 0x16, 0x56, 0xe6, 0x04, 0x6d, 0x7c, 0x13, 0x96, 0xc1, 0x1c, 0xbe, 0xb8, 0xa0, 0x7e, - 0xa5, 0x20, 0xea, 0xe5, 0xc2, 0x1c, 0x6a, 0x91, 0xbb, 0x8b, 0x00, 0xaa, 0xbb, 0x8b, 0x38, 0xa5, - 0xc5, 0x9d, 0x32, 0x00, 0x70, 0x27, 0xfe, 0x64, 0x85, 0x62, 0x64, 0x07, 0x9e, 0x03, 0x3d, 0xa6, - 0x3f, 0x36, 0x4c, 0x3c, 0x81, 0x9c, 0x78, 0x02, 0x7a, 0xc2, 0x13, 0x50, 0x47, 0xb6, 0x67, 0x54, - 0x43, 0x04, 0xde, 0xd3, 0x80, 0x3f, 0x4b, 0xec, 0x35, 0x23, 0x10, 0x79, 0x01, 0x01, 0x47, 0xa1, - 0xc9, 0x15, 0xed, 0x3d, 0x15, 0xc1, 0x9c, 0x38, 0x25, 0xfc, 0x09, 0x14, 0xe4, 0x3c, 0x81, 0x1b, - 0x09, 0xe2, 0xd3, 0x83, 0x4b, 0xdf, 0x7c, 0x2d, 0x4d, 0x3a, 0x65, 0xae, 0xde, 0xff, 0xf5, 0xef, - 0x6f, 0xd9, 0x1a, 0xac, 0xa2, 0xb4, 0xe9, 0x09, 0xef, 0x35, 0xf9, 0x07, 0x0c, 0x53, 0x7b, 0xc6, - 0xa7, 0x99, 0x5e, 0x7f, 0x35, 0x4f, 0x89, 0x7f, 0x2a, 0xc4, 0xd7, 0xe0, 0x2a, 0x4a, 0x1e, 0xcd, - 0xe8, 0x56, 0x8d, 0xc1, 0x3b, 0x78, 0x0b, 0x8a, 0xbc, 0xb4, 0xe1, 0x79, 0xe9, 0x18, 0xf1, 0xc1, - 0x96, 0x8e, 0xf1, 0x62, 0x40, 0x99, 0xcb, 0x02, 0xa3, 0x0a, 0x17, 0x52, 0x30, 0xe0, 0xcf, 0x9a, - 0x54, 0xb7, 0xf1, 0xe0, 0xc3, 0x9b, 0xb0, 0x23, 0xd4, 0xeb, 0x70, 0x23, 0x45, 0xbd, 0xd9, 0xc3, - 0x83, 0x88, 0x11, 0xf7, 0x1a, 0x00, 0xca, 0x89, 0x99, 0x38, 0xff, 0xd7, 0x8c, 0x35, 0x81, 0xb3, - 0x04, 0x6b, 0x33, 0x70, 0xe0, 0xef, 0x1a, 0x98, 0x8f, 0xcd, 0x30, 0xf8, 0x59, 0x5a, 0xff, 0xa4, - 0xc9, 0xab, 0xef, 0xbc, 0x31, 0x5b, 0x31, 0x6d, 0x0b, 0xa6, 0x75, 0x68, 0x26, 0x31, 0x75, 0xe8, - 0xa0, 0x89, 0x3d, 0xaf, 0xe9, 0x48, 0x90, 0x3f, 0x15, 0xda, 0x78, 0x28, 0xcc, 0x46, 0x7b, 0x39, - 0xdc, 0x66, 0xa3, 0x4d, 0x4d, 0x1a, 0xf3, 0x0b, 0x81, 0xf6, 0x39, 0xb4, 0xd2, 0xd0, 0x04, 0x56, - 0xd3, 0xf5, 0x2f, 0x29, 0xba, 0x1d, 0x0f, 0xc9, 0xbb, 0x83, 0xc6, 0xc3, 0xb3, 0xa1, 0x3d, 0x3e, - 0x1b, 0xda, 0x3f, 0xcf, 0x86, 0xf6, 0xcb, 0xd0, 0xc8, 0x3c, 0x0e, 0x8d, 0xcc, 0xd3, 0xd0, 0xc8, - 0x9c, 0xd7, 0xdb, 0x2e, 0xeb, 0xf4, 0x5b, 0x96, 0x43, 0xbb, 0xf1, 0x9e, 0xd7, 0xfb, 0xe8, 0x47, - 0xd9, 0x98, 0xdd, 0x04, 0x24, 0x6c, 0x15, 0xc4, 0x3f, 0x2e, 0xfb, 0xff, 0x05, 0x00, 0x00, 0xff, - 0xff, 0x99, 0x69, 0x73, 0x30, 0x8a, 0x09, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4d, 0x4f, 0x3b, 0x45, + 0x1c, 0xc7, 0xbb, 0x6d, 0x69, 0xff, 0x1d, 0x43, 0xa2, 0x43, 0x13, 0xda, 0x2d, 0x2c, 0xb0, 0x3c, + 0x14, 0x89, 0xec, 0x08, 0x1a, 0x8d, 0xc7, 0x82, 0x91, 0x60, 0x0c, 0xc1, 0xe5, 0x46, 0x62, 0x9a, + 0xe9, 0x32, 0xb4, 0x9b, 0x6c, 0x77, 0x96, 0xee, 0x94, 0x8a, 0x84, 0x0b, 0x37, 0x6f, 0x46, 0x2f, + 0x9e, 0x8d, 0x2f, 0x86, 0x23, 0x89, 0x17, 0x4e, 0xc6, 0x50, 0x5f, 0x88, 0x99, 0x87, 0xb6, 0xbb, + 0x74, 0xb7, 0x10, 0xf3, 0xbf, 0xb0, 0xcc, 0xfc, 0x1e, 0xbe, 0x9f, 0xf9, 0xce, 0xf0, 0x0b, 0x60, + 0xd9, 0xc3, 0xd7, 0xd8, 0x27, 0x0c, 0xf1, 0x2f, 0x0a, 0x03, 0xe2, 0xa0, 0xab, 0x3e, 0xe9, 0xdd, + 0x58, 0x41, 0x8f, 0x32, 0x0a, 0x3f, 0x52, 0x61, 0x8b, 0x7f, 0x2d, 0x1e, 0xd6, 0xcb, 0x6d, 0xda, + 0xa6, 0x22, 0x8a, 0xf8, 0x6f, 0x32, 0x51, 0x5f, 0x6a, 0x53, 0xda, 0xf6, 0x08, 0xc2, 0x81, 0x8b, + 0xb0, 0xef, 0x53, 0x86, 0x99, 0x4b, 0xfd, 0x50, 0x45, 0x77, 0x1c, 0x1a, 0x76, 0x69, 0x88, 0x5a, + 0x38, 0x24, 0xb2, 0x3f, 0xba, 0xde, 0x6b, 0x11, 0x86, 0xf7, 0x50, 0x80, 0xdb, 0xae, 0x2f, 0x92, + 0x55, 0xae, 0x31, 0x4d, 0x14, 0xe0, 0x1e, 0xee, 0x8e, 0x7a, 0x2d, 0x4d, 0xc7, 0xf9, 0x0f, 0x19, + 0x35, 0xcb, 0x00, 0x7e, 0xcf, 0xfb, 0x9f, 0x8a, 0x12, 0x9b, 0x5c, 0xf5, 0x49, 0xc8, 0xcc, 0x13, + 0xb0, 0x10, 0xdb, 0x0d, 0x03, 0xea, 0x87, 0x04, 0x7e, 0x09, 0x0a, 0xb2, 0x75, 0x45, 0x5b, 0xd5, + 0xb6, 0x3f, 0xd8, 0xaf, 0x5a, 0x53, 0xc7, 0xb5, 0x64, 0xc9, 0x41, 0xfe, 0xe1, 0xef, 0x95, 0x8c, + 0xad, 0xd2, 0x4d, 0xa4, 0xfa, 0x1d, 0x11, 0x76, 0x16, 0x10, 0x47, 0xc9, 0xc0, 0x0a, 0x28, 0x1e, + 0x76, 0xb0, 0xeb, 0x1f, 0x7f, 0x2d, 0x1a, 0x96, 0xec, 0xd1, 0xd2, 0x3c, 0x06, 0xe5, 0x78, 0x81, + 0x22, 0xd8, 0x03, 0x79, 0xbe, 0x56, 0xfa, 0x8b, 0x09, 0xfa, 0x3c, 0xac, 0xd4, 0x45, 0xaa, 0xf9, + 0x83, 0xd2, 0x6e, 0x78, 0x5e, 0x54, 0xfb, 0x1b, 0x00, 0x26, 0x56, 0xaa, 0x7e, 0x5b, 0x96, 0xf4, + 0xdd, 0xe2, 0xbe, 0x5b, 0xf2, 0x5e, 0x95, 0xef, 0xd6, 0x29, 0x6e, 0x13, 0x55, 0x6b, 0x47, 0x2a, + 0xcd, 0x5f, 0x35, 0x85, 0x3a, 0xee, 0x3f, 0x85, 0x9a, 0x7b, 0x23, 0x2a, 0x3c, 0x8a, 0x31, 0x65, + 0x05, 0x53, 0xfd, 0x55, 0x26, 0xa9, 0x17, 0x83, 0xaa, 0x81, 0xaa, 0x60, 0x3a, 0xeb, 0xd0, 0x41, + 0xc3, 0xf3, 0x84, 0xab, 0xe3, 0xcb, 0x65, 0x40, 0x4f, 0x0a, 0x2a, 0xec, 0x53, 0x30, 0xef, 0x88, + 0x4b, 0xf0, 0x2f, 0xe9, 0x77, 0x6e, 0xc8, 0x2a, 0x59, 0xc1, 0xbf, 0x93, 0xc4, 0x1f, 0x6d, 0xc0, + 0xf3, 0xcf, 0x58, 0xaf, 0xef, 0x30, 0x3b, 0xde, 0xe0, 0xdb, 0xfc, 0x3b, 0xed, 0xc3, 0xac, 0xf9, + 0x87, 0x06, 0x16, 0x53, 0x0a, 0xe0, 0x12, 0x28, 0x89, 0x92, 0x13, 0xdc, 0x25, 0xea, 0x25, 0x4c, + 0x36, 0xf8, 0x2b, 0x71, 0xd4, 0x2b, 0xc9, 0xca, 0x57, 0xa2, 0x96, 0x70, 0x1f, 0x94, 0x89, 0x8f, + 0x5b, 0x1e, 0xb9, 0x68, 0x04, 0xee, 0xb1, 0xcf, 0x48, 0xef, 0x12, 0x3b, 0x24, 0xac, 0xe4, 0x56, + 0x73, 0xdb, 0x25, 0x3b, 0x31, 0x06, 0x6b, 0xa0, 0x84, 0x03, 0xb7, 0xe9, 0xd0, 0xbe, 0xcf, 0x2a, + 0xf9, 0x55, 0x6d, 0x3b, 0x6f, 0xbf, 0xc3, 0x81, 0x7b, 0xc8, 0xd7, 0xe6, 0x57, 0x11, 0xdf, 0x0e, + 0x47, 0x87, 0x18, 0xbd, 0x98, 0x99, 0x94, 0xa6, 0x03, 0x8a, 0x8d, 0xc0, 0xe5, 0x07, 0xe6, 0x89, + 0xee, 0x48, 0x50, 0x48, 0x94, 0xec, 0xc9, 0x06, 0xdc, 0x00, 0xf3, 0x61, 0x3f, 0x08, 0x68, 0x8f, + 0x09, 0xb4, 0xb0, 0x32, 0x27, 0x68, 0xe3, 0x9b, 0xb0, 0x0c, 0xe6, 0xf0, 0xc5, 0x05, 0xf5, 0x2b, + 0x05, 0x51, 0x2f, 0x17, 0xe6, 0x50, 0x8b, 0xdc, 0x5d, 0x04, 0x50, 0xdd, 0x5d, 0xc4, 0x29, 0x2d, + 0xee, 0x94, 0x01, 0x80, 0x3b, 0xf1, 0x27, 0x2b, 0x14, 0x23, 0x3b, 0xf0, 0x1c, 0xe8, 0x31, 0xfd, + 0xb1, 0x61, 0xe2, 0x09, 0xe4, 0xc4, 0x13, 0xd0, 0x13, 0x9e, 0x80, 0x3a, 0xb2, 0x3d, 0xa3, 0x1a, + 0x22, 0xb0, 0x40, 0x03, 0xfe, 0x2c, 0xb1, 0xd7, 0x8c, 0x40, 0xe4, 0x05, 0x04, 0x1c, 0x85, 0x26, + 0x57, 0xb4, 0xff, 0x54, 0x04, 0x73, 0xe2, 0x94, 0xf0, 0x27, 0x50, 0x90, 0xf3, 0x04, 0x6e, 0x26, + 0x88, 0x4f, 0x0f, 0x2e, 0x7d, 0xeb, 0xb5, 0x34, 0xe9, 0x94, 0xb9, 0x76, 0xff, 0xd7, 0xbf, 0xbf, + 0x65, 0x6b, 0xb0, 0x8a, 0xd2, 0xa6, 0x27, 0xbc, 0xd7, 0xe4, 0x1f, 0x30, 0x4c, 0xed, 0x19, 0x9f, + 0x66, 0x7a, 0xfd, 0xd5, 0x3c, 0x25, 0xfe, 0xb1, 0x10, 0x5f, 0x87, 0x6b, 0x28, 0x79, 0x34, 0xa3, + 0x5b, 0x35, 0x06, 0xef, 0xe0, 0x2d, 0x28, 0xf2, 0xd2, 0x86, 0xe7, 0xa5, 0x63, 0xc4, 0x07, 0x5b, + 0x3a, 0xc6, 0x8b, 0x01, 0x65, 0xae, 0x08, 0x8c, 0x2a, 0x5c, 0x4c, 0xc1, 0x80, 0x3f, 0x6b, 0x52, + 0xdd, 0xc6, 0x83, 0xf7, 0x6f, 0xc2, 0xae, 0x50, 0xaf, 0xc3, 0xcd, 0x14, 0xf5, 0x66, 0x0f, 0x0f, + 0x22, 0x46, 0xdc, 0x6b, 0x00, 0x28, 0x27, 0x66, 0xe2, 0xfc, 0x5f, 0x33, 0xd6, 0x05, 0xce, 0x32, + 0xac, 0xcd, 0xc0, 0x81, 0xbf, 0x6b, 0x60, 0x3e, 0x36, 0xc3, 0xe0, 0x27, 0x69, 0xfd, 0x93, 0x26, + 0xaf, 0xbe, 0xfb, 0xc6, 0x6c, 0xc5, 0xb4, 0x23, 0x98, 0x36, 0xa0, 0x99, 0xc4, 0xd4, 0xa1, 0x83, + 0x26, 0xf6, 0xbc, 0xa6, 0x23, 0x41, 0xfe, 0x54, 0x68, 0xe3, 0xa1, 0x30, 0x1b, 0xed, 0xe5, 0x70, + 0x9b, 0x8d, 0x36, 0x35, 0x69, 0xcc, 0x2f, 0x04, 0xda, 0xa7, 0xd0, 0x4a, 0x43, 0x13, 0x58, 0x4d, + 0xd7, 0xbf, 0xa4, 0xe8, 0x76, 0x3c, 0x24, 0xef, 0x0e, 0x1a, 0x0f, 0xcf, 0x86, 0xf6, 0xf8, 0x6c, + 0x68, 0xff, 0x3c, 0x1b, 0xda, 0x2f, 0x43, 0x23, 0xf3, 0x38, 0x34, 0x32, 0x4f, 0x43, 0x23, 0x73, + 0x5e, 0x6f, 0xbb, 0xac, 0xd3, 0x6f, 0x59, 0x0e, 0xed, 0xc6, 0x7b, 0x5e, 0x7f, 0x8e, 0x7e, 0x94, + 0x8d, 0xd9, 0x4d, 0x40, 0xc2, 0x56, 0x41, 0xfc, 0xe3, 0xf2, 0xd9, 0x7f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xd9, 0x57, 0xaa, 0x55, 0x8a, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/spec/types/spec.go b/x/spec/types/spec.go index f41ee8fda0..b1b99ff00b 100644 --- a/x/spec/types/spec.go +++ b/x/spec/types/spec.go @@ -10,8 +10,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) const ( diff --git a/x/spec/types/spec.pb.go b/x/spec/types/spec.pb.go index 304a9a5ea7..fd3de514df 100644 --- a/x/spec/types/spec.pb.go +++ b/x/spec/types/spec.pb.go @@ -232,51 +232,51 @@ func init() { proto.RegisterFile("lavanet/lava/spec/spec.proto", fileDescriptor_ var fileDescriptor_789140b95c48dfce = []byte{ // 719 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0xcf, 0x52, 0xe3, 0x36, - 0x18, 0x8f, 0x1b, 0x6f, 0x12, 0x94, 0x6e, 0xf0, 0xaa, 0x59, 0x46, 0x30, 0x5b, 0xaf, 0xbb, 0x07, - 0xea, 0x76, 0x5a, 0x7b, 0x80, 0x4b, 0x6f, 0x1d, 0x02, 0x64, 0x0a, 0xd3, 0x4e, 0xa9, 0xa1, 0x97, - 0x5e, 0x3c, 0xb2, 0x2c, 0x12, 0x0d, 0xb6, 0xe4, 0x5a, 0x22, 0x25, 0x7d, 0x8a, 0x3e, 0x46, 0x1f, - 0x85, 0x23, 0x47, 0xa6, 0x07, 0xa6, 0x13, 0x5e, 0xa4, 0x23, 0xd9, 0xa6, 0xce, 0xb0, 0x97, 0xc8, - 0x9f, 0x7e, 0x7f, 0x3e, 0x49, 0xf9, 0x49, 0xe0, 0x5d, 0x86, 0x17, 0x98, 0x53, 0x15, 0xea, 0x31, - 0x94, 0x05, 0x25, 0xe6, 0x27, 0x28, 0x4a, 0xa1, 0x04, 0x7c, 0x53, 0xa3, 0x81, 0x1e, 0x03, 0x0d, - 0xec, 0x8c, 0x67, 0x62, 0x26, 0x0c, 0x1a, 0xea, 0xaf, 0x8a, 0xb8, 0xb3, 0xfb, 0xd2, 0x06, 0x17, - 0x2c, 0x26, 0x22, 0xcb, 0x28, 0x51, 0x4c, 0xf0, 0x9a, 0xe7, 0x12, 0x21, 0x73, 0x21, 0xc3, 0x04, - 0x4b, 0x1a, 0x2e, 0xf6, 0x12, 0xaa, 0xf0, 0x5e, 0x48, 0x04, 0xab, 0xf1, 0x0f, 0x0f, 0x7d, 0x60, - 0x5f, 0x14, 0x94, 0xc0, 0x31, 0x78, 0xc5, 0x78, 0x4a, 0x6f, 0x91, 0xe5, 0x59, 0xfe, 0x46, 0x54, - 0x15, 0x10, 0x02, 0x9b, 0xe3, 0x9c, 0xa2, 0x4f, 0xcc, 0xa4, 0xf9, 0x86, 0x08, 0xf4, 0x29, 0xc7, - 0x49, 0x46, 0x53, 0x64, 0x7b, 0x96, 0x3f, 0x88, 0x9a, 0x12, 0x1e, 0x80, 0xb7, 0x25, 0xcd, 0x18, - 0x4e, 0x58, 0xc6, 0xd4, 0x32, 0x56, 0xf3, 0x92, 0xca, 0xb9, 0xc8, 0x52, 0xf4, 0xca, 0xb3, 0xfc, - 0xd7, 0xd1, 0xb8, 0x05, 0x5e, 0x36, 0x18, 0xfc, 0x0e, 0xa0, 0x14, 0x2b, 0x1c, 0xb7, 0x95, 0x8d, - 0x7f, 0xcf, 0xf8, 0x6f, 0x69, 0x3c, 0xfa, 0x1f, 0x3e, 0xa9, 0xdb, 0xfd, 0x00, 0xbe, 0x48, 0x32, - 0x41, 0xae, 0xe3, 0x94, 0x49, 0x85, 0x39, 0xa1, 0xf1, 0x95, 0x28, 0xe3, 0x2b, 0xc6, 0x71, 0xc6, - 0xfe, 0xa4, 0x69, 0xac, 0x65, 0xa8, 0x6f, 0x5a, 0x7f, 0x6e, 0x88, 0xc7, 0x35, 0x6f, 0x2a, 0xca, - 0x69, 0xc3, 0x3a, 0xc6, 0x0a, 0xc3, 0xef, 0xc1, 0x3b, 0x43, 0x90, 0x31, 0xe3, 0x8d, 0x01, 0xd6, - 0xa7, 0x18, 0x17, 0xa5, 0x10, 0x57, 0x68, 0x60, 0x4c, 0xb6, 0x2b, 0xce, 0x29, 0x9f, 0xb6, 0x18, - 0xe7, 0x9a, 0x00, 0xbf, 0x01, 0x10, 0x2f, 0x68, 0x89, 0x67, 0x34, 0xae, 0x96, 0xa4, 0x58, 0x4e, - 0xd1, 0x86, 0x67, 0xf9, 0xdd, 0xc8, 0xa9, 0x91, 0x89, 0x06, 0x2e, 0x59, 0x4e, 0xe1, 0x21, 0x70, - 0x71, 0x96, 0x89, 0x3f, 0x68, 0x5a, 0xb3, 0x33, 0x3c, 0x33, 0x6b, 0xff, 0x5d, 0xc8, 0x58, 0x2e, - 0x39, 0x41, 0xc0, 0x28, 0xb7, 0x6b, 0x96, 0x51, 0xfe, 0x88, 0x67, 0x53, 0x51, 0xfe, 0x22, 0xe4, - 0xc5, 0x92, 0x13, 0xdd, 0xb0, 0x91, 0x4a, 0x15, 0xdf, 0x14, 0x29, 0x56, 0x34, 0x45, 0x43, 0xcf, - 0xf2, 0xed, 0xc8, 0x49, 0x2a, 0xbe, 0x54, 0xbf, 0x56, 0xf3, 0xf0, 0x27, 0x00, 0x73, 0xc6, 0x63, - 0xa9, 0xf0, 0x35, 0xd5, 0x5b, 0x5a, 0xb0, 0x94, 0x96, 0xe8, 0x53, 0xcf, 0xf2, 0x87, 0xfb, 0xdb, - 0x41, 0x15, 0x91, 0x40, 0x47, 0x24, 0xa8, 0x23, 0x12, 0x1c, 0x09, 0xc6, 0x27, 0xf6, 0xdd, 0xe3, - 0xfb, 0x4e, 0xe4, 0xe4, 0x8c, 0x5f, 0x68, 0xe5, 0x79, 0x2d, 0x84, 0x3f, 0x83, 0xcd, 0xc6, 0x44, - 0xc6, 0x6a, 0x59, 0x50, 0x89, 0x46, 0x9e, 0xe5, 0x8f, 0xf6, 0x77, 0x83, 0x17, 0xf9, 0x0d, 0x74, - 0xba, 0x82, 0x46, 0x2a, 0x2f, 0x35, 0x3b, 0x1a, 0x15, 0x6b, 0xb5, 0x8e, 0x14, 0xcb, 0x0b, 0x51, - 0x2a, 0x89, 0x36, 0xbd, 0xae, 0xbf, 0x11, 0x35, 0x25, 0x3c, 0x05, 0x9b, 0xeb, 0xb9, 0x96, 0xc8, - 0xf1, 0xba, 0xfe, 0x70, 0xdf, 0xfb, 0x48, 0xab, 0xc3, 0x82, 0x1d, 0x3d, 0x13, 0xa3, 0x11, 0x6e, - 0x97, 0x12, 0x7a, 0x60, 0x48, 0x04, 0x57, 0x25, 0x4b, 0x6e, 0x94, 0x28, 0xd1, 0x1b, 0xd3, 0xa8, - 0x3d, 0x05, 0x31, 0xd8, 0x6a, 0x95, 0x71, 0x41, 0x4b, 0x42, 0xb9, 0xc2, 0x33, 0x8a, 0xa0, 0xce, - 0xff, 0xe4, 0xeb, 0x7f, 0x1e, 0xdf, 0xef, 0xce, 0x98, 0x9a, 0xdf, 0x24, 0x01, 0x11, 0x79, 0x58, - 0xdf, 0xad, 0x6a, 0xf8, 0x56, 0xa6, 0xd7, 0xa1, 0x39, 0x8c, 0xe0, 0x98, 0x92, 0xe8, 0x6d, 0xcb, - 0xe9, 0xfc, 0xd9, 0x08, 0x6e, 0x81, 0x9e, 0x9c, 0xe3, 0x92, 0x4a, 0xf4, 0x99, 0xf9, 0xaf, 0xea, - 0x0a, 0xee, 0x80, 0x01, 0x4b, 0x29, 0x57, 0x4c, 0x2d, 0xd1, 0xd8, 0x5c, 0xb6, 0xe7, 0xfa, 0xc3, - 0x57, 0x60, 0xb4, 0x7e, 0x7e, 0x70, 0x08, 0xfa, 0xe9, 0x92, 0xe3, 0x9c, 0x11, 0xa7, 0x03, 0x01, - 0xe8, 0x49, 0x85, 0x15, 0x23, 0x8e, 0x75, 0x66, 0x0f, 0xba, 0x8e, 0x7d, 0x66, 0x0f, 0x5e, 0x3b, - 0xa3, 0xc9, 0xc9, 0xdf, 0x2b, 0xd7, 0xba, 0x5b, 0xb9, 0xd6, 0xfd, 0xca, 0xb5, 0xfe, 0x5d, 0xb9, - 0xd6, 0x5f, 0x4f, 0x6e, 0xe7, 0xfe, 0xc9, 0xed, 0x3c, 0x3c, 0xb9, 0x9d, 0xdf, 0xbe, 0x6c, 0xed, - 0x63, 0xed, 0x2d, 0x59, 0x1c, 0x84, 0xb7, 0xd5, 0x83, 0x62, 0x36, 0x93, 0xf4, 0xcc, 0x43, 0x71, - 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0xc9, 0x86, 0xf4, 0xb9, 0x04, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0xcf, 0x72, 0xe3, 0x34, + 0x18, 0x8f, 0x89, 0x37, 0x49, 0x15, 0x36, 0xf5, 0x8a, 0x6c, 0x47, 0xed, 0x2c, 0x5e, 0xb3, 0x87, + 0x62, 0x18, 0xb0, 0xa7, 0x2d, 0x07, 0x6e, 0x4c, 0xd3, 0x36, 0x43, 0x3b, 0x30, 0x14, 0xb7, 0x5c, + 0xb8, 0x78, 0x64, 0x59, 0x4d, 0x34, 0xb5, 0x25, 0x63, 0xa9, 0xa1, 0xe1, 0x29, 0x78, 0x0c, 0x1e, + 0xa5, 0xc7, 0x1e, 0x3b, 0x1c, 0x3a, 0x4c, 0xfa, 0x22, 0x8c, 0x64, 0xbb, 0x38, 0x53, 0x2e, 0x91, + 0x3f, 0xfd, 0xfe, 0x7c, 0x92, 0xf2, 0x93, 0xc0, 0xbb, 0x0c, 0x2f, 0x30, 0xa7, 0x2a, 0xd4, 0x63, + 0x28, 0x0b, 0x4a, 0xcc, 0x4f, 0x50, 0x94, 0x42, 0x09, 0xf8, 0xa6, 0x46, 0x03, 0x3d, 0x06, 0x1a, + 0xd8, 0x19, 0xcf, 0xc4, 0x4c, 0x18, 0x34, 0xd4, 0x5f, 0x15, 0x71, 0x67, 0xf7, 0xa5, 0x0d, 0x2e, + 0x58, 0x4c, 0x44, 0x96, 0x51, 0xa2, 0x98, 0xe0, 0x35, 0xcf, 0x25, 0x42, 0xe6, 0x42, 0x86, 0x09, + 0x96, 0x34, 0x5c, 0xec, 0x25, 0x54, 0xe1, 0xbd, 0x90, 0x08, 0x56, 0xe3, 0x1f, 0x1e, 0xfa, 0xc0, + 0xbe, 0x28, 0x28, 0x81, 0x63, 0xf0, 0x8a, 0xf1, 0x94, 0xde, 0x22, 0xcb, 0xb3, 0xfc, 0x8d, 0xa8, + 0x2a, 0x20, 0x04, 0x36, 0xc7, 0x39, 0x45, 0x1f, 0x99, 0x49, 0xf3, 0x0d, 0x11, 0xe8, 0x53, 0x8e, + 0x93, 0x8c, 0xa6, 0xc8, 0xf6, 0x2c, 0x7f, 0x10, 0x35, 0x25, 0x3c, 0x00, 0x6f, 0x4b, 0x9a, 0x31, + 0x9c, 0xb0, 0x8c, 0xa9, 0x65, 0xac, 0xe6, 0x25, 0x95, 0x73, 0x91, 0xa5, 0xe8, 0x95, 0x67, 0xf9, + 0xaf, 0xa3, 0x71, 0x0b, 0xbc, 0x6c, 0x30, 0xf8, 0x2d, 0x40, 0x29, 0x56, 0x38, 0x6e, 0x2b, 0x1b, + 0xff, 0x9e, 0xf1, 0xdf, 0xd2, 0x78, 0xf4, 0x1f, 0x7c, 0x52, 0xb7, 0xfb, 0x1e, 0x7c, 0x96, 0x64, + 0x82, 0x5c, 0xc7, 0x29, 0x93, 0x0a, 0x73, 0x42, 0xe3, 0x2b, 0x51, 0xc6, 0x57, 0x8c, 0xe3, 0x8c, + 0xfd, 0x41, 0xd3, 0x58, 0xcb, 0x50, 0xdf, 0xb4, 0xfe, 0xd4, 0x10, 0x8f, 0x6b, 0xde, 0x54, 0x94, + 0xd3, 0x86, 0x75, 0x8c, 0x15, 0x86, 0xdf, 0x81, 0x77, 0x86, 0x20, 0x63, 0xc6, 0x1b, 0x03, 0xac, + 0x4f, 0x31, 0x2e, 0x4a, 0x21, 0xae, 0xd0, 0xc0, 0x98, 0x6c, 0x57, 0x9c, 0x53, 0x3e, 0x6d, 0x31, + 0xce, 0x35, 0x01, 0x7e, 0x05, 0x20, 0x5e, 0xd0, 0x12, 0xcf, 0x68, 0x5c, 0x2d, 0x49, 0xb1, 0x9c, + 0xa2, 0x0d, 0xcf, 0xf2, 0xbb, 0x91, 0x53, 0x23, 0x13, 0x0d, 0x5c, 0xb2, 0x9c, 0xc2, 0x43, 0xe0, + 0xe2, 0x2c, 0x13, 0xbf, 0xd3, 0xb4, 0x66, 0x67, 0x78, 0x66, 0xd6, 0xfe, 0x9b, 0x90, 0xb1, 0x5c, + 0x72, 0x82, 0x80, 0x51, 0x6e, 0xd7, 0x2c, 0xa3, 0xfc, 0x01, 0xcf, 0xa6, 0xa2, 0xfc, 0x59, 0xc8, + 0x8b, 0x25, 0x27, 0xba, 0x61, 0x23, 0x95, 0x2a, 0xbe, 0x29, 0x52, 0xac, 0x68, 0x8a, 0x86, 0x9e, + 0xe5, 0xdb, 0x91, 0x93, 0x54, 0x7c, 0xa9, 0x7e, 0xa9, 0xe6, 0xe1, 0x8f, 0x00, 0xe6, 0x8c, 0xc7, + 0x52, 0xe1, 0x6b, 0xaa, 0xb7, 0xb4, 0x60, 0x29, 0x2d, 0xd1, 0xc7, 0x9e, 0xe5, 0x0f, 0xf7, 0xb7, + 0x83, 0x2a, 0x22, 0x81, 0x8e, 0x48, 0x50, 0x47, 0x24, 0x38, 0x12, 0x8c, 0x4f, 0xec, 0xbb, 0xc7, + 0xf7, 0x9d, 0xc8, 0xc9, 0x19, 0xbf, 0xd0, 0xca, 0xf3, 0x5a, 0x08, 0x7f, 0x02, 0x9b, 0x8d, 0x89, + 0x8c, 0xd5, 0xb2, 0xa0, 0x12, 0x8d, 0x3c, 0xcb, 0x1f, 0xed, 0xef, 0x06, 0x2f, 0xf2, 0x1b, 0xe8, + 0x74, 0x05, 0x8d, 0x54, 0x5e, 0x6a, 0x76, 0x34, 0x2a, 0xd6, 0x6a, 0x1d, 0x29, 0x96, 0x17, 0xa2, + 0x54, 0x12, 0x6d, 0x7a, 0x5d, 0x7f, 0x23, 0x6a, 0x4a, 0x78, 0x0a, 0x36, 0xd7, 0x73, 0x2d, 0x91, + 0xe3, 0x75, 0xfd, 0xe1, 0xbe, 0xf7, 0x3f, 0xad, 0x0e, 0x0b, 0x76, 0xf4, 0x4c, 0x8c, 0x46, 0xb8, + 0x5d, 0x4a, 0xe8, 0x81, 0x21, 0x11, 0x5c, 0x95, 0x2c, 0xb9, 0x51, 0xa2, 0x44, 0x6f, 0x4c, 0xa3, + 0xf6, 0x14, 0xc4, 0x60, 0xab, 0x55, 0xc6, 0x05, 0x2d, 0x09, 0xe5, 0x0a, 0xcf, 0x28, 0x82, 0x3a, + 0xff, 0x93, 0x2f, 0xff, 0x7e, 0x7c, 0xbf, 0x3b, 0x63, 0x6a, 0x7e, 0x93, 0x04, 0x44, 0xe4, 0x61, + 0x7d, 0xb7, 0xaa, 0xe1, 0x6b, 0x99, 0x5e, 0x87, 0xe6, 0x30, 0x82, 0x63, 0x4a, 0xa2, 0xb7, 0x2d, + 0xa7, 0xf3, 0x67, 0x23, 0xb8, 0x05, 0x7a, 0x72, 0x8e, 0x4b, 0x2a, 0xd1, 0x27, 0xe6, 0xbf, 0xaa, + 0x2b, 0xb8, 0x03, 0x06, 0x2c, 0xa5, 0x5c, 0x31, 0xb5, 0x44, 0x63, 0x73, 0xd9, 0x9e, 0xeb, 0x0f, + 0x5f, 0x80, 0xd1, 0xfa, 0xf9, 0xc1, 0x21, 0xe8, 0xa7, 0x4b, 0x8e, 0x73, 0x46, 0x9c, 0x0e, 0x04, + 0xa0, 0x27, 0x15, 0x56, 0x8c, 0x38, 0xd6, 0x99, 0x3d, 0xe8, 0x3a, 0xf6, 0x99, 0x3d, 0x78, 0xed, + 0x8c, 0x26, 0x27, 0x7f, 0xad, 0x5c, 0xeb, 0x6e, 0xe5, 0x5a, 0xf7, 0x2b, 0xd7, 0xfa, 0x67, 0xe5, + 0x5a, 0x7f, 0x3e, 0xb9, 0x9d, 0xfb, 0x27, 0xb7, 0xf3, 0xf0, 0xe4, 0x76, 0x7e, 0xfd, 0xbc, 0xb5, + 0x8f, 0xb5, 0xb7, 0x64, 0xf1, 0x4d, 0x78, 0x5b, 0x3d, 0x28, 0x66, 0x33, 0x49, 0xcf, 0x3c, 0x14, + 0x07, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x42, 0xf7, 0x5f, 0x91, 0xb9, 0x04, 0x00, 0x00, } func (this *Spec) Equal(that interface{}) bool { diff --git a/x/spec/types/spec_add_proposal.pb.go b/x/spec/types/spec_add_proposal.pb.go index c098f5683e..aa12a03aa9 100644 --- a/x/spec/types/spec_add_proposal.pb.go +++ b/x/spec/types/spec_add_proposal.pb.go @@ -84,9 +84,9 @@ var fileDescriptor_90ccba27a5c90c8a = []byte{ 0xad, 0x15, 0x47, 0xc7, 0x02, 0x79, 0x86, 0x19, 0x0b, 0xe4, 0x19, 0x9c, 0x5c, 0x57, 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xf5, 0xf4, 0xcc, 0x92, - 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x14, 0x1f, 0x95, 0x19, 0xeb, 0x57, 0x40, 0xbc, + 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x14, 0x1f, 0x95, 0x99, 0xe8, 0x57, 0x40, 0xbc, 0x55, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, 0x98, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, - 0xd5, 0xd1, 0x5c, 0x6a, 0x4c, 0x01, 0x00, 0x00, + 0x95, 0xef, 0x85, 0x0f, 0x4c, 0x01, 0x00, 0x00, } func (this *SpecAddProposal) Equal(that interface{}) bool { diff --git a/x/spec/types/tx.pb.go b/x/spec/types/tx.pb.go index e20b23012e..ae8b731bc8 100644 --- a/x/spec/types/tx.pb.go +++ b/x/spec/types/tx.pb.go @@ -33,8 +33,8 @@ var fileDescriptor_c6aee532b425dbb5 = []byte{ 0x62, 0xf6, 0x2d, 0x4e, 0x77, 0x72, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xf5, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x14, 0xa3, 0xcb, - 0x8c, 0xf5, 0x2b, 0xa0, 0xe6, 0x57, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xed, 0x30, 0x06, 0x04, - 0x00, 0x00, 0xff, 0xff, 0x93, 0xa4, 0x62, 0x61, 0x81, 0x00, 0x00, 0x00, + 0x4c, 0xf4, 0x2b, 0xa0, 0xe6, 0x57, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xed, 0x30, 0x06, 0x04, + 0x00, 0x00, 0xff, 0xff, 0xd3, 0x9a, 0xbb, 0x04, 0x81, 0x00, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/subscription/client/cli/query.go b/x/subscription/client/cli/query.go index 5d18141b0e..1c78247f2a 100644 --- a/x/subscription/client/cli/query.go +++ b/x/subscription/client/cli/query.go @@ -10,7 +10,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/subscription/client/cli/query_current.go b/x/subscription/client/cli/query_current.go index 20565b23c9..dc3986bea9 100644 --- a/x/subscription/client/cli/query_current.go +++ b/x/subscription/client/cli/query_current.go @@ -3,8 +3,8 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/query_estimated_rewards.go b/x/subscription/client/cli/query_estimated_rewards.go index 17c59b8e2a..1f82c3a345 100644 --- a/x/subscription/client/cli/query_estimated_rewards.go +++ b/x/subscription/client/cli/query_estimated_rewards.go @@ -3,8 +3,8 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/query_estimated_validators_rewards.go b/x/subscription/client/cli/query_estimated_validators_rewards.go index e522d32e14..c83a758d30 100644 --- a/x/subscription/client/cli/query_estimated_validators_rewards.go +++ b/x/subscription/client/cli/query_estimated_validators_rewards.go @@ -3,8 +3,8 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/query_list.go b/x/subscription/client/cli/query_list.go index ff1a335cea..3792a3a1c8 100644 --- a/x/subscription/client/cli/query_list.go +++ b/x/subscription/client/cli/query_list.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/query_list_projects.go b/x/subscription/client/cli/query_list_projects.go index 931448ea5f..962bf27871 100644 --- a/x/subscription/client/cli/query_list_projects.go +++ b/x/subscription/client/cli/query_list_projects.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/query_next_to_month_expiry.go b/x/subscription/client/cli/query_next_to_month_expiry.go index 1f2bfce8e2..32f71fee89 100644 --- a/x/subscription/client/cli/query_next_to_month_expiry.go +++ b/x/subscription/client/cli/query_next_to_month_expiry.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/query_params.go b/x/subscription/client/cli/query_params.go index 272e2e65aa..82da6a773c 100644 --- a/x/subscription/client/cli/query_params.go +++ b/x/subscription/client/cli/query_params.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/query_tracked_cu_usage.go b/x/subscription/client/cli/query_tracked_cu_usage.go index 55a756006e..f2f114c440 100644 --- a/x/subscription/client/cli/query_tracked_cu_usage.go +++ b/x/subscription/client/cli/query_tracked_cu_usage.go @@ -3,7 +3,7 @@ package cli import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/tx.go b/x/subscription/client/cli/tx.go index 7a5501090d..853c32b87f 100644 --- a/x/subscription/client/cli/tx.go +++ b/x/subscription/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/subscription/client/cli/tx_add_project.go b/x/subscription/client/cli/tx_add_project.go index cf42d7ae75..4687502260 100644 --- a/x/subscription/client/cli/tx_add_project.go +++ b/x/subscription/client/cli/tx_add_project.go @@ -6,11 +6,11 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/decoder" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/decoder" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/tx_auto_renewal.go b/x/subscription/client/cli/tx_auto_renewal.go index 6b6633c10d..8404be4e93 100644 --- a/x/subscription/client/cli/tx_auto_renewal.go +++ b/x/subscription/client/cli/tx_auto_renewal.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cast" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/tx_buy.go b/x/subscription/client/cli/tx_buy.go index 2f518ee611..ef89756cb8 100644 --- a/x/subscription/client/cli/tx_buy.go +++ b/x/subscription/client/cli/tx_buy.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cast" "github.com/spf13/cobra" ) diff --git a/x/subscription/client/cli/tx_del_project.go b/x/subscription/client/cli/tx_del_project.go index 76ec6611cc..d1651dc52b 100644 --- a/x/subscription/client/cli/tx_del_project.go +++ b/x/subscription/client/cli/tx_del_project.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/spf13/cobra" ) diff --git a/x/subscription/genesis.go b/x/subscription/genesis.go index 8280be0897..4fcd829b7b 100644 --- a/x/subscription/genesis.go +++ b/x/subscription/genesis.go @@ -2,8 +2,8 @@ package subscription import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/subscription/genesis_test.go b/x/subscription/genesis_test.go index ade04231be..9e221ed69c 100644 --- a/x/subscription/genesis_test.go +++ b/x/subscription/genesis_test.go @@ -3,10 +3,10 @@ package subscription_test import ( "testing" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/testutil/nullify" - "github.com/lavanet/lava/v3/x/subscription" - "github.com/lavanet/lava/v3/x/subscription/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/testutil/nullify" + "github.com/lavanet/lava/v4/x/subscription" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/handler.go b/x/subscription/handler.go index f522a16f5c..71203e5475 100644 --- a/x/subscription/handler.go +++ b/x/subscription/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" ) // NewHandler ... diff --git a/x/subscription/keeper/adjustment.go b/x/subscription/keeper/adjustment.go index b939cf32ef..b2b32d27a9 100644 --- a/x/subscription/keeper/adjustment.go +++ b/x/subscription/keeper/adjustment.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" ) // SetAdjustment set a specific Adjustment in the store from its index diff --git a/x/subscription/keeper/adjustment_test.go b/x/subscription/keeper/adjustment_test.go index 8a1df55d9d..028efb1b1d 100644 --- a/x/subscription/keeper/adjustment_test.go +++ b/x/subscription/keeper/adjustment_test.go @@ -4,7 +4,7 @@ import ( "testing" "cosmossdk.io/math" - "github.com/lavanet/lava/v3/testutil/common" + "github.com/lavanet/lava/v4/testutil/common" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/keeper/cluster.go b/x/subscription/keeper/cluster.go index f4c5b126a4..5cb947d1f4 100644 --- a/x/subscription/keeper/cluster.go +++ b/x/subscription/keeper/cluster.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) func (k Keeper) GetAllClusters(ctx sdk.Context) []string { diff --git a/x/subscription/keeper/cluster_test.go b/x/subscription/keeper/cluster_test.go index 2d94b3a208..f7911bf801 100644 --- a/x/subscription/keeper/cluster_test.go +++ b/x/subscription/keeper/cluster_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/keeper/cu_tracker.go b/x/subscription/keeper/cu_tracker.go index 93aa764efd..79817c614c 100644 --- a/x/subscription/keeper/cu_tracker.go +++ b/x/subscription/keeper/cu_tracker.go @@ -8,10 +8,10 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) const LIMIT_TOKEN_PER_CU = 100 diff --git a/x/subscription/keeper/grpc_query.go b/x/subscription/keeper/grpc_query.go index 1abf00d8ed..ac95d19838 100644 --- a/x/subscription/keeper/grpc_query.go +++ b/x/subscription/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/subscription/keeper/grpc_query_current.go b/x/subscription/keeper/grpc_query_current.go index b757119c52..bcbfb27089 100644 --- a/x/subscription/keeper/grpc_query_current.go +++ b/x/subscription/keeper/grpc_query_current.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/subscription/keeper/grpc_query_estimated_rewards.go b/x/subscription/keeper/grpc_query_estimated_rewards.go index 863c2ba6e5..2c39590579 100644 --- a/x/subscription/keeper/grpc_query_estimated_rewards.go +++ b/x/subscription/keeper/grpc_query_estimated_rewards.go @@ -8,11 +8,11 @@ import ( abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/sample" - "github.com/lavanet/lava/v3/utils" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/testutil/sample" + "github.com/lavanet/lava/v4/utils" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" + "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/subscription/keeper/grpc_query_estimated_validator_rewards.go b/x/subscription/keeper/grpc_query_estimated_validator_rewards.go index 7d65dfcedc..988072d3bc 100644 --- a/x/subscription/keeper/grpc_query_estimated_validator_rewards.go +++ b/x/subscription/keeper/grpc_query_estimated_validator_rewards.go @@ -5,8 +5,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" - "github.com/lavanet/lava/v3/x/subscription/types" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" + "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/subscription/keeper/grpc_query_list.go b/x/subscription/keeper/grpc_query_list.go index c1c86e458d..e1f4509b31 100644 --- a/x/subscription/keeper/grpc_query_list.go +++ b/x/subscription/keeper/grpc_query_list.go @@ -5,8 +5,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/subscription/keeper/grpc_query_list_projects.go b/x/subscription/keeper/grpc_query_list_projects.go index d0cd8a5802..dd83f7f089 100644 --- a/x/subscription/keeper/grpc_query_list_projects.go +++ b/x/subscription/keeper/grpc_query_list_projects.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/subscription/keeper/grpc_query_next_to_month_expiry.go b/x/subscription/keeper/grpc_query_next_to_month_expiry.go index ede72c98d7..4ede178e9e 100644 --- a/x/subscription/keeper/grpc_query_next_to_month_expiry.go +++ b/x/subscription/keeper/grpc_query_next_to_month_expiry.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/subscription/types" - timertypes "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/subscription/types" + timertypes "github.com/lavanet/lava/v4/x/timerstore/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/subscription/keeper/grpc_query_params.go b/x/subscription/keeper/grpc_query_params.go index e6875cb943..142e3f07fb 100644 --- a/x/subscription/keeper/grpc_query_params.go +++ b/x/subscription/keeper/grpc_query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/subscription/keeper/grpc_query_params_test.go b/x/subscription/keeper/grpc_query_params_test.go index 5aff504135..cffb744309 100644 --- a/x/subscription/keeper/grpc_query_params_test.go +++ b/x/subscription/keeper/grpc_query_params_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/keeper/grpc_query_tracked_usage.go b/x/subscription/keeper/grpc_query_tracked_usage.go index b9af85a727..53720b261a 100644 --- a/x/subscription/keeper/grpc_query_tracked_usage.go +++ b/x/subscription/keeper/grpc_query_tracked_usage.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/subscription/keeper/keeper.go b/x/subscription/keeper/keeper.go index c583ed4c2b..037da90286 100644 --- a/x/subscription/keeper/keeper.go +++ b/x/subscription/keeper/keeper.go @@ -10,9 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" - "github.com/lavanet/lava/v3/x/subscription/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" + "github.com/lavanet/lava/v4/x/subscription/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) type ( diff --git a/x/subscription/keeper/migrations.go b/x/subscription/keeper/migrations.go index b3bc25d008..22aebf0452 100644 --- a/x/subscription/keeper/migrations.go +++ b/x/subscription/keeper/migrations.go @@ -6,12 +6,12 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - v2 "github.com/lavanet/lava/v3/x/subscription/migrations/v2" - v5 "github.com/lavanet/lava/v3/x/subscription/migrations/v5" - v6 "github.com/lavanet/lava/v3/x/subscription/migrations/v6" - v8 "github.com/lavanet/lava/v3/x/subscription/migrations/v8" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + v2 "github.com/lavanet/lava/v4/x/subscription/migrations/v2" + v5 "github.com/lavanet/lava/v4/x/subscription/migrations/v5" + v6 "github.com/lavanet/lava/v4/x/subscription/migrations/v6" + v8 "github.com/lavanet/lava/v4/x/subscription/migrations/v8" + "github.com/lavanet/lava/v4/x/subscription/types" ) type Migrator struct { diff --git a/x/subscription/keeper/msg_server.go b/x/subscription/keeper/msg_server.go index 4b033809aa..0ed2a91c4a 100644 --- a/x/subscription/keeper/msg_server.go +++ b/x/subscription/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) type msgServer struct { diff --git a/x/subscription/keeper/msg_server_add_project.go b/x/subscription/keeper/msg_server_add_project.go index fba236ccf5..4c4bf0fb2f 100644 --- a/x/subscription/keeper/msg_server_add_project.go +++ b/x/subscription/keeper/msg_server_add_project.go @@ -5,9 +5,9 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) func (k msgServer) AddProject(goCtx context.Context, msg *types.MsgAddProject) (*types.MsgAddProjectResponse, error) { diff --git a/x/subscription/keeper/msg_server_auto_renewal.go b/x/subscription/keeper/msg_server_auto_renewal.go index a399da62fd..1e39a6d7eb 100644 --- a/x/subscription/keeper/msg_server_auto_renewal.go +++ b/x/subscription/keeper/msg_server_auto_renewal.go @@ -6,9 +6,9 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + "github.com/lavanet/lava/v4/x/subscription/types" ) func (k msgServer) AutoRenewal(goCtx context.Context, msg *types.MsgAutoRenewal) (*types.MsgAutoRenewalResponse, error) { diff --git a/x/subscription/keeper/msg_server_buy.go b/x/subscription/keeper/msg_server_buy.go index 36d8324d13..780cdb5cb4 100644 --- a/x/subscription/keeper/msg_server_buy.go +++ b/x/subscription/keeper/msg_server_buy.go @@ -6,8 +6,8 @@ import ( "strconv" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" ) func (k msgServer) Buy(goCtx context.Context, msg *types.MsgBuy) (*types.MsgBuyResponse, error) { diff --git a/x/subscription/keeper/msg_server_del_project.go b/x/subscription/keeper/msg_server_del_project.go index 33012a6fbb..da447a6bb4 100644 --- a/x/subscription/keeper/msg_server_del_project.go +++ b/x/subscription/keeper/msg_server_del_project.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/x/subscription/types" ) func (k msgServer) DelProject(goCtx context.Context, msg *types.MsgDelProject) (*types.MsgDelProjectResponse, error) { diff --git a/x/subscription/keeper/msg_server_test.go b/x/subscription/keeper/msg_server_test.go index 3b91e5fdac..b537768e68 100644 --- a/x/subscription/keeper/msg_server_test.go +++ b/x/subscription/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { diff --git a/x/subscription/keeper/params.go b/x/subscription/keeper/params.go index 3fe927cdd0..d1d8f6073b 100644 --- a/x/subscription/keeper/params.go +++ b/x/subscription/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) // GetParams get all parameters as types.Params diff --git a/x/subscription/keeper/params_test.go b/x/subscription/keeper/params_test.go index c6b94af34a..b683b9e52b 100644 --- a/x/subscription/keeper/params_test.go +++ b/x/subscription/keeper/params_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - testkeeper "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + testkeeper "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/keeper/subscription.go b/x/subscription/keeper/subscription.go index 7cde34e7ed..9a873a0d0a 100644 --- a/x/subscription/keeper/subscription.go +++ b/x/subscription/keeper/subscription.go @@ -8,11 +8,11 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/utils" - "github.com/lavanet/lava/v3/utils/lavaslices" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/utils" + "github.com/lavanet/lava/v4/utils/lavaslices" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + "github.com/lavanet/lava/v4/x/subscription/types" ) // GetSubscription returns the subscription of a given consumer diff --git a/x/subscription/keeper/subscription_test.go b/x/subscription/keeper/subscription_test.go index 59995a4e92..f29d70dc2e 100644 --- a/x/subscription/keeper/subscription_test.go +++ b/x/subscription/keeper/subscription_test.go @@ -8,15 +8,15 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/testutil/common" - keepertest "github.com/lavanet/lava/v3/testutil/keeper" - "github.com/lavanet/lava/v3/utils" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/utils/sigs" - pairingtypes "github.com/lavanet/lava/v3/x/pairing/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/testutil/common" + keepertest "github.com/lavanet/lava/v4/testutil/keeper" + "github.com/lavanet/lava/v4/utils" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/utils/sigs" + pairingtypes "github.com/lavanet/lava/v4/x/pairing/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/module.go b/x/subscription/module.go index 890f3a9ece..6a8f4fbdbe 100644 --- a/x/subscription/module.go +++ b/x/subscription/module.go @@ -18,9 +18,9 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/lavanet/lava/v3/x/subscription/client/cli" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/client/cli" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" ) var ( diff --git a/x/subscription/module_simulation.go b/x/subscription/module_simulation.go index e36b975910..c8047e4039 100644 --- a/x/subscription/module_simulation.go +++ b/x/subscription/module_simulation.go @@ -10,9 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/lavanet/lava/v3/testutil/sample" - subscriptionsimulation "github.com/lavanet/lava/v3/x/subscription/simulation" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/testutil/sample" + subscriptionsimulation "github.com/lavanet/lava/v4/x/subscription/simulation" + "github.com/lavanet/lava/v4/x/subscription/types" ) // avoid unused import issue diff --git a/x/subscription/simulation/add_project.go b/x/subscription/simulation/add_project.go index fb30603637..a82d928431 100644 --- a/x/subscription/simulation/add_project.go +++ b/x/subscription/simulation/add_project.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" ) func SimulateMsgAddProject( diff --git a/x/subscription/simulation/auto_renewal.go b/x/subscription/simulation/auto_renewal.go index e4fb430944..6fc8fde634 100644 --- a/x/subscription/simulation/auto_renewal.go +++ b/x/subscription/simulation/auto_renewal.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" ) func SimulateMsgAutoRenewal( diff --git a/x/subscription/simulation/buy.go b/x/subscription/simulation/buy.go index d67915c3f8..9f3eb3b304 100644 --- a/x/subscription/simulation/buy.go +++ b/x/subscription/simulation/buy.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" ) func SimulateMsgBuy( diff --git a/x/subscription/simulation/del_project.go b/x/subscription/simulation/del_project.go index 8864ae934d..574f434ed0 100644 --- a/x/subscription/simulation/del_project.go +++ b/x/subscription/simulation/del_project.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/lavanet/lava/v3/x/subscription/keeper" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/keeper" + "github.com/lavanet/lava/v4/x/subscription/types" ) func SimulateMsgDelProject( diff --git a/x/subscription/types/adjustment.pb.go b/x/subscription/types/adjustment.pb.go index 3402e12a2c..852b37df4f 100644 --- a/x/subscription/types/adjustment.pb.go +++ b/x/subscription/types/adjustment.pb.go @@ -102,9 +102,9 @@ var fileDescriptor_6061843cba96837b = []byte{ 0xab, 0x24, 0xbf, 0x24, 0x31, 0x07, 0xa2, 0x84, 0x19, 0xac, 0x04, 0x49, 0xc4, 0xc9, 0xf3, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xf4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, - 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x51, 0x7c, 0x55, 0x66, 0xac, 0x5f, 0x81, 0xea, 0xb5, 0x92, 0xca, - 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xb7, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x47, 0x54, - 0x5a, 0xe1, 0x04, 0x01, 0x00, 0x00, + 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x51, 0x7c, 0x55, 0x66, 0xa2, 0x5f, 0x81, 0xea, 0xb5, 0x92, 0xca, + 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xb7, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xfd, + 0x78, 0x54, 0x04, 0x01, 0x00, 0x00, } func (m *Adjustment) Marshal() (dAtA []byte, err error) { diff --git a/x/subscription/types/cu_tracker.pb.go b/x/subscription/types/cu_tracker.pb.go index c4ff1a2fa5..f942146d43 100644 --- a/x/subscription/types/cu_tracker.pb.go +++ b/x/subscription/types/cu_tracker.pb.go @@ -199,28 +199,28 @@ func init() { } var fileDescriptor_5974e118ddf7c543 = []byte{ - // 323 bytes of a gzipped FileDescriptorProto + // 324 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xbd, 0x6e, 0xc2, 0x30, 0x14, 0x85, 0x13, 0x4a, 0x69, 0xe3, 0xaa, 0x1d, 0x2c, 0x86, 0x40, 0x2b, 0x17, 0x31, 0xa1, 0x0e, - 0xb6, 0x28, 0x43, 0x77, 0x60, 0x61, 0x8d, 0x98, 0xba, 0x54, 0x8e, 0x71, 0xc1, 0x02, 0x72, 0x23, - 0xc7, 0x8e, 0xca, 0x5b, 0xf4, 0xb1, 0x18, 0x19, 0x3b, 0x55, 0x15, 0x79, 0x91, 0x2a, 0x3f, 0xfc, - 0x4d, 0xf7, 0x9e, 0xeb, 0x63, 0x9f, 0x4f, 0xbe, 0xe8, 0x65, 0xc5, 0x53, 0x1e, 0x49, 0xc3, 0xf2, - 0xca, 0x12, 0x1b, 0x26, 0x42, 0xab, 0xd8, 0x28, 0x88, 0x98, 0xb0, 0x1f, 0x46, 0x73, 0xb1, 0x94, - 0x9a, 0xc6, 0x1a, 0x0c, 0xe0, 0x56, 0xe5, 0xa5, 0x79, 0xa5, 0xe7, 0xde, 0x36, 0x11, 0x90, 0xac, - 0x21, 0x61, 0x21, 0x4f, 0x24, 0x4b, 0xfb, 0xa1, 0x34, 0xbc, 0xcf, 0x04, 0xa8, 0xa8, 0xbc, 0xda, - 0x6e, 0xce, 0x61, 0x0e, 0x45, 0xcb, 0xf2, 0xae, 0x9c, 0x76, 0x1f, 0x91, 0x37, 0x2d, 0x12, 0x66, - 0x23, 0x8b, 0x1f, 0x50, 0x4d, 0x58, 0xdf, 0xed, 0xb8, 0xbd, 0x7a, 0x50, 0x13, 0xb6, 0x2b, 0x10, - 0x1e, 0xd9, 0xf2, 0x58, 0x4f, 0xd5, 0x5a, 0xea, 0x31, 0x37, 0x1c, 0x37, 0xd1, 0x75, 0xb8, 0x02, - 0xb1, 0xac, 0x8c, 0xa5, 0xc0, 0x6f, 0xa8, 0x21, 0xb4, 0x9c, 0x29, 0xe3, 0xd7, 0x3a, 0x6e, 0xef, - 0xee, 0xb5, 0x45, 0x4b, 0x1e, 0x9a, 0xf3, 0xd0, 0x8a, 0x87, 0x8e, 0x40, 0x45, 0xc3, 0xfa, 0xf6, - 0xf7, 0xd9, 0x09, 0x2a, 0x7b, 0x77, 0x83, 0xee, 0x8f, 0x04, 0x93, 0xe8, 0x13, 0x70, 0x1b, 0xdd, - 0xc6, 0x1a, 0x52, 0x35, 0x93, 0xba, 0x88, 0xf0, 0x82, 0xa3, 0xc6, 0x3e, 0xba, 0x11, 0x0b, 0xae, - 0xa2, 0xc9, 0xb8, 0x88, 0xf1, 0x82, 0x83, 0xc4, 0x4f, 0xc8, 0x33, 0x87, 0x67, 0xfc, 0xab, 0x82, - 0xec, 0x34, 0x38, 0x31, 0xd7, 0xcf, 0x98, 0x87, 0x93, 0xed, 0x9e, 0xb8, 0xbb, 0x3d, 0x71, 0xff, - 0xf6, 0xc4, 0xfd, 0xce, 0x88, 0xb3, 0xcb, 0x88, 0xf3, 0x93, 0x11, 0xe7, 0x9d, 0xcd, 0x95, 0x59, - 0xd8, 0x90, 0x0a, 0x58, 0xb3, 0x8b, 0xf5, 0xa4, 0x03, 0xf6, 0x75, 0xb9, 0x23, 0xb3, 0x89, 0x65, - 0x12, 0x36, 0x8a, 0xef, 0x1c, 0xfc, 0x07, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xbe, 0xee, 0x8d, 0xcd, - 0x01, 0x00, 0x00, + 0xb6, 0x68, 0x2b, 0x75, 0x07, 0x16, 0xd6, 0x88, 0xa9, 0x4b, 0xe5, 0x18, 0x17, 0x2c, 0x20, 0x37, + 0x72, 0xec, 0xa8, 0xbc, 0x45, 0x1f, 0x8b, 0x91, 0xb1, 0x53, 0x55, 0x91, 0x17, 0xa9, 0xf2, 0xc3, + 0xdf, 0x74, 0xef, 0xb9, 0x3e, 0xf6, 0xf9, 0xe4, 0x8b, 0x9e, 0x96, 0x3c, 0xe5, 0x91, 0x34, 0x2c, + 0xaf, 0x2c, 0xb1, 0x61, 0x22, 0xb4, 0x8a, 0x8d, 0x82, 0x88, 0x09, 0xfb, 0x61, 0x34, 0x17, 0x0b, + 0xa9, 0x69, 0xac, 0xc1, 0x00, 0x6e, 0x55, 0x5e, 0x9a, 0x57, 0x7a, 0xea, 0x6d, 0x13, 0x01, 0xc9, + 0x0a, 0x12, 0x16, 0xf2, 0x44, 0xb2, 0xb4, 0x1f, 0x4a, 0xc3, 0xfb, 0x4c, 0x80, 0x8a, 0xca, 0xab, + 0xed, 0xe6, 0x0c, 0x66, 0x50, 0xb4, 0x2c, 0xef, 0xca, 0x69, 0xf7, 0x1e, 0x79, 0x93, 0x22, 0x61, + 0x3a, 0xb4, 0xf8, 0x0e, 0xd5, 0x84, 0xf5, 0xdd, 0x8e, 0xdb, 0xab, 0x07, 0x35, 0x61, 0xbb, 0x02, + 0xe1, 0xa1, 0x2d, 0x8f, 0xf5, 0x44, 0xad, 0xa4, 0x1e, 0x71, 0xc3, 0x71, 0x13, 0x5d, 0x86, 0x4b, + 0x10, 0x8b, 0xca, 0x58, 0x0a, 0xfc, 0x86, 0x1a, 0x42, 0xcb, 0xa9, 0x32, 0x7e, 0xad, 0xe3, 0xf6, + 0x6e, 0x9e, 0x5b, 0xb4, 0xe4, 0xa1, 0x39, 0x0f, 0xad, 0x78, 0xe8, 0x10, 0x54, 0x34, 0xa8, 0x6f, + 0x7e, 0x1f, 0x9d, 0xa0, 0xb2, 0x77, 0xd7, 0xe8, 0xf6, 0x40, 0x30, 0x8e, 0x3e, 0x01, 0xb7, 0xd1, + 0x75, 0xac, 0x21, 0x55, 0x53, 0xa9, 0x8b, 0x08, 0x2f, 0x38, 0x68, 0xec, 0xa3, 0x2b, 0x31, 0xe7, + 0x2a, 0x1a, 0x8f, 0x8a, 0x18, 0x2f, 0xd8, 0x4b, 0xfc, 0x80, 0x3c, 0xb3, 0x7f, 0xc6, 0xbf, 0x28, + 0xc8, 0x8e, 0x83, 0x23, 0x73, 0xfd, 0x84, 0x79, 0x30, 0xde, 0xec, 0x88, 0xbb, 0xdd, 0x11, 0xf7, + 0x6f, 0x47, 0xdc, 0xef, 0x8c, 0x38, 0xdb, 0x8c, 0x38, 0x3f, 0x19, 0x71, 0xde, 0xd9, 0x4c, 0x99, + 0xb9, 0x0d, 0xa9, 0x80, 0x15, 0x3b, 0x5b, 0x4f, 0xfa, 0xca, 0xbe, 0xce, 0x77, 0x64, 0xd6, 0xb1, + 0x4c, 0xc2, 0x46, 0xf1, 0x9d, 0x2f, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x17, 0xcc, 0x38, + 0xcd, 0x01, 0x00, 0x00, } func (m *TrackedCu) Marshal() (dAtA []byte, err error) { diff --git a/x/subscription/types/expected_keepers.go b/x/subscription/types/expected_keepers.go index 8d04451573..2169e5b817 100644 --- a/x/subscription/types/expected_keepers.go +++ b/x/subscription/types/expected_keepers.go @@ -8,13 +8,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - dualstakingtypes "github.com/lavanet/lava/v3/x/dualstaking/types" - epochstoragetypes "github.com/lavanet/lava/v3/x/epochstorage/types" - fixationtypes "github.com/lavanet/lava/v3/x/fixationstore/types" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" - rewardstypes "github.com/lavanet/lava/v3/x/rewards/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + dualstakingtypes "github.com/lavanet/lava/v4/x/dualstaking/types" + epochstoragetypes "github.com/lavanet/lava/v4/x/epochstorage/types" + fixationtypes "github.com/lavanet/lava/v4/x/fixationstore/types" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" + rewardstypes "github.com/lavanet/lava/v4/x/rewards/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/subscription/types/genesis.go b/x/subscription/types/genesis.go index 07d1f5901d..cadd802c9e 100644 --- a/x/subscription/types/genesis.go +++ b/x/subscription/types/genesis.go @@ -1,8 +1,8 @@ package types import ( - fixationstoretypes "github.com/lavanet/lava/v3/x/fixationstore/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + fixationstoretypes "github.com/lavanet/lava/v4/x/fixationstore/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) // this line is used by starport scaffolding # genesis/types/import diff --git a/x/subscription/types/genesis.pb.go b/x/subscription/types/genesis.pb.go index a01062a1b7..dfae6509e4 100644 --- a/x/subscription/types/genesis.pb.go +++ b/x/subscription/types/genesis.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/fixationstore/types" - types1 "github.com/lavanet/lava/v3/x/timerstore/types" + types "github.com/lavanet/lava/v4/x/fixationstore/types" + types1 "github.com/lavanet/lava/v4/x/timerstore/types" io "io" math "math" math_bits "math/bits" @@ -120,28 +120,28 @@ func init() { var fileDescriptor_dc6c60f9c112fe52 = []byte{ // 347 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x31, 0x4e, 0xf3, 0x30, - 0x18, 0x86, 0x93, 0xbf, 0xfd, 0x33, 0xa4, 0x4c, 0x11, 0x43, 0xe8, 0x10, 0x0a, 0x08, 0x28, 0x0c, - 0xb6, 0x44, 0x0f, 0x80, 0x28, 0x52, 0x11, 0x03, 0x52, 0x45, 0x32, 0xb1, 0xb9, 0xc1, 0x84, 0x00, - 0x89, 0x23, 0xdb, 0xa9, 0xca, 0x2d, 0x38, 0x56, 0x07, 0x86, 0x8e, 0x4c, 0x08, 0x35, 0x17, 0x41, - 0xb6, 0xd3, 0xd6, 0x16, 0xca, 0x00, 0x93, 0x1d, 0xe9, 0x79, 0x9f, 0xbc, 0x5f, 0xf2, 0xb9, 0xc7, - 0x2f, 0x68, 0x8a, 0x72, 0xcc, 0xa1, 0x38, 0x21, 0x2b, 0x27, 0x2c, 0xa6, 0x69, 0xc1, 0x53, 0x92, - 0xc3, 0x04, 0xe7, 0x98, 0xa5, 0x0c, 0x14, 0x94, 0x70, 0xe2, 0xed, 0xd4, 0x20, 0x10, 0x27, 0xd0, - 0xc1, 0xee, 0x76, 0x42, 0x12, 0x22, 0x29, 0x28, 0x6e, 0x2a, 0xd0, 0x3d, 0x6a, 0x36, 0x17, 0x88, - 0xa2, 0xac, 0x16, 0x77, 0x4f, 0x9b, 0x39, 0x74, 0xff, 0x54, 0x32, 0x9e, 0xe1, 0x9c, 0xd7, 0xec, - 0x89, 0xc1, 0x3e, 0xa4, 0x33, 0x24, 0x38, 0xc6, 0x09, 0xc5, 0xeb, 0xa7, 0x1a, 0x3d, 0x30, 0x50, - 0x9e, 0x66, 0x98, 0x2a, 0x4e, 0x5e, 0x15, 0xb4, 0xff, 0xde, 0x72, 0xb7, 0xae, 0xd4, 0x98, 0x21, - 0x47, 0x1c, 0x7b, 0xe7, 0xae, 0xa3, 0xca, 0xf9, 0x76, 0xcf, 0xee, 0x77, 0xce, 0xf6, 0x40, 0xe3, - 0xd8, 0x60, 0x2c, 0xc1, 0x61, 0x7b, 0xfe, 0xb9, 0x6b, 0xdd, 0xd6, 0x31, 0x6f, 0xe4, 0x3a, 0x02, - 0x1a, 0x85, 0xfe, 0x3f, 0x29, 0xe8, 0x9b, 0x02, 0xa3, 0x32, 0xd0, 0x5f, 0xbd, 0xf2, 0xa8, 0xb4, - 0x77, 0xa9, 0x3c, 0x51, 0xe8, 0xb7, 0xa4, 0xe7, 0xd0, 0xf4, 0x6c, 0xe6, 0x69, 0x94, 0x44, 0xa1, - 0x37, 0x76, 0x3b, 0x71, 0x19, 0x51, 0x14, 0x3f, 0x63, 0x3a, 0x0a, 0xfd, 0xf6, 0x9f, 0x1a, 0xe9, - 0x0a, 0xef, 0x46, 0x33, 0x46, 0xa1, 0xff, 0xff, 0xf7, 0xdd, 0xf4, 0xbc, 0xd0, 0x6d, 0xfe, 0x31, - 0xf3, 0x9d, 0x5e, 0xeb, 0xa7, 0xce, 0xf8, 0xe6, 0x17, 0x6b, 0x7a, 0xa5, 0xd3, 0xf2, 0xc3, 0xeb, - 0xf9, 0x32, 0xb0, 0x17, 0xcb, 0xc0, 0xfe, 0x5a, 0x06, 0xf6, 0x5b, 0x15, 0x58, 0x8b, 0x2a, 0xb0, - 0x3e, 0xaa, 0xc0, 0xba, 0x83, 0x49, 0xca, 0x1f, 0xcb, 0x09, 0x88, 0x49, 0x06, 0x8d, 0xc5, 0x98, - 0x0e, 0xe0, 0xcc, 0x5c, 0x3a, 0xfe, 0x5a, 0x60, 0x36, 0x71, 0xe4, 0x82, 0x0c, 0xbe, 0x03, 0x00, - 0x00, 0xff, 0xff, 0x34, 0x32, 0xd2, 0xe8, 0x20, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xb1, 0x4e, 0xeb, 0x30, + 0x14, 0x86, 0x93, 0xdb, 0xde, 0x0c, 0x29, 0x53, 0xc4, 0x10, 0x3a, 0x84, 0x02, 0x02, 0x0a, 0x83, + 0x2d, 0x01, 0x3b, 0xa2, 0x48, 0x45, 0x0c, 0x48, 0x15, 0xc9, 0xc4, 0xe6, 0x06, 0x13, 0x02, 0x24, + 0x8e, 0x6c, 0xa7, 0x2a, 0x6f, 0xc1, 0x63, 0x75, 0x60, 0xe8, 0xc8, 0x84, 0x50, 0xf3, 0x22, 0xc8, + 0x76, 0xda, 0xda, 0x42, 0x19, 0x60, 0xb2, 0x23, 0x7d, 0xff, 0x97, 0xff, 0x24, 0xc7, 0x3d, 0x7c, + 0x41, 0x13, 0x94, 0x63, 0x0e, 0xc5, 0x09, 0x59, 0x39, 0x66, 0x31, 0x4d, 0x0b, 0x9e, 0x92, 0x1c, + 0x26, 0x38, 0xc7, 0x2c, 0x65, 0xa0, 0xa0, 0x84, 0x13, 0x6f, 0xab, 0x06, 0x81, 0x38, 0x81, 0x0e, + 0x76, 0x37, 0x13, 0x92, 0x10, 0x49, 0x41, 0x71, 0x53, 0x81, 0xee, 0x41, 0xb3, 0xb9, 0x40, 0x14, + 0x65, 0xb5, 0xb8, 0x7b, 0xdc, 0xcc, 0xa1, 0xfb, 0xa7, 0x92, 0xf1, 0x0c, 0xe7, 0xbc, 0x66, 0x8f, + 0x0c, 0xf6, 0x21, 0x9d, 0x22, 0xc1, 0x31, 0x4e, 0x28, 0x5e, 0x3d, 0xd5, 0xe8, 0x9e, 0x81, 0xf2, + 0x34, 0xc3, 0x54, 0x71, 0xf2, 0xaa, 0xa0, 0xdd, 0xf7, 0x96, 0xbb, 0x71, 0xa5, 0xc6, 0x0c, 0x39, + 0xe2, 0xd8, 0x3b, 0x77, 0x1d, 0x55, 0xce, 0xb7, 0x7b, 0x76, 0xbf, 0x73, 0xb2, 0x03, 0x1a, 0xc7, + 0x06, 0x23, 0x09, 0x0e, 0xda, 0xb3, 0xcf, 0x6d, 0xeb, 0xb6, 0x8e, 0x79, 0x43, 0xd7, 0x11, 0xd0, + 0x30, 0xf4, 0xff, 0x49, 0x41, 0xdf, 0x14, 0x18, 0x95, 0x81, 0xfe, 0xea, 0xa5, 0x47, 0xa5, 0xbd, + 0x4b, 0xe5, 0x89, 0x42, 0xbf, 0x25, 0x3d, 0xfb, 0xa6, 0x67, 0x3d, 0x4f, 0xa3, 0x24, 0x0a, 0xbd, + 0x91, 0xdb, 0x89, 0xcb, 0x88, 0xa2, 0xf8, 0x19, 0xd3, 0x61, 0xe8, 0xb7, 0xff, 0xd4, 0x48, 0x57, + 0x78, 0x37, 0x9a, 0x31, 0x0a, 0xfd, 0xff, 0xbf, 0xef, 0xa6, 0xe7, 0x85, 0x6e, 0xfd, 0x8f, 0x99, + 0xef, 0xf4, 0x5a, 0x3f, 0x75, 0xc6, 0x37, 0xbf, 0x58, 0xd1, 0x4b, 0x9d, 0x96, 0x1f, 0x5c, 0xcf, + 0x16, 0x81, 0x3d, 0x5f, 0x04, 0xf6, 0xd7, 0x22, 0xb0, 0xdf, 0xaa, 0xc0, 0x9a, 0x57, 0x81, 0xf5, + 0x51, 0x05, 0xd6, 0x1d, 0x4c, 0x52, 0xfe, 0x58, 0x8e, 0x41, 0x4c, 0x32, 0x68, 0x2c, 0xc6, 0xe4, + 0x0c, 0x4e, 0xcd, 0xa5, 0xe3, 0xaf, 0x05, 0x66, 0x63, 0x47, 0x2e, 0xc8, 0xe9, 0x77, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x0c, 0x9b, 0xf0, 0x5d, 0x20, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/subscription/types/genesis_test.go b/x/subscription/types/genesis_test.go index 4e6ad883bb..42a66273c7 100644 --- a/x/subscription/types/genesis_test.go +++ b/x/subscription/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/lavanet/lava/v3/x/subscription/types" + "github.com/lavanet/lava/v4/x/subscription/types" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/types/message_add_project.go b/x/subscription/types/message_add_project.go index bbb3a4f6b1..cb6359c596 100644 --- a/x/subscription/types/message_add_project.go +++ b/x/subscription/types/message_add_project.go @@ -4,7 +4,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" ) const TypeMsgAddProject = "add_project" diff --git a/x/subscription/types/message_add_project_test.go b/x/subscription/types/message_add_project_test.go index c17851199a..84d33ca9f0 100644 --- a/x/subscription/types/message_add_project_test.go +++ b/x/subscription/types/message_add_project_test.go @@ -4,9 +4,9 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" - planstypes "github.com/lavanet/lava/v3/x/plans/types" - projectstypes "github.com/lavanet/lava/v3/x/projects/types" + "github.com/lavanet/lava/v4/testutil/sample" + planstypes "github.com/lavanet/lava/v4/x/plans/types" + projectstypes "github.com/lavanet/lava/v4/x/projects/types" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/types/message_auto_renewal_test.go b/x/subscription/types/message_auto_renewal_test.go index cbe6a371fc..6b6ad20057 100644 --- a/x/subscription/types/message_auto_renewal_test.go +++ b/x/subscription/types/message_auto_renewal_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/types/message_buy_test.go b/x/subscription/types/message_buy_test.go index 14c10a4443..3182c0e222 100644 --- a/x/subscription/types/message_buy_test.go +++ b/x/subscription/types/message_buy_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/types/message_del_project_test.go b/x/subscription/types/message_del_project_test.go index 7e08bb1e00..f7f4ddb8e8 100644 --- a/x/subscription/types/message_del_project_test.go +++ b/x/subscription/types/message_del_project_test.go @@ -4,7 +4,7 @@ import ( "testing" legacyerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/lavanet/lava/v3/testutil/sample" + "github.com/lavanet/lava/v4/testutil/sample" "github.com/stretchr/testify/require" ) diff --git a/x/subscription/types/params.pb.go b/x/subscription/types/params.pb.go index 8037e61ca9..960677d4a0 100644 --- a/x/subscription/types/params.pb.go +++ b/x/subscription/types/params.pb.go @@ -77,8 +77,8 @@ var fileDescriptor_8b1e38ca40b9ef74 = []byte{ 0xc6, 0x02, 0x79, 0x06, 0x27, 0xcf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, 0x4f, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, 0x71, 0x4d, 0x99, - 0xb1, 0x7e, 0x05, 0xaa, 0x93, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x36, 0x18, 0x03, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xae, 0x64, 0x46, 0xbc, 0x00, 0x00, 0x00, + 0x89, 0x7e, 0x05, 0xaa, 0x93, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x36, 0x18, 0x03, + 0x02, 0x00, 0x00, 0xff, 0xff, 0x73, 0x07, 0x46, 0xf3, 0xbc, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/subscription/types/query.pb.go b/x/subscription/types/query.pb.go index 7a479eeb8b..d4341cca75 100644 --- a/x/subscription/types/query.pb.go +++ b/x/subscription/types/query.pb.go @@ -1100,99 +1100,99 @@ func init() { } var fileDescriptor_e870698c9d8ccc09 = []byte{ - // 1459 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0x13, 0x47, - 0x1b, 0xcf, 0x18, 0xc7, 0x49, 0x9e, 0x7c, 0x90, 0x4c, 0x10, 0xda, 0x58, 0x79, 0x1d, 0xb2, 0x7c, - 0x04, 0x02, 0x78, 0x15, 0xf2, 0xbe, 0x0a, 0x70, 0x00, 0x5e, 0x07, 0xaa, 0x82, 0x68, 0x15, 0x4c, - 0x00, 0xa9, 0x55, 0xbb, 0x5d, 0xef, 0x4e, 0x9c, 0x2d, 0xf6, 0x8e, 0x99, 0x9d, 0x0d, 0x89, 0xa2, - 0x5c, 0x2a, 0x0e, 0x15, 0xa7, 0xaa, 0x3d, 0xf7, 0xd0, 0x5b, 0x55, 0xa9, 0x52, 0xcf, 0xbd, 0xf5, - 0xc6, 0x11, 0xb5, 0x97, 0x4a, 0x95, 0x28, 0x82, 0x4a, 0xdc, 0xf9, 0x07, 0x5a, 0xcd, 0xc7, 0x3a, - 0x6b, 0xc7, 0x1f, 0x31, 0xb4, 0xea, 0x05, 0xef, 0x3c, 0xf3, 0x3c, 0xbf, 0xe7, 0xf7, 0x7c, 0xcc, - 0xcc, 0x43, 0xe0, 0x78, 0xc5, 0xd9, 0x70, 0x02, 0xc2, 0x2d, 0xf1, 0x6b, 0x85, 0x51, 0x29, 0x74, - 0x99, 0x5f, 0xe3, 0x3e, 0x0d, 0xac, 0x07, 0x11, 0x61, 0x5b, 0xf9, 0x1a, 0xa3, 0x9c, 0xe2, 0x29, - 0xad, 0x96, 0x17, 0xbf, 0xf9, 0xa4, 0x5a, 0x76, 0xde, 0xa5, 0x61, 0x95, 0x86, 0x56, 0xc9, 0x09, - 0x89, 0xb2, 0xb1, 0x36, 0x16, 0x4a, 0x84, 0x3b, 0x0b, 0x56, 0xcd, 0x29, 0xfb, 0x81, 0x23, 0xb4, - 0x14, 0x4c, 0x36, 0x97, 0xd4, 0x8d, 0xb5, 0x5c, 0xea, 0xc7, 0xfb, 0x87, 0xca, 0xb4, 0x4c, 0xe5, - 0xa7, 0x25, 0xbe, 0xb4, 0x74, 0xba, 0x4c, 0x69, 0xb9, 0x42, 0x2c, 0xa7, 0xe6, 0x5b, 0x4e, 0x10, - 0x50, 0x2e, 0x21, 0x43, 0xbd, 0x3b, 0xdf, 0x3e, 0x02, 0x37, 0xb2, 0x39, 0x73, 0xdc, 0xfb, 0x84, - 0x69, 0xdd, 0x13, 0xed, 0x75, 0x6b, 0x0e, 0x73, 0xaa, 0x31, 0xe6, 0x99, 0xf6, 0x7a, 0xc9, 0x85, - 0xd6, 0x9e, 0x70, 0xaa, 0x7e, 0x40, 0x2d, 0xf9, 0xaf, 0x12, 0x99, 0x87, 0x00, 0xdf, 0x12, 0xa9, - 0x58, 0x91, 0xa8, 0x45, 0xf2, 0x20, 0x22, 0x21, 0x37, 0xef, 0xc2, 0x64, 0x83, 0x34, 0xac, 0xd1, - 0x20, 0x24, 0xf8, 0x32, 0x64, 0x94, 0x77, 0x03, 0x1d, 0x41, 0x27, 0x87, 0xcf, 0xcd, 0xe6, 0xdb, - 0x66, 0x3b, 0xaf, 0x4c, 0x0b, 0xe9, 0x27, 0xcf, 0x66, 0xfa, 0x8a, 0xda, 0xcc, 0x5c, 0xd0, 0xb8, - 0xcb, 0x11, 0x63, 0x24, 0xe0, 0xda, 0x1d, 0xce, 0xc2, 0xa0, 0x4b, 0x83, 0x30, 0xaa, 0x12, 0x26, - 0x91, 0x87, 0x8a, 0xf5, 0xb5, 0x79, 0x0f, 0x0e, 0x35, 0x9a, 0xd4, 0xb9, 0x1c, 0x08, 0xa3, 0x92, - 0x26, 0x32, 0xd7, 0x81, 0xc8, 0xed, 0xc4, 0x42, 0xd2, 0x41, 0x45, 0x61, 0x69, 0x5e, 0x02, 0x43, - 0x02, 0xdf, 0xf4, 0x43, 0xbe, 0xc2, 0xe8, 0xa7, 0xc4, 0xe5, 0x71, 0xfc, 0xd8, 0x84, 0x91, 0x24, - 0x86, 0x26, 0xd5, 0x20, 0x33, 0x97, 0x60, 0xaa, 0x85, 0xbd, 0x66, 0x97, 0x85, 0xc1, 0x9a, 0x96, - 0x19, 0xe8, 0xc8, 0x01, 0x11, 0x51, 0xbc, 0x36, 0x31, 0x8c, 0xd7, 0x0d, 0xe3, 0x84, 0x3b, 0x30, - 0x91, 0x90, 0x69, 0x90, 0x9b, 0x30, 0x24, 0x3c, 0xda, 0x7e, 0xb0, 0x46, 0x25, 0xca, 0xf0, 0xb9, - 0x53, 0x1d, 0x02, 0x15, 0xb6, 0xd7, 0x83, 0x35, 0x7a, 0x9b, 0xb3, 0xc8, 0xe5, 0x3a, 0xf3, 0x83, - 0x42, 0x45, 0x48, 0xcd, 0xc7, 0x69, 0x18, 0x6b, 0x54, 0xe9, 0x94, 0x77, 0x8c, 0x21, 0x5d, 0xab, - 0x38, 0x81, 0x91, 0x92, 0x72, 0xf9, 0x8d, 0xe7, 0xe0, 0xa0, 0x17, 0x31, 0xd9, 0xd4, 0x76, 0x89, - 0x46, 0xe5, 0x75, 0x6e, 0x1c, 0x38, 0x82, 0x4e, 0xa6, 0x8b, 0x63, 0xb1, 0xb8, 0x20, 0xa5, 0xf8, - 0x28, 0x8c, 0xd6, 0x15, 0x2b, 0x64, 0x8d, 0x1b, 0x69, 0xa9, 0x36, 0x12, 0x0b, 0x6f, 0x92, 0x35, - 0x8e, 0x67, 0x61, 0xa4, 0x4a, 0x03, 0xbe, 0x6e, 0x93, 0xcd, 0x9a, 0xcf, 0xb6, 0x8c, 0x7e, 0xa9, - 0x33, 0x2c, 0x65, 0xd7, 0xa4, 0x08, 0x1f, 0x83, 0x31, 0xa5, 0x22, 0x0e, 0x08, 0xe5, 0x4e, 0xc5, - 0xc8, 0x28, 0x20, 0x29, 0x5d, 0x8e, 0x56, 0x85, 0x0c, 0x9b, 0x30, 0x5a, 0xd7, 0x92, 0xde, 0x06, - 0x12, 0x48, 0xcb, 0x91, 0x74, 0x66, 0xc0, 0x80, 0x5b, 0x89, 0x42, 0x4e, 0x98, 0x31, 0x28, 0x23, - 0x8a, 0x97, 0xf8, 0x38, 0xd4, 0xd9, 0x6b, 0x1f, 0x43, 0xd2, 0xbc, 0x1e, 0x81, 0x72, 0xb2, 0x08, - 0x87, 0x9d, 0x88, 0x53, 0x9b, 0x91, 0x80, 0x3c, 0x74, 0x2a, 0x76, 0x40, 0x36, 0xb9, 0x2d, 0x33, - 0x34, 0x2c, 0xf1, 0x26, 0xc5, 0x6e, 0x51, 0x6d, 0xbe, 0x4f, 0x36, 0xf9, 0x8a, 0x48, 0xd8, 0xc7, - 0x30, 0xb9, 0x16, 0xf1, 0x88, 0x11, 0xbb, 0xa1, 0x9d, 0x46, 0x64, 0xd3, 0x9e, 0xed, 0x50, 0xcb, - 0x77, 0xa4, 0x55, 0xb2, 0x75, 0x8b, 0x78, 0x6d, 0x8f, 0x0c, 0x2f, 0x40, 0xc6, 0x65, 0xc4, 0xf3, - 0xb9, 0x31, 0x2a, 0x21, 0xa7, 0xf2, 0xea, 0xde, 0xca, 0x8b, 0x7b, 0x2b, 0xaf, 0xef, 0xad, 0xfc, - 0x32, 0xf5, 0x83, 0xa2, 0x56, 0xbc, 0x91, 0x1e, 0x84, 0xf1, 0x61, 0x73, 0x06, 0xfe, 0x23, 0xfb, - 0x4d, 0x30, 0x5d, 0xa5, 0xef, 0xed, 0xa6, 0x3c, 0x6e, 0xc8, 0x15, 0x38, 0xb8, 0xea, 0x57, 0x09, - 0x53, 0x52, 0xd1, 0x33, 0x1d, 0xbb, 0xa5, 0xb9, 0x96, 0xa9, 0x3d, 0xb5, 0x34, 0x37, 0x21, 0xd7, - 0xce, 0xa5, 0xee, 0xf7, 0xbb, 0x30, 0x9a, 0x4c, 0x42, 0xa8, 0x7b, 0x7e, 0xbe, 0x43, 0x9e, 0x9a, - 0x38, 0xea, 0xa6, 0x6f, 0x84, 0x31, 0x6f, 0xc0, 0x31, 0xe9, 0x39, 0x99, 0xba, 0x55, 0x79, 0xdd, - 0x7a, 0x77, 0x42, 0xa7, 0x4c, 0x7a, 0x39, 0xf5, 0xbf, 0x21, 0x38, 0xde, 0x05, 0x4c, 0x47, 0x73, - 0xab, 0x05, 0x5a, 0xcf, 0x37, 0x55, 0x03, 0x04, 0xbe, 0x04, 0xfd, 0x91, 0xf0, 0x61, 0xa4, 0x64, - 0x62, 0x4e, 0x76, 0x4a, 0x8c, 0xa2, 0xb4, 0x1c, 0x89, 0xb4, 0x14, 0x95, 0x19, 0x9e, 0x81, 0x61, - 0xd9, 0xe1, 0xb6, 0x42, 0x51, 0x67, 0x17, 0xa4, 0x48, 0x72, 0x37, 0xbf, 0x47, 0x30, 0x2d, 0xa3, - 0xbb, 0x16, 0x72, 0xbf, 0xea, 0x70, 0xe2, 0x15, 0xc9, 0x43, 0x87, 0x79, 0x61, 0xe2, 0xa6, 0xae, - 0x31, 0xba, 0xe1, 0x7b, 0xbb, 0x3d, 0x10, 0xaf, 0x71, 0x01, 0x06, 0xdd, 0x75, 0xc7, 0x0f, 0x6c, - 0xdf, 0x53, 0xb7, 0x46, 0x61, 0xee, 0xf5, 0xb3, 0x99, 0xd9, 0x2d, 0xa7, 0x5a, 0xb9, 0x68, 0xc6, - 0x3b, 0xe6, 0x19, 0x8f, 0xd4, 0x18, 0x71, 0x05, 0xf6, 0x45, 0x93, 0xb3, 0x88, 0x98, 0x06, 0x2a, - 0x0e, 0xc8, 0xed, 0xeb, 0x1e, 0x3e, 0x05, 0xe3, 0x4e, 0x95, 0x46, 0x01, 0xb7, 0x3d, 0x52, 0x21, - 0x65, 0x87, 0x53, 0x26, 0x69, 0x0e, 0x15, 0x0f, 0x2a, 0xf9, 0xd5, 0x58, 0x7c, 0x31, 0x65, 0x20, - 0xb3, 0xaa, 0x2b, 0x5b, 0xa7, 0xbb, 0xa2, 0xc9, 0xf4, 0x40, 0xbb, 0x95, 0xcb, 0x54, 0x4b, 0x97, - 0xe6, 0xd7, 0x08, 0x26, 0x9b, 0x32, 0x23, 0x4f, 0xc6, 0x61, 0xc8, 0x84, 0x34, 0x62, 0x2e, 0xd1, - 0xe0, 0x7a, 0x85, 0x03, 0xc8, 0x28, 0x08, 0x5d, 0xb0, 0xe9, 0x96, 0xc7, 0xf3, 0x2a, 0x71, 0xc5, - 0x09, 0x2d, 0x9c, 0x17, 0xbd, 0xfb, 0xdd, 0xef, 0x33, 0xa7, 0xcb, 0x3e, 0x5f, 0x8f, 0x4a, 0x79, - 0x97, 0x56, 0x2d, 0x3d, 0x86, 0xa8, 0x9f, 0xb3, 0xa1, 0x77, 0xdf, 0xe2, 0x5b, 0x35, 0x12, 0xc6, - 0x36, 0xe1, 0xb7, 0xaf, 0x7e, 0x98, 0x47, 0x45, 0xed, 0xc5, 0x7c, 0x94, 0xd2, 0xc7, 0x7a, 0x6f, - 0xf9, 0x74, 0x53, 0xbe, 0x0b, 0xe9, 0xc4, 0x6b, 0x92, 0xef, 0xd0, 0x40, 0x2d, 0xe2, 0xd4, 0xa7, - 0x4b, 0x22, 0xe0, 0x0a, 0xf4, 0xab, 0xdb, 0xf2, 0x9f, 0x0d, 0x4d, 0x39, 0xc1, 0xa7, 0x61, 0x82, - 0x11, 0x97, 0x56, 0xab, 0x24, 0xf0, 0x88, 0x67, 0x97, 0x2a, 0xd4, 0xbd, 0xaf, 0xfb, 0x77, 0x3c, - 0xb1, 0x51, 0x10, 0x72, 0xb3, 0xa6, 0x8f, 0x68, 0x3d, 0x84, 0xbb, 0x4e, 0xc5, 0xf7, 0x44, 0x05, - 0x9b, 0xda, 0x62, 0x1a, 0x86, 0x36, 0xe2, 0x2d, 0x5d, 0xba, 0x5d, 0x41, 0x2f, 0x8d, 0xf1, 0x1c, - 0xc1, 0x89, 0x6e, 0x2e, 0xff, 0xb6, 0x0a, 0xa0, 0x7f, 0xa3, 0x02, 0xe7, 0x1e, 0x8d, 0x41, 0xbf, - 0x0c, 0x11, 0x7f, 0x89, 0x20, 0xa3, 0xa6, 0x3b, 0xdc, 0xe9, 0x09, 0xdb, 0x3b, 0x56, 0x66, 0xf3, - 0xfb, 0x55, 0x57, 0xb9, 0x32, 0x4f, 0x7d, 0xf6, 0xcb, 0x1f, 0x5f, 0xa5, 0x8e, 0xe2, 0x59, 0xab, - 0xdb, 0x38, 0x8c, 0xbf, 0x41, 0x30, 0xa0, 0x47, 0x44, 0xdc, 0xd5, 0x4d, 0xe3, 0xf8, 0x99, 0xb5, - 0xf6, 0xad, 0xaf, 0x79, 0xfd, 0x4f, 0xf2, 0xb2, 0xf0, 0x59, 0xab, 0xd3, 0x48, 0x2f, 0x6d, 0xac, - 0xed, 0xf8, 0x8d, 0xdc, 0xc1, 0x3f, 0x22, 0x18, 0x49, 0x4e, 0x8b, 0x78, 0xb1, 0x9b, 0xe3, 0x16, - 0xb3, 0x69, 0xf6, 0xbf, 0xbd, 0x19, 0x69, 0xca, 0x97, 0x25, 0xe5, 0x0b, 0x78, 0xa9, 0x03, 0xe5, - 0x8a, 0x1f, 0x72, 0x3b, 0x1e, 0x53, 0xad, 0xed, 0xe4, 0xde, 0x0e, 0x7e, 0x8c, 0x20, 0x2d, 0x90, - 0xf1, 0xe9, 0xfd, 0xf8, 0x8f, 0xc9, 0x9e, 0xd9, 0x9f, 0xb2, 0x26, 0x39, 0x27, 0x49, 0xce, 0xe2, - 0x99, 0x2e, 0x24, 0xf1, 0x4f, 0x08, 0x26, 0xf6, 0xcc, 0x11, 0xf8, 0x7c, 0x37, 0x67, 0xed, 0xa6, - 0x9d, 0xec, 0x85, 0x37, 0xb0, 0xd4, 0x9c, 0x97, 0x24, 0xe7, 0x05, 0x6c, 0x75, 0xe0, 0x2c, 0x67, - 0x45, 0x4e, 0xed, 0xe4, 0x88, 0x84, 0x7f, 0x46, 0x30, 0x92, 0x1c, 0x1c, 0xf0, 0xe5, 0x6e, 0x24, - 0xba, 0xcc, 0x2f, 0xd9, 0x2b, 0x6f, 0x0e, 0xd0, 0x43, 0x97, 0xa8, 0xff, 0xa8, 0x7a, 0x6a, 0x86, - 0x68, 0xee, 0x92, 0x57, 0x08, 0xc6, 0x9b, 0x1f, 0x1f, 0xbc, 0xd4, 0x8d, 0x57, 0x9b, 0x69, 0x23, - 0x7b, 0xbe, 0x77, 0x43, 0x1d, 0xc8, 0x27, 0x32, 0x90, 0x7b, 0xf8, 0x4e, 0x87, 0x40, 0x48, 0x6c, - 0x6c, 0x33, 0x65, 0x6d, 0x6d, 0xc7, 0x43, 0xc1, 0x8e, 0xb5, 0x1d, 0x0f, 0x2c, 0x3b, 0xd6, 0x76, - 0xf3, 0x2b, 0xb0, 0xf3, 0x79, 0x0a, 0xe1, 0xd7, 0x08, 0x8c, 0x76, 0x63, 0x47, 0xf7, 0x52, 0x76, - 0x19, 0x58, 0xde, 0x22, 0xf2, 0x0f, 0x65, 0xe4, 0x77, 0xf0, 0xed, 0x7d, 0x45, 0x1e, 0x07, 0xdc, - 0x32, 0x05, 0x7b, 0xe2, 0xc6, 0x7f, 0x22, 0x98, 0x6a, 0xfb, 0xc4, 0xe1, 0x2b, 0xfb, 0x26, 0xdd, - 0xe6, 0x41, 0xce, 0xfe, 0xff, 0x2d, 0x10, 0x74, 0xfc, 0x1f, 0xf5, 0x54, 0xf9, 0xfa, 0x6b, 0xbf, - 0x9b, 0x80, 0xba, 0xa8, 0x55, 0x06, 0x0a, 0xd7, 0x9f, 0xbc, 0xc8, 0xa1, 0xa7, 0x2f, 0x72, 0xe8, - 0xf9, 0x8b, 0x1c, 0xfa, 0xe2, 0x65, 0xae, 0xef, 0xe9, 0xcb, 0x5c, 0xdf, 0xaf, 0x2f, 0x73, 0x7d, - 0x1f, 0x58, 0x89, 0x97, 0xb5, 0xc1, 0xf5, 0xc6, 0xa2, 0xb5, 0xd9, 0x74, 0x84, 0xc4, 0x33, 0x5b, - 0xca, 0xc8, 0xbf, 0xc0, 0x2c, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, 0x72, 0xe8, 0x0a, 0x31, 0xda, - 0x12, 0x00, 0x00, + // 1458 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x13, 0xc7, + 0x17, 0xcf, 0x18, 0xc7, 0x49, 0x5e, 0x7e, 0x90, 0x4c, 0x10, 0xda, 0x58, 0xf9, 0x3a, 0x64, 0xf9, + 0x11, 0x08, 0xe0, 0x55, 0x80, 0xaf, 0x02, 0x1c, 0x80, 0x3a, 0x50, 0x15, 0x44, 0xab, 0x60, 0x02, + 0x48, 0xad, 0xda, 0xed, 0x7a, 0x77, 0xe2, 0x6c, 0xb1, 0x77, 0xcc, 0xec, 0x6c, 0x48, 0x14, 0xe5, + 0x52, 0x71, 0xa8, 0x38, 0x55, 0xed, 0xb9, 0x87, 0xde, 0xaa, 0x4a, 0x95, 0x7a, 0xee, 0xad, 0x37, + 0x8e, 0xa8, 0xbd, 0x54, 0xaa, 0x44, 0x11, 0x54, 0xe2, 0xce, 0x3f, 0xd0, 0x6a, 0x7e, 0xac, 0xb3, + 0x76, 0xfc, 0x23, 0x86, 0x56, 0xbd, 0xe0, 0x9d, 0x37, 0xef, 0x7d, 0xde, 0xe7, 0xfd, 0x98, 0x99, + 0x47, 0xe0, 0x68, 0xc5, 0x59, 0x77, 0x02, 0xc2, 0x2d, 0xf1, 0x6b, 0x85, 0x51, 0x29, 0x74, 0x99, + 0x5f, 0xe3, 0x3e, 0x0d, 0xac, 0x07, 0x11, 0x61, 0x9b, 0xf9, 0x1a, 0xa3, 0x9c, 0xe2, 0x29, 0xad, + 0x96, 0x17, 0xbf, 0xf9, 0xa4, 0x5a, 0x76, 0xde, 0xa5, 0x61, 0x95, 0x86, 0x56, 0xc9, 0x09, 0x89, + 0xb2, 0xb1, 0xd6, 0x17, 0x4a, 0x84, 0x3b, 0x0b, 0x56, 0xcd, 0x29, 0xfb, 0x81, 0x23, 0xb4, 0x14, + 0x4c, 0x36, 0x97, 0xd4, 0x8d, 0xb5, 0x5c, 0xea, 0xc7, 0xfb, 0x07, 0xca, 0xb4, 0x4c, 0xe5, 0xa7, + 0x25, 0xbe, 0xb4, 0x74, 0xba, 0x4c, 0x69, 0xb9, 0x42, 0x2c, 0xa7, 0xe6, 0x5b, 0x4e, 0x10, 0x50, + 0x2e, 0x21, 0x43, 0xbd, 0x3b, 0xdf, 0x3e, 0x02, 0x37, 0xb2, 0x39, 0x73, 0xdc, 0xfb, 0x84, 0x69, + 0xdd, 0x63, 0xed, 0x75, 0x6b, 0x0e, 0x73, 0xaa, 0x31, 0xe6, 0xa9, 0xf6, 0x7a, 0xc9, 0x85, 0xd6, + 0x9e, 0x70, 0xaa, 0x7e, 0x40, 0x2d, 0xf9, 0xaf, 0x12, 0x99, 0x07, 0x00, 0xdf, 0x12, 0xa9, 0x58, + 0x96, 0xa8, 0x45, 0xf2, 0x20, 0x22, 0x21, 0x37, 0xef, 0xc2, 0x64, 0x83, 0x34, 0xac, 0xd1, 0x20, + 0x24, 0xf8, 0x32, 0x64, 0x94, 0x77, 0x03, 0x1d, 0x42, 0xc7, 0x87, 0xcf, 0xcc, 0xe6, 0xdb, 0x66, + 0x3b, 0xaf, 0x4c, 0x0b, 0xe9, 0x27, 0xcf, 0x66, 0xfa, 0x8a, 0xda, 0xcc, 0x5c, 0xd0, 0xb8, 0x4b, + 0x11, 0x63, 0x24, 0xe0, 0xda, 0x1d, 0xce, 0xc2, 0xa0, 0x4b, 0x83, 0x30, 0xaa, 0x12, 0x26, 0x91, + 0x87, 0x8a, 0xf5, 0xb5, 0x79, 0x0f, 0x0e, 0x34, 0x9a, 0xd4, 0xb9, 0xec, 0x0b, 0xa3, 0x92, 0x26, + 0x32, 0xd7, 0x81, 0xc8, 0xed, 0xc4, 0x42, 0xd2, 0x41, 0x45, 0x61, 0x69, 0x5e, 0x02, 0x43, 0x02, + 0xdf, 0xf4, 0x43, 0xbe, 0xcc, 0xe8, 0x67, 0xc4, 0xe5, 0x71, 0xfc, 0xd8, 0x84, 0x91, 0x24, 0x86, + 0x26, 0xd5, 0x20, 0x33, 0x17, 0x61, 0xaa, 0x85, 0xbd, 0x66, 0x97, 0x85, 0xc1, 0x9a, 0x96, 0x19, + 0xe8, 0xd0, 0x3e, 0x11, 0x51, 0xbc, 0x36, 0x31, 0x8c, 0xd7, 0x0d, 0xe3, 0x84, 0x3b, 0x30, 0x91, + 0x90, 0x69, 0x90, 0x9b, 0x30, 0x24, 0x3c, 0xda, 0x7e, 0xb0, 0x4a, 0x25, 0xca, 0xf0, 0x99, 0x13, + 0x1d, 0x02, 0x15, 0xb6, 0xd7, 0x83, 0x55, 0x7a, 0x9b, 0xb3, 0xc8, 0xe5, 0x3a, 0xf3, 0x83, 0x42, + 0x45, 0x48, 0xcd, 0xc7, 0x69, 0x18, 0x6b, 0x54, 0xe9, 0x94, 0x77, 0x8c, 0x21, 0x5d, 0xab, 0x38, + 0x81, 0x91, 0x92, 0x72, 0xf9, 0x8d, 0xe7, 0x60, 0xbf, 0x17, 0x31, 0xd9, 0xd4, 0x76, 0x89, 0x46, + 0xe5, 0x35, 0x6e, 0xec, 0x3b, 0x84, 0x8e, 0xa7, 0x8b, 0x63, 0xb1, 0xb8, 0x20, 0xa5, 0xf8, 0x30, + 0x8c, 0xd6, 0x15, 0x2b, 0x64, 0x95, 0x1b, 0x69, 0xa9, 0x36, 0x12, 0x0b, 0x6f, 0x92, 0x55, 0x8e, + 0x67, 0x61, 0xa4, 0x4a, 0x03, 0xbe, 0x66, 0x93, 0x8d, 0x9a, 0xcf, 0x36, 0x8d, 0x7e, 0xa9, 0x33, + 0x2c, 0x65, 0xd7, 0xa4, 0x08, 0x1f, 0x81, 0x31, 0xa5, 0x22, 0x0e, 0x08, 0xe5, 0x4e, 0xc5, 0xc8, + 0x28, 0x20, 0x29, 0x5d, 0x8a, 0x56, 0x84, 0x0c, 0x9b, 0x30, 0x5a, 0xd7, 0x92, 0xde, 0x06, 0x12, + 0x48, 0x4b, 0x91, 0x74, 0x66, 0xc0, 0x80, 0x5b, 0x89, 0x42, 0x4e, 0x98, 0x31, 0x28, 0x23, 0x8a, + 0x97, 0xf8, 0x28, 0xd4, 0xd9, 0x6b, 0x1f, 0x43, 0xd2, 0xbc, 0x1e, 0x81, 0x72, 0x72, 0x16, 0x0e, + 0x3a, 0x11, 0xa7, 0x36, 0x23, 0x01, 0x79, 0xe8, 0x54, 0xec, 0x80, 0x6c, 0x70, 0x5b, 0x66, 0x68, + 0x58, 0xe2, 0x4d, 0x8a, 0xdd, 0xa2, 0xda, 0xfc, 0x80, 0x6c, 0xf0, 0x65, 0x91, 0xb0, 0x4f, 0x60, + 0x72, 0x35, 0xe2, 0x11, 0x23, 0x76, 0x43, 0x3b, 0x8d, 0xc8, 0xa6, 0x3d, 0xdd, 0xa1, 0x96, 0xef, + 0x4a, 0xab, 0x64, 0xeb, 0x16, 0xf1, 0xea, 0x2e, 0x19, 0x5e, 0x80, 0x8c, 0xcb, 0x88, 0xe7, 0x73, + 0x63, 0x54, 0x42, 0x4e, 0xe5, 0xd5, 0xbd, 0x95, 0x17, 0xf7, 0x56, 0x5e, 0xdf, 0x5b, 0xf9, 0x25, + 0xea, 0x07, 0x45, 0xad, 0x78, 0x23, 0x3d, 0x08, 0xe3, 0xc3, 0xe6, 0x0c, 0xfc, 0x4f, 0xf6, 0x9b, + 0x60, 0xba, 0x42, 0xdf, 0xdf, 0x49, 0x79, 0xdc, 0x90, 0xcb, 0xb0, 0x7f, 0xc5, 0xaf, 0x12, 0xa6, + 0xa4, 0xa2, 0x67, 0x3a, 0x76, 0x4b, 0x73, 0x2d, 0x53, 0xbb, 0x6a, 0x69, 0x6e, 0x40, 0xae, 0x9d, + 0x4b, 0xdd, 0xef, 0x77, 0x61, 0x34, 0x99, 0x84, 0x50, 0xf7, 0xfc, 0x7c, 0x87, 0x3c, 0x35, 0x71, + 0xd4, 0x4d, 0xdf, 0x08, 0x63, 0xde, 0x80, 0x23, 0xd2, 0x73, 0x32, 0x75, 0x2b, 0xf2, 0xba, 0xf5, + 0xee, 0x84, 0x4e, 0x99, 0xf4, 0x72, 0xea, 0x7f, 0x47, 0x70, 0xb4, 0x0b, 0x98, 0x8e, 0xe6, 0x56, + 0x0b, 0xb4, 0x9e, 0x6f, 0xaa, 0x06, 0x08, 0x7c, 0x09, 0xfa, 0x23, 0xe1, 0xc3, 0x48, 0xc9, 0xc4, + 0x1c, 0xef, 0x94, 0x18, 0x45, 0x69, 0x29, 0x12, 0x69, 0x29, 0x2a, 0x33, 0x3c, 0x03, 0xc3, 0xb2, + 0xc3, 0x6d, 0x85, 0xa2, 0xce, 0x2e, 0x48, 0x91, 0xe4, 0x6e, 0xfe, 0x80, 0x60, 0x5a, 0x46, 0x77, + 0x2d, 0xe4, 0x7e, 0xd5, 0xe1, 0xc4, 0x2b, 0x92, 0x87, 0x0e, 0xf3, 0xc2, 0xc4, 0x4d, 0x5d, 0x63, + 0x74, 0xdd, 0xf7, 0x76, 0x7a, 0x20, 0x5e, 0xe3, 0x02, 0x0c, 0xba, 0x6b, 0x8e, 0x1f, 0xd8, 0xbe, + 0xa7, 0x6e, 0x8d, 0xc2, 0xdc, 0xeb, 0x67, 0x33, 0xb3, 0x9b, 0x4e, 0xb5, 0x72, 0xd1, 0x8c, 0x77, + 0xcc, 0x53, 0x1e, 0xa9, 0x31, 0xe2, 0x0a, 0xec, 0x8b, 0x26, 0x67, 0x11, 0x31, 0x0d, 0x54, 0x1c, + 0x90, 0xdb, 0xd7, 0x3d, 0x7c, 0x02, 0xc6, 0x9d, 0x2a, 0x8d, 0x02, 0x6e, 0x7b, 0xa4, 0x42, 0xca, + 0x0e, 0xa7, 0x4c, 0xd2, 0x1c, 0x2a, 0xee, 0x57, 0xf2, 0xab, 0xb1, 0xf8, 0x62, 0xca, 0x40, 0x66, + 0x55, 0x57, 0xb6, 0x4e, 0x77, 0x59, 0x93, 0xe9, 0x81, 0x76, 0x2b, 0x97, 0xa9, 0x96, 0x2e, 0xcd, + 0x6f, 0x10, 0x4c, 0x36, 0x65, 0x46, 0x9e, 0x8c, 0x83, 0x90, 0x09, 0x69, 0xc4, 0x5c, 0xa2, 0xc1, + 0xf5, 0x0a, 0x07, 0x90, 0x51, 0x10, 0xba, 0x60, 0xd3, 0x2d, 0x8f, 0xe7, 0x55, 0xe2, 0x8a, 0x13, + 0x5a, 0x38, 0x2f, 0x7a, 0xf7, 0xfb, 0x3f, 0x66, 0x4e, 0x96, 0x7d, 0xbe, 0x16, 0x95, 0xf2, 0x2e, + 0xad, 0x5a, 0x7a, 0x0c, 0x51, 0x3f, 0xa7, 0x43, 0xef, 0xbe, 0xc5, 0x37, 0x6b, 0x24, 0x8c, 0x6d, + 0xc2, 0xef, 0x5e, 0xfd, 0x38, 0x8f, 0x8a, 0xda, 0x8b, 0xf9, 0x28, 0xa5, 0x8f, 0xf5, 0xee, 0xf2, + 0xe9, 0xa6, 0x7c, 0x0f, 0xd2, 0x89, 0xd7, 0x24, 0xdf, 0xa1, 0x81, 0x5a, 0xc4, 0xa9, 0x4f, 0x97, + 0x44, 0xc0, 0x15, 0xe8, 0x57, 0xb7, 0xe5, 0xbf, 0x1b, 0x9a, 0x72, 0x82, 0x4f, 0xc2, 0x04, 0x23, + 0x2e, 0xad, 0x56, 0x49, 0xe0, 0x11, 0xcf, 0x2e, 0x55, 0xa8, 0x7b, 0x5f, 0xf7, 0xef, 0x78, 0x62, + 0xa3, 0x20, 0xe4, 0x66, 0x4d, 0x1f, 0xd1, 0x7a, 0x08, 0x77, 0x9d, 0x8a, 0xef, 0x89, 0x0a, 0x36, + 0xb5, 0xc5, 0x34, 0x0c, 0xad, 0xc7, 0x5b, 0xba, 0x74, 0x3b, 0x82, 0x5e, 0x1a, 0xe3, 0x39, 0x82, + 0x63, 0xdd, 0x5c, 0xfe, 0x63, 0x15, 0x40, 0xff, 0x45, 0x05, 0xce, 0x3c, 0x1a, 0x83, 0x7e, 0x19, + 0x22, 0xfe, 0x0a, 0x41, 0x46, 0x4d, 0x77, 0xb8, 0xd3, 0x13, 0xb6, 0x7b, 0xac, 0xcc, 0xe6, 0xf7, + 0xaa, 0xae, 0x72, 0x65, 0x9e, 0xf8, 0xfc, 0xd7, 0x3f, 0xbf, 0x4e, 0x1d, 0xc6, 0xb3, 0x56, 0xb7, + 0x71, 0x18, 0x7f, 0x8b, 0x60, 0x40, 0x8f, 0x88, 0xb8, 0xab, 0x9b, 0xc6, 0xf1, 0x33, 0x6b, 0xed, + 0x59, 0x5f, 0xf3, 0xfa, 0xbf, 0xe4, 0x65, 0xe1, 0xd3, 0x56, 0xa7, 0x91, 0x5e, 0xda, 0x58, 0x5b, + 0xf1, 0x1b, 0xb9, 0x8d, 0x7f, 0x42, 0x30, 0x92, 0x9c, 0x16, 0xf1, 0xd9, 0x6e, 0x8e, 0x5b, 0xcc, + 0xa6, 0xd9, 0x73, 0xbd, 0x19, 0x69, 0xca, 0x97, 0x25, 0xe5, 0x0b, 0x78, 0xb1, 0x03, 0xe5, 0x8a, + 0x1f, 0x72, 0x3b, 0x1e, 0x53, 0xad, 0xad, 0xe4, 0xde, 0x36, 0x7e, 0x8c, 0x20, 0x2d, 0x90, 0xf1, + 0xc9, 0xbd, 0xf8, 0x8f, 0xc9, 0x9e, 0xda, 0x9b, 0xb2, 0x26, 0x39, 0x27, 0x49, 0xce, 0xe2, 0x99, + 0x2e, 0x24, 0xf1, 0xcf, 0x08, 0x26, 0x76, 0xcd, 0x11, 0xf8, 0x7c, 0x37, 0x67, 0xed, 0xa6, 0x9d, + 0xec, 0x85, 0x37, 0xb0, 0xd4, 0x9c, 0x17, 0x25, 0xe7, 0x05, 0x6c, 0x75, 0xe0, 0x2c, 0x67, 0x45, + 0x4e, 0xed, 0xe4, 0x88, 0x84, 0x7f, 0x41, 0x30, 0x92, 0x1c, 0x1c, 0xf0, 0xe5, 0x6e, 0x24, 0xba, + 0xcc, 0x2f, 0xd9, 0x2b, 0x6f, 0x0e, 0xd0, 0x43, 0x97, 0xa8, 0xff, 0xa8, 0x7a, 0x6a, 0x86, 0x68, + 0xee, 0x92, 0x57, 0x08, 0xc6, 0x9b, 0x1f, 0x1f, 0xbc, 0xd8, 0x8d, 0x57, 0x9b, 0x69, 0x23, 0x7b, + 0xbe, 0x77, 0x43, 0x1d, 0xc8, 0xa7, 0x32, 0x90, 0x7b, 0xf8, 0x4e, 0x87, 0x40, 0x48, 0x6c, 0x6c, + 0x33, 0x65, 0x6d, 0x6d, 0xc5, 0x43, 0xc1, 0xb6, 0xb5, 0x15, 0x0f, 0x2c, 0xdb, 0xd6, 0x56, 0xf3, + 0x2b, 0xb0, 0xfd, 0x45, 0x0a, 0xe1, 0xd7, 0x08, 0x8c, 0x76, 0x63, 0x47, 0xf7, 0x52, 0x76, 0x19, + 0x58, 0xde, 0x22, 0xf2, 0x8f, 0x64, 0xe4, 0x77, 0xf0, 0xed, 0x3d, 0x45, 0x1e, 0x07, 0xdc, 0x32, + 0x05, 0xbb, 0xe2, 0xc6, 0x7f, 0x21, 0x98, 0x6a, 0xfb, 0xc4, 0xe1, 0x2b, 0x7b, 0x26, 0xdd, 0xe6, + 0x41, 0xce, 0xbe, 0xf3, 0x16, 0x08, 0x3a, 0xfe, 0x8f, 0x7b, 0xaa, 0x7c, 0xfd, 0xb5, 0xdf, 0x49, + 0x40, 0x5d, 0xd4, 0x2a, 0x03, 0x85, 0xeb, 0x4f, 0x5e, 0xe4, 0xd0, 0xd3, 0x17, 0x39, 0xf4, 0xfc, + 0x45, 0x0e, 0x7d, 0xf9, 0x32, 0xd7, 0xf7, 0xf4, 0x65, 0xae, 0xef, 0xb7, 0x97, 0xb9, 0xbe, 0x0f, + 0xad, 0xc4, 0xcb, 0xda, 0xe0, 0x7a, 0xfd, 0x9c, 0xb5, 0xd1, 0x74, 0x84, 0xc4, 0x33, 0x5b, 0xca, + 0xc8, 0xbf, 0xc0, 0x9c, 0xfd, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x41, 0x28, 0x84, 0xda, 0x12, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/subscription/types/subscription.pb.go b/x/subscription/types/subscription.pb.go index f36117e3fa..c0debc0794 100644 --- a/x/subscription/types/subscription.pb.go +++ b/x/subscription/types/subscription.pb.go @@ -266,41 +266,42 @@ func init() { } var fileDescriptor_c3bc5507ca237d79 = []byte{ - // 544 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcf, 0x6f, 0xd3, 0x30, - 0x14, 0x6e, 0xb6, 0xac, 0x6b, 0xdd, 0x9f, 0xf3, 0x26, 0xe4, 0x55, 0x22, 0x54, 0x05, 0x44, 0x85, - 0x20, 0xd1, 0xe8, 0x81, 0x7b, 0x27, 0x90, 0x56, 0x21, 0x84, 0xca, 0x4e, 0x1c, 0x88, 0x9c, 0xd4, - 0x6d, 0x23, 0x92, 0xb8, 0x72, 0xec, 0x92, 0xfd, 0x17, 0xfc, 0x59, 0x3b, 0xa1, 0x1d, 0x39, 0x21, - 0xd4, 0xfe, 0x1d, 0x48, 0xc8, 0x2f, 0x69, 0x68, 0x35, 0x98, 0xe0, 0x64, 0xbf, 0xef, 0x7d, 0x9f, - 0xdf, 0x7b, 0xf6, 0x67, 0xf4, 0x2c, 0xa4, 0x4b, 0x1a, 0x33, 0xe9, 0xe8, 0xd5, 0x49, 0x94, 0x97, - 0xf8, 0x22, 0x58, 0xc8, 0x80, 0xc7, 0x3b, 0x81, 0xbd, 0x10, 0x5c, 0x72, 0x7c, 0x9a, 0xb3, 0x6d, - 0xbd, 0xda, 0xdb, 0x84, 0x8e, 0xe5, 0xf3, 0x24, 0xe2, 0x89, 0xe3, 0xd1, 0x84, 0x39, 0xcb, 0x33, - 0x8f, 0x49, 0x7a, 0xe6, 0xf8, 0x3c, 0xc8, 0xa5, 0x9d, 0x93, 0x19, 0x9f, 0x71, 0xd8, 0x3a, 0x7a, - 0x97, 0xa1, 0xbd, 0x9f, 0x26, 0xaa, 0xbf, 0xdf, 0x3a, 0x06, 0x13, 0x74, 0xe8, 0x0b, 0x46, 0x25, - 0x17, 0xc4, 0xe8, 0x1a, 0xfd, 0xea, 0x78, 0x13, 0xe2, 0x0e, 0xaa, 0xf8, 0x3c, 0x4e, 0x54, 0xc4, - 0x04, 0xd9, 0x83, 0x54, 0x11, 0xe3, 0x13, 0x74, 0xe0, 0x85, 0xdc, 0xff, 0x44, 0xf6, 0xbb, 0x46, - 0xdf, 0x1c, 0x67, 0x01, 0xbe, 0x8f, 0xd0, 0x22, 0xa4, 0xb1, 0x1b, 0xc4, 0x13, 0x96, 0x12, 0x13, - 0x34, 0x55, 0x8d, 0x5c, 0x68, 0xa0, 0x48, 0x67, 0xca, 0x03, 0x50, 0x42, 0x7a, 0x08, 0xea, 0x27, - 0xa8, 0x35, 0x51, 0x82, 0xea, 0xae, 0x5c, 0x8f, 0xab, 0xd9, 0x5c, 0x92, 0x32, 0x70, 0x9a, 0x1b, - 0x78, 0x08, 0x28, 0x7e, 0x88, 0x1a, 0x05, 0x31, 0x64, 0x53, 0x49, 0x0e, 0x81, 0x56, 0xdf, 0x80, - 0x6f, 0xd8, 0x54, 0xe2, 0xa7, 0xe8, 0x28, 0xe2, 0xb1, 0x9c, 0xbb, 0x2c, 0x5d, 0x04, 0xe2, 0xca, - 0x95, 0x41, 0xc4, 0x48, 0x05, 0x88, 0x2d, 0x48, 0xbc, 0x02, 0xfc, 0x32, 0x88, 0x18, 0x7e, 0x84, - 0x9a, 0x19, 0xd7, 0x57, 0xae, 0xe4, 0x92, 0x86, 0x04, 0x65, 0x27, 0x02, 0x7a, 0xae, 0x2e, 0x35, - 0x86, 0x7b, 0xa8, 0x51, 0xb0, 0xa0, 0x6c, 0x0d, 0x48, 0xb5, 0x9c, 0x04, 0x55, 0xf5, 0x6d, 0x86, - 0x2a, 0x91, 0x4c, 0x90, 0x46, 0x7e, 0x9b, 0x59, 0x88, 0x1f, 0xa3, 0x62, 0x8c, 0xbc, 0x46, 0x13, - 0xe4, 0xc5, 0x28, 0x59, 0x91, 0x8f, 0xe8, 0x78, 0xaa, 0xa4, 0x12, 0xcc, 0xdd, 0x7e, 0x6c, 0xd2, - 0xee, 0x1a, 0xfd, 0xda, 0x8b, 0xe7, 0xf6, 0x5f, 0xed, 0x60, 0xbf, 0x06, 0xd5, 0xf6, 0xd3, 0x8e, - 0xf1, 0xf4, 0x16, 0x86, 0x07, 0xe8, 0x1e, 0x55, 0x92, 0xbb, 0x82, 0xc5, 0xec, 0x33, 0x0d, 0xdd, - 0x98, 0xa5, 0xd2, 0xd5, 0x6f, 0x40, 0x8e, 0xa0, 0xdf, 0x63, 0x9d, 0x1d, 0x67, 0xc9, 0xb7, 0x2c, - 0x95, 0xef, 0x42, 0x1a, 0xe3, 0x97, 0xa8, 0xec, 0x0b, 0x36, 0x09, 0x24, 0xc1, 0xd0, 0xc7, 0xa9, - 0x9d, 0x79, 0xcf, 0xd6, 0xde, 0xb3, 0x73, 0xef, 0xd9, 0xe7, 0x3c, 0x88, 0x87, 0xe6, 0xf5, 0xf7, - 0x07, 0xa5, 0x71, 0x4e, 0x1f, 0x99, 0x95, 0x6a, 0x1b, 0x8d, 0xcc, 0x4a, 0xbd, 0xdd, 0x18, 0x99, - 0x95, 0x56, 0xbb, 0xdd, 0xfb, 0x6a, 0x20, 0x7c, 0xbb, 0xd5, 0x3b, 0x5c, 0xb8, 0xeb, 0xa9, 0xbd, - 0xbb, 0x3d, 0xb5, 0xff, 0x0f, 0x9e, 0x32, 0xff, 0xe8, 0xa9, 0xdf, 0x23, 0x1e, 0xfc, 0xd7, 0x88, - 0xc3, 0x8b, 0xeb, 0x95, 0x65, 0xdc, 0xac, 0x2c, 0xe3, 0xc7, 0xca, 0x32, 0xbe, 0xac, 0xad, 0xd2, - 0xcd, 0xda, 0x2a, 0x7d, 0x5b, 0x5b, 0xa5, 0x0f, 0xce, 0x2c, 0x90, 0x73, 0xe5, 0xd9, 0x3e, 0x8f, - 0x9c, 0x9d, 0x4f, 0xbf, 0x1c, 0x38, 0xe9, 0xee, 0xcf, 0x97, 0x57, 0x0b, 0x96, 0x78, 0x65, 0xf8, - 0xa2, 0x83, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x03, 0x42, 0x4d, 0x23, 0x04, 0x00, 0x00, + // 546 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x5f, 0x6f, 0xd3, 0x3e, + 0x14, 0x6d, 0xb6, 0xb4, 0x6b, 0xdd, 0xbf, 0xf3, 0xa6, 0x9f, 0xbc, 0x4a, 0xbf, 0x50, 0x15, 0x10, + 0x15, 0x82, 0x44, 0x63, 0x48, 0xbc, 0x77, 0x02, 0x69, 0x15, 0x42, 0xa8, 0xec, 0x89, 0x07, 0x22, + 0x27, 0x75, 0xdb, 0x88, 0x24, 0xae, 0x1c, 0xbb, 0x64, 0xdf, 0x82, 0x8f, 0xb5, 0x27, 0xb4, 0x47, + 0x9e, 0x10, 0x6a, 0x3f, 0x07, 0x12, 0xf2, 0x4d, 0x1a, 0x5a, 0x0d, 0x26, 0x78, 0xb2, 0xef, 0xb9, + 0xe7, 0xf8, 0xde, 0x6b, 0x1f, 0xa3, 0x27, 0x21, 0x5d, 0xd2, 0x98, 0x49, 0x47, 0xaf, 0x4e, 0xa2, + 0xbc, 0xc4, 0x17, 0xc1, 0x42, 0x06, 0x3c, 0xde, 0x09, 0xec, 0x85, 0xe0, 0x92, 0xe3, 0x93, 0x9c, + 0x6d, 0xeb, 0xd5, 0xde, 0x26, 0x74, 0x2d, 0x9f, 0x27, 0x11, 0x4f, 0x1c, 0x8f, 0x26, 0xcc, 0x59, + 0x9e, 0x7a, 0x4c, 0xd2, 0x53, 0xc7, 0xe7, 0x41, 0x2e, 0xed, 0x1e, 0xcf, 0xf8, 0x8c, 0xc3, 0xd6, + 0xd1, 0xbb, 0x0c, 0xed, 0xff, 0x30, 0x51, 0xe3, 0xdd, 0xd6, 0x31, 0x98, 0xa0, 0x03, 0x5f, 0x30, + 0x2a, 0xb9, 0x20, 0x46, 0xcf, 0x18, 0xd4, 0xc6, 0x9b, 0x10, 0x77, 0x51, 0xd5, 0xe7, 0x71, 0xa2, + 0x22, 0x26, 0xc8, 0x1e, 0xa4, 0x8a, 0x18, 0x1f, 0xa3, 0xb2, 0x17, 0x72, 0xff, 0x23, 0xd9, 0xef, + 0x19, 0x03, 0x73, 0x9c, 0x05, 0xf8, 0x7f, 0x84, 0x16, 0x21, 0x8d, 0xdd, 0x20, 0x9e, 0xb0, 0x94, + 0x98, 0xa0, 0xa9, 0x69, 0xe4, 0x42, 0x03, 0x45, 0x3a, 0x53, 0x96, 0x41, 0x09, 0xe9, 0x21, 0xa8, + 0x1f, 0xa1, 0xf6, 0x44, 0x09, 0xaa, 0xbb, 0x72, 0x3d, 0xae, 0x66, 0x73, 0x49, 0x2a, 0xc0, 0x69, + 0x6d, 0xe0, 0x21, 0xa0, 0xf8, 0x3e, 0x6a, 0x16, 0xc4, 0x90, 0x4d, 0x25, 0x39, 0x00, 0x5a, 0x63, + 0x03, 0xbe, 0x66, 0x53, 0x89, 0x1f, 0xa3, 0xc3, 0x88, 0xc7, 0x72, 0xee, 0xb2, 0x74, 0x11, 0x88, + 0x2b, 0x57, 0x06, 0x11, 0x23, 0x55, 0x20, 0xb6, 0x21, 0xf1, 0x12, 0xf0, 0xcb, 0x20, 0x62, 0xf8, + 0x01, 0x6a, 0x65, 0x5c, 0x5f, 0xb9, 0x92, 0x4b, 0x1a, 0x12, 0x94, 0x9d, 0x08, 0xe8, 0xb9, 0xba, + 0xd4, 0x18, 0xee, 0xa3, 0x66, 0xc1, 0x82, 0xb2, 0x75, 0x20, 0xd5, 0x73, 0x12, 0x54, 0xd5, 0xb7, + 0x19, 0xaa, 0x44, 0x32, 0x41, 0x9a, 0xf9, 0x6d, 0x66, 0x21, 0x7e, 0x88, 0x8a, 0x31, 0xf2, 0x1a, + 0x2d, 0x90, 0x17, 0xa3, 0x64, 0x45, 0x3e, 0xa0, 0xa3, 0xa9, 0x92, 0x4a, 0x30, 0x77, 0xfb, 0xb1, + 0x49, 0xa7, 0x67, 0x0c, 0xea, 0xcf, 0x9e, 0xda, 0x7f, 0xb4, 0x83, 0xfd, 0x0a, 0x54, 0xdb, 0x4f, + 0x3b, 0xc6, 0xd3, 0x5b, 0x18, 0x3e, 0x43, 0xff, 0x51, 0x25, 0xb9, 0x2b, 0x58, 0xcc, 0x3e, 0xd1, + 0xd0, 0x8d, 0x59, 0x2a, 0x5d, 0xfd, 0x06, 0xe4, 0x10, 0xfa, 0x3d, 0xd2, 0xd9, 0x71, 0x96, 0x7c, + 0xc3, 0x52, 0xf9, 0x36, 0xa4, 0x31, 0x7e, 0x81, 0x2a, 0xbe, 0x60, 0x93, 0x40, 0x12, 0x0c, 0x7d, + 0x9c, 0xd8, 0x99, 0xf7, 0x6c, 0xed, 0x3d, 0x3b, 0xf7, 0x9e, 0x7d, 0xce, 0x83, 0x78, 0x68, 0x5e, + 0x7f, 0xbb, 0x57, 0x1a, 0xe7, 0xf4, 0x91, 0x59, 0xad, 0x75, 0xd0, 0xc8, 0xac, 0x36, 0x3a, 0xcd, + 0x91, 0x59, 0x6d, 0x77, 0x3a, 0xfd, 0x2f, 0x06, 0xc2, 0xb7, 0x5b, 0xbd, 0xc3, 0x85, 0xbb, 0x9e, + 0xda, 0xbb, 0xdb, 0x53, 0xfb, 0x7f, 0xe1, 0x29, 0xf3, 0xb7, 0x9e, 0xfa, 0x35, 0x62, 0xf9, 0x9f, + 0x46, 0x1c, 0x5e, 0x5c, 0xaf, 0x2c, 0xe3, 0x66, 0x65, 0x19, 0xdf, 0x57, 0x96, 0xf1, 0x79, 0x6d, + 0x95, 0x6e, 0xd6, 0x56, 0xe9, 0xeb, 0xda, 0x2a, 0xbd, 0x77, 0x66, 0x81, 0x9c, 0x2b, 0xcf, 0xf6, + 0x79, 0xe4, 0xec, 0x7c, 0xfa, 0xe5, 0x73, 0x27, 0xdd, 0xfd, 0xf9, 0xf2, 0x6a, 0xc1, 0x12, 0xaf, + 0x02, 0x5f, 0xf4, 0xec, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x76, 0xaa, 0x60, 0xf8, 0x23, 0x04, + 0x00, 0x00, } func (m *Subscription) Marshal() (dAtA []byte, err error) { diff --git a/x/subscription/types/tx.pb.go b/x/subscription/types/tx.pb.go index 4bae4295e5..d631e3339a 100644 --- a/x/subscription/types/tx.pb.go +++ b/x/subscription/types/tx.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types "github.com/lavanet/lava/v3/x/projects/types" + types "github.com/lavanet/lava/v4/x/projects/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -449,39 +449,39 @@ var fileDescriptor_b1bb075a6865b817 = []byte{ // 555 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x4f, 0x6f, 0xd3, 0x30, 0x14, 0xaf, 0x69, 0x96, 0x15, 0x77, 0x40, 0xb1, 0xf6, 0x27, 0x44, 0x10, 0xb6, 0x70, 0xe9, 0x38, - 0x24, 0xb0, 0xdd, 0x7a, 0x5b, 0xb5, 0x0b, 0xa0, 0x4a, 0x53, 0xb8, 0xc1, 0xa1, 0x72, 0x13, 0x2b, - 0x0d, 0xb4, 0x76, 0x14, 0x3b, 0xa5, 0xfd, 0x0a, 0x9c, 0x90, 0xe0, 0xc6, 0x97, 0xe0, 0x63, 0xec, - 0xb8, 0x23, 0x12, 0x12, 0x42, 0xed, 0x81, 0xaf, 0x81, 0xe2, 0x24, 0x4d, 0x02, 0x74, 0xd9, 0x25, - 0x7e, 0xef, 0xf9, 0xe7, 0xf7, 0xfb, 0xf9, 0xbd, 0x17, 0x43, 0x73, 0x82, 0x67, 0x98, 0x12, 0x61, - 0x27, 0xab, 0xcd, 0xe3, 0x11, 0x77, 0xa3, 0x20, 0x14, 0x01, 0xa3, 0xb6, 0x98, 0x5b, 0x61, 0xc4, - 0x04, 0x43, 0x0f, 0x32, 0x8c, 0x95, 0xac, 0x56, 0x19, 0xa3, 0xdf, 0xc7, 0xd3, 0x80, 0x32, 0x5b, - 0x7e, 0x53, 0xb4, 0xfe, 0xa4, 0x92, 0x31, 0x8c, 0xd8, 0x3b, 0xe2, 0x0a, 0x9e, 0x1b, 0x19, 0x68, - 0xd7, 0x67, 0x3e, 0x93, 0xa6, 0x9d, 0x58, 0x69, 0xd4, 0xfc, 0x01, 0xa0, 0x3a, 0xe0, 0x7e, 0x3f, - 0x5e, 0x20, 0x0d, 0x6e, 0xbb, 0x11, 0xc1, 0x82, 0x45, 0x1a, 0x38, 0x04, 0xdd, 0xdb, 0x4e, 0xee, - 0x22, 0x1d, 0xb6, 0x5c, 0x46, 0x79, 0x3c, 0x25, 0x91, 0x76, 0x4b, 0x6e, 0xad, 0x7d, 0xb4, 0x0b, - 0xb7, 0x02, 0xea, 0x91, 0xb9, 0xd6, 0x94, 0x1b, 0xa9, 0x93, 0x9c, 0xf0, 0xe2, 0x08, 0x27, 0x82, - 0x35, 0xe5, 0x10, 0x74, 0x15, 0x67, 0xed, 0xa3, 0x23, 0xb8, 0x83, 0x63, 0xc1, 0x86, 0x11, 0xa1, - 0xe4, 0x03, 0x9e, 0x68, 0xea, 0x21, 0xe8, 0xb6, 0x9c, 0x76, 0x12, 0x73, 0xd2, 0x10, 0x3a, 0x86, - 0x1d, 0xec, 0xcd, 0x30, 0x75, 0xc9, 0x30, 0x8c, 0x23, 0x77, 0x8c, 0x39, 0xd1, 0xb6, 0x25, 0xec, - 0x5e, 0x16, 0xbf, 0xc8, 0xc2, 0xbd, 0xbd, 0x8f, 0xbf, 0xbf, 0x3d, 0xed, 0x54, 0xaa, 0xd8, 0x8f, - 0x17, 0x2f, 0x95, 0xd6, 0x56, 0x47, 0x35, 0x3b, 0xf0, 0x6e, 0x7a, 0x39, 0x87, 0xf0, 0x90, 0x51, - 0x4e, 0xcc, 0x2f, 0x00, 0xde, 0x19, 0x70, 0xff, 0xcc, 0xf3, 0x2e, 0xd2, 0xea, 0x5c, 0x73, 0xed, - 0x57, 0x70, 0x27, 0x2b, 0xe1, 0xd0, 0xc3, 0x02, 0xcb, 0xab, 0xb7, 0x4f, 0x4c, 0xab, 0xd2, 0x9b, - 0xbc, 0xda, 0x56, 0x96, 0xef, 0x1c, 0x0b, 0xdc, 0x57, 0x2e, 0x7f, 0x3e, 0x6e, 0x38, 0xed, 0xb0, - 0x08, 0xf5, 0x1e, 0x26, 0x3a, 0x0f, 0x2a, 0x3a, 0x0b, 0x11, 0xe6, 0x01, 0xdc, 0xab, 0xa8, 0x5a, - 0xeb, 0x7d, 0x2b, 0xe5, 0x9e, 0x93, 0x49, 0xbd, 0x5c, 0x04, 0x15, 0x8a, 0xa7, 0x24, 0xeb, 0x90, - 0xb4, 0xff, 0xc7, 0x5a, 0xe4, 0xca, 0x58, 0x8b, 0xc0, 0x9a, 0xf5, 0x33, 0x90, 0x85, 0x3b, 0x2b, - 0xb5, 0x64, 0x33, 0xef, 0x3e, 0x54, 0x09, 0xc5, 0xa3, 0x49, 0xca, 0xdc, 0x72, 0x32, 0xaf, 0x32, - 0x35, 0xcd, 0x4d, 0x53, 0xa3, 0x94, 0xa6, 0xa6, 0xf7, 0x28, 0x51, 0xab, 0x55, 0x6b, 0x54, 0x48, - 0x30, 0x35, 0xb8, 0x5f, 0x15, 0x95, 0xeb, 0x3d, 0xf9, 0xda, 0x84, 0xcd, 0x01, 0xf7, 0xd1, 0x6b, - 0xd8, 0x4c, 0x26, 0xf9, 0xc8, 0xda, 0xf8, 0xfb, 0x58, 0xe9, 0x3c, 0xe8, 0xc7, 0xb5, 0x90, 0x3c, - 0x39, 0x1a, 0x43, 0x58, 0x1a, 0x97, 0xee, 0xf5, 0x07, 0x0b, 0xa4, 0xfe, 0xec, 0xa6, 0xc8, 0x32, - 0x53, 0xa9, 0xd3, 0x35, 0x4c, 0x05, 0xb2, 0x8e, 0xe9, 0xdf, 0x06, 0xa3, 0xf7, 0xb0, 0x5d, 0x6e, - 0x6e, 0x4d, 0x35, 0x4a, 0x50, 0xfd, 0xf9, 0x8d, 0xa1, 0x39, 0x59, 0xff, 0xc5, 0xe5, 0xd2, 0x00, - 0x57, 0x4b, 0x03, 0xfc, 0x5a, 0x1a, 0xe0, 0xd3, 0xca, 0x68, 0x5c, 0xad, 0x8c, 0xc6, 0xf7, 0x95, - 0xd1, 0x78, 0x63, 0xfb, 0x81, 0x18, 0xc7, 0x23, 0xcb, 0x65, 0x53, 0xbb, 0xf2, 0x86, 0xcd, 0x4e, - 0xed, 0xf9, 0x5f, 0x4f, 0xe3, 0x22, 0x24, 0x7c, 0xa4, 0xca, 0x57, 0xeb, 0xf4, 0x4f, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xa2, 0x31, 0x09, 0xee, 0x44, 0x05, 0x00, 0x00, + 0x24, 0x30, 0x38, 0xf5, 0xb6, 0x6a, 0x17, 0x40, 0x95, 0xa6, 0x70, 0x83, 0x43, 0xe5, 0x26, 0x56, + 0x1a, 0x68, 0xed, 0x28, 0x76, 0x4a, 0xfb, 0x15, 0x38, 0x21, 0xc1, 0x8d, 0x2f, 0xc1, 0xc7, 0xd8, + 0x71, 0x47, 0x24, 0x24, 0x84, 0xda, 0x03, 0x5f, 0x03, 0xc5, 0x49, 0x9a, 0x04, 0xe8, 0xb2, 0x4b, + 0xfc, 0xde, 0xf3, 0xcf, 0xef, 0xf7, 0xf3, 0x7b, 0x2f, 0x86, 0xe6, 0x04, 0xcf, 0x30, 0x25, 0xc2, + 0x4e, 0x56, 0x9b, 0xc7, 0x23, 0xee, 0x46, 0x41, 0x28, 0x02, 0x46, 0x6d, 0x31, 0xb7, 0xc2, 0x88, + 0x09, 0x86, 0xee, 0x65, 0x18, 0x2b, 0x59, 0xad, 0x32, 0x46, 0xbf, 0x8b, 0xa7, 0x01, 0x65, 0xb6, + 0xfc, 0xa6, 0x68, 0xfd, 0x51, 0x25, 0x63, 0x18, 0xb1, 0x77, 0xc4, 0x15, 0x3c, 0x37, 0x32, 0xd0, + 0xae, 0xcf, 0x7c, 0x26, 0x4d, 0x3b, 0xb1, 0xd2, 0xa8, 0xf9, 0x03, 0x40, 0x75, 0xc0, 0xfd, 0x7e, + 0xbc, 0x40, 0x1a, 0xdc, 0x76, 0x23, 0x82, 0x05, 0x8b, 0x34, 0x70, 0x08, 0xba, 0x37, 0x9d, 0xdc, + 0x45, 0x3a, 0x6c, 0xb9, 0x8c, 0xf2, 0x78, 0x4a, 0x22, 0xed, 0x86, 0xdc, 0x5a, 0xfb, 0x68, 0x17, + 0x6e, 0x05, 0xd4, 0x23, 0x73, 0xad, 0x29, 0x37, 0x52, 0x27, 0x39, 0xe1, 0xc5, 0x11, 0x4e, 0x04, + 0x6b, 0xca, 0x21, 0xe8, 0x2a, 0xce, 0xda, 0x47, 0x47, 0x70, 0x07, 0xc7, 0x82, 0x0d, 0x23, 0x42, + 0xc9, 0x07, 0x3c, 0xd1, 0xd4, 0x43, 0xd0, 0x6d, 0x39, 0xed, 0x24, 0xe6, 0xa4, 0x21, 0x74, 0x0c, + 0x3b, 0xd8, 0x9b, 0x61, 0xea, 0x92, 0x61, 0x18, 0x47, 0xee, 0x18, 0x73, 0xa2, 0x6d, 0x4b, 0xd8, + 0x9d, 0x2c, 0x7e, 0x9e, 0x85, 0x7b, 0x7b, 0x1f, 0x7f, 0x7f, 0x7b, 0xdc, 0xa9, 0x54, 0xb1, 0x1f, + 0x2f, 0x5e, 0x2a, 0xad, 0xad, 0x8e, 0x6a, 0x76, 0xe0, 0xed, 0xf4, 0x72, 0x0e, 0xe1, 0x21, 0xa3, + 0x9c, 0x98, 0x5f, 0x00, 0xbc, 0x35, 0xe0, 0xfe, 0xa9, 0xe7, 0x9d, 0xa7, 0xd5, 0xb9, 0xe2, 0xda, + 0xaf, 0xe0, 0x4e, 0x56, 0xc2, 0xa1, 0x87, 0x05, 0x96, 0x57, 0x6f, 0x9f, 0x98, 0x56, 0xa5, 0x37, + 0x79, 0xb5, 0xad, 0x2c, 0xdf, 0x19, 0x16, 0xb8, 0xaf, 0x5c, 0xfc, 0x7c, 0xd8, 0x70, 0xda, 0x61, + 0x11, 0xea, 0xdd, 0x4f, 0x74, 0x1e, 0x54, 0x74, 0x16, 0x22, 0xcc, 0x03, 0xb8, 0x57, 0x51, 0xb5, + 0xd6, 0xfb, 0x56, 0xca, 0x3d, 0x23, 0x93, 0x7a, 0xb9, 0x08, 0x2a, 0x14, 0x4f, 0x49, 0xd6, 0x21, + 0x69, 0xff, 0x8f, 0xb5, 0xc8, 0x95, 0xb1, 0x16, 0x81, 0x35, 0xeb, 0x67, 0x20, 0x0b, 0x77, 0x5a, + 0x6a, 0xc9, 0x66, 0xde, 0x7d, 0xa8, 0x12, 0x8a, 0x47, 0x93, 0x94, 0xb9, 0xe5, 0x64, 0x5e, 0x65, + 0x6a, 0x9a, 0x9b, 0xa6, 0x46, 0x29, 0x4d, 0x4d, 0xef, 0x41, 0xa2, 0x56, 0xab, 0xd6, 0xa8, 0x90, + 0x60, 0x6a, 0x70, 0xbf, 0x2a, 0x2a, 0xd7, 0x7b, 0xf2, 0xb5, 0x09, 0x9b, 0x03, 0xee, 0xa3, 0xd7, + 0xb0, 0x99, 0x4c, 0xf2, 0x91, 0xb5, 0xf1, 0xf7, 0xb1, 0xd2, 0x79, 0xd0, 0x8f, 0x6b, 0x21, 0x79, + 0x72, 0x34, 0x86, 0xb0, 0x34, 0x2e, 0xdd, 0xab, 0x0f, 0x16, 0x48, 0xfd, 0xc9, 0x75, 0x91, 0x65, + 0xa6, 0x52, 0xa7, 0x6b, 0x98, 0x0a, 0x64, 0x1d, 0xd3, 0xbf, 0x0d, 0x46, 0xef, 0x61, 0xbb, 0xdc, + 0xdc, 0x9a, 0x6a, 0x94, 0xa0, 0xfa, 0xd3, 0x6b, 0x43, 0x73, 0xb2, 0xfe, 0x8b, 0x8b, 0xa5, 0x01, + 0x2e, 0x97, 0x06, 0xf8, 0xb5, 0x34, 0xc0, 0xa7, 0x95, 0xd1, 0xb8, 0x5c, 0x19, 0x8d, 0xef, 0x2b, + 0xa3, 0xf1, 0xc6, 0xf6, 0x03, 0x31, 0x8e, 0x47, 0x96, 0xcb, 0xa6, 0x76, 0xe5, 0x0d, 0x9b, 0x3d, + 0xb7, 0xe7, 0x7f, 0x3d, 0x8d, 0x8b, 0x90, 0xf0, 0x91, 0x2a, 0x5f, 0xad, 0x67, 0x7f, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x9a, 0x98, 0x2b, 0x5b, 0x44, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/timerstore/client/cli/query.go b/x/timerstore/client/cli/query.go index e779583f95..8dc9c991d3 100644 --- a/x/timerstore/client/cli/query.go +++ b/x/timerstore/client/cli/query.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/client" - "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/spf13/cobra" ) diff --git a/x/timerstore/client/cli/query_all_timers.go b/x/timerstore/client/cli/query_all_timers.go index 26e89e2c38..b4f12f9dba 100644 --- a/x/timerstore/client/cli/query_all_timers.go +++ b/x/timerstore/client/cli/query_all_timers.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/spf13/cobra" ) diff --git a/x/timerstore/client/cli/query_next.go b/x/timerstore/client/cli/query_next.go index 0b9b6830d1..767372ab8d 100644 --- a/x/timerstore/client/cli/query_next.go +++ b/x/timerstore/client/cli/query_next.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/spf13/cobra" ) diff --git a/x/timerstore/client/cli/query_store_keys.go b/x/timerstore/client/cli/query_store_keys.go index 397fc1f66c..1858047069 100644 --- a/x/timerstore/client/cli/query_store_keys.go +++ b/x/timerstore/client/cli/query_store_keys.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/spf13/cobra" ) diff --git a/x/timerstore/keeper/grpc_query_all_timers.go b/x/timerstore/keeper/grpc_query_all_timers.go index cd5e1a61e4..7250d26a18 100644 --- a/x/timerstore/keeper/grpc_query_all_timers.go +++ b/x/timerstore/keeper/grpc_query_all_timers.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/timerstore/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/timerstore/keeper/grpc_query_next.go b/x/timerstore/keeper/grpc_query_next.go index a8753db700..ce758780cf 100644 --- a/x/timerstore/keeper/grpc_query_next.go +++ b/x/timerstore/keeper/grpc_query_next.go @@ -5,8 +5,8 @@ import ( "math" sdk "github.com/cosmos/cosmos-sdk/types" - commontypes "github.com/lavanet/lava/v3/utils/common/types" - "github.com/lavanet/lava/v3/x/timerstore/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" + "github.com/lavanet/lava/v4/x/timerstore/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/timerstore/keeper/grpc_query_store_keys.go b/x/timerstore/keeper/grpc_query_store_keys.go index 3a1c213fec..ad5029a84a 100644 --- a/x/timerstore/keeper/grpc_query_store_keys.go +++ b/x/timerstore/keeper/grpc_query_store_keys.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/timerstore/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/timerstore/keeper/keeper.go b/x/timerstore/keeper/keeper.go index ac7386f019..925d267083 100644 --- a/x/timerstore/keeper/keeper.go +++ b/x/timerstore/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - timerstoretypes "github.com/lavanet/lava/v3/x/timerstore/types" + timerstoretypes "github.com/lavanet/lava/v4/x/timerstore/types" ) func NewKeeper(cdc codec.BinaryCodec) *Keeper { diff --git a/x/timerstore/module.go b/x/timerstore/module.go index 2fc0ae3190..24b6d590d5 100644 --- a/x/timerstore/module.go +++ b/x/timerstore/module.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/lavanet/lava/v3/x/timerstore/client/cli" - timerstorekeeper "github.com/lavanet/lava/v3/x/timerstore/keeper" - "github.com/lavanet/lava/v3/x/timerstore/types" + "github.com/lavanet/lava/v4/x/timerstore/client/cli" + timerstorekeeper "github.com/lavanet/lava/v4/x/timerstore/keeper" + "github.com/lavanet/lava/v4/x/timerstore/types" "github.com/spf13/cobra" ) diff --git a/x/timerstore/types/query.pb.go b/x/timerstore/types/query.pb.go index 8b6b5756f8..146b095c03 100644 --- a/x/timerstore/types/query.pb.go +++ b/x/timerstore/types/query.pb.go @@ -505,7 +505,7 @@ var fileDescriptor_67348a2ef655ad3f = []byte{ // 595 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6e, 0xd3, 0x40, 0x10, 0xb6, 0x13, 0xb7, 0xe0, 0x29, 0xa8, 0xcd, 0x0a, 0xda, 0x28, 0x20, 0x13, 0xb9, 0x20, 0x85, - 0x22, 0xbc, 0x52, 0xca, 0x01, 0xf5, 0x44, 0x23, 0xa4, 0x06, 0x51, 0xa1, 0x62, 0x38, 0x71, 0xa0, + 0x22, 0xbc, 0x52, 0xe8, 0x01, 0xf5, 0x44, 0x23, 0xa4, 0x06, 0x51, 0xa1, 0x62, 0x38, 0x71, 0xa0, 0x72, 0xd2, 0xad, 0x6b, 0xc5, 0xf5, 0xa6, 0xf1, 0xa6, 0xc4, 0xaa, 0xca, 0x81, 0x27, 0x40, 0xe2, 0xc4, 0x4b, 0xf0, 0x1c, 0x3d, 0x70, 0xa8, 0xc4, 0x85, 0x13, 0x42, 0x09, 0x0f, 0xc0, 0x23, 0xa0, 0x5d, 0x6f, 0x5c, 0xe7, 0xc7, 0x34, 0x82, 0x93, 0xc7, 0xb3, 0xdf, 0x7e, 0xf3, 0xcd, 0x37, 0x63, @@ -535,11 +535,11 @@ var fileDescriptor_67348a2ef655ad3f = []byte{ 0xbb, 0xf1, 0x2b, 0x3e, 0x49, 0x1c, 0x3d, 0xc5, 0x27, 0xb1, 0x65, 0xa7, 0xe8, 0xb3, 0x0a, 0x7a, 0x32, 0xd8, 0xcb, 0x04, 0x8f, 0x2f, 0xd9, 0x65, 0x82, 0x27, 0x36, 0xc6, 0x7c, 0x20, 0x04, 0xdf, 0x43, 0xab, 0x99, 0x82, 0x13, 0x91, 0x21, 0xd7, 0xa6, 0xf1, 0x59, 0xa2, 0xfb, 0x7f, 0x2f, 0x93, - 0x5a, 0x9c, 0xd2, 0xda, 0x2c, 0x50, 0x29, 0x66, 0x43, 0x88, 0x79, 0x84, 0xaa, 0x99, 0x62, 0xf8, - 0xe8, 0xa7, 0xfa, 0x56, 0xdb, 0x3a, 0xeb, 0x1b, 0xea, 0x79, 0xdf, 0x50, 0x7f, 0xf6, 0x0d, 0xf5, - 0xe3, 0xc0, 0x50, 0xce, 0x07, 0x86, 0xf2, 0x7d, 0x60, 0x28, 0x6f, 0x1e, 0xba, 0x1e, 0x3b, 0xe8, - 0x36, 0xac, 0x26, 0x3d, 0x1c, 0xe5, 0x3d, 0x5e, 0xc7, 0xbd, 0x91, 0x7f, 0x6c, 0xd4, 0x26, 0x61, - 0x63, 0x5e, 0xfc, 0x64, 0xd7, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x10, 0x1f, 0xd8, 0xfd, 0xfd, + 0x5a, 0x9c, 0xd2, 0xda, 0x2c, 0x50, 0x29, 0x66, 0x43, 0x88, 0x59, 0x47, 0xd5, 0x4c, 0x31, 0x7c, + 0xf4, 0x53, 0x7d, 0xab, 0x6d, 0x9d, 0xf5, 0x0d, 0xf5, 0xbc, 0x6f, 0xa8, 0x3f, 0xfb, 0x86, 0xfa, + 0x71, 0x60, 0x28, 0xe7, 0x03, 0x43, 0xf9, 0x3e, 0x30, 0x94, 0x37, 0x0f, 0x5d, 0x8f, 0x1d, 0x74, + 0x1b, 0x56, 0x93, 0x1e, 0x8e, 0xf2, 0x1e, 0xaf, 0xe3, 0xde, 0xc8, 0x3f, 0x36, 0x6a, 0x93, 0xb0, + 0x31, 0x2f, 0x7e, 0xb2, 0x8f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x43, 0xec, 0xd1, 0xf9, 0xfd, 0x05, 0x00, 0x00, } diff --git a/x/timerstore/types/timer.go b/x/timerstore/types/timer.go index b4f0a66678..99b84910f8 100644 --- a/x/timerstore/types/timer.go +++ b/x/timerstore/types/timer.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - commontypes "github.com/lavanet/lava/v3/utils/common/types" + commontypes "github.com/lavanet/lava/v4/utils/common/types" ) // TimerStore manages timers to efficiently support future timeouts. Timeouts diff --git a/x/timerstore/types/timer.pb.go b/x/timerstore/types/timer.pb.go index 3fa445a3a0..72c7ab1802 100644 --- a/x/timerstore/types/timer.pb.go +++ b/x/timerstore/types/timer.pb.go @@ -169,28 +169,29 @@ func init() { } var fileDescriptor_0bfa2b3f0d19f843 = []byte{ - // 336 bytes of a gzipped FileDescriptorProto + // 337 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0xc1, 0x6a, 0xf2, 0x40, 0x10, 0xc7, 0x13, 0x8d, 0xdf, 0x47, 0xd7, 0x88, 0x75, 0x11, 0x1a, 0x7a, 0x48, 0xc5, 0x42, 0x11, - 0xa1, 0x09, 0xd4, 0x37, 0x10, 0xc4, 0xde, 0x0a, 0xb1, 0xbd, 0xf4, 0x22, 0xd1, 0x0e, 0x71, 0x51, - 0x77, 0x65, 0x77, 0x0c, 0xfa, 0x16, 0x7d, 0x8c, 0x3e, 0x8a, 0x47, 0x8f, 0x3d, 0x95, 0xa2, 0x2f, - 0x52, 0x76, 0x13, 0xdb, 0x4a, 0xe9, 0xa5, 0xa7, 0xf9, 0xcf, 0xcc, 0x2f, 0xff, 0xcc, 0xce, 0x90, - 0xcb, 0x59, 0x9c, 0xc6, 0x1c, 0x30, 0xd4, 0x31, 0x44, 0x36, 0x07, 0xa9, 0x50, 0x48, 0xc8, 0x64, - 0xb0, 0x90, 0x02, 0x05, 0x3d, 0xcb, 0xa1, 0x40, 0xc7, 0xe0, 0x0b, 0x3a, 0xaf, 0x27, 0x22, 0x11, - 0x86, 0x09, 0xb5, 0xca, 0xf0, 0xe6, 0x4b, 0x81, 0xb8, 0x7d, 0xe0, 0xa0, 0x98, 0x1a, 0x60, 0x8c, - 0x40, 0x3d, 0xf2, 0x3f, 0x05, 0xa9, 0x98, 0xe0, 0x9e, 0xdd, 0xb0, 0x5b, 0x4e, 0x74, 0x48, 0x69, - 0x9b, 0xd4, 0x38, 0xac, 0x70, 0x38, 0x9a, 0x89, 0xf1, 0x74, 0x38, 0x01, 0x96, 0x4c, 0xd0, 0x2b, - 0x18, 0xa6, 0xaa, 0x1b, 0x5d, 0x5d, 0xbf, 0x35, 0x65, 0x7a, 0x45, 0xaa, 0xdf, 0x58, 0x3d, 0x85, - 0x57, 0x34, 0x64, 0xe5, 0x93, 0xbc, 0x67, 0x73, 0xa0, 0x03, 0xe2, 0xea, 0xe6, 0x10, 0x38, 0x4a, - 0x06, 0xca, 0x73, 0x1a, 0xc5, 0x56, 0xf9, 0xa6, 0x1d, 0xfc, 0xf2, 0x88, 0x20, 0x1f, 0x55, 0x7f, - 0x2b, 0x7b, 0x1c, 0xe5, 0xba, 0xeb, 0x6c, 0xde, 0x2e, 0xac, 0xa8, 0xac, 0x99, 0x5e, 0x66, 0x42, - 0x1f, 0x48, 0x25, 0xfb, 0xef, 0xc1, 0xb5, 0xf4, 0x47, 0x57, 0xd7, 0xd8, 0xe4, 0xb6, 0xcd, 0x3b, - 0x52, 0xfb, 0x01, 0xd2, 0x53, 0x52, 0x9c, 0xc2, 0xda, 0xac, 0xea, 0x24, 0xd2, 0x92, 0xd6, 0x49, - 0x29, 0x8d, 0x67, 0x4b, 0xc8, 0x57, 0x93, 0x25, 0x94, 0x12, 0xe7, 0x29, 0xc6, 0xd8, 0x6c, 0xc1, - 0x8d, 0x8c, 0xee, 0xf6, 0x37, 0x3b, 0xdf, 0xde, 0xee, 0x7c, 0xfb, 0x7d, 0xe7, 0xdb, 0xcf, 0x7b, - 0xdf, 0xda, 0xee, 0x7d, 0xeb, 0x75, 0xef, 0x5b, 0x8f, 0xd7, 0x09, 0xc3, 0xc9, 0x72, 0x14, 0x8c, - 0xc5, 0x3c, 0x3c, 0x3a, 0x7a, 0xda, 0x09, 0x57, 0x47, 0x97, 0x5f, 0x2f, 0x40, 0x8d, 0xfe, 0x99, - 0x5b, 0x76, 0x3e, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x0e, 0xa2, 0xfe, 0x21, 0x02, 0x00, 0x00, + 0xa1, 0x09, 0xb4, 0x7d, 0x02, 0x41, 0xec, 0xad, 0x10, 0xdb, 0x4b, 0x2f, 0x12, 0xed, 0x10, 0x17, + 0x75, 0x57, 0x76, 0xc7, 0xa0, 0x6f, 0xd1, 0xc7, 0xe8, 0xa3, 0x78, 0xf4, 0xd8, 0x53, 0x29, 0xfa, + 0x22, 0x65, 0x37, 0xb1, 0xad, 0x94, 0x5e, 0x7a, 0x9a, 0xff, 0xcc, 0xfc, 0xf2, 0xcf, 0xec, 0x0c, + 0x39, 0x9f, 0xc6, 0x69, 0xcc, 0x01, 0x43, 0x1d, 0x43, 0x64, 0x33, 0x90, 0x0a, 0x85, 0x84, 0x4c, + 0x06, 0x73, 0x29, 0x50, 0xd0, 0x93, 0x1c, 0x0a, 0x74, 0x0c, 0xbe, 0xa0, 0xd3, 0x7a, 0x22, 0x12, + 0x61, 0x98, 0x50, 0xab, 0x0c, 0x6f, 0xbe, 0x14, 0x88, 0xdb, 0x03, 0x0e, 0x8a, 0xa9, 0x3e, 0xc6, + 0x08, 0xd4, 0x23, 0xff, 0x53, 0x90, 0x8a, 0x09, 0xee, 0xd9, 0x0d, 0xbb, 0xe5, 0x44, 0xfb, 0x94, + 0xb6, 0x49, 0x8d, 0xc3, 0x12, 0x07, 0xc3, 0xa9, 0x18, 0x4d, 0x06, 0x63, 0x60, 0xc9, 0x18, 0xbd, + 0x82, 0x61, 0xaa, 0xba, 0xd1, 0xd1, 0xf5, 0x5b, 0x53, 0xa6, 0x17, 0xa4, 0xfa, 0x8d, 0xd5, 0x53, + 0x78, 0x45, 0x43, 0x56, 0x3e, 0xc9, 0x7b, 0x36, 0x03, 0xda, 0x27, 0xae, 0x6e, 0x0e, 0x80, 0xa3, + 0x64, 0xa0, 0x3c, 0xa7, 0x51, 0x6c, 0x95, 0xaf, 0xda, 0xc1, 0x2f, 0x8f, 0x08, 0xf2, 0x51, 0xf5, + 0xb7, 0xb2, 0xcb, 0x51, 0xae, 0x3a, 0xce, 0xfa, 0xed, 0xcc, 0x8a, 0xca, 0x9a, 0xe9, 0x66, 0x26, + 0xf4, 0x81, 0x54, 0xb2, 0xff, 0xee, 0x5d, 0x4b, 0x7f, 0x74, 0x75, 0x8d, 0x4d, 0x6e, 0xdb, 0xbc, + 0x23, 0xb5, 0x1f, 0x20, 0x3d, 0x26, 0xc5, 0x09, 0xac, 0xcc, 0xaa, 0x8e, 0x22, 0x2d, 0x69, 0x9d, + 0x94, 0xd2, 0x78, 0xba, 0x80, 0x7c, 0x35, 0x59, 0x42, 0x29, 0x71, 0x9e, 0x62, 0x8c, 0xcd, 0x16, + 0xdc, 0xc8, 0xe8, 0x4e, 0x6f, 0xbd, 0xf5, 0xed, 0xcd, 0xd6, 0xb7, 0xdf, 0xb7, 0xbe, 0xfd, 0xbc, + 0xf3, 0xad, 0xcd, 0xce, 0xb7, 0x5e, 0x77, 0xbe, 0xf5, 0x78, 0x99, 0x30, 0x1c, 0x2f, 0x86, 0xc1, + 0x48, 0xcc, 0xc2, 0x83, 0xa3, 0xa7, 0x37, 0xe1, 0xf2, 0xe0, 0xf2, 0xab, 0x39, 0xa8, 0xe1, 0x3f, + 0x73, 0xcb, 0xeb, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x29, 0xfd, 0xab, 0xfa, 0x21, 0x02, 0x00, + 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) {