@subwallet/extension-base 1.1.38-1 → 1.1.39-beta.0

package/services/chain-service/index.js

@@ -31,6 +31,7 @@ export class ChainService {
   // TODO: consider BehaviorSubject
   chainInfoMapSubject = new Subject();
   chainStateMapSubject = new Subject();
+  chainStatusMapSubject = new BehaviorSubject({});
   assetRegistrySubject = new Subject();
   multiChainAssetMapSubject = new Subject();
   xcmRefMapSubject = new Subject();
@@ -104,6 +105,9 @@ export class ChainService {
   subscribeChainStateMap() {
     return this.chainStateMapSubject;
   }
+  subscribeChainStatusMap() {
+    return this.chainStatusMapSubject;
+  }
   getAssetRegistry() {
     return this.dataMap.assetRegistry;
   }
@@ -181,6 +185,12 @@ export class ChainService {
   getChainStateByKey(key) {
     return this.dataMap.chainStateMap[key];
   }
+  getChainStatusMap() {
+    return this.chainStatusMapSubject.getValue();
+  }
+  getChainStatusByKey(key) {
+    return this.getChainStatusMap()[key];
+  }
   getActiveChains() {
     return Object.entries(this.dataMap.chainStateMap).filter(([, chainState]) => _isChainEnabled(chainState)).map(([key]) => key);
   }
@@ -339,9 +349,31 @@ export class ChainService {
     this.lockChainInfoMap = false;
     return true;
   }
-  setChainConnectionStatus(slug, connectionStatus) {
-    const chainStateMap = this.getChainStateMap();
-    chainStateMap[slug].connectionStatus = connectionStatus;
+  connectionStatusQueueMap = {};
+  updateChainConnectionStatus(slug, connectionStatus) {
+    this.connectionStatusQueueMap[slug] = connectionStatus;
+    addLazy('updateChainConnectionStatus', () => {
+      const chainStatusMap = this.getChainStatusMap();
+      let update = false;
+      Object.entries(this.connectionStatusQueueMap).forEach(([slug, status]) => {
+        if (chainStatusMap[slug]) {
+          if (chainStatusMap[slug].connectionStatus !== status) {
+            chainStatusMap[slug].connectionStatus = status;
+            chainStatusMap[slug].lastUpdated = Date.now();
+            update = true;
+          }
+        } else {
+          chainStatusMap[slug] = {
+            slug,
+            connectionStatus: status,
+            lastUpdated: Date.now()
+          };
+          update = true;
+        }
+      });
+      this.connectionStatusQueueMap = {};
+      update && this.chainStatusMapSubject.next(chainStatusMap);
+    });
   }
   upsertCustomToken(token) {
     if (token.slug.length === 0) {
@@ -513,13 +545,8 @@ export class ChainService {
       providerName
     } = this.getChainCurrentProviderByKey(chainInfo.slug);
     const onUpdateStatus = status => {
-      const currentStatus = this.getChainStateByKey(chainInfo.slug).connectionStatus;
-
-      // Avoid unnecessary update in case disable chain
-      if (currentStatus !== status) {
-        this.setChainConnectionStatus(chainInfo.slug, status);
-        this.updateChainStateMapSubscription();
-      }
+      const slug = chainInfo.slug;
+      this.updateChainConnectionStatus(slug, status);
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
       if (_MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && MODULE_SUPPORT.MANTA_ZK && this.mantaChainHandler) {
@@ -618,7 +645,7 @@ export class ChainService {
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
     // Set disconnect state for inactive chain
-    chainStateMap[chainSlug].connectionStatus = _ChainConnectionStatus.DISCONNECTED;
+    this.updateChainConnectionStatus(chainSlug, _ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
@@ -711,9 +738,9 @@ export class ChainService {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: providerKey,
           slug: chainInfo.slug,
-          connectionStatus: _ChainConnectionStatus.DISCONNECTED,
           active: _DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
         };
+        this.updateChainConnectionStatus(chainInfo.slug, _ChainConnectionStatus.DISCONNECTED);
 
         // create data for storage
         newStorageData.push({
@@ -764,9 +791,9 @@ export class ChainService {
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
-            connectionStatus: _ChainConnectionStatus.DISCONNECTED,
             active: canActive && storedChainInfo.active
           };
+          this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
@@ -786,9 +813,9 @@ export class ChainService {
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
               currentProvider: storedChainInfo.currentProvider,
               slug: duplicatedDefaultSlug,
-              connectionStatus: _ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
             };
+            this.updateChainConnectionStatus(duplicatedDefaultSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[duplicatedDefaultSlug],
               active: storedChainInfo.active,
@@ -813,9 +840,9 @@ export class ChainService {
               currentProvider: storedChainInfo.currentProvider,
               // TODO: review
               slug: storedSlug,
-              connectionStatus: _ChainConnectionStatus.DISCONNECTED,
               active: storedChainInfo.active
             };
+            this.updateChainConnectionStatus(storedSlug, _ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
@@ -833,9 +860,9 @@ export class ChainService {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
-            connectionStatus: _ChainConnectionStatus.DISCONNECTED,
             active: _DEFAULT_ACTIVE_CHAINS.includes(slug)
           };
+          this.updateChainConnectionStatus(slug, _ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[slug],
             active: _DEFAULT_ACTIVE_CHAINS.includes(slug),
@@ -910,9 +937,7 @@ export class ChainService {
     }
   }
   updateChainStateMapSubscription() {
-    addLazy('updateChainStateMapSubscription', () => {
-      this.chainStateMapSubject.next(this.getChainStateMap());
-    }, 300, 900);
+    this.chainStateMapSubject.next(this.getChainStateMap());
   }
   updateChainInfoMapSubscription() {
     this.chainInfoMapSubject.next(this.getChainInfoMap());
@@ -1021,10 +1046,17 @@ export class ChainService {
     const chainStateMap = this.getChainStateMap();
     chainStateMap[newChainSlug] = {
       active: true,
-      connectionStatus: _ChainConnectionStatus.DISCONNECTED,
       currentProvider: params.chainEditInfo.currentProvider,
       slug: newChainSlug
     };
+
+    // const chainStatusMap = this.getChainStatusMap();
+    // const chainStatusMap[newChainSlug] = {
+    //   slug: newChainSlug,
+    //   connectionStatus: _ChainConnectionStatus.DISCONNECTED,
+    //   lastUpdated: Date.now()
+    // };
+
     await this.initApiForChain(chainInfo);
 
     // create a record in assetRegistry for native token and update store/subscription
@@ -1309,29 +1341,6 @@ export class ChainService {
     await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp()]);
     this.checkLatestData();
   }
-  checkAndUpdateStatusMapForChain(chainSlug) {
-    const substrateApiMap = this.getSubstrateApiMap();
-    const evmApiMap = this.getEvmApiMap();
-    const chainState = this.getChainStateByKey(chainSlug);
-    let update = false;
-    function updateState(current, status) {
-      if (current.connectionStatus !== status) {
-        current.connectionStatus = status;
-        update = true;
-      }
-    }
-    if (chainState.active) {
-      const api = substrateApiMap[chainSlug] || evmApiMap[chainSlug];
-      if (api) {
-        updateState(chainState, api.isApiConnected ? _ChainConnectionStatus.CONNECTED : _ChainConnectionStatus.DISCONNECTED);
-      }
-    } else {
-      updateState(chainState, _ChainConnectionStatus.DISCONNECTED);
-    }
-    if (update) {
-      this.dataMap.chainStateMap[chainSlug] = chainState;
-    }
-  }
   async initAssetSettings() {
     const assetSettings = await this.getAssetSettings();
     const activeChainSlugs = this.getActiveChainSlugs();

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

@@ -22,7 +22,11 @@ export interface _ChainState {
     slug: string;
     active: boolean;
     currentProvider: string;
+}
+export interface _ChainApiStatus {
+    slug: string;
     connectionStatus: _ChainConnectionStatus;
+    lastUpdated: number;
 }
 export interface _SubstrateDefaultFormatBalance {
     decimals?: number[] | number;

package/services/earning-service/handlers/native-staking/relay-chain.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';

package/services/earning-service/handlers/native-staking/relay-chain.js

@@ -280,7 +280,21 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const currentEra = _era.toString();
     const allValidators = [];
     const validatorInfoList = [];
-    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data()]);
+    const [_totalEraStake, _eraStakers, _minBond, _stakingRewards, _validators] = await Promise.all([chainApi.api.query.staking.erasTotalStake(parseInt(currentEra)), chainApi.api.query.staking.erasStakers.entries(parseInt(currentEra)), chainApi.api.query.staking.minNominatorBond(), ((_chainApi$api$query$s = chainApi.api.query.stakingRewards) === null || _chainApi$api$query$s === void 0 ? void 0 : _chainApi$api$query$s.data) && chainApi.api.query.stakingRewards.data(), chainApi.api.query.staking.validators.entries()]);
+
+    // filter blocked validators
+    const validators = _validators;
+    const blockValidatorList = [];
+    for (const validator of validators) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      const validatorAddress = validator[0].toHuman()[0];
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      const validatorPrefs = validator[1].toHuman();
+      const isBlocked = validatorPrefs.blocked;
+      if (isBlocked) {
+        blockValidatorList.push(validatorAddress);
+      }
+    }
     const stakingRewards = _stakingRewards === null || _stakingRewards === void 0 ? void 0 : _stakingRewards.toPrimitive();
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
@@ -296,32 +310,34 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const rawValidatorStat = item[1].toHuman();
       const validatorAddress = rawValidatorInfo[1];
-      const rawTotalStake = rawValidatorStat.total;
-      const rawOwnStake = rawValidatorStat.own;
-      const bnTotalStake = new BN(rawTotalStake.replaceAll(',', ''));
-      const bnOwnStake = new BN(rawOwnStake.replaceAll(',', ''));
-      const otherStake = bnTotalStake.sub(bnOwnStake);
-      totalStakeMap[validatorAddress] = bnTotalStake;
-      let nominatorCount = 0;
-      if ('others' in rawValidatorStat) {
-        const others = rawValidatorStat.others;
-        nominatorCount = others.length;
+      if (!blockValidatorList.includes(validatorAddress)) {
+        const rawTotalStake = rawValidatorStat.total;
+        const rawOwnStake = rawValidatorStat.own;
+        const bnTotalStake = new BN(rawTotalStake.replaceAll(',', ''));
+        const bnOwnStake = new BN(rawOwnStake.replaceAll(',', ''));
+        const otherStake = bnTotalStake.sub(bnOwnStake);
+        totalStakeMap[validatorAddress] = bnTotalStake;
+        let nominatorCount = 0;
+        if ('others' in rawValidatorStat) {
+          const others = rawValidatorStat.others;
+          nominatorCount = others.length;
+        }
+        allValidators.push(validatorAddress);
+        validatorInfoList.push({
+          address: validatorAddress,
+          totalStake: bnTotalStake.toString(),
+          ownStake: bnOwnStake.toString(),
+          otherStake: otherStake.toString(),
+          nominatorCount,
+          // to be added later
+          commission: 0,
+          expectedReturn: 0,
+          blocked: false,
+          isVerified: false,
+          minBond,
+          isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
+        });
       }
-      allValidators.push(validatorAddress);
-      validatorInfoList.push({
-        address: validatorAddress,
-        totalStake: bnTotalStake.toString(),
-        ownStake: bnOwnStake.toString(),
-        otherStake: otherStake.toString(),
-        nominatorCount,
-        // to be added later
-        commission: 0,
-        expectedReturn: 0,
-        blocked: false,
-        isVerified: false,
-        minBond,
-        isCrowded: unlimitedNominatorRewarded ? false : nominatorCount > parseInt(maxNominatorRewarded)
-      });
     }
     const extraInfoMap = {};
     await Promise.all(allValidators.map(async address => {

package/services/earning-service/handlers/special.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';

package/services/earning-service/service.js

@@ -5,7 +5,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BasicTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL } from '@subwallet/extension-base/constants';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
-import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isChainEnabled, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import BaseLiquidStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/liquid-staking/base';
 import { YieldPoolType } from '@subwallet/extension-base/types';
@@ -127,13 +127,20 @@ export default class EarningService {
     this.eventService.onLazy((events, eventTypes) => {
       (async () => {
         const removedAddresses = [];
+        const removeChains = [];
         events.forEach(event => {
           if (event.type === 'account.remove') {
             removedAddresses.push(event.data[0]);
           }
+          if (event.type === 'chain.updateState') {
+            const chainState = this.state.getChainStateByKey(event.data[0]);
+            if (chainState && !_isChainEnabled(chainState)) {
+              removeChains.push(event.data[0]);
+            }
+          }
         });
-        if (removedAddresses.length > 0) {
-          await this.removeYieldPositions(undefined, removedAddresses);
+        if (removeChains.length || removedAddresses.length) {
+          await this.removeYieldPositions(removeChains, removedAddresses);
         }
 
         // Account changed or chain changed (active or inactive)

package/services/transaction-service/index.js

@@ -339,13 +339,14 @@ export default class TransactionService {
   transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
     const extrinsicType = transaction.extrinsicType;
+    const chainInfo = this.state.chainService.getChainInfoByKey(transaction.chain);
     const formattedTransactionAddress = reformatAddress(transaction.address);
     const historyItem = {
       origin: 'app',
       chain: transaction.chain,
       direction: TransactionDirection.SEND,
       type: transaction.extrinsicType,
-      from: formattedTransactionAddress,
+      from: transaction.address,
       to: '',
       chainType: transaction.chainType,
       address: formattedTransactionAddress,
@@ -361,7 +362,6 @@ export default class TransactionService {
       nonce: nonce !== null && nonce !== void 0 ? nonce : 0,
       startBlock: startBlock || 0
     };
-    const chainInfo = this.state.chainService.getChainInfoByKey(transaction.chain);
     const nativeAsset = _getChainNativeTokenBasicInfo(chainInfo);
     const baseNativeAmount = {
       value: '0',
@@ -861,7 +861,8 @@ export default class TransactionService {
         to: transaction.to !== undefined ? transaction.to : '',
         value: addHexPrefix(anyNumberToBN(transaction.value).toString(16)),
         data: transaction.data,
-        chainId: _getEvmChainId(chainInfo)
+        chainId: _getEvmChainId(chainInfo),
+        type: 2
       };
     } else {
       var _transaction$nonce2;
@@ -872,7 +873,8 @@ export default class TransactionService {
         to: transaction.to !== undefined ? transaction.to : '',
         value: addHexPrefix(anyNumberToBN(transaction.value).toString(16)),
         data: transaction.data,
-        chainId: _getEvmChainId(chainInfo)
+        chainId: _getEvmChainId(chainInfo),
+        type: 0
       };
     }
     return ethers.Transaction.from(txObject).unsignedSerialized;

package/types/balance.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { BN } from '@polkadot/util';
 export interface TokenBalanceRaw {

package/types/yield/info/pallet.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@polkadot/util';
 export interface PalletNominationPoolsPoolMember {
     poolId: number;
@@ -122,6 +121,10 @@ export interface PalletStakingNominations {
     submittedIn: number;
     suppressed: boolean;
 }
+export interface PalletStakingValidatorPrefs {
+    commission: string;
+    blocked: boolean;
+}
 export interface UnlockingChunk {
     value: number;
     era: number;

package/utils/eth/mergeTransactionAndSignature.js

@@ -1,6 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { BN_ZERO } from '@subwallet/extension-base/utils';
+import { anyNumberToBN } from '@subwallet/extension-base/utils/eth';
 import { addHexPrefix } from 'ethereumjs-util';
 import { ethers } from 'ethers';
 export const mergeTransactionAndSignature = (tx, _rawSignature) => {
@@ -11,7 +13,8 @@ export const mergeTransactionAndSignature = (tx, _rawSignature) => {
     v: parseInt(`0x${_signature.substring(128)}`)
   };
   let transaction;
-  if (tx.maxFeePerGas) {
+  const max = anyNumberToBN(tx.maxFeePerGas);
+  if (max.gt(BN_ZERO)) {
     transaction = {
       nonce: tx.nonce,
       maxFeePerGas: addHexPrefix(tx.maxFeePerGas.toString(16)),
@@ -21,7 +24,8 @@ export const mergeTransactionAndSignature = (tx, _rawSignature) => {
       value: addHexPrefix(tx.value.toString(16)),
       data: tx.data,
       chainId: tx.chainId,
-      signature: signature
+      signature: signature,
+      type: 2
     };
   } else {
     transaction = {
@@ -32,7 +36,8 @@ export const mergeTransactionAndSignature = (tx, _rawSignature) => {
       value: addHexPrefix(tx.value.toString(16)),
       data: tx.data,
       chainId: tx.chainId,
-      signature: signature
+      signature: signature,
+      type: 0
     };
   }
   return ethers.Transaction.from(transaction).serialized;

package/utils/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { CrowdloanParaState, NetworkJson } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountAuthType, AccountJson } from '@subwallet/extension-base/background/types';
 import { BN } from '@polkadot/util';
@@ -38,7 +37,7 @@ export declare function isSameAddress(address1: string, address2: string): boole
 export declare function getDomainFromUrl(url: string): string;
 export declare function waitTimeout(ms: number): Promise<void>;
 export declare const stripUrl: (url: string) => string;
-export declare const baseParseIPFSUrl: (input: string) => string | undefined;
+export declare const baseParseIPFSUrl: (input: string, customDomain?: string) => string | undefined;
 export declare const swParseIPFSUrl: (input: string) => string | undefined;
 export declare function wait(milliseconds: number): Promise<void>;
 export * from './account';

package/utils/index.js

@@ -286,7 +286,8 @@ export const stripUrl = url => {
   const parts = url.split('/');
   return parts[2];
 };
-export const baseParseIPFSUrl = input => {
+export const baseParseIPFSUrl = (input, customDomain) => {
+  const selectedDomain = customDomain || getRandomIpfsGateway();
   if (!input || input.length === 0) {
     return undefined;
   }
@@ -297,17 +298,17 @@ export const baseParseIPFSUrl = input => {
     return input;
   }
   if (input.startsWith('/ipfs/')) {
-    return getRandomIpfsGateway() + input.split('/ipfs/')[1];
+    return selectedDomain + input.split('/ipfs/')[1];
   }
   if (!input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
     // just the IPFS hash
-    return getRandomIpfsGateway() + input;
+    return selectedDomain + input;
   }
   if (input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
     // starts with ipfs://
-    return getRandomIpfsGateway() + input.split('ipfs://')[1];
+    return selectedDomain + input.split('ipfs://')[1];
   }
-  return getRandomIpfsGateway() + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
+  return selectedDomain + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
 };
 
 export const swParseIPFSUrl = input => {

package/utils/staticData/buyServiceInfos.json

@@ -45,4 +45,3 @@
     "url": " "
   }
 ]
-

package/utils/staticData/buyTokenConfigs.json

@@ -679,20 +679,5 @@
     "slug": "arbitrum_one-ERC20-USDC-0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
     "symbol": "USDC",
     "support": "ETHEREUM"
-  },
-  {
-    "serviceInfo": {
-      "transak": {
-        "network": "polygon",
-        "symbol": "USDC",
-        "isSuspended": false
-      }
-    },
-    "network": "polygon",
-    "slug": "polygon-ERC20-USDC-0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
-    "symbol": "USDC",
-    "support": "ETHEREUM"
   }
 ]
-
-