@tonconnect/sdk 0.0.44 → 2.0.0

package/lib/cjs/errors/address/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WrongAddressError = void 0;
+var wrong_address_error_1 = require("./wrong-address.error");
+Object.defineProperty(exports, "WrongAddressError", { enumerable: true, get: function () { return wrong_address_error_1.WrongAddressError; } });

package/lib/cjs/errors/address/wrong-address.error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WrongAddressError = void 0;
+const errors_1 = require("..");
+class WrongAddressError extends errors_1.TonConnectError {
+    constructor(...args) {
+        super(...args);
+        Object.setPrototypeOf(this, WrongAddressError.prototype);
+    }
+}
+exports.WrongAddressError = WrongAddressError;

package/lib/cjs/errors/binary/base64-encode.error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Base64EncodeError = void 0;
+const errors_1 = require("..");
+class Base64EncodeError extends errors_1.TonConnectError {
+    constructor(...args) {
+        super(...args);
+        Object.setPrototypeOf(this, Base64EncodeError.prototype);
+    }
+}
+exports.Base64EncodeError = Base64EncodeError;

package/lib/cjs/errors/binary/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParseHexError = exports.Base64EncodeError = void 0;
+var base64_encode_error_1 = require("./base64-encode.error");
+Object.defineProperty(exports, "Base64EncodeError", { enumerable: true, get: function () { return base64_encode_error_1.Base64EncodeError; } });
+var parse_hex_error_1 = require("./parse-hex.error");
+Object.defineProperty(exports, "ParseHexError", { enumerable: true, get: function () { return parse_hex_error_1.ParseHexError; } });

package/lib/cjs/errors/binary/parse-hex.error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParseHexError = void 0;
+const errors_1 = require("..");
+class ParseHexError extends errors_1.TonConnectError {
+    constructor(...args) {
+        super(...args);
+        Object.setPrototypeOf(this, ParseHexError.prototype);
+    }
+}
+exports.ParseHexError = ParseHexError;

package/lib/cjs/errors/index.js

@@ -19,6 +19,8 @@ __exportStar(require("./protocol"), exports);
 __exportStar(require("./wallet"), exports);
 __exportStar(require("./storage"), exports);
 __exportStar(require("./wallets-manager"), exports);
+__exportStar(require("./address"), exports);
+__exportStar(require("./binary"), exports);
 var ton_connect_error_1 = require("./ton-connect.error");
 Object.defineProperty(exports, "TonConnectError", { enumerable: true, get: function () { return ton_connect_error_1.TonConnectError; } });
 var unknown_error_1 = require("./unknown.error");

package/lib/cjs/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CHAIN = exports.default = void 0;
+exports.toUserFriendlyAddress = exports.CHAIN = exports.default = void 0;
 __exportStar(require("./ton-connect"), exports);
 __exportStar(require("./models"), exports);
 __exportStar(require("./errors"), exports);
@@ -22,3 +22,5 @@ var ton_connect_1 = require("./ton-connect");
 Object.defineProperty(exports, "default", { enumerable: true, get: function () { return ton_connect_1.TonConnect; } });
 var protocol_1 = require("@tonconnect/protocol");
 Object.defineProperty(exports, "CHAIN", { enumerable: true, get: function () { return protocol_1.CHAIN; } });
+var address_1 = require("./utils/address");
+Object.defineProperty(exports, "toUserFriendlyAddress", { enumerable: true, get: function () { return address_1.toUserFriendlyAddress; } });

