Feat/required features

.eslintrc.js

@@ -33,7 +33,11 @@ module.exports = {
                             },
                             {
                                 "sourceTag": "scope:ui",
-                                "onlyDependOnLibsWithTags": ["scope:core"]
+                                "onlyDependOnLibsWithTags": ["scope:sdk"]
+                            },
+                            {
+                                "sourceTag": "scope:ui-react",
+                                "onlyDependOnLibsWithTags": ["scope:ui"]
                             }
                         ]
                     }

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 dist
 .idea
+.vscode
+.DS_Store

packages/protocol/src/models/wallet-message/wallet-event/connect-event.ts

@@ -18,6 +18,7 @@ export interface ConnectEventError {
     payload: {
         code: CONNECT_EVENT_ERROR_CODES;
         message: string;
+        device?: DeviceInfo;
     };
 }
 
@@ -28,7 +29,8 @@ export enum CONNECT_EVENT_ERROR_CODES {
     MANIFEST_CONTENT_ERROR = 3,
     UNKNOWN_APP_ERROR = 100,
     USER_REJECTS_ERROR = 300,
-    METHOD_NOT_SUPPORTED = 400
+    METHOD_NOT_SUPPORTED = 400,
+    MISSING_REQUIRED_FEATURES = 430
 }
 
 export type ConnectItemReply = TonAddressItemReply | TonProofItemReply;

packages/sdk/.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
-    extends: ["../../.eslintrc.js"],
+    extends: ['../../.eslintrc.js'],
     overrides: [
         {
             files: './vite.config.ts',
@@ -9,6 +9,12 @@ module.exports = {
                 tsconfigRootDir: __dirname,
                 createDefaultProgram: true
             },
+            '@nx/enforce-module-boundaries': [
+                'error',
+                {
+                    allow: ['scope:protocol']
+                }
+            ]
         }
     ]
 };

packages/sdk/src/errors/protocol/events/connect/index.ts

@@ -1 +1,2 @@
 export { UserRejectsError } from 'src/errors/protocol/events/connect/user-rejects.error';
+export { MissingRequiredFeaturesError } from 'src/errors/protocol/events/connect/missing-required-features.error';

packages/sdk/src/errors/protocol/events/connect/missing-required-features.error.ts

@@ -0,0 +1,21 @@
+import { DeviceInfo } from '@tonconnect/protocol';
+import { TonConnectError } from 'src/errors/ton-connect.error';
+
+/**
+ * Thrown when wallet can't get manifest by passed manifestUrl.
+ */
+export class MissingRequiredFeaturesError extends TonConnectError {
+    declare cause: {
+        device: DeviceInfo;
+    };
+
+    protected get info(): string {
+        return 'Missing required features. You need to update your wallet.';
+    }
+
+    constructor(...args: ConstructorParameters<typeof TonConnectError>) {
+        super(...args);
+
+        Object.setPrototypeOf(this, MissingRequiredFeaturesError.prototype);
+    }
+}

packages/sdk/src/models/ton-connect-options.ts

@@ -1,6 +1,8 @@
+import { Feature } from '@tonconnect/protocol';
 import { IStorage } from 'src/storage/models/storage.interface';
 import { EventDispatcher } from 'src/tracker/event-dispatcher';
 import { SdkActionEvent } from 'src/tracker/types';
+import { RequireFeature } from './wallet';
 
 /**
  * TonConnect constructor options
@@ -35,6 +37,8 @@ export interface TonConnectOptions {
      */
     walletsListCacheTTLMs?: number;
 
+    walletsRequiredFeatures?: RequireFeature[] | ((features: Feature[]) => boolean);
+
     /**
      * Allows to disable auto pause/unpause SSE connection on 'document.visibilitychange' event. It is not recommended to change default behaviour.
      */

packages/sdk/src/models/wallet/index.ts

@@ -19,3 +19,8 @@ export {
     isWalletInfoRemote,
     isWalletInfoInjected
 } from './wallet-info';
+export {
+    RequireFeature,
+    RequireSendTransactionFeature,
+    RequireSignDataFeature
+} from './require-feature';

packages/sdk/src/models/wallet/require-feature.ts

@@ -0,0 +1,11 @@
+export type RequireFeature = RequireSendTransactionFeature | RequireSignDataFeature
+
+export type RequireSendTransactionFeature = {
+    name: 'SendTransaction';
+    minMessages?: number;
+    extraCurrencyRequired?: boolean;
+};
+
+export type RequireSignDataFeature = {
+    name: 'SignData';
+};

