@ton-community/ton-ledger 7.2.0-pre.3 → 7.3.0

package/CHANGELOG.md

@@ -4,13 +4,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.7.1] - 2024-01-17
+## [7.3.0] - 2025-08-21
+
+- New jettons
+- Fixed `includeWalletOp`
+
+## [7.2.0] - 2025-02-07
+
+- Added support for TON Ledger App 2.2.0 features, including:
+- Hardcoded jettons
+- Wallet specifiers support in more methods
+
+## [7.1.0] - Not released
+
+### Added
+
+- Added `parseMessage` helper to parse messages into TON Ledger App format
+- Added support for TON Ledger App 2.1.0 features, including:
+- New message types
+- Wallet specifiers (subwallet ID and wallet op inclusion for v4 support)
+- `getSettings` method
+
+## [7.0.1] - 2024-01-17
 
 ### Fixed
 
 - Fixed incorrect VarUInt encoding of 0 (0 nanoTON, 0 jetton units, etc)
 
-## [0.7.0] - 2023-09-15
+## [7.0.0] - 2023-09-15
 
 ### Changed
 

package/dist/TonTransport.d.ts

@@ -6,6 +6,12 @@ export type KnownJetton = {
     masterAddress: Address;
 };
 export declare const KNOWN_JETTONS: KnownJetton[];
+export type ExtraCurrency = {
+    id: number;
+    symbol: string;
+    decimals: number;
+};
+export declare const KNOWN_EXTRA_CURRENCIES: ExtraCurrency[];
 export type TonPayloadFormat = {
     type: 'unsafe';
     message: Cell;
@@ -82,6 +88,22 @@ export type TonPayloadFormat = {
     type: 'token-bridge-pay-swap';
     queryId: bigint | null;
     swapId: Buffer;
+} | {
+    type: 'tonwhales-pool-deposit';
+    queryId: bigint;
+    gasLimit: bigint;
+} | {
+    type: 'tonwhales-pool-withdraw';
+    queryId: bigint;
+    gasLimit: bigint;
+    amount: bigint;
+} | {
+    type: 'vesting-send-msg-comment';
+    queryId: bigint | null;
+    sendMode: number;
+    value: bigint;
+    destination: Address;
+    text: string;
 };
 export declare function parseMessage(cell: Cell, opts?: {
     disallowUnsafe?: boolean;
@@ -158,6 +180,10 @@ export declare class TonTransport {
             subwalletId?: number;
             includeWalletOp: boolean;
         };
+        extraCurrency?: {
+            index: number;
+            amount: bigint;
+        };
     }) => Promise<Cell>;
     getSettings(): Promise<{
         blindSigningEnabled: boolean;

package/dist/TonTransport.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TonTransport = exports.parseMessage = exports.KNOWN_JETTONS = void 0;
+exports.TonTransport = exports.parseMessage = exports.KNOWN_EXTRA_CURRENCIES = exports.KNOWN_JETTONS = void 0;
 const core_1 = require("@ton/core");
 const crypto_1 = require("@ton/crypto");
 const teslabot_1 = require("teslabot");
@@ -44,6 +44,25 @@ exports.KNOWN_JETTONS = [
         symbol: 'STAKED',
         masterAddress: core_1.Address.parse('EQCqC6EhRJ_tpWngKxL6dV0k6DSnRUrs9GSVkLbfdCqsj6TE'),
     },
+    {
+        symbol: 'CATI',
+        masterAddress: core_1.Address.parse('EQD-cvR0Nz6XAyRBvbhz-abTrRC6sI5tvHvvpeQraV9UAAD7'),
+    },
+    {
+        symbol: 'DOGS',
+        masterAddress: core_1.Address.parse('EQCvxJy4eG8hyHBFsZ7eePxrRsUQSFE_jpptRAYBmcG_DOGS'),
+    },
+    {
+        symbol: 'X',
+        masterAddress: core_1.Address.parse('EQB4zZusHsbU2vVTPqjhlokIOoiZhEdCMT703CWEzhTOo__X'),
+    },
+];
+exports.KNOWN_EXTRA_CURRENCIES = [
+    {
+        id: 1,
+        symbol: 'tgBTC',
+        decimals: 8,
+    },
 ];
 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]);
