enable sign in amino wasm, wasmplus store message with access type

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to
 ### Added
 - [\#69](https://github.com/line/lbmjs/pull/69) apply the changes of `x/token` and `x/collection` protos
 - [\#71](https://github.com/line/lbmjs/pull/71) @lbmjs/finschia: Add custom GetBlockWithTxs for lbm
+- [\#77](https://github.com/line/lbmjs/pull/77) @lbmjs/finschia: Enable amino sign store msgs in `wasm` and `wasmplus`
 - [\#80](https://github.com/line/lbmjs/pull/80) add MsgInstantiateContract2
 - [\#81](https://github.com/line/lbmjs/pull/81) add git PR template
 

packages/finschia/package.json

@@ -45,7 +45,7 @@
     "@cosmjs/tendermint-rpc": "^0.29.0",
     "@cosmjs/utils": "^0.29.0",
     "cosmjs-types": "^0.5.1",
-    "lbmjs-types": "^0.47.0-alpha1",
+    "lbmjs-types": "^1.0.0-rc2",
     "long": "^4.0.0",
     "pako": "^2.0.2",
     "protobufjs": "~6.10.2",

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

@@ -104,7 +104,6 @@ describe("Amino sign", () => {
           authority: authorityAddress,
           params: {
             foundationTax: Decimal.fromUserInput("0.1", 18).atomics,
-            censoredMsgTypeUrls: ["/lbm.foundation.v1.MsgWithdrawFromTreasury"],
           },
         },
       };
@@ -226,7 +225,6 @@ describe("Amino sign", () => {
         authority: authorityAddress,
         params: {
           foundationTax: Decimal.fromUserInput("0.1", 18).atomics,
-          censoredMsgTypeUrls: ["/lbm.foundation.v1.MsgWithdrawFromTreasury"],
         },
       },
     };
@@ -475,7 +473,6 @@ describe("AminoTypes", () => {
         authority: faucet.address0,
         params: {
           foundationTax: "0",
-          censoredMsgTypeUrls: ["/lbm.foundation.v1.MsgWithdrawFromTreasury"],
         },
       };
       const aminoTypes = new AminoTypes(createFoundationAminoConverters());
@@ -489,7 +486,6 @@ describe("AminoTypes", () => {
           authority: faucet.address0,
           params: {
             foundation_tax: "0.000000000000000000",
-            censored_msg_type_urls: ["/lbm.foundation.v1.MsgWithdrawFromTreasury"],
           },
         },
       };
@@ -833,7 +829,6 @@ describe("AminoTypes", () => {
           authority: faucet.address0,
           params: {
             foundation_tax: "0",
-            censored_msg_type_urls: ["/lbm.foundation.v1.MsgWithdrawFromTreasury"],
           },
         },
       };
@@ -843,7 +838,6 @@ describe("AminoTypes", () => {
         authority: faucet.address0,
         params: {
           foundationTax: "0",
-          censoredMsgTypeUrls: ["/lbm.foundation.v1.MsgWithdrawFromTreasury"],
         },
       };
       expect(msg).toEqual({

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

@@ -38,7 +38,6 @@ import {
 
 interface Params {
   foundation_tax: string;
-  censored_msg_type_urls: string[];
 }
 
 interface DecisionPolicyWindows {
@@ -292,7 +291,6 @@ export function createFoundationAminoConvertersWithoutSubmitProposal(): AminoCon
           authority: authority,
           params: {
             foundation_tax: protoDecimalToJson(params.foundationTax),
-            censored_msg_type_urls: params.censoredMsgTypeUrls,
           },
         };
       },
@@ -302,7 +300,6 @@ export function createFoundationAminoConvertersWithoutSubmitProposal(): AminoCon
           authority: authority,
           params: {
             foundationTax: jsonDecimalToProto(params.foundation_tax),
-            censoredMsgTypeUrls: params.censored_msg_type_urls,
           },
         };
       },

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

@@ -0,0 +1,112 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import { fromBase64 } from "@cosmjs/encoding";
+import { AminoTypes } from "@cosmjs/stargate";
+import { MsgStoreCode } from "lbmjs-types/cosmwasm/wasm/v1/tx";
+import { AccessType } from "lbmjs-types/cosmwasm/wasm/v1/types";
+
+import { AminoMsgStoreCode, createWasmAminoConverters } from "./aminomessages";
+
+describe("AminoTypes", () => {
+  describe("toAmino", () => {
+    it("works for MsgStoreCode", () => {
+      const msg: MsgStoreCode = {
+        sender: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+        wasmByteCode: fromBase64("WUVMTE9XIFNVQk1BUklORQ=="),
+        instantiatePermission: undefined,
+      };
+      const aminoMsg = new AminoTypes(createWasmAminoConverters()).toAmino({
+        typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode",
+        value: msg,
+      });
+      const expected: AminoMsgStoreCode = {
+        type: "wasm/MsgStoreCode",
+        value: {
+          sender: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+          wasm_byte_code: "WUVMTE9XIFNVQk1BUklORQ==",
+          instantiate_permission: undefined,
+        },
+      };
+      expect(aminoMsg).toEqual(expected);
+    });
+
+    it("works for MsgStoreCode with access type", () => {
+      const msg: MsgStoreCode = {
+        sender: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+        wasmByteCode: fromBase64("WUVMTE9XIFNVQk1BUklORQ=="),
+        instantiatePermission: {
+          permission: AccessType.ACCESS_TYPE_ONLY_ADDRESS,
+          address: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+          addresses: [],
+        },
+      };
+      const aminoMsg = new AminoTypes(createWasmAminoConverters()).toAmino({
+        typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode",
+        value: msg,
+      });
+      const expected: AminoMsgStoreCode = {
+        type: "wasm/MsgStoreCode",
+        value: {
+          sender: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+          wasm_byte_code: "WUVMTE9XIFNVQk1BUklORQ==",
+          instantiate_permission: {
+            permission: "OnlyAddress",
+            address: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+            addresses: undefined,
+          },
+        },
+      };
+      expect(aminoMsg).toEqual(expected);
+    });
+  });
+
+  describe("fromAmino", () => {
+    it("works for MsgStoreCode", () => {
+      const aminoMsg: AminoMsgStoreCode = {
+        type: "wasm/MsgStoreCode",
+        value: {
+          sender: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+          wasm_byte_code: "WUVMTE9XIFNVQk1BUklORQ==",
+        },
+      };
+      const msg = new AminoTypes(createWasmAminoConverters()).fromAmino(aminoMsg);
+      const expectedValue: MsgStoreCode = {
+        sender: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+        wasmByteCode: fromBase64("WUVMTE9XIFNVQk1BUklORQ=="),
+        instantiatePermission: undefined,
+      };
+      expect(msg).toEqual({
+        typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode",
+        value: expectedValue,
+      });
+    });
+
+    it("works for MsgStoreCode with access type", () => {
+      const aminoMsg: AminoMsgStoreCode = {
+        type: "wasm/MsgStoreCode",
+        value: {
+          sender: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+          wasm_byte_code: "WUVMTE9XIFNVQk1BUklORQ==",
+          instantiate_permission: {
+            permission: "OnlyAddress",
+            address: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+            addresses: undefined,
+          },
+        },
+      };
+      const msg = new AminoTypes(createWasmAminoConverters()).fromAmino(aminoMsg);
+      const expectedValue: MsgStoreCode = {
+        sender: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+        wasmByteCode: fromBase64("WUVMTE9XIFNVQk1BUklORQ=="),
+        instantiatePermission: {
+          permission: AccessType.ACCESS_TYPE_ONLY_ADDRESS,
+          address: "link1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+          addresses: [],
+        },
+      };
+      expect(msg).toEqual({
+        typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode",
+        value: expectedValue,
+      });
+    });
+  });
+});

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

@@ -0,0 +1,117 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import { createWasmAminoConverters as createAminoConverters } from "@cosmjs/cosmwasm-stargate";
+import { fromBase64, toBase64 } from "@cosmjs/encoding";
+import { AminoConverters } from "@cosmjs/stargate";
+import { MsgStoreCode } from "lbmjs-types/cosmwasm/wasm/v1/tx";
+import { AccessType } from "lbmjs-types/cosmwasm/wasm/v1/types";
+
+export function accessTypeFromString(str: string): AccessType {
+  switch (str) {
+    case "Unspecified":
+      return AccessType.ACCESS_TYPE_UNSPECIFIED;
+    case "Nobody":
+      return AccessType.ACCESS_TYPE_NOBODY;
+    case "OnlyAddress":
+      return AccessType.ACCESS_TYPE_ONLY_ADDRESS;
+    case "Everybody":
+      return AccessType.ACCESS_TYPE_EVERYBODY;
+    case "AnyOfAddresses":
+      return AccessType.ACCESS_TYPE_ANY_OF_ADDRESSES;
+    default:
+      return AccessType.UNRECOGNIZED;
+  }
+}
+
+export function accessTypeToString(object: any): string {
+  switch (object) {
+    case AccessType.ACCESS_TYPE_UNSPECIFIED:
+      return "Unspecified";
+    case AccessType.ACCESS_TYPE_NOBODY:
+      return "Nobody";
+    case AccessType.ACCESS_TYPE_ONLY_ADDRESS:
+      return "OnlyAddress";
+    case AccessType.ACCESS_TYPE_EVERYBODY:
+      return "Everybody";
+    case AccessType.ACCESS_TYPE_ANY_OF_ADDRESSES:
+      return "AnyOfAddresses";
+    case AccessType.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+/**
+ * @see https://github.com/CosmWasm/wasmd/blob/v0.18.0-rc1/proto/cosmwasm/wasm/v1/types.proto#L36-L41
+ */
+export interface AccessConfig {
+  /**
+   * Permission should be one kind of string 'Nobody', 'OnlyAddress', 'Everybody', 'Unspecified'
+   * @see https://github.com/CosmWasm/wasmd/blob/v0.28.0/x/wasm/types/params.go#L54
+   */
+  readonly permission: string;
+  /**
+   * Address
+   * Deprecated: replaced by addresses
+   */
+  readonly address?: string;
+  readonly addresses?: string[];
+}
+
+/**
+ * The Amino JSON representation of [MsgStoreCode].
+ *
+ * [MsgStoreCode]: https://github.com/CosmWasm/wasmd/blob/v0.18.0-rc1/proto/cosmwasm/wasm/v1/tx.proto#L28-L39
+ */
+export interface AminoMsgStoreCode {
+  type: "wasm/MsgStoreCode";
+  value: {
+    /** Bech32 account address */
+    readonly sender: string;
+    /** Base64 encoded Wasm */
+    readonly wasm_byte_code: string;
+    readonly instantiate_permission?: AccessConfig;
+  };
+}
+
+export function createWasmAminoConverters(): AminoConverters {
+  return {
+    ...createAminoConverters(),
+    "/cosmwasm.wasm.v1.MsgStoreCode": {
+      aminoType: "wasm/MsgStoreCode",
+      toAmino: ({
+        sender,
+        wasmByteCode,
+        instantiatePermission,
+      }: MsgStoreCode): AminoMsgStoreCode["value"] => ({
+        sender: sender,
+        wasm_byte_code: toBase64(wasmByteCode),
+        instantiate_permission: instantiatePermission
+          ? {
+              permission: accessTypeToString(instantiatePermission.permission),
+              address: instantiatePermission.address || undefined,
+              addresses:
+                instantiatePermission.addresses.length !== 0 ? instantiatePermission.addresses : undefined,
+            }
+          : undefined,
+      }),
+      fromAmino: ({
+        sender,
+        wasm_byte_code,
+        instantiate_permission,
+      }: AminoMsgStoreCode["value"]): MsgStoreCode => ({
+        sender: sender,
+        wasmByteCode: fromBase64(wasm_byte_code),
+        instantiatePermission: instantiate_permission
+          ? {
+              permission: accessTypeFromString(instantiate_permission.permission),
+              address: instantiate_permission.address ?? "",
+              addresses: instantiate_permission.addresses ?? [],
+            }
+          : undefined,
+      }),
+    },
+  };
+}
+
+/** @deprecated use `createWasmAminoConverters()` */
+export const cosmWasmTypes: AminoConverters = createWasmAminoConverters();

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

@@ -1,4 +1,5 @@
 import { EncodeObject, GeneratedType } from "@cosmjs/proto-signing";
+import { Coin } from "lbmjs-types/cosmos/base/v1beta1/coin";
 import {
   MsgClearAdmin,
   MsgExecuteContract,
@@ -8,7 +9,6 @@ import {
   MsgStoreCode,
   MsgUpdateAdmin,
 } from "lbmjs-types/cosmwasm/wasm/v1/tx";
-import { Coin } from "lbmjs-types/cosmos/base/v1beta1/coin";
 
 export const wasmTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/cosmwasm.wasm.v1.MsgClearAdmin", MsgClearAdmin],
@@ -20,6 +20,14 @@ export const wasmTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/cosmwasm.wasm.v1.MsgUpdateAdmin", MsgUpdateAdmin],
 ];
 
+export interface MsgStoreCodeEncodeObject extends EncodeObject {
+  readonly typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode";
+  readonly value: Partial<MsgStoreCode>;
+}
+
+export function isMsgStoreCodeEncodeObject(object: EncodeObject): object is MsgStoreCodeEncodeObject {
+  return (object as MsgStoreCodeEncodeObject).typeUrl === "/cosmwasm.wasm.v1.MsgStoreCode";
+}
 export interface MsgInstantiateContract2EncodeObject extends EncodeObject {
   readonly typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract2";
   readonly value: Partial<MsgInstantiateContract2>;