Puneet/removelscosmos (#516)

* remove msg service.

* deprecate all queries and msgs

* add deprecation warnings

* add deprecation warnings

Author: puneet2019

proto/pstake/lscosmos/v1beta1/governance_proposal.proto

@@ -15,6 +15,7 @@ option (gogoproto.goproto_getters_all) = false;
 message MinDepositAndFeeChangeProposal {
   option (gogoproto.equal) = false;
   option (gogoproto.goproto_stringer) = false;
+  option deprecated = true;
 
   string title = 1;
   string description = 2;
@@ -48,6 +49,7 @@ message MinDepositAndFeeChangeProposal {
 message PstakeFeeAddressChangeProposal {
   option (gogoproto.equal) = false;
   option (gogoproto.goproto_stringer) = false;
+  option deprecated = true;
 
   string title = 1;
   string description = 2;
@@ -58,6 +60,7 @@ message PstakeFeeAddressChangeProposal {
 message AllowListedValidatorSetChangeProposal {
   option (gogoproto.equal) = false;
   option (gogoproto.goproto_stringer) = false;
+  option deprecated = true;
 
   string title = 1;
   string description = 2;

proto/pstake/lscosmos/v1beta1/msgs.proto

@@ -13,6 +13,8 @@ option go_package = "github.com/persistenceOne/pstake-native/v2/x/lscosmos/types
 
 // Msg defines the lsCosmos services.
 service Msg {
+  option deprecated = true;
+
   rpc LiquidStake(MsgLiquidStake) returns (MsgLiquidStakeResponse) {
     option (google.api.http).post = "/pstake/lscosmos/v1beta1/LiquidStake";
   }

proto/pstake/lscosmos/v1beta1/query.proto

@@ -5,6 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "pstake/lscosmos/v1beta1/params.proto";
+import "pstake/lscosmos/v1beta1/genesis.proto";
 import "pstake/lscosmos/v1beta1/governance_proposal.proto";
 import "pstake/lscosmos/v1beta1/lscosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
@@ -15,10 +16,15 @@ option go_package = "github.com/persistenceOne/pstake-native/v2/x/lscosmos/types
 
 // Query defines the gRPC querier service.
 service Query {
+  option deprecated = true;
   // Parameters queries the parameters of the module.
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/pstake/lscosmos/v1beta1/params";
   }
+  // AllState returns all state of module, aka, genesis export.
+  rpc AllState(QueryAllStateRequest) returns (QueryAllStateResponse) {
+    option (google.api.http).get = "/pstake/lscosmos/v1beta1/all_state";
+  }
 
   rpc HostChainParams(QueryHostChainParamsRequest)
       returns (QueryHostChainParamsResponse) {
@@ -82,7 +88,7 @@ service Query {
   rpc DelegatorUnbondingEpochEntry(QueryDelegatorUnbondingEpochEntryRequest)
       returns (QueryDelegatorUnbondingEpochEntryResponse) {
     option (google.api.http).get =
-        "/pstake/lscosmos/v1beta1/delegator_unbonding_epoch_entry/"
+    "/pstake/lscosmos/v1beta1/delegator_unbonding_epoch_entry/"
         "{delegator_address}/{epoch_number}";
   }
 
@@ -101,7 +107,7 @@ service Query {
       QueryAllDelegatorUnbondingEpochEntriesRequest)
       returns (QueryAllDelegatorUnbondingEpochEntriesResponse) {
     option (google.api.http).get =
-        "/pstake/lscosmos/v1beta1/delegator_unbonding_epoch_entries/"
+    "/pstake/lscosmos/v1beta1/delegator_unbonding_epoch_entries/"
         "{delegator_address}";
   }
 }
@@ -112,7 +118,17 @@ message QueryParamsRequest {}
 // QueryParamsResponse is response type for the Query/Params RPC method.
 message QueryParamsResponse {
   // params holds all the parameters of this module.
-  Params params = 1 [ (gogoproto.nullable) = false ];
+  Params params = 1 [(gogoproto.nullable) = false];
+}
+
+
+// QueryAllStateRequest is request type for the Query/AllState RPC method.
+message QueryAllStateRequest {}
+
+// QueryAllStateResponse is response type for the Query/AllState RPC method.
+message QueryAllStateResponse {
+  // params holds all the parameters of this module.
+  GenesisState genesis = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryHostChainParamsRequest is request for the Ouery/HostChainParams methods.
@@ -121,7 +137,7 @@ message QueryHostChainParamsRequest {}
 // QueryHostChainParamsResponse is response for the Ouery/HostChainParams
 // methods.
 message QueryHostChainParamsResponse {
-  HostChainParams host_chain_params = 1 [ (gogoproto.nullable) = false ];
+  HostChainParams host_chain_params = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryDelegationStateRequest is request for the Ouery/DelegationState methods.
@@ -130,7 +146,7 @@ message QueryDelegationStateRequest {}
 // QueryDelegationStateResponse is response for the Ouery/DelegationState
 // methods.
 message QueryDelegationStateResponse {
-  DelegationState delegation_state = 1 [ (gogoproto.nullable) = false ];
+  DelegationState delegation_state = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryListedValidatorsRequest is a request for the Query/AllowListedValidators
@@ -141,7 +157,7 @@ message QueryAllowListedValidatorsRequest {}
 // Query/AllowListedValidators methods.
 message QueryAllowListedValidatorsResponse {
   AllowListedValidators allow_listed_validators = 1
-      [ (gogoproto.nullable) = false ];
+  [(gogoproto.nullable) = false];
 }
 
 // QueryCValueRequest is a request for the Query/CValue methods.
@@ -159,7 +175,7 @@ message QueryCValueResponse {
 message QueryModuleStateRequest {}
 
 // QueryModuleStateRequest is a response for the Query/ModuleState methods.
-message QueryModuleStateResponse { bool module_state = 1; }
+message QueryModuleStateResponse {bool module_state = 1;}
 
 // QueryIBCTransientStoreRequest is a request for the Query/IBCTransientStore
 // methods.
@@ -169,58 +185,58 @@ message QueryIBCTransientStoreRequest {}
 // methods.
 message QueryIBCTransientStoreResponse {
   IBCAmountTransientStore i_b_c_transient_store = 1
-      [ (gogoproto.nullable) = false ];
+  [(gogoproto.nullable) = false];
 }
 
 // QueryUnclaimedRequest is a request for the Query/Unclaimed methods.
-message QueryUnclaimedRequest { string delegator_address = 1; }
+message QueryUnclaimedRequest {string delegator_address = 1;}
 // QueryUnclaimedResponse is a response for the Query/Unclaimed methods.
 message QueryUnclaimedResponse {
-  repeated UnbondingEpochCValue unclaimed = 1 [ (gogoproto.nullable) = false ];
+  repeated UnbondingEpochCValue unclaimed = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryFailedUnbondingsRequest is a request for the Query/FailedUnbondings
 // methods.
-message QueryFailedUnbondingsRequest { string delegator_address = 1; }
+message QueryFailedUnbondingsRequest {string delegator_address = 1;}
 
 // QueryFailedUnbondingsResponse a response for the Query/FailedUnbondings
 // methods.
 message QueryFailedUnbondingsResponse {
   repeated UnbondingEpochCValue failed_unbondings = 1
-      [ (gogoproto.nullable) = false ];
+  [(gogoproto.nullable) = false];
 }
 
 // QueryPendingUnbondingsRequest is a request for the Query/PendingUnbondings
 // methods.
-message QueryPendingUnbondingsRequest { string delegator_address = 1; }
+message QueryPendingUnbondingsRequest {string delegator_address = 1;}
 
 // QueryPendingUnbondingsResponse is a response for the Query/PendingUnbondings
 // methods.
 message QueryPendingUnbondingsResponse {
   repeated UnbondingEpochCValue pending_unbondings = 1
-      [ (gogoproto.nullable) = false ];
+  [(gogoproto.nullable) = false];
 }
 
 // QueryUnbondingEpochCValueRequest is a request for the
 // Query/UnbondingEpochCValue methods.
-message QueryUnbondingEpochCValueRequest { int64 epoch_number = 1; }
+message QueryUnbondingEpochCValueRequest {int64 epoch_number = 1;}
 
 // QueryUnbondingEpochCValueResponse is a response for the
 // Query/UnbondingEpochCValue methods.
 message QueryUnbondingEpochCValueResponse {
   UnbondingEpochCValue unbonding_epoch_c_value = 1
-      [ (gogoproto.nullable) = false ];
+  [(gogoproto.nullable) = false];
 }
 
 // QueryHostAccountUndelegationRequest is a request for the
 // Query/HostAccountUndelegation methods.
-message QueryHostAccountUndelegationRequest { int64 epoch_number = 1; }
+message QueryHostAccountUndelegationRequest {int64 epoch_number = 1;}
 
 // QueryHostAccountUndelegationResponse is a response for the
 // Query/HostAccountUndelegation methods.
 message QueryHostAccountUndelegationResponse {
   HostAccountUndelegation host_account_undelegation = 1
-      [ (gogoproto.nullable) = false ];
+  [(gogoproto.nullable) = false];
 }
 
 // QueryDelegatorUnbondingEpochEntryRequest is a request for the
@@ -234,15 +250,15 @@ message QueryDelegatorUnbondingEpochEntryRequest {
 // Query/DelegatorUnbondingEpochEntry methods.
 message QueryDelegatorUnbondingEpochEntryResponse {
   DelegatorUnbondingEpochEntry delegator_unboding_epoch_entry = 1
-      [ (gogoproto.nullable) = false ];
+  [(gogoproto.nullable) = false];
 }
 
 // QueryHostAccountsRequest is a request for the Query/HostAccounts methods.
 message QueryHostAccountsRequest {}
 
 // QueryHostAccountsResponse is a response for the Query/HostAccounts methods.
 message QueryHostAccountsResponse {
-  HostAccounts host_accounts = 1 [ (gogoproto.nullable) = false ];
+  HostAccounts host_accounts = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryDepositModuleAccountRequest is a request for the
@@ -252,7 +268,7 @@ message QueryDepositModuleAccountRequest {}
 // QueryDepositModuleAccountResponse is a response for the
 // Query/DepositModuleAccount methods.
 message QueryDepositModuleAccountResponse {
-  cosmos.base.v1beta1.Coin balance = 1 [ (gogoproto.nullable) = false ];
+  cosmos.base.v1beta1.Coin balance = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryAllDelegatorUnbondingEpochEntriesRequest is a request for the
@@ -265,5 +281,5 @@ message QueryAllDelegatorUnbondingEpochEntriesRequest {
 // Query/DelegatorUnbondingEpochEntries methods.
 message QueryAllDelegatorUnbondingEpochEntriesResponse {
   repeated DelegatorUnbondingEpochEntry delegator_unbonding_epoch_entries = 1
-      [ (gogoproto.nullable) = false ];
+  [(gogoproto.nullable) = false];
 }

x/lscosmos/genesis.go

@@ -42,20 +42,6 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 
 // ExportGenesis returns the capability module's exported genesis.
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
-	genesis := types.DefaultGenesis()
-	genesis.Params = k.GetParams(ctx)
-
-	genesis.ModuleEnabled = k.GetModuleState(ctx)
-	genesis.HostChainParams = k.GetHostChainParams(ctx)
-	genesis.AllowListedValidators = k.GetAllowListedValidators(ctx)
-	genesis.DelegationState = k.GetDelegationState(ctx)
-	genesis.HostChainRewardAddress = k.GetHostChainRewardAddress(ctx)
-	genesis.IBCAmountTransientStore = k.GetIBCTransientStore(ctx)
-	genesis.UnbondingEpochCValues = k.IterateAllUnbondingEpochCValues(ctx)
-	genesis.DelegatorUnbondingEpochEntries = k.IterateAllDelegatorUnbondingEpochEntry(ctx)
-	genesis.HostAccounts = k.GetHostAccounts(ctx)
-
 	// this line is used by starport scaffolding # genesis/module/export
-
-	return genesis
+	return k.GetGenesisState(ctx)
 }

x/lscosmos/keeper/genesis.go

@@ -0,0 +1,22 @@
+package keeper
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/persistenceOne/pstake-native/v2/x/lscosmos/types"
+)
+
+func (k Keeper) GetGenesisState(ctx sdk.Context) *types.GenesisState {
+	genesis := types.DefaultGenesis()
+	genesis.Params = k.GetParams(ctx)
+
+	genesis.ModuleEnabled = k.GetModuleState(ctx)
+	genesis.HostChainParams = k.GetHostChainParams(ctx)
+	genesis.AllowListedValidators = k.GetAllowListedValidators(ctx)
+	genesis.DelegationState = k.GetDelegationState(ctx)
+	genesis.HostChainRewardAddress = k.GetHostChainRewardAddress(ctx)
+	genesis.IBCAmountTransientStore = k.GetIBCTransientStore(ctx)
+	genesis.UnbondingEpochCValues = k.IterateAllUnbondingEpochCValues(ctx)
+	genesis.DelegatorUnbondingEpochEntries = k.IterateAllDelegatorUnbondingEpochEntry(ctx)
+	genesis.HostAccounts = k.GetHostAccounts(ctx)
+	return genesis
+}

x/lscosmos/keeper/governance_proposal.go

@@ -1,64 +1,21 @@
 package keeper
 
 import (
-	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/persistenceOne/pstake-native/v2/x/lscosmos/types"
 )
 
 // HandleMinDepositAndFeeChangeProposal changes host chain params for desired min-deposit and protocol fee
 func HandleMinDepositAndFeeChangeProposal(ctx sdk.Context, k Keeper, content types.MinDepositAndFeeChangeProposal) error {
-	if !k.GetModuleState(ctx) {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Module not enabled")
-	}
-
-	hostChainParams := k.GetHostChainParams(ctx)
-	if hostChainParams.IsEmpty() {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "host chain not registered")
-	}
-
-	// modify oldData with the new proposal content
-	hostChainParams.MinDeposit = content.MinDeposit
-	hostChainParams.PstakeParams.PstakeDepositFee = content.PstakeDepositFee
-	hostChainParams.PstakeParams.PstakeRestakeFee = content.PstakeRestakeFee
-	hostChainParams.PstakeParams.PstakeUnstakeFee = content.PstakeUnstakeFee
-	hostChainParams.PstakeParams.PstakeRedemptionFee = content.PstakeRedemptionFee
-
-	k.SetHostChainParams(ctx, hostChainParams)
-
-	return nil
+	return types.ErrDeprecated
 }
 
 // HandlePstakeFeeAddressChangeProposal changes fee collector address
 func HandlePstakeFeeAddressChangeProposal(ctx sdk.Context, k Keeper, content types.PstakeFeeAddressChangeProposal) error {
-	//Do not check ModuleEnabled state or host chain params here because non-critical proposal and will help not hardcode address inside default genesis
-
-	hostChainParams := k.GetHostChainParams(ctx)
-
-	// modify oldData with the new proposal content
-	hostChainParams.PstakeParams.PstakeFeeAddress = content.PstakeFeeAddress
-
-	k.SetHostChainParams(ctx, hostChainParams)
-
-	return nil
+	return types.ErrDeprecated
 }
 
 // HandleAllowListedValidatorSetChangeProposal changes the allowList validator set
 func HandleAllowListedValidatorSetChangeProposal(ctx sdk.Context, k Keeper, content types.AllowListedValidatorSetChangeProposal) error {
-	if !k.GetModuleState(ctx) {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Module not enabled")
-	}
-
-	hostChainParams := k.GetHostChainParams(ctx)
-	if hostChainParams.IsEmpty() {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "host chain not registered")
-	}
-
-	if !content.AllowListedValidators.Valid() {
-		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Allow listed validators is invalid")
-	}
-
-	k.SetAllowListedValidators(ctx, content.AllowListedValidators)
-	return nil
+	return types.ErrDeprecated
 }