@subwallet/extension-base 1.3.19-0 → 1.3.21-0

package/services/chain-service/constants.js

@@ -254,7 +254,7 @@ export const _TRANSFER_CHAIN_GROUP = {
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot'],
   centrifuge: ['centrifuge'],
-  disable_transfer: ['invarch', 'crab', 'pangolin']
+  disable_transfer: ['crab', 'pangolin']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']

package/services/chain-service/handler/EvmApi.js

@@ -118,12 +118,10 @@ export class EvmApi {
     return this.disconnect();
   }
   onConnect() {
+    this.isReadyHandler.resolve(this);
     if (!this.isApiConnected) {
       console.log(`Connected to ${this.chainSlug} at ${this.apiUrl}`);
       this.isApiReady = true;
-      if (this.isApiReadyOnce) {
-        this.isReadyHandler.resolve(this);
-      }
     }
     this.updateConnectionStatus(_ChainConnectionStatus.CONNECTED);
   }

package/services/chain-service/utils/patch.js

@@ -5,7 +5,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.98'; // update this when build chainlist
+const ChainListVersion = '0.2.99'; // update this when build chainlist
 
 // todo: move this interface to chainlist
 

package/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -18,6 +18,7 @@ export const getStellaswapLiquidStakingContract = (networkKey, assetAddress, evm
 };
 const APR_STATS_URL = 'https://apr-api.stellaswap.com/api/v1/stdot';
 const SUBWALLET_REFERRAL = '0x7e6815f45E624768548d085231f2d453f16FD7DD';
+const TOP_HOLDER = '0x4300e09284e3bB4d9044DdAB31EfAF5f3301DABa';
 export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakingPoolHandler {
   inputAsset = 'moonbeam-LOCAL-xcDOT';
   altInputAsset = '';
@@ -198,9 +199,15 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
     await allowanceCall.call(), evmApi.api.eth.getGasPrice()]);
     if (!allowance || parseInt(allowance) <= 0) {
+      const metadata = {
+        tokenApprove: inputTokenSlug,
+        contractAddress: _getContractAddressOfToken(inputTokenInfo),
+        spenderAddress: _getContractAddressOfToken(derivativeTokenInfo)
+      };
       const step = {
         name: 'Authorize token approval',
-        type: YieldStepType.TOKEN_APPROVAL
+        type: YieldStepType.TOKEN_APPROVAL,
+        metadata: metadata
       };
 
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
@@ -223,13 +230,17 @@ export default class StellaSwapLiquidStakingPoolHandler extends BaseLiquidStakin
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
       const depositCall = stakingContract.methods.deposit(params.amount);
       let estimatedDepositGas = 0;
-      try {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-        estimatedDepositGas = await depositCall.estimateGas({
-          from: params.address
-        });
-      } catch (e) {
-        console.error(e);
+      const addressToTests = [params.address, TOP_HOLDER];
+      for (const address of addressToTests) {
+        try {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+          estimatedDepositGas = await depositCall.estimateGas({
+            from: address
+          });
+          break;
+        } catch (e) {
+          console.error(e);
+        }
       }
       const gasPrice = await evmApi.api.eth.getGasPrice();
       return {

package/services/earning-service/handlers/special.js

@@ -3,10 +3,10 @@
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY, XCM_FEE_RATIO } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, XCM_FEE_RATIO, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { YIELD_POOL_STAT_REFRESH_INTERVAL } from '@subwallet/extension-base/koni/api/yield/helper/utils';
 import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
-import { _getAssetDecimals, _getAssetExistentialDeposit, _getAssetName, _getAssetSymbol, _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetExistentialDeposit, _getAssetName, _getAssetSymbol, _getChainNativeTokenSlug, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType, YieldStepType, YieldValidationStatus } from '@subwallet/extension-base/types';
 import { createPromiseHandler, formatNumber } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
@@ -216,15 +216,6 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
           const altChainInfo = this.state.getChainInfo(altInputTokenInfo.originChain);
           const symbol = altInputTokenInfo.symbol;
           const networkName = altChainInfo.name;
-          const step = {
-            metadata: {
-              sendingValue: bnAmount.toString(),
-              originTokenInfo: altInputTokenInfo,
-              destinationTokenInfo: inputTokenInfo
-            },
-            name: `Transfer ${symbol} from ${networkName}`,
-            type: YieldStepType.XCM
-          };
           const xcmOriginSubstrateApi = await this.state.getSubstrateApi(altInputTokenInfo.originChain).isReady;
           const id = getId();
           const feeInfo = await this.state.feeService.subscribeChainFee(id, altChainInfo.slug, 'substrate');
@@ -245,9 +236,24 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
 
           const fee = {
             slug: altInputTokenSlug,
-            amount: Math.round(xcmFeeInfo.partialFee * 1.2).toString() // TODO
+            amount: Math.round(xcmFeeInfo.partialFee * XCM_MIN_AMOUNT_RATIO).toString() // TODO
           };
 
+          let bnTransferAmount = bnAmount.sub(bnInputTokenBalance);
+          if (_isNativeToken(altInputTokenInfo)) {
+            const bnXcmFee = new BN(fee.amount || 0); // xcm fee is paid in native token but swap token is not always native token
+
+            bnTransferAmount = bnTransferAmount.add(bnXcmFee);
+          }
+          const step = {
+            metadata: {
+              sendingValue: bnTransferAmount.toString(),
+              originTokenInfo: altInputTokenInfo,
+              destinationTokenInfo: inputTokenInfo
+            },
+            name: `Transfer ${symbol} from ${networkName}`,
+            type: YieldStepType.XCM
+          };
           return [step, fee];
         }
       }

