@ton-community/ton-ledger 6.0.0 → 7.0.1

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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
+
+### Fixed
+
+- Fixed incorrect VarUInt encoding of 0 (0 nanoTON, 0 jetton units, etc)
+
+## [0.7.0] - 2023-09-15
+
+### Changed
+
+- Switched `ton-core` and `ton-crypto` to `@ton/core` and `@ton/crypto`
+
 ## [6.0.0] - 2023-07-11
 
 ### Removed

package/dist/TonTransport.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import Transport from "@ledgerhq/hw-transport";
-import { Address, Cell, SendMode, StateInit } from "ton-core";
+import { Address, Cell, SendMode, StateInit } from "@ton/core";
 export type TonPayloadFormat = {
     type: 'comment';
     text: string;

package/dist/TonTransport.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonTransport = void 0;
-const ton_core_1 = require("ton-core");
-const ton_crypto_1 = require("ton-crypto");
+const core_1 = require("@ton/core");
+const crypto_1 = require("@ton/crypto");
 const teslabot_1 = require("teslabot");
 const ledgerWriter_1 = require("./utils/ledgerWriter");
 const getInit_1 = require("./utils/getInit");
@@ -80,7 +80,7 @@ class TonTransport {
         }
         // Contract
         const contract = (0, getInit_1.getInit)(chain, response);
-        const address = (0, ton_core_1.contractAddress)(chain, contract);
+        const address = (0, core_1.contractAddress)(chain, contract);
         return { address: address.toString({ bounceable, testOnly }), publicKey: response };
     }
     async validateAddress(path, opts) {
@@ -95,7 +95,7 @@ class TonTransport {
         }
         // Contract
         const contract = (0, getInit_1.getInit)(chain, response);
-        const address = (0, ton_core_1.contractAddress)(chain, contract);
+        const address = (0, core_1.contractAddress)(chain, contract);
         return { address: address.toString({ bounceable, testOnly }), publicKey: response };
     }
     async getAddressProof(path, params, opts) {
@@ -116,7 +116,7 @@ class TonTransport {
         let res = await this.#doRequest(INS_PROOF, 0x01, flags, reqBuf);
         let signature = res.slice(1, 1 + 64);
         let hash = res.slice(2 + 64, 2 + 64 + 32);
-        if (!(0, ton_crypto_1.signVerify)(hash, signature, publicKey)) {
+        if (!(0, crypto_1.signVerify)(hash, signature, publicKey)) {
             throw Error('Received signature is invalid');
         }
         return { signature, hash };
@@ -132,7 +132,7 @@ class TonTransport {
             case 'plaintext': {
                 schema = 0x754bf91b;
                 data = Buffer.from(req.text, 'ascii');
-                cell = (0, ton_core_1.beginCell)().storeStringTail(req.text).endCell();
+                cell = (0, core_1.beginCell)().storeStringTail(req.text).endCell();
                 break;
             }
             case 'app-data': {
@@ -140,7 +140,7 @@ class TonTransport {
                     throw new Error('At least one of `address` and `domain` must be set when using \'app-data\' request');
                 }
                 schema = 0x54b58535;
-                let b = (0, ton_core_1.beginCell)();
+                let b = (0, core_1.beginCell)();
                 let dp = [];
                 if (req.address !== undefined) {
                     b.storeBit(1);
@@ -153,7 +153,7 @@ class TonTransport {
                 }
                 if (req.domain !== undefined) {
                     b.storeBit(1);
-                    let inner = (0, ton_core_1.beginCell)();
+                    let inner = (0, core_1.beginCell)();
                     req.domain.split('.').reverse().forEach(p => {
                         inner.storeBuffer(Buffer.from(p, 'ascii'));
                         inner.storeUint(0, 8);
@@ -204,7 +204,7 @@ class TonTransport {
         if (!hash.equals(cell.hash())) {
             throw Error('Hash mismatch. Expected: ' + cell.hash().toString('hex') + ', got: ' + hash.toString('hex'));
         }
-        if (!(0, ton_crypto_1.signVerify)(Buffer.concat([commonPart, hash]), signature, publicKey)) {
+        if (!(0, crypto_1.signVerify)(Buffer.concat([commonPart, hash]), signature, publicKey)) {
             throw Error('Received signature is invalid');
         }
         return {
@@ -237,8 +237,8 @@ class TonTransport {
         //
         let stateInit = null;
         if (transaction.stateInit) {
-            stateInit = (0, ton_core_1.beginCell)()
-                .store((0, ton_core_1.storeStateInit)(transaction.stateInit))
+            stateInit = (0, core_1.beginCell)()
+                .store((0, core_1.storeStateInit)(transaction.stateInit))
                 .endCell();
             pkg = Buffer.concat([
                 pkg,
@@ -266,7 +266,7 @@ class TonTransport {
                     (0, ledgerWriter_1.writeUint16)(Buffer.from(transaction.payload.text).length),
                     Buffer.from(transaction.payload.text)
                 ]);
-                payload = (0, ton_core_1.beginCell)()
+                payload = (0, core_1.beginCell)()
                     .storeUint(0, 32)
                     .storeBuffer(Buffer.from(transaction.payload.text))
                     .endCell();
@@ -276,7 +276,7 @@ class TonTransport {
                     (0, ledgerWriter_1.writeUint8)(1),
                     (0, ledgerWriter_1.writeUint32)(transaction.payload.type === 'jetton-transfer' ? 0x01 : 0x02)
                 ]);
-                let b = (0, ton_core_1.beginCell)()
+                let b = (0, core_1.beginCell)()
                     .storeUint(transaction.payload.type === 'jetton-transfer' ? 0x0f8a7ea5 : 0x5fcc3d14, 32);
                 let d = Buffer.alloc(0);
                 if (transaction.payload.queryId !== null) {
@@ -356,7 +356,7 @@ class TonTransport {
         //
         // Parse response
         //
-        let orderBuilder = (0, ton_core_1.beginCell)()
+        let orderBuilder = (0, core_1.beginCell)()
             .storeBit(0)
             .storeBit(true)
             .storeBit(transaction.bounce)
@@ -391,7 +391,7 @@ class TonTransport {
                 .storeBit(false);
         }
         // Transfer message
-        let transfer = (0, ton_core_1.beginCell)()
+        let transfer = (0, core_1.beginCell)()
             .storeUint(698983191, 32)
             .storeUint(transaction.timeout, 32)
             .storeUint(transaction.seqno, 32)
@@ -405,11 +405,11 @@ class TonTransport {
         if (!hash.equals(transfer.hash())) {
             throw Error('Hash mismatch. Expected: ' + transfer.hash().toString('hex') + ', got: ' + hash.toString('hex'));
         }
-        if (!(0, ton_crypto_1.signVerify)(hash, signature, publicKey)) {
+        if (!(0, crypto_1.signVerify)(hash, signature, publicKey)) {
             throw Error('Received signature is invalid');
         }
         // Build a message
-        return (0, ton_core_1.beginCell)()
+        return (0, core_1.beginCell)()
             .storeBuffer(signature)
             .storeSlice(transfer.beginParse())
             .endCell();

package/dist/utils/getInit.d.ts

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

package/dist/utils/getInit.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInit = void 0;
-const ton_core_1 = require("ton-core");
+const core_1 = require("@ton/core");
 function getInit(workchain, publicKey) {
-    let code = ton_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];
-    let data = (0, ton_core_1.beginCell)()
+    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];
+    let data = (0, core_1.beginCell)()
         .storeUint(0, 32) // Seqno
         .storeUint(698983191 + workchain, 32)
         .storeBuffer(publicKey)

package/dist/utils/ledgerWriter.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Address, Cell } from 'ton-core';
+import { Address, Cell } from '@ton/core';
 export declare function writeUint32(value: number): Buffer;
 export declare function writeUint16(value: number): Buffer;
 export declare function writeUint64(value: bigint): Buffer;

package/dist/utils/ledgerWriter.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeCellRef = exports.writeAddress = exports.writeUint8 = exports.writeVarUInt = exports.writeUint64 = exports.writeUint16 = exports.writeUint32 = void 0;
-const ton_core_1 = require("ton-core");
+const core_1 = require("@ton/core");
 function writeUint32(value) {
     let b = Buffer.alloc(4);
     b.writeUint32BE(value, 0);
@@ -15,12 +15,12 @@ function writeUint16(value) {
 }
 exports.writeUint16 = writeUint16;
 function writeUint64(value) {
-    return (0, ton_core_1.beginCell)().storeUint(value, 64).endCell().beginParse().loadBuffer(8);
+    return (0, core_1.beginCell)().storeUint(value, 64).endCell().beginParse().loadBuffer(8);
 }
 exports.writeUint64 = writeUint64;
 function writeVarUInt(value) {
-    const sizeBytes = Math.ceil((value.toString(2).length) / 8);
-    return (0, ton_core_1.beginCell)().storeUint(sizeBytes, 8).storeUint(value, sizeBytes * 8).endCell().beginParse().loadBuffer(1 + sizeBytes);
+    const sizeBytes = value === 0n ? 0 : Math.ceil((value.toString(2).length) / 8);
+    return (0, core_1.beginCell)().storeUint(sizeBytes, 8).storeUint(value, sizeBytes * 8).endCell().beginParse().loadBuffer(1 + sizeBytes);
 }
 exports.writeVarUInt = writeVarUInt;
 function writeUint8(value) {

package/dist/utils/ledgerWriter.spec.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ton_core_1 = require("ton-core");
+const core_1 = require("@ton/core");
 const ledgerWriter_1 = require("./ledgerWriter");
 describe('ledgerWriter', () => {
     it('should write ints', () => {
@@ -27,15 +27,15 @@ describe('ledgerWriter', () => {
         expect((0, ledgerWriter_1.writeUint64)(18446744073709551615n).toString('hex')).toMatchSnapshot();
     });
     it('should write addresses', () => {
-        expect((0, ledgerWriter_1.writeAddress)(new ton_core_1.Address(0, Buffer.alloc(32))).toString('hex')).toMatchSnapshot();
-        expect((0, ledgerWriter_1.writeAddress)(new ton_core_1.Address(-1, Buffer.alloc(32))).toString('hex')).toMatchSnapshot();
-        expect((0, ledgerWriter_1.writeAddress)(ton_core_1.Address.parse('EQBNVUFfKt2QgqKL5vZvnyP50wmniCFP2ASOKAE-g2noRDlR')).toString('hex')).toMatchSnapshot();
-        expect((0, ledgerWriter_1.writeAddress)(ton_core_1.Address.parse('Ef87m7_QrVM4uXAPCDM4DuF9Rj5Rwa5nHubwiQG96JmyAjQY')).toString('hex')).toMatchSnapshot();
+        expect((0, ledgerWriter_1.writeAddress)(new core_1.Address(0, Buffer.alloc(32))).toString('hex')).toMatchSnapshot();
+        expect((0, ledgerWriter_1.writeAddress)(new core_1.Address(-1, Buffer.alloc(32))).toString('hex')).toMatchSnapshot();
+        expect((0, ledgerWriter_1.writeAddress)(core_1.Address.parse('EQBNVUFfKt2QgqKL5vZvnyP50wmniCFP2ASOKAE-g2noRDlR')).toString('hex')).toMatchSnapshot();
+        expect((0, ledgerWriter_1.writeAddress)(core_1.Address.parse('Ef87m7_QrVM4uXAPCDM4DuF9Rj5Rwa5nHubwiQG96JmyAjQY')).toString('hex')).toMatchSnapshot();
     });
     it('should write cell refs', () => {
-        expect((0, ledgerWriter_1.writeCellRef)((0, ton_core_1.beginCell)().endCell()).toString('hex')).toMatchSnapshot();
-        expect((0, ledgerWriter_1.writeCellRef)((0, ton_core_1.beginCell)().storeUint(0, 32).endCell()).toString('hex')).toMatchSnapshot();
-        expect((0, ledgerWriter_1.writeCellRef)((0, ton_core_1.beginCell)().storeUint(0, 32).storeRef((0, ton_core_1.beginCell)().endCell()).endCell()).toString('hex')).toMatchSnapshot();
-        expect((0, ledgerWriter_1.writeCellRef)((0, ton_core_1.beginCell)().storeUint(0, 32).storeRef((0, ton_core_1.beginCell)().storeRef((0, ton_core_1.beginCell)().endCell()).endCell()).endCell()).toString('hex')).toMatchSnapshot();
+        expect((0, ledgerWriter_1.writeCellRef)((0, core_1.beginCell)().endCell()).toString('hex')).toMatchSnapshot();
+        expect((0, ledgerWriter_1.writeCellRef)((0, core_1.beginCell)().storeUint(0, 32).endCell()).toString('hex')).toMatchSnapshot();
+        expect((0, ledgerWriter_1.writeCellRef)((0, core_1.beginCell)().storeUint(0, 32).storeRef((0, core_1.beginCell)().endCell()).endCell()).toString('hex')).toMatchSnapshot();
+        expect((0, ledgerWriter_1.writeCellRef)((0, core_1.beginCell)().storeUint(0, 32).storeRef((0, core_1.beginCell)().storeRef((0, core_1.beginCell)().endCell()).endCell()).endCell()).toString('hex')).toMatchSnapshot();
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ton-community/ton-ledger",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "repository": "https://github.com/ton-community/ton-ledger-ts",
   "author": "Steve Korshakov <steve@korshakov.com>",
   "license": "MIT",
@@ -15,24 +15,24 @@
     "dev": "ts-node ./test/index.ts"
   },
   "peerDependencies": {
-    "ton-core": ">=0.49.1"
+    "@ton/core": ">=0.52.2"
   },
   "devDependencies": {
-    "@release-it/keep-a-changelog": "^3.1.0",
     "@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",
     "@types/node": "^20.2.5",
     "jest": "^29.5.0",
     "release-it": "^15.11.0",
-    "ton-core": "^0.49.1",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
   },
   "dependencies": {
     "@ledgerhq/hw-transport": "^6.28.4",
-    "teslabot": "^1.5.0",
-    "ton-crypto": "^3.2.0"
+    "@ton/crypto": "^3.2.0",
+    "teslabot": "^1.5.0"
   },
   "publishConfig": {
     "access": "public",