@subwallet/extension-base 1.1.32-0 → 1.1.33-0

package/cjs/utils/fetchEvmChainInfo.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getEVMChainInfo = getEVMChainInfo;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const onlineMap = {};
+async function getEVMChainInfo(chainId) {
+  if (Object.keys(onlineMap).length === 0) {
+    const rs = await fetch('https://chainid.network/chains.json');
+    const data = await rs.json();
+    data.forEach(item => {
+      onlineMap[item.chainId] = item;
+    });
+  }
+  return onlineMap[chainId];
+}

package/cjs/utils/index.js

@@ -150,6 +150,30 @@ Object.keys(_translate).forEach(function (key) {
     }
   });
 });
+var _fetchStaticData = require("./fetchStaticData");
+Object.keys(_fetchStaticData).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _fetchStaticData[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _fetchStaticData[key];
+    }
+  });
+});
+var _fetchEvmChainInfo = require("./fetchEvmChainInfo");
+Object.keys(_fetchEvmChainInfo).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _fetchEvmChainInfo[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _fetchEvmChainInfo[key];
+    }
+  });
+});
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

package/koni/api/staking/bonding/amplitude.d.ts

@@ -5,7 +5,7 @@ import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/
 import { Codec } from '@polkadot/types/types';
 export declare function subscribeAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi, callback: (chain: string, rs: ChainStakingMetadata) => void): Promise<Codec>;
 export declare function getAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
-export declare function subscribeAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption, unstakingInfo: Record<string, number>): Promise<NominatorMetadata>;
+export declare function subscribeAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption[], unstakingInfo: Record<string, number>): Promise<NominatorMetadata>;
 /**
  * Deprecated
  * */

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

@@ -3,7 +3,7 @@
 
 import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { getBondedValidators, getStakingStatusByNominations, isUnstakeAll, parseIdentity } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
-import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -16,7 +16,7 @@ export function subscribeAmplitudeStakingMetadata(chain, substrateApi, callback)
     const unstakingDelay = substrateApi.api.consts.parachainStaking.stakeDuration.toString();
     const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
     const blockPerRound = parseFloat(_blockPerRound);