@@ -336,6 +355,62 @@ function parseMessage(cell, opts) {
                     swapId,
                 };
             }
+            case 0x7bcd1fef: {
+                const queryId = s.loadUintBig(64);
+                if (queryId <= 0n) {
+                    throw new Error('Incorrect query id: must be greater than 0');
+                }
+                const gasLimit = s.loadCoins();
+                s.endParse();
+                return {
+                    type: 'tonwhales-pool-deposit',
+                    queryId,
+                    gasLimit,
+                };
+            }
+            case 0xda803efd: {
+                const queryId = s.loadUintBig(64);
+                if (queryId <= 0n) {
+                    throw new Error('Incorrect query id: must be greater than 0');
+                }
+                const gasLimit = s.loadCoins();
+                const amount = s.loadCoins();
+                s.endParse();
+                return {
+                    type: 'tonwhales-pool-withdraw',
+                    queryId,
+                    gasLimit,
+                    amount,
+                };
+            }
+            case 0xa7733acd: {
+                const queryId = normalizeQueryId(s.loadUintBig(64));
+                const sendMode = s.loadUint(8);
+                const msgRefSlice = s.loadRef().beginParse();
+                s.endParse();
+                const msg = (0, core_1.loadMessageRelaxed)(msgRefSlice);
+                if (msg.info.type !== 'internal') {
+                    throw new Error('Message is not internal');
+                }
+                const body = msg.body.beginParse();
+                const op = body.loadUint(32);
+                if (op !== 0) {
+                    throw new Error('Message body is not a comment');
+                }
+                const text = body.loadStringTail();
+                if (text.length > 120) {
+                    throw new Error('Comment must be at most 120 ASCII characters long');
+                }
+                body.endParse();
+                return {
+                    type: 'vesting-send-msg-comment',
+                    queryId,
+                    sendMode,
+                    value: msg.info.value.coins,
+                    destination: msg.info.dest,
+                    text,
+                };
+            }
         }
         throw new Error('Unknown op: ' + op);
     }
@@ -706,6 +781,92 @@ function convertPayload(input) {
             ]);
             break;
         }
