@onekeyfe/onekey-ton-provider 2.2.37-alpha.1 → 2.2.37

package/dist/OnekeyTonProvider.d.ts

@@ -1,4 +1,4 @@
-import { IInpageProviderConfig } from '@onekeyfe/cross-inpage-provider-core';
+import { IInpageProviderConfig, IProviderBaseConnectionStatus } from '@onekeyfe/cross-inpage-provider-core';
 import { ProviderTonBase } from './ProviderTonBase';
 import { AppRequest, ConnectEvent, ConnectRequest, DeviceInfo, RpcMethod, WalletEvent, WalletResponse, WalletResponseError } from '@tonconnect/protocol';
 import { AccountInfo, SignDataRequest, SignDataResult, SignProofRequest, SignProofResult, TransactionRequest, WalletInfo } from './types';
@@ -37,6 +37,7 @@ export declare class ProviderTon extends ProviderTonBase implements IProviderTon
     walletInfo?: WalletInfo;
     protocolVersion: number;
     isWalletBrowser: boolean;
+    connectionStatus: IProviderBaseConnectionStatus;
     constructor(props: OneKeyTonProviderProps);
     private _getPlatform;
     private _getDeviceInfo;
@@ -51,10 +52,11 @@ export declare class ProviderTon extends ProviderTonBase implements IProviderTon
     _connect(protocolVersion?: number, message?: ConnectRequest): Promise<ConnectEvent>;
     connect(protocolVersion?: number, message?: ConnectRequest): Promise<ConnectEvent>;
     restoreConnection(): Promise<ConnectEvent>;
-    convertError<T extends RpcMethod>(id: string, error: unknown): WalletResponseError<T>;
+    convertError<T extends RpcMethod>(id: string, error: unknown, method: string): WalletResponseError<T>;
     send<T extends RpcMethod>(message: AppRequest<T>): Promise<WalletResponse<T>>;
     private _sendTransaction;
     private _signData;
+    disconnect(): Promise<void>;
     private _disconnect;
     listen(callback: (event: WalletEvent) => void): void;
 }

package/dist/OnekeyTonProvider.js

@@ -16,6 +16,9 @@ const PROVIDER_EVENTS = {
     'accountChanged': 'accountChanged',
     'message_low_level': 'message_low_level',
 };
+const TonResponseError = {
+    ParameterError: 1,
+};
 function isWalletEventMethodMatch({ method, name }) {
     return method === `wallet_events_${name}`;
 }
@@ -62,6 +65,7 @@ export class ProviderTon extends ProviderTonBase {
         };
         this.protocolVersion = 2;
         this.isWalletBrowser = false;
+        this.connectionStatus = 'disconnected';
         // void this._getDeviceInfo();
         this._registerEvents();
     }
@@ -261,14 +265,27 @@ export class ProviderTon extends ProviderTonBase {
     restoreConnection() {
         return this._connect();
     }
-    convertError(id, error) {
+    convertError(id, error, method) {
         const { code, message } = error;
         if (code === 4001) {
+            let errorMessage = ConnectEventErrorMessage.USER_DECLINED;
+            if (method === 'sendTransaction' || method === 'signData') {
+                errorMessage = SendTransactionErrorMessage.USER_REJECTS_ERROR;
+            }
             return {
                 id,
                 error: {
                     code: SEND_TRANSACTION_ERROR_CODES.USER_REJECTS_ERROR,
-                    message: ConnectEventErrorMessage.USER_DECLINED,
+                    message: errorMessage,
+                },
+            };
+        }
+        else if (code === TonResponseError.ParameterError) {
+            return {
+                id,
+                error: {
+                    code: SEND_TRANSACTION_ERROR_CODES.BAD_REQUEST_ERROR,
+                    message: message,
                 },
             };
         }
@@ -315,7 +332,7 @@ export class ProviderTon extends ProviderTonBase {
                 }
             }
             catch (error) {
-                return this.convertError(id, error);
+                return this.convertError(id, error, message.method);
             }
             if (res === undefined) {
                 return {
@@ -349,13 +366,18 @@ export class ProviderTon extends ProviderTonBase {
             return res;
         });
     }
+    disconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this._disconnect();
+        });
+    }
     _disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._callBridge({
                 method: 'disconnect',
                 params: [],
             });
-            this._handleDisconnected();
+            this._handleDisconnected({ emit: true });
         });
     }
     listen(callback) {

package/dist/cjs/OnekeyTonProvider.js

@@ -21,6 +21,9 @@ const PROVIDER_EVENTS = {
     'accountChanged': 'accountChanged',
     'message_low_level': 'message_low_level',
 };
+const TonResponseError = {
+    ParameterError: 1,
+};
 function isWalletEventMethodMatch({ method, name }) {
     return method === `wallet_events_${name}`;
 }
@@ -67,6 +70,7 @@ class ProviderTon extends ProviderTonBase_1.ProviderTonBase {
         };
         this.protocolVersion = 2;
         this.isWalletBrowser = false;
+        this.connectionStatus = 'disconnected';
         // void this._getDeviceInfo();
         this._registerEvents();
     }
@@ -266,14 +270,27 @@ class ProviderTon extends ProviderTonBase_1.ProviderTonBase {
     restoreConnection() {
         return this._connect();
     }
-    convertError(id, error) {
+    convertError(id, error, method) {
         const { code, message } = error;
         if (code === 4001) {
+            let errorMessage = types_1.ConnectEventErrorMessage.USER_DECLINED;
+            if (method === 'sendTransaction' || method === 'signData') {
+                errorMessage = types_1.SendTransactionErrorMessage.USER_REJECTS_ERROR;
+            }
             return {
                 id,
                 error: {
                     code: protocol_1.SEND_TRANSACTION_ERROR_CODES.USER_REJECTS_ERROR,
-                    message: types_1.ConnectEventErrorMessage.USER_DECLINED,
+                    message: errorMessage,
+                },
+            };
+        }
+        else if (code === TonResponseError.ParameterError) {
+            return {
+                id,
+                error: {
+                    code: protocol_1.SEND_TRANSACTION_ERROR_CODES.BAD_REQUEST_ERROR,
+                    message: message,
                 },
             };
         }
@@ -320,7 +337,7 @@ class ProviderTon extends ProviderTonBase_1.ProviderTonBase {
                 }
             }
             catch (error) {
-                return this.convertError(id, error);
+                return this.convertError(id, error, message.method);
             }
             if (res === undefined) {
                 return {
@@ -354,13 +371,18 @@ class ProviderTon extends ProviderTonBase_1.ProviderTonBase {
             return res;
         });
     }
+    disconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this._disconnect();
+        });
+    }
     _disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._callBridge({
                 method: 'disconnect',
                 params: [],
             });
-            this._handleDisconnected();
+            this._handleDisconnected({ emit: true });
         });
     }
     listen(callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-ton-provider",
-  "version": "2.2.37-alpha.1",
+  "version": "2.2.37",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -27,11 +27,11 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.2.37-alpha.1",
-    "@onekeyfe/cross-inpage-provider-errors": "2.2.37-alpha.1",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.37-alpha.1",
-    "@onekeyfe/extension-bridge-injected": "2.2.37-alpha.1",
-    "@tonconnect/protocol": "^2.2.6"
+    "@onekeyfe/cross-inpage-provider-core": "2.2.37",
+    "@onekeyfe/cross-inpage-provider-errors": "2.2.37",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.37",
+    "@onekeyfe/extension-bridge-injected": "2.2.37",
+    "@tonconnect/protocol": "^2.3.0"
   },
-  "gitHead": "86ab7dcf6ed8bd5239cda2fb65e6c278fbd7c7ab"
+  "gitHead": "0c1b9cafd7a5d6ebcf7fc20c5c279534abf85da5"
 }