feat: support message based proposals

docs/core/proto-docs.md

@@ -973,6 +973,8 @@
     - [Query](#lbm.fswap.v1.Query)
 
 - [lbm/fswap/v1/tx.proto](#lbm/fswap/v1/tx.proto)
+    - [MsgMakeSwapProposal](#lbm.fswap.v1.MsgMakeSwapProposal)
+    - [MsgMakeSwapProposalResponse](#lbm.fswap.v1.MsgMakeSwapProposalResponse)
     - [MsgSwap](#lbm.fswap.v1.MsgSwap)
     - [MsgSwapAll](#lbm.fswap.v1.MsgSwapAll)
     - [MsgSwapAllResponse](#lbm.fswap.v1.MsgSwapAllResponse)
@@ -14163,13 +14165,11 @@ Msg defines the foundation Msg service.
 <a name="lbm.fswap.v1.MakeSwapProposal"></a>
 
 ### MakeSwapProposal
-From cosmos-sdk 0.46.0 they deprecated this way, but currently finschia-sdk based on 0.45.10
+
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `title` | [string](#string) |  |  |
-| `description` | [string](#string) |  |  |
 | `swap` | [Swap](#lbm.fswap.v1.Swap) |  |  |
 | `to_denom_metadata` | [cosmos.bank.v1beta1.Metadata](#cosmos.bank.v1beta1.Metadata) |  |  |
 
@@ -14398,6 +14398,32 @@ GenesisState defines the fswap module's genesis state.
 
 
 
+<a name="lbm.fswap.v1.MsgMakeSwapProposal"></a>
+
+### MsgMakeSwapProposal
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `authority` | [string](#string) |  | authority is the address of the privileged account. |
+| `proposal` | [MakeSwapProposal](#lbm.fswap.v1.MakeSwapProposal) |  |  |
+
+
+
+
+
+
+<a name="lbm.fswap.v1.MsgMakeSwapProposalResponse"></a>
+
+### MsgMakeSwapProposalResponse
+
+
+
+
+
+
+
 <a name="lbm.fswap.v1.MsgSwap"></a>
 
 ### MsgSwap
@@ -14467,6 +14493,7 @@ GenesisState defines the fswap module's genesis state.
 | ----------- | ------------ | ------------- | ------------| ------- | -------- |
 | `Swap` | [MsgSwap](#lbm.fswap.v1.MsgSwap) | [MsgSwapResponse](#lbm.fswap.v1.MsgSwapResponse) |  | |
 | `SwapAll` | [MsgSwapAll](#lbm.fswap.v1.MsgSwapAll) | [MsgSwapAllResponse](#lbm.fswap.v1.MsgSwapAllResponse) |  | |
+| `MakeSwapProposal` | [MsgMakeSwapProposal](#lbm.fswap.v1.MsgMakeSwapProposal) | [MsgMakeSwapProposalResponse](#lbm.fswap.v1.MsgMakeSwapProposalResponse) |  | |
 
  <!-- end services -->
 

proto/lbm/fswap/v1/fswap.proto

@@ -26,14 +26,11 @@ message SwapStats {
   int32 swap_count = 1;
 }
 
-// From cosmos-sdk 0.46.0 they deprecated this way, but currently finschia-sdk based on 0.45.10
 message MakeSwapProposal {
   option (gogoproto.goproto_stringer) = false;
 
-  string                       title             = 1;
-  string                       description       = 2;
-  Swap                         swap              = 3 [(gogoproto.nullable) = false];
-  cosmos.bank.v1beta1.Metadata to_denom_metadata = 4
+  Swap                         swap              = 1 [(gogoproto.nullable) = false];
+  cosmos.bank.v1beta1.Metadata to_denom_metadata = 2
       [(gogoproto.moretags) = "yaml:\"denom_metadata\"", (gogoproto.nullable) = false];
 }
 

proto/lbm/fswap/v1/tx.proto

@@ -5,10 +5,12 @@ option go_package = "github.com/Finschia/finschia-sdk/x/fswap/types";
 
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
+import "lbm/fswap/v1/fswap.proto";
 
 service Msg {
   rpc Swap(MsgSwap) returns (MsgSwapResponse);
   rpc SwapAll(MsgSwapAll) returns (MsgSwapAllResponse);
+  rpc MakeSwapProposal(MsgMakeSwapProposal) returns (MsgMakeSwapProposalResponse);
 }
 
 message MsgSwap {
@@ -30,3 +32,11 @@ message MsgSwapAll {
 }
 
 message MsgSwapAllResponse {}
+
+message MsgMakeSwapProposal {
+  // authority is the address of the privileged account.
+  string   authority = 1;
+  MakeSwapProposal proposal = 2;
+}
+
+message MsgMakeSwapProposalResponse {}

simapp/app.go

@@ -76,7 +76,6 @@ import (
 	foundationkeeper "github.com/Finschia/finschia-sdk/x/foundation/keeper"
 	foundationmodule "github.com/Finschia/finschia-sdk/x/foundation/module"
 	"github.com/Finschia/finschia-sdk/x/fswap"
-	fswapclient "github.com/Finschia/finschia-sdk/x/fswap/client"
 	fswapkeeper "github.com/Finschia/finschia-sdk/x/fswap/keeper"
 	fswaptypes "github.com/Finschia/finschia-sdk/x/fswap/types"
 	"github.com/Finschia/finschia-sdk/x/genutil"
@@ -134,7 +133,6 @@ var (
 			upgradeclient.ProposalHandler,
 			upgradeclient.CancelProposalHandler,
 			foundationclient.ProposalHandler,
-			fswapclient.ProposalHandler,
 		),
 		params.AppModuleBasic{},
 		crisis.AppModuleBasic{},
@@ -344,16 +342,15 @@ func NewSimApp(
 	app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.BaseApp.MsgServiceRouter())
 
 	fswapConfig := fswaptypes.DefaultConfig()
-	app.FswapKeeper = fswapkeeper.NewKeeper(appCodec, keys[fswaptypes.StoreKey], fswapConfig, app.BankKeeper)
+	app.FswapKeeper = fswapkeeper.NewKeeper(appCodec, keys[fswaptypes.StoreKey], fswapConfig, fswaptypes.DefaultAuthority().String(), app.BankKeeper)
 
 	// register the proposal types
 	govRouter := govtypes.NewRouter()
 	govRouter.AddRoute(govtypes.RouterKey, govtypes.ProposalHandler).
 		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
 		AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
-		AddRoute(foundation.RouterKey, foundationkeeper.NewFoundationProposalsHandler(app.FoundationKeeper)).
-		AddRoute(fswaptypes.RouterKey, fswap.NewSwapHandler(app.FswapKeeper))
+		AddRoute(foundation.RouterKey, foundationkeeper.NewFoundationProposalsHandler(app.FoundationKeeper))
 
 	govKeeper := govkeeper.NewKeeper(
 		appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,

x/fswap/client/cli/tx.go

@@ -13,8 +13,6 @@ import (
 	sdkerrors "github.com/Finschia/finschia-sdk/types/errors"
 	bank "github.com/Finschia/finschia-sdk/x/bank/types"
 	"github.com/Finschia/finschia-sdk/x/fswap/types"
-	govcli "github.com/Finschia/finschia-sdk/x/gov/client/cli"
-	gov "github.com/Finschia/finschia-sdk/x/gov/types"
 )
 
 const (
@@ -36,6 +34,7 @@ func GetTxCmd() *cobra.Command {
 	cmd.AddCommand(
 		CmdTxMsgSwap(),
 		CmdTxMsgSwapAll(),
+		CmdMsgMakeSwapProposal(),
 	)
 
 	return cmd
@@ -115,21 +114,21 @@ func CmdTxMsgSwapAll() *cobra.Command {
 	return cmd
 }
 
-// NewCmdMakeSwapProposal implements a command handler for submitting a swap init proposal transaction.
-func NewCmdMakeSwapProposal() *cobra.Command {
+// CmdMsgMakeSwapProposal implements a command handler for submitting a swap init proposal transaction.
+func CmdMsgMakeSwapProposal() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "make-swap [messages-json]",
-		Args:  cobra.ExactArgs(1),
-		Short: "todo",
+		Use:   "make-swap-proposal [authority] [metadata-json]",
+		Args:  cobra.ExactArgs(2),
+		Short: "Make swap proposal",
 		Long: `
 Parameters:
-    messages-json: messages in json format that will be executed if the proposal is accepted.
+    metadata-json: messages in json format that will be executed if the proposal is accepted.
 
-Example of the content of messages-json:
+Example of the content of metadata-json:
 
 {
   "metadata": {
-    "description": "the base coin of Finschia mainnet",
+    "description": "example of to-denom is finschia cony",
     "denom_units": [
       {
         "denom": "cony",
@@ -152,19 +151,11 @@ Example of the content of messages-json:
 }
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx, err := client.GetClientTxContext(cmd)
-			if err != nil {
-				return err
-			}
-
-			from := clientCtx.GetFromAddress()
-
-			title, err := cmd.Flags().GetString(govcli.FlagTitle)
-			if err != nil {
+			if err := validateGenerateOnly(cmd); err != nil {
 				return err
 			}
 
-			description, err := cmd.Flags().GetString(govcli.FlagDescription)
+			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
@@ -178,10 +169,12 @@ Example of the content of messages-json:
 			if err != nil {
 				return err
 			}
+
 			amountCapStr, err := cmd.Flags().GetString(FlagAmountCapForToDenom)
 			if err != nil {
 				return err
 			}
+
 			amountCap, ok := sdk.NewIntFromString(amountCapStr)
 			if !ok {
 				return sdkerrors.ErrInvalidRequest.Wrapf("failed to parse %s %s", FlagAmountCapForToDenom, amountCap.String())
@@ -202,42 +195,44 @@ Example of the content of messages-json:
 				SwapRate:            swapRateDec,
 			}
 
-			toDenomMetadata, err := parseToDenomMetadata(args[0])
-			if err != nil {
-				return err
-			}
-
-			content := types.NewMakeSwapProposal(title, description, swap, toDenomMetadata)
-
-			depositStr, err := cmd.Flags().GetString(govcli.FlagDeposit)
-			if err != nil {
-				return err
-			}
-			deposit, err := sdk.ParseCoinsNormalized(depositStr)
+			authority := args[0]
+			toDenomMetadata, err := parseToDenomMetadata(args[1])
 			if err != nil {
 				return err
 			}
 
-			msg, err := gov.NewMsgSubmitProposal(content, deposit, from)
-			if err != nil {
-				return err
+			msg := types.MsgMakeSwapProposal{
+				Authority: authority,
+				Proposal: &types.MakeSwapProposalTmp{
+					Swap:            swap,
+					ToDenomMetadata: toDenomMetadata,
+				},
 			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
 		},
 	}
 
-	cmd.Flags().String(govcli.FlagTitle, "", "title of proposal")
-	cmd.Flags().String(govcli.FlagDescription, "", "description of proposal")
-	cmd.Flags().String(govcli.FlagDeposit, "", "deposit of proposal")
 	cmd.Flags().String(FlagFromDenom, "", "cony")
 	cmd.Flags().String(FlagToDenom, "", "PDT")
 	cmd.Flags().String(FlagAmountCapForToDenom, "0", "tbd")
 	cmd.Flags().String(FlagSwapRate, "0", "tbd")
 
+	flags.AddTxFlagsToCmd(cmd)
 	return cmd
 }
 
+func validateGenerateOnly(cmd *cobra.Command) error {
+	generateOnly, err := cmd.Flags().GetBool(flags.FlagGenerateOnly)
+	if err != nil {
+		return err
+	}
+	if !generateOnly {
+		return fmt.Errorf("you must use it with the flag --%s", flags.FlagGenerateOnly)
+	}
+	return nil
+}
+
 func parseToDenomMetadata(jsonDenomMetadata string) (bank.Metadata, error) {
 	type toDenomMeta struct {
 		Metadata bank.Metadata `json:"metadata"`

x/fswap/codec/codec.go

@@ -1,18 +1 @@
 package codec
-
-import (
-	"github.com/Finschia/finschia-sdk/codec"
-	cryptocodec "github.com/Finschia/finschia-sdk/crypto/codec"
-	sdk "github.com/Finschia/finschia-sdk/types"
-)
-
-var (
-	Amino     = codec.NewLegacyAmino()
-	ModuleCdc = codec.NewAminoCodec(Amino)
-)
-
-func init() {
-	cryptocodec.RegisterCrypto(Amino)
-	codec.RegisterEvidences(Amino)
-	sdk.RegisterLegacyAminoCodec(Amino)
-}

x/fswap/keeper/keeper.go

@@ -9,23 +9,33 @@
 	"github.com/Finschia/finschia-sdk/store/prefix"
 	storetypes "github.com/Finschia/finschia-sdk/store/types"
 	sdk "github.com/Finschia/finschia-sdk/types"
+	sdkerrors "github.com/Finschia/finschia-sdk/types/errors"
 	"github.com/Finschia/finschia-sdk/x/fswap/types"
 )
 
 type Keeper struct {
-	cdc      codec.BinaryCodec
-	storeKey storetypes.StoreKey
-
-	config types.Config
-
+	cdc       codec.BinaryCodec
+	storeKey  storetypes.StoreKey
+	config    types.Config
+	authority string
 	BankKeeper
 }
 
-func NewKeeper(cdc codec.BinaryCodec, storeKey storetypes.StoreKey, config types.Config, bk BankKeeper) Keeper {
+func NewKeeper(cdc codec.BinaryCodec, storeKey storetypes.StoreKey, config types.Config, authority string, bk BankKeeper) Keeper {
+	if _, err := sdk.AccAddressFromBech32(authority); err != nil {
+		panic("authority is not a valid acc address")
+	}
+
+	// authority is x/foundation module account for now.
+	if authority != types.DefaultAuthority().String() {
+		panic("x/foundation authority must be the module account")
+	}
+
 	return Keeper{
 		cdc,
 		storeKey,
 		config,
+		authority,
 		bk,
 	}
 }
@@ -201,3 +211,11 @@
 	store.Set(swapStatsKey, bz)
 	return nil
 }
+
+func (k Keeper) validateAuthority(authority string) error {
+	if authority != k.authority {
+		return sdkerrors.ErrUnauthorized.Wrapf("invalid authority; expected %s, got %s", k.authority, authority)
+	}
+
+	return nil
+}