fix: ton transfer

OneKeyHQ · Oct 15, 2024 · 37b0a00 · 37b0a00
1 parent 20b0129
commit 37b0a00
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 18 deletions.
diff --git a/packages/core/src/api/ton/TonSignMessage.ts b/packages/core/src/api/ton/TonSignMessage.ts
@@ -18,14 +18,14 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
       { name: 'destination', type: 'string' },
       { name: 'jettonMasterAddress', type: 'string' },
       { name: 'jettonWalletAddress', type: 'string' },
-      { name: 'tonAmount', type: 'number' },
-      { name: 'jettonAmount', type: 'number' },
-      { name: 'fwdFee', type: 'number' },
+      { name: 'tonAmount' },
+      { name: 'jettonAmount' },
+      { name: 'fwdFee' },
       { name: 'comment', type: 'string' },
       { name: 'isRawData', type: 'boolean' },
       { name: 'mode', type: 'number' },
       { name: 'seqno', type: 'number' },
-      { name: 'expireAt', type: 'number' },
+      { name: 'expireAt' },
       { name: 'walletVersion' },
       { name: 'walletId', type: 'number' },
       { name: 'workchain' },

diff --git a/packages/core/src/api/ton/TonSignProof.ts b/packages/core/src/api/ton/TonSignProof.ts
@@ -16,7 +16,7 @@ export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
       { name: 'path', required: true },
       { name: 'appdomain', type: 'string' },
       { name: 'comment', type: 'string' },
-      { name: 'expireAt', type: 'number' },
+      { name: 'expireAt' },
       { name: 'walletVersion' },
       { name: 'walletId', type: 'number' },
       { name: 'workchain' },

diff --git a/packages/core/src/types/api/tonSignMessage.ts b/packages/core/src/types/api/tonSignMessage.ts
@@ -1,26 +1,31 @@
-import { TonSignedMessage, TonWalletVersion, TonWorkChain } from '@onekeyfe/hd-transport';
+import type {
+  TonSignedMessage,
+  TonWalletVersion,
+  TonWorkChain,
+  UintType,
+} from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type TonSignMessageParams = {
   path: string | number[];
   destination: string;
   jettonMasterAddress?: string;
   jettonWalletAddress?: string;
-  tonAmount: number;
-  jettonAmount?: number;
-  fwdFee?: number;
+  tonAmount: UintType;
+  jettonAmount?: UintType;
+  fwdFee?: UintType;
   comment?: string;
   isRawData?: boolean;
   mode?: number;
   seqno: number;
-  expireAt: number;
+  expireAt: UintType;
   walletVersion?: TonWalletVersion;
   walletId?: number;
   workchain?: TonWorkChain;
   isBounceable?: boolean;
   isTestnetOnly?: boolean;
   extDestination?: string[];
-  extTonAmount?: number[];
+  extTonAmount?: UintType[];
   extPayload?: string[];
 };
 

diff --git a/packages/core/src/types/api/tonSignProof.ts b/packages/core/src/types/api/tonSignProof.ts
@@ -1,11 +1,16 @@
-import { TonSignedProof, TonWalletVersion, TonWorkChain } from '@onekeyfe/hd-transport';
+import type {
+  TonSignedProof,
+  TonWalletVersion,
+  TonWorkChain,
+  UintType,
+} from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type TonSignProofParams = {
   path: string | number[];
   appdomain: string;
   comment?: string;
-  expireAt: number;
+  expireAt: UintType;
   walletVersion?: TonWalletVersion;
   walletId?: number;
   workchain?: TonWorkChain;

diff --git a/packages/hd-transport/scripts/protobuf-patches/index.js b/packages/hd-transport/scripts/protobuf-patches/index.js
@@ -202,6 +202,11 @@ const TYPE_PATCH = {
   'TezosDelegationOp.source': 'Uint8Array',
   'TezosDelegationOp.delegate': 'Uint8Array',
   'TezosSignTx.branch': 'Uint8Array',
+  'TonSignMessage.ton_amount': UINT_TYPE,
+  'TonSignMessage.jetton_amount': UINT_TYPE,
+  'TonSignMessage.fwd_fee': UINT_TYPE,
+  'TonSignMessage.ext_ton_amount': UINT_TYPE,
+  'TonSignProof.expire_at': UINT_TYPE,
 };
 
 const DEFINITION_PATCH = {

diff --git a/packages/hd-transport/src/types/messages.ts b/packages/hd-transport/src/types/messages.ts
@@ -3891,9 +3891,9 @@ export type TonSignMessage = {
   destination: string;
   jetton_master_address?: string;
   jetton_wallet_address?: string;
-  ton_amount: number;
-  jetton_amount?: number;
-  fwd_fee?: number;
+  ton_amount: UintType;
+  jetton_amount?: UintType;
+  fwd_fee?: UintType;
   comment?: string;
   is_raw_data?: boolean;
   mode?: number;
@@ -3905,7 +3905,7 @@ export type TonSignMessage = {
   is_bounceable?: boolean;
   is_testnet_only?: boolean;
   ext_destination: string[];
-  ext_ton_amount: number[];
+  ext_ton_amount: UintType[];
   ext_payload: string[];
 };
 
@@ -3920,7 +3920,7 @@ export type TonSignProof = {
   address_n: number[];
   appdomain: string;
   comment?: string;
-  expire_at: number;
+  expire_at: UintType;
   wallet_version?: TonWalletVersion;
   wallet_id?: number;
   workchain?: TonWorkChain;