@subwallet/extension-base 1.3.40-0 → 1.3.42-0

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

@@ -17,6 +17,7 @@ exports.HistoryRecoverStatus = HistoryRecoverStatus;
   HistoryRecoverStatus["LACK_INFO"] = "LACK_INFO";
   HistoryRecoverStatus["FAIL_DETECT"] = "FAIL_DETECT";
   HistoryRecoverStatus["UNKNOWN"] = "UNKNOWN";
+  HistoryRecoverStatus["TX_PENDING"] = "TX_PENDING";
 })(HistoryRecoverStatus || (exports.HistoryRecoverStatus = HistoryRecoverStatus = {}));
 const BLOCK_LIMIT = 6;
 const substrateRecover = async (history, chainService) => {
@@ -216,6 +217,80 @@ const evmRecover = async (history, chainService) => {
     };
   }
 };
+const bitcoinRecover = async (history, chainService) => {
+  const {
+    chain,
+    extrinsicHash
+  } = history;
+  const result = {
+    status: HistoryRecoverStatus.UNKNOWN
+  };
+
+  // TODO: 1. Consider rebroadcasting transaction if stuck in mempool
+
+  try {
+    const bitcoinApi = chainService.getBitcoinApi(chain);
+    if (bitcoinApi) {
+      const api = bitcoinApi.api;
+      if (extrinsicHash) {
+        try {
+          const timeout = new Promise(resolve => {
+            setTimeout(() => {
+              resolve(undefined);
+            }, 60000);
+          });
+          const txStatus = await Promise.race([api.getTransactionStatus(extrinsicHash), timeout]);
+          if (!txStatus) {
+            return {
+              ...result,
+              status: HistoryRecoverStatus.API_INACTIVE
+            };
+          }
+          if (txStatus.confirmed) {
+            const transactionDetail = await Promise.race([api.getTransactionDetail(extrinsicHash), timeout]);
+            if (transactionDetail) {
+              result.blockHash = transactionDetail.status.block_hash || undefined;
+              result.blockNumber = transactionDetail.status.block_height || undefined;
+              result.blockTime = transactionDetail.status.block_time ? transactionDetail.status.block_time * 1000 : undefined;
+              return {
+                ...result,
+                status: HistoryRecoverStatus.SUCCESS
+              };
+            }
+            return {
+              ...result,
+              status: HistoryRecoverStatus.API_INACTIVE
+            };
+          } else {
+            return {
+              ...result,
+              status: HistoryRecoverStatus.TX_PENDING
+            };
+          }
+        } catch (e) {
+          // Fail when cannot find transaction
+          return {
+            ...result,
+            status: HistoryRecoverStatus.FAILED
+          };
+        }
+      }
+      return {
+        status: HistoryRecoverStatus.FAIL_DETECT
+      };
+    } else {
+      console.error(`Fail to update history ${chain}-${extrinsicHash}: Api not active`);
+      return {
+        status: HistoryRecoverStatus.API_INACTIVE
+      };
+    }
+  } catch (e) {
+    console.error(`Fail to update history ${chain}-${extrinsicHash}:`, e.message);
+    return {
+      status: HistoryRecoverStatus.UNKNOWN
+    };
+  }
+};
 
 // undefined: Cannot check status
 // true: Transaction success
@@ -224,13 +299,30 @@ const historyRecover = async (history, chainService) => {
   const {
     chainType
   } = history;
-  if (chainType) {
-    const checkFunction = chainType === 'substrate' ? substrateRecover : evmRecover;
-    return await checkFunction(history, chainService);
-  } else {
+  if (!chainType) {
     return {
       status: HistoryRecoverStatus.LACK_INFO
     };
   }
+  const recoverFunctions = {
+    substrate: substrateRecover,
+    evm: evmRecover,
+    bitcoin: bitcoinRecover
+  };
+  const checkFunction = recoverFunctions[chainType];
+  if (!checkFunction) {
+    console.warn(`Chain type ${chainType} is not supported for recoverHistory`);
+    return {
+      status: HistoryRecoverStatus.UNKNOWN
+    };
+  }
+  try {
+    return await checkFunction(history, chainService);
+  } catch (error) {
+    console.error(`Failed to recover history for chain type ${chainType}:`, error);
+    return {
+      status: HistoryRecoverStatus.FAILED
+    };
+  }
 };
 exports.historyRecover = historyRecover;

package/cjs/services/history-service/index.js

@@ -8,6 +8,7 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _bitcoinHistory = require("@subwallet/extension-base/services/history-service/bitcoin-history");
 var _recoverHistoryStatus = require("@subwallet/extension-base/services/history-service/helpers/recoverHistoryStatus");
 var _subscanExtrinsicParserHelper = require("@subwallet/extension-base/services/history-service/helpers/subscan-extrinsic-parser-helper");
 var _subscanHistory = require("@subwallet/extension-base/services/history-service/subscan-history");
@@ -149,20 +150,48 @@ class HistoryService {
       console.log('fetchAllPossibleTransferItems-receive error', e);
     });
   }
