@subwallet/extension-base 1.3.20-0 → 1.3.22-0

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

@@ -15,4 +15,7 @@ export default class MetadataStore extends BaseStoreWithChain {
   updateMetadataByGenesisHash(genesisHash, metadata) {
     return this.table.put(metadata, genesisHash);
   }
+  clearByChains(chains) {
+    return this.table.where('chain').anyOf(chains).delete();
+  }
 }

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

@@ -1,4 +1,5 @@
 import { IMigration } from '../databases';
 import BaseStore from './BaseStore';
 export default class MigrationStore extends BaseStore<IMigration> {
+    hasRunScript(key: string): Promise<boolean>;
 }

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

@@ -2,4 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import BaseStore from "./BaseStore.js";
-export default class MigrationStore extends BaseStore {}
+export default class MigrationStore extends BaseStore {
+  async hasRunScript(key) {
+    const rs = await this.table.where('key').equals(key).first();
+    return !!rs;
+  }
+}

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

@@ -0,0 +1,14 @@
+import { ProcessTransactionData } from '@subwallet/extension-base/types';
+import BaseStoreWithAddress from './BaseStoreWithAddress';
+export default class ProcessTransaction extends BaseStoreWithAddress<ProcessTransactionData> {
+    getAll(): Promise<Record<string, ProcessTransactionData>>;
+    observableAll(): import("dexie").Observable<Record<string, ProcessTransactionData>>;
+    getOne(id: string): Promise<ProcessTransactionData | undefined>;
+    observableOne(id: string): import("dexie").Observable<ProcessTransactionData | undefined>;
+    getByIds(ids: string[]): Promise<{
+        [k: string]: ProcessTransactionData;
+    }>;
+    delete(key: string): Promise<void>;
+    getSubmittingProcess(): import("dexie").PromiseExtended<ProcessTransactionData[]>;
+    bulkDelete(keys: string[]): Promise<void>;
+}

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

@@ -0,0 +1,39 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { StepStatus } from '@subwallet/extension-base/types';
+import { liveQuery } from 'dexie';
+import BaseStoreWithAddress from "./BaseStoreWithAddress.js";
+export default class ProcessTransaction extends BaseStoreWithAddress {
+  async getAll() {
+    const all = await this.table.toArray();
+    return Object.fromEntries(all.map(item => [item.id, item]));
+  }
+  observableAll() {
+    return liveQuery(async () => {
+      const all = await this.table.toArray();
+      return Object.fromEntries(all.map(item => [item.id, item]));
+    });
+  }
+  async getOne(id) {
+    return this.table.get(id);
+  }
+  observableOne(id) {
+    return liveQuery(async () => {
+      return this.table.get(id);
+    });
+  }
+  async getByIds(ids) {
+    const rs = await this.table.where('id').anyOf(ids).toArray();
+    return Object.fromEntries(rs.map(item => [item.id, item]));
+  }
+  delete(key) {
+    return this.table.delete(key);
+  }
+  getSubmittingProcess() {
+    return this.table.filter(item => [StepStatus.PROCESSING, StepStatus.QUEUED].includes(item.status)).toArray();
+  }
+  bulkDelete(keys) {
+    return this.table.bulkDelete(keys);
+  }
+}

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

@@ -10,6 +10,8 @@ export default class TransactionStore extends BaseStoreWithAddressAndChain {
     }
     return this.table.where('address').equals(address).toArray();
   }
