refactor: update x/foundation params

CHANGELOG.md

@@ -79,6 +79,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/auth,bank,foundation,wasm) [\#691](https://github.com/line/lbm-sdk/pull/691) change AccAddressFromBech32 to MustAccAddressFromBech32
 * (x/wasm) [\#690](https://github.com/line/lbm-sdk/pull/690) fix to prevent accepting file name
 * (cli) [\#708](https://github.com/line/lbm-sdk/pull/708) In CLI, allow 1 SIGN_MODE_DIRECT signer in transactions with multiple signers.
+* (x/foundation) [\#704](https://github.com/line/lbm-sdk/pull/704) update x/foundation params
 
 ### Bug Fixes
 * (x/wasm) [\#453](https://github.com/line/lbm-sdk/pull/453) modify wasm grpc query api path

baseapp/block_gas_test.go

@@ -101,7 +101,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
 			txBuilder.SetFeeAmount(feeAmount)
 			txBuilder.SetGasLimit(txtypes.MaxGasWanted) // tx validation checks that gasLimit can't be bigger than this
 
-			privs, accNums, accSeqs := []cryptotypes.PrivKey{priv1}, []uint64{8}, []uint64{0}
+			privs, accNums, accSeqs := []cryptotypes.PrivKey{priv1}, []uint64{7}, []uint64{0}
 			_, txBytes, err := createTestTx(encCfg.TxConfig, txBuilder, privs, accNums, accSeqs, ctx.ChainID())
 			require.NoError(t, err)
 

client/docs/swagger-ui/swagger.yaml

@@ -34882,11 +34882,12 @@ paths:
               params:
                 type: object
                 properties:
-                  enabled:
-                    type: boolean
-                    format: boolean
                   foundation_tax:
                     type: string
+                  censored_msg_type_urls:
+                    type: array
+                    items:
+                      type: string
                 description: Params defines the parameters for the foundation module.
             description: >-
               QueryParamsResponse is the response type for the Query/Params RPC
@@ -68588,11 +68589,12 @@ definitions:
   lbm.foundation.v1.Params:
     type: object
     properties:
-      enabled:
-        type: boolean
-        format: boolean
       foundation_tax:
         type: string
+      censored_msg_type_urls:
+        type: array
+        items:
+          type: string
     description: Params defines the parameters for the foundation module.
   lbm.foundation.v1.Proposal:
     type: object
@@ -69248,11 +69250,12 @@ definitions:
       params:
         type: object
         properties:
-          enabled:
-            type: boolean
-            format: boolean
           foundation_tax:
             type: string
+          censored_msg_type_urls:
+            type: array
+            items:
+              type: string
         description: Params defines the parameters for the foundation module.
     description: QueryParamsResponse is the response type for the Query/Params RPC method.
   lbm.foundation.v1.QueryProposalResponse:

docs/core/proto-docs.md

@@ -1107,6 +1107,7 @@
     - [FoundationInfo](#lbm.foundation.v1.FoundationInfo)
     - [Member](#lbm.foundation.v1.Member)
     - [MemberRequest](#lbm.foundation.v1.MemberRequest)
+    - [OutsourcingDecisionPolicy](#lbm.foundation.v1.OutsourcingDecisionPolicy)
     - [Params](#lbm.foundation.v1.Params)
     - [PercentageDecisionPolicy](#lbm.foundation.v1.PercentageDecisionPolicy)
     - [Pool](#lbm.foundation.v1.Pool)
@@ -16846,6 +16847,22 @@ since this field cannot be set as part of requests.
 
 
 
+<a name="lbm.foundation.v1.OutsourcingDecisionPolicy"></a>
+
+### OutsourcingDecisionPolicy
+OutsourcingDecisionPolicy is a dummy decision policy which is set after
+the operator has been updated into x/group's group policy.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `description` | [string](#string) |  |  |
+
+
+
+
+
+
 <a name="lbm.foundation.v1.Params"></a>
 
 ### Params
@@ -16854,8 +16871,8 @@ Params defines the parameters for the foundation module.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `enabled` | [bool](#bool) |  |  |
 | `foundation_tax` | [string](#string) |  |  |
+| `censored_msg_type_urls` | [string](#string) | repeated |  |
 
 
 
@@ -16974,7 +16991,9 @@ UpdateFoundationParamsProposal details a proposal to update params of foundation
 | ----- | ---- | ----- | ----------- |
 | `title` | [string](#string) |  |  |
 | `description` | [string](#string) |  |  |
-| `params` | [Params](#lbm.foundation.v1.Params) |  |  |
+| `params` | [Params](#lbm.foundation.v1.Params) |  | params defines the x/foundation parameters to update.
+
+Note: All parameters must be supplied. |
 
 
 

proto/lbm/foundation/v1/event.proto

@@ -13,7 +13,7 @@ import "lbm/foundation/v1/foundation.proto";
 
 // EventUpdateFoundationParams is emitted after updating foundation parameters.
 message EventUpdateFoundationParams {
-  Params params = 1;
+  Params params = 1 [(gogoproto.nullable) = false];
 }
 
 // EventFundTreasury is an event emitted when one funds the treasury.

proto/lbm/foundation/v1/foundation.proto

@@ -13,9 +13,9 @@ import "cosmos_proto/cosmos.proto";
 
 // Params defines the parameters for the foundation module.
 message Params {
-  bool   enabled        = 1;
-  string foundation_tax = 2
+  string foundation_tax = 1
       [(gogoproto.customtype) = "github.com/line/lbm-sdk/types.Dec", (gogoproto.nullable) = false];
+  repeated string censored_msg_type_urls = 2;
 }
 
 // UpdateFoundationParamsProposal details a proposal to update params of foundation module.
@@ -26,7 +26,11 @@ message UpdateFoundationParamsProposal {
 
   string title       = 1;
   string description = 2;
-  Params params      = 3;
+
+  // params defines the x/foundation parameters to update.
+  //
+  // Note: All parameters must be supplied.
+  Params params = 3 [(gogoproto.nullable) = false];
 }
 
 // Member represents a foundation member with an account address and metadata.
@@ -107,6 +111,14 @@ message DecisionPolicyWindows {
   google.protobuf.Duration min_execution_period = 2 [(gogoproto.stdduration) = true, (gogoproto.nullable) = false];
 }
 
+// OutsourcingDecisionPolicy is a dummy decision policy which is set after
+// the operator has been updated into x/group's group policy.
+message OutsourcingDecisionPolicy {
+  option (cosmos_proto.implements_interface) = "DecisionPolicy";
+
+  string description = 1;
+}
+
 // VoteOption enumerates the valid vote options for a given proposal.
 enum VoteOption {
   option (gogoproto.goproto_enum_prefix) = false;

proto/lbm/foundation/v1/genesis.proto

@@ -15,10 +15,10 @@ message GenesisState {
   option (gogoproto.goproto_getters) = false;
 
   // params defines the module parameters at genesis.
-  Params params = 1;
+  Params params = 1 [(gogoproto.nullable) = false];
 
   // foundation is the foundation info.
-  FoundationInfo foundation = 2;
+  FoundationInfo foundation = 2 [(gogoproto.nullable) = false];
 
   // members is the list of the foundation members.
   repeated Member members = 3 [(gogoproto.nullable) = false];

proto/lbm/foundation/v1/query.proto

@@ -76,7 +76,7 @@ message QueryParamsRequest {}
 
 // QueryParamsResponse is the response type for the Query/Params RPC method.
 message QueryParamsResponse {
-  Params params = 1;
+  Params params = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryTreasuryRequest is the request type for the

simapp/app.go

@@ -181,7 +181,7 @@ var (
 		authtypes.FeeCollectorName:     nil,
 		distrtypes.ModuleName:          nil,
 		foundation.TreasuryName:        nil,
-		foundation.AdministratorName:   nil,
+		foundation.DefaultOperatorName: nil,
 		minttypes.ModuleName:           {authtypes.Minter},
 		stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
 		stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
@@ -377,7 +377,7 @@ func NewSimApp(
 	app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp)
 
 	foundationConfig := foundation.DefaultConfig()
-	app.FoundationKeeper = foundationkeeper.NewKeeper(appCodec, keys[foundation.StoreKey], app.BaseApp.MsgServiceRouter(), app.AccountKeeper, app.BankKeeper, stakingKeeper, authtypes.FeeCollectorName, foundationConfig)
+	app.FoundationKeeper = foundationkeeper.NewKeeper(appCodec, keys[foundation.StoreKey], app.BaseApp.MsgServiceRouter(), app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName, foundationConfig)
 
 	classKeeper := classkeeper.NewKeeper(appCodec, keys[class.StoreKey])
 	app.TokenKeeper = tokenkeeper.NewKeeper(appCodec, keys[token.StoreKey], app.AccountKeeper, classKeeper)
@@ -520,7 +520,7 @@ func NewSimApp(
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper),
 		crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
-		foundationmodule.NewAppModule(appCodec, app.FoundationKeeper, app.StakingKeeper),
+		foundationmodule.NewAppModule(appCodec, app.FoundationKeeper),
 		gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
 		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
 		slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),

x/auth/ante/ante_test.go

@@ -480,7 +480,7 @@ func (suite *AnteTestSuite) TestAnteHandlerFees() {
 		{
 			"signer as enough funds, should pass",
 			func() {
-				accNums = []uint64{8}
+				accNums = []uint64{7}
 				modAcc := suite.app.AccountKeeper.GetModuleAccount(suite.ctx, types.FeeCollectorName)
 
 				suite.Require().True(suite.app.BankKeeper.GetAllBalances(suite.ctx, modAcc.GetAddress()).Empty())

x/foundation/client/cli/tx.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -13,21 +12,26 @@ import (
 	"github.com/line/lbm-sdk/client/tx"
 	"github.com/line/lbm-sdk/codec"
 	sdk "github.com/line/lbm-sdk/types"
-	"github.com/line/lbm-sdk/version"
 	"github.com/line/lbm-sdk/x/foundation"
 	"github.com/line/lbm-sdk/x/gov/client/cli"
 	govtypes "github.com/line/lbm-sdk/x/gov/types"
 )
 
 // Proposal flags
 const (
-	FlagAllowedValidatorAdd    = "add"
-	FlagAllowedValidatorDelete = "delete"
-
 	FlagExec = "exec"
 	ExecTry  = "try"
 )
 
+func parseParams(codec codec.Codec, paramsJSON string) (*foundation.Params, error) {
+	var params foundation.Params
+	if err := codec.UnmarshalJSON([]byte(paramsJSON), &params); err != nil {
+		return nil, err
+	}
+
+	return &params, nil
+}
+
 func parseMemberRequests(codec codec.Codec, membersJSON string) ([]foundation.MemberRequest, error) {
 	var cliMembers []json.RawMessage
 	if err := json.Unmarshal([]byte(membersJSON), &cliMembers); err != nil {
@@ -145,19 +149,21 @@ func NewTxCmd() *cobra.Command {
 // NewProposalCmdUpdateFoundationParams implements the command to submit an update-foundation-params proposal
 func NewProposalCmdUpdateFoundationParams() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "update-foundation-params",
-		Args:  cobra.NoArgs,
+		Use:   "update-foundation-params [params-json]",
+		Args:  cobra.ExactArgs(1),
 		Short: "Submit an update foundation params proposal",
-		Long: strings.TrimSpace(
-			fmt.Sprintf(`Submit an update foundation params proposal.
-For now, you have no other options, so we make the corresponding params json file for you.
+		Long: `Submit an update foundation params proposal.
 
-Example:
-$ %s tx gov submit-proposal update-foundation-params [flags]
+Example of the content of params-json:
+
+{
+  "foundation_tax": "0.1",
+  "censored_msg_type_urls": [
+    "/cosmos.staking.v1beta1.MsgCreateValidator",
+    "/lbm.foundation.v1.MsgWithdrawFromTreasury"
+  ]
+}
 `,
-				version.AppName,
-			),
-		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
@@ -185,10 +191,12 @@ $ %s tx gov submit-proposal update-foundation-params [flags]
 				return err
 			}
 
-			params := &foundation.Params{
-				Enabled: false,
+			params, err := parseParams(clientCtx.Codec, args[0])
+			if err != nil {
+				return err
 			}
-			content := foundation.NewUpdateFoundationParamsProposal(title, description, params)
+
+			content := foundation.NewUpdateFoundationParamsProposal(title, description, *params)
 			msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from)
 			if err != nil {
 				return err

x/foundation/client/testutil/grpc.go

@@ -9,6 +9,7 @@ import (
 
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/x/foundation"
+	stakingtypes "github.com/line/lbm-sdk/x/staking/types"
 )
 
 func (s *IntegrationTestSuite) TestGRPCParams() {
@@ -27,9 +28,12 @@ func (s *IntegrationTestSuite) TestGRPCParams() {
 			false,
 			&foundation.QueryParamsResponse{},
 			&foundation.QueryParamsResponse{
-				Params: &foundation.Params{
-					Enabled:       true,
+				Params: foundation.Params{
 					FoundationTax: sdk.MustNewDecFromStr("0.2"),
+					CensoredMsgTypeUrls: []string{
+						sdk.MsgTypeURL((*stakingtypes.MsgCreateValidator)(nil)),
+						sdk.MsgTypeURL((*foundation.MsgWithdrawFromTreasury)(nil)),
+					},
 				},
 			},
 		},