fix(mobile): sign-raw when wallet contract is uninit (#652)

tonkeeper · Dec 13, 2023 · f58a924 · f58a924
1 parent a21ecdd
commit f58a924
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/mobile/src/core/ModalContainer/NFTOperations/Modals/SignRawModal.tsx b/packages/mobile/src/core/ModalContainer/NFTOperations/Modals/SignRawModal.tsx
@@ -36,6 +36,7 @@ import { formatValue, getActionTitle } from '@tonkeeper/shared/utils/signRaw';
 import { Buffer } from 'buffer';
 import { trackEvent } from '$utils/stats';
 import { Events, SendAnalyticsFrom } from '$store/models';
+import { getWalletSeqno } from '@tonkeeper/shared/utils/wallet';
 
 interface SignRawModalProps {
   consequences?: MessageConsequences;
@@ -65,10 +66,9 @@ export const SignRawModal = memo<SignRawModalProps>((props) => {
       contractVersionsMap[vault.getVersion() ?? 'v4R2'],
       Buffer.from(vault.tonPublicKey),
     );
-
     const boc = TransactionService.createTransfer(contract, {
       messages: TransactionService.parseSignRawMessages(params.messages),
-      seqno: (await tonapi.wallet.getAccountSeqno(tk.wallet.address.ton.raw)).seqno,
+      seqno: await getWalletSeqno(),
       sendMode: 3,
       secretKey: Buffer.from(privateKey),
     });
@@ -254,7 +254,7 @@ export const openSignRawModal = async (
     try {
       const boc = TransactionService.createTransfer(contract, {
         messages: TransactionService.parseSignRawMessages(params.messages),
-        seqno: (await tonapi.wallet.getAccountSeqno(tk.wallet.address.ton.raw)).seqno,
+        seqno: await getWalletSeqno(),
         secretKey: Buffer.alloc(64),
       });
       consequences = await tonapi.wallet.emulateMessageToWallet({ boc });

diff --git a/packages/shared/utils/wallet.ts b/packages/shared/utils/wallet.ts
@@ -0,0 +1,10 @@
+import { tk, tonapi } from '../tonkeeper';
+
+export async function getWalletSeqno() {
+  try {
+    const seqno = (await tonapi.wallet.getAccountSeqno(tk.wallet.address.ton.raw)).seqno;
+    return seqno;
+  } catch (e) {
+    return 0;
+  }
+}