+
+  // Only 1 address is passed in
+  async fetchBitcoinTransactionHistory(chain, addresses) {
+    const chainInfo = this.chainService.getChainInfoByKey(chain);
+    const chainState = this.chainService.getChainStateByKey(chain);
+    if (!chainState.active) {
+      return;
+    }
+    const bitcoinApi = this.chainService.getBitcoinApi(chain);
+    const allParsedItems = [];
+    for (const address of addresses) {
+      const transferItems = await bitcoinApi.api.getAddressTransaction(address);
+      const parsedItems = transferItems.map((item, index) => {
+        const parsedItem = (0, _bitcoinHistory.parseBitcoinTransferData)(address, item, chainInfo);
+        return {
+          ...parsedItem,
+          apiTxIndex: index
+        };
+      });
+      allParsedItems.push(...parsedItems);
+    }
+    await this.addHistoryItems(allParsedItems);
+  }
   subscribeHistories(chain, proxyId, cb) {
     const addresses = this.keyringService.context.getDecodedAddresses(proxyId, false);
+    const chainInfo = this.chainService.getChainInfoByKey(chain);
     const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
     const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
+    const bitcoinAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.BITCOIN], chainInfo);
     const subscription = this.historySubject.subscribe(items => {
       cb(items.filter(filterHistoryItemByAddressAndChain(chain, addresses)));
     });
-    const chainInfo = this.chainService.getChainInfoByKey(chain);
     if ((0, _utils._isChainSubstrateCompatible)(chainInfo)) {
       if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
         this.fetchSubscanTransactionHistory(chain, evmAddresses);
       } else {
         this.fetchSubscanTransactionHistory(chain, substrateAddresses);
       }
