@subwallet/extension-base 1.1.24-0 → 1.1.24-2

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

@@ -1,5 +1,5 @@
 import { _ChainAsset } from '@subwallet/chain-list/types';
-import { BalanceItem, ChainStakingMetadata, CrowdloanItem, MantaPayConfig, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, StakingType, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainStakingMetadata, CrowdloanItem, MantaPayConfig, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, StakingType, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { IBalance, ICampaign, IChain, INft } from '@subwallet/extension-base/services/storage-service/databases';
 import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
@@ -8,6 +8,7 @@ import ChainStakingMetadataStore from '@subwallet/extension-base/services/storag
 import MantaPayStore from '@subwallet/extension-base/services/storage-service/db-stores/MantaPay';
 import NominatorMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata';
 import { HistoryQuery } from '@subwallet/extension-base/services/storage-service/db-stores/Transaction';
+import { BalanceItem } from '@subwallet/extension-base/types';
 import { Subscription } from 'dexie';
 export default class DatabaseService {
     private eventService;
@@ -36,7 +37,8 @@ export default class DatabaseService {
     updatePriceStore(priceData: PriceJson): Promise<void>;
     getPriceStore(): Promise<PriceJson | undefined>;
     getStoredBalance(): Promise<IBalance[]>;
-    updateBalanceStore(address: string, item: BalanceItem): Promise<unknown>;
+    updateBalanceStore(item: BalanceItem): Promise<unknown>;
+    updateBulkBalanceStore(items: BalanceItem[]): Promise<unknown>;
     removeFromBalanceStore(assets: string[]): Promise<number>;
     updateCrowdloanStore(chain: string, address: string, item: CrowdloanItem): Promise<unknown>;
     updateStaking(chain: string, address: string, item: StakingItem): Promise<unknown>;

package/services/storage-service/DatabaseService.js

@@ -58,14 +58,19 @@ export default class DatabaseService {
   async getStoredBalance() {
     return this.stores.balance.table.toArray();
   }
-  async updateBalanceStore(address, item) {
+  async updateBalanceStore(item) {
     if (item.state === APIItemState.READY) {
       return this.stores.balance.upsert({
-        address,
         ...item
       });
     }
   }
+  async updateBulkBalanceStore(items) {
+    const filtered = items.filter(item => item.state !== APIItemState.PENDING);
+    if (filtered.length) {
+      return this.stores.balance.bulkUpsert(filtered);
+    }
+  }
   async removeFromBalanceStore(assets) {
     return this.stores.balance.removeBySlugs(assets);
   }

package/services/storage-service/databases/index.d.ts

@@ -1,5 +1,6 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { BalanceItem, CampaignData, ChainStakingMetadata, CrowdloanItem, MetadataItem, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
+import { CampaignData, ChainStakingMetadata, CrowdloanItem, MetadataItem, NftCollection, NftItem, NominatorMetadata, PriceJson, StakingItem, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
+import { BalanceItem } from '@subwallet/extension-base/types';
 import Dexie, { Table } from 'dexie';
 export interface DefaultChainDoc {
     chain: string;

package/services/storage-service/db-stores/Balance.d.ts

@@ -1,7 +1,7 @@
-import { BalanceItem } from '@subwallet/extension-base/background/KoniTypes';
+import { BalanceMap } from '@subwallet/extension-base/types';
 import { IBalance } from '../databases';
 import BaseStoreWithAddress from '../db-stores/BaseStoreWithAddress';
 export default class BalanceStore extends BaseStoreWithAddress<IBalance> {
-    getBalanceMapByAddress(address: string): Promise<Record<string, BalanceItem>>;
+    getBalanceMapByAddresses(addresses: string): Promise<BalanceMap>;
     removeBySlugs(tokenSlugs: string[]): Promise<number>;
 }

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

@@ -3,17 +3,17 @@
 
 import BaseStoreWithAddress from "./BaseStoreWithAddress.js";
 export default class BalanceStore extends BaseStoreWithAddress {
-  async getBalanceMapByAddress(address) {
-    const data = await this.table.where('address').equals(address).toArray();
+  async getBalanceMapByAddresses(addresses) {
+    const data = await this.table.where('address').anyOf(addresses).toArray();
     const balanceMap = {};
     data.forEach(storedBalance => {
-      balanceMap[storedBalance.tokenSlug] = {
-        tokenSlug: storedBalance.tokenSlug,
-        state: storedBalance.state,
-        free: storedBalance.free,
-        locked: storedBalance.locked,
-        substrateInfo: storedBalance.substrateInfo,
-        timestamp: storedBalance.timestamp
+      const address = storedBalance.address;
+      const slug = storedBalance.tokenSlug;
+      if (!balanceMap[address]) {
+        balanceMap[address] = {};
+      }
+      balanceMap[address][slug] = {
+        ...storedBalance
       };
     });
     return balanceMap;

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

@@ -1,4 +1,4 @@
-import { CrowdloanContributionsResponse, ExtrinsicItem, ExtrinsicsListResponse, IMultiChainBalance, TransferItem, TransfersListResponse } from '@subwallet/extension-base/services/subscan-service/types';
+import { CrowdloanContributionsResponse, ExtrinsicItem, ExtrinsicsListResponse, IMultiChainBalance, RequestBlockRange, TransferItem, TransfersListResponse } from '@subwallet/extension-base/services/subscan-service/types';
 export declare class SubscanService {
     private subscanChainMap;
     private limitRate;
@@ -21,8 +21,14 @@ export declare class SubscanService {
     setSubscanChainMap(subscanChainMap: Record<string, string>): void;
     getMultiChainBalance(address: string): Promise<IMultiChainBalance[]>;
     getCrowdloanContributions(relayChain: string, address: string, page?: number): Promise<CrowdloanContributionsResponse>;
-    getExtrinsicsList(chain: string, address: string, page?: number): Promise<ExtrinsicsListResponse>;
-    fetchAllPossibleExtrinsicItems(chain: string, address: string, cbAfterEachRequest?: (items: ExtrinsicItem[]) => void): Promise<ExtrinsicItem[]>;
-    getTransfersList(chain: string, address: string, page?: number, direction?: 'sent' | 'received'): Promise<TransfersListResponse>;
-    fetchAllPossibleTransferItems(chain: string, address: string, direction?: 'sent' | 'received', cbAfterEachRequest?: (items: TransferItem[]) => void): Promise<TransferItem[]>;
+    getExtrinsicsList(chain: string, address: string, page?: number, blockRange?: RequestBlockRange): Promise<ExtrinsicsListResponse>;
+    fetchAllPossibleExtrinsicItems(chain: string, address: string, cbAfterEachRequest?: (items: ExtrinsicItem[]) => void, limit?: {
+        page: number;
+        record: number;
+    }): Promise<ExtrinsicItem[]>;
+    getTransfersList(chain: string, address: string, page?: number, direction?: 'sent' | 'received', blockRange?: RequestBlockRange): Promise<TransfersListResponse>;
+    fetchAllPossibleTransferItems(chain: string, address: string, direction?: 'sent' | 'received', cbAfterEachRequest?: (items: TransferItem[]) => void, limit?: {
+        page: number;
+        record: number;
+    }): Promise<Record<string, TransferItem[]>>;
 }

package/services/subscan-service/index.js

@@ -119,12 +119,19 @@ export class SubscanService {
       return jsonData.data;
     });
   }
-  getExtrinsicsList(chain, address, page = 0) {
+  getExtrinsicsList(chain, address, page = 0, blockRange) {
+    const _blockRange = (() => {
+      if (!blockRange || !blockRange.to) {
+        return null;
+      }
+      return `${blockRange.from || 0}-${blockRange.to}`;
+    })();
     return this.addRequest(async () => {
       const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/extrinsics'), {
         page,
         row: QUERY_ROW,
-        address
+        address,
+        block_range: _blockRange
       });
       if (rs.status !== 200) {
         throw new SWError('SubscanService.getExtrinsicsList', await rs.text());
@@ -133,40 +140,54 @@ export class SubscanService {
       return jsonData.data;
     });
   }
-  async fetchAllPossibleExtrinsicItems(chain, address, cbAfterEachRequest) {
-    let count = 0;
+  async fetchAllPossibleExtrinsicItems(chain, address, cbAfterEachRequest, limit = {
+    page: 10,
+    record: 1000
+  }) {
+    let maxCount = 0;
+    let currentCount = 0;
+    const blockRange = {
+      from: null,
+      to: null
+    };
     const resultMap = {};
     const _getExtrinsicItems = async page => {
-      const res = await this.getExtrinsicsList(chain, address, page);
+      const res = await this.getExtrinsicsList(chain, address, page, blockRange);
       if (!res || !res.count || !res.extrinsics || !res.extrinsics.length) {
         return;
       }
-      if (res.count > count) {
-        count = res.count;
+      if (res.count > maxCount) {
+        maxCount = res.count;
       }
       cbAfterEachRequest === null || cbAfterEachRequest === void 0 ? void 0 : cbAfterEachRequest(res.extrinsics);
       res.extrinsics.forEach(item => {
         resultMap[item.extrinsic_hash] = item;
       });
-      if (Object.values(resultMap).length < count) {
+      currentCount += res.extrinsics.length;
+      if (page > limit.page || currentCount > limit.record) {
+        return;
+      }
+      if (currentCount < maxCount) {
         await wait(100);
+        if (page === 0) {
+          blockRange.to = res.extrinsics[0].block_num;
+        }
         await _getExtrinsicItems(++page);
       }
     };
     await _getExtrinsicItems(0);
     return Object.values(resultMap);
   }
-  getTransfersList(chain, address, page = 0, direction) {
-    const requestBody = {
-      page,
-      row: QUERY_ROW,
-      address
-    };
-    if (direction) {
-      requestBody.direction = direction;
-    }
+  getTransfersList(chain, address, page = 0, direction, blockRange) {
     return this.addRequest(async () => {
-      const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/transfers'), requestBody);
+      const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/transfers'), {
+        page,
+        row: QUERY_ROW,
+        address,
+        direction: direction || null,
+        from_block: (blockRange === null || blockRange === void 0 ? void 0 : blockRange.from) || null,
+        to_block: (blockRange === null || blockRange === void 0 ? void 0 : blockRange.to) || null
+      });
       if (rs.status !== 200) {
         throw new SWError('SubscanService.getTransfersList', await rs.text());
       }
@@ -174,27 +195,46 @@ export class SubscanService {
       return jsonData.data;
     });
   }
-  async fetchAllPossibleTransferItems(chain, address, direction, cbAfterEachRequest) {
-    let count = 0;
+  async fetchAllPossibleTransferItems(chain, address, direction, cbAfterEachRequest, limit = {
+    page: 10,
+    record: 1000
+  }) {
+    let maxCount = 0;
+    let currentCount = 0;
+    const blockRange = {
+      from: null,
+      to: null
+    };
     const resultMap = {};
     const _getTransferItems = async page => {
-      const res = await this.getTransfersList(chain, address, page, direction);
+      const res = await this.getTransfersList(chain, address, page, direction, blockRange);
       if (!res || !res.count || !res.transfers || !res.transfers.length) {
         return;
       }
-      if (res.count > count) {
-        count = res.count;
+      if (res.count > maxCount) {
+        maxCount = res.count;
       }
       cbAfterEachRequest === null || cbAfterEachRequest === void 0 ? void 0 : cbAfterEachRequest(res.transfers);
       res.transfers.forEach(item => {
-        resultMap[item.hash] = item;
+        if (!resultMap[item.hash]) {
+          resultMap[item.hash] = [item];
+        } else {
+          resultMap[item.hash].push(item);
+        }
       });
-      if (Object.values(resultMap).length < count) {
+      currentCount += res.transfers.length;
+      if (page > limit.page || currentCount > limit.record) {
+        return;
+      }
+      if (currentCount < maxCount) {
         await wait(100);
+        if (page === 0) {
+          blockRange.to = res.transfers[0].block_num;
+        }
         await _getTransferItems(++page);
       }
     };
     await _getTransferItems(0);
-    return Object.values(resultMap);
+    return resultMap;
   }
 }

package/services/subscan-service/types.d.ts

@@ -171,3 +171,7 @@ export interface TransfersListResponse {
     count: number;
     transfers: null | TransferItem[];
 }
+export declare type RequestBlockRange = {
+    from: number | null;
+    to: number | null;
+};

package/services/transaction-service/index.js

@@ -14,7 +14,7 @@ import { parseTransferEventLogs, parseXcmEventLogs } from '@subwallet/extension-
 import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
-import { anyNumberToBN } from '@subwallet/extension-base/utils/eth';
+import { anyNumberToBN, recalculateGasPrice } from '@subwallet/extension-base/utils/eth';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import keyring from '@subwallet/ui-keyring';
@@ -114,7 +114,8 @@ export default class TransactionService {
             if (!web3) {
               validationResponse.errors.push(new TransactionError(BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
-              const gasPrice = await web3.api.eth.getGasPrice();
+              const _price = await web3.api.eth.getGasPrice();
+              const gasPrice = recalculateGasPrice(_price, chainInfo.slug);
               const gasLimit = await web3.api.eth.estimateGas(transaction);
               estimateFee.value = (gasLimit * parseInt(gasPrice)).toString();
             }
@@ -912,8 +913,8 @@ export default class TransactionService {
             }
           }) => section === 'system').forEach(({
             event: {
-              method,
-              data: [error]
+              data: [error],
+              method
             }
           }) => {
             if (method === 'ExtrinsicFailed') {

package/types/balance.d.ts

@@ -0,0 +1,40 @@
+/// <reference types="bn.js" />
+import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
+import { BN } from '@polkadot/util';
+export interface TokenBalanceRaw {
+    reserved: BN;
+    frozen: BN;
+    free: BN;
+}
+export interface SubstrateBalance {
+    reserved?: string;
+    miscFrozen?: string;
+    feeFrozen?: string;
+}
+/**
+ * Balance info of a token on an address
+ * @property {string} address - Address
+ * @property {string} tokenSlug - Slug of token
+ * @property {APIItemState} state - State of information
+ * @property {number} [timestamp] - Time to get information
+ * @property {string} free - Free balance
+ * @property {string} locked - Locked balance
+ * @property {SubstrateBalance} [substrateInfo] - Substrate info of balance
+ */
+export interface BalanceItem {
+    address: string;
+    tokenSlug: string;
+    state: APIItemState;
+    timestamp?: number;
+    free: string;
+    locked: string;
+    substrateInfo?: SubstrateBalance;
+}
+/** Balance info of all tokens on an address */
+export declare type BalanceInfo = Record<string, BalanceItem>;
+/** Balance info of all addresses */
+export declare type BalanceMap = Record<string, BalanceInfo>;
+export interface BalanceJson {
+    reset?: boolean;
+    details: BalanceMap;
+}

package/types/balance.js

@@ -0,0 +1 @@
+export {};

package/types/index.d.ts

@@ -7,4 +7,5 @@ export interface Message extends MessageEvent {
         subscription?: string;
     };
 }
+export * from './balance';
 export * from './buy';

package/types/index.js

@@ -1,5 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+export * from "./balance.js";
 export * from "./buy.js";
 export {};

package/utils/account.d.ts

@@ -0,0 +1,15 @@
+import { AccountJson, AddressJson } from '@subwallet/extension-base/background/types';
+import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
+export declare const simpleAddress: (address: string) => string;
+export declare function quickFormatAddressToCompare(address?: string): string | undefined;
+export declare const convertSubjectInfoToAddresses: (subjectInfo: SubjectInfo) => AddressJson[];
+/**
+ * @function getAccountJsonByAddress
+ * @desc Get account info by address
+ * <p>
+ *   Note: Use on the background only
+ * </p>
+ * @param {string} address - Address
+ * @returns {AccountJson|null}  - Account info or null if not found
+ */
+export declare const getAccountJsonByAddress: (address: string) => AccountJson | null;

package/utils/{address.js → account.js}

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { reformatAddress } from '@subwallet/extension-base/utils/index';
+import keyring from '@subwallet/ui-keyring';
 import { decodeAddress, encodeAddress, isAddress, isEthereumAddress } from '@polkadot/util-crypto';
 export const simpleAddress = address => {
   if (isEthereumAddress(address)) {
@@ -21,4 +22,31 @@ export const convertSubjectInfoToAddresses = subjectInfo => {
     type: info.type,
     ...info.json.meta
   }));
+};
+
+/**
+ * @function getAccountJsonByAddress
+ * @desc Get account info by address
+ * <p>
+ *   Note: Use on the background only
+ * </p>
+ * @param {string} address - Address
+ * @returns {AccountJson|null}  - Account info or null if not found
+ */
+export const getAccountJsonByAddress = address => {
+  try {
+    const pair = keyring.getPair(address);
+    if (pair) {
+      return {
+        address: pair.address,
+        type: pair.type,
+        ...pair.meta
+      };
+    } else {
+      return null;
+    }
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
 };

package/utils/eth.d.ts

@@ -15,3 +15,4 @@ export declare class Transaction {
 export declare const anyNumberToBN: (value?: string | number | BNEther) => BigN;
 export declare const createTransactionFromRLP: (rlp: string) => Transaction | null;
 export declare const signatureToHex: (sig: SignedTransaction) => string;
+export declare const recalculateGasPrice: (_price: string, chain: string) => string;

package/utils/eth.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { GAS_PRICE_RATIO, NETWORK_MULTI_GAS_FEE } from '@subwallet/extension-base/constants';
 import BigN from 'bignumber.js';
 import { ethers } from 'ethers';
 import { hexStripPrefix, numberToHex } from '@polkadot/util';
@@ -58,4 +59,7 @@ export const signatureToHex = sig => {
   const hexS = s.length % 2 === 1 ? `0${s}` : s;
   const hexV = hexStripPrefix(numberToHex(v));
   return hexR + hexS + hexV;
+};
+export const recalculateGasPrice = (_price, chain) => {
+  return NETWORK_MULTI_GAS_FEE.includes(chain) ? new BigN(_price).multipliedBy(GAS_PRICE_RATIO).toFixed(0) : _price;
 };

package/utils/index.d.ts

@@ -40,6 +40,7 @@ export declare function getDomainFromUrl(url: string): string;
 export declare function waitTimeout(ms: number): Promise<void>;
 export declare const stripUrl: (url: string) => string;
 export declare function wait(milliseconds: number): Promise<void>;
+export * from './account';
 export * from './array';
 export * from './environment';
 export * from './lazy';

package/utils/index.js

@@ -294,6 +294,7 @@ export function wait(milliseconds) {
     }, milliseconds);
   });
 }
+export * from "./account.js";
 export * from "./array.js";
 export * from "./environment.js";
 export * from "./lazy.js";