package/lib/cjs/utils/address.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toUserFriendlyAddress = void 0;
+const errors_1 = require("../errors");
+const protocol_1 = require("@tonconnect/protocol");
+function toUserFriendlyAddress(hexAddress) {
+    const { wc, hex } = parseHexAddress(hexAddress);
+    const bounceableTag = 0x11;
+    const addr = new Int8Array(34);
+    addr[0] = bounceableTag;
+    addr[1] = wc;
+    addr.set(hex, 2);
+    const addressWithChecksum = new Uint8Array(36);
+    addressWithChecksum.set(addr);
+    addressWithChecksum.set(crc16(addr), 34);
+    let addressBase64 = protocol_1.Base64.encode(addressWithChecksum);
+    return addressBase64.replace(/\+/g, '-').replace(/\//g, '_');
+}
+exports.toUserFriendlyAddress = toUserFriendlyAddress;
+function parseHexAddress(hexAddress) {
+    if (!hexAddress.includes(':')) {
+        throw new errors_1.WrongAddressError(`Wrong address ${hexAddress}. Address must include ":".`);
+    }
+    const parts = hexAddress.split(':');
+    if (parts.length !== 2) {
+        throw new errors_1.WrongAddressError(`Wrong address ${hexAddress}. Address must include ":" only once.`);
+    }
+    const wc = parseInt(parts[0]);
+    if (wc !== 0 && wc !== -1) {
+        throw new errors_1.WrongAddressError(`Wrong address ${hexAddress}. WC must be eq 0 or -1, but ${wc} received.`);
+    }
+    const hex = parts[1];
+    if ((hex === null || hex === void 0 ? void 0 : hex.length) !== 64) {
+        throw new errors_1.WrongAddressError(`Wrong address ${hexAddress}. Hex part must be 64bytes length, but ${hex === null || hex === void 0 ? void 0 : hex.length} received.`);
+    }
+    return {
+        wc,
+        hex: hexToBytes(hex)
+    };
+}
+function crc16(data) {
+    const poly = 0x1021;
+    let reg = 0;
+    const message = new Uint8Array(data.length + 2);
+    message.set(data);
+    for (let byte of message) {
+        let mask = 0x80;
+        while (mask > 0) {
+            reg <<= 1;
+            if (byte & mask) {
+                reg += 1;
+            }
+            mask >>= 1;
+            if (reg > 0xffff) {
+                reg &= 0xffff;
+                reg ^= poly;
+            }
+        }
+    }
+    return new Uint8Array([Math.floor(reg / 256), reg % 256]);
+}
+const toByteMap = {};
+for (let ord = 0; ord <= 0xff; ord++) {
+    let s = ord.toString(16);
+    if (s.length < 2) {
+        s = '0' + s;
+    }
+    toByteMap[s] = ord;
+}
+function hexToBytes(hex) {
+    hex = hex.toLowerCase();
+    const length2 = hex.length;
+    if (length2 % 2 !== 0) {
+        throw new errors_1.ParseHexError('Hex string must have length a multiple of 2: ' + hex);
+    }
+    const length = length2 / 2;
+    const result = new Uint8Array(length);
+    for (let i = 0; i < length; i++) {
+        const doubled = i * 2;
+        const hexSubstring = hex.substring(doubled, doubled + 2);
+        if (!toByteMap.hasOwnProperty(hexSubstring)) {
+            throw new errors_1.ParseHexError('Invalid hex character: ' + hexSubstring);
+        }
+        result[i] = toByteMap[hexSubstring];
+    }
+    return result;
+}

package/lib/cjs/wallets-list-manager.js

@@ -61,18 +61,22 @@ class WalletsListManager {
                 aboutUrl: walletConfigDTO.about_url,
                 tondns: walletConfigDTO.tondns
             };
-            if ('bridge_url' in walletConfigDTO) {
-                walletConfig.bridgeUrl = walletConfigDTO.bridge_url;
-                walletConfig.universalLink = walletConfigDTO.universal_url;
-            }
-            if ('js_bridge_key' in walletConfigDTO) {
-                const jsBridgeKey = walletConfigDTO.js_bridge_key;
-                walletConfig.jsBridgeKey = jsBridgeKey;
-                walletConfig.injected =
-                    injected_provider_1.InjectedProvider.isWalletInjected(jsBridgeKey);
-                walletConfig.embedded =
-                    injected_provider_1.InjectedProvider.isInsideWalletBrowser(jsBridgeKey);
-            }
+            walletConfigDTO.bridge.forEach(bridge => {
+                if (bridge.type === 'sse') {
+                    walletConfig.bridgeUrl = bridge.url;
+                    walletConfig.universalLink =
+                        walletConfigDTO.universal_url;
+                    walletConfig.deepLink = walletConfigDTO.deepLink;
+                }
+                if (bridge.type === 'js') {
+                    const jsBridgeKey = bridge.key;
+                    walletConfig.jsBridgeKey = jsBridgeKey;
+                    walletConfig.injected =
+                        injected_provider_1.InjectedProvider.isWalletInjected(jsBridgeKey);
+                    walletConfig.embedded =
+                        injected_provider_1.InjectedProvider.isInsideWalletBrowser(jsBridgeKey);
+                }
+            });
             return walletConfig;
         });
     }