+    } else if ((0, _utils._isChainBitcoinCompatible)(chainInfo)) {
+      this.fetchBitcoinTransactionHistory(chain, bitcoinAddresses).catch(e => {
+        console.log('fetchBitcoinTransactionHistory Error', e);
+      });
     }
     return {
       unsubscribe: subscription.unsubscribe,
@@ -203,7 +232,8 @@ class HistoryService {
       if (needUpdateItem) {
         updateRecords.push({
           ...needUpdateItem,
-          status: item.status
+          status: item.status,
+          apiTxIndex: item.apiTxIndex
         });
         return;
       }
@@ -256,6 +286,9 @@ class HistoryService {
       switch (recoverResult.status) {
         case _recoverHistoryStatus.HistoryRecoverStatus.API_INACTIVE:
           break;
+        case _recoverHistoryStatus.HistoryRecoverStatus.TX_PENDING:
+          delete this.#needRecoveryHistories[currentExtrinsicHash];
+          break;
         case _recoverHistoryStatus.HistoryRecoverStatus.FAILED:
         case _recoverHistoryStatus.HistoryRecoverStatus.SUCCESS:
           updateData.status = recoverResult.status === _recoverHistoryStatus.HistoryRecoverStatus.SUCCESS ? _KoniTypes.ExtrinsicStatus.SUCCESS : _KoniTypes.ExtrinsicStatus.FAIL;
@@ -293,7 +326,12 @@ class HistoryService {
     const histories = await this.dbService.getHistories();
     this.#needRecoveryHistories = {};
     histories.filter(history => {
-      return [_KoniTypes.ExtrinsicStatus.PROCESSING, _KoniTypes.ExtrinsicStatus.SUBMITTING].includes(history.status);
+      if ([_KoniTypes.ExtrinsicStatus.PROCESSING, _KoniTypes.ExtrinsicStatus.SUBMITTING].includes(history.status)) {
+        return true;
+      } else if (history.status === _KoniTypes.ExtrinsicStatus.SUCCESS && history.chainType === 'bitcoin') {
+        return !history.blockTime;
+      }
+      return false;
     }).filter(history => {
       if (history.type === _KoniTypes.ExtrinsicType.TRANSFER_XCM) {
         const data = history.additionalInfo;

package/cjs/services/keyring-service/context/handlers/Derive.js

@@ -15,7 +15,7 @@ var _Base = require("./Base");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const validDeriveKeypairTypes = [..._types2.SubstrateKeypairTypes, ..._types2.EthereumKeypairTypes, 'ton', 'cardano'];
+const validDeriveKeypairTypes = [..._types2.SubstrateKeypairTypes, ..._types2.EthereumKeypairTypes, 'ton', 'cardano', ..._types2.BitcoinKeypairTypes];
 
 /**
  * @class AccountDeriveHandler

package/cjs/services/keyring-service/context/handlers/Migration.js

@@ -82,7 +82,7 @@ class AccountMigrationHandler extends _Base.AccountBaseHandler {
           proxyId
         }).result;
         const newChainTypes = Object.values(_types.AccountChainType).filter(type => !unifiedAccount.chainTypes.includes(type) && _types.SUPPORTED_ACCOUNT_CHAIN_TYPES.includes(type));
-        const keypairTypes = newChainTypes.map(chainType => (0, _utils.getDefaultKeypairTypeFromAccountChainType)(chainType));
+        const keypairTypes = newChainTypes.flatMap(chainType => (0, _utils.getDefaultKeypairTypeFromAccountChainType)(chainType));
         keypairTypes.forEach(type => {
           const suri = (0, _utils.getSuri)(mnemonic, type);
           const pair = _uiKeyring.keyring.createFromUri(suri, {}, type);
@@ -187,7 +187,7 @@ class AccountMigrationHandler extends _Base.AccountBaseHandler {
         password,
         proxyId: firstAccountOldProxyId
       }).result;
-      const keypairTypes = _types.SUPPORTED_ACCOUNT_CHAIN_TYPES.map(chainType => (0, _utils.getDefaultKeypairTypeFromAccountChainType)(chainType));
+      const keypairTypes = _types.SUPPORTED_ACCOUNT_CHAIN_TYPES.flatMap(chainType => (0, _utils.getDefaultKeypairTypeFromAccountChainType)(chainType));
       keypairTypes.forEach(type => {
         const suri = (0, _utils.getSuri)(mnemonic, type);
         const pair = _uiKeyring.keyring.createFromUri(suri, {}, type);

package/cjs/services/keyring-service/context/handlers/Mnemonic.js

@@ -7,6 +7,7 @@ exports.SEED_LENGTHS = exports.SEED_DEFAULT_LENGTH = exports.AccountMnemonicHand
 var _types = require("@subwallet/extension-base/types");
 var _utils = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
+var _types2 = require("@subwallet/keyring/types");
 var _utils2 = require("@subwallet/keyring/utils");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _i18next = require("i18next");
@@ -36,7 +37,7 @@ class AccountMnemonicHandler extends _Base.AccountBaseHandler {
       mnemonic: _seed,
       type = 'general'
     } = _ref;
-    const types = type === 'general' ? ['sr25519', 'ethereum', 'ton', 'cardano'] : ['ton-native'];
+    const types = type === 'general' ? ['sr25519', ..._types2.EthereumKeypairTypes, 'ton', ..._types2.CardanoKeypairTypes, ..._types2.BitcoinKeypairTypes] : ['ton-native'];
     const seed = _seed || type === 'general' ? (0, _utilCrypto.mnemonicGenerate)(length) : await (0, _keyring.tonMnemonicGenerate)(length);
     const rs = {
       mnemonic: seed,
@@ -70,7 +71,7 @@ class AccountMnemonicHandler extends _Base.AccountBaseHandler {
       try {
         (0, _util.assert)((0, _utilCrypto.mnemonicValidate)(phrase), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
         mnemonicTypes = 'general';
-        pairTypes = ['sr25519', 'ethereum', 'ton'];
+        pairTypes = ['sr25519', ..._types2.EthereumKeypairTypes, 'ton', ..._types2.CardanoKeypairTypes, ..._types2.BitcoinKeypairTypes];
       } catch (e) {
         (0, _util.assert)((0, _utils2.tonMnemonicValidate)(phrase), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
         mnemonicTypes = 'ton';
@@ -107,7 +108,7 @@ class AccountMnemonicHandler extends _Base.AccountBaseHandler {
     const addressDict = {};
     let changedAccount = false;
     const hasMasterPassword = _uiKeyring.keyring.keyring.hasMasterPassword;
-    const types = type ? [type] : ['sr25519', 'ethereum', 'ton', 'cardano'];
+    const types = type ? [type] : ['sr25519', ..._types2.EthereumKeypairTypes, 'ton', ..._types2.CardanoKeypairTypes, ..._types2.BitcoinKeypairTypes];
     if (!hasMasterPassword) {
       if (!password) {
         throw Error((0, _i18next.t)('The password of each account is needed to set up master password'));

package/cjs/services/migration-service/scripts/MigrateNewUnifiedAccount.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateNewUnifiedAccount extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            isAcknowledgedUnifiedAccountMigration: false
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateNewUnifiedAccount;

package/cjs/services/migration-service/scripts/index.js

@@ -26,6 +26,7 @@ var _EnableVaraChain = _interopRequireDefault(require("./EnableVaraChain"));
 var _MigrateAuthUrls = _interopRequireDefault(require("./MigrateAuthUrls"));
 var _MigrateImportedToken = _interopRequireDefault(require("./MigrateImportedToken"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSettings"));
+var _MigrateNewUnifiedAccount = _interopRequireDefault(require("./MigrateNewUnifiedAccount"));
 var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecimals"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
 var _MigrateTransactionHistoryBridge = _interopRequireDefault(require("./MigrateTransactionHistoryBridge"));
@@ -70,8 +71,9 @@ var _default = {
   '1.3.6-01': _MigrateTransactionHistoryBridge.default,
   '1.3.10-01': _ClearMetadataDatabase.default,
   '1.3.26-01': _DisableZeroBalanceTokens.default,
-  [MYTHOS_MIGRATION_KEY]: _ClearMetadataForMythos.default
+  [MYTHOS_MIGRATION_KEY]: _ClearMetadataForMythos.default,
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
+  '1.3.42-01': _MigrateNewUnifiedAccount.default
 };
 exports.default = _default;