From 2f16c72deab0cdb8f9441bb0a52fcd379fa2c2fc Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 7 Oct 2022 18:38:58 +0800 Subject: [PATCH 1/4] fix: fixed the cosmwasm msg types --- packages/cosmwasm-stargate/src/cosmwasmclient.ts | 4 ++-- packages/cosmwasm-stargate/src/signingcosmwasmclient.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.ts index 113218b50f..c9fd5528eb 100644 --- a/packages/cosmwasm-stargate/src/cosmwasmclient.ts +++ b/packages/cosmwasm-stargate/src/cosmwasmclient.ts @@ -71,7 +71,7 @@ export interface ContractCodeHistoryEntry { /** The source of this history entry */ readonly operation: "Genesis" | "Init" | "Migrate"; readonly codeId: number; - readonly msg: Record; + readonly msg: Object; } /** Use for testing only */ @@ -439,7 +439,7 @@ export class CosmWasmClient { * Promise is rejected for invalid query format. * Promise is rejected for invalid response format. */ - public async queryContractSmart(address: string, queryMsg: Record): Promise { + public async queryContractSmart(address: string, queryMsg: Object): Promise { try { return await this.forceGetQueryClient().wasm.queryContractSmart(address, queryMsg); } catch (error) { diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts index 9fe6456534..09a69033e4 100644 --- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts +++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts @@ -137,7 +137,7 @@ export interface MigrateResult { export interface ExecuteInstruction { contractAddress: string; - msg: Record; + msg: Object; funds?: readonly Coin[]; } @@ -278,7 +278,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { public async instantiate( senderAddress: string, codeId: number, - msg: Record, + msg: Object, label: string, fee: StdFee | "auto" | number, options: InstantiateOptions = {}, @@ -368,7 +368,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { senderAddress: string, contractAddress: string, codeId: number, - migrateMsg: Record, + migrateMsg: Object, fee: StdFee | "auto" | number, memo = "", ): Promise { @@ -397,7 +397,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { public async execute( senderAddress: string, contractAddress: string, - msg: Record, + msg: Object, fee: StdFee | "auto" | number, memo = "", funds?: readonly Coin[], From 29edf5a32320b5b582e50109a3a5bf1099d6cee8 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 7 Oct 2022 18:59:08 +0800 Subject: [PATCH 2/4] revert: reverted none execution msg arguments --- packages/cosmwasm-stargate/src/cosmwasmclient.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.ts index c9fd5528eb..113218b50f 100644 --- a/packages/cosmwasm-stargate/src/cosmwasmclient.ts +++ b/packages/cosmwasm-stargate/src/cosmwasmclient.ts @@ -71,7 +71,7 @@ export interface ContractCodeHistoryEntry { /** The source of this history entry */ readonly operation: "Genesis" | "Init" | "Migrate"; readonly codeId: number; - readonly msg: Object; + readonly msg: Record; } /** Use for testing only */ @@ -439,7 +439,7 @@ export class CosmWasmClient { * Promise is rejected for invalid query format. * Promise is rejected for invalid response format. */ - public async queryContractSmart(address: string, queryMsg: Object): Promise { + public async queryContractSmart(address: string, queryMsg: Record): Promise { try { return await this.forceGetQueryClient().wasm.queryContractSmart(address, queryMsg); } catch (error) { From 3856a3c2c07637586b48f2ccfa84aefcb80497ee Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 7 Oct 2022 19:10:23 +0800 Subject: [PATCH 3/4] fix: replace Object into JsonObject --- packages/cosmwasm-stargate/src/signingcosmwasmclient.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts index 09a69033e4..4e2eda04b8 100644 --- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts +++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts @@ -57,6 +57,7 @@ import { MsgStoreCodeEncodeObject, MsgUpdateAdminEncodeObject, wasmTypes, + JsonObject, } from "./modules"; export interface UploadResult { @@ -137,7 +138,7 @@ export interface MigrateResult { export interface ExecuteInstruction { contractAddress: string; - msg: Object; + msg: JsonObject; funds?: readonly Coin[]; } @@ -278,7 +279,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { public async instantiate( senderAddress: string, codeId: number, - msg: Object, + msg: JsonObject, label: string, fee: StdFee | "auto" | number, options: InstantiateOptions = {}, @@ -368,7 +369,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { senderAddress: string, contractAddress: string, codeId: number, - migrateMsg: Object, + migratemsg: JsonObject, fee: StdFee | "auto" | number, memo = "", ): Promise { @@ -397,7 +398,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { public async execute( senderAddress: string, contractAddress: string, - msg: Object, + msg: JsonObject, fee: StdFee | "auto" | number, memo = "", funds?: readonly Coin[], From 25d219fcc3762b74db0b35f39f77fa3535b8a40b Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 7 Oct 2022 19:15:51 +0800 Subject: [PATCH 4/4] fix: fixed typo --- packages/cosmwasm-stargate/src/signingcosmwasmclient.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts index 4e2eda04b8..7a1b7d861b 100644 --- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts +++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts @@ -369,7 +369,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { senderAddress: string, contractAddress: string, codeId: number, - migratemsg: JsonObject, + migrateMsg: JsonObject, fee: StdFee | "auto" | number, memo = "", ): Promise {