@@ -86,10 +90,30 @@ class WalletsListManager {
         if (!containsName || !containsImage || !containsAbout) {
             return false;
         }
-        const containsUniversalUrl = 'universal_url' in value;
-        const containsHttpBridge = 'bridge_url' in value;
-        const containsJsBridge = 'js_bridge_key' in value;
-        return (containsHttpBridge && containsUniversalUrl) || containsJsBridge;
+        if (!('bridge' in value) ||
+            !Array.isArray(value.bridge) ||
+            !value.bridge.length) {
+            return false;
+        }
+        const bridge = value.bridge;
+        if (bridge.some(item => !item || typeof item !== 'object' || !('type' in item))) {
+            return false;
+        }
+        const sseBridge = bridge.find(item => item.type === 'sse');
+        if (sseBridge) {
+            if (!('url' in sseBridge) ||
+                !sseBridge.url ||
+                !value.universal_url) {
+                return false;
+            }
+        }
+        const jsBridge = bridge.find(item => item.type === 'js');
+        if (jsBridge) {
+            if (!('key' in jsBridge) || !jsBridge.key) {
+                return false;
+            }
+        }
+        return true;
     }
 }
 exports.WalletsListManager = WalletsListManager;

package/lib/esm/errors/address/index.js

@@ -0,0 +1 @@
+export { WrongAddressError } from './wrong-address.error';

package/lib/esm/errors/address/wrong-address.error.js

@@ -0,0 +1,7 @@
+import { TonConnectError } from "..";
+export class WrongAddressError extends TonConnectError {
+    constructor(...args) {
+        super(...args);
+        Object.setPrototypeOf(this, WrongAddressError.prototype);
+    }
+}

package/lib/esm/errors/binary/base64-encode.error.js

@@ -0,0 +1,7 @@
+import { TonConnectError } from "..";
+export class Base64EncodeError extends TonConnectError {
+    constructor(...args) {
+        super(...args);
+        Object.setPrototypeOf(this, Base64EncodeError.prototype);
+    }
+}

package/lib/esm/errors/binary/index.js

@@ -0,0 +1,2 @@
+export { Base64EncodeError } from './base64-encode.error';
+export { ParseHexError } from './parse-hex.error';

package/lib/esm/errors/binary/parse-hex.error.js

@@ -0,0 +1,7 @@
+import { TonConnectError } from "..";
+export class ParseHexError extends TonConnectError {
+    constructor(...args) {
+        super(...args);
+        Object.setPrototypeOf(this, ParseHexError.prototype);
+    }
+}

package/lib/esm/errors/index.js

@@ -2,5 +2,7 @@ export * from './protocol';
 export * from './wallet';
 export * from './storage';
 export * from './wallets-manager';
+export * from './address';
+export * from './binary';
 export { TonConnectError } from './ton-connect.error';
 export { UnknownError } from './unknown.error';

package/lib/esm/index.js

@@ -3,3 +3,4 @@ export * from './models';
 export * from './errors';
 export { TonConnect as default } from './ton-connect';
 export { CHAIN } from '@tonconnect/protocol';
+export { toUserFriendlyAddress } from './utils/address';

package/lib/esm/utils/address.js