package/services/history-service/helpers/recoverHistoryStatus.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { isSameAddress } from '@subwallet/extension-base/utils';
+import { isHex } from '@polkadot/util';
 export let HistoryRecoverStatus;
 (function (HistoryRecoverStatus) {
   HistoryRecoverStatus["SUCCESS"] = "SUCCESS";
@@ -31,7 +32,7 @@ const substrateRecover = async (history, chainService) => {
       const _api = await substrateApi.isReady;
       const api = _api.api;
       if (!blockHash) {
-        if (!nonce || !startBlock) {
+        if (nonce === undefined || startBlock === undefined) {
           console.log(`Fail to find extrinsic for ${address} on ${chain}: With nonce ${nonce || 'undefined'} from block ${startBlock || 'undefined'}`);
           return {
             status: HistoryRecoverStatus.LACK_INFO
@@ -41,7 +42,7 @@ const substrateRecover = async (history, chainService) => {
         for (let i = 1, found = false; i < BLOCK_LIMIT && !found && startBlock + i <= currentBlock; i++) {
           const blockHash = (await api.rpc.chain.getBlockHash(startBlock + i)).toHex();
           const block = await api.rpc.chain.getBlock(blockHash);
-          const extrinsics = block.block.extrinsics;
+          const extrinsics = block.block.extrinsics.toArray();
           let index;
           for (const [idx, extrinsic] of Object.entries(extrinsics)) {
             if (extrinsic.signer && isSameAddress(from, extrinsic.signer.toString()) && nonce === extrinsic.nonce.toNumber()) {
@@ -142,16 +143,24 @@ const evmRecover = async (history, chainService) => {
   try {
     const evmApi = chainService.getEvmApi(chain);
     if (evmApi) {
-      const _api = await evmApi.isReady;
+      const _api = await Promise.race([evmApi.isReady, new Promise((resolve, reject) => {
+        const createTimeout = callback => {
+          setTimeout(callback, 10000);
+        };
+        createTimeout(() => {
+          const api = chainService.getEvmApi(chain);
+          Promise.race([api.isReady, new Promise((resolve, reject) => createTimeout(() => reject(new Error('Timeout'))))]).then(resolve).catch(reject);
+        });
+      })]);
       const api = _api.api;
-      if (extrinsicHash) {
+      if (extrinsicHash && isHex(extrinsicHash)) {
         const transactionReceipt = await api.eth.getTransactionReceipt(extrinsicHash);
         return {
           ...result,
           status: transactionReceipt.status ? HistoryRecoverStatus.SUCCESS : HistoryRecoverStatus.FAILED
         };
       } else {
-        if (!nonce || !startBlock) {
+        if (nonce === undefined || startBlock === undefined) {
           console.log(`Fail to find extrinsic for ${address} on ${chain}: With nonce ${nonce || 'undefined'} from block ${startBlock || 'undefined'}`);
           return {
             ...result,

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

@@ -1,4 +1,4 @@
-import { TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
+import { ExtrinsicType, TransactionHistoryItem } from '@subwallet/extension-base/background/KoniTypes';
 import { PersistDataServiceInterface, ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
@@ -18,18 +18,18 @@ export declare class HistoryService implements StoppableServiceInterface, Persis
     private fetchPromise;
     private recoverInterval;
     private fetchAndLoadHistories;
-    getHistories(): Promise<TransactionHistoryItem<import("@subwallet/extension-base/background/KoniTypes").ExtrinsicType.TRANSFER_BALANCE>[]>;
-    getHistorySubject(): Promise<BehaviorSubject<TransactionHistoryItem<import("@subwallet/extension-base/background/KoniTypes").ExtrinsicType.TRANSFER_BALANCE>[]>>;
+    getHistories(): Promise<TransactionHistoryItem<ExtrinsicType.TRANSFER_BALANCE>[]>;
+    getHistorySubject(): Promise<BehaviorSubject<TransactionHistoryItem<ExtrinsicType.TRANSFER_BALANCE>[]>>;
     /**
      * @todo: Must improve performance of this function
      * */
     private fetchSubscanTransactionHistory;
     subscribeHistories(chain: string, proxyId: string, cb: (items: TransactionHistoryItem[]) => void): {
         unsubscribe: () => void;
-        value: TransactionHistoryItem<import("@subwallet/extension-base/background/KoniTypes").ExtrinsicType.TRANSFER_BALANCE>[];
+        value: TransactionHistoryItem<ExtrinsicType.TRANSFER_BALANCE>[];
     };
     updateHistories(chain: string, extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<void>;
-    updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<void>;
+    updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>, isRecover?: boolean): Promise<void>;
     insertHistories(historyItems: TransactionHistoryItem[]): Promise<void>;
     addHistoryItems(historyItems: TransactionHistoryItem[]): Promise<void>;
     removeHistoryByAddress(address: string): Promise<void>;
@@ -45,6 +45,7 @@ export declare class HistoryService implements StoppableServiceInterface, Persis
         promise: Promise<void>;
     };
     init(): Promise<void>;
+    restoreProcessTransaction(): Promise<void>;
     recoverProcessingHistory(): Promise<void>;
     start(): Promise<void>;
     waitForStarted(): Promise<void>;

package/services/history-service/index.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { ExtrinsicStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { ExtrinsicStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { CRON_RECOVER_HISTORY_INTERVAL } from '@subwallet/extension-base/constants';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { _isChainEvmCompatible, _isChainSubstrateCompatible } from '@subwallet/extension-base/services/chain-service/utils';
@@ -177,8 +177,8 @@ export class HistoryService {
     });
     await this.addHistoryItems(updatedRecords);
   }
-  async updateHistoryByExtrinsicHash(extrinsicHash, updateData) {
-    await this.dbService.updateHistoryByExtrinsicHash(extrinsicHash, updateData);
+  async updateHistoryByExtrinsicHash(extrinsicHash, updateData, isRecover = false) {
+    await this.dbService.updateHistoryByExtrinsicHash(extrinsicHash, updateData, isRecover);
     this.historySubject.next(await this.dbService.getHistories());
   }
 
@@ -253,11 +253,11 @@ export class HistoryService {
         case HistoryRecoverStatus.FAILED:
         case HistoryRecoverStatus.SUCCESS:
           updateData.status = recoverResult.status === HistoryRecoverStatus.SUCCESS ? ExtrinsicStatus.SUCCESS : ExtrinsicStatus.FAIL;
-          this.updateHistoryByExtrinsicHash(currentExtrinsicHash, updateData).catch(console.error);
+          this.updateHistoryByExtrinsicHash(currentExtrinsicHash, updateData, true).catch(console.error);
           delete this.#needRecoveryHistories[currentExtrinsicHash];
           break;
         default:
-          this.updateHistoryByExtrinsicHash(currentExtrinsicHash, updateData).catch(console.error);
+          this.updateHistoryByExtrinsicHash(currentExtrinsicHash, updateData, true).catch(console.error);
           delete this.#needRecoveryHistories[currentExtrinsicHash];
       }
     });
@@ -269,6 +269,7 @@ export class HistoryService {
   async init() {
     this.status = ServiceStatus.INITIALIZING;
     await this.eventService.waitCryptoReady;
+    this.restoreProcessTransaction().catch(console.error);
     await this.loadData();
     Promise.all([this.eventService.waitKeyringReady, this.eventService.waitChainReady]).then(() => {
       this.getHistories().catch(console.log);
@@ -279,11 +280,21 @@ export class HistoryService {
     }).catch(console.error);
     this.status = ServiceStatus.INITIALIZED;
   }
+  async restoreProcessTransaction() {
+    await this.dbService.restoreProcessTransaction();
+  }
   async recoverProcessingHistory() {
     const histories = await this.dbService.getHistories();
     this.#needRecoveryHistories = {};
     histories.filter(history => {
       return [ExtrinsicStatus.PROCESSING, ExtrinsicStatus.SUBMITTING].includes(history.status);
+    }).filter(history => {
+      if (history.type === ExtrinsicType.TRANSFER_XCM) {
+        const data = history.additionalInfo;
+        return data.originalChain === history.chain;
+      } else {
+        return true;
+      }
     }).forEach(history => {
       this.#needRecoveryHistories[history.extrinsicHash] = history;
     });

package/services/inapp-notification-service/index.d.ts

@@ -6,6 +6,7 @@ import { _BaseNotificationInfo, _NotificationInfo, NotificationActionType } from
 import { AvailBridgeTransaction, PolygonTransaction } from '@subwallet/extension-base/services/inapp-notification-service/utils';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
+import { ProcessTransactionData } from '@subwallet/extension-base/types';
 import { GetNotificationParams, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
 export declare class InappNotificationService implements CronServiceInterface {
     private readonly dbService;
@@ -36,6 +37,7 @@ export declare class InappNotificationService implements CronServiceInterface {
     processWriteAvailBridgeClaim(address: string, transactions: AvailBridgeTransaction[], token: _ChainAsset): Promise<void>;
     createPolygonClaimableTransactions(): Promise<void>;
     processPolygonClaimNotification(address: string, transactions: PolygonTransaction[], token: _ChainAsset): Promise<void>;
+    createProcessNotification(process: ProcessTransactionData): Promise<void>;
     start(): Promise<void>;
     startCron(): Promise<void>;
     stop(): Promise<void>;

package/services/inapp-notification-service/index.js

@@ -6,10 +6,12 @@ import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { CRON_LISTEN_AVAIL_BRIDGE_CLAIM } from '@subwallet/extension-base/constants';
 import { fetchLastestRemindNotificationTime } from '@subwallet/extension-base/constants/remind-notification-time';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
+import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import { NotificationDescriptionMap, NotificationTitleMap, ONE_DAY_MILLISECOND } from '@subwallet/extension-base/services/inapp-notification-service/consts';
 import { NotificationActionType, NotificationTab } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
 import { AvailBridgeSourceChain, fetchAllAvailBridgeClaimable, fetchPolygonBridgeTransactions, hrsToMillisecond } from '@subwallet/extension-base/services/inapp-notification-service/utils';
-import { categoryAddresses, formatNumber } from '@subwallet/extension-base/utils';
+import { ProcessType, YieldPoolType } from '@subwallet/extension-base/types';
+import { categoryAddresses, formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { isSubstrateAddress } from '@subwallet/keyring';
 export class InappNotificationService {
   constructor(dbService, keyringService, eventService, chainService) {
@@ -126,6 +128,17 @@ export class InappNotificationService {
         }
       }
     }
+    if ([NotificationActionType.SWAP, NotificationActionType.EARNING].includes(candidateNotification.actionType)) {
+      const candidateMetadata = candidateNotification.metadata;
+      const processId = candidateMetadata.processId;
+      for (const notification of comparedNotifications) {
+        const comparedMetadata = notification.metadata;
+        const _processId = comparedMetadata.processId;
+        if (processId === _processId) {
+          return false;
+        }
+      }
+    }
     return true;
   }
   async validateAndWriteNotificationsToDB(notifications, address) {
@@ -319,6 +332,71 @@ export class InappNotificationService {
     });
     await this.validateAndWriteNotificationsToDB(notifications, address);
   }
+  async createProcessNotification(process) {
+    const timestamp = Date.now();
+    const _id = process.id;
+    const address = process.address;
+    let actionType;
+    let extrinsicType;
+    let title = '';
+    let description = '';
+    if (process.type === ProcessType.SWAP) {
+      actionType = NotificationActionType.SWAP;
+      extrinsicType = ExtrinsicType.SWAP;
+      const combineInfo = process.combineInfo;
+      const fromAsset = this.chainService.getAssetBySlug(combineInfo.quote.pair.from);
+      const toAsset = this.chainService.getAssetBySlug(combineInfo.quote.pair.to);
+      const fromChain = this.chainService.getChainInfoByKey(fromAsset.originChain);
+      const toChain = this.chainService.getChainInfoByKey(toAsset.originChain);
+      title = '[{{accountName}}]  SWAPPED {{fromAsset}}'.replace('{{fromAsset}}', fromAsset.symbol);
+      description = '{{fromAmount}} {{fromAsset}} on {{fromChain}} swapped for {{toAmount}} {{toAsset}} on {{toChain}}. Click to view details'.replace('{{fromAmount}}', formatNumber(combineInfo.quote.fromAmount, fromAsset.decimals || 0)).replace('{{fromAsset}}', fromAsset.symbol).replace('{{fromChain}}', fromChain.name).replace('{{toAmount}}', formatNumber(combineInfo.quote.toAmount, toAsset.decimals || 0)).replace('{{toAsset}}', toAsset.symbol).replace('{{toChain}}', toChain.name);
+    } else {
+      actionType = NotificationActionType.EARNING;
+      extrinsicType = ExtrinsicType.JOIN_YIELD_POOL; // Not used
+
+      const combineInfo = process.combineInfo;
+      const asset = this.chainService.getAssetBySlug(combineInfo.brief.token);
+      const chain = this.chainService.getChainInfoByKey(combineInfo.brief.chain);
+      const amount = combineInfo.brief.amount;
+      let method;
+      switch (combineInfo.brief.method) {
+        case YieldPoolType.LIQUID_STAKING:
+          method = 'Liquid staking';
+          break;
+        case YieldPoolType.LENDING:
+          method = 'Lending';
+          break;
+        case YieldPoolType.SINGLE_FARMING:
+          method = 'Single farming';
+          break;
+        case YieldPoolType.NOMINATION_POOL:
+          method = 'Nomination pool';
+          break;
+        case YieldPoolType.PARACHAIN_STAKING:
+          method = 'Parachain staking';
+          break;
+        case YieldPoolType.NATIVE_STAKING:
+          method = _STAKING_CHAIN_GROUP.astar.includes(chain.slug) ? 'dApp staking' : 'Direct nomination';
+          break;
+      }
+      title = '[{{accountName}}] STAKED {{asset}}'.replace('{{asset}}', asset.symbol);
+      description = '{{amount}} {{asset}} on {{chain}} staked via {{method}}. Click to view details'.replace('{{amount}}', formatNumber(amount, asset.decimals || 0)).replace('{{asset}}', asset.symbol).replace('{{chain}}', chain.name).replace('{{method}}', method);
+    }
+    const notification = {
+      id: `${actionType}___${_id}___${timestamp}`,
+      address: reformatAddress(address),
+      title,
+      actionType,
+      metadata: {
+        processId: process.id
+      },
+      time: timestamp,
+      description,
+      isRead: false,
+      extrinsicType
+    };
+    await this.validateAndWriteNotificationsToDB([notification], process.address);
+  }
 
   // Polygon Claimable Handle
 

package/services/inapp-notification-service/interfaces.d.ts

@@ -28,6 +28,8 @@ export interface ActionTypeToMetadataMap {
     [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_AVAIL]: ClaimAvailBridgeNotificationMetadata;
     [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_ETHEREUM]: ClaimAvailBridgeNotificationMetadata;
     [NotificationActionType.CLAIM_POLYGON_BRIDGE]: ClaimPolygonBridgeNotificationMetadata;
+    [NotificationActionType.SWAP]: ProcessNotificationMetadata;
+    [NotificationActionType.EARNING]: ProcessNotificationMetadata;
 }
 export interface SendReceiveNotificationMetadata {
     chain: string;
@@ -71,6 +73,9 @@ export interface ClaimPolygonBridgeNotificationMetadata {
     transactionInitiator?: string;
     userAddress: string;
 }
+export interface ProcessNotificationMetadata {
+    processId: string;
+}
 export declare enum NotificationTimePeriod {
     TODAY = "TODAY",
     THIS_WEEK = "THIS_WEEK",
@@ -83,7 +88,9 @@ export declare enum NotificationActionType {
     CLAIM = "CLAIM",
     CLAIM_AVAIL_BRIDGE_ON_AVAIL = "CLAIM_AVAIL_BRIDGE_ON_AVAIL",
     CLAIM_AVAIL_BRIDGE_ON_ETHEREUM = "CLAIM_AVAIL_BRIDGE_ON_ETHEREUM",
-    CLAIM_POLYGON_BRIDGE = "CLAIM_POLYGON_BRIDGE"
+    CLAIM_POLYGON_BRIDGE = "CLAIM_POLYGON_BRIDGE",
+    SWAP = "SWAP",
+    EARNING = "EARNING"
 }
 export declare enum NotificationTab {
     ALL = "ALL",

package/services/inapp-notification-service/interfaces.js

@@ -22,6 +22,8 @@ export let NotificationActionType;
   NotificationActionType["CLAIM_AVAIL_BRIDGE_ON_AVAIL"] = "CLAIM_AVAIL_BRIDGE_ON_AVAIL";
   NotificationActionType["CLAIM_AVAIL_BRIDGE_ON_ETHEREUM"] = "CLAIM_AVAIL_BRIDGE_ON_ETHEREUM";
   NotificationActionType["CLAIM_POLYGON_BRIDGE"] = "CLAIM_POLYGON_BRIDGE";
+  NotificationActionType["SWAP"] = "SWAP";
+  NotificationActionType["EARNING"] = "EARNING";
 })(NotificationActionType || (NotificationActionType = {}));
 export let NotificationTab;
 (function (NotificationTab) {

package/services/keyring-service/context/state.d.ts

@@ -64,7 +64,7 @@ export declare class AccountState {
     upsertAccountProxyByKey(data: AccountProxyData, callback?: () => void): void;
     deleteAccountProxy(key: string, callback?: () => void): void;
     isUnifiedAccount(proxyId: string): boolean;
-    belongUnifiedAccount(address: string): string | undefined;
+    belongUnifiedAccount(_address: string): string | undefined;
     addressesByProxyId(proxyId: string): string[];
     upsertModifyPairs(data: ModifyPairStoreData): void;
     getAllAddresses(): string[];

package/services/keyring-service/context/state.js

@@ -6,7 +6,7 @@ import { AccountProxyStoreSubject, CurrentAccountStoreSubject, ModifyPairStoreSu
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountRefStore } from '@subwallet/extension-base/stores';
 import { AccountProxyType } from '@subwallet/extension-base/types';
-import { addLazy, combineAccountsWithSubjectInfo, isAddressValidWithAuthType, isSameAddress, parseUnifiedSuriToDerivationPath } from '@subwallet/extension-base/utils';
+import { addLazy, combineAccountsWithSubjectInfo, isAddressValidWithAuthType, isSameAddress, parseUnifiedSuriToDerivationPath, reformatAddress } from '@subwallet/extension-base/utils';
 import { generateRandomString } from '@subwallet/extension-base/utils/getId';
 import { EthereumKeypairTypes } from '@subwallet/keyring/types';
 import { keyring } from '@subwallet/ui-keyring';
@@ -381,10 +381,11 @@ export class AccountState {
     const accountProxies = this.accounts;
     return Object.values(accountProxies).some(value => value.accountType === AccountProxyType.UNIFIED && value.id === proxyId);
   }
-  belongUnifiedAccount(address) {
+  belongUnifiedAccount(_address) {
     var _modifyPairs$address;
     const modifyPairs = this.modifyPairs;
     const accountProxies = this.accountProxies;
+    const address = reformatAddress(_address);
     const proxyId = (_modifyPairs$address = modifyPairs[address]) === null || _modifyPairs$address === void 0 ? void 0 : _modifyPairs$address.accountProxyId;
     if (proxyId) {
       var _accountProxies$proxy;

package/services/request-service/handler/EvmRequestHandler.js

@@ -77,6 +77,16 @@ export default class EvmRequestHandler {
     if (!isInternal) {
       this.#requestService.popupOpen();
     }
+    if (options.isPassConfirmation) {
+      await this.completeConfirmation({
+        evmSendTransactionRequest: {
+          id,
+          url,
+          isApproved: true,
+          payload: ''
+        }
+      });
+    }
     this.#requestService.updateIconV2();
     return promise;
   }

package/services/request-service/handler/SubstrateRequestHandler.d.ts

@@ -13,6 +13,6 @@ export default class SubstrateRequestHandler {
     private signComplete;
     get numSubstrateRequests(): number;
     sign(url: string, request: RequestSign, _id?: string): Promise<ResponseSigning>;
-    signTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON): Promise<ResponseSigning>;
+    signTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON, onSign?: (id: string) => void): Promise<ResponseSigning>;
     resetWallet(): void;
 }

package/services/request-service/handler/SubstrateRequestHandler.js

@@ -74,9 +74,9 @@ export default class SubstrateRequestHandler {
       this.#requestService.popupOpen();
     });
   }
-  async signTransaction(id, address, url, payload) {
+  async signTransaction(id, address, url, payload, onSign) {
     const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
-    if (isAlwaysRequired) {
+    if (isAlwaysRequired && !onSign) {
       this.#requestService.keyringService.lock();
     }
     return new Promise((resolve, reject) => {
@@ -88,9 +88,10 @@ export default class SubstrateRequestHandler {
         url: url
       };
       this.updateIconSign();
-      if (!isInternalRequest(url)) {
+      if (!isInternalRequest(url) && !onSign) {
         this.#requestService.popupOpen();
       }
+      onSign === null || onSign === void 0 ? void 0 : onSign(id);
     });
   }
   resetWallet() {

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

@@ -50,7 +50,7 @@ export default class RequestService {
     get confirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     get confirmationsQueueSubjectTon(): BehaviorSubject<ConfirmationsQueueTon>;
     getSignRequest(id: string): import("./types").SignRequest | undefined;
-    signInternalTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON): Promise<ResponseSigning>;
+    signInternalTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON, onSign?: (id: string) => void): Promise<ResponseSigning>;
     addConfirmation<CT extends ConfirmationType>(id: string, url: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): Promise<ConfirmationDefinitions[CT][1]>;
     addConfirmationTon<CT extends ConfirmationTypeTon>(id: string, url: string, type: CT, payload: ConfirmationDefinitionsTon[CT][0]['payload'], // todo: messages <-> payload
     options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitionsTon[CT][1]) => Error | undefined): Promise<ConfirmationDefinitionsTon[CT][1]>;

package/services/request-service/index.js

@@ -151,8 +151,8 @@ export default class RequestService {
   getSignRequest(id) {
     return this.#substrateRequestHandler.getSignRequest(id);
   }
-  async signInternalTransaction(id, address, url, payload) {
-    return this.#substrateRequestHandler.signTransaction(id, address, url, payload);
+  async signInternalTransaction(id, address, url, payload, onSign) {
+    return this.#substrateRequestHandler.signTransaction(id, address, url, payload, onSign);
   }
   addConfirmation(id, url, type, payload, options = {}, validator) {
     return this.#evmRequestHandler.addConfirmation(id, url, type, payload, options, validator);

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

@@ -11,5 +11,6 @@ export declare const DEFAULT_SHOW_ZERO_BALANCE = true;
 export declare const DEFAULT_SHOW_BALANCE = false;
 export declare const DEFAULT_ALL_LOGO = "";
 export declare const DEFAULT_CAMERA_ENABLE = false;
+export declare const DEFAULT_ALLOW_ONE_SIGN = true;
 export declare const DEFAULT_NOTIFICATION_SETUP: NotificationSetup;
 export declare const DEFAULT_SETTING: UiSettings;

package/services/setting-service/constants.js

@@ -14,6 +14,7 @@ export const DEFAULT_SHOW_ZERO_BALANCE = true;
 export const DEFAULT_SHOW_BALANCE = false;
 export const DEFAULT_ALL_LOGO = '';
 export const DEFAULT_CAMERA_ENABLE = false;
+export const DEFAULT_ALLOW_ONE_SIGN = true;
 export const DEFAULT_NOTIFICATION_SETUP = {
   isEnabled: true,
   showNotice: {
@@ -42,5 +43,6 @@ export const DEFAULT_SETTING = {
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
   enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE,
   notificationSetup: DEFAULT_NOTIFICATION_SETUP,
-  walletReference: ''
+  walletReference: '',
+  allowOneSign: DEFAULT_ALLOW_ONE_SIGN
 };

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

@@ -3,7 +3,7 @@ import { ChainStakingMetadata, CrowdloanItem, MantaPayConfig, NftCollection, Nft
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { _NotificationInfo } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
 import { IBalance, ICampaign, IChain, INft } from '@subwallet/extension-base/services/storage-service/databases';
-import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MetadataV15Store, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
+import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MetadataStore, MetadataV15Store, MigrationStore, NftCollectionStore, NftStore, PriceStore, ProcessTransactionStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
 import CampaignStore from '@subwallet/extension-base/services/storage-service/db-stores/Campaign';
 import ChainStakingMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata';
 import InappNotificationStore from '@subwallet/extension-base/services/storage-service/db-stores/InappNotification';
@@ -12,7 +12,7 @@ import NominatorMetadataStore from '@subwallet/extension-base/services/storage-s
 import { HistoryQuery } from '@subwallet/extension-base/services/storage-service/db-stores/Transaction';
 import YieldPoolStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPoolStore';
 import YieldPositionStore from '@subwallet/extension-base/services/storage-service/db-stores/YieldPositionStore';
-import { BalanceItem, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { BalanceItem, ProcessTransactionData, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { GetNotificationParams, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
 import { Subscription } from 'dexie';
 import { DexieExportJsonStructure } from 'dexie-export-import';
@@ -40,6 +40,7 @@ export default class DatabaseService {
         mantaPay: MantaPayStore;
         campaign: CampaignStore;
         inappNotification: InappNotificationStore;
+        processTransactions: ProcessTransactionStore;
     };
     private logger;
     private nftSubscription;
@@ -67,7 +68,9 @@ export default class DatabaseService {
     subscribeNominatorMetadata(addresses: string[], callback: (data: NominatorMetadata[]) => void): Subscription;
     getHistories(query?: HistoryQuery): Promise<import("@subwallet/extension-base/services/storage-service/databases").ITransactionHistoryItem[]>;
     upsertHistory(histories: TransactionHistoryItem[]): Promise<unknown>;
-    updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<unknown>;
+    updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>, isRecover: boolean): Promise<unknown>;
+    restoreProcessTransaction(): Promise<void>;
+    recoverProcessTransaction(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<void>;
     addNftCollection(collection: NftCollection): Promise<unknown>;
     deleteNftCollection(chain: string, collectionId: string): Promise<void>;
     getAllNftCollection(chainHashes?: string[]): import("dexie").PromiseExtended<NftCollection[]>;
@@ -134,4 +137,10 @@ export default class DatabaseService {
     exportDB(): Promise<string>;
     importDB(data: string): Promise<boolean>;
     getExportJson(): Promise<DexieExportJsonStructure>;
+    upsertProcessTransaction(processTransaction: ProcessTransactionData): Promise<unknown>;
+    observableProcessTransactions(): import("dexie").Observable<Record<string, ProcessTransactionData>>;
+    getProcessTransactions(): Promise<Record<string, ProcessTransactionData>>;
+    getProcessTransactionById(processId: string): Promise<ProcessTransactionData | undefined>;
+    observableProcessTransactionById(processId: string): import("dexie").Observable<ProcessTransactionData | undefined>;
+    deleteProcessTransactionById(processId: string): Promise<void>;
 }