refactor: revisit foundation operator (#744)

* Use more abstracted field name instead of operator

* Update the field names in the logic

* Remove operator field from FoundationInfo

* Remove operator from the state

* Update x/foundation/README.md

* Update CHANGELOG.md

* Lint

* Increase coverage

* Lint

* Mind consistency

* Chore

CHANGELOG.md

@@ -86,6 +86,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/wasm)  [\#695](https://github.com/line/lbm-sdk/pull/695) fix to prevent external filesystem dependency of simulation
 * (x/foundation) [\#729](https://github.com/line/lbm-sdk/pull/729) add UpdateParams to x/foundation
 * (amino) [\#736](https://github.com/line/lbm-sdk/pull/736) apply the missing amino codec registratoin of cosmos-sdk
+* (x/foundation) [\#744](https://github.com/line/lbm-sdk/pull/744) revisit foundation operator
 
 ### Bug Fixes
 * (x/wasm) [\#453](https://github.com/line/lbm-sdk/pull/453) modify wasm grpc query api path

client/docs/swagger-ui/swagger.yaml

@@ -33584,11 +33584,6 @@ paths:
                 description: info is the FoundationInfo for the foundation.
                 type: object
                 properties:
-                  operator:
-                    type: string
-                    description: >-
-                      operator is the account address of the foundation's
-                      operator.
                   version:
                     type: string
                     format: uint64
@@ -68691,9 +68686,6 @@ definitions:
   lbm.foundation.v1.FoundationInfo:
     type: object
     properties:
-      operator:
-        type: string
-        description: operator is the account address of the foundation's operator.
       version:
         type: string
         format: uint64
@@ -69116,9 +69108,6 @@ definitions:
         description: info is the FoundationInfo for the foundation.
         type: object
         properties:
-          operator:
-            type: string
-            description: operator is the account address of the foundation's operator.
           version:
             type: string
             format: uint64

docs/core/proto-docs.md

@@ -16807,7 +16807,6 @@ FoundationInfo represents the high-level on-chain information for the foundation
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `operator` | [string](#string) |  | operator is the account address of the foundation's operator. |
 | `version` | [uint64](#uint64) |  | version is used to track changes to the foundation's membership structure that would break existing proposals. Whenever any member is added or removed, this version is incremented and will cause proposals based on older versions of the foundation to fail |
 | `total_weight` | [string](#string) |  | total_weight is the number of the foundation members. |
 | `decision_policy` | [google.protobuf.Any](#google.protobuf.Any) |  | decision_policy specifies the foundation's decision policy. |
@@ -16857,7 +16856,7 @@ since this field cannot be set as part of requests.
 
 ### OutsourcingDecisionPolicy
 OutsourcingDecisionPolicy is a dummy decision policy which is set after
-the operator has been updated into x/group's group policy.
+the proposal feature has been outsourced to x/group.
 
 
 | Field | Type | Label | Description |
@@ -17242,7 +17241,7 @@ EventVote is an event emitted when a voter votes on a proposal.
 <a name="lbm.foundation.v1.EventWithdrawFromTreasury"></a>
 
 ### EventWithdrawFromTreasury
-EventWithdrawFromTreasury is an event emitted when the operator withdraws coins from the treasury.
+EventWithdrawFromTreasury is an event emitted when coins are withdrawn from the treasury.
 
 
 | Field | Type | Label | Description |
@@ -17788,7 +17787,7 @@ MsgGovMint is the Msg/GovMint request type.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `operator` | [string](#string) |  |  |
+| `authority` | [string](#string) |  | authority is the address of the privileged account. |
 | `amount` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated |  |
 
 
@@ -17815,7 +17814,7 @@ on behalf of the foundation.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `operator` | [string](#string) |  |  |
+| `authority` | [string](#string) |  | authority is the address of the privileged account. |
 | `grantee` | [string](#string) |  |  |
 | `authorization` | [google.protobuf.Any](#google.protobuf.Any) |  |  |
 
@@ -17867,7 +17866,7 @@ MsgRevoke is the Msg/Revoke request type.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `operator` | [string](#string) |  |  |
+| `authority` | [string](#string) |  | authority is the address of the privileged account. |
 | `grantee` | [string](#string) |  |  |
 | `msg_type_url` | [string](#string) |  |  |
 
@@ -17927,7 +17926,7 @@ MsgUpdateDecisionPolicy is the Msg/UpdateDecisionPolicy request type.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `operator` | [string](#string) |  | operator is the account address of the foundation operator. |
+| `authority` | [string](#string) |  | authority is the address of the privileged account. |
 | `decision_policy` | [google.protobuf.Any](#google.protobuf.Any) |  | decision_policy is the updated decision policy. |
 
 
@@ -17953,7 +17952,7 @@ MsgUpdateMembers is the Msg/UpdateMembers request type.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `operator` | [string](#string) |  | operator is the account address of the foundation operator. |
+| `authority` | [string](#string) |  | authority is the address of the privileged account. |
 | `member_updates` | [MemberRequest](#lbm.foundation.v1.MemberRequest) | repeated | member_updates is the list of members to update, set remove to true to remove a member. |
 
 
@@ -17979,7 +17978,7 @@ MsgUpdateParams is the Msg/UpdateParams request type.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `authority` | [string](#string) |  | authority is the address of the operator account. |
+| `authority` | [string](#string) |  | authority is the address of the privileged account. |
 | `params` | [Params](#lbm.foundation.v1.Params) |  | params defines the x/foundation parameters to update.
 
 NOTE: All parameters must be supplied. |
@@ -18036,7 +18035,7 @@ MsgWithdrawFromTreasury is the Msg/WithdrawFromTreasury request type.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `operator` | [string](#string) |  |  |
+| `authority` | [string](#string) |  | authority is the address of the privileged account. |
 | `to` | [string](#string) |  |  |
 | `amount` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated |  |
 

proto/lbm/foundation/v1/event.proto

@@ -23,7 +23,7 @@ message EventFundTreasury {
       [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/line/lbm-sdk/types.Coins"];
 }
 
-// EventWithdrawFromTreasury is an event emitted when the operator withdraws coins from the treasury.
+// EventWithdrawFromTreasury is an event emitted when coins are withdrawn from the treasury.
 message EventWithdrawFromTreasury {
   string   to                              = 1;
   repeated cosmos.base.v1beta1.Coin amount = 2

proto/lbm/foundation/v1/foundation.proto

@@ -97,7 +97,7 @@ message DecisionPolicyWindows {
 }
 
 // OutsourcingDecisionPolicy is a dummy decision policy which is set after
-// the operator has been updated into x/group's group policy.
+// the proposal feature has been outsourced to x/group.
 message OutsourcingDecisionPolicy {
   option (cosmos_proto.implements_interface) = "DecisionPolicy";
 
@@ -124,20 +124,17 @@ enum VoteOption {
 message FoundationInfo {
   option (gogoproto.goproto_getters) = false;
 
-  // operator is the account address of the foundation's operator.
-  string operator = 1;
-
   // version is used to track changes to the foundation's membership structure that
   // would break existing proposals. Whenever any member is added or removed,
   // this version is incremented and will cause proposals based on older versions
   // of the foundation to fail
-  uint64 version = 2;
+  uint64 version = 1;
 
   // total_weight is the number of the foundation members.
-  string total_weight = 3 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/line/lbm-sdk/types.Dec"];
+  string total_weight = 2 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/line/lbm-sdk/types.Dec"];
 
   // decision_policy specifies the foundation's decision policy.
-  google.protobuf.Any decision_policy = 4 [(cosmos_proto.accepts_interface) = "DecisionPolicy"];
+  google.protobuf.Any decision_policy = 3 [(cosmos_proto.accepts_interface) = "DecisionPolicy"];
 }
 
 // Proposal defines a foundation proposal. Any member of the foundation can submit a proposal

proto/lbm/foundation/v1/tx.proto

@@ -61,7 +61,7 @@ service Msg {
 
 // MsgUpdateParams is the Msg/UpdateParams request type.
 message MsgUpdateParams {
-  // authority is the address of the operator account.
+  // authority is the address of the privileged account.
   string authority = 1;
 
   // params defines the x/foundation parameters to update.
@@ -85,7 +85,8 @@ message MsgFundTreasuryResponse {}
 
 // MsgWithdrawFromTreasury is the Msg/WithdrawFromTreasury request type.
 message MsgWithdrawFromTreasury {
-  string   operator                        = 1;
+  // authority is the address of the privileged account.
+  string   authority                       = 1;
   string   to                              = 2;
   repeated cosmos.base.v1beta1.Coin amount = 3
       [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/line/lbm-sdk/types.Coins"];
@@ -96,8 +97,8 @@ message MsgWithdrawFromTreasuryResponse {}
 
 // MsgUpdateMembers is the Msg/UpdateMembers request type.
 message MsgUpdateMembers {
-  // operator is the account address of the foundation operator.
-  string operator = 1;
+  // authority is the address of the privileged account.
+  string authority = 1;
 
   // member_updates is the list of members to update,
   // set remove to true to remove a member.
@@ -109,8 +110,8 @@ message MsgUpdateMembersResponse {}
 
 // MsgUpdateDecisionPolicy is the Msg/UpdateDecisionPolicy request type.
 message MsgUpdateDecisionPolicy {
-  // operator is the account address of the foundation operator.
-  string operator = 1;
+  // authority is the address of the privileged account.
+  string authority = 1;
 
   // decision_policy is the updated decision policy.
   google.protobuf.Any decision_policy = 2 [(cosmos_proto.accepts_interface) = "DecisionPolicy"];
@@ -214,8 +215,9 @@ message MsgLeaveFoundationResponse {}
 // MsgGrant is the Msg/Grant request type.
 // on behalf of the foundation.
 message MsgGrant {
-  string operator = 1;
-  string grantee  = 2;
+  // authority is the address of the privileged account.
+  string authority = 1;
+  string grantee   = 2;
 
   google.protobuf.Any authorization = 3
       [(cosmos_proto.accepts_interface) = "github.com/line/lbm-sdk/x/foundation.Authorization"];
@@ -226,7 +228,8 @@ message MsgGrantResponse {}
 
 // MsgRevoke is the Msg/Revoke request type.
 message MsgRevoke {
-  string operator     = 1;
+  // authority is the address of the privileged account.
+  string authority    = 1;
   string grantee      = 2;
   string msg_type_url = 3;
 }
@@ -236,7 +239,8 @@ message MsgRevokeResponse {}
 
 // MsgGovMint is the Msg/GovMint request type.
 message MsgGovMint {
-  string   operator                        = 1;
+  // authority is the address of the privileged account.
+  string   authority                       = 1;
   repeated cosmos.base.v1beta1.Coin amount = 2
       [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/line/lbm-sdk/types.Coins"];
 }

simapp/app.go

@@ -178,8 +178,8 @@ var (
 	maccPerms = map[string][]string{
 		authtypes.FeeCollectorName:     nil,
 		distrtypes.ModuleName:          nil,
+		foundation.ModuleName:          nil,
 		foundation.TreasuryName:        nil,
-		foundation.DefaultOperatorName: nil,
 		foundation.GovMinterName:       {authtypes.Minter},
 		minttypes.ModuleName:           {authtypes.Minter},
 		stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
@@ -376,7 +376,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, authtypes.FeeCollectorName, foundationConfig)
+	app.FoundationKeeper = foundationkeeper.NewKeeper(appCodec, keys[foundation.StoreKey], app.BaseApp.MsgServiceRouter(), app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName, foundationConfig, foundation.DefaultAuthority().String())
 
 	classKeeper := classkeeper.NewKeeper(appCodec, keys[class.StoreKey])
 	app.TokenKeeper = tokenkeeper.NewKeeper(appCodec, keys[token.StoreKey], app.AccountKeeper, classKeeper)