@subwallet/extension-base 1.1.28-beta.1 → 1.1.30-0

package/services/transaction-service/index.js

@@ -6,14 +6,14 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { BasicTxErrorType, BasicTxWarningCode, ChainType, EvmProviderErrorType, ExtrinsicStatus, ExtrinsicType, NotificationType, TransactionDirection } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getEvmChainId, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
+import { _getChainNativeTokenBasicInfo, _getEvmChainId } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { TRANSACTION_TIMEOUT } from '@subwallet/extension-base/services/transaction-service/constants';
-import { parseLiquidStakingEvents, parseLiquidStakingFastUnstakeEvents, parseTransferEventLogs, parseXcmEventLogs } from '@subwallet/extension-base/services/transaction-service/event-parser';
+import { parseTransferEventLogs, parseXcmEventLogs } from '@subwallet/extension-base/services/transaction-service/event-parser';
 import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
-import { YieldPoolType } from '@subwallet/extension-base/types';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import { anyNumberToBN, recalculateGasPrice } from '@subwallet/extension-base/utils/eth';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
@@ -26,15 +26,20 @@ import EventEmitter from 'eventemitter3';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { isHex } from '@polkadot/util';
-import { _TRANSFER_CHAIN_GROUP } from "../chain-service/constants.js";
 export default class TransactionService {
   transactionSubject = new BehaviorSubject({});
   watchTransactionSubscribes = {};
   get transactions() {
     return this.transactionSubject.getValue();
   }
-  constructor(state) {
-    this.state = state;
+  constructor(chainService, eventService, requestService, balanceService, historyService, notificationService, databaseService) {
+    this.chainService = chainService;
+    this.eventService = eventService;
+    this.requestService = requestService;
+    this.balanceService = balanceService;
+    this.historyService = historyService;
+    this.notificationService = notificationService;
+    this.databaseService = databaseService;
   }
   get allTransactions() {
     return Object.values(this.transactions);
@@ -91,7 +96,7 @@ export default class TransactionService {
       decimals: 0,
       value: ''
     };
-    const chainInfo = this.state.chainService.getChainInfoByKey(chain);
+    const chainInfo = this.chainService.getChainInfoByKey(chain);
     if (!chainInfo) {
       validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, t('Cannot find network')));
     } else {
@@ -106,7 +111,7 @@ export default class TransactionService {
           if (isSubstrateTransaction(transaction)) {
             estimateFee.value = (await transaction.paymentInfo(address)).partialFee.toString();
           } else {
-            const web3 = this.state.chainService.getEvmApi(chain);
+            const web3 = this.chainService.getEvmApi(chain);
             if (!web3) {
               validationResponse.errors.push(new TransactionError(BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
@@ -140,35 +145,32 @@ export default class TransactionService {
 
     // Balance
     const transferNative = validationResponse.transferNativeAmount || '0';
-    const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(chain);
-    const balance = await this.state.balanceService.getTokenFreeBalance(address, chain, nativeTokenInfo.slug);
+    const nativeTokenInfo = this.chainService.getNativeTokenInfo(chain);
+    const balance = await this.balanceService.getTokenFreeBalance(address, chain, nativeTokenInfo.slug);
     const existentialDeposit = nativeTokenInfo.minAmount || '0';
     const feeNum = parseInt(estimateFee.value);
     const balanceNum = parseInt(balance.value);
     const edNum = parseInt(existentialDeposit);
     const transferNativeNum = parseInt(transferNative);
-    if (!validationInput.skipFeeValidation) {
-      // TODO
-      if (!new BigN(balance.value).gt(0)) {
+    if (!new BigN(balance.value).gt(0)) {
+      validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
+    }
+    if (transferNativeNum + feeNum > balanceNum) {
+      if (!isTransferAll) {
         validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
-      }
-      if (transferNativeNum + feeNum > balanceNum) {
-        if (!isTransferAll) {
+      } else {
+        if ([..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.genshiro, ..._TRANSFER_CHAIN_GROUP.bitcountry, ..._TRANSFER_CHAIN_GROUP.statemine].includes(chain)) {
+          // Chain not have transfer all function
           validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
-        } else {
-          if ([..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.genshiro, ..._TRANSFER_CHAIN_GROUP.bitcountry, ..._TRANSFER_CHAIN_GROUP.statemine].includes(chain)) {
-            // Chain not have transfer all function
-            validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
-          }
         }
       }
-      if (!isTransferAll) {
-        if (balanceNum - (transferNativeNum + feeNum) < edNum) {
-          if (edAsWarning) {
-            validationResponse.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
-          } else {
-            validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
-          }
+    }
+    if (!isTransferAll) {
+      if (balanceNum - (transferNativeNum + feeNum) < edNum) {
+        if (edAsWarning) {
+          validationResponse.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
+        } else {
+          validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
         }
       }
     }
@@ -235,21 +237,12 @@ export default class TransactionService {
     }
     validatedTransaction.warnings = [];
     const emitter = await this.addTransaction(validatedTransaction);
-    await new Promise((resolve, reject) => {
-      // TODO
-      if (transaction.resolveOnDone) {
-        emitter.on('success', data => {
-          validatedTransaction.id = data.id;
-          validatedTransaction.extrinsicHash = data.extrinsicHash;
-          resolve();
-        });
-      } else {
-        emitter.on('signed', data => {
-          validatedTransaction.id = data.id;
-          validatedTransaction.extrinsicHash = data.extrinsicHash;
-          resolve();
-        });
-      }
+    await new Promise(resolve => {
+      emitter.on('signed', data => {
+        validatedTransaction.id = data.id;
+        validatedTransaction.extrinsicHash = data.extrinsicHash;
+        resolve();
+      });
       emitter.on('error', data => {
         if (data.errors.length > 0) {
           validatedTransaction.errors.push(...data.errors);
@@ -315,7 +308,7 @@ export default class TransactionService {
   }
   getTransactionLink(id) {
     const transaction = this.getTransaction(id);
-    const chainInfo = this.state.chainService.getChainInfoByKey(transaction.chain);
+    const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
     return getExplorerLink(chainInfo, transaction.extrinsicHash, 'tx');
   }
   transactionToHistories(id, startBlock, nonce, eventLogs) {
@@ -343,7 +336,7 @@ export default class TransactionService {
       nonce: nonce !== null && nonce !== void 0 ? nonce : 0,
       startBlock: startBlock || 0
     };
-    const chainInfo = this.state.chainService.getChainInfoByKey(transaction.chain);
+    const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
     const nativeAsset = _getChainNativeTokenBasicInfo(chainInfo);
     const baseNativeAmount = {
       value: '0',
@@ -357,7 +350,7 @@ export default class TransactionService {
         {
           const inputData = parseTransactionData(transaction.data);
           historyItem.to = inputData.to;
-          const sendingTokenInfo = this.state.chainService.getAssetBySlug(inputData.tokenSlug);
+          const sendingTokenInfo = this.chainService.getAssetBySlug(inputData.tokenSlug);
           historyItem.amount = {
             value: inputData.value || '0',
             decimals: sendingTokenInfo.decimals || 0,
@@ -370,7 +363,7 @@ export default class TransactionService {
         {
           const inputData = parseTransactionData(transaction.data);
           historyItem.to = inputData.to;
-          const sendingTokenInfo = this.state.chainService.getAssetBySlug(inputData.tokenSlug);
+          const sendingTokenInfo = this.chainService.getAssetBySlug(inputData.tokenSlug);
           historyItem.amount = {
             value: inputData.value || '0',
             decimals: sendingTokenInfo.decimals || 0,
@@ -383,7 +376,7 @@ export default class TransactionService {
         {
           const inputData = parseTransactionData(transaction.data);
           historyItem.to = inputData.to;
-          const sendingTokenInfo = this.state.chainService.getAssetBySlug(inputData.tokenSlug);
+          const sendingTokenInfo = this.chainService.getAssetBySlug(inputData.tokenSlug);
           historyItem.amount = {
             value: inputData.value || '0',
             decimals: sendingTokenInfo.decimals || 0,
@@ -432,29 +425,17 @@ export default class TransactionService {
       case ExtrinsicType.STAKING_UNBOND:
         {
           const data = parseTransactionData(transaction.data);
-          if (data.isLiquidStaking && data.derivativeTokenInfo && data.exchangeRate && data.inputTokenInfo) {
-            historyItem.amount = {
-              decimals: _getAssetDecimals(data.derivativeTokenInfo),
-              symbol: _getAssetSymbol(data.derivativeTokenInfo),
-              value: data.amount
-            };
-            historyItem.additionalInfo = {
-              inputTokenSlug: data.inputTokenInfo.slug,
-              exchangeRate: data.exchangeRate
-            };
-          } else {
-            historyItem.to = data.validatorAddress || '';
-            historyItem.amount = {
-              ...baseNativeAmount,
-              value: data.amount || '0'
-            };
-          }
+          historyItem.to = data.validatorAddress || '';
+          historyItem.amount = {
+            ...baseNativeAmount,
+            value: data.amount || '0'
+          };
         }
         break;
       case ExtrinsicType.STAKING_LEAVE_POOL:
         {
           const data = parseTransactionData(transaction.data);
-          historyItem.to = data.address || '';
+          historyItem.to = data.nominatorMetadata.address || '';
           historyItem.amount = {
             ...baseNativeAmount,
             value: data.amount || '0'
@@ -473,7 +454,7 @@ export default class TransactionService {
       case ExtrinsicType.STAKING_WITHDRAW:
         {
           const data = parseTransactionData(transaction.data);
-          historyItem.to = data.unstakingInfo.validatorAddress || '';
+          historyItem.to = data.validatorAddress || '';
           historyItem.amount = {
             ...baseNativeAmount,
             value: data.unstakingInfo.claimable || '0'
@@ -498,68 +479,6 @@ export default class TransactionService {
           historyItem.to = (data === null || data === void 0 ? void 0 : data.to) || '';
           break;
         }
-      case ExtrinsicType.MINT_STDOT:
-      case ExtrinsicType.MINT_QDOT:
-      case ExtrinsicType.MINT_LDOT:
-      case ExtrinsicType.MINT_SDOT:
-
-      // eslint-disable-next-line no-fallthrough
-      case ExtrinsicType.MINT_VDOT:
-        {
-          const data = parseTransactionData(transaction.data);
-          const params = data.data;
-          const inputTokenInfo = this.state.chainService.getAssetBySlug(params.inputTokenSlug);
-          const isFeePaidWithInputAsset = params.feeTokenSlug === params.inputTokenSlug;
-          historyItem.amount = {
-            value: params.amount,
-            symbol: _getAssetSymbol(inputTokenInfo),
-            decimals: _getAssetDecimals(inputTokenInfo)
-          };
-          historyItem.additionalInfo = {
-            derivativeTokenSlug: params.derivativeTokenSlug,
-            exchangeRate: params.exchangeRate
-          };
-          eventLogs && !_isChainEvmCompatible(chainInfo) && parseLiquidStakingEvents(historyItem, eventLogs, inputTokenInfo, chainInfo, isFeePaidWithInputAsset, extrinsicType);
-          break;
-        }
-      case ExtrinsicType.REDEEM_QDOT:
-        {
-          const data = parseTransactionData(transaction.data);
-          const yieldPoolInfo = data.yieldPoolInfo;
-          if (yieldPoolInfo.metadata.derivativeAssets) {
-            const inputTokenSlug = yieldPoolInfo.metadata.inputAsset;
-            const inputTokenInfo = this.state.chainService.getAssetBySlug(inputTokenSlug);
-            historyItem.amount = {
-              value: data.amount,
-              symbol: _getAssetSymbol(inputTokenInfo),
-              decimals: _getAssetDecimals(inputTokenInfo)
-            };
-            eventLogs && parseLiquidStakingFastUnstakeEvents(historyItem, eventLogs, chainInfo, extrinsicType);
-          }
-          break;
-        }
-      case ExtrinsicType.REDEEM_STDOT:
-      case ExtrinsicType.REDEEM_LDOT:
-      case ExtrinsicType.REDEEM_SDOT:
-
-      // eslint-disable-next-line no-fallthrough
-      case ExtrinsicType.REDEEM_VDOT:
-        {
-          const data = parseTransactionData(transaction.data);
-          const yieldPoolInfo = data.yieldPoolInfo;
-          if (yieldPoolInfo.metadata.derivativeAssets) {
-            const derivativeTokenSlug = yieldPoolInfo.metadata.derivativeAssets[0];
-            const derivativeTokenInfo = this.state.chainService.getAssetBySlug(derivativeTokenSlug);
-            const chainInfo = this.state.chainService.getChainInfoByKey(data.yieldPoolInfo.chain);
-            historyItem.amount = {
-              value: data.amount,
-              symbol: _getAssetSymbol(derivativeTokenInfo),
-              decimals: _getAssetDecimals(derivativeTokenInfo)
-            };
-            eventLogs && !_isChainEvmCompatible(chainInfo) && parseLiquidStakingFastUnstakeEvents(historyItem, eventLogs, chainInfo, extrinsicType);
-          }
-          break;
-        }
       case ExtrinsicType.UNKNOWN:
         break;
     }
@@ -605,7 +524,7 @@ export default class TransactionService {
     });
 
     // Create Input History Transaction History
-    this.state.historyService.insertHistories(this.transactionToHistories(id, startBlock, nonce)).catch(console.error);
+    this.historyService.insertHistories(this.transactionToHistories(id, startBlock, nonce)).catch(console.error);
     console.debug(`Transaction "${id}" is sent`);
   }
   onHasTransactionHash({
@@ -622,12 +541,8 @@ export default class TransactionService {
     this.updateTransaction(id, updateData);
 
     // In this case transaction id is the same as extrinsic hash and will change after below update
-    this.state.historyService.updateHistoryByExtrinsicHash(id, updateData).catch(console.error);
+    this.historyService.updateHistoryByExtrinsicHash(id, updateData).catch(console.error);
     console.debug(`Transaction "${id}" is submitted with hash ${extrinsicHash || ''}`);
-    const transaction = this.getTransaction(id);
-    if ([ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.JOIN_YIELD_POOL, ExtrinsicType.MINT_LDOT, ExtrinsicType.MINT_QDOT, ExtrinsicType.MINT_SDOT, ExtrinsicType.MINT_VDOT].includes(transaction.extrinsicType)) {
-      this.handlePostEarningTransaction(id);
-    }
   }
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
@@ -636,15 +551,15 @@ export default class TransactionService {
       const inputData = parseTransactionData(transaction.data);
       try {
         const sender = keyring.getPair(inputData.senderAddress);
-        sender && this.state.dbService.handleNftTransfer(transaction.chain, [sender.address, ALL_ACCOUNT_KEY], inputData.nftItem).then(() => {
-          this.state.eventService.emit('transaction.transferNft', undefined);
+        sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, ALL_ACCOUNT_KEY], inputData.nftItem).then(() => {
+          this.eventService.emit('transaction.transferNft', undefined);
         }).catch(console.error);
       } catch (e) {
         console.error(e);
       }
       try {
         const recipient = keyring.getPair(inputData.recipientAddress);
-        recipient && this.state.dbService.addNft(recipient.address, {
+        recipient && this.databaseService.addNft(recipient.address, {
           ...inputData.nftItem,
           owner: recipient.address
         }).catch(console.error);
@@ -652,7 +567,7 @@ export default class TransactionService {
         console.error(e);
       }
     } else if ([ExtrinsicType.STAKING_BOND, ExtrinsicType.STAKING_UNBOND, ExtrinsicType.STAKING_WITHDRAW, ExtrinsicType.STAKING_CANCEL_UNSTAKE, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.STAKING_POOL_WITHDRAW, ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
-      this.state.eventService.emit('transaction.submitStaking', transaction.chain);
+      this.eventService.emit('transaction.submitStaking', transaction.chain);
     }
   }
   onSuccess({
@@ -668,14 +583,14 @@ export default class TransactionService {
     });
 
     // Write success transaction history
-    this.state.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
+    this.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
       extrinsicHash,
       status: ExtrinsicStatus.SUCCESS,
       blockNumber: blockNumber || 0,
       blockHash: blockHash || ''
     }).catch(console.error);
-    const info = isHex(extrinsicHash) ? extrinsicHash : getBaseTransactionInfo(transaction, this.state.chainService.getChainInfoMap());
-    this.state.notificationService.notify({
+    const info = isHex(extrinsicHash) ? extrinsicHash : getBaseTransactionInfo(transaction, this.chainService.getChainInfoMap());
+    this.notificationService.notify({
       type: NotificationType.SUCCESS,
       title: t('Transaction completed'),
       message: t('Transaction {{info}} completed', {
@@ -688,7 +603,7 @@ export default class TransactionService {
       },
       notifyViaBrowser: true
     });
-    this.state.eventService.emit('transaction.done', transaction);
+    this.eventService.emit('transaction.done', transaction);
   }
   onFailed({
     blockHash,
@@ -707,14 +622,14 @@ export default class TransactionService {
       });
 
       // Write failed transaction history
-      this.state.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
+      this.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
         extrinsicHash: extrinsicHash || transaction.extrinsicHash,
         status: nextStatus,
         blockNumber: blockNumber || 0,
         blockHash: blockHash || ''
       }).catch(console.error);
-      const info = isHex(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : getBaseTransactionInfo(transaction, this.state.chainService.getChainInfoMap());
-      this.state.notificationService.notify({
+      const info = isHex(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : getBaseTransactionInfo(transaction, this.chainService.getChainInfoMap());
+      this.notificationService.notify({
         type: NotificationType.ERROR,
         title: t('Transaction failed'),
         message: t('Transaction {{info}} failed', {
@@ -728,11 +643,11 @@ export default class TransactionService {
         notifyViaBrowser: true
       });
     }
-    this.state.eventService.emit('transaction.failed', transaction);
+    this.eventService.emit('transaction.failed', transaction);
   }
   generateHashPayload(chain, transaction) {
     var _transaction$nonce;
-    const chainInfo = this.state.chainService.getChainInfoByKey(chain);
+    const chainInfo = this.chainService.getChainInfoByKey(chain);
     const txObject = {
       nonce: (_transaction$nonce = transaction.nonce) !== null && _transaction$nonce !== void 0 ? _transaction$nonce : 0,
       gasPrice: addHexPrefix(anyNumberToBN(transaction.gasPrice).toString(16)),
@@ -753,8 +668,8 @@ export default class TransactionService {
   }) {
     var _payload$nonce;
     const payload = transaction;
-    const evmApi = this.state.chainService.getEvmApi(chain);
-    const chainInfo = this.state.chainService.getChainInfoByKey(chain);
+    const evmApi = this.chainService.getEvmApi(chain);
+    const chainInfo = this.chainService.getChainInfoByKey(chain);
     const accountPair = keyring.getPair(address);
     const account = {
       address,
@@ -784,7 +699,7 @@ export default class TransactionService {
 
     // Set unique nonce to avoid transaction errors
     if (!payload.nonce) {
-      const evmApi = this.state.chainService.getEvmApi(chain);
+      const evmApi = this.chainService.getEvmApi(chain);
       payload.nonce = await evmApi.api.eth.getTransactionCount(address);
     }
     if (!payload.chainId) {
@@ -819,7 +734,7 @@ export default class TransactionService {
       extrinsicHash: id
     };
     if (isInjected) {
-      this.state.requestService.addConfirmation(id, url || EXTENSION_REQUEST_URL, 'evmWatchTransactionRequest', payload, {}).then(async ({
+      this.requestService.addConfirmation(id, url || EXTENSION_REQUEST_URL, 'evmWatchTransactionRequest', payload, {}).then(async ({
         isApproved,
         payload
       }) => {
@@ -827,7 +742,7 @@ export default class TransactionService {
           if (!payload) {
             throw new EvmProviderError(EvmProviderErrorType.UNAUTHORIZED, 'Bad signature');
           }
-          const web3Api = this.state.chainService.getEvmApi(chain).api;
+          const web3Api = this.chainService.getEvmApi(chain).api;
 
           // Emit signed event
           emitter.emit('signed', eventData);
@@ -883,7 +798,7 @@ export default class TransactionService {
         emitter.emit('error', eventData);
       });
     } else {
-      this.state.requestService.addConfirmation(id, url || EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async ({
+      this.requestService.addConfirmation(id, url || EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async ({
         isApproved,
         payload
       }) => {
@@ -892,7 +807,7 @@ export default class TransactionService {
           if (!payload) {
             throw new EvmProviderError(EvmProviderErrorType.UNAUTHORIZED, t('Failed to sign'));
           }
-          const web3Api = this.state.chainService.getEvmApi(chain).api;
+          const web3Api = this.chainService.getEvmApi(chain).api;
           if (!isExternal) {
             signedTransaction = payload;
           } else {
@@ -959,7 +874,7 @@ export default class TransactionService {
     transaction.signAsync(address, {
       signer: {
         signPayload: async payload => {
-          const signing = await this.state.requestService.signInternalTransaction(id, address, url || EXTENSION_REQUEST_URL, payload);
+          const signing = await this.requestService.signInternalTransaction(id, address, url || EXTENSION_REQUEST_URL, payload);
           return {
             id: new Date().getTime(),
             signature: signing.signature
@@ -971,7 +886,7 @@ export default class TransactionService {
       emitter.emit('signed', eventData);
 
       // Send transaction
-      const api = this.state.chainService.getSubstrateApi(chain);
+      const api = this.chainService.getSubstrateApi(chain);
       eventData.nonce = rs.nonce.toNumber();
       eventData.startBlock = (await api.api.query.system.number()).toPrimitive();
       this.handleTransactionTimeout(emitter, eventData);
@@ -1039,27 +954,6 @@ export default class TransactionService {
       clearTimeout(timeout);
     });
   }
-  handlePostEarningTransaction(id) {
-    const transaction = this.getTransaction(id);
-    const data = transaction.data;
-    const slug = data.data.slug;
-    const poolHandler = this.state.earningService.getPoolHandler(slug);
-    if (poolHandler) {
-      const type = poolHandler.type;
-      if (type === YieldPoolType.NATIVE_STAKING) {
-        return;
-      }
-    } else {
-      return;
-    }
-    this.state.mintCampaignService.unlockDotCampaign.mintNft({
-      transactionId: id,
-      address: transaction.address,
-      slug: slug,
-      network: transaction.chain,
-      extrinsicHash: transaction.extrinsicHash
-    }).catch(console.error);
-  }
   resetWallet() {
     this.transactionSubject.next({});
   }

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

@@ -30,8 +30,6 @@ export interface SWTransactionInput extends SwInputBase, Partial<Pick<SWTransact
     errors?: SWTransaction['errors'];
     edAsWarning?: boolean;
     isTransferAll?: boolean;
-    resolveOnDone?: boolean;
-    skipFeeValidation?: boolean;
 }
 export declare type SWTransactionResponse = SwInputBase & Pick<SWTransaction, 'warnings' | 'errors'> & Partial<Pick<SWTransaction, 'id' | 'extrinsicHash' | 'status' | 'estimateFee'>>;
 export declare type ValidateTransactionResponseInput = SWTransactionInput;

package/services/transaction-service/utils.js

@@ -5,7 +5,6 @@ import { _getBlockExplorerFromChain, _isPureEvmChain } from '@subwallet/extensio
 
 // @ts-ignore
 export function parseTransactionData(data) {
-  // @ts-ignore
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return data;
 }

package/types/index.d.ts

@@ -5,12 +5,7 @@ export interface Message extends MessageEvent {
         origin: string;
         response?: string;
         subscription?: string;
-        sender?: string;
     };
 }
 export * from './balance';
 export * from './buy';
-export * from './campaigns';
-export * from './ordinal';
-export * from './transaction';
-export * from './yield';

package/types/index.js

@@ -1,10 +1,6 @@
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 export * from "./balance.js";
 export * from "./buy.js";
-export * from "./campaigns/index.js";
-export * from "./ordinal.js";
-export * from "./transaction.js";
-export * from "./yield/index.js";
 export {};

package/utils/fetchStaticData.js

@@ -2,9 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import axios from 'axios';
-const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'koni-dev';
-const fetchTarget = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
+const fetchTarget = branchName === 'master' || branchName === 'webapp' ? 'list.json' : 'preview.json';
 export async function fetchStaticData(slug, targetFile) {
   const fetchFile = targetFile || fetchTarget;
   const rs = await axios.get(`https://static-data.subwallet.app/${slug}/${fetchFile}`);

package/utils/index.d.ts

@@ -39,15 +39,10 @@ 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 swParseIPFSUrl: (input: string) => string | undefined;
 export declare function wait(milliseconds: number): Promise<void>;
 export * from './account';
 export * from './array';
 export * from './environment';
-export * from './number';
 export * from './lazy';
-export * from './promise';
 export * from './registry';
 export * from './translate';
-export * from './object';

package/utils/index.js

@@ -3,7 +3,6 @@
 
 import { CrowdloanParaState, MobileOS } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { getRandomIpfsGateway, SUBWALLET_IPFS } from '@subwallet/extension-base/koni/api/nft/config';
 import { getOS } from '@subwallet/extension-base/utils/environment';
 import { t } from 'i18next';
 import { assert, BN, hexToU8a, isHex } from '@polkadot/util';
@@ -288,54 +287,6 @@ export const stripUrl = url => {
   const parts = url.split('/');
   return parts[2];
 };
-export const baseParseIPFSUrl = input => {
-  if (!input || input.length === 0) {
-    return undefined;
-  }
-  if (isUrl(input)) {
-    return input;
-  }
-  if (isUrl(input) || input.includes('https://') || input.includes('http')) {
-    return input;
-  }
-  if (input.startsWith('/ipfs/')) {
-    return getRandomIpfsGateway() + input.split('/ipfs/')[1];
-  }
-  if (!input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
-    // just the IPFS hash
-    return getRandomIpfsGateway() + input;
-  }
-  if (input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
-    // starts with ipfs://
-    return getRandomIpfsGateway() + input.split('ipfs://')[1];
-  }
-  return getRandomIpfsGateway() + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
-};
-
-export const swParseIPFSUrl = input => {
-  if (!input || input.length === 0) {
-    return undefined;
-  }
-  if (isUrl(input)) {
-    return input;
-  }
-  if (isUrl(input) || input.includes('https://') || input.includes('http')) {
-    return input;
-  }
-  if (input.startsWith('/ipfs/')) {
-    return SUBWALLET_IPFS + input.split('/ipfs/')[1];
-  }
-  if (!input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
-    // just the IPFS hash
-    return SUBWALLET_IPFS + input;
-  }
-  if (input.includes('ipfs://') && !input.includes('ipfs://ipfs/')) {
-    // starts with ipfs://
-    return SUBWALLET_IPFS + input.split('ipfs://')[1];
-  }
-  return SUBWALLET_IPFS + input.split('ipfs://ipfs/')[1]; // starts with ipfs://ipfs/
-};
-
 export function wait(milliseconds) {
   return new Promise(resolve => {
     setTimeout(() => {
@@ -346,9 +297,6 @@ export function wait(milliseconds) {
 export * from "./account.js";
 export * from "./array.js";
 export * from "./environment.js";
-export * from "./number.js";
 export * from "./lazy.js";
-export * from "./promise.js";
 export * from "./registry.js";
-export * from "./translate.js";
-export * from "./object.js";
+export * from "./translate.js";