-    const blockDuration = (_STAKING_ERA_LENGTH_MAP[chain] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
+    const blockDuration = (_STAKING_ERA_LENGTH_MAP[chain] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound;
     const unstakingPeriod = blockDuration * parseInt(unstakingDelay);
     callback(chain, {
       chain,
@@ -58,46 +58,52 @@ export async function subscribeAmplitudeNominatorMetadata(chainInfo, address, su
   const nominationList = [];
   const unstakingList = [];
   const minDelegatorStake = substrateApi.api.consts.parachainStaking.minDelegatorStake.toString();
+  const hasUnstakingInfo = unstakingInfo && Object.values(unstakingInfo).length > 0;
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const [identity] = await parseIdentity(substrateApi, delegatorState.owner);
-    activeStake = delegatorState.amount.toString();
-    const bnActiveStake = new BN(activeStake);
-    let delegationStatus = StakingStatus.NOT_EARNING;
-    if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegatorStake))) {
-      delegationStatus = StakingStatus.EARNING_REWARD;
-    }
-    nominationList.push({
-      status: delegationStatus,
-      chain: chainInfo.slug,
-      validatorAddress: delegatorState.owner,
-      activeStake: delegatorState.amount.toString(),
-      validatorMinStake: '0',
-      hasUnstaking: !!unstakingInfo && Object.values(unstakingInfo).length > 0,
-      validatorIdentity: identity
-    });
-  }
-  if (unstakingInfo && Object.values(unstakingInfo).length > 0) {
-    const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
-    const currentBlockInfo = _currentBlockInfo.toPrimitive();
-    const currentBlockNumber = currentBlockInfo.number;
-    const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
-    const blockPerRound = parseFloat(_blockPerRound);
-    const nearestUnstakingBlock = Object.keys(unstakingInfo)[0];
-    const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
-    const blockDuration = (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
+    const identityPromises = delegatorState.map(delegate => parseIdentity(substrateApi, delegate.owner));
+    const identities = await Promise.all(identityPromises);
+    for (let i = 0; i < delegatorState.length; i++) {
+      const delegate = delegatorState[i];
+      const [identity] = identities[i];
+      activeStake = delegate.amount.toString();
+      const bnActiveStake = new BN(activeStake);
+      let delegationStatus = StakingStatus.NOT_EARNING;
+      if (bnActiveStake.gt(BN_ZERO) && bnActiveStake.gte(new BN(minDelegatorStake))) {
+        delegationStatus = StakingStatus.EARNING_REWARD;
+      }
+      nominationList.push({
+        status: delegationStatus,
+        chain: chainInfo.slug,
+        validatorAddress: delegate.owner,
+        activeStake: delegate.amount.toString(),
+        validatorMinStake: '0',
+        hasUnstaking: hasUnstakingInfo,
+        validatorIdentity: identity
+      });
+      if (hasUnstakingInfo) {
+        const _currentBlockInfo = await substrateApi.api.rpc.chain.getHeader();
+        const currentBlockInfo = _currentBlockInfo.toPrimitive();
+        const currentBlockNumber = currentBlockInfo.number;
+        const _blockPerRound = substrateApi.api.consts.parachainStaking.defaultBlocksPerRound.toString();
+        const blockPerRound = parseFloat(_blockPerRound);
+        const nearestUnstakingBlock = Object.keys(unstakingInfo)[0];
+        const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
+        const blockDuration = (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
-    const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
-    const waitingTime = remainingBlock * blockDuration;
-    unstakingList.push({
-      chain: chainInfo.slug,
-      status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
-      claimable: nearestUnstakingAmount.toString(),
-      waitingTime,
-      validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
-    });
+        const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
+        const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
+        const waitingTime = remainingBlock * blockDuration;
+        unstakingList.push({
+          chain: chainInfo.slug,
+          status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
+          claimable: nearestUnstakingAmount.toString(),
+          waitingTime,
+          validatorAddress: (delegate === null || delegate === void 0 ? void 0 : delegate.owner) || undefined
+        });
+      }
+    }
   }
   const stakingStatus = getStakingStatusByNominations(new BN(activeStake), nominationList);
   return {
@@ -194,33 +200,61 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
 }
 export async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   const chainApi = await substrateApi.isReady;
-  const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
-  const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
-  const inflationConfig = _inflationConfig.toHuman();
-  const rawDelegatorReturn = inflationConfig.delegator.rewardRate.annual;
-  const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
-  const allCollators = [];
-  for (const _collator of _allCollators) {
-    const collatorInfo = _collator[1].toPrimitive();
-    const bnTotalStake = new BN(collatorInfo.total);
-    const bnOwnStake = new BN(collatorInfo.stake);
-    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
-    allCollators.push({
-      address: collatorInfo.id,
-      totalStake: bnTotalStake.toString(),
-      ownStake: bnOwnStake.toString(),
-      otherStake: bnOtherStake.toString(),
-      nominatorCount: collatorInfo.delegators.length,
-      commission: 0,
-      expectedReturn: delegatorReturn,
-      blocked: false,
-      isVerified: false,
-      minBond: '0',
-      chain,
-      isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-    });
+
+  // Noted: Krest do not have reward
+  if (_STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
+    const _allCollators = await chainApi.api.query.parachainStaking.candidatePool.entries();
+    const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
+    const allCollators = [];
+    for (const _collator of _allCollators) {
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = new BN(collatorInfo.total);
+      const bnOwnStake = new BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      allCollators.push({
+        address: collatorInfo.id,
+        totalStake: bnTotalStake.toString(),
+        ownStake: bnOwnStake.toString(),
+        otherStake: bnOtherStake.toString(),
+        nominatorCount: collatorInfo.delegators.length,
+        commission: 0,
+        blocked: false,
+        isVerified: false,
+        minBond: '0',
+        chain,
+        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+      });
+    }
+    return allCollators;
+  } else {
+    const [_allCollators, _inflationConfig] = await Promise.all([chainApi.api.query.parachainStaking.candidatePool.entries(), chainApi.api.query.parachainStaking.inflationConfig()]);
+    const maxDelegatorsPerCollator = chainApi.api.consts.parachainStaking.maxDelegatorsPerCollator.toString();
+    const inflationConfig = _inflationConfig.toHuman();
+    const rawDelegatorReturn = inflationConfig.delegator.rewardRate.annual;
+    const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
+    const allCollators = [];
+    for (const _collator of _allCollators) {
+      const collatorInfo = _collator[1].toPrimitive();
+      const bnTotalStake = new BN(collatorInfo.total);
+      const bnOwnStake = new BN(collatorInfo.stake);
+      const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+      allCollators.push({
+        address: collatorInfo.id,
+        totalStake: bnTotalStake.toString(),
+        ownStake: bnOwnStake.toString(),
+        otherStake: bnOtherStake.toString(),
+        nominatorCount: collatorInfo.delegators.length,
+        commission: 0,
+        expectedReturn: delegatorReturn,
+        blocked: false,
+        isVerified: false,
+        minBond: '0',
+        chain,
+        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+      });
+    }
+    return allCollators;
   }
-  return allCollators;
 }
 export async function getAmplitudeBondingExtrinsic(substrateApi, amount, selectedValidatorInfo, nominatorMetadata) {
   const chainApi = await substrateApi.isReady;

package/koni/api/staking/bonding/utils.d.ts

@@ -39,6 +39,10 @@ export interface ParachainStakingStakeOption {
     owner: string;
     amount: number;
 }
+export interface KrestDelegateState {
+    delegations: ParachainStakingStakeOption[];
+    total: string;
+}
 export interface ParachainStakingCandidateMetadata {
     bond: string;
     delegationCount: number;

package/koni/api/staking/paraChain.js

@@ -12,7 +12,15 @@ import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 function getSingleStakingAmplitude(substrateApi, address, chainInfoMap, chain, stakingCallback, nominatorStateCallback) {
   return substrateApi.api.queryMulti([[substrateApi.api.query.parachainStaking.delegatorState, address], [substrateApi.api.query.parachainStaking.unstaking, address]], async ([_delegatorState, _unstaking]) => {
-    const delegatorState = _delegatorState.toPrimitive();
+    let delegatorState = [];
+    if (_STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
+      const krestDelegatorState = _delegatorState.toPrimitive();
+      const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
+      delegatorState = delegatorState.concat(delegates);
+    } else {
+      const delegate = _delegatorState.toPrimitive();
+      delegatorState.push(delegate);
+    }
     const unstakingInfo = _unstaking.toPrimitive();
     const {
       symbol
@@ -41,8 +49,13 @@ function getSingleStakingAmplitude(substrateApi, address, chainInfoMap, chain, s
         unstakings: []
       });
     } else {
-      const activeBalance = delegatorState ? new BN(delegatorState.amount.toString()) : BN_ZERO;
+      let activeBalance = BN_ZERO;
       let unstakingBalance = BN_ZERO;
+      for (const delegate of delegatorState) {
+        var _delegate$amount;
+        const amount = new BN((_delegate$amount = delegate.amount) === null || _delegate$amount === void 0 ? void 0 : _delegate$amount.toString());
+        activeBalance = activeBalance.add(amount);
+      }
       if (unstakingInfo) {
         Object.values(unstakingInfo).forEach(unstakingAmount => {
           const bnUnstakingAmount = new BN(unstakingAmount.toString());
@@ -77,7 +90,15 @@ function getMultiStakingAmplitude(substrateApi, useAddresses, chainInfoMap, chai
       const _unstakingStates = await substrateApi.api.query.parachainStaking.unstaking.multi(useAddresses);
       await Promise.all(ledgers.map(async (_delegatorState, i) => {
         const owner = reformatAddress(useAddresses[i], 42);
-        const delegatorState = _delegatorState.toPrimitive();
+        let delegatorState = [];
+        if (_STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
+          const krestDelegatorState = _delegatorState.toPrimitive();
+          const delegates = krestDelegatorState === null || krestDelegatorState === void 0 ? void 0 : krestDelegatorState.delegations;
+          delegatorState = delegatorState.concat(delegates);
+        } else {
+          const delegate = _delegatorState.toPrimitive();
+          delegatorState.push(delegate);
+        }
         const unstakingInfo = _unstakingStates[i].toPrimitive();
         if (!delegatorState && !unstakingInfo) {
           stakingCallback(chain, {
@@ -102,8 +123,13 @@ function getMultiStakingAmplitude(substrateApi, useAddresses, chainInfoMap, chai
             unstakings: []
           });
         } else {
-          const activeBalance = delegatorState ? new BN(delegatorState.amount.toString()) : BN_ZERO;
+          let activeBalance = BN_ZERO;
           let unstakingBalance = BN_ZERO;
+          for (const delegate of delegatorState) {
+            var _delegate$amount2;
+            const amount = new BN((_delegate$amount2 = delegate.amount) === null || _delegate$amount2 === void 0 ? void 0 : _delegate$amount2.toString());
+            activeBalance = activeBalance.add(amount);
+          }
           if (unstakingInfo) {
             Object.values(unstakingInfo).forEach(unstakingAmount => {
               const bnUnstakingAmount = new BN(unstakingAmount.toString());
@@ -149,7 +175,7 @@ export async function getAmplitudeUnclaimedStakingReward(substrateApiMap, addres
   });
   const unclaimedRewardList = [];
   await Promise.all(chains.map(async chain => {
-    if (_STAKING_CHAIN_GROUP.amplitude.includes(chain) && !_STAKING_CHAIN_GROUP.kilt.includes(chain)) {
+    if (_STAKING_CHAIN_GROUP.amplitude.includes(chain) && !_STAKING_CHAIN_GROUP.kilt.includes(chain) && !_STAKING_CHAIN_GROUP.krest_network.includes(chain)) {
       const networkInfo = networks[chain];
       const apiProps = await substrateApiMap[chain].isReady;
       await Promise.all(useAddresses.map(async address => {

package/koni/api/xcm/xTokens.js

@@ -19,6 +19,6 @@ function getCurrencyId(tokenInfo) {
 }
 export function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : getDestWeight();
-  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel', 'astar', 'shiden', 'centrifuge'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel', 'astar', 'shiden', 'centrifuge', 'manta_network'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, getDestMultilocation(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/koni/background/handlers/Tabs.js

@@ -13,7 +13,7 @@ import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
-import { canDerive, stripUrl } from '@subwallet/extension-base/utils';
+import { canDerive, getEVMChainInfo, stripUrl } from '@subwallet/extension-base/utils';
 import keyring from '@subwallet/ui-keyring';
 import { t } from 'i18next';
 import Web3 from 'web3';
@@ -382,15 +382,32 @@ export default class KoniTabs {
   }) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
+    const chainIdDec = parseInt(chainId, 16);
     const evmState = await this.getEvmState(url);
     if (evmState.chainId === chainId) {
       return null;
     }
-    const [networkKey] = this.#koniState.findNetworkKeyByChainId(parseInt(chainId, 16));
+    const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdDec);
     if (networkKey) {
       await this.#koniState.switchEvmNetworkByUrl(stripUrl(url), networkKey);
     } else {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'This network is currently not supported');
+      const onlineData = await getEVMChainInfo(chainIdDec);
+      if (onlineData) {
+        const chainData = {
+          chainId: chainId,
+          rpcUrls: onlineData.rpc.filter(url => url.startsWith('https://')),
+          chainName: onlineData.name,
+          blockExplorerUrls: onlineData.explorers.map(explorer => explorer.url),
+          nativeCurrency: onlineData.nativeCurrency,
+          requestId: id
+        };
+        await this.addEvmChain(id, url, {
+          method: 'wallet_addEthereumChain',
+          params: [chainData]
+        });
+      } else {
+        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'This network is currently not supported');
+      }
     }
     return null;
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.32-0",
+  "version": "1.1.33-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1313,6 +1313,11 @@
       "require": "./cjs/utils/eth/parseTransaction/base.js",
       "default": "./utils/eth/parseTransaction/base.js"
     },
+    "./utils/fetchEvmChainInfo": {
+      "types": "./utils/fetchEvmChainInfo.d.ts",
+      "require": "./cjs/utils/fetchEvmChainInfo.js",
+      "default": "./utils/fetchEvmChainInfo.js"
+    },
     "./utils/fetchStaticData": {
       "types": "./utils/fetchStaticData.d.ts",
       "require": "./cjs/utils/fetchStaticData.js",
@@ -1393,11 +1398,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.38",
-    "@subwallet/extension-base": "^1.1.32-0",
-    "@subwallet/extension-chains": "^1.1.32-0",
-    "@subwallet/extension-dapp": "^1.1.32-0",
-    "@subwallet/extension-inject": "^1.1.32-0",
+    "@subwallet/chain-list": "0.2.39-beta.5",
+    "@subwallet/extension-base": "^1.1.33-0",
+    "@subwallet/extension-chains": "^1.1.33-0",
+    "@subwallet/extension-dapp": "^1.1.33-0",
+    "@subwallet/extension-inject": "^1.1.33-0",
     "@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.32-0'
+  version: '1.1.33-0'
 };

package/services/campaign-service/index.js

@@ -44,6 +44,7 @@ export default class CampaignService {
             endTime,
             startTime,
             isDone: false,
+            isArchive: false,
             campaignId,
             type: CampaignDataType.BANNER,
             buttons,
@@ -64,6 +65,7 @@ export default class CampaignService {
           endTime,
           startTime,
           isDone: false,
+          isArchive: false,
           campaignId,
           type: CampaignDataType.NOTIFICATION,
           buttons,
@@ -76,6 +78,23 @@ export default class CampaignService {
       const exists = await this.#state.dbService.getCampaign(campaign.slug);
       if (!exists) {
         await this.#state.dbService.upsertCampaign(campaign);
+      } else {
+        const data = {
+          ...campaign,
+          isDone: exists.isDone
+        };
+        await this.#state.dbService.upsertCampaign(data);
+      }
+    }
+    const allCampaign = await this.#state.dbService.getAllCampaign();
+    for (const stored of allCampaign) {
+      const exists = campaigns.find(campaign => campaign.slug === stored.slug);
+      if (!exists) {
+        const data = {
+          ...stored,
+          isArchive: true
+        };
+        await this.#state.dbService.upsertCampaign(data);
       }
     }
     this.#state.eventService.emit('campaign.ready', true);

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

@@ -38,6 +38,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     para: string[];
     astar: string[];
     amplitude: string[];
+    krest_network: string[];
     kilt: string[];
     nominationPool: string[];
     bifrost: string[];

package/services/chain-service/constants.js

@@ -29,7 +29,7 @@ export const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge']
@@ -56,8 +56,9 @@ export const _STAKING_CHAIN_GROUP = {
   relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware', 'creditcoin', 'vara_network', 'goldberg_testnet'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network'],
   astar: ['astar', 'shiden', 'shibuya'],
-  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
+  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
   // amplitude and kilt only share some common logic
+  krest_network: ['krest_network'],
   kilt: ['kilt', 'kilt_peregrine'],
   nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet'],
   bifrost: ['bifrost', 'bifrost_testnet'],
@@ -97,7 +98,8 @@ export const _STAKING_ERA_LENGTH_MAP = {
   creditcoin: 24,
   vara_network: 12,
   goldberg_testnet: 24,
-  manta_network: 6
+  manta_network: 6,
+  krest_network: 4
 };
 export const _EXPECTED_BLOCK_TIME = {
   // in seconds

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

@@ -18,6 +18,7 @@ export interface EventRegistry {
     'asset.updateState': [string];
     'transaction.done': [SWTransaction];
     'transaction.failed': [SWTransaction | undefined];
+    'transaction.timeout': [SWTransaction | undefined];
     'transaction.submitStaking': [string];
     'transaction.transferNft': [SWTransaction | undefined];
     'mantaPay.initSync': [string | undefined];

package/services/history-service/index.js

@@ -166,14 +166,18 @@ export class HistoryService {
 
   // Insert history with check override origin 'app'
   async addHistoryItems(historyItems) {
-    // Prevent override record with original is 'app'
-    const appRecords = this.historySubject.value.filter(item => item.origin === 'app');
-    const excludeKeys = appRecords.map(item => {
-      return `${item.chain}-${item.extrinsicHash}`;
-    });
-    const updateRecords = historyItems.filter(item => {
-      const key = `${item.chain}-${item.extrinsicHash}`;
-      return item.origin === 'app' || !excludeKeys.includes(key);
+    const updateRecords = [];
+    const appItems = this.historySubject.value.filter(i => i.origin === 'app');
+    historyItems.forEach(item => {
+      const needUpdateItem = appItems.find(item_ => item_.extrinsicHash === item.extrinsicHash && item.chain === item_.chain && item.address === item_.address);
+      if (needUpdateItem) {
+        updateRecords.push({
+          ...needUpdateItem,
+          status: item.status
+        });
+        return;
+      }
+      updateRecords.push(item);
     });
     await this.dbService.upsertHistory(updateRecords);
     this.historySubject.next(await this.dbService.getHistories());

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

@@ -83,6 +83,7 @@ export default class DatabaseService {
     subscribeMantaPayConfig(chain: string, callback: (data: MantaPayConfig[]) => void): void;
     getMantaPayConfig(chain: string): Promise<any[]>;
     getMantaPayFirstConfig(chain: string): Promise<any>;
+    getAllCampaign(): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     subscribeProcessingCampaign(): import("dexie").Observable<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     getProcessingCampaign(): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData[]>;
     getCampaign(slug: string): Promise<import("@subwallet/extension-base/background/KoniTypes").CampaignData | undefined>;

package/services/storage-service/DatabaseService.js

@@ -274,6 +274,9 @@ export default class DatabaseService {
 
   /* Campaign */
 
+  getAllCampaign() {
+    return this.stores.campaign.getAll();
+  }
   subscribeProcessingCampaign() {
     return this.stores.campaign.subscribeProcessingCampaign();
   }

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

@@ -6,7 +6,13 @@ import { liveQuery } from 'dexie';
 const filterProcessing = campaign => {
   const now = new Date().getTime();
   const isExpired = now <= campaign.startTime || now >= campaign.endTime;
-  return !(campaign.isDone || isExpired);
+  return !(campaign.isArchive || campaign.isDone || isExpired);
+};
+const getId = campaign => {
+  return campaign.campaignId;
+};
+const sortById = (a, b) => {
+  return getId(a) - getId(b);
 };
 export default class CampaignStore extends BaseStore {
   async getAll() {
@@ -16,10 +22,10 @@ export default class CampaignStore extends BaseStore {
     return this.table.get(slug);
   }
   async getProcessingCampaign() {
-    return (await this.table.toArray()).filter(filterProcessing);
+    return (await this.table.toArray()).filter(filterProcessing).sort(sortById);
   }
   subscribeProcessingCampaign() {
-    return liveQuery(() => this.table.filter(filterProcessing).toArray());
+    return liveQuery(async () => (await this.table.filter(filterProcessing).toArray()).sort(sortById));
   }
   upsertCampaign(campaign) {
     return this.table.put(campaign);

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

@@ -43,6 +43,7 @@ export default class TransactionService {
     private handlePostProcessing;
     private onSuccess;
     private onFailed;
+    private onTimeOut;
     generateHashPayload(chain: string, transaction: TransactionConfig): HexString;
     private signAndSendEvmTransaction;
     private signAndSendSubstrateTransaction;