@toruslabs/ethereum-controllers 4.10.1 → 5.0.0

package/dist/ethereumControllers.esm.js

@@ -1,6 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { BaseController, formatSmallNumbers, addressSlicer, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, significantDigits, TransactionStatus, BaseBlockTracker, timeout, BaseCurrencyController, BaseKeyringController, randomId, PROVIDER_JRPC_METHODS, createFetchMiddleware, createSwappableProxy, createEventEmitterProxy, BasePreferencesController, ACTIVITY_ACTION_TOPUP, TX_EVENTS, TRANSACTION_TYPES, BaseTransactionStateManager, transactionMatchesNetwork as transactionMatchesNetwork$1 } from '@toruslabs/base-controllers';
+import { BaseController, formatSmallNumbers, addressSlicer, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, significantDigits, TransactionStatus, BaseBlockTracker, timeout, BaseCurrencyController, BaseKeyringController, randomId, PROVIDER_JRPC_METHODS, createFetchMiddleware, createSwappableProxy, createEventEmitterProxy, BasePreferencesController, TX_EVENTS, TRANSACTION_TYPES, BaseTransactionStateManager, transactionMatchesNetwork as transactionMatchesNetwork$1 } from '@toruslabs/base-controllers';
 import { Mutex } from 'async-mutex';
 import { BrowserProvider, toQuantity, Contract, SigningKey, Wallet, isHexString as isHexString$1, JsonRpcProvider, Interface, keccak256 } from 'ethers';
 import log from 'loglevel';
@@ -851,14 +851,6 @@ class AccountTrackerController extends BaseController {
     this.provider = provider;
     this.blockTracker = blockTracker;
     this.ethersProvider = new BrowserProvider(this.provider, "any");
-
-    // Initiate block tracker internal tracking.
-    this.blockTracker.on("latest", block => {
-      this.configure({
-        _currentBlock: block
-      });
-      this.refresh();
-    });
     this.getIdentities = getIdentities;
     this.getCurrentChainId = getCurrentChainId;
     onPreferencesStateChange(() => {
@@ -866,6 +858,24 @@ class AccountTrackerController extends BaseController {
       const refreshNeeded = this.syncAccounts();
       if (refreshNeeded) this.refresh();
     });
+    this.blockTrackerListener = this.blockTrackerListener.bind(this);
+  }
+  blockTrackerListener(block) {
+    this.configure({
+      _currentBlock: block
+    });
+    this.refresh();
+  }
+  startPolling() {
+    this.stopPolling();
+    // Initiate block tracker internal tracking.
+    if (Object.keys(this.state.accounts).length > 0) {
+      // Adding this listener on block tracker triggers it to start polling.
+      this.blockTracker.on("latest", this.blockTrackerListener);
+    }
+  }
+  stopPolling() {
+    this.blockTracker.removeListener("latest", this.blockTrackerListener);
   }
   syncAccounts() {
     const {
@@ -3549,7 +3559,6 @@ class PreferencesController extends BasePreferencesController {
       config,
       state,
       provider,
-      blockTracker,
       signAuthMessage,
       getProviderConfig,
       setProviderConfig
@@ -3569,12 +3578,9 @@ class PreferencesController extends BasePreferencesController {
     _defineProperty(this, "getProviderConfig", void 0);
     _defineProperty(this, "setProviderConfig", void 0);
     _defineProperty(this, "provider", void 0);
-    _defineProperty(this, "blockTracker", void 0);
     this.provider = provider;
     this.getProviderConfig = getProviderConfig;
     this.setProviderConfig = setProviderConfig;
-    this.blockTracker = blockTracker;
-    log.info(this.blockTracker);
   }
   async poll(interval) {
     var _this$getAddressState;
@@ -3604,13 +3610,18 @@ class PreferencesController extends BasePreferencesController {
       locale = "en-US",
       type,
       signatures,
-      network
+      web3AuthClientId,
+      web3AuthNetwork
     } = params;
-    await super.init(address, userInfo, jwtToken, {
+    await super.init({
+      address,
+      userInfo,
+      idToken: jwtToken,
       type,
-      email: userInfo.email,
-      signatures,
-      network
+      metadata: {
+        email: userInfo.email,
+        signatures
+      }
     });
     const {
       aggregateVerifier,
@@ -3626,17 +3637,21 @@ class PreferencesController extends BasePreferencesController {
         verifier: aggregateVerifier || verifier,
         verifierId,
         locale,
-        address
+        address,
+        type,
+        web3AuthNetwork
       });
     }
-    if (!rehydrate) await this.storeUserLogin({
+    await this.storeUserLogin({
       verifier: aggregateVerifier || verifier,
       verifierId,
       options: {
         calledFromEmbed,
         rehydrate
       },
-      address
+      address,
+      web3AuthClientId,
+      web3AuthNetwork
     });
   }
   getSelectedAddress() {
@@ -3655,7 +3670,8 @@ class PreferencesController extends BasePreferencesController {
           default_public_address: defaultPublicAddress,
           customNetworks,
           customTokens,
-          customNfts
+          customNfts,
+          account_type: accountType
         } = user || {};
 
         // update latest data in state.
@@ -3667,7 +3683,8 @@ class PreferencesController extends BasePreferencesController {
           defaultPublicAddress: defaultPublicAddress || userPublicAddress,
           customTokens,
           customNfts,
-          customNetworks
+          customNetworks,
+          accountType: accountType
         }, address);
         return true;
       }
@@ -3678,13 +3695,8 @@ class PreferencesController extends BasePreferencesController {
     } finally {
       Promise.all([this.getWalletOrders(address).catch(error => {
         log.error("unable to fetch wallet orders", error);
-      }), this.getTopUpOrders(address).catch(error => {
-        log.error("unable to fetch top up orders", error);
       })]).then(data => {
-        const [walletTx, paymentTx] = data;
-        if (paymentTx) {
-          this.calculatePaymentTx(paymentTx, address);
-        }
+        const [walletTx] = data;
         // eslint-disable-next-line promise/always-return
         if (walletTx && walletTx.length > 0) {
           this.updateState({
@@ -3732,10 +3744,21 @@ class PreferencesController extends BasePreferencesController {
   async refetchEtherscanTx(address) {
     var _this$getAddressState3;
     const selectedAddress = address || this.state.selectedAddress;
-    if ((_this$getAddressState3 = this.getAddressState(selectedAddress)) !== null && _this$getAddressState3 !== void 0 && _this$getAddressState3.jwtToken) ;
+    if ((_this$getAddressState3 = this.getAddressState(selectedAddress)) !== null && _this$getAddressState3 !== void 0 && _this$getAddressState3.jwtToken) {
+      const {
+        chainId
+      } = this.getProviderConfig();
+      if (ETHERSCAN_SUPPORTED_CHAINS.includes(chainId)) {
+        return this.fetchEtherscanTx({
+          selectedAddress,
+          chainId: this.getProviderConfig().chainId
+        });
+      }
+    }
   }
   async fetchEtherscanTx(parameters) {
     try {
+      // TODO: rewrite this api to use chainId
       const url = new URL(`${this.config.api}/etherscan`);
       Object.keys(parameters).forEach(key => url.searchParams.append(key, parameters[key]));
       const response = await get(url.href, this.headers(parameters.selectedAddress));
@@ -3881,36 +3904,6 @@ class PreferencesController extends BasePreferencesController {
       return false;
     }
   }
-  calculatePaymentTx(txs, address) {
-    const accumulator = [];
-    for (const x of txs) {
-      let action = "";
-      const lowerCaseAction = x.action.toLowerCase();
-      if (ACTIVITY_ACTION_TOPUP.includes(lowerCaseAction)) action = ACTIVITY_ACTION_TOPUP;else if (ACTIVITY_ACTION_SEND.includes(lowerCaseAction)) action = ACTIVITY_ACTION_SEND;else if (ACTIVITY_ACTION_RECEIVE.includes(lowerCaseAction)) action = ACTIVITY_ACTION_RECEIVE;
-      accumulator.push({
-        id: x.id,
-        date: new Date(x.date).toDateString(),
-        from: x.from,
-        slicedFrom: x.slicedFrom,
-        action,
-        to: x.to,
-        slicedTo: x.slicedTo,
-        totalAmount: x.totalAmount,
-        totalAmountString: x.totalAmountString,
-        currencyAmount: x.currencyAmount,
-        currencyAmountString: x.currencyAmountString,
-        amount: x.amount,
-        ethRate: x.ethRate,
-        status: x.status.toLowerCase(),
-        etherscanLink: x.etherscanLink || "",
-        blockExplorerLink: "",
-        currencyUsed: x.currencyUsed
-      });
-    }
-    this.updateState({
-      paymentTx: accumulator
-    }, address);
-  }
   getChainOptions() {
     var _identities$address$c, _identities$address;
     let address = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.state.selectedAddress;