+
+  // TODO: This query is not exactly correct. It makes a lot of wrong assumptions, need to be fixed.
   async queryHistory(query) {
     if (!(query !== null && query !== void 0 && query.address) && !(query !== null && query !== void 0 && query.chain)) {
       return this.table.toArray();

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

@@ -10,3 +10,4 @@ export { default as MetadataStore } from './Metadata';
 export { default as MetadataV15Store } from './MetadataV15';
 export { default as ChainStore } from './Chain';
 export { default as AssetStore } from './Asset';
+export { default as ProcessTransactionStore } from './ProcessTransaction';

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

@@ -12,4 +12,5 @@ export { default as MigrationStore } from "./Migration.js";
 export { default as MetadataStore } from "./Metadata.js";
 export { default as MetadataV15Store } from "./MetadataV15.js";
 export { default as ChainStore } from "./Chain.js";
-export { default as AssetStore } from "./Asset.js";
+export { default as AssetStore } from "./Asset.js";
+export { default as ProcessTransactionStore } from "./ProcessTransaction.js";

package/services/swap-service/handler/asset-hub/handler.js

@@ -4,6 +4,7 @@
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { _getEarlyAssetHubValidationError, _validateBalanceToSwapOnAssetHub, _validateSwapRecipient } from '@subwallet/extension-base/core/logic-validation/swap';
 import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _getChainNativeTokenSlug, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
@@ -20,7 +21,18 @@ export class AssetHubSwapHandler {
   isReady = false;
   constructor(chainService, balanceService, feeService, chain) {
     const chainInfo = chainService.getChainInfoByKey(chain);
-    const providerSlug = chain === 'statemint' ? SwapProviderId.POLKADOT_ASSET_HUB : chain === 'statemine' ? SwapProviderId.KUSAMA_ASSET_HUB : SwapProviderId.ROCOCO_ASSET_HUB;
+    const providerSlug = function () {
+      switch (chain) {
+        case 'statemint':
+          return SwapProviderId.POLKADOT_ASSET_HUB;
+        case 'statemine':
+          return SwapProviderId.KUSAMA_ASSET_HUB;
+        case 'westend_assethub':
+          return SwapProviderId.WESTEND_ASSET_HUB;
+        default:
+          return SwapProviderId.ROCOCO_ASSET_HUB;
+      }
+    }();
     this.swapBaseHandler = new SwapBaseHandler({
       balanceService,
       chainService,
@@ -78,21 +90,13 @@ export class AssetHubSwapHandler {
     try {
       const alternativeChainInfo = this.chainService.getChainInfoByKey(alternativeAsset.originChain);
       const originalChainInfo = this.chainService.getChainInfoByKey(this.chain);
-      const step = {
-        metadata: {
-          sendingValue: bnAmount.toString(),
-          originTokenInfo: alternativeAsset,
-          destinationTokenInfo: fromAsset
-        },
-        name: `Transfer ${alternativeAsset.symbol} from ${alternativeChainInfo.name}`,
-        type: CommonStepType.XCM
-      };
       const xcmOriginSubstrateApi = await this.chainService.getSubstrateApi(alternativeAsset.originChain).isReady;
       const id = getId();
       const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, alternativeChainInfo.slug, 'substrate');
       const xcmTransfer = await createXcmExtrinsic({
         originTokenInfo: alternativeAsset,
         destinationTokenInfo: fromAsset,
+        // Mock sending value to get payment info
         sendingValue: bnAmount.toString(),
         recipient: params.request.address,
         sender: params.request.address,
@@ -106,12 +110,27 @@ export class AssetHubSwapHandler {
       const fee = {
         feeComponent: [{
           feeType: SwapFeeType.NETWORK_FEE,
-          amount: Math.round(xcmFeeInfo.partialFee * 1.2).toString(),
+          amount: Math.round(xcmFeeInfo.partialFee * XCM_MIN_AMOUNT_RATIO).toString(),
           tokenSlug: _getChainNativeTokenSlug(alternativeChainInfo)
         }],
         defaultFeeToken: _getChainNativeTokenSlug(alternativeChainInfo),
         feeOptions: [_getChainNativeTokenSlug(alternativeChainInfo)]
       };
+      let bnTransferAmount = bnAmount.minus(bnFromAssetBalance);
+      if (_isNativeToken(alternativeAsset)) {
+        const bnXcmFee = new BigN(fee.feeComponent[0].amount); // xcm fee is paid in native token but swap token is not always native token
+
+        bnTransferAmount = bnTransferAmount.plus(bnXcmFee);
+      }
+      const step = {
+        metadata: {
+          sendingValue: bnTransferAmount.toString(),
+          originTokenInfo: alternativeAsset,
+          destinationTokenInfo: fromAsset
+        },
+        name: `Transfer ${alternativeAsset.symbol} from ${alternativeChainInfo.name}`,
+        type: CommonStepType.XCM
+      };
       return [step, fee];
     } catch (e) {
       console.error('Error creating xcm step', e);

package/services/swap-service/handler/hydradx-handler.js

@@ -7,6 +7,7 @@ import { _AssetType } from '@subwallet/chain-list/types';
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { _getEarlyHydradxValidationError } from '@subwallet/extension-base/core/logic-validation/swap';
 import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _getAssetDecimals, _getChainNativeTokenSlug, _getTokenOnChainAssetId, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
@@ -92,21 +93,13 @@ export class HydradxHandler {
     try {
       const alternativeChainInfo = this.chainService.getChainInfoByKey(alternativeAsset.originChain);
       const destChainInfo = this.chainService.getChainInfoByKey(this.chain());
-      const step = {
-        metadata: {
-          sendingValue: bnAmount.toString(),
-          originTokenInfo: alternativeAsset,
-          destinationTokenInfo: fromAsset
-        },
-        name: `Transfer ${alternativeAsset.symbol} from ${alternativeChainInfo.name}`,
-        type: CommonStepType.XCM
-      };
       const xcmOriginSubstrateApi = await this.chainService.getSubstrateApi(alternativeAsset.originChain).isReady;
       const id = getId();
       const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, alternativeAsset.originChain, 'substrate');
       const xcmTransfer = await createXcmExtrinsic({
         originTokenInfo: alternativeAsset,
         destinationTokenInfo: fromAsset,
+        // Mock sending value to get payment info
         sendingValue: bnAmount.toString(),
         recipient: params.request.address,
         substrateApi: xcmOriginSubstrateApi,
@@ -120,12 +113,27 @@ export class HydradxHandler {
       const fee = {
         feeComponent: [{
           feeType: SwapFeeType.NETWORK_FEE,
-          amount: Math.round(xcmFeeInfo.partialFee * 1.2).toString(),
+          amount: Math.round(xcmFeeInfo.partialFee * XCM_MIN_AMOUNT_RATIO).toString(),
           tokenSlug: _getChainNativeTokenSlug(alternativeChainInfo)
         }],
         defaultFeeToken: _getChainNativeTokenSlug(alternativeChainInfo),
         feeOptions: [_getChainNativeTokenSlug(alternativeChainInfo)]
       };
+      let bnTransferAmount = bnAmount.minus(bnFromAssetBalance);
+      if (_isNativeToken(alternativeAsset)) {
+        const bnXcmFee = new BigNumber(fee.feeComponent[0].amount); // xcm fee is paid in native token but swap token is not always native token
+
+        bnTransferAmount = bnTransferAmount.plus(bnXcmFee);
+      }
+      const step = {
+        metadata: {
+          sendingValue: bnTransferAmount.toString(),
+          originTokenInfo: alternativeAsset,
+          destinationTokenInfo: fromAsset
+        },
+        name: `Transfer ${alternativeAsset.symbol} from ${alternativeChainInfo.name}`,
+        type: CommonStepType.XCM
+      };
       return [step, fee];
     } catch (e) {
       console.error('Error creating xcm step', e);

package/services/swap-service/index.js

@@ -158,6 +158,9 @@ export class SwapService {
         case SwapProviderId.ROCOCO_ASSET_HUB:
           this.handlers[providerId] = new AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'rococo_assethub');
           break;
+        case SwapProviderId.WESTEND_ASSET_HUB:
+          this.handlers[providerId] = new AssetHubSwapHandler(this.chainService, this.state.balanceService, this.state.feeService, 'westend_assethub');
+          break;
         case SwapProviderId.SIMPLE_SWAP:
           this.handlers[providerId] = new SimpleSwapHandler(this.chainService, this.state.balanceService, this.state.feeService);
           break;

package/services/swap-service/utils.js

@@ -51,6 +51,7 @@ export const _PROVIDER_TO_SUPPORTED_PAIR_MAP = {
   [SwapProviderId.POLKADOT_ASSET_HUB]: [COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB],
   [SwapProviderId.KUSAMA_ASSET_HUB]: [COMMON_CHAIN_SLUGS.KUSAMA_ASSET_HUB],
   [SwapProviderId.ROCOCO_ASSET_HUB]: [COMMON_CHAIN_SLUGS.ROCOCO_ASSET_HUB],
+  [SwapProviderId.WESTEND_ASSET_HUB]: ['westend_assethub'],
   [SwapProviderId.SIMPLE_SWAP]: ['bittensor', COMMON_CHAIN_SLUGS.ETHEREUM, COMMON_CHAIN_SLUGS.POLKADOT]
 };
 export function getSwapAlternativeAsset(swapPair) {

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

@@ -1,17 +1,20 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { SWTransaction, SWTransactionInput, SWTransactionResponse, TransactionEmitter } from '@subwallet/extension-base/services/transaction-service/types';
+import { BriefProcessStep, ProcessStep, ProcessTransactionData } from '@subwallet/extension-base/types';
 import { BehaviorSubject } from 'rxjs';
 import { TransactionConfig } from 'web3-core';
 import { HexString } from '@polkadot/util/types';
 export default class TransactionService {
     private readonly state;
-    private readonly transactionSubject;
     private readonly eventService;
     private readonly historyService;
     private readonly notificationService;
     private readonly chainService;
     private readonly watchTransactionSubscribes;
+    private aliveProcessMap;
+    private readonly transactionSubject;
+    private readonly aliveProcessSubject;
     private get transactions();
     constructor(state: KoniState);
     private get allTransactions();
@@ -20,6 +23,15 @@ export default class TransactionService {
     private checkDuplicate;
     validateTransaction(transactionInput: SWTransactionInput): Promise<SWTransactionResponse>;
     getTransactionSubject(): BehaviorSubject<Record<string, SWTransaction>>;
+    get observables(): {
+        readonly transaction: import("rxjs").Observable<Record<string, SWTransaction>>;
+        readonly aliveProcess: import("rxjs").Observable<Record<string, ProcessTransactionData>>;
+    };
+    get values(): {
+        readonly transaction: Record<string, SWTransaction>;
+        readonly aliveProcess: Record<string, ProcessTransactionData>;
+    };
+    private updateAliveProcess;
     private fillTransactionDefaultInfo;
     addTransaction(inputTransaction: SWTransactionInput): Promise<TransactionEmitter>;
     generateBeforeHandleResponseErrors(errors: TransactionError[]): SWTransactionResponse;
@@ -42,5 +54,11 @@ export default class TransactionService {
     private signAndSendTonTransaction;
     private handleTransactionTimeout;
     private handlePostEarningTransaction;
+    createProcessIfNeed(process: ProcessTransactionData): Promise<void>;
+    checkProcessExist(processId: string): boolean;
+    private deleteProcess;
+    updateProcessStepStatus(step: BriefProcessStep, data: Pick<ProcessStep, 'status' | 'transactionId' | 'extrinsicHash' | 'chain'>): void;
+    updateProcessInfo(id: string, combineInfo: unknown, step?: ProcessStep): Promise<void>;
+    createProcessNotification(transactionId: string): Promise<void>;
     resetWallet(): void;
 }