@ton-community/ton-ledger 7.1.0-pre.1 → 7.2.0-pre.2

package/dist/TonTransport.d.ts

@@ -1,6 +1,11 @@
 /// <reference types="node" />
 import Transport from "@ledgerhq/hw-transport";
 import { Address, Cell, SendMode, StateInit } from "@ton/core";
+export type KnownJetton = {
+    symbol: string;
+    masterAddress: Address;
+};
+export declare const KNOWN_JETTONS: KnownJetton[];
 export type TonPayloadFormat = {
     type: 'unsafe';
     message: Cell;
@@ -16,6 +21,10 @@ export type TonPayloadFormat = {
     customPayload: Cell | null;
     forwardAmount: bigint;
     forwardPayload: Cell | null;
+    knownJetton: {
+        jettonId: number;
+        workchain: number;
+    } | null;
 } | {
     type: 'nft-transfer';
     queryId: bigint | null;
@@ -99,6 +108,8 @@ export declare class TonTransport {
         testOnly?: boolean;
         bounceable?: boolean;
         chain?: number;
+        subwalletId?: number;
+        walletVersion?: 'v3r2' | 'v4';
     }): Promise<{
         address: string;
         publicKey: Buffer;
@@ -107,6 +118,8 @@ export declare class TonTransport {
         testOnly?: boolean;
         bounceable?: boolean;
         chain?: number;
+        subwalletId?: number;
+        walletVersion?: 'v3r2' | 'v4';
     }): Promise<{
         address: string;
         publicKey: Buffer;
@@ -119,6 +132,8 @@ export declare class TonTransport {
         testOnly?: boolean;
         bounceable?: boolean;
         chain?: number;
+        subwalletId?: number;
+        walletVersion?: 'v3r2' | 'v4';
     }): Promise<{
         signature: Buffer;
         hash: Buffer;

package/dist/TonTransport.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TonTransport = exports.parseMessage = void 0;
+exports.TonTransport = exports.parseMessage = exports.KNOWN_JETTONS = void 0;
 const core_1 = require("@ton/core");
 const crypto_1 = require("@ton/crypto");
 const teslabot_1 = require("teslabot");
@@ -15,6 +15,36 @@ const INS_PROOF = 0x08;
 const INS_SIGN_DATA = 0x09;
 const INS_SETTINGS = 0x0A;
 const DEFAULT_SUBWALLET_ID = 698983191;
+exports.KNOWN_JETTONS = [
+    {
+        symbol: 'USDT',
+        masterAddress: core_1.Address.parse('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'),
+    },
+    {
+        symbol: 'NOT',
+        masterAddress: core_1.Address.parse('EQAvlWFDxGF2lXm67y4yzC17wYKD9A0guwPkMs1gOsM__NOT'),
+    },
+    {
+        symbol: 'tsTON',
+        masterAddress: core_1.Address.parse('EQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAJav'),
+    },
+    {
+        symbol: 'wsTON',
+        masterAddress: core_1.Address.parse('EQB0SoxuGDx5qjVt0P_bPICFeWdFLBmVopHhjgfs0q-wsTON'),
+    },
+    {
+        symbol: 'hTON',
+        masterAddress: core_1.Address.parse('EQDPdq8xjAhytYqfGSX8KcFWIReCufsB9Wdg0pLlYSO_h76w'),
+    },
+    {
+        symbol: 'stTON',
+        masterAddress: core_1.Address.parse('EQDNhy-nxYFgUqzfUzImBEP67JqsyMIcyk2S5_RwNNEYku0k'),
+    },
+    {
+        symbol: 'STAKED',
+        masterAddress: core_1.Address.parse('EQCqC6EhRJ_tpWngKxL6dV0k6DSnRUrs9GSVkLbfdCqsj6TE'),
+    },
+];
 const dnsWalletKey = Buffer.from([0xe8, 0xd4, 0x40, 0x50, 0x87, 0x3d, 0xba, 0x86, 0x5a, 0xa7, 0xc1, 0x70, 0xab, 0x4c, 0xce, 0x64,
     0xd9, 0x08, 0x39, 0xa3, 0x4d, 0xcf, 0xd6, 0xcf, 0x71, 0xd1, 0x4e, 0x02, 0x05, 0x44, 0x3b, 0x1b]);
 function normalizeQueryId(qid) {
@@ -81,6 +111,7 @@ function parseMessage(cell, opts) {
                     customPayload,
                     forwardAmount,
                     forwardPayload,
+                    knownJetton: null,
                 };
             }
             case 0x5fcc3d14: {
@@ -331,6 +362,9 @@ function processAddressFlags(opts) {
     const bounceable = opts?.bounceable ?? true;
     const testOnly = opts?.testOnly ?? false;
     const chain = opts?.chain ?? 0;
+    const subwalletId = opts?.subwalletId ?? 698983191;
+    const walletVersion = opts?.walletVersion ?? 'v3r2';
+    let specifiers = undefined;
     let flags = 0x00;
     if (testOnly) {
         flags |= 0x01;
@@ -338,7 +372,14 @@ function processAddressFlags(opts) {
     if (chain === -1) {
         flags |= 0x02;
     }
-    return { bounceable, testOnly, chain, flags };
+    if (subwalletId !== 698983191 || walletVersion !== 'v4') {
+        flags |= 0x04;
+        specifiers = {
+            subwalletId,
+            isV3R2: walletVersion === 'v3r2',
+        };
+    }
+    return { bounceable, testOnly, chain, flags, specifiers };
 }
 function convertPayload(input) {
     let payload = null;
@@ -376,15 +417,25 @@ function convertPayload(input) {
             let b = (0, core_1.beginCell)()
                 .storeUint(input.type === 'jetton-transfer' ? 0x0f8a7ea5 : 0x5fcc3d14, 32);
             let d = Buffer.alloc(0);
+            let flags = 0;
             if (input.queryId !== null) {
-                d = Buffer.concat([d, (0, ledgerWriter_1.writeUint8)(1), (0, ledgerWriter_1.writeUint64)(input.queryId)]);
+                flags |= 1;
+            }
+            if (input.type === 'jetton-transfer' && input.knownJetton !== null) {
+                flags |= 2;
+            }
+            d = Buffer.concat([d, (0, ledgerWriter_1.writeUint8)(flags)]);
+            if (input.queryId !== null) {
+                d = Buffer.concat([d, (0, ledgerWriter_1.writeUint64)(input.queryId)]);
                 b = b.storeUint(input.queryId, 64);
             }
             else {
-                d = Buffer.concat([d, (0, ledgerWriter_1.writeUint8)(0)]);
                 b = b.storeUint(0, 64);
             }
             if (input.type === 'jetton-transfer') {
+                if (input.knownJetton !== null) {
+                    d = Buffer.concat([d, (0, ledgerWriter_1.writeUint16)(input.knownJetton.jettonId), (0, ledgerWriter_1.writeUint8)(input.knownJetton.workchain)]);
+                }
                 d = Buffer.concat([d, (0, ledgerWriter_1.writeVarUInt)(input.amount)]);
                 b = b.storeCoins(input.amount);
                 d = Buffer.concat([d, (0, ledgerWriter_1.writeAddress)(input.destination)]);
@@ -702,14 +753,14 @@ class TonTransport {
         // Check path
         validatePath(path);
         // Resolve flags
-        const { bounceable, testOnly, chain } = processAddressFlags(opts);
+        const { bounceable, testOnly, chain, specifiers } = processAddressFlags(opts);
         // Get public key
         let response = await this.#doRequest(INS_ADDRESS, 0x00, 0x00, pathElementsToBuffer(path.map((v) => v + 0x80000000)));
         if (response.length !== 32) {
             throw Error('Invalid response');
         }
         // Contract
-        const contract = (0, getInit_1.getInit)(chain, response);
+        const contract = (0, getInit_1.getInit)(response, specifiers?.subwalletId ?? 698983191, specifiers?.isV3R2 ?? false);
         const address = (0, core_1.contractAddress)(chain, contract);
         return { address: address.toString({ bounceable, testOnly }), publicKey: response };
     }
@@ -717,14 +768,18 @@ class TonTransport {
         // Check path
         validatePath(path);
         // Resolve flags
-        const { bounceable, testOnly, chain, flags } = processAddressFlags(opts);
+        const { bounceable, testOnly, chain, flags, specifiers } = processAddressFlags(opts);
+        let r = pathElementsToBuffer(path.map((v) => v + 0x80000000));
+        if (specifiers !== undefined) {
+            r = Buffer.concat([r, (0, ledgerWriter_1.writeUint8)(specifiers.isV3R2 ? 1 : 0), (0, ledgerWriter_1.writeUint32)(specifiers.subwalletId)]);
+        }
         // Get public key
-        let response = await this.#doRequest(INS_ADDRESS, 0x01, flags, pathElementsToBuffer(path.map((v) => v + 0x80000000)));
+        let response = await this.#doRequest(INS_ADDRESS, 0x01, flags, r);
         if (response.length !== 32) {
             throw Error('Invalid response');
         }
         // Contract
-        const contract = (0, getInit_1.getInit)(chain, response);
+        const contract = (0, getInit_1.getInit)(response, specifiers?.subwalletId ?? 698983191, specifiers?.isV3R2 ?? false);
         const address = (0, core_1.contractAddress)(chain, contract);
         return { address: address.toString({ bounceable, testOnly }), publicKey: response };
     }
@@ -733,10 +788,15 @@ class TonTransport {
         validatePath(path);
         let publicKey = (await this.getAddress(path)).publicKey;
         // Resolve flags
-        const { flags } = processAddressFlags(opts);
+        const { flags, specifiers } = processAddressFlags(opts);
+        let specifiersBuf = Buffer.alloc(0);
+        if (specifiers !== undefined) {
+            specifiersBuf = Buffer.concat([(0, ledgerWriter_1.writeUint8)(specifiers.isV3R2 ? 1 : 0), (0, ledgerWriter_1.writeUint32)(specifiers.subwalletId)]);
+        }
         const domainBuf = Buffer.from(params.domain, 'utf-8');
         const reqBuf = Buffer.concat([
             pathElementsToBuffer(path.map((v) => v + 0x80000000)),
+            specifiersBuf,
             (0, ledgerWriter_1.writeUint8)(domainBuf.length),
             domainBuf,
             (0, ledgerWriter_1.writeUint64)(BigInt(params.timestamp)),

package/dist/index.d.ts

@@ -1 +1 @@
-export { TonPayloadFormat, TonTransport, SignDataRequest, parseMessage } from './TonTransport';
+export { TonPayloadFormat, TonTransport, SignDataRequest, parseMessage, KNOWN_JETTONS } from './TonTransport';

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMessage = exports.TonTransport = void 0;
+exports.KNOWN_JETTONS = exports.parseMessage = exports.TonTransport = void 0;
 var TonTransport_1 = require("./TonTransport");
 Object.defineProperty(exports, "TonTransport", { enumerable: true, get: function () { return TonTransport_1.TonTransport; } });
 Object.defineProperty(exports, "parseMessage", { enumerable: true, get: function () { return TonTransport_1.parseMessage; } });
+Object.defineProperty(exports, "KNOWN_JETTONS", { enumerable: true, get: function () { return TonTransport_1.KNOWN_JETTONS; } });

package/dist/utils/getInit.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Cell } from '@ton/core';
-export declare function getInit(workchain: number, publicKey: Buffer): {
+export declare function getInit(publicKey: Buffer, subwalletId: number, isV3R2: boolean): {
     code: Cell;
     data: Cell;
 };

package/dist/utils/getInit.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInit = void 0;
 const core_1 = require("@ton/core");
-function getInit(workchain, publicKey) {
-    let code = core_1.Cell.fromBoc(Buffer.from('te6ccgECFAEAAtQAART/APSkE/S88sgLAQIBIAIDAgFIBAUE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8QERITAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNBgcCASAICQB4AfoA9AQw+CdvIjBQCqEhvvLgUIIQcGx1Z4MesXCAGFAEywUmzxZY+gIZ9ADLaRfLH1Jgyz8gyYBA+wAGAIpQBIEBCPRZMO1E0IEBQNcgyAHPFvQAye1UAXKwjiOCEGRzdHKDHrFwgBhQBcsFUAPPFiP6AhPLassfyz/JgED7AJJfA+ICASAKCwBZvSQrb2omhAgKBrkPoCGEcNQICEekk30pkQzmkD6f+YN4EoAbeBAUiYcVnzGEAgFYDA0AEbjJftRNDXCx+AA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYAIBIA4PABmtznaiaEAga5Drhf/AABmvHfaiaEAQa5DrhY/AAG7SB/oA1NQi+QAFyMoHFcv/ydB3dIAYyMsFywIizxZQBfoCFMtrEszMyXP7AMhAFIEBCPRR8qcCAHCBAQjXGPoA0z/IVCBHgQEI9FHyp4IQbm90ZXB0gBjIywXLAlAGzxZQBPoCFMtqEssfyz/Jc/sAAgBsgQEI1xj6ANM/MFIkgQEI9Fnyp4IQZHN0cnB0gBjIywXLAlAFzxZQA/oCE8tqyx8Syz/Jc/sAAAr0AMntVA==', 'base64'))[0];
+function getInit(publicKey, subwalletId, isV3R2) {
     let data = (0, core_1.beginCell)()
         .storeUint(0, 32) // Seqno
-        .storeUint(698983191 + workchain, 32)
-        .storeBuffer(publicKey)
-        .storeBit(0) // Empty plugins dict
-        .endCell();
-    return { code, data };
+        .storeUint(subwalletId, 32)
+        .storeBuffer(publicKey);
+    return {
+        code: isV3R2 ? core_1.Cell.fromBase64('te6cckEBAQEAcQAA3v8AIN0gggFMl7ohggEznLqxn3Gw7UTQ0x/THzHXC//jBOCk8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVBC9ba0=') : core_1.Cell.fromBase64('te6ccgECFAEAAtQAART/APSkE/S88sgLAQIBIAIDAgFIBAUE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8QERITAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNBgcCASAICQB4AfoA9AQw+CdvIjBQCqEhvvLgUIIQcGx1Z4MesXCAGFAEywUmzxZY+gIZ9ADLaRfLH1Jgyz8gyYBA+wAGAIpQBIEBCPRZMO1E0IEBQNcgyAHPFvQAye1UAXKwjiOCEGRzdHKDHrFwgBhQBcsFUAPPFiP6AhPLassfyz/JgED7AJJfA+ICASAKCwBZvSQrb2omhAgKBrkPoCGEcNQICEekk30pkQzmkD6f+YN4EoAbeBAUiYcVnzGEAgFYDA0AEbjJftRNDXCx+AA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYAIBIA4PABmtznaiaEAga5Drhf/AABmvHfaiaEAQa5DrhY/AAG7SB/oA1NQi+QAFyMoHFcv/ydB3dIAYyMsFywIizxZQBfoCFMtrEszMyXP7AMhAFIEBCPRR8qcCAHCBAQjXGPoA0z/IVCBHgQEI9FHyp4IQbm90ZXB0gBjIywXLAlAGzxZQBPoCFMtqEssfyz/Jc/sAAgBsgQEI1xj6ANM/MFIkgQEI9Fnyp4IQZHN0cnB0gBjIywXLAlAFzxZQA/oCE8tqyx8Syz/Jc/sAAAr0AMntVA=='),
+        data: isV3R2 ? data.endCell() : data.storeBit(0).endCell(),
+    };
 }
 exports.getInit = getInit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ton-community/ton-ledger",
-  "version": "7.1.0-pre.1",
+  "version": "7.2.0-pre.2",
   "repository": "https://github.com/ton-community/ton-ledger-ts",
   "author": "Steve Korshakov <steve@korshakov.com>",
   "license": "MIT",