chore: fix ms signing

thorswap · Jan 31, 2025 · 1fa663b · 1fa663b
1 parent 7119015
commit 1fa663b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/.changeset/good-needles-roll.md b/.changeset/good-needles-roll.md
@@ -0,0 +1,5 @@
+---
+"@swapkit/toolbox-cosmos": patch
+---
+
+Fixes return type of tx creation if not signable
diff --git a/packages/toolboxes/cosmos/src/thorchainUtils/messages.ts b/packages/toolboxes/cosmos/src/thorchainUtils/messages.ts
@@ -90,6 +90,7 @@ export const buildAminoMsg = ({
   return msg;
 };
 
+// TODO I think the msg typing is wrong it should be not prepared for broadcast
 export const convertToSignable = (
   msg: MsgDepositForBroadcast | MsgSendForBroadcast,
   chain: Chain.THORChain | Chain.Maya,
@@ -128,16 +129,17 @@ export const buildTransferTx =
     asSignable = true,
   }: ThorchainTransferTxParams) => {
     const account = await getAccount({ rpcUrl, from });
-    const preparedMessage = prepareMessageForBroadcast(
-      transferMsgAmino({
-        from,
-        recipient,
-        assetValue,
-        chain,
-      }),
-    );
 
-    const msg = asSignable ? convertToSignable(preparedMessage, chain) : preparedMessage;
+    const transferMsg = transferMsgAmino({
+      from,
+      recipient,
+      assetValue,
+      chain,
+    });
+
+    const msg = asSignable
+      ? convertToSignable(prepareMessageForBroadcast(transferMsg), chain)
+      : transferMsg;
 
     const transaction = {
       chainId: ChainToChainId[chain],
@@ -156,11 +158,11 @@ export const buildDepositTx =
   async ({ from, assetValue, memo = "", chain, asSignable = true }: ThorcahinDepositTxParams) => {
     const account = await getAccount({ rpcUrl, from });
 
-    const preparedMessage = prepareMessageForBroadcast<MsgDeposit>(
-      depositMsgAmino({ from, assetValue, memo, chain }),
-    );
+    const depositMsg = depositMsgAmino({ from, assetValue, memo, chain });
 
-    const msg = asSignable ? convertToSignable(preparedMessage, chain) : preparedMessage;
+    const msg = asSignable
+      ? convertToSignable(prepareMessageForBroadcast<MsgDeposit>(depositMsg), chain)
+      : depositMsg;
 
     const transaction = {
       chainId: ChainToChainId[chain],

diff --git a/packages/toolboxes/cosmos/src/toolbox/thorchain.ts b/packages/toolboxes/cosmos/src/toolbox/thorchain.ts
@@ -73,7 +73,7 @@ const signMultisigTx = async (
     fee,
     memo,
   }: {
-    msgs: ReturnType<typeof prepareMessageForBroadcast>[];
+    msgs: ReturnType<typeof buildAminoMsg>[];
     accountNumber: number;
     sequence: number;
     chainId: ChainId;
@@ -92,6 +92,7 @@ const signMultisigTx = async (
   const msgForSigning = [];
 
   for (const msg of msgs) {
+    // @ts-expect-error wrong typing of convertToSignable - investigation needed
     const signMsg = await convertToSignable(msg, chain);
     msgForSigning.push(signMsg);
   }
@@ -106,7 +107,7 @@ const signMultisigTx = async (
 
   const bodyBytes = await buildEncodedTxBody({
     chain,
-    msgs,
+    msgs: msgs.map(prepareMessageForBroadcast),
     memo,
   });