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

package/services/storage-service/DatabaseService.d.ts

@@ -1,6 +1,6 @@
 import { _ChainAsset } from '@subwallet/chain-list/types';
 import { BalanceItem, ChainStakingMetadata, CrowdloanItem, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, StakingType, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
-import { IChain, INft } from '@subwallet/extension-base/services/storage-service/databases';
+import { IBalance, IChain, INft } from '@subwallet/extension-base/services/storage-service/databases';
 import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
 import ChainStakingMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata';
 import NominatorMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata';
@@ -28,6 +28,7 @@ export default class DatabaseService {
     constructor();
     updatePriceStore(priceData: PriceJson): Promise<void>;
     getPriceStore(): Promise<PriceJson | undefined>;
+    getStoredBalance(): Promise<IBalance[]>;
     updateBalanceStore(address: string, item: BalanceItem): Promise<unknown>;
     removeFromBalanceStore(assets: string[]): Promise<number>;
     updateCrowdloanStore(chain: string, address: string, item: CrowdloanItem): Promise<unknown>;

package/services/storage-service/DatabaseService.js

@@ -34,9 +34,7 @@ export default 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;
@@ -44,6 +42,9 @@ export default class DatabaseService {
   }
 
   // Balance
+  async getStoredBalance() {
+    return this.stores.balance.table.toArray();
+  }
   async updateBalanceStore(address, item) {
     if (item.state === APIItemState.READY) {
       this.logger.log(`Updating balance for [${item.tokenSlug}]`);

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

@@ -21,29 +21,4 @@ export default class BalanceStore extends BaseStoreWithAddress {
   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;
-  // }
 }

package/services/transaction-service/index.d.ts

@@ -2,6 +2,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
+import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import RequestService from '@subwallet/extension-base/services/request-service';
 import { SWTransaction, SWTransactionInput, SWTransactionResponse, TransactionEmitter } from '@subwallet/extension-base/services/transaction-service/types';
 import { BehaviorSubject } from 'rxjs';
@@ -12,9 +13,10 @@ export default class TransactionService {
     private readonly requestService;
     private readonly balanceService;
     private readonly historyService;
+    private readonly notificationService;
     private readonly transactionSubject;
     private get transactions();
-    constructor(chainService: ChainService, requestService: RequestService, balanceService: BalanceService, historyService: HistoryService);
+    constructor(chainService: ChainService, requestService: RequestService, balanceService: BalanceService, historyService: HistoryService, notificationService: NotificationService);
     private get allTransactions();
     private get processingTransactions();
     getTransaction(id: string): SWTransaction;

package/services/transaction-service/index.js

@@ -3,10 +3,9 @@
 
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, BasicTxWarningCode, ChainType, EvmProviderErrorType, ExtrinsicStatus, ExtrinsicType, TransactionDirection } from '@subwallet/extension-base/background/KoniTypes';
+import { BasicTxErrorType, BasicTxWarningCode, ChainType, EvmProviderErrorType, ExtrinsicStatus, ExtrinsicType, NotificationType, TransactionDirection } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { _getChainNativeTokenBasicInfo, _getEvmChainId } from '@subwallet/extension-base/services/chain-service/utils';
-import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { getTransactionId, isSubstrateTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { getTransactionLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
@@ -23,11 +22,12 @@ export default 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);
@@ -122,10 +122,10 @@ export default 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) {
@@ -394,7 +394,15 @@ export default class TransactionService {
       blockNumber: blockNumber || 0,
       blockHash: blockHash || ''
     }).catch(console.error);
-    NotificationService.createNotification('Transaction completed', `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} completed`, this.getTransactionLink(id));
+    this.notificationService.notify({
+      type: 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({
     blockHash,
@@ -416,7 +424,15 @@ export default class TransactionService {
         blockNumber: blockNumber || 0,
         blockHash: blockHash || ''
       }).catch(console.error);
-      NotificationService.createNotification('Transaction failed', `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} failed`, this.getTransactionLink(id));
+      this.notificationService.notify({
+        type: 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/cjs/background/errors/EvmRpcError.js

@@ -1,21 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.EvmRpcError = void 0;
-var _ethereum = require("@subwallet/extension-base/constants/ethereum");
-// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-class EvmRpcError extends Error {
-  constructor(type, message, data) {
-    const [code, prefix] = _ethereum.EVM_PROVIDER_RPC_ERRORS_MAP[type];
-    const finalMessage = message ? `${prefix}: ${message}` : prefix;
-    super(finalMessage);
-    this.code = code;
-    this.message = finalMessage;
-    this.data = data;
-  }
-}
-exports.EvmRpcError = EvmRpcError;

package/cjs/background/errors/SubWalletProviderError.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SubWalletProviderError = void 0;
-// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-class SubWalletProviderError extends Error {
-  constructor(message, code, data) {
-    super(message);
-    this.code = code;
-    this.data = data;
-  }
-}
-exports.SubWalletProviderError = SubWalletProviderError;

package/cjs/constants/ethereum.js

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.EVM_PROVIDER_RPC_ERRORS_MAP = void 0;
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-const EVM_PROVIDER_RPC_ERRORS_MAP = {
-  USER_REJECTED_REQUEST: [4001, 'User Rejected Request'],
-  UNAUTHORIZED: [4100, 'Unauthorized'],
-  UNSUPPORTED_METHOD: [4200, 'Unsupported Method'],
-  DISCONNECTED: [4900, 'Disconnected'],
-  CHAIN_DISCONNECTED: [4901, 'Chain Disconnected'],
-  INVALID_PARAMS: [-32602, 'Invalid Params'],
-  INTERNAL_ERROR: [-32603, 'Internal Error']
-};
-exports.EVM_PROVIDER_RPC_ERRORS_MAP = EVM_PROVIDER_RPC_ERRORS_MAP;

package/cjs/utils/eth/parseTransactionData.js

@@ -1,284 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.InputDataDecoder = void 0;
-var _buffer = require("buffer");
-var _ethers = require("ethers");
-var _isBuffer = _interopRequireDefault(require("is-buffer"));
-var _web3Utils = require("web3-utils");
-// Copyright 2019-2022 @subwallet/extension-koni-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// @ts-ignore
-
-const ABI_TYPES = ['function', 'constructor', 'event', 'fallback'];
-const instanceOfAbiItem = object => {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
-  return 'type' in object && ABI_TYPES.includes(object.type);
-};
-const checkArrayAbiItems = data => {
-  if (Array.isArray(data)) {
-    return data.length > 0 && data.every(value => instanceOfAbiItem(value));
-  } else {
-    return false;
-  }
-};
-const genType = type => {
-  if (typeof type === 'string') {
-    return type;
-  } else {
-    if (type.components) {
-      var _type$components;
-      const arr = (_type$components = type.components) === null || _type$components === void 0 ? void 0 : _type$components.map(genType);
-      const tupleStr = `(${arr.join(',')})`;
-      if (type.type === 'tuple[]') {
-        return tupleStr + '[]';
-      } else {
-        return tupleStr;
-      }
-    } else {
-      return type.type;
-    }
-  }
-};
-const getMethodId = abi => {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call
-  return (0, _web3Utils.keccak256)((0, _web3Utils._jsonInterfaceMethodToString)(abi)).slice(2, 10);
-};
-const getMethodName = abi => {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-call
-  return (0, _web3Utils._jsonInterfaceMethodToString)(abi);
-};
-const deepRemoveUnwantedArrayProperties = arr => {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-return
-  return [...arr.map(item => {
-    if (Array.isArray(item)) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-      return deepRemoveUnwantedArrayProperties(item);
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    return item;
-  })];
-};
-
-// remove 0x from addresses
-function deepStripTupleAddresses(input, tupleTypes) {
-  return input.map((item, i) => {
-    // We find tupleTypes to not be an array where internalType is present in the ABI indicating item is a structure
-    const type = tupleTypes[i] ? tupleTypes[i].type : null;
-    if (type === 'address' && typeof item === 'string') {
-      return item;
-    }
-    if (type === 'address[]' && Array.isArray(item)) {
-      return item.map(a => a);
-    }
-    if (Array.isArray(item)) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-      return deepStripTupleAddresses(item, tupleTypes);
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    return item;
-  });
-}
-const toHexString = byteArray => {
-  return Array.from(byteArray, function (byte) {
-    return ('0' + (byte & 0xFF).toString(16)).slice(-2);
-  }).join('');
-};
-class InputDataDecoder {
-  constructor(prop) {
-    this.abi = [];
-    if (typeof prop === 'string') {
-      try {
-        this.abi = JSON.parse(prop);
-      } catch (err) {
-        throw new Error(`Invalid ABI: ${err.message}`);
-      }
-    } else if (checkArrayAbiItems(prop)) {
-      this.abi = prop;
-    } else {
-      throw new TypeError('Must pass ABI array object or file path to constructor');
-    }
-  }
-  decodeConstructor(data) {
-    if ((0, _isBuffer.default)(data)) {
-      data = data.toString('utf8');
-    }
-    if (typeof data !== 'string') {
-      data = '';
-    }
-    data = data.trim();
-    for (let i = 0; i < this.abi.length; i++) {
-      const obj = this.abi[i];
-      if (obj.type !== 'constructor') {
-        continue;
-      }
-      const method = obj.name || null;
-      const methodName = getMethodName(obj);
-      const types = obj.inputs ? obj.inputs.map(x => x.type) : [];
-      const names = obj.inputs ? obj.inputs.map(x => x.name) : [];
-
-      // take last 32 bytes
-      data = data.slice(-256);
-      if (data.length !== 256) {
-        throw new Error('fail');
-      }
-      if (data.indexOf('0x') !== 0) {
-        data = `0x${data}`;
-      }
-      const _inputs = _ethers.ethers.utils.defaultAbiCoder.decode(types, data);
-      const inputs = deepRemoveUnwantedArrayProperties(_inputs);
-      return {
-        methodName,
-        method,
-        types,
-        inputs,
-        names
-      };
-    }
-    throw new Error('not found');
-  }
-  decodeData(data) {
-    if ((0, _isBuffer.default)(data)) {
-      data = data.toString('utf8');
-    }
-    if (typeof data !== 'string') {
-      data = '';
-    }
-    data = data.trim();
-    const dataBuf = _buffer.Buffer.from(data.replace(/^0x/, ''), 'hex');
-    const methodId = toHexString(dataBuf.subarray(0, 4));
-    const inputsBuf = dataBuf.subarray(4);
-    let result = {
-      method: null,
-      methodName: null,
-      types: [],
-      inputs: [],
-      names: []
-    };
-    for (const abi of this.abi) {
-      try {
-        if (abi.type === 'constructor') {
-          continue;
-        }
-        if (abi.type === 'event') {
-          continue;
-        }
-        const method = abi.name || null;
-        const methodName = getMethodName(abi);
-        const types = abi.inputs ? abi.inputs.map(x => {
-          if (x.type.includes('tuple')) {
-            return x;
-          } else {
-            return x.type;
-          }
-        }) : [];
-        const names = abi.inputs ? abi.inputs.map(x => {
-          if (x.type.includes('tuple') && x.components) {
-            return [x.name, x.components.map(a => a.name)];
-          } else {
-            return x.name;
-          }
-        }) : [];
-        const hash = getMethodId(abi);
-        if (hash === methodId) {
-          let inputs = [];
-          try {
-            // @ts-ignore
-            inputs = _ethers.ethers.utils.defaultAbiCoder.decode(types, inputsBuf);
-          } catch (err) {
-            try {
-              const ifc = new _ethers.ethers.utils.Interface([]);
-              inputs = ifc.decodeFunctionData(_ethers.ethers.utils.FunctionFragment.fromObject(abi), data);
-            } catch (err) {}
-          }
-
-          // TODO: do this normalization into normalizeAddresses
-          let _inputs = [];
-          _inputs = inputs.map((input, i) => {
-            if (types[i].components) {
-              const tupleTypes = types[i].components;
-
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-argument
-              return deepStripTupleAddresses(input, tupleTypes);
-            }
-            if (types[i] === 'address' && typeof input === 'string') {
-              return input;
-            }
-            if (types[i] === 'address[]' && Array.isArray(input)) {
-              return input.map(address => address);
-            }
-
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            return input;
-          });
-
-          // Map any tuple types into arrays
-          const typesToReturn = types.map(genType);
-
-          // defaultAbiCoder attaches some unwanted properties to the list object
-          _inputs = deepRemoveUnwantedArrayProperties(_inputs);
-          result = {
-            methodName,
-            method,
-            types: typesToReturn,
-            inputs: _inputs,
-            names
-          };
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    }
-    if (!result.method) {
-      for (const obj of this.abi) {
-        if (obj.type === 'constructor') {
-          continue;
-        }
-        if (obj.type === 'event') {
-          continue;
-        }
-        const method = obj.name || null;
-        try {
-          const ifc = new _ethers.ethers.utils.Interface([]);
-          const _result = ifc.decodeFunctionData(_ethers.ethers.utils.FunctionFragment.fromObject(obj), data);
-          const inputs = deepRemoveUnwantedArrayProperties(_result);
-          result.method = method;
-          result.methodName = getMethodName(obj);
-          result.inputs = inputs;
-          result.names = obj.inputs ? obj.inputs.map(x => {
-            if (x.type.includes('tuple')) {
-              var _x$components;
-              return [x.name, ((_x$components = x.components) === null || _x$components === void 0 ? void 0 : _x$components.map(a => a.name)) || ''];
-            } else {
-              return x.name;
-            }
-          }) : [];
-          const types = obj.inputs ? obj.inputs.map(x => {
-            if (x.type.includes('tuple')) {
-              return x;
-            } else {
-              return x.type;
-            }
-          }) : [];
-          result.types = types.map(genType);
-        } catch (err) {}
-      }
-    }
-    if (!result.method) {
-      try {
-        const decoded = this.decodeConstructor(data);
-        if (decoded) {
-          return decoded;
-        }
-      } catch (err) {}
-    }
-    return result;
-  }
-}
-exports.InputDataDecoder = InputDataDecoder;