From 3152646b6c4b41172467d93662ac368bb69e2d7d Mon Sep 17 00:00:00 2001
From: "jinseong.cho" <jinseong.cho@linecorp.com>
Date: Wed, 5 Apr 2023 20:25:35 +0900
Subject: [PATCH] chore: apply feedback

---
 packages/cosmwasm-stargate/src/index.ts       |  2 +
 .../cosmwasm-stargate/src/modules/index.ts    |  2 +
 .../src/signingcosmwasmclient.spec.ts         |  2 +-
 .../src/signingcosmwasmclient.ts              | 45 +++----------------
 4 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/packages/cosmwasm-stargate/src/index.ts b/packages/cosmwasm-stargate/src/index.ts
index 91c5af34..602f8115 100644
--- a/packages/cosmwasm-stargate/src/index.ts
+++ b/packages/cosmwasm-stargate/src/index.ts
@@ -5,6 +5,7 @@ export {
   createWasmAminoConverters,
   isMsgClearAdminEncodeObject,
   isMsgExecuteEncodeObject,
+  isMsgInstantiateContract2EncodeObject,
   isMsgInstantiateContractEncodeObject,
   isMsgMigrateEncodeObject,
   isMsgStoreCodeEncodeObject,
@@ -12,6 +13,7 @@ export {
   JsonObject,
   MsgClearAdminEncodeObject,
   MsgExecuteContractEncodeObject,
+  MsgInstantiateContract2EncodeObject,
   MsgInstantiateContractEncodeObject,
   MsgMigrateContractEncodeObject,
   MsgStoreCodeEncodeObject,
diff --git a/packages/cosmwasm-stargate/src/modules/index.ts b/packages/cosmwasm-stargate/src/modules/index.ts
index 04cb2a79..2b3114cb 100644
--- a/packages/cosmwasm-stargate/src/modules/index.ts
+++ b/packages/cosmwasm-stargate/src/modules/index.ts
@@ -10,12 +10,14 @@ export {
 export {
   isMsgClearAdminEncodeObject,
   isMsgExecuteEncodeObject,
+  isMsgInstantiateContract2EncodeObject,
   isMsgInstantiateContractEncodeObject,
   isMsgMigrateEncodeObject,
   isMsgStoreCodeEncodeObject,
   isMsgUpdateAdminEncodeObject,
   MsgClearAdminEncodeObject,
   MsgExecuteContractEncodeObject,
+  MsgInstantiateContract2EncodeObject,
   MsgInstantiateContractEncodeObject,
   MsgMigrateContractEncodeObject,
   MsgStoreCodeEncodeObject,
diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts
index f1c0d4e0..e2892e6c 100644
--- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts
+++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts
@@ -274,13 +274,13 @@ describe("SigningCosmWasmClient", () => {
       const { contractAddress } = await client.instantiate2(
         alice.address0,
         codeId,
+        salt,
         msg,
         "My cool label--",
         defaultInstantiateFee,
         {
           memo: "Let's see if the memo is used",
           funds: funds,
-          salt: salt,
         },
       );
 
diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
index f5218554..39ffb130 100644
--- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
+++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
@@ -55,13 +55,13 @@ import {
   JsonObject,
   MsgClearAdminEncodeObject,
   MsgExecuteContractEncodeObject,
+  MsgInstantiateContract2EncodeObject,
   MsgInstantiateContractEncodeObject,
   MsgMigrateContractEncodeObject,
   MsgStoreCodeEncodeObject,
   MsgUpdateAdminEncodeObject,
   wasmTypes,
 } from "./modules";
-import { MsgInstantiateContract2EncodeObject } from "./modules/wasm/messages";
 
 export interface UploadResult {
   /** Size of the original wasm code in bytes */
@@ -85,7 +85,7 @@ export interface UploadResult {
 }
 
 /**
- * The options of an .instantiate() call.
+ * The options of .instantiate() and .instantiate2() call.
  * All properties are optional.
  */
 export interface InstantiateOptions {
@@ -105,38 +105,6 @@ export interface InstantiateOptions {
   readonly admin?: string;
 }
 
-/**
- * The options of an .instantiate() call.
- * All properties are optional.
- */
-export interface Instantiate2Options {
-  readonly memo?: string;
-  /**
-   * The funds that are transferred from the sender to the newly created contract.
-   * The funds are transferred as part of the message execution after the contract address is
-   * created and before the instantiation message is executed by the contract.
-   *
-   * Only native tokens are supported.
-   */
-  readonly funds?: readonly Coin[];
-  /**
-   * A bech32 encoded address of an admin account.
-   * Caution: an admin has the privilege to upgrade a contract. If this is not desired, do not set this value.
-   */
-  readonly admin?: string;
-
-  /**
-   * salt is an arbitrary value provided by the sender. Size can be 1 to 64.
-   */
-  readonly salt?: Uint8Array;
-
-  /**
-   * FixMsg include the msg value into the hash for the predictable address.
-   * Default is false
-   */
-  readonly fixMsg?: boolean;
-}
-
 export interface InstantiateResult {
   /** The address of the newly instantiated contract */
   readonly contractAddress: string;
@@ -372,10 +340,11 @@ export class SigningCosmWasmClient extends CosmWasmClient {
   public async instantiate2(
     senderAddress: string,
     codeId: number,
-    msg: Record<string, unknown>,
+    salt: Uint8Array,
+    msg: JsonObject,
     label: string,
     fee: StdFee | "auto" | number,
-    options: Instantiate2Options = {},
+    options: InstantiateOptions = {},
   ): Promise<InstantiateResult> {
     const instantiateContract2Msg: MsgInstantiateContract2EncodeObject = {
       typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract2",
@@ -386,8 +355,8 @@ export class SigningCosmWasmClient extends CosmWasmClient {
         msg: toUtf8(JSON.stringify(msg)),
         funds: [...(options.funds || [])],
         admin: options.admin,
-        salt: options.salt,
-        fixMsg: options.fixMsg,
+        salt: salt,
+        fixMsg: false,
       }),
     };
     const result = await this.signAndBroadcast(senderAddress, [instantiateContract2Msg], fee, options.memo);