feat: add MsgUpdateCensorship msg and Censorship query of x/foundation API

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - [\#98](https://github.com/Finschia/finschia-js/pull/98) bumpup cosmjs to 0.31.0
+- [\#105](https://github.com/Finschia/finschia-js/pull/105) add `MsgUpdateCensorship` msg and `Censorship` query apis of x/foundation
 
 ### Changed
 

package.json

@@ -40,7 +40,7 @@
     "@cosmjs/encoding": "^0.31.0",
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
-    "@finschia/finschia": "0.9.0-rc2",
+    "@finschia/finschia": "0.9.0",
     "eslint": "^7.5",
     "karma-chrome-launcher": "^3.1.0",
     "karma-jasmine": "^4.0.1",

packages/finschia/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finschia/finschia",
-  "version": "0.9.0-rc2",
+  "version": "0.9.0",
   "description": "Utilities for FINSCHIA v2.0.0",
   "contributors": [
     "zemyblue <zemyblue@users.noreply.github.com>",
@@ -47,7 +47,7 @@
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
     "@cosmjs/utils": "^0.31.0",
-    "@finschia/finschia-proto": "^2.0.0-rc5",
+    "@finschia/finschia-proto": "^2.0.0",
     "cosmjs-types": "^0.8.0",
     "long": "^4.0.0",
     "pako": "^2.0.2",

packages/finschia/src/index.ts

@@ -55,6 +55,7 @@ export {
   createMsgGrant,
   createMsgRevoke,
   createMsgSubmitProposal,
+  createMsgUpdateCensorship,
   createMsgUpdateDecisionPolicy,
   createMsgUpdateMembers,
   createMsgWithdrawFromTreasury,
@@ -69,6 +70,7 @@ export {
   isMsgLeaveFoundationEncodeObject,
   isMsgRevokeEncodeObject,
   isMsgSubmitProposalEncodeObject,
+  isMsgUpdateCensorshipEncodeObject,
   isMsgUpdateDecisionPolicyEncodeObject,
   isMsgUpdateMembersEncodeObject,
   isMsgVoteEncodeObject,
@@ -82,6 +84,7 @@ export {
   MsgLeaveFoundationEncodeObject,
   MsgRevokeEncodeObject,
   MsgSubmitProposalEncodeObject,
+  MsgUpdateCensorshipEncodeObject,
   MsgUpdateDecisionPolicyEncodeObject,
   MsgUpdateMembersEncodeObject,
   MsgVoteEncodeObject,

packages/finschia/src/modules/collection/queries.ts

@@ -1,8 +1,8 @@
 import { createProtobufRpcClient, QueryClient } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
-import { Any } from "cosmjs-types/google/protobuf/any";
 import { Coin, Contract, Grant, NFT, TokenType } from "@finschia/finschia-proto/lbm/collection/v1/collection";
 import { QueryClientImpl } from "@finschia/finschia-proto/lbm/collection/v1/query";
+import { Any } from "cosmjs-types/google/protobuf/any";
 
 export interface CollectionExtension {
   readonly collection: {

packages/finschia/src/modules/feegrant/queries.ts

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { createPagination, createProtobufRpcClient, QueryClient } from "@cosmjs/stargate";
-import { QueryAllowanceResponse, QueryAllowancesResponse } from "cosmjs-types/cosmos/feegrant/v1beta1/query";
 import {
   QueryAllowancesByGranterResponse,
   QueryClientImpl,
 } from "@finschia/finschia-proto/cosmos/feegrant/v1beta1/query";
+import { QueryAllowanceResponse, QueryAllowancesResponse } from "cosmjs-types/cosmos/feegrant/v1beta1/query";
 
 export interface FeeGrantExtension {
   readonly feegrant: {

packages/finschia/src/modules/foundation/aminomessages.spec.ts

@@ -5,6 +5,7 @@ import { AminoTypes, assertIsDeliverTxSuccess, coins, logs } from "@cosmjs/starg
 import { sleep } from "@cosmjs/utils";
 import { ReceiveFromTreasuryAuthorization } from "@finschia/finschia-proto/lbm/foundation/v1/authz";
 import {
+  CensorshipAuthority,
   PercentageDecisionPolicy,
   ThresholdDecisionPolicy,
   VoteOption,
@@ -16,6 +17,7 @@ import {
   MsgGrant,
   MsgLeaveFoundation,
   MsgRevoke,
+  MsgUpdateCensorship,
   MsgUpdateDecisionPolicy,
   MsgUpdateMembers,
   MsgVote,
@@ -45,6 +47,7 @@ import {
   AminoMsgLeaveFoundation,
   AminoMsgRevoke,
   AminoMsgSubmitProposal,
+  AminoMsgUpdateCensorship,
   AminoMsgUpdateDecisionPolicy,
   AminoMsgUpdateMembers,
   AminoMsgVote,
@@ -56,8 +59,13 @@ import {
 } from "./aminomessages";
 import {
   createMsgGrant,
+  createMsgSubmitProposal,
+  createMsgUpdateCensorship,
   createMsgUpdateDecisionPolicy,
+  createMsgWithdrawFromTreasury,
   createPercentageDecisionPolicy,
+  createThresholdDecisionPolicy,
+  foundationTypes,
   MsgExecEncodeObject,
   MsgGrantEncodeObject,
   MsgLeaveFoundationEncodeObject,
@@ -66,12 +74,6 @@ import {
   MsgWithdrawFromTreasuryEncodeObject,
   MsgWithdrawProposalEncodeObject,
 } from "./messages";
-import {
-  createMsgSubmitProposal,
-  createMsgWithdrawFromTreasury,
-  createThresholdDecisionPolicy,
-  foundationTypes,
-} from "./messages";
 import { makeClientWithFoundation } from "./queries.spec";
 
 describe("Amino sign", () => {
@@ -315,6 +317,28 @@ describe("Amino sign", () => {
     assertIsDeliverTxSuccess(result);
   });
 
+  it("MsgUpdateCensorship", async () => {
+    pendingWithoutSimapp();
+    const wallet = await Secp256k1HdWallet.fromMnemonic(faucet.mnemonic, {
+      hdPaths: [makeLinkPath(0)],
+      prefix: simapp.prefix,
+    });
+    const signingFinschiaClient2 = await SigningFinschiaClient.connectWithSigner(
+      simapp.tendermintUrl,
+      wallet,
+      defaultSigningClientOptions,
+    );
+
+    const foundationModuleAddr = "link190vt0vxc8c8vj24a7mm3fjsenfu8f5yxxj76cp";
+    const msgUpdateCensorship = createMsgUpdateCensorship(foundationModuleAddr, {
+      msgTypeUrl: "/lbm.foundation.v1.MsgWithdrawFromTreasury",
+      authority: CensorshipAuthority.CENSORSHIP_AUTHORITY_GOVERNANCE,
+    });
+    const msg1 = createMsgSubmitProposal([faucet.address0], [msgUpdateCensorship]);
+    const result1 = await signingFinschiaClient2.signAndBroadcast(faucet.address0, [msg1], defaultFee);
+    assertIsDeliverTxSuccess(result1);
+  });
+
   it("MsgUpdateDecisionPolicy ThresholdDecisionPolicy", async () => {
     pendingWithoutSimapp();
     const wallet = await Secp256k1HdWallet.fromMnemonic(faucet.mnemonic, {
@@ -643,6 +667,32 @@ describe("AminoTypes", () => {
       expect(aminoMsg).toEqual(expected);
     });
 
+    it("MsgUpdateCensorship", () => {
+      const msg: MsgUpdateCensorship = {
+        authority: faucet.address0,
+        censorship: {
+          msgTypeUrl: "/lbm.foundation.v1.MsgWithdrawFromTreasury",
+          authority: CensorshipAuthority.CENSORSHIP_AUTHORITY_GOVERNANCE,
+        },
+      };
+      const aminoTypes = new AminoTypes(createFoundationAminoConverters());
+      const aminoMsg = aminoTypes.toAmino({
+        typeUrl: "/lbm.foundation.v1.MsgUpdateCensorship",
+        value: msg,
+      });
+      const expected: AminoMsgUpdateCensorship = {
+        type: "lbm-sdk/MsgUpdateCensorship",
+        value: {
+          authority: faucet.address0,
+          censorship: {
+            msg_type_url: "/lbm.foundation.v1.MsgWithdrawFromTreasury",
+            authority: 1,
+          },
+        },
+      };
+      expect(aminoMsg).toEqual(expected);
+    });
+
     it("MsgGrant", () => {
       const msg: MsgGrant = {
         authority: faucet.address0,
@@ -944,6 +994,32 @@ describe("AminoTypes", () => {
       });
     });
 
+    it("MsgUpdateCensorship", () => {
+      const aminoMsg: AminoMsgUpdateCensorship = {
+        type: "lbm-sdk/MsgUpdateCensorship",
+        value: {
+          authority: faucet.address0,
+          censorship: {
+            msg_type_url: "/lbm.foundation.v1.MsgWithdrawFromTreasury",
+            authority: 1,
+          },
+        },
+      };
+      const aminoTypes = new AminoTypes(createFoundationAminoConverters());
+      const msg = aminoTypes.fromAmino(aminoMsg);
+      const expectedValue: MsgUpdateCensorship = {
+        authority: faucet.address0,
+        censorship: {
+          msgTypeUrl: "/lbm.foundation.v1.MsgWithdrawFromTreasury",
+          authority: CensorshipAuthority.CENSORSHIP_AUTHORITY_GOVERNANCE,
+        },
+      };
+      expect(msg).toEqual({
+        typeUrl: "/lbm.foundation.v1.MsgUpdateCensorship",
+        value: expectedValue,
+      });
+    });
+
     it("MsgGrant", () => {
       const aminoMsg: AminoMsgGrant = {
         type: "lbm-sdk/MsgGrant",

packages/finschia/src/modules/foundation/aminomessages.ts

@@ -5,6 +5,7 @@ import { AminoConverter, AminoConverters, AminoTypes } from "@cosmjs/stargate";
 import { assertDefinedAndNotNull } from "@cosmjs/utils";
 import { ReceiveFromTreasuryAuthorization } from "@finschia/finschia-proto/lbm/foundation/v1/authz";
 import {
+  censorshipAuthorityFromJSON,
   PercentageDecisionPolicy,
   ThresholdDecisionPolicy,
   voteOptionFromJSON,
@@ -18,6 +19,7 @@ import {
   MsgLeaveFoundation,
   MsgRevoke,
   MsgSubmitProposal,
+  MsgUpdateCensorship,
   MsgUpdateDecisionPolicy,
   MsgUpdateMembers,
   MsgVote,
@@ -28,6 +30,7 @@ import { CreateValidatorAuthorization } from "@finschia/finschia-proto/lbm/staki
 import { Any } from "cosmjs-types/google/protobuf/any";
 import Long from "long";
 
+// eslint-disable-next-line import/no-cycle
 import { createDefaultRegistry, createDefaultTypesWithoutFoundation } from "../../types";
 import {
   jsonDecimalToProto,
@@ -46,6 +49,11 @@ interface MemberRequest {
   metadata?: string;
 }
 
+interface Censorship {
+  msg_type_url: string;
+  authority: number;
+}
+
 export interface AminoMsgFundTreasury extends AminoMsg {
   readonly type: "lbm-sdk/MsgFundTreasury";
   readonly value: {
@@ -54,7 +62,7 @@ export interface AminoMsgFundTreasury extends AminoMsg {
   };
 }
 
-export function isAminoMsgFundTreasurys(msg: AminoMsg): msg is AminoMsgFundTreasury {
+export function isAminoMsgFundTreasury(msg: AminoMsg): msg is AminoMsgFundTreasury {
   return msg.type === "lbm-sdk/MsgFundTreasury";
 }
 
@@ -191,6 +199,18 @@ export function isAminoMsgLeaveFoundation(msg: AminoMsg): msg is AminoMsgLeaveFo
   return msg.type === "lbm-sdk/MsgLeaveFoundation";
 }
 
+export interface AminoMsgUpdateCensorship extends AminoMsg {
+  readonly type: "lbm-sdk/MsgUpdateCensorship";
+  readonly value: {
+    readonly authority: string;
+    readonly censorship: Censorship;
+  };
+}
+
+export function isAminoMsgUpdateCensorship(msg: AminoMsg): msg is AminoMsgUpdateCensorship {
+  return msg.type === "lbm-sdk/MsgUpdateCensorship";
+}
+
 export interface AminoMsgGrant extends AminoMsg {
   readonly type: "lbm-sdk/MsgGrant";
   readonly value: {
@@ -493,6 +513,28 @@ export function createFoundationAminoConvertersWithoutSubmitProposal(): AminoCon
         };
       },
     },
+    "/lbm.foundation.v1.MsgUpdateCensorship": {
+      aminoType: "lbm-sdk/MsgUpdateCensorship",
+      toAmino: ({ authority, censorship }: MsgUpdateCensorship): AminoMsgUpdateCensorship["value"] => {
+        assertDefinedAndNotNull(censorship);
+        return {
+          authority: authority,
+          censorship: {
+            msg_type_url: censorship.msgTypeUrl,
+            authority: censorship.authority,
+          },
+        };
+      },
+      fromAmino: ({ authority, censorship }: AminoMsgUpdateCensorship["value"]): MsgUpdateCensorship => {
+        return {
+          authority: authority,
+          censorship: {
+            msgTypeUrl: censorship.msg_type_url,
+            authority: censorshipAuthorityFromJSON(censorship.authority),
+          },
+        };
+      },
+    },
     "/lbm.foundation.v1.MsgGrant": {
       aminoType: "lbm-sdk/MsgGrant",
       toAmino: ({ authority, grantee, authorization }: MsgGrant): AminoMsgGrant["value"] => {

packages/finschia/src/modules/foundation/messages.ts

@@ -2,6 +2,7 @@ import { Decimal } from "@cosmjs/math";
 import { EncodeObject, GeneratedType, Registry } from "@cosmjs/proto-signing";
 import { ReceiveFromTreasuryAuthorization } from "@finschia/finschia-proto/lbm/foundation/v1/authz";
 import {
+  Censorship,
   DecisionPolicyWindows,
   MemberRequest,
   PercentageDecisionPolicy,
@@ -16,6 +17,7 @@ import {
   MsgLeaveFoundation,
   MsgRevoke,
   MsgSubmitProposal,
+  MsgUpdateCensorship,
   MsgUpdateDecisionPolicy,
   MsgUpdateMembers,
   MsgVote,
@@ -37,6 +39,7 @@ export const foundationTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/lbm.foundation.v1.MsgVote", MsgVote],
   ["/lbm.foundation.v1.MsgExec", MsgExec],
   ["/lbm.foundation.v1.MsgLeaveFoundation", MsgLeaveFoundation],
+  ["/lbm.foundation.v1.MsgUpdateCensorship", MsgUpdateCensorship],
   ["/lbm.foundation.v1.MsgGrant", MsgGrant],
   ["/lbm.foundation.v1.MsgRevoke", MsgRevoke],
   ["/lbm.foundation.v1.ReceiveFromTreasuryAuthorization", ReceiveFromTreasuryAuthorization],
@@ -140,6 +143,17 @@ export function isMsgLeaveFoundationEncodeObject(
   return (object as MsgLeaveFoundationEncodeObject).typeUrl === "/lbm.foundation.v1.MsgLeaveFoundation";
 }
 
+export interface MsgUpdateCensorshipEncodeObject extends EncodeObject {
+  readonly typeUrl: "/lbm.foundation.v1.MsgUpdateCensorship";
+  readonly value: Partial<MsgUpdateCensorship>;
+}
+
+export function isMsgUpdateCensorshipEncodeObject(
+  object: EncodeObject,
+): object is MsgUpdateCensorshipEncodeObject {
+  return (object as MsgUpdateCensorshipEncodeObject).typeUrl === "/lbm.foundation.v1.MsgUpdateCensorship";
+}
+
 export interface MsgGrantEncodeObject extends EncodeObject {
   readonly typeUrl: "/lbm.foundation.v1.MsgGrant";
   readonly value: Partial<MsgGrant>;
@@ -203,6 +217,19 @@ export function createMsgSubmitProposal(
   };
 }
 
+export function createMsgUpdateCensorship(
+  authority: string,
+  censorship: Censorship,
+): MsgUpdateCensorshipEncodeObject {
+  return {
+    typeUrl: "/lbm.foundation.v1.MsgUpdateCensorship",
+    value: {
+      authority: authority,
+      censorship: censorship,
+    },
+  };
+}
+
 export function createMsgGrant(authority: string, grantee: string): MsgGrantEncodeObject {
   const registry = new Registry(foundationTypes);
   return {