@tonconnect/sdk 0.0.35 → 0.0.37

package/lib/errors/protocol/events/connect/manifest-content-error.error.d.ts

@@ -0,0 +1,8 @@
+import { TonConnectError } from "../../../ton-connect.error";
+/**
+ * Thrown when passed manifest contains errors.
+ */
+export declare class ManifestContentErrorError extends TonConnectError {
+    private static additionalMessage;
+    constructor(message?: string);
+}

package/lib/errors/protocol/events/connect/manifest-content-error.error.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManifestContentErrorError = void 0;
+const ton_connect_error_1 = require("../../../ton-connect.error");
+/**
+ * Thrown when passed manifest contains errors.
+ */
+class ManifestContentErrorError extends ton_connect_error_1.TonConnectError {
+    constructor(message) {
+        super(message || '' + ManifestContentErrorError.additionalMessage);
+        Object.setPrototypeOf(this, ManifestContentErrorError.prototype);
+    }
+}
+exports.ManifestContentErrorError = ManifestContentErrorError;
+ManifestContentErrorError.additionalMessage = '\nPassed `tonconnect-manifest.json` contains errors. Check format of your manifest. See more https://github.com/ton-connect/docs/blob/main/requests-responses.md#app-manifest';

package/lib/errors/protocol/events/connect/manifest-not-found.error.d.ts

@@ -0,0 +1,8 @@
+import { TonConnectError } from "../../../ton-connect.error";
+/**
+ * Thrown when wallet can't get manifest by passed manifestUrl.
+ */
+export declare class ManifestNotFoundError extends TonConnectError {
+    private static additionalMessage;
+    constructor(message?: string);
+}

package/lib/errors/protocol/events/connect/manifest-not-found.error.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManifestNotFoundError = void 0;
+const ton_connect_error_1 = require("../../../ton-connect.error");
+/**
+ * Thrown when wallet can't get manifest by passed manifestUrl.
+ */
+class ManifestNotFoundError extends ton_connect_error_1.TonConnectError {
+    constructor(message) {
+        super(message || '' + ManifestNotFoundError.additionalMessage);
+        Object.setPrototypeOf(this, ManifestNotFoundError.prototype);
+    }
+}
+exports.ManifestNotFoundError = ManifestNotFoundError;
+ManifestNotFoundError.additionalMessage = '\nManifest not found. Make sure you added `tonconnect-manifest.json` to the root of your app or passed correct manifestUrl. See more https://github.com/ton-connect/docs/blob/main/requests-responses.md#app-manifest';

package/lib/errors/ton-connect.error.d.ts

@@ -2,5 +2,6 @@
  * Base class for TonConnect errors. You can check if the error was triggered by the @tonconnect/sdk using `err instanceof TonConnectError`.
  */
 export declare class TonConnectError extends Error {
-    constructor(...args: ConstructorParameters<typeof Error>);
+    private static prefix;
+    constructor(message?: string, options?: ErrorOptions);
 }

package/lib/errors/ton-connect.error.js

@@ -5,9 +5,13 @@ exports.TonConnectError = void 0;
  * Base class for TonConnect errors. You can check if the error was triggered by the @tonconnect/sdk using `err instanceof TonConnectError`.
  */
 class TonConnectError extends Error {
-    constructor(...args) {
-        super(...args);
+    constructor(message, options) {
+        if (message) {
+            message = TonConnectError.prefix + ' ' + message;
+        }
+        super(message, options);
         Object.setPrototypeOf(this, TonConnectError.prototype);
     }
 }
 exports.TonConnectError = TonConnectError;
+TonConnectError.prefix = '[TON_CONNECT_SDK_ERROR]';

package/lib/models/methods/send-transaction/send-transaction-request.d.ts

@@ -2,7 +2,7 @@ export interface SendTransactionRequest {
     /**
      * Sending transaction deadline in unix epoch seconds.
      */
-    valid_until: number;
+    validUntil: number;
     /**
      * Messages to send: min is 1, max is 4.
      */
@@ -18,7 +18,7 @@ export interface SendTransactionRequest {
         /**
          * Contract specific data to add to the transaction.
          */
-        initState?: string;
+        stateInit?: string;
         /**
          * Contract specific data to add to the transaction.
          */

package/lib/models/ton-connect-options.d.ts

@@ -1,14 +1,13 @@
-import { DappMetadata } from "./dapp/dapp-metadata";
 import { IStorage } from "../storage/models/storage.interface";
 /**
  * TonConnect constructor options
  */
 export interface TonConnectOptions {
     /**
-     * Dapp metadata that will be displayed in the user's wallet.
-     * Options will be merged with the [defaults]{@link ./dapp/dappMetedata.ts} if there are some empty fields.
+     * Url to the [manifest]{@link https://github.com/ton-connect/docs/blob/main/requests-responses.md#app-manifest} with the Dapp metadata that will be displayed in the user's wallet.
+     * If not passed, manifest from `${window.location.origin}/tonconnect-manifest.json` will be taken.
      */
-    dappMetedata?: Partial<DappMetadata>;
+    manifestUrl?: string;
     /**
      * Storage to save protocol data. For browser default is `localStorage`. If you use SDK with nodeJS, you have to specify this field.
      */

package/lib/models/wallet/account.d.ts

@@ -8,4 +8,9 @@ export interface Account {
      * User's selected chain.
      */
     chain: CHAIN;
+    /**
+     * Base64 (not url safe) encoded wallet contract stateInit.
+     * Can be used to get user's public key from the stateInit if the wallet contract doesn't support corresponding get method.
+     */
+    walletStateInit: string;
 }

package/lib/parsers/connect-errors-parser.js

@@ -2,13 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectErrorsParser = void 0;
 const errors_1 = require("../errors");
+const manifest_content_error_error_1 = require("../errors/protocol/events/connect/manifest-content-error.error");
+const manifest_not_found_error_1 = require("../errors/protocol/events/connect/manifest-not-found.error");
 const unknown_error_1 = require("../errors/unknown.error");
 const protocol_1 = require("@tonconnect/protocol");
 const connectEventErrorsCodes = {
     [protocol_1.CONNECT_EVENT_ERROR_CODES.UNKNOWN_ERROR]: unknown_error_1.UnknownError,
     [protocol_1.CONNECT_EVENT_ERROR_CODES.USER_REJECTS_ERROR]: errors_1.UserRejectsError,
     [protocol_1.CONNECT_EVENT_ERROR_CODES.BAD_REQUEST_ERROR]: errors_1.BadRequestError,
-    [protocol_1.CONNECT_EVENT_ERROR_CODES.UNKNOWN_APP_ERROR]: errors_1.UnknownAppError
+    [protocol_1.CONNECT_EVENT_ERROR_CODES.UNKNOWN_APP_ERROR]: errors_1.UnknownAppError,
+    [protocol_1.CONNECT_EVENT_ERROR_CODES.MANIFEST_NOT_FOUND_ERROR]: manifest_not_found_error_1.ManifestNotFoundError,
+    [protocol_1.CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR]: manifest_content_error_error_1.ManifestContentErrorError
 };
 class ConnectErrorsParser {
     parseError(error) {

package/lib/parsers/send-transaction-parser.d.ts

@@ -3,7 +3,9 @@ import { SendTransactionRequest, SendTransactionResponse } from "../models/metho
 import { RpcParser } from "./rpc-parser";
 import { WithoutId } from "../utils/types";
 declare class SendTransactionParser extends RpcParser<'sendTransaction'> {
-    convertToRpcRequest(request: SendTransactionRequest): WithoutId<SendTransactionRpcRequest>;
+    convertToRpcRequest(request: Omit<SendTransactionRequest, 'validUntil'> & {
+        valid_until: number;
+    }): WithoutId<SendTransactionRpcRequest>;
     parseAndThrowError(response: WithoutId<SendTransactionRpcResponseError>): never;
     convertFromRpcResponse(rpcResponse: WithoutId<SendTransactionRpcResponseSuccess>): SendTransactionResponse;
 }

package/lib/ton-connect.js

@@ -8,9 +8,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonConnect = void 0;
 const dapp_metadata_error_1 = require("./errors/dapp/dapp-metadata.error");
+const manifest_content_error_error_1 = require("./errors/protocol/events/connect/manifest-content-error.error");
+const manifest_not_found_error_1 = require("./errors/protocol/events/connect/manifest-not-found.error");
 const ton_connect_error_1 = require("./errors/ton-connect.error");
 const wallet_already_connected_error_1 = require("./errors/wallet/wallet-already-connected.error");
 const wallet_not_connected_error_1 = require("./errors/wallet/wallet-not-connected.error");
@@ -21,7 +34,6 @@ const bridge_provider_1 = require("./provider/bridge/bridge-provider");
 const injected_provider_1 = require("./provider/injected/injected-provider");
 const bridge_connection_storage_1 = require("./storage/bridge-connection-storage");
 const default_storage_1 = require("./storage/default-storage");
-const options_1 = require("./utils/options");
 const web_api_1 = require("./utils/web-api");
 const wallets_list_manager_1 = require("./wallets-list-manager");
 class TonConnect {
@@ -32,11 +44,11 @@ class TonConnect {
         this.statusChangeSubscriptions = [];
         this.statusChangeErrorSubscriptions = [];
         this.dappSettings = {
-            dappMetedata: (0, options_1.mergeOptions)(options === null || options === void 0 ? void 0 : options.dappMetedata, (0, web_api_1.getWebPageMetadata)()),
+            manifestUrl: (options === null || options === void 0 ? void 0 : options.manifestUrl) || (0, web_api_1.getWebPageManifest)(),
             storage: (options === null || options === void 0 ? void 0 : options.storage) || new default_storage_1.DefaultStorage()
         };
-        if (!this.dappSettings.dappMetedata.url) {
-            throw new dapp_metadata_error_1.DappMetadataError('Dapp url must be specified if window.location.origin is undefined.');
+        if (!this.dappSettings.manifestUrl) {
+            throw new dapp_metadata_error_1.DappMetadataError('Dapp tonconnect-manifest.json must be specified if window.location.origin is undefined. See more https://github.com/ton-connect/docs/blob/main/requests-responses.md#app-manifest');
         }
         this.bridgeConnectionStorage = new bridge_connection_storage_1.BridgeConnectionStorage(this.dappSettings.storage);
     }
@@ -132,8 +144,9 @@ class TonConnect {
      */
     sendTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { validUntil } = transaction, tx = __rest(transaction, ["validUntil"]);
             this.checkConnection();
-            const response = yield this.provider.sendRequest(send_transaction_parser_1.sendTransactionParser.convertToRpcRequest(transaction));
+            const response = yield this.provider.sendRequest(send_transaction_parser_1.sendTransactionParser.convertToRpcRequest(Object.assign(Object.assign({}, tx), { valid_until: validUntil })));
             if (send_transaction_parser_1.sendTransactionParser.isError(response)) {
                 return send_transaction_parser_1.sendTransactionParser.parseAndThrowError(response);
             }
@@ -186,7 +199,8 @@ class TonConnect {
             provider: this.provider.type,
             account: {
                 address: tonAccountItem.address,
-                chain: tonAccountItem.network
+                chain: tonAccountItem.network,
+                walletStateInit: tonAccountItem.walletStateInit
             }
         };
         if (tonProofItem) {
@@ -199,6 +213,10 @@ class TonConnect {
     onWalletConnectError(connectEventError) {
         const error = connect_errors_parser_1.connectErrorsParser.parseError(connectEventError);
         this.statusChangeErrorSubscriptions.forEach(errorsHandler => errorsHandler(error));
+        if (error instanceof manifest_not_found_error_1.ManifestNotFoundError || error instanceof manifest_content_error_error_1.ManifestContentErrorError) {
+            console.error(error);
+            throw error;
+        }
     }
     onWalletDisconnected() {
         this.wallet = null;
@@ -209,8 +227,6 @@ class TonConnect {
         }
     }
     createConnectRequest(request) {
-        const webPageMetadata = (0, web_api_1.getWebPageMetadata)();
-        const metadata = (0, options_1.mergeOptions)(this.dappSettings.dappMetedata, webPageMetadata);
         const items = [
             {
                 name: 'ton_addr'
@@ -222,7 +238,10 @@ class TonConnect {
                 payload: request.tonProof
             });
         }
-        return Object.assign(Object.assign({}, metadata), { items });
+        return {
+            manifestUrl: this.dappSettings.manifestUrl,
+            items
+        };
     }
 }
 exports.TonConnect = TonConnect;

package/lib/utils/web-api.d.ts

@@ -1,4 +1,3 @@
-import { DappMetadata } from "../models";
 export declare function getWindow(): Window | undefined;
 export declare function getDocument(): Document | undefined;
-export declare function getWebPageMetadata(): DappMetadata;
+export declare function getWebPageManifest(): string;

package/lib/utils/web-api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWebPageMetadata = exports.getDocument = exports.getWindow = void 0;
+exports.getWebPageManifest = exports.getDocument = exports.getWindow = void 0;
 function getWindow() {
     if (typeof window === 'undefined') {
         return undefined;
@@ -15,62 +15,12 @@ function getDocument() {
     return document;
 }
 exports.getDocument = getDocument;
-function getWebPageMetadata() {
-    var _a, _b;
-    return {
-        url: ((_a = getWindow()) === null || _a === void 0 ? void 0 : _a.location.origin) || '',
-        icon: getIconUrl(),
-        name: ((_b = getDocument()) === null || _b === void 0 ? void 0 : _b.title) || 'Unknown dapp'
-    };
-}
-exports.getWebPageMetadata = getWebPageMetadata;
-function getIconUrl() {
-    const document = getDocument();
-    if (!document) {
-        return '';
-    }
-    const appleTouchIcons = document.querySelectorAll("link[rel='apple-touch-icon']");
-    if (appleTouchIcons === null || appleTouchIcons === void 0 ? void 0 : appleTouchIcons.length) {
-        return getLargestSizeIconUrl(Array.from(appleTouchIcons));
-    }
-    const links = Array.from(document.querySelectorAll("link[rel*='icon']"));
-    const pngLinks = links.filter(link => link.href.endsWith('.png'));
-    if (pngLinks.length) {
-        return getLargestSizeIconUrl(pngLinks);
-    }
-    const icoIcon = links.filter(link => link.href.endsWith('.ico'))[0];
-    return (icoIcon === null || icoIcon === void 0 ? void 0 : icoIcon.href) || '';
-}
-function getLargestSizeIconUrl(links) {
-    const parsedLinks = links.map(parseIconLink);
-    const maxSizeIcon = parsedLinks.sort((a, b) => (b.size > a.size ? 1 : -1))[0];
-    return (maxSizeIcon === null || maxSizeIcon === void 0 ? void 0 : maxSizeIcon.href) || '';
-}
-function parseIconLink(link) {
+function getWebPageManifest() {
     var _a;
-    if (!((_a = link.sizes) === null || _a === void 0 ? void 0 : _a.value)) {
-        return {
-            href: link.href,
-            size: 0
-        };
-    }
-    const sizes = Array.from(link.sizes)
-        .map(size => {
-        const groups = size.match(/(\d+)x(\d+)/i);
-        if (!groups || !groups[1] || !groups[2]) {
-            return undefined;
-        }
-        return parseInt(groups[1]) * parseInt(groups[2]);
-    })
-        .filter(item => !!item);
-    if (sizes.length === 0) {
-        return {
-            href: link.href,
-            size: 0
-        };
+    const origin = (_a = getWindow()) === null || _a === void 0 ? void 0 : _a.location.origin;
+    if (origin) {
+        return origin + '/tonconnect-manifest.json';
     }
-    return {
-        href: link.href,
-        size: Math.max.apply(Math, sizes)
-    };
+    return '';
 }
+exports.getWebPageManifest = getWebPageManifest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonconnect/sdk",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "scripts": {
     "build": "npx rimraf lib && ttsc && npx rimraf dist &&  webpack --mode development",
     "build:production": "npx rimraf lib && ttsc --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.21"
+    "@tonconnect/protocol": "^0.0.22"
   },
   "files": [
     "lib",