chore: use MsgSend for dummy message, and lint fix

Finschia · Feb 15, 2023 · 0303f8f · 0303f8f
1 parent c01b28d
commit 0303f8f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/packages/finschia/src/finschiaclient.ts b/packages/finschia/src/finschiaclient.ts
@@ -69,11 +69,11 @@ import {
   setupIbcExtension,
   setupNodeExtension,
   setupTokenExtension,
-  setupWasmplusExtension,
   setupTx2Extension,
+  setupWasmplusExtension,
   TokenExtension,
-  WasmplusExtension,
   Tx2Extension,
+  WasmplusExtension,
 } from "./modules";
 
 export type QueryClientWithExtensions = QueryClient &

diff --git a/packages/finschia/src/index.ts b/packages/finschia/src/index.ts
@@ -130,7 +130,7 @@ export {
   WasmplusExtension,
   wasmTypes,
 } from "./modules";
-export { Tx2Extension, setupTx2Extension } from "./modules";
+export { setupTx2Extension, Tx2Extension } from "./modules";
 export { makeLinkPath } from "./paths";
 export { SigningFinschiaClient, UploadAndInstantiateResult } from "./signingfinschiaclient";
 export { finschiaRegistryTypes } from "./types";

diff --git a/packages/finschia/src/modules/index.ts b/packages/finschia/src/modules/index.ts
@@ -120,6 +120,7 @@ export {
   tokenTypes,
 } from "./token/messages";
 export { setupTokenExtension, TokenExtension } from "./token/queries";
+export { setupTx2Extension, Tx2Extension } from "./tx2/queries";
 export { wasmTypes } from "./wasm/messages";
 export { createWasmplusAminoConverters } from "./wasmplus/aminomessages";
 export {
@@ -128,4 +129,3 @@ export {
   wasmplusTypes,
 } from "./wasmplus/messages";
 export { setupWasmplusExtension, WasmplusExtension } from "./wasmplus/queries";
-export { setupTx2Extension, Tx2Extension } from "./tx2/queries";
diff --git a/packages/finschia/src/modules/tx2/queries.spec.ts b/packages/finschia/src/modules/tx2/queries.spec.ts
@@ -1,10 +1,18 @@
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
-import { coins, coin, QueryClient } from "@cosmjs/stargate";
+import { coins, MsgSendEncodeObject, QueryClient } from "@cosmjs/stargate";
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
+import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 
 import { makeLinkPath } from "../../paths";
 import { SigningFinschiaClient } from "../../signingfinschiaclient";
-import { defaultSigningClientOptions, faucet, pendingWithoutSimapp, simapp } from "../../testutils.spec";
+import {
+  defaultSigningClientOptions,
+  faucet,
+  makeRandomAddress,
+  pendingWithoutSimapp,
+  simapp,
+} from "../../testutils.spec";
 import { longify } from "../../utils";
 import { setupTx2Extension, Tx2Extension } from "./queries";
 
@@ -18,22 +26,26 @@ async function sendDummyTx() {
     hdPaths: [makeLinkPath(0)],
     prefix: simapp.prefix,
   });
-  const defaultFee = {
-    amount: coins(250000, simapp.denomFee),
-    gas: "1500000", // 1.5 million
-  };
   const client = await SigningFinschiaClient.connectWithSigner(
     simapp.tendermintUrl,
     wallet,
     defaultSigningClientOptions,
   );
-  const sendAmount = coin("1000", "cony");
-  const msg = {
-    typeUrl: "/lbm.foundation.v1.MsgFundTreasury",
-    value: { from: faucet.address0, amount: [sendAmount] },
+  const defaultFee = {
+    amount: coins(250000, simapp.denomFee),
+    gas: "1500000",
   };
-
-  return client.signAndBroadcast(faucet.address0, [msg], defaultFee);
+  const msg: MsgSend = {
+    fromAddress: faucet.address0,
+    toAddress: makeRandomAddress(),
+    amount: coins(1234, simapp.denomFee),
+  };
+  const dummyMsg: MsgSendEncodeObject = {
+    typeUrl: "/cosmos.bank.v1beta1.MsgSend",
+    value: msg,
+  };
+  const signed = await client.sign(faucet.address0, [dummyMsg], defaultFee, "");
+  return await client.broadcastTx(Uint8Array.from(TxRaw.encode(signed).finish()));
 }
 
 describe("Tx2Extension", () => {