@tronweb3/tronwallet-adapter-tokenpocket 1.0.3 → 1.0.5

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@tronweb3/tronwallet-adapter-tokenpocket",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Wallet adapter for TokenPocket Wallet app.",
   "keywords": [
     "TRON",
     "TronWeb",
     "TokenPocket"
   ],
-  "author": "tronprotocol",
+  "author": "web3-geek",
   "repository": {
     "type": "git",
-    "url": "https://github.com/tronprotocol/tronwallet-adapter"
+    "url": "https://github.com/web3-geek/tronwallet-adapter"
   },
   "license": "MIT",
   "type": "module",
@@ -36,8 +36,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@tronweb3/tronwallet-abstract-adapter": "^1.1.6",
-    "@tronweb3/tronwallet-adapter-tronlink": "^1.1.9"
+    "@tronweb3/tronwallet-abstract-adapter": "^1.1.8",
+    "@tronweb3/tronwallet-adapter-tronlink": "^1.1.11"
   },
   "devDependencies": {
     "@testing-library/dom": "^8.20.0",

package/src/adapter.ts

@@ -7,7 +7,6 @@ import {
     WalletNotFoundError,
     WalletDisconnectedError,
     WalletSignTransactionError,
-    isInMobileBrowser,
     WalletGetNetworkError,
 } from '@tronweb3/tronwallet-abstract-adapter';
 import type {
@@ -16,9 +15,10 @@ import type {
     AdapterName,
     BaseAdapterConfig,
     Network,
+    TronWeb,
 } from '@tronweb3/tronwallet-abstract-adapter';
 import { getNetworkInfoByTronWeb } from '@tronweb3/tronwallet-adapter-tronlink';
-import type { TronLinkWallet } from '@tronweb3/tronwallet-adapter-tronlink';
+import type { Tron } from '@tronweb3/tronwallet-adapter-tronlink';
 import { openTokenPocket, supportTokenPocket } from './utils.js';
 
 export interface TokenPocketAdapterConfig extends BaseAdapterConfig {
@@ -36,6 +36,18 @@ export interface TokenPocketAdapterConfig extends BaseAdapterConfig {
 
 export const TokenPocketAdapterName = 'TokenPocket' as AdapterName<'TokenPocket'>;
 
+export interface TokenPocketWallet {
+    ready: boolean;
+    tronWeb: TronWeb;
+    tron: Tron;
+}
+
+declare global {
+    interface Window {
+        tokenpocket?: TokenPocketWallet;
+    }
+}
+
 export class TokenPocketAdapter extends Adapter {
     name = TokenPocketAdapterName;
     url = 'https://tokenpocket.pro/';
@@ -46,7 +58,7 @@ export class TokenPocketAdapter extends Adapter {
     private _readyState: WalletReadyState = isInBrowser() ? WalletReadyState.Loading : WalletReadyState.NotFound;
     private _state: AdapterState = AdapterState.Loading;
     private _connecting: boolean;
-    private _wallet: TronLinkWallet | null;
+    private _wallet: TokenPocketWallet | null;
     private _address: string | null;
 
     constructor(config: TokenPocketAdapterConfig = {}) {
@@ -64,12 +76,6 @@ export class TokenPocketAdapter extends Adapter {
         this._wallet = null;
         this._address = null;
 
-        if (!isInMobileBrowser()) {
-            // Currently TokenPocket extension does not support Tron.
-            this._readyState = WalletReadyState.NotFound;
-            this._state = AdapterState.NotFound;
-            return;
-        }
         if (supportTokenPocket()) {
             this._readyState = WalletReadyState.Found;
             this._updateWallet();
@@ -131,8 +137,11 @@ export class TokenPocketAdapter extends Adapter {
             }
             if (!this._wallet) return;
             this._connecting = true;
-            const wallet = this._wallet as TronLinkWallet;
-            const address = wallet.tronWeb.defaultAddress?.base58 || '';
+            const wallet = this._wallet as TokenPocketWallet;
+
+            const res = await wallet.tron.request({ method: 'eth_requestAccounts' });
+            const address = res[0];
+
             this.setAddress(address);
             this.setState(AdapterState.Connected);
             this.emit('connect', this.address || '');
@@ -171,11 +180,15 @@ export class TokenPocketAdapter extends Adapter {
         }
     }
 
-    async multiSign(...args: any[]): Promise<SignedTransaction> {
+    async multiSign(
+        transaction: Transaction,
+        privateKey?: string | false,
+        permissionId?: number
+    ): Promise<SignedTransaction> {
         try {
             const wallet = await this.checkAndGetWallet();
             try {
-                return await wallet.tronWeb.trx.multiSign(...args);
+                return await wallet.tronWeb.trx.multiSign(transaction, privateKey, permissionId);
             } catch (error: any) {
                 if (error instanceof Error) {
                     throw new WalletSignTransactionError(error.message, error);
@@ -213,7 +226,7 @@ export class TokenPocketAdapter extends Adapter {
         if (!this.connected) throw new WalletDisconnectedError();
         const wallet = this._wallet;
         if (!wallet || !wallet.tronWeb) throw new WalletDisconnectedError();
-        return wallet as TronLinkWallet;
+        return wallet as TokenPocketWallet;
     }
 
     private checkIfOpenApp() {
@@ -286,19 +299,17 @@ export class TokenPocketAdapter extends Adapter {
         let state = this.state;
         let address = this.address;
         if (supportTokenPocket()) {
-            // fake tronLink
             this._wallet = {
+                tron: window.tokenpocket?.tron,
                 ready: window.tronWeb?.ready,
-                tronWeb: window.tronWeb,
-                request: () => Promise.resolve(true) as any,
-            } as TronLinkWallet;
+                tronWeb: window.tokenpocket?.tronWeb,
+            } as TokenPocketWallet;
             address = this._wallet.tronWeb.defaultAddress?.base58 || null;
             state = window.tronWeb?.ready ? AdapterState.Connected : AdapterState.Disconnect;
             if (!window.tronWeb?.ready) {
                 this.checkForWalletReady();
             }
         } else {
-            // no tronlink support
             this._wallet = null;
             address = null;
             state = AdapterState.NotFound;

package/src/utils.ts

@@ -1,7 +1,7 @@
 import { isInBrowser, isInMobileBrowser } from '@tronweb3/tronwallet-abstract-adapter';
 
 export function supportTokenPocket() {
-    return !!isInMobileBrowser() && !!window.tronWeb && typeof (window as any).tokenpocket !== 'undefined';
+    return !!window.tronWeb && typeof (window as any).tokenpocket !== 'undefined';
 }
 
 /**