@@ -0,0 +1,83 @@
+import { WrongAddressError, ParseHexError } from "../errors";
+import { Base64 } from '@tonconnect/protocol';
+export function toUserFriendlyAddress(hexAddress) {
+    const { wc, hex } = parseHexAddress(hexAddress);
+    const bounceableTag = 0x11;
+    const addr = new Int8Array(34);
+    addr[0] = bounceableTag;
+    addr[1] = wc;
+    addr.set(hex, 2);
+    const addressWithChecksum = new Uint8Array(36);
+    addressWithChecksum.set(addr);
+    addressWithChecksum.set(crc16(addr), 34);
+    let addressBase64 = Base64.encode(addressWithChecksum);
+    return addressBase64.replace(/\+/g, '-').replace(/\//g, '_');
+}
+function parseHexAddress(hexAddress) {
+    if (!hexAddress.includes(':')) {
+        throw new WrongAddressError(`Wrong address ${hexAddress}. Address must include ":".`);
+    }
+    const parts = hexAddress.split(':');
+    if (parts.length !== 2) {
+        throw new WrongAddressError(`Wrong address ${hexAddress}. Address must include ":" only once.`);
+    }
+    const wc = parseInt(parts[0]);
+    if (wc !== 0 && wc !== -1) {
+        throw new WrongAddressError(`Wrong address ${hexAddress}. WC must be eq 0 or -1, but ${wc} received.`);
+    }
+    const hex = parts[1];
+    if ((hex === null || hex === void 0 ? void 0 : hex.length) !== 64) {
+        throw new WrongAddressError(`Wrong address ${hexAddress}. Hex part must be 64bytes length, but ${hex === null || hex === void 0 ? void 0 : hex.length} received.`);
+    }
+    return {
+        wc,
+        hex: hexToBytes(hex)
+    };
+}
+function crc16(data) {
+    const poly = 0x1021;
+    let reg = 0;
+    const message = new Uint8Array(data.length + 2);
+    message.set(data);
+    for (let byte of message) {
+        let mask = 0x80;
+        while (mask > 0) {
+            reg <<= 1;
+            if (byte & mask) {
+                reg += 1;
+            }
+            mask >>= 1;
+            if (reg > 0xffff) {
+                reg &= 0xffff;
+                reg ^= poly;
+            }
+        }
+    }
+    return new Uint8Array([Math.floor(reg / 256), reg % 256]);
+}
+const toByteMap = {};
+for (let ord = 0; ord <= 0xff; ord++) {
+    let s = ord.toString(16);
+    if (s.length < 2) {
+        s = '0' + s;
+    }
+    toByteMap[s] = ord;
+}
+function hexToBytes(hex) {
+    hex = hex.toLowerCase();
+    const length2 = hex.length;
+    if (length2 % 2 !== 0) {
+        throw new ParseHexError('Hex string must have length a multiple of 2: ' + hex);
+    }
+    const length = length2 / 2;
+    const result = new Uint8Array(length);
+    for (let i = 0; i < length; i++) {
+        const doubled = i * 2;
+        const hexSubstring = hex.substring(doubled, doubled + 2);
+        if (!toByteMap.hasOwnProperty(hexSubstring)) {
+            throw new ParseHexError('Invalid hex character: ' + hexSubstring);
+        }
+        result[i] = toByteMap[hexSubstring];
+    }
+    return result;
+}

package/lib/esm/wallets-list-manager.js

@@ -58,18 +58,22 @@ export class WalletsListManager {
                 aboutUrl: walletConfigDTO.about_url,
                 tondns: walletConfigDTO.tondns
             };
-            if ('bridge_url' in walletConfigDTO) {
-                walletConfig.bridgeUrl = walletConfigDTO.bridge_url;
-                walletConfig.universalLink = walletConfigDTO.universal_url;
-            }
-            if ('js_bridge_key' in walletConfigDTO) {
-                const jsBridgeKey = walletConfigDTO.js_bridge_key;
-                walletConfig.jsBridgeKey = jsBridgeKey;
-                walletConfig.injected =
-                    InjectedProvider.isWalletInjected(jsBridgeKey);
-                walletConfig.embedded =
-                    InjectedProvider.isInsideWalletBrowser(jsBridgeKey);
-            }
+            walletConfigDTO.bridge.forEach(bridge => {
+                if (bridge.type === 'sse') {
+                    walletConfig.bridgeUrl = bridge.url;
+                    walletConfig.universalLink =
+                        walletConfigDTO.universal_url;
+                    walletConfig.deepLink = walletConfigDTO.deepLink;
+                }
+                if (bridge.type === 'js') {
+                    const jsBridgeKey = bridge.key;
+                    walletConfig.jsBridgeKey = jsBridgeKey;
+                    walletConfig.injected =
+                        InjectedProvider.isWalletInjected(jsBridgeKey);
+                    walletConfig.embedded =
+                        InjectedProvider.isInsideWalletBrowser(jsBridgeKey);
+                }
+            });
             return walletConfig;
         });
     }
@@ -83,9 +87,29 @@ export class WalletsListManager {
         if (!containsName || !containsImage || !containsAbout) {
             return false;
         }
-        const containsUniversalUrl = 'universal_url' in value;
-        const containsHttpBridge = 'bridge_url' in value;
-        const containsJsBridge = 'js_bridge_key' in value;
-        return (containsHttpBridge && containsUniversalUrl) || containsJsBridge;
+        if (!('bridge' in value) ||
+            !Array.isArray(value.bridge) ||
+            !value.bridge.length) {
+            return false;
+        }
+        const bridge = value.bridge;
+        if (bridge.some(item => !item || typeof item !== 'object' || !('type' in item))) {
+            return false;
+        }
+        const sseBridge = bridge.find(item => item.type === 'sse');
+        if (sseBridge) {
+            if (!('url' in sseBridge) ||
+                !sseBridge.url ||
+                !value.universal_url) {
+                return false;
+            }
+        }
+        const jsBridge = bridge.find(item => item.type === 'js');
+        if (jsBridge) {
+            if (!('key' in jsBridge) || !jsBridge.key) {
+                return false;
+            }
+        }
+        return true;
     }
 }

package/lib/types/errors/address/index.d.ts

@@ -0,0 +1 @@
+export { WrongAddressError } from './wrong-address.error';

package/lib/types/errors/address/wrong-address.error.d.ts

