@subwallet/extension-base 1.1.26-0 → 1.1.27-1

package/background/KoniTypes.d.ts

@@ -1444,7 +1444,7 @@ export interface Notification {
 }
 export declare type NotificationParams = Omit<Notification, 'id'>;
 export interface CronReloadRequest {
-    data: 'nft' | 'staking';
+    data: 'nft' | 'staking' | 'balance' | 'crowdloan';
 }
 export interface AllLogoMap {
     chainLogoMap: Record<string, string>;

package/cjs/constants/staking.js

@@ -10,7 +10,8 @@ exports.PREDEFINED_STAKING_POOL = exports.MAX_NOMINATIONS = void 0;
 const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
-  vara_network: 29
+  vara_network: 29,
+  aleph: 55
 };
 exports.PREDEFINED_STAKING_POOL = PREDEFINED_STAKING_POOL;
 const MAX_NOMINATIONS = '16';

package/cjs/koni/api/staking/bonding/astar.js

@@ -24,6 +24,18 @@ var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+const convertAddress = address => {
+  return (0, _utilCrypto.isEthereumAddress)(address) ? address.toLowerCase() : address;
+};
+const fetchDApps = async network => {
+  return new Promise(function (resolve) {
+    (0, _crossFetch.default)(`https://api.astar.network/api/v1/${network}/dapps-staking/dappssimple`, {
+      method: 'GET'
+    }).then(resp => {
+      resolve(resp.json());
+    }).catch(console.error);
+  });
+};
 function subscribeAstarStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.dappsStaking.currentEra(_currentEra => {
     const era = _currentEra.toString();
@@ -79,19 +91,10 @@ async function getAstarStakingMetadata(chain, substrateApi) {
     unstakingPeriod
   };
 }
-const convertAddress = address => {
-  return (0, _utilCrypto.isEthereumAddress)(address) ? address.toLowerCase() : address;
-};
 async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi, ledger) {
   const nominationList = [];
   const unstakingList = [];
-  const allDappsReq = new Promise(function (resolve) {
-    (0, _crossFetch.default)(`https://api.astar.network/api/v1/${chainInfo.slug}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(chainInfo.slug);
   const [_allDapps, _era, _stakerInfo] = await Promise.all([allDappsReq, substrateApi.api.query.dappsStaking.currentEra(), substrateApi.api.query.dappsStaking.generalStakerInfo.entries(address)]);
   const currentEra = _era.toString();
   const minDelegatorStake = substrateApi.api.consts.dappsStaking.minimumStakingAmount.toString();
@@ -176,13 +179,7 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const nominationList = [];
   const unstakingList = [];
-  const allDappsReq = new Promise(function (resolve) {
-    (0, _crossFetch.default)(`https://api.astar.network/api/v1/${chain}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(chain);
   const [_ledger, _era, _stakerInfo] = await Promise.all([chainApi.api.query.dappsStaking.ledger(address), chainApi.api.query.dappsStaking.currentEra(), chainApi.api.query.dappsStaking.generalStakerInfo.entries(address)]);
   const ledger = _ledger.toPrimitive();
   const currentEra = _era.toString();
@@ -261,13 +258,7 @@ async function getAstarDappsInfo(networkKey, substrateApi) {
   const rawMaxStakerPerContract = chainApi.api.consts.dappsStaking.maxNumberOfStakersPerContract.toHuman();
   const allDappsInfo = [];
   const maxStakerPerContract = (0, _utils2.parseRawNumber)(rawMaxStakerPerContract);
-  const allDappsReq = new Promise(function (resolve) {
-    (0, _crossFetch.default)(`https://api.astar.network/api/v1/${networkKey}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(networkKey);
   const [_era, _allDapps] = await Promise.all([chainApi.api.query.dappsStaking.currentEra(), allDappsReq]);
   const era = (0, _utils2.parseRawNumber)(_era.toHuman());
   const allDapps = _allDapps;

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

@@ -3296,6 +3296,10 @@ class KoniExtension {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
       return await this.#koniState.reloadStaking();
+    } else if (data === 'balance') {
+      return await this.#koniState.reloadBalance();
+    } else if (data === 'crowdloan') {
+      return await this.#koniState.reloadCrowdloan();
     }
     return Promise.resolve(false);
   }

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

@@ -704,12 +704,12 @@ class KoniState {
     return await this.dbService.stores.balance.getBalanceMapByAddresses(address);
   }
   isFirstLoad = true;
-  async handleSwitchAccount(newAddress) {
-    if (this.isFirstLoad) {
+  async handleResetBalance(newAddress, forceRefresh) {
+    if (this.isFirstLoad || forceRefresh) {
       const backupBalanceData = await this.dbService.getStoredBalance();
       this.balanceMap.updateBalanceItems(backupBalanceData, (0, _utils2.isAccountAll)(newAddress));
     }
-    await Promise.all([this.resetCrowdloanMap(newAddress), this.removeInactiveChainBalances()]);
+    await Promise.all([this.removeInactiveChainBalances()]);
   }
   async resetCrowdloanMap(newAddress) {
     const defaultData = generateDefaultCrowdloanMap();
@@ -1564,6 +1564,14 @@ class KoniState {
     await this.subscription.reloadStaking();
     return true;
   }
+  async reloadBalance() {
+    await this.subscription.reloadBalance();
+    return true;
+  }
+  async reloadCrowdloan() {
+    await this.subscription.reloadCrowdloan();
+    return true;
+  }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {
       this.settingService.getPassPhishingList(value => {

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

@@ -58,7 +58,7 @@ function handlers(_ref, port) {
   const isMobile = port.name === _defaults.PORT_MOBILE;
   const isExtension = port.name === extensionPortName;
   const sender = port.sender;
-  const from = isExtension ? 'extension' : sender.tab && sender.tab.url || sender.url || '<unknown>';
+  const from = isExtension ? 'extension' : sender.url || sender.tab && sender.tab.url || '<unknown>';
   const source = `${from}: ${id}: ${message}`;
 
   // console.log(` [in] ${source}`); // :: ${JSON.stringify(request)}`);

package/cjs/koni/background/subscription.js

@@ -59,7 +59,8 @@ class KoniSubscription {
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
     if (currentAddress) {
-      this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+      this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+      this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
       this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
     }
     this.eventHandler = (events, eventTypes) => {
@@ -73,7 +74,8 @@ class KoniSubscription {
       if (!address) {
         return;
       }
-      this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
+      this.subscribeBalances(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
+      this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
       this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
     };
     this.state.eventService.onLazy(this.eventHandler.bind(this));
@@ -86,16 +88,24 @@ class KoniSubscription {
     this.stopAllSubscription();
     return Promise.resolve();
   }
-  subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
-    this.state.handleSwitchAccount(address).then(() => {
-      const addresses = this.state.getDecodedAddresses(address);
-      if (!addresses.length) {
-        return;
-      }
+  subscribeBalances(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.state.handleResetBalance(address).then(() => {
       this.updateSubscription('balance', this.initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime));
-      this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
     }).catch(err => this.logger.warn(err));
   }
+  subscribeCrowdloans(address, substrateApiMap, onlyRunOnFirstTime) {
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.state.resetCrowdloanMap(address).then(() => {
+      this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
+    }).catch(console.error);
+  }
   subscribeStakingOnChain(address, substrateApiMap, onlyRunOnFirstTime) {
     this.state.resetStaking(address);
     const addresses = this.state.getDecodedAddresses(address);
@@ -255,5 +265,18 @@ class KoniSubscription {
     this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
     await (0, _utils2.waitTimeout)(1800);
   }
+  async reloadBalance() {
+    var _this$state$keyringSe3;
+    const currentAddress = (_this$state$keyringSe3 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe3 === void 0 ? void 0 : _this$state$keyringSe3.address;
+    this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+    await (0, _utils2.waitTimeout)(1800);
+  }
+  async reloadCrowdloan() {
+    var _this$state$keyringSe4;
+    const currentAddress = (_this$state$keyringSe4 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe4 === void 0 ? void 0 : _this$state$keyringSe4.address;
+    await this.state.handleResetBalance(currentAddress, true);
+    this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
+    await (0, _utils2.waitTimeout)(1800);
+  }
 }
 exports.KoniSubscription = KoniSubscription;

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.26-0'
+  version: '1.1.27-1'
 };
 exports.packageInfo = packageInfo;

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

@@ -43,9 +43,6 @@ class BalanceMapImpl {
       address,
       tokenSlug
     } = balanceItem;
-    if (!address.startsWith('5') && !address.startsWith('0x')) {
-      console.log('check address', address);
-    }
     if (!this._map[address]) {
       this._map[address] = {};
     }

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

@@ -18,6 +18,7 @@ var _eventParser = require("@subwallet/extension-base/services/transaction-servi
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
 var _utils2 = require("@subwallet/extension-base/services/transaction-service/utils");
 var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _eth = require("@subwallet/extension-base/utils/eth");
 var _mergeTransactionAndSignature = require("@subwallet/extension-base/utils/eth/mergeTransactionAndSignature");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
@@ -320,15 +321,16 @@ class TransactionService {
   transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
     const extrinsicType = transaction.extrinsicType;
+    const formattedTransactionAddress = (0, _utils3.reformatAddress)(transaction.address);
     const historyItem = {
       origin: 'app',
       chain: transaction.chain,
       direction: _KoniTypes.TransactionDirection.SEND,
       type: transaction.extrinsicType,
-      from: transaction.address,
+      from: formattedTransactionAddress,
       to: '',
       chainType: transaction.chainType,
-      address: transaction.address,
+      address: formattedTransactionAddress,
       status: transaction.status,
       transactionId: transaction.id,
       extrinsicHash: transaction.extrinsicHash,

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

@@ -24,6 +24,9 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('subscan.io')) {
     return 'account';
   }
+  if (explorerLink.includes('3dpscan.io')) {
+    return 'account';
+  }
   return 'address';
 }
 function getBlockExplorerTxRoute(chainInfo) {

package/constants/staking.js

@@ -4,6 +4,7 @@
 export const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
-  vara_network: 29
+  vara_network: 29,
+  aleph: 55
 };
 export const MAX_NOMINATIONS = '16';

package/koni/api/staking/bonding/astar.js

@@ -8,6 +8,18 @@ import { isUrl, parseRawNumber } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
+const convertAddress = address => {
+  return isEthereumAddress(address) ? address.toLowerCase() : address;
+};
+const fetchDApps = async network => {
+  return new Promise(function (resolve) {
+    fetch(`https://api.astar.network/api/v1/${network}/dapps-staking/dappssimple`, {
+      method: 'GET'
+    }).then(resp => {
+      resolve(resp.json());
+    }).catch(console.error);
+  });
+};
 export function subscribeAstarStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.dappsStaking.currentEra(_currentEra => {
     const era = _currentEra.toString();
@@ -63,19 +75,10 @@ export async function getAstarStakingMetadata(chain, substrateApi) {
     unstakingPeriod
   };
 }
-const convertAddress = address => {
-  return isEthereumAddress(address) ? address.toLowerCase() : address;
-};
 export async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi, ledger) {
   const nominationList = [];
   const unstakingList = [];
-  const allDappsReq = new Promise(function (resolve) {
-    fetch(`https://api.astar.network/api/v1/${chainInfo.slug}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(chainInfo.slug);
   const [_allDapps, _era, _stakerInfo] = await Promise.all([allDappsReq, substrateApi.api.query.dappsStaking.currentEra(), substrateApi.api.query.dappsStaking.generalStakerInfo.entries(address)]);
   const currentEra = _era.toString();
   const minDelegatorStake = substrateApi.api.consts.dappsStaking.minimumStakingAmount.toString();
@@ -160,13 +163,7 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
   const chainApi = await substrateApi.isReady;
   const nominationList = [];
   const unstakingList = [];
-  const allDappsReq = new Promise(function (resolve) {
-    fetch(`https://api.astar.network/api/v1/${chain}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(chain);
   const [_ledger, _era, _stakerInfo] = await Promise.all([chainApi.api.query.dappsStaking.ledger(address), chainApi.api.query.dappsStaking.currentEra(), chainApi.api.query.dappsStaking.generalStakerInfo.entries(address)]);
   const ledger = _ledger.toPrimitive();
   const currentEra = _era.toString();
@@ -245,13 +242,7 @@ export async function getAstarDappsInfo(networkKey, substrateApi) {
   const rawMaxStakerPerContract = chainApi.api.consts.dappsStaking.maxNumberOfStakersPerContract.toHuman();
   const allDappsInfo = [];
   const maxStakerPerContract = parseRawNumber(rawMaxStakerPerContract);
-  const allDappsReq = new Promise(function (resolve) {
-    fetch(`https://api.astar.network/api/v1/${networkKey}/dapps-staking/dapps`, {
-      method: 'GET'
-    }).then(resp => {
-      resolve(resp.json());
-    }).catch(console.error);
-  });
+  const allDappsReq = fetchDApps(networkKey);
   const [_era, _allDapps] = await Promise.all([chainApi.api.query.dappsStaking.currentEra(), allDappsReq]);
   const era = parseRawNumber(_era.toHuman());
   const allDapps = _allDapps;

package/koni/background/handlers/Extension.js

@@ -3207,6 +3207,10 @@ export default class KoniExtension {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
       return await this.#koniState.reloadStaking();
+    } else if (data === 'balance') {
+      return await this.#koniState.reloadBalance();
+    } else if (data === 'crowdloan') {
+      return await this.#koniState.reloadCrowdloan();
     }
     return Promise.resolve(false);
   }

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

@@ -153,7 +153,7 @@ export default class KoniState {
     getBalance(reset?: boolean): Promise<BalanceJson>;
     getStoredBalance(address: string): Promise<BalanceItem[]>;
     private isFirstLoad;
-    handleSwitchAccount(newAddress: string): Promise<void>;
+    handleResetBalance(newAddress: string, forceRefresh?: boolean): Promise<void>;
     resetCrowdloanMap(newAddress: string): Promise<void>;
     resetStaking(newAddress: string): void;
     private balanceUpdateCache;
@@ -235,6 +235,8 @@ export default class KoniState {
     onAccountRemove(): void;
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
+    reloadBalance(): Promise<boolean>;
+    reloadCrowdloan(): Promise<boolean>;
     approvePassPhishingPage(_url: string): Promise<boolean>;
     resetWallet(resetAll: boolean): Promise<void>;
     enableMantaPay(updateStore: boolean, address: string, password: string, seedPhrase?: string): Promise<string | undefined>;

package/koni/background/handlers/State.js

@@ -690,12 +690,12 @@ export default class KoniState {
     return await this.dbService.stores.balance.getBalanceMapByAddresses(address);
   }
   isFirstLoad = true;
-  async handleSwitchAccount(newAddress) {
-    if (this.isFirstLoad) {
+  async handleResetBalance(newAddress, forceRefresh) {
+    if (this.isFirstLoad || forceRefresh) {
       const backupBalanceData = await this.dbService.getStoredBalance();
       this.balanceMap.updateBalanceItems(backupBalanceData, isAccountAll(newAddress));
     }
-    await Promise.all([this.resetCrowdloanMap(newAddress), this.removeInactiveChainBalances()]);
+    await Promise.all([this.removeInactiveChainBalances()]);
   }
   async resetCrowdloanMap(newAddress) {
     const defaultData = generateDefaultCrowdloanMap();
@@ -1540,6 +1540,14 @@ export default class KoniState {
     await this.subscription.reloadStaking();
     return true;
   }
+  async reloadBalance() {
+    await this.subscription.reloadBalance();
+    return true;
+  }
+  async reloadCrowdloan() {
+    await this.subscription.reloadCrowdloan();
+    return true;
+  }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {
       this.settingService.getPassPhishingList(value => {

package/koni/background/handlers/index.js

@@ -44,7 +44,7 @@ export default function handlers({
   const isMobile = port.name === PORT_MOBILE;
   const isExtension = port.name === extensionPortName;
   const sender = port.sender;
-  const from = isExtension ? 'extension' : sender.tab && sender.tab.url || sender.url || '<unknown>';
+  const from = isExtension ? 'extension' : sender.url || sender.tab && sender.tab.url || '<unknown>';
   const source = `${from}: ${id}: ${message}`;
 
   // console.log(` [in] ${source}`); // :: ${JSON.stringify(request)}`);

package/koni/background/subscription.d.ts

@@ -16,7 +16,8 @@ export declare class KoniSubscription {
     stopAllSubscription(): void;
     start(): Promise<void>;
     stop(): Promise<void>;
-    subscribeBalancesAndCrowdloans(address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, web3ApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): void;
+    subscribeBalances(address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, web3ApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): void;
+    subscribeCrowdloans(address: string, substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): void;
     subscribeStakingOnChain(address: string, substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): void;
     initStakingOnChainSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     initEssentialChainStakingMetadataSubscription(substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
@@ -27,5 +28,7 @@ export declare class KoniSubscription {
     subscribeStakingReward(address: string): Promise<void>;
     subscribeStakingRewardFastInterval(address: string): Promise<void>;
     reloadStaking(): Promise<void>;
+    reloadBalance(): Promise<void>;
+    reloadCrowdloan(): Promise<void>;
 }
 export {};

package/koni/background/subscription.js

@@ -53,7 +53,8 @@ export class KoniSubscription {
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
     if (currentAddress) {
-      this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+      this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+      this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
       this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
     }
     this.eventHandler = (events, eventTypes) => {
@@ -67,7 +68,8 @@ export class KoniSubscription {
       if (!address) {
         return;
       }
-      this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
+      this.subscribeBalances(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
+      this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
       this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
     };
     this.state.eventService.onLazy(this.eventHandler.bind(this));
@@ -80,16 +82,24 @@ export class KoniSubscription {
     this.stopAllSubscription();
     return Promise.resolve();
   }
-  subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
-    this.state.handleSwitchAccount(address).then(() => {
-      const addresses = this.state.getDecodedAddresses(address);
-      if (!addresses.length) {
-        return;
-      }
+  subscribeBalances(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.state.handleResetBalance(address).then(() => {
       this.updateSubscription('balance', this.initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime));
-      this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
     }).catch(err => this.logger.warn(err));
   }
+  subscribeCrowdloans(address, substrateApiMap, onlyRunOnFirstTime) {
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.state.resetCrowdloanMap(address).then(() => {
+      this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
+    }).catch(console.error);
+  }
   subscribeStakingOnChain(address, substrateApiMap, onlyRunOnFirstTime) {
     this.state.resetStaking(address);
     const addresses = this.state.getDecodedAddresses(address);
@@ -242,4 +252,17 @@ export class KoniSubscription {
     this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
     await waitTimeout(1800);
   }
+  async reloadBalance() {
+    var _this$state$keyringSe3;
+    const currentAddress = (_this$state$keyringSe3 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe3 === void 0 ? void 0 : _this$state$keyringSe3.address;
+    this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+    await waitTimeout(1800);
+  }
+  async reloadCrowdloan() {
+    var _this$state$keyringSe4;
+    const currentAddress = (_this$state$keyringSe4 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe4 === void 0 ? void 0 : _this$state$keyringSe4.address;
+    await this.state.handleResetBalance(currentAddress, true);
+    this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
+    await waitTimeout(1800);
+  }
 }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.26-0",
+  "version": "1.1.27-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1382,11 +1382,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.2.30",
-    "@subwallet/extension-base": "^1.1.26-0",
-    "@subwallet/extension-chains": "^1.1.26-0",
-    "@subwallet/extension-dapp": "^1.1.26-0",
-    "@subwallet/extension-inject": "^1.1.26-0",
+    "@subwallet/chain-list": "0.2.31",
+    "@subwallet/extension-base": "^1.1.27-1",
+    "@subwallet/extension-chains": "^1.1.27-1",
+    "@subwallet/extension-dapp": "^1.1.27-1",
+    "@subwallet/extension-inject": "^1.1.27-1",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.26-0'
+  version: '1.1.27-1'
 };

package/services/balance-service/BalanceMapImpl.js

@@ -35,9 +35,6 @@ export class BalanceMapImpl {
       address,
       tokenSlug
     } = balanceItem;
-    if (!address.startsWith('5') && !address.startsWith('0x')) {
-      console.log('check address', address);
-    }
     if (!this._map[address]) {
       this._map[address] = {};
     }

package/services/transaction-service/index.js

@@ -14,6 +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 { reformatAddress } from '@subwallet/extension-base/utils';
 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';
@@ -313,15 +314,16 @@ export default class TransactionService {
   transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
     const extrinsicType = transaction.extrinsicType;
+    const formattedTransactionAddress = reformatAddress(transaction.address);
     const historyItem = {
       origin: 'app',
       chain: transaction.chain,
       direction: TransactionDirection.SEND,
       type: transaction.extrinsicType,
-      from: transaction.address,
+      from: formattedTransactionAddress,
       to: '',
       chainType: transaction.chainType,
-      address: transaction.address,
+      address: formattedTransactionAddress,
       status: transaction.status,
       transactionId: transaction.id,
       extrinsicHash: transaction.extrinsicHash,

package/services/transaction-service/utils.js

@@ -18,6 +18,9 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('subscan.io')) {
     return 'account';
   }
+  if (explorerLink.includes('3dpscan.io')) {
+    return 'account';
+  }
   return 'address';
 }
 function getBlockExplorerTxRoute(chainInfo) {