@tonconnect/sdk 3.4.0-beta.0 → 3.4.0-beta.1

package/lib/cjs/index.cjs

@@ -169,6 +169,14 @@ class WalletMissingRequiredFeaturesError extends TonConnectError {
     }
 }
 
+class WalletWrongNetworkError extends TonConnectError {
+    constructor(message, options) {
+        super(message, options);
+        this.name = 'WalletWrongNetworkError';
+        Object.setPrototypeOf(this, WalletWrongNetworkError.prototype);
+    }
+}
+
 function isWalletConnectionSourceJS(value) {
     return 'jsBridgeKey' in value;
 }
@@ -3786,7 +3794,7 @@ class TonConnectTracker {
     }
 }
 
-const tonConnectSdkVersion = "3.4.0-beta.0";
+const tonConnectSdkVersion = "3.4.0-beta.1";
 
 const bounceableTag = 0x11;
 const noBounceableTag = 0x51;
@@ -4784,10 +4792,13 @@ class TonConnect {
         var _a, _b, _c;
         // TODO: remove deprecated method
         const options = Object.assign({}, additionalOptions);
-        if (typeof requestOrOptions === 'object' && 'tonProof' in requestOrOptions) {
+        if (typeof requestOrOptions === 'object' &&
+            requestOrOptions !== null &&
+            'tonProof' in requestOrOptions) {
             options.request = requestOrOptions;
         }
         if (typeof requestOrOptions === 'object' &&
+            requestOrOptions !== null &&
             ('openingDeadlineMS' in requestOrOptions ||
                 'signal' in requestOrOptions ||
                 'request' in requestOrOptions ||
@@ -4925,7 +4936,7 @@ class TonConnect {
     }
     sendTransaction(transaction, optionsOrOnRequestSent) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c;
             // TODO: remove deprecated method
             const options = {};
             if (typeof optionsOrOnRequestSent === 'function') {
@@ -4963,6 +4974,14 @@ class TonConnect {
             const { validUntil, messages } = transaction, tx = __rest(transaction, ["validUntil", "messages"]);
             const from = transaction.from || this.account.address;
             const network = transaction.network || this.account.chain;
+            if (((_b = this.wallet) === null || _b === void 0 ? void 0 : _b.account.chain) && network !== this.wallet.account.chain) {
+                throw new WalletWrongNetworkError('Wallet connected to a wrong network', {
+                    cause: {
+                        expectedChainId: (_c = this.wallet) === null || _c === void 0 ? void 0 : _c.account.chain,
+                        actualChainId: network
+                    }
+                });
+            }
             const response = yield this.provider.sendRequest(sendTransactionParser.convertToRpcRequest(Object.assign(Object.assign({}, tx), { from,
                 network, valid_until: validUntil, messages: messages.map((_a) => {
                     var { extraCurrency, payload, stateInit } = _a, msg = __rest(_a, ["extraCurrency", "payload", "stateInit"]);
@@ -4983,7 +5002,7 @@ class TonConnect {
     }
     signData(data, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c;
             const abortController = createAbortController(options === null || options === void 0 ? void 0 : options.signal);
             if (abortController.signal.aborted) {
                 throw new TonConnectError('data sending was aborted');
@@ -5005,6 +5024,14 @@ class TonConnect {
             this.tracker.trackDataSentForSignature(this.wallet, data, sessionInfo, traceId);
             const from = data.from || this.account.address;
             const network = data.network || this.account.chain;
+            if (((_b = this.wallet) === null || _b === void 0 ? void 0 : _b.account.chain) && network !== this.wallet.account.chain) {
+                throw new WalletWrongNetworkError('Wallet connected to a wrong network', {
+                    cause: {
+                        expectedChainId: (_c = this.wallet) === null || _c === void 0 ? void 0 : _c.account.chain,
+                        actualChainId: network
+                    }
+                });
+            }
             const response = yield this.provider.sendRequest(signDataParser.convertToRpcRequest(Object.assign(Object.assign(Object.assign({}, data), (data.type === 'cell' ? { cell: normalizeBase64(data.cell) } : {})), { from,
                 network })), { onRequestSent: options === null || options === void 0 ? void 0 : options.onRequestSent, signal: abortController.signal, traceId });
             if (signDataParser.isError(response)) {
@@ -5016,6 +5043,17 @@ class TonConnect {
             return Object.assign(Object.assign({}, result), { traceId });
         });
     }
+    /**
+     * Set desired network for the connection. Can only be set before connecting.
+     * If wallet connects with a different chain, the SDK will throw an error and abort connection.
+     * @param network desired network id (e.g., '-239', '-3', or custom). Pass undefined to allow any network.
+     */
+    setConnectionNetwork(network) {
+        if (this.connected) {
+            throw new TonConnectError('Cannot change network while wallet is connected');
+        }
+        this.desiredChainId = network;
+    }
     /**
      * Disconnect form thw connected wallet and drop current session.
      */
@@ -5158,7 +5196,7 @@ class TonConnect {
         }
     }
     onWalletConnected(connectEvent, options) {
-        var _a;
+        var _a, _b;
         const tonAccountItem = connectEvent.items.find(item => item.name === 'ton_addr');
         const tonProofItem = connectEvent.items.find(item => item.name === 'ton_proof');
         if (!tonAccountItem) {
@@ -5180,6 +5218,15 @@ class TonConnect {
                 publicKey: tonAccountItem.publicKey
             }
         };
+        if (this.desiredChainId && wallet.account.chain !== this.desiredChainId) {
+            const expectedChainId = this.desiredChainId;
+            const actualChainId = wallet.account.chain;
+            (_b = this.provider) === null || _b === void 0 ? void 0 : _b.disconnect();
+            this.onWalletConnectError(new WalletWrongNetworkError('Wallet connected to a wrong network', {
+                cause: { expectedChainId, actualChainId }
+            }));
+            return;
+        }
         if (tonProofItem) {
             const validationError = validateTonProofItemReply(tonProofItem);
             let tonProof = undefined;
@@ -5260,9 +5307,7 @@ class TonConnect {
     }
     createConnectRequest(request) {
         const items = [
-            {
-                name: 'ton_addr'
-            }
+            Object.assign({ name: 'ton_addr' }, (this.desiredChainId ? { network: this.desiredChainId } : {}))
         ];
         if (request === null || request === void 0 ? void 0 : request.tonProof) {
             items.push({
@@ -5328,6 +5373,7 @@ exports.WalletMissingRequiredFeaturesError = WalletMissingRequiredFeaturesError;
 exports.WalletNotConnectedError = WalletNotConnectedError;
 exports.WalletNotInjectedError = WalletNotInjectedError;
 exports.WalletNotSupportFeatureError = WalletNotSupportFeatureError;
+exports.WalletWrongNetworkError = WalletWrongNetworkError;
 exports.WalletsListManager = WalletsListManager;
 exports.WrongAddressError = WrongAddressError;
 exports.checkRequiredWalletFeatures = checkRequiredWalletFeatures;