@@ -0,0 +1,4 @@
+import { TonConnectError } from "..";
+export declare class WrongAddressError extends TonConnectError {
+    constructor(...args: ConstructorParameters<typeof Error>);
+}

package/lib/types/errors/binary/base64-encode.error.d.ts

@@ -0,0 +1,4 @@
+import { TonConnectError } from "..";
+export declare class Base64EncodeError extends TonConnectError {
+    constructor(...args: ConstructorParameters<typeof Error>);
+}

package/lib/types/errors/binary/index.d.ts

@@ -0,0 +1,2 @@
+export { Base64EncodeError } from './base64-encode.error';
+export { ParseHexError } from './parse-hex.error';

package/lib/types/errors/binary/parse-hex.error.d.ts

@@ -0,0 +1,4 @@
+import { TonConnectError } from "..";
+export declare class ParseHexError extends TonConnectError {
+    constructor(...args: ConstructorParameters<typeof Error>);
+}

package/lib/types/errors/index.d.ts

@@ -2,5 +2,7 @@ export * from './protocol';
 export * from './wallet';
 export * from './storage';
 export * from './wallets-manager';
+export * from './address';
+export * from './binary';
 export { TonConnectError } from './ton-connect.error';
 export { UnknownError } from './unknown.error';

package/lib/types/index.d.ts

@@ -5,3 +5,4 @@ export { IStorage } from './storage/models/storage.interface';
 export { TonConnect as default } from './ton-connect';
 export { ITonConnect } from './ton-connect.interface';
 export { CHAIN, DeviceInfo } from '@tonconnect/protocol';
+export { toUserFriendlyAddress } from './utils/address';

package/lib/types/models/wallet/wallet-info.d.ts

@@ -21,6 +21,10 @@ export interface WalletInfoRemote extends WalletInfoBase {
      * Base part of the wallet universal url. The link should support [Ton Connect parameters]{@link https://github.com/ton-connect/docs/blob/main/bridge.md#universal-link}.
      */
     universalLink: string;
+    /**
+     * Native wallet app deepLink. The link should support [Ton Connect parameters]{@link https://github.com/ton-connect/docs/blob/main/bridge.md#universal-link}.
+     */
+    deepLink: string;
     /**
      * Url of the wallet's implementation of the [HTTP bridge]{@link https://github.com/ton-connect/docs/blob/main/bridge.md#http-bridge}.
      */
@@ -41,18 +45,21 @@ export interface WalletInfoInjected extends WalletInfoBase {
     embedded: boolean;
 }
 export declare type WalletInfo = WalletInfoRemote | WalletInfoInjected | (WalletInfoRemote & WalletInfoInjected);
-export interface WalletInfoDTOBase {
+export interface WalletInfoDTO {
     name: string;
     image: string;
     tondns?: string;
     about_url: string;
-}
-export interface WalletInfoRemoteDTO extends WalletInfoDTOBase {
     universal_url: string;
-    bridge_url: string;
+    deepLink: string;
+    bridge: (WalletInfoBridgeRemoteDTO | WalletInfoBridgeInjectedDTO)[];
+}
+export interface WalletInfoBridgeRemoteDTO {
+    type: 'sse';
+    url: string;
 }
-export interface WalletInfoInjectedDTO extends WalletInfoDTOBase {
-    js_bridge_key: string;
+export interface WalletInfoBridgeInjectedDTO {
+    type: 'js';
+    key: string;
 }
-export declare type WalletInfoDTO = WalletInfoRemoteDTO | WalletInfoInjectedDTO | (WalletInfoRemoteDTO & WalletInfoInjectedDTO);
 export declare function isWalletInfoInjected(value: WalletInfo): value is WalletInfoInjected;

package/lib/types/utils/address.d.ts

@@ -0,0 +1 @@
+export declare function toUserFriendlyAddress(hexAddress: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonconnect/sdk",
-  "version": "0.0.44",
+  "version": "2.0.0",
   "scripts": {
     "build": "npx rimraf lib && ttsc --outDir ./lib/cjs && ttsc --module esnext --outDir ./lib/esm && npx rimraf dist &&  webpack --mode development",
     "build:production": "npx rimraf lib && ttsc --project tsconfig.cjs.json --sourceMap false && ttsc --project tsconfig.esm.json --sourceMap false && npx rimraf dist &&  webpack --mode production"
@@ -28,7 +28,7 @@
     "tweetnacl": "^1.0.3",
     "eventsource": "^2.0.2",
     "node-fetch": "^2.6.7",
-    "@tonconnect/protocol": "^0.0.25"
+    "@tonconnect/protocol": "^2.0.0"
   },
   "files": [
     "lib",