packages/sdk/src/models/wallet/wallet-info.ts

@@ -1,3 +1,5 @@
+import { Feature } from "@tonconnect/protocol";
+
 /**
  * Common information for injectable and http-compatible wallets.
  */
@@ -27,6 +29,16 @@ export interface WalletInfoBase {
      */
     aboutUrl: string;
 
+    /**
+     * List of features supported by the wallet.
+     */
+    features?: Feature[];
+
+    /**
+     * Indicates if the wallet supports required features.
+     */
+    isSupportRequiredFeatures: boolean;
+
     /**
      * OS and browsers where the wallet could be installed
      */
@@ -119,6 +131,7 @@ export interface WalletInfoDTO {
     tondns?: string;
     about_url: string;
     universal_url?: string;
+    features?: Feature[];
     platforms: (
         | 'ios'
         | 'android'

packages/sdk/src/parsers/connect-errors-parser.ts

@@ -4,6 +4,7 @@ import { ManifestNotFoundError } from 'src/errors/protocol/events/connect/manife
 import { TonConnectError } from 'src/errors/ton-connect.error';
 import { UnknownError } from 'src/errors/unknown.error';
 import { CONNECT_EVENT_ERROR_CODES, ConnectEventError } from '@tonconnect/protocol';
+import { MissingRequiredFeaturesError } from 'src/errors/protocol/events/connect/missing-required-features.error';
 
 const connectEventErrorsCodes: Partial<Record<CONNECT_EVENT_ERROR_CODES, typeof TonConnectError>> =
     {
@@ -12,18 +13,16 @@ const connectEventErrorsCodes: Partial<Record<CONNECT_EVENT_ERROR_CODES, typeof
         [CONNECT_EVENT_ERROR_CODES.BAD_REQUEST_ERROR]: BadRequestError,
         [CONNECT_EVENT_ERROR_CODES.UNKNOWN_APP_ERROR]: UnknownAppError,
         [CONNECT_EVENT_ERROR_CODES.MANIFEST_NOT_FOUND_ERROR]: ManifestNotFoundError,
-        [CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR]: ManifestContentErrorError
+        [CONNECT_EVENT_ERROR_CODES.MANIFEST_CONTENT_ERROR]: ManifestContentErrorError,
+        [CONNECT_EVENT_ERROR_CODES.MISSING_REQUIRED_FEATURES]: MissingRequiredFeaturesError
     };
 
 class ConnectErrorsParser {
     parseError(error: ConnectEventError['payload']): TonConnectError {
-        let ErrorConstructor: typeof TonConnectError = UnknownError;
+        const ErrorConstructor = connectEventErrorsCodes[error.code] ?? UnknownError;
+        const options = "device" in error ? { cause: { device: error.device } } : undefined;
 
-        if (error.code in connectEventErrorsCodes) {
-            ErrorConstructor = connectEventErrorsCodes[error.code] || UnknownError;
-        }
-
-        return new ErrorConstructor(error.message);
+        return new ErrorConstructor(error.message, options);
     }
 }
 

packages/sdk/src/provider/injected/injected-provider.ts

@@ -3,6 +3,7 @@ import {
     AppRequest,
     ConnectEventError,
     ConnectRequest,
+    Feature,
     RpcMethod,
     WalletEvent,
     WalletResponse
@@ -47,7 +48,9 @@ export class InjectedProvider<T extends string = string> implements InternalProv
         return false;
     }
 
-    public static getCurrentlyInjectedWallets(): WalletInfoCurrentlyInjected[] {
+    public static getCurrentlyInjectedWallets(
+        checkRequiredFeatures: (features: Feature[] | undefined) => boolean
+    ): WalletInfoCurrentlyInjected[] {
         if (!this.window) {
             return [];
         }
@@ -66,7 +69,11 @@ export class InjectedProvider<T extends string = string> implements InternalProv
             jsBridgeKey,
             injected: true,
             embedded: wallet.tonconnect.isWalletBrowser,
-            platforms: wallet.tonconnect.walletInfo.platforms
+            platforms: wallet.tonconnect.walletInfo.platforms,
+            features: wallet.tonconnect.walletInfo.features,
+            isSupportRequiredFeatures: checkRequiredFeatures(
+                wallet.tonconnect.walletInfo.features
+            ),
         }));
     }
 
@@ -184,7 +191,9 @@ export class InjectedProvider<T extends string = string> implements InternalProv
     ): Promise<WithoutId<WalletResponse<T>>>;
     public async sendRequest<T extends RpcMethod>(
         request: WithoutId<AppRequest<T>>,
-        optionsOrOnRequestSent?: (() => void) | { onRequestSent?: () => void; signal?: AbortSignal; attempts?: number }
+        optionsOrOnRequestSent?:
+            | (() => void)
+            | { onRequestSent?: () => void; signal?: AbortSignal; attempts?: number }
     ): Promise<WithoutId<WalletResponse<T>>> {
         // TODO: remove deprecated method
         const options: {

packages/sdk/src/provider/injected/models/injected-wallet-api.ts

@@ -14,7 +14,7 @@ export interface InjectedWalletApi {
     deviceInfo: DeviceInfo;
     walletInfo: Pick<
         WalletInfoDTO,
-        'name' | 'app_name' | 'tondns' | 'image' | 'about_url' | 'platforms'
+        'name' | 'app_name' | 'tondns' | 'image' | 'about_url' | 'platforms' | 'features'
     >;
     protocolVersion: number;
     isWalletBrowser: boolean;

packages/sdk/src/ton-connect.ts

@@ -1,8 +1,10 @@
 import {
+    CONNECT_EVENT_ERROR_CODES,
     ConnectEventError,
     ConnectEventSuccess,
     ConnectItem,
     ConnectRequest,
+    Feature,
     SendTransactionRpcResponseSuccess,
     TonAddressItemReply,
     TonProofItemReply,
@@ -16,6 +18,7 @@ import { WalletAlreadyConnectedError } from 'src/errors/wallet/wallet-already-co
 import { WalletNotConnectedError } from 'src/errors/wallet/wallet-not-connected.error';
 import {
     Account,
+    RequireFeature,
     Wallet,
     WalletConnectionSource,
     WalletConnectionSourceHTTP,
@@ -39,7 +42,10 @@ import { ITonConnect } from 'src/ton-connect.interface';
 import { getDocument, getWebPageManifest } from 'src/utils/web-api';
 import { WalletsListManager } from 'src/wallets-list-manager';
 import { WithoutIdDistributive } from 'src/utils/types';
-import { checkSendTransactionSupport } from 'src/utils/feature-support';
+import {
+    checkSendTransactionSupport,
+    checkRequiredWalletFeatures
+} from 'src/utils/feature-support';
 import { callForSuccess } from 'src/utils/call-for-success';
 import { logDebug, logError } from 'src/utils/log';
 import { createAbortController } from 'src/utils/create-abort-controller';
@@ -90,6 +96,11 @@ export class TonConnect implements ITonConnect {
 
     private statusChangeErrorSubscriptions: ((err: TonConnectError) => void)[] = [];
 
+    private readonly walletsRequiredFeatures:
+        | RequireFeature[]
+        | ((features: Feature[]) => boolean)
+        | undefined;
+
     private abortController?: AbortController;
 
     /**
@@ -124,9 +135,12 @@ export class TonConnect implements ITonConnect {
             storage: options?.storage || new DefaultStorage()
         };
 
+        this.walletsRequiredFeatures = options?.walletsRequiredFeatures;
+
         this.walletsList = new WalletsListManager({
             walletsListSource: options?.walletsListSource,
-            cacheTTLMs: options?.walletsListCacheTTLMs
+            cacheTTLMs: options?.walletsListCacheTTLMs,
+            walletsRequiredFeatures: options?.walletsRequiredFeatures
         });
 
         this.tracker = new TonConnectTracker({
@@ -568,6 +582,21 @@ export class TonConnect implements ITonConnect {
             throw new TonConnectError('ton_addr connection item was not found');
         }
 
+        const hasRequiredFeatures = checkRequiredWalletFeatures(
+            connectEvent.device.features,
+            this.walletsRequiredFeatures ?? []
+        );
+
+        if (!hasRequiredFeatures) {
+            this.provider?.disconnect();
+            this.walletEventsListener({ event: 'connect_error', payload: {
+                code: CONNECT_EVENT_ERROR_CODES.MISSING_REQUIRED_FEATURES,
+                message: 'Wallet does not support required features',
+                device: connectEvent.device
+            } });
+            return;
+        }
+
         const wallet: Wallet = {
             device: connectEvent.device,
             provider: this.provider!.type,