+        case 'tonwhales-pool-deposit': {
+            hints = Buffer.concat([
+                (0, ledgerWriter_1.writeUint8)(1),
+                (0, ledgerWriter_1.writeUint32)(0x0B)
+            ]);
+            const cell = (0, core_1.beginCell)()
+                .storeUint(0x7bcd1fef, 32)
+                .storeUint(input.queryId, 64)
+                .storeCoins(input.gasLimit)
+                .endCell();
+            const buffer = Buffer.concat([
+                (0, ledgerWriter_1.writeUint64)(input.queryId),
+                (0, ledgerWriter_1.writeVarUInt)(input.gasLimit)
+            ]);
+            payload = cell;
+            hints = Buffer.concat([
+                hints,
+                (0, ledgerWriter_1.writeUint16)(buffer.length),
+                buffer
+            ]);
+            break;
+        }
+        case 'tonwhales-pool-withdraw': {
+            hints = Buffer.concat([
+                (0, ledgerWriter_1.writeUint8)(1),
+                (0, ledgerWriter_1.writeUint32)(0x0C)
+            ]);
+            const cell = (0, core_1.beginCell)()
+                .storeUint(0xda803efd, 32)
+                .storeUint(input.queryId, 64)
+                .storeCoins(input.gasLimit)
+                .storeCoins(input.amount)
+                .endCell();
+            const buffer = Buffer.concat([
+                (0, ledgerWriter_1.writeUint64)(input.queryId),
+                (0, ledgerWriter_1.writeVarUInt)(input.gasLimit),
+                (0, ledgerWriter_1.writeVarUInt)(input.amount)
+            ]);
+            payload = cell;
+            hints = Buffer.concat([
+                hints,
+                (0, ledgerWriter_1.writeUint16)(buffer.length),
+                buffer
+            ]);
+            break;
+        }
+        case 'vesting-send-msg-comment': {
+            hints = Buffer.concat([
+                (0, ledgerWriter_1.writeUint8)(1),
+                (0, ledgerWriter_1.writeUint32)(0x0D)
+            ]);
+            let builder = (0, core_1.beginCell)()
+                .storeUint(0xa7733acd, 32);
+            let buffer = Buffer.alloc(0);
+            if (input.queryId !== null) {
+                builder = builder.storeUint(input.queryId, 64);
+                buffer = Buffer.concat([buffer, (0, ledgerWriter_1.writeUint8)(1), (0, ledgerWriter_1.writeUint64)(input.queryId)]);
+            }
+            else {
+                builder = builder.storeUint(0, 64);
+                buffer = Buffer.concat([buffer, (0, ledgerWriter_1.writeUint8)(0)]);
+            }
+            builder = builder.storeUint(input.sendMode, 8);
+            buffer = Buffer.concat([buffer, (0, ledgerWriter_1.writeUint8)(input.sendMode)]);
+            const msg = (0, core_1.internal)({
+                to: input.destination,
+                value: input.value,
+                body: (0, core_1.beginCell)().storeUint(0, 32).storeStringTail(input.text).endCell(),
+            });
+            const msgRefBuilder = (0, core_1.beginCell)();
+            (0, core_1.storeMessageRelaxed)(msg)(msgRefBuilder);
+            builder = builder.storeRef(msgRefBuilder.endCell());
+            buffer = Buffer.concat([buffer, (0, ledgerWriter_1.writeAddress)(input.destination)]);
+            buffer = Buffer.concat([buffer, (0, ledgerWriter_1.writeVarUInt)(input.value)]);
+            if (input.text.length > 120) {
+                throw new Error('Comment must be at most 120 ASCII characters long');
+            }
+            buffer = Buffer.concat([buffer, (0, ledgerWriter_1.writeUint8)(Buffer.from(input.text).length), Buffer.from(input.text)]);
+            payload = builder.endCell();
+            hints = Buffer.concat([
+                hints,
+                (0, ledgerWriter_1.writeUint16)(buffer.length),
+                buffer
+            ]);
+            break;
+        }
         default: {
             throw new Error('Unknown payload type: ' + input.type);
         }
@@ -906,6 +1067,9 @@ class TonTransport {
     signTransaction = async (path, transaction) => {
         // Check path
         validatePath(path);
+        if (transaction.extraCurrency !== undefined && transaction.extraCurrency.index >= exports.KNOWN_EXTRA_CURRENCIES.length) {
+            throw Error('Invalid extra currency index');
+        }
         //
         // Fetch key
         //
@@ -913,14 +1077,31 @@ class TonTransport {
         //
         // Create package
         //
+        const includeWalletOp = transaction.walletSpecifiers?.includeWalletOp ?? true;
+        const subwalletId = transaction.walletSpecifiers?.subwalletId ?? DEFAULT_SUBWALLET_ID;
+        const useTag1 = transaction.walletSpecifiers !== undefined || transaction.extraCurrency !== undefined;
         let pkg = Buffer.concat([
-            (0, ledgerWriter_1.writeUint8)(transaction.walletSpecifiers === undefined ? 0 : 1), // tag
+            (0, ledgerWriter_1.writeUint8)(useTag1 ? 1 : 0), // tag
         ]);
-        if (transaction.walletSpecifiers !== undefined) {
+        if (useTag1) {
+            let flags = 0;
+            if (includeWalletOp) {
+                flags |= 1;
+            }
+            if (transaction.extraCurrency !== undefined) {
+                flags |= 2;
+            }
             pkg = Buffer.concat([
                 pkg,
-                (0, ledgerWriter_1.writeUint32)(transaction.walletSpecifiers.subwalletId ?? DEFAULT_SUBWALLET_ID),
-                (0, ledgerWriter_1.writeUint8)(transaction.walletSpecifiers.includeWalletOp ? 1 : 0),
+                (0, ledgerWriter_1.writeUint32)(subwalletId),
+                (0, ledgerWriter_1.writeUint8)(flags),
+            ]);
+        }
+        let ecBuf = Buffer.alloc(0);
+        if (transaction.extraCurrency !== undefined) {
+            ecBuf = Buffer.concat([
+                (0, ledgerWriter_1.writeUint8)(transaction.extraCurrency.index),
+                (0, ledgerWriter_1.writeVarUInt)(transaction.extraCurrency.amount),
             ]);
         }
         pkg = Buffer.concat([
@@ -928,6 +1109,7 @@ class TonTransport {
             (0, ledgerWriter_1.writeUint32)(transaction.seqno),
             (0, ledgerWriter_1.writeUint32)(transaction.timeout),
             (0, ledgerWriter_1.writeVarUInt)(transaction.amount),
+            ecBuf,
             (0, ledgerWriter_1.writeAddress)(transaction.to),
             (0, ledgerWriter_1.writeUint8)(transaction.bounce ? 1 : 0),
             (0, ledgerWriter_1.writeUint8)(transaction.sendMode),
@@ -992,8 +1174,20 @@ class TonTransport {
             .storeBit(false)
             .storeAddress(null)
             .storeAddress(transaction.to)
-            .storeCoins(transaction.amount)
-            .storeBit(false)
+            .storeCoins(transaction.amount);
+        if (transaction.extraCurrency !== undefined) {
+            orderBuilder = orderBuilder
+                .storeBit(true)
+                .storeRef((0, core_1.beginCell)()
+                .storeUint(0b10, 2)
+                .storeUint(32, 6)
+                .storeUint(exports.KNOWN_EXTRA_CURRENCIES[transaction.extraCurrency.index].id, 32)
+                .storeVarUint(transaction.extraCurrency.amount, 5));
+        }
+        else {
+            orderBuilder = orderBuilder.storeBit(false);
+        }
+        orderBuilder = orderBuilder
             .storeCoins(0)
             .storeCoins(0)
             .storeUint(0, 64)
@@ -1021,10 +1215,10 @@ class TonTransport {
         }
         // Transfer message
         let transferB = (0, core_1.beginCell)()
-            .storeUint(transaction.walletSpecifiers?.subwalletId ?? DEFAULT_SUBWALLET_ID, 32)
+            .storeUint(subwalletId, 32)
             .storeUint(transaction.timeout, 32)
             .storeUint(transaction.seqno, 32);
-        if (transaction.walletSpecifiers?.includeWalletOp ?? true) {
+        if (includeWalletOp) {
             transferB = transferB.storeUint(0, 8);
         }
         let transfer = transferB.storeUint(transaction.sendMode, 8)

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KNOWN_JETTONS = exports.parseMessage = exports.TonTransport = void 0;
+exports.KNOWN_EXTRA_CURRENCIES = 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; } });
+Object.defineProperty(exports, "KNOWN_EXTRA_CURRENCIES", { enumerable: true, get: function () { return TonTransport_1.KNOWN_EXTRA_CURRENCIES; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ton-community/ton-ledger",
-  "version": "7.2.0-pre.3",
+  "version": "7.3.0",
   "repository": "https://github.com/ton-community/ton-ledger-ts",
   "author": "Steve Korshakov <steve@korshakov.com>",
   "license": "MIT",
@@ -18,7 +18,6 @@
     "@ton/core": ">=0.52.2"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "^6.27.15",
     "@release-it/keep-a-changelog": "^3.1.0",
     "@ton/core": "^0.52.2",
     "@types/jest": "^29.5.2",
@@ -30,7 +29,7 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@ledgerhq/hw-transport": "^6.28.4",
+    "@ledgerhq/hw-transport": "^6.31.4",
     "@ton/crypto": "^3.2.0",
     "teslabot": "^1.5.0"
   },
@@ -47,5 +46,6 @@
         "filename": "CHANGELOG.md"
       }
     }
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }