npm - @onekeyfe/onekey-tron-provider - Versions diffs - 2.1.0 → 2.1.2 - Mend

@onekeyfe/onekey-tron-provider 2.1.0 → 2.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/ProviderTron.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import TronWeb, { UnsignedTransaction, SignedTransaction } from 'tronweb';
+import TronWeb, { UnsignedTransaction, SignedTransaction } from 'tronweb/dist/TronWeb';
 import SunWeb from 'sunweb';
 import { IInpageProviderConfig } from '@onekeyfe/cross-inpage-provider-core';
 import { ProviderTronBase } from './ProviderTronBase';
@@ -11,6 +11,9 @@ export declare const CONTRACT_ADDRESS: {
     SIDE: string;
 };
 export declare const SIDE_CHAIN_ID = "41E209E4DE650F0150788E8EC5CAFA240A23EB8EB7";
+export declare const AUTO_REQUEST_ACCOUNTS_ORIGIN_WHITE_LIST: string[];
+export declare const TRON_REQUEST_ACCOUNTS_LOCAL_KEY = "onekey_tron_request_accounts_local_key";
+export declare const TRON_REQUEST_ACCOUNTS_INTERVAL: number;
 declare class ProviderTron extends ProviderTronBase implements IProviderTron {
     readonly isTronLink = true;
     tronWeb: TronWeb | null;

package/dist/ProviderTron.js CHANGED Viewed

@@ -7,8 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import dequal from 'fast-deep-equal';
-import TronWeb from 'tronweb';
+import TronWeb from 'tronweb/dist/TronWeb';
 import SunWeb from 'sunweb';
 import { isEmpty } from 'lodash';
 import { checkWalletSwitchEnable, defineWindowProperty, } from '@onekeyfe/cross-inpage-provider-core';
@@ -17,11 +19,19 @@ import { web3Errors } from '@onekeyfe/cross-inpage-provider-errors';
 import { ProviderTronBase } from './ProviderTronBase';
 import { ProviderEvents, } from './types';
 import { isWalletEventMethodMatch } from './utils';
+import BigNumber from 'bignumber.js';
 export const CONTRACT_ADDRESS = {
     MAIN: 'TL9q7aDAHYbW5KdPCwk8oJR3bCDhRwegFf',
     SIDE: 'TGKotco6YoULzbYisTBuP6DWXDjEgJSpYz',
 };
 export const SIDE_CHAIN_ID = '41E209E4DE650F0150788E8EC5CAFA240A23EB8EB7';
+export const AUTO_REQUEST_ACCOUNTS_ORIGIN_WHITE_LIST = [
+    'https://tronscan.org',
+    'https://tronscan.io',
+];
+export const TRON_REQUEST_ACCOUNTS_LOCAL_KEY = 'onekey_tron_request_accounts_local_key';
+export const TRON_REQUEST_ACCOUNTS_INTERVAL = 10 * 60 * 1000; // ten minutes
+const globalWindow = typeof window !== 'undefined' ? window : global;
 class OneKeyTronWeb extends TronWeb {
     constructor(props, provider) {
         super(props);
@@ -98,8 +108,33 @@ class ProviderTron extends ProviderTronBase {
                 const self = this;
                 Object.defineProperty(tronWeb, 'defaultAddress', {
                     get() {
+                        var _a;
                         if (!self._connected) {
                             self._log.warn('OneKey: We recommend that DApp developers use $onekey.tron.request({method: "tron_requestAccounts"}) to request users’ account information at the earliest time possible in order to get a complete TronWeb injection.');
+                            const origin = ((_a = globalWindow === null || globalWindow === void 0 ? void 0 : globalWindow.location) === null || _a === void 0 ? void 0 : _a.origin) || '';
+                            if (origin && AUTO_REQUEST_ACCOUNTS_ORIGIN_WHITE_LIST.includes(origin)) {
+                                const requestAccountsLocalStr = localStorage.getItem(TRON_REQUEST_ACCOUNTS_LOCAL_KEY);
+                                const requestAccountsLocal = requestAccountsLocalStr
+                                    ? JSON.parse(requestAccountsLocalStr)
+                                    : null;
+                                if (requestAccountsLocal && requestAccountsLocal[origin]) {
+                                    const requestTimeStamp = requestAccountsLocal[origin];
+                                    if (new BigNumber(Date.now())
+                                        .minus(requestTimeStamp)
+                                        .isGreaterThan(TRON_REQUEST_ACCOUNTS_INTERVAL)) {
+                                        localStorage.setItem(TRON_REQUEST_ACCOUNTS_LOCAL_KEY, JSON.stringify(Object.assign(Object.assign({}, requestAccountsLocal), { [origin]: Date.now() })));
+                                        void self.request({
+                                            method: 'tron_requestAccounts',
+                                        });
+                                    }
+                                }
+                                else {
+                                    localStorage.setItem(TRON_REQUEST_ACCOUNTS_LOCAL_KEY, JSON.stringify(Object.assign(Object.assign({}, requestAccountsLocal), { [origin]: Date.now() })));
+                                    void self.request({
+                                        method: 'tron_requestAccounts',
+                                    });
+                                }
+                            }
                         }
                         return self._defaultAddress;
                     },
@@ -193,6 +228,7 @@ class ProviderTron extends ProviderTronBase {
         if (!this._connected) {
             this._connected = true;
             this._postMessage(ProviderEvents.CONNECT);
+            this._postMessage(ProviderEvents.ACCEPT_WEB);
         }
     }
     _postMessage(action, data) {

package/dist/cjs/ProviderTron.js CHANGED Viewed

@@ -12,10 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TronWeb = exports.ProviderEvents = exports.ProviderTron = exports.SIDE_CHAIN_ID = exports.CONTRACT_ADDRESS = void 0;
+exports.TronWeb = exports.ProviderEvents = exports.ProviderTron = exports.TRON_REQUEST_ACCOUNTS_INTERVAL = exports.TRON_REQUEST_ACCOUNTS_LOCAL_KEY = exports.AUTO_REQUEST_ACCOUNTS_ORIGIN_WHITE_LIST = exports.SIDE_CHAIN_ID = exports.CONTRACT_ADDRESS = void 0;
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
-const tronweb_1 = __importDefault(require("tronweb"));
-exports.TronWeb = tronweb_1.default;
+const TronWeb_1 = __importDefault(require("tronweb/dist/TronWeb"));
+exports.TronWeb = TronWeb_1.default;
 const sunweb_1 = __importDefault(require("sunweb"));
 const lodash_1 = require("lodash");
 const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
@@ -25,12 +27,20 @@ const ProviderTronBase_1 = require("./ProviderTronBase");
 const types_1 = require("./types");
 Object.defineProperty(exports, "ProviderEvents", { enumerable: true, get: function () { return types_1.ProviderEvents; } });
 const utils_1 = require("./utils");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 exports.CONTRACT_ADDRESS = {
     MAIN: 'TL9q7aDAHYbW5KdPCwk8oJR3bCDhRwegFf',
     SIDE: 'TGKotco6YoULzbYisTBuP6DWXDjEgJSpYz',
 };
 exports.SIDE_CHAIN_ID = '41E209E4DE650F0150788E8EC5CAFA240A23EB8EB7';
-class OneKeyTronWeb extends tronweb_1.default {
+exports.AUTO_REQUEST_ACCOUNTS_ORIGIN_WHITE_LIST = [
+    'https://tronscan.org',
+    'https://tronscan.io',
+];
+exports.TRON_REQUEST_ACCOUNTS_LOCAL_KEY = 'onekey_tron_request_accounts_local_key';
+exports.TRON_REQUEST_ACCOUNTS_INTERVAL = 10 * 60 * 1000; // ten minutes
+const globalWindow = typeof window !== 'undefined' ? window : global;
+class OneKeyTronWeb extends TronWeb_1.default {
     constructor(props, provider) {
         super(props);
         this.provider = provider;
@@ -106,8 +116,33 @@ class ProviderTron extends ProviderTronBase_1.ProviderTronBase {
                 const self = this;
                 Object.defineProperty(tronWeb, 'defaultAddress', {
                     get() {
+                        var _a;
                         if (!self._connected) {
                             self._log.warn('OneKey: We recommend that DApp developers use $onekey.tron.request({method: "tron_requestAccounts"}) to request users’ account information at the earliest time possible in order to get a complete TronWeb injection.');
+                            const origin = ((_a = globalWindow === null || globalWindow === void 0 ? void 0 : globalWindow.location) === null || _a === void 0 ? void 0 : _a.origin) || '';
+                            if (origin && exports.AUTO_REQUEST_ACCOUNTS_ORIGIN_WHITE_LIST.includes(origin)) {
+                                const requestAccountsLocalStr = localStorage.getItem(exports.TRON_REQUEST_ACCOUNTS_LOCAL_KEY);
+                                const requestAccountsLocal = requestAccountsLocalStr
+                                    ? JSON.parse(requestAccountsLocalStr)
+                                    : null;
+                                if (requestAccountsLocal && requestAccountsLocal[origin]) {
+                                    const requestTimeStamp = requestAccountsLocal[origin];
+                                    if (new bignumber_js_1.default(Date.now())
+                                        .minus(requestTimeStamp)
+                                        .isGreaterThan(exports.TRON_REQUEST_ACCOUNTS_INTERVAL)) {
+                                        localStorage.setItem(exports.TRON_REQUEST_ACCOUNTS_LOCAL_KEY, JSON.stringify(Object.assign(Object.assign({}, requestAccountsLocal), { [origin]: Date.now() })));
+                                        void self.request({
+                                            method: 'tron_requestAccounts',
+                                        });
+                                    }
+                                }
+                                else {
+                                    localStorage.setItem(exports.TRON_REQUEST_ACCOUNTS_LOCAL_KEY, JSON.stringify(Object.assign(Object.assign({}, requestAccountsLocal), { [origin]: Date.now() })));
+                                    void self.request({
+                                        method: 'tron_requestAccounts',
+                                    });
+                                }
+                            }
                         }
                         return self._defaultAddress;
                     },
@@ -201,6 +236,7 @@ class ProviderTron extends ProviderTronBase_1.ProviderTronBase {
         if (!this._connected) {
             this._connected = true;
             this._postMessage(types_1.ProviderEvents.CONNECT);
+            this._postMessage(types_1.ProviderEvents.ACCEPT_WEB);
         }
     }
     _postMessage(action, data) {

package/dist/cjs/types.js CHANGED Viewed

@@ -13,4 +13,5 @@ var ProviderEvents;
     ProviderEvents["MESSAGE"] = "message";
     ProviderEvents["MESSAGE_LOW_LEVEL"] = "message_low_level";
     ProviderEvents["CHAIN_CHANGED"] = "chainChanged";
+    ProviderEvents["ACCEPT_WEB"] = "acceptWeb";
 })(ProviderEvents = exports.ProviderEvents || (exports.ProviderEvents = {}));

package/dist/types.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { IJsonRpcRequest } from '@onekeyfe/cross-inpage-provider-types';
-import TronWeb, { UnsignedTransaction, SignedTransaction } from 'tronweb';
+import TronWeb, { UnsignedTransaction, SignedTransaction } from 'tronweb/dist/TronWeb';
 import { ProviderTronBase } from './ProviderTronBase';
 export declare enum ProviderEvents {
     TAB_REPLY = "tabReply",
@@ -11,7 +11,8 @@ export declare enum ProviderEvents {
     NODES_CHANGED = "nodesChanged",
     MESSAGE = "message",
     MESSAGE_LOW_LEVEL = "message_low_level",
-    CHAIN_CHANGED = "chainChanged"
+    CHAIN_CHANGED = "chainChanged",
+    ACCEPT_WEB = "acceptWeb"
 }
 export interface Nodes {
     fullHost: string;

package/dist/types.js CHANGED Viewed

@@ -10,4 +10,5 @@ export var ProviderEvents;
     ProviderEvents["MESSAGE"] = "message";
     ProviderEvents["MESSAGE_LOW_LEVEL"] = "message_low_level";
     ProviderEvents["CHAIN_CHANGED"] = "chainChanged";
+    ProviderEvents["ACCEPT_WEB"] = "acceptWeb";
 })(ProviderEvents || (ProviderEvents = {}));

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-tron-provider",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@noble/secp256k1": "1.7.1",
-    "@onekeyfe/cross-inpage-provider-core": "2.1.0",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.0",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.0",
-    "@onekeyfe/extension-bridge-injected": "2.1.0",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.2",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.2",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.2",
+    "@onekeyfe/extension-bridge-injected": "2.1.2",
     "querystring": "^0.2.1",
     "sunweb": "^1.0.7",
     "tronweb": "^5.3.2"
   },
-  "gitHead": "6c27b10b87edbd6d6c839566276c7f6f9cb4940c"
+  "gitHead": "18c5992b3eb11029f807d9488d2bb8a378e9b503"
 }