@subwallet/extension-base 0.8.1-wr2x → 0.8.1-wr3

package/cjs/koni/background/handlers/State.js

@@ -11,12 +11,12 @@ var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
 var _subscriptions = require("@subwallet/extension-base/background/handlers/subscriptions");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
-var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
 var _balanceService = require("@subwallet/extension-base/services/balance-service");
 var _chainService = require("@subwallet/extension-base/services/chain-service");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _historyService = require("@subwallet/extension-base/services/history-service");
+var _NotificationService = _interopRequireDefault(require("@subwallet/extension-base/services/notification-service/NotificationService"));
 var _priceService = require("@subwallet/extension-base/services/price-service");
 var _requestService = _interopRequireDefault(require("@subwallet/extension-base/services/request-service"));
 var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/services/setting-service/SettingService"));
@@ -94,22 +94,20 @@ class KoniState {
     fastInterval: []
   };
   lazyMap = {};
-
-  // TODO: consider making chainService public (or getter) and call function directly
-
   ready = false;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor() {
     let providers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     this.providers = providers;
     this.dbService = new _DatabaseService.default();
+    this.notificationService = new _NotificationService.default();
     this.chainService = new _chainService.ChainService(this.dbService);
     this.settingService = new _SettingService.default();
-    this.requestService = new _requestService.default(this.chainService);
+    this.requestService = new _requestService.default(this.chainService, this.settingService);
     this.priceService = new _priceService.PriceService(this.dbService, this.chainService);
-    this.balanceService = new _balanceService.BalanceService(_balance.getFreeBalance);
+    this.balanceService = new _balanceService.BalanceService(this.chainService);
     this.historyService = new _historyService.HistoryService(this.dbService, this.chainService);
-    this.transactionService = new _transactionService.default(this.chainService, this.requestService, this.balanceService, this.historyService);
+    this.transactionService = new _transactionService.default(this.chainService, this.requestService, this.balanceService, this.historyService, this.notificationService);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
     this.logger = (0, _util.logger)('State');
@@ -188,10 +186,6 @@ class KoniState {
   saveMetadata(meta) {
     this.requestService.saveMetadata(meta);
   }
-  setNotification(notification) {
-    this.requestService.setNotification(notification);
-    return true;
-  }
   sign(url, request, account) {
     return this.requestService.sign(url, request, account);
   }
@@ -682,6 +676,16 @@ class KoniState {
       });
     });
   }
+  setCamera(value) {
+    this.settingService.getSettings(settings => {
+      const newSettings = {
+        ...settings,
+        camera: value
+      };
+      console.log(newSettings, value);
+      this.settingService.setSettings(newSettings);
+    });
+  }
   subscribeSettingsSubject() {
     return this.settingService.getSubject();
   }

package/cjs/services/balance-service/index.js

@@ -4,12 +4,105 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BalanceService = void 0;
+var _BalanceError = require("@subwallet/extension-base/background/errors/BalanceError");
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
+var _handlers = require("@subwallet/extension-base/koni/background/handlers");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 class BalanceService {
-  constructor(getFreeBalance) {
-    this.getFreeBalance = getFreeBalance;
+  constructor(chainService) {
+    this.chainService = chainService;
+
+    // Todo: Load data from db to balanceSubject
+    // Todo: Start  subscribe balance and data
+    // Todo: Listen change and apply to balanceSubject
+    // Todo: Active/Chain
+    // Todo: Add/remove account
+    // Todo: Add new account
+    // Todo: Optimize get balance for single account and chain with cache
+    // Todo: Move everything of fetching balance to this service
+  }
+
+  async subscribeTokenFreeBalance(address, chain, tokenSlug, callback) {
+    const chainInfo = this.chainService.getChainInfoByKey(chain);
+    const chainState = this.chainService.getChainStateByKey(chain);
+    if (!chainInfo || !chainState || !chainState.active) {
+      return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.NETWORK_ERROR, `Chain ${chain} is not active`));
+    }
+    const tSlug = tokenSlug || (0, _utils._getChainNativeTokenSlug)(chainInfo);
+    const tokenInfo = this.chainService.getAssetBySlug(tSlug);
+    if (!tokenInfo) {
+      return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.TOKEN_ERROR, `Token ${tSlug} is not supported`));
+    }
+    return new Promise((resolve, reject) => {
+      let hasError = true;
+      const unsub = this.subscribeBalance([address], [chain], rs => {
+        if (rs.tokenSlug === tSlug) {
+          hasError = false;
+          const balance = {
+            value: rs.free,
+            decimals: tokenInfo.decimals || 0,
+            symbol: tokenInfo.symbol
+          };
+          if (callback) {
+            callback(balance);
+          } else {
+            // Auto unsubscribe if no callback
+            unsub();
+          }
+          resolve([unsub, balance]);
+        }
+      });
+      setTimeout(() => {
+        if (hasError) {
+          unsub();
+          reject(new Error('Get Balance Timeout'));
+        }
+      }, 9999);
+    });
+  }
+  async getTokenFreeBalance(address, chain, tokenSlug) {
+    const [, balance] = await this.subscribeTokenFreeBalance(address, chain, tokenSlug);
+    return balance;
+  }
+  subscribeBalance(addresses, chains, callback) {
+    const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
+    const chainInfoMap = this.chainService.getChainInfoMap();
+    const chainStateMap = this.chainService.getChainStateMap();
+    const substrateApiMap = this.chainService.getSubstrateApiMap();
+    const evmApiMap = this.chainService.getEvmApiMap();
+
+    // Get data from chain or all chains
+    const chainList = chains || Object.keys(chainInfoMap);
+    // Filter active chain only
+    const useChainInfos = chainList.filter(c => chainStateMap[c] && chainStateMap[c].active).map(c => chainInfoMap[c]);
+
+    // Looping over each chain
+    const unsubList = useChainInfos.map(async chainInfo => {
+      const chainSlug = chainInfo.slug;
+      const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
+      if ((0, _utils._isPureEvmChain)(chainInfo)) {
+        const nativeTokenInfo = _handlers.state.getNativeTokenInfo(chainSlug);
+        return (0, _balance.subscribeEVMBalance)(chainSlug, useAddresses, evmApiMap, callback, nativeTokenInfo);
+      }
+      if (!useAddresses || useAddresses.length === 0 || _constants._PURE_EVM_CHAINS.indexOf(chainSlug) > -1) {
+        return undefined;
+      }
+      const networkAPI = await substrateApiMap[chainSlug].isReady;
+      return (0, _balance.subscribeSubstrateBalance)(useAddresses, chainInfo, chainSlug, networkAPI, evmApiMap, callback);
+    });
+    return () => {
+      unsubList.forEach(subProm => {
+        subProm.then(unsub => {
+          unsub && unsub();
+        }).catch(console.error);
+      });
+    };
   }
 }
 exports.BalanceService = BalanceService;

package/cjs/services/chain-service/utils.js

@@ -339,12 +339,22 @@ function _getAssetDecimals(assetInfo) {
   return assetInfo.decimals || 0;
 }
 function _getBlockExplorerFromChain(chainInfo) {
-  var _chainInfo$substrateI12;
+  let blockExplorer;
   if (_isPureEvmChain(chainInfo)) {
     var _chainInfo$evmInfo4;
-    return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.blockExplorer) || '';
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.blockExplorer;
+  } else {
+    var _chainInfo$substrateI12;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : _chainInfo$substrateI12.blockExplorer;
+  }
+  if (!blockExplorer) {
+    return undefined;
+  }
+  if (blockExplorer !== '' && !blockExplorer.endsWith('/')) {
+    return `${blockExplorer}/`;
+  } else {
+    return blockExplorer;
   }
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : _chainInfo$substrateI12.blockExplorer) || '';
 }
 function _parseMetadataForSmartContractAsset(contractAddress) {
   return {

package/cjs/services/notification-service/NotificationService.js

@@ -4,12 +4,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _rxjs = require("rxjs");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 class NotificationService {
+  notificationSubject = new _rxjs.BehaviorSubject([]);
+  getNotificationSubject() {
+    return this.notificationSubject;
+  }
+  notify(notification) {
+    const now = new Date().getTime();
+    // Get values in last 30 seconds only
+    const notifications = this.notificationSubject.value.filter(n => n.id < now - 30000);
+
+    // Push notification
+    notifications.push({
+      ...notification,
+      id: now
+    });
+    this.notificationSubject.next(notifications);
+    if (notification.notifyViaBrowser) {
+      var _notification$action;
+      NotificationService.createBrowserNotification(notification.title, notification.message, notification === null || notification === void 0 ? void 0 : (_notification$action = notification.action) === null || _notification$action === void 0 ? void 0 : _notification$action.url);
+    }
+  }
+
   // Create a new chrome notification with link
-  static createNotification(title, message, link) {
+  static createBrowserNotification(title, message, link) {
     chrome.notifications.create({
       type: 'basic',
       title,

package/cjs/services/request-service/handler/PopupHandler.js

@@ -1,12 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
-var _uiSettings = _interopRequireDefault(require("@polkadot/ui-settings"));
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -27,10 +25,17 @@ const NORMAL_WINDOW_OPTS = {
 };
 class PopupHandler {
   #requestService;
-  #notification = _uiSettings.default.notification;
+  #notification = 'popup';
   #windows = [];
   constructor(requestService) {
     this.#requestService = requestService;
+    const updateNotification = rs => {
+      this.#notification = rs.browserConfirmationType;
+    };
+    requestService.settingService.getSettings(updateNotification);
+    requestService.settingService.getSubject().subscribe({
+      next: updateNotification
+    });
   }
   updateIconV2(shouldClose) {
     const numRequests = this.#requestService.numRequests;
@@ -45,10 +50,6 @@ class PopupHandler {
       this.popupClose();
     }
   }
-  setNotification(notification) {
-    this.#notification = notification;
-    return true;
-  }
   get popup() {
     return this.#windows;
   }
@@ -58,19 +59,12 @@ class PopupHandler {
   }
   popupOpen() {
     if (this.#notification !== 'extension') {
-      if (this.#notification === 'window') {
-        chrome.windows.create(NORMAL_WINDOW_OPTS, window => {
-          if (window) {
-            this.#windows.push(window.id || 0);
-          }
-        });
-      }
       chrome.windows.getCurrent(win => {
         const popupOptions = {
-          ...POPUP_WINDOW_OPTS
+          ...(this.#notification === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS)
         };
         if (win) {
-          popupOptions.left = (win.left || 0) + (win.width || 0) - (POPUP_WINDOW_OPTS.width || 0) - 20;
+          popupOptions.left = (win.left || 0) + (win.width || 0) - (popupOptions.width || 0) - 20;
           popupOptions.top = (win.top || 0) + 80;
         }
         chrome.windows.create(popupOptions, window => {

package/cjs/services/request-service/index.js

@@ -24,8 +24,9 @@ class RequestService {
   #evmRequestHandler;
 
   // Common
-  constructor(chainService) {
+  constructor(chainService, settingService) {
     this.#chainService = chainService;
+    this.settingService = settingService;
     this.#popupHandler = new _PopupHandler.default(this);
     this.#metadataRequestHandler = new _MetadataRequestHandler.default(this);
     this.#authRequestHandler = new _AuthRequestHandler.default(this, this.#chainService);
@@ -51,11 +52,6 @@ class RequestService {
   }
 
   // Popup
-
-  setNotification(notification) {
-    this.#popupHandler.setNotification(notification);
-    return true;
-  }
   get popup() {
     return this.#popupHandler.popup;
   }

package/cjs/services/setting-service/SettingService.js

@@ -24,7 +24,8 @@ class SettingService {
           // isShowZeroBalance: true,
           isShowBalance: false,
           accountAllLogo: '',
-          theme: _KoniTypes.ThemeNames.DARK
+          theme: _KoniTypes.ThemeNames.DARK,
+          camera: false
         });
       } else {
         update(value);

package/cjs/services/storage-service/DatabaseService.js

@@ -41,9 +41,7 @@ class DatabaseService {
   }
   async getPriceStore() {
     try {
-      console.log('abcd');
       const rs = await this.stores.price.table.get('usd');
-      console.log('abcd', rs);
       return rs;
     } catch (e) {
       return undefined;
@@ -51,6 +49,9 @@ class DatabaseService {
   }
 
   // Balance
+  async getStoredBalance() {
+    return this.stores.balance.table.toArray();
+  }
   async updateBalanceStore(address, item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
       this.logger.log(`Updating balance for [${item.tokenSlug}]`);

package/cjs/services/storage-service/db-stores/Balance.js

@@ -28,30 +28,5 @@ class BalanceStore extends _BaseStoreWithAddress.default {
   async removeBySlugs(tokenSlugs) {
     return this.table.where('tokenSlug').anyOfIgnoreCase(tokenSlugs).delete();
   }
-
-  // private balanceSub!: Subscription;
-  // liveQueryBalance (address: string, cb: (result: BalanceJson) => void) {
-  //   if (this.balanceSub) {
-  //     this.balanceSub.unsubscribe();
-  //   }
-  //
-  //   const subscription = liveQuery(
-  //     () => this.table.where('address').equals(address).toArray()
-  //   );
-  //
-  //   this.balanceSub = subscription.subscribe({
-  //     next: (rs) => {
-  //       const data = this.convertToJsonObject(rs);
-  //
-  //       if (Object.keys(data).length) {
-  //         const res: BalanceJson = { details: data };
-  //
-  //         cb(res);
-  //       }
-  //     }
-  //   });
-  //
-  //   return this.balanceSub;
-  // }
 }
 exports.default = BalanceStore;

package/cjs/services/transaction-service/index.js

@@ -10,7 +10,6 @@ var _TransactionError = require("@subwallet/extension-base/background/errors/Tra
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _TransactionWarning = require("@subwallet/extension-base/background/warnings/TransactionWarning");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _NotificationService = _interopRequireDefault(require("@subwallet/extension-base/services/notification-service/NotificationService"));
 var _constants = require("@subwallet/extension-base/services/request-service/constants");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
 var _utils2 = require("@subwallet/extension-base/services/transaction-service/utils");
@@ -30,11 +29,12 @@ class TransactionService {
   get transactions() {
     return this.transactionSubject.getValue();
   }
-  constructor(chainService, requestService, balanceService, historyService) {
+  constructor(chainService, requestService, balanceService, historyService, notificationService) {
     this.chainService = chainService;
     this.requestService = requestService;
     this.balanceService = balanceService;
     this.historyService = historyService;
+    this.notificationService = notificationService;
   }
   get allTransactions() {
     return Object.values(this.transactions);
@@ -129,10 +129,10 @@ class TransactionService {
     // Balance
     const transferNative = validationResponse.transferNativeAmount || '0';
     const nativeTokenInfo = this.chainService.getNativeTokenInfo(chain);
-    const balance = await this.balanceService.getFreeBalance(chain, address, this.chainService.getSubstrateApiMap(), this.chainService.getEvmApiMap());
+    const balance = await this.balanceService.getTokenFreeBalance(address, chain, nativeTokenInfo.slug);
     const existentialDeposit = nativeTokenInfo.minAmount || '0';
     const feeNum = parseInt(estimateFee.value);
-    const balanceNum = parseInt(balance);
+    const balanceNum = parseInt(balance.value);
     const edNum = parseInt(existentialDeposit);
     const transferNativeNum = parseInt(transferNative);
     if (transferNativeNum + feeNum > balanceNum) {
@@ -403,7 +403,15 @@ class TransactionService {
       blockNumber: blockNumber || 0,
       blockHash: blockHash || ''
     }).catch(console.error);
-    _NotificationService.default.createNotification('Transaction completed', `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} completed`, this.getTransactionLink(id));
+    this.notificationService.notify({
+      type: _KoniTypes.NotificationType.SUCCESS,
+      title: 'Transaction completed',
+      message: `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} completed`,
+      action: {
+        url: this.getTransactionLink(id)
+      },
+      notifyViaBrowser: true
+    });
   }
   onFailed(_ref3) {
     let {
@@ -426,7 +434,15 @@ class TransactionService {
         blockNumber: blockNumber || 0,
         blockHash: blockHash || ''
       }).catch(console.error);
-      _NotificationService.default.createNotification('Transaction failed', `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} failed`, this.getTransactionLink(id));
+      this.notificationService.notify({
+        type: _KoniTypes.NotificationType.ERROR,
+        title: 'Transaction failed',
+        message: `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} failed`,
+        action: {
+          url: this.getTransactionLink(id)
+        },
+        notifyViaBrowser: true
+      });
     }
 
     // Log transaction errors

package/koni/api/dotsama/balance.d.ts

@@ -2,6 +2,7 @@ import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { BalanceItem } from '@subwallet/extension-base/background/KoniTypes';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 export declare function subscribeBalance(addresses: string[], chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem) => void): () => void;
+export declare function subscribeSubstrateBalance(addresses: string[], chainInfo: _ChainInfo, chain: string, networkAPI: _SubstrateApi, evmApiMap: Record<string, _EvmApi>, callBack: (rs: BalanceItem) => void): Promise<() => void>;
 export declare function subscribeEVMBalance(chain: string, addresses: string[], evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem) => void, tokenInfo: _ChainAsset): () => void;
 export declare function getFreeBalance(chain: string, address: string, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, tokenSlug?: string): Promise<string>;
 export declare function subscribeFreeBalance(chain: string, address: string, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, token: string | undefined, update: (balance: string) => void): Promise<() => void>;

package/koni/api/dotsama/balance.js

@@ -38,7 +38,7 @@ export function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmAp
     });
   };
 }
-async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI, evmApiMap, callBack) {
+export async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI, evmApiMap, callBack) {
   let unsubNativeToken;
   if (_BALANCE_CHAIN_GROUP.crab.includes(chain)) {
     unsubNativeToken = subscribeDarwiniaBalance(addresses, chainInfo, chain, networkAPI.api, callBack);

package/koni/background/handlers/Extension.d.ts

@@ -52,6 +52,7 @@ export default class KoniExtension {
     private _forgetAllSite;
     private forgetAllSite;
     private getNonReadonlyAccounts;
+    private isAddressValidWithAuthType;
     private filterAccountsByAccountAuthType;
     private _changeAuthorizationAll;
     private changeAuthorizationAll;
@@ -68,6 +69,7 @@ export default class KoniExtension {
     private toggleBalancesVisibility;
     private saveAccountAllLogo;
     private saveTheme;
+    private setCamera;
     private saveBrowserConfirmationType;
     private subscribeSettings;
     private subscribeAuthUrls;
@@ -125,6 +127,7 @@ export default class KoniExtension {
     private upsertCustomToken;
     private deleteCustomAsset;
     private validateCustomAsset;
+    private getAddressFreeBalance;
     private subscribeAddressFreeBalance;
     private transferCheckReferenceCount;
     private transferCheckSupporting;
@@ -181,5 +184,6 @@ export default class KoniExtension {
     private getSupportedSmartContractTypes;
     private getTransaction;
     private subscribeTransactions;
+    private subscribeNotifications;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }