juno-network 0.12.0 → 0.14.0

package/src/codegen/cosmwasm/wasm/v1/tx.amino.ts

@@ -2,8 +2,8 @@ import { accessTypeFromJSON } from "./types";
 import { AminoMsg } from "@cosmjs/amino";
 import { toBase64, fromBase64, fromUtf8, toUtf8 } from "@cosmjs/encoding";
 import { Long } from "../../../helpers";
-import { MsgStoreCode, MsgInstantiateContract, MsgExecuteContract, MsgMigrateContract, MsgUpdateAdmin, MsgClearAdmin } from "./tx";
-export interface AminoMsgStoreCode extends AminoMsg {
+import { MsgStoreCode, MsgInstantiateContract, MsgInstantiateContract2, MsgExecuteContract, MsgMigrateContract, MsgUpdateAdmin, MsgClearAdmin } from "./tx";
+export interface MsgStoreCodeAminoType extends AminoMsg {
   type: "wasm/MsgStoreCode";
   value: {
     sender: string;
@@ -11,10 +11,11 @@ export interface AminoMsgStoreCode extends AminoMsg {
     instantiate_permission: {
       permission: number;
       address: string;
+      addresses: string[];
     };
   };
 }
-export interface AminoMsgInstantiateContract extends AminoMsg {
+export interface MsgInstantiateContractAminoType extends AminoMsg {
   type: "wasm/MsgInstantiateContract";
   value: {
     sender: string;
@@ -28,7 +29,23 @@ export interface AminoMsgInstantiateContract extends AminoMsg {
     }[];
   };
 }
-export interface AminoMsgExecuteContract extends AminoMsg {
+export interface MsgInstantiateContract2AminoType extends AminoMsg {
+  type: "wasm/MsgInstantiateContract2";
+  value: {
+    sender: string;
+    admin: string;
+    code_id: string;
+    label: string;
+    msg: Uint8Array;
+    funds: {
+      denom: string;
+      amount: string;
+    }[];
+    salt: Uint8Array;
+    fix_msg: boolean;
+  };
+}
+export interface MsgExecuteContractAminoType extends AminoMsg {
   type: "wasm/MsgExecuteContract";
   value: {
     sender: string;
@@ -40,7 +57,7 @@ export interface AminoMsgExecuteContract extends AminoMsg {
     }[];
   };
 }
-export interface AminoMsgMigrateContract extends AminoMsg {
+export interface MsgMigrateContractAminoType extends AminoMsg {
   type: "wasm/MsgMigrateContract";
   value: {
     sender: string;
@@ -49,7 +66,7 @@ export interface AminoMsgMigrateContract extends AminoMsg {
     msg: Uint8Array;
   };
 }
-export interface AminoMsgUpdateAdmin extends AminoMsg {
+export interface MsgUpdateAdminAminoType extends AminoMsg {
   type: "wasm/MsgUpdateAdmin";
   value: {
     sender: string;
@@ -57,7 +74,7 @@ export interface AminoMsgUpdateAdmin extends AminoMsg {
     contract: string;
   };
 }
-export interface AminoMsgClearAdmin extends AminoMsg {
+export interface MsgClearAdminAminoType extends AminoMsg {
   type: "wasm/MsgClearAdmin";
   value: {
     sender: string;
@@ -71,13 +88,14 @@ export const AminoConverter = {
       sender,
       wasmByteCode,
       instantiatePermission
-    }: MsgStoreCode): AminoMsgStoreCode["value"] => {
+    }: MsgStoreCode): MsgStoreCodeAminoType["value"] => {
       return {
         sender,
         wasm_byte_code: toBase64(wasmByteCode),
         instantiate_permission: {
           permission: instantiatePermission.permission,
-          address: instantiatePermission.address
+          address: instantiatePermission.address,
+          addresses: instantiatePermission.addresses
         }
       };
     },
@@ -85,13 +103,14 @@ export const AminoConverter = {
       sender,
       wasm_byte_code,
       instantiate_permission
-    }: AminoMsgStoreCode["value"]): MsgStoreCode => {
+    }: MsgStoreCodeAminoType["value"]): MsgStoreCode => {
       return {
         sender,
         wasmByteCode: fromBase64(wasm_byte_code),
         instantiatePermission: {
           permission: accessTypeFromJSON(instantiate_permission.permission),
-          address: instantiate_permission.address
+          address: instantiate_permission.address,
+          addresses: instantiate_permission.addresses
         }
       };
     }
@@ -105,7 +124,7 @@ export const AminoConverter = {
       label,
       msg,
       funds
-    }: MsgInstantiateContract): AminoMsgInstantiateContract["value"] => {
+    }: MsgInstantiateContract): MsgInstantiateContractAminoType["value"] => {
       return {
         sender,
         admin,
@@ -125,7 +144,7 @@ export const AminoConverter = {
       label,
       msg,
       funds
-    }: AminoMsgInstantiateContract["value"]): MsgInstantiateContract => {
+    }: MsgInstantiateContractAminoType["value"]): MsgInstantiateContract => {
       return {
         sender,
         admin,
@@ -139,6 +158,57 @@ export const AminoConverter = {
       };
     }
   },
+  "/cosmwasm.wasm.v1.MsgInstantiateContract2": {
+    aminoType: "wasm/MsgInstantiateContract2",
+    toAmino: ({
+      sender,
+      admin,
+      codeId,
+      label,
+      msg,
+      funds,
+      salt,
+      fixMsg
+    }: MsgInstantiateContract2): MsgInstantiateContract2AminoType["value"] => {
+      return {
+        sender,
+        admin,
+        code_id: codeId.toString(),
+        label,
+        msg: JSON.parse(fromUtf8(msg)),
+        funds: funds.map(el0 => ({
+          denom: el0.denom,
+          amount: el0.amount
+        })),
+        salt,
+        fix_msg: fixMsg
+      };
+    },
+    fromAmino: ({
+      sender,
+      admin,
+      code_id,
+      label,
+      msg,
+      funds,
+      salt,
+      fix_msg
+    }: MsgInstantiateContract2AminoType["value"]): MsgInstantiateContract2 => {
+      return {
+        sender,
+        admin,
+        codeId: Long.fromString(code_id),
+        label,
+        msg: toUtf8(JSON.stringify(msg)),
+        funds: funds.map(el0 => ({
+          denom: el0.denom,
+          amount: el0.amount
+        })),
+        salt,
+        fixMsg: fix_msg
+      };
+    }
+  },
   "/cosmwasm.wasm.v1.MsgExecuteContract": {
     aminoType: "wasm/MsgExecuteContract",
     toAmino: ({
@@ -146,7 +216,7 @@ export const AminoConverter = {
       contract,
       msg,
       funds
-    }: MsgExecuteContract): AminoMsgExecuteContract["value"] => {
+    }: MsgExecuteContract): MsgExecuteContractAminoType["value"] => {
       return {
         sender,
         contract,
@@ -162,7 +232,7 @@ export const AminoConverter = {
       contract,
       msg,
       funds
-    }: AminoMsgExecuteContract["value"]): MsgExecuteContract => {
+    }: MsgExecuteContractAminoType["value"]): MsgExecuteContract => {
       return {
         sender,
         contract,
@@ -181,7 +251,7 @@ export const AminoConverter = {
       contract,
       codeId,
       msg
-    }: MsgMigrateContract): AminoMsgMigrateContract["value"] => {
+    }: MsgMigrateContract): MsgMigrateContractAminoType["value"] => {
       return {
         sender,
         contract,
@@ -194,7 +264,7 @@ export const AminoConverter = {
       contract,
       code_id,
       msg
-    }: AminoMsgMigrateContract["value"]): MsgMigrateContract => {
+    }: MsgMigrateContractAminoType["value"]): MsgMigrateContract => {
       return {
         sender,
         contract,
@@ -209,7 +279,7 @@ export const AminoConverter = {
       sender,
       newAdmin,
       contract
-    }: MsgUpdateAdmin): AminoMsgUpdateAdmin["value"] => {
+    }: MsgUpdateAdmin): MsgUpdateAdminAminoType["value"] => {
       return {
         sender,
         new_admin: newAdmin,
@@ -220,7 +290,7 @@ export const AminoConverter = {
       sender,
       new_admin,
       contract
-    }: AminoMsgUpdateAdmin["value"]): MsgUpdateAdmin => {
+    }: MsgUpdateAdminAminoType["value"]): MsgUpdateAdmin => {
       return {
         sender,
         newAdmin: new_admin,
@@ -233,7 +303,7 @@ export const AminoConverter = {
     toAmino: ({
       sender,
       contract
-    }: MsgClearAdmin): AminoMsgClearAdmin["value"] => {
+    }: MsgClearAdmin): MsgClearAdminAminoType["value"] => {
       return {
         sender,
         contract
@@ -242,7 +312,7 @@ export const AminoConverter = {
     fromAmino: ({
       sender,
       contract
-    }: AminoMsgClearAdmin["value"]): MsgClearAdmin => {
+    }: MsgClearAdminAminoType["value"]): MsgClearAdmin => {
       return {
         sender,
         contract

package/src/codegen/cosmwasm/wasm/v1/tx.registry.ts

@@ -1,6 +1,6 @@
 import { GeneratedType, Registry } from "@cosmjs/proto-signing";
-import { MsgStoreCode, MsgInstantiateContract, MsgExecuteContract, MsgMigrateContract, MsgUpdateAdmin, MsgClearAdmin } from "./tx";
-export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmwasm.wasm.v1.MsgStoreCode", MsgStoreCode], ["/cosmwasm.wasm.v1.MsgInstantiateContract", MsgInstantiateContract], ["/cosmwasm.wasm.v1.MsgExecuteContract", MsgExecuteContract], ["/cosmwasm.wasm.v1.MsgMigrateContract", MsgMigrateContract], ["/cosmwasm.wasm.v1.MsgUpdateAdmin", MsgUpdateAdmin], ["/cosmwasm.wasm.v1.MsgClearAdmin", MsgClearAdmin]];
+import { MsgStoreCode, MsgInstantiateContract, MsgInstantiateContract2, MsgExecuteContract, MsgMigrateContract, MsgUpdateAdmin, MsgClearAdmin } from "./tx";
+export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmwasm.wasm.v1.MsgStoreCode", MsgStoreCode], ["/cosmwasm.wasm.v1.MsgInstantiateContract", MsgInstantiateContract], ["/cosmwasm.wasm.v1.MsgInstantiateContract2", MsgInstantiateContract2], ["/cosmwasm.wasm.v1.MsgExecuteContract", MsgExecuteContract], ["/cosmwasm.wasm.v1.MsgMigrateContract", MsgMigrateContract], ["/cosmwasm.wasm.v1.MsgUpdateAdmin", MsgUpdateAdmin], ["/cosmwasm.wasm.v1.MsgClearAdmin", MsgClearAdmin]];
 export const load = (protoRegistry: Registry) => {
   registry.forEach(([typeUrl, mod]) => {
     protoRegistry.register(typeUrl, mod);
@@ -22,6 +22,13 @@ export const MessageComposer = {
       };
     },
 
+    instantiateContract2(value: MsgInstantiateContract2) {
+      return {
+        typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract2",
+        value: MsgInstantiateContract2.encode(value).finish()
+      };
+    },
+
     executeContract(value: MsgExecuteContract) {
       return {
         typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
@@ -66,6 +73,13 @@ export const MessageComposer = {
       };
     },
 
+    instantiateContract2(value: MsgInstantiateContract2) {
+      return {
+        typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract2",
+        value
+      };
+    },
+
     executeContract(value: MsgExecuteContract) {
       return {
         typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",
@@ -110,6 +124,13 @@ export const MessageComposer = {
       };
     },
 
+    instantiateContract2(value: MsgInstantiateContract2) {
+      return {
+        typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract2",
+        value: MsgInstantiateContract2.fromPartial(value)
+      };
+    },
+
     executeContract(value: MsgExecuteContract) {
       return {
         typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract",

package/src/codegen/cosmwasm/wasm/v1/tx.rpc.msg.ts

@@ -1,14 +1,23 @@
 import { Rpc } from "../../../helpers";
 import * as _m0 from "protobufjs/minimal";
-import { MsgStoreCode, MsgStoreCodeResponse, MsgInstantiateContract, MsgInstantiateContractResponse, MsgExecuteContract, MsgExecuteContractResponse, MsgMigrateContract, MsgMigrateContractResponse, MsgUpdateAdmin, MsgUpdateAdminResponse, MsgClearAdmin, MsgClearAdminResponse } from "./tx";
+import { MsgStoreCode, MsgStoreCodeResponse, MsgInstantiateContract, MsgInstantiateContractResponse, MsgInstantiateContract2, MsgInstantiateContract2Response, MsgExecuteContract, MsgExecuteContractResponse, MsgMigrateContract, MsgMigrateContractResponse, MsgUpdateAdmin, MsgUpdateAdminResponse, MsgClearAdmin, MsgClearAdminResponse } from "./tx";
 /** Msg defines the wasm Msg service. */
 
 export interface Msg {
   /** StoreCode to submit Wasm code to the system */
   storeCode(request: MsgStoreCode): Promise<MsgStoreCodeResponse>;
-  /** Instantiate creates a new smart contract instance for the given code id. */
+  /**
+   * InstantiateContract creates a new smart contract instance for the given
+   *  code id.
+   */
 
   instantiateContract(request: MsgInstantiateContract): Promise<MsgInstantiateContractResponse>;
+  /**
+   * InstantiateContract2 creates a new smart contract instance for the given
+   *  code id with a predictable address
+   */
+
+  instantiateContract2(request: MsgInstantiateContract2): Promise<MsgInstantiateContract2Response>;
   /** Execute submits the given message data to a smart contract */
 
   executeContract(request: MsgExecuteContract): Promise<MsgExecuteContractResponse>;
@@ -29,6 +38,7 @@ export class MsgClientImpl implements Msg {
     this.rpc = rpc;
     this.storeCode = this.storeCode.bind(this);
     this.instantiateContract = this.instantiateContract.bind(this);
+    this.instantiateContract2 = this.instantiateContract2.bind(this);
     this.executeContract = this.executeContract.bind(this);
     this.migrateContract = this.migrateContract.bind(this);
     this.updateAdmin = this.updateAdmin.bind(this);
@@ -47,6 +57,12 @@ export class MsgClientImpl implements Msg {
     return promise.then(data => MsgInstantiateContractResponse.decode(new _m0.Reader(data)));
   }
 
+  instantiateContract2(request: MsgInstantiateContract2): Promise<MsgInstantiateContract2Response> {
+    const data = MsgInstantiateContract2.encode(request).finish();
+    const promise = this.rpc.request("cosmwasm.wasm.v1.Msg", "InstantiateContract2", data);
+    return promise.then(data => MsgInstantiateContract2Response.decode(new _m0.Reader(data)));
+  }
+
   executeContract(request: MsgExecuteContract): Promise<MsgExecuteContractResponse> {
     const data = MsgExecuteContract.encode(request).finish();
     const promise = this.rpc.request("cosmwasm.wasm.v1.Msg", "ExecuteContract", data);