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

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

@@ -38,6 +38,9 @@ class BalanceService {
   stopPromiseHandler = (0, _utils2.createPromiseHandler)();
   status = _types.ServiceStatus.NOT_INITIALIZED;
   isReload = false;
+  get isStarted() {
+    return this.status === _types.ServiceStatus.STARTED;
+  }
   detectAccountBalanceStore = new _DetectAccountBalance.default();
   balanceDetectSubject = new _rxjs.BehaviorSubject({});
   intervalTime = 3 * 60 * 1000;
@@ -63,7 +66,7 @@ class BalanceService {
     this.status = _types.ServiceStatus.INITIALIZED;
 
     // Start service
-    await this.start();
+    // await this.start(); // Commented out to avoid auto start when app not fully initialized
 
     // Handle events
     this.state.eventService.onLazy(this.handleEvents.bind(this));
@@ -149,7 +152,7 @@ class BalanceService {
     }
     if (needReload) {
       (0, _utils2.addLazy)('reloadBalanceByEvents', () => {
-        if (!this.isReload) {
+        if (!this.isReload && this.isStarted) {
           this.runSubscribeBalances().catch(console.error);
         }
       }, lazyTime, undefined, true);
@@ -203,8 +206,9 @@ class BalanceService {
       const substrateApiMap = this.state.chainService.getSubstrateApiMap();
       const tonApiMap = this.state.chainService.getTonApiMap();
       const cardanoApiMap = this.state.chainService.getCardanoApiMap();
+      const bitcoinApiMap = this.state.chainService.getBitcoinApiMap();
       let unsub = _util.noop;
-      unsub = (0, _helpers.subscribeBalance)([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, cardanoApiMap, result => {
+      unsub = (0, _helpers.subscribeBalance)([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, cardanoApiMap, bitcoinApiMap, result => {
         const rs = result[0];
         let value;
         switch (balanceType) {
@@ -375,13 +379,14 @@ class BalanceService {
     const substrateApiMap = this.state.chainService.getSubstrateApiMap();
     const tonApiMap = this.state.chainService.getTonApiMap();
     const cardanoApiMap = this.state.chainService.getCardanoApiMap();
+    const bitcoinApiMap = this.state.chainService.getBitcoinApiMap();
     const activeChainSlugs = Object.keys(this.state.getActiveChainInfoMap());
     const assetState = this.state.chainService.subscribeAssetSettings().value;
     const assets = Object.values(assetMap).filter(asset => {
       var _assetState$asset$slu;
       return activeChainSlugs.includes(asset.originChain) && ((_assetState$asset$slu = assetState[asset.slug]) === null || _assetState$asset$slu === void 0 ? void 0 : _assetState$asset$slu.visible);
     }).map(asset => asset.slug);
-    const unsub = (0, _helpers.subscribeBalance)(addresses, activeChainSlugs, assets, assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, cardanoApiMap, result => {
+    const unsub = (0, _helpers.subscribeBalance)(addresses, activeChainSlugs, assets, assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, cardanoApiMap, bitcoinApiMap, result => {
       !cancel && this.setBalanceItem(result);
     }, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE);
     const unsub2 = this.state.subscribeMantaPayBalance();
@@ -391,6 +396,29 @@ class BalanceService {
       unsub2 && unsub2();
     };
   }
+  async refreshBalanceForAddress(address, chain, asset, extrinsicType) {
+    // Check if address and chain are valid
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
+    if (!chainInfoMap[chain]) {
+      console.warn(`Chain ${chain} is not supported`);
+      return;
+    }
+
+    // Get necessary data
+    const assetMap = this.state.chainService.getAssetRegistry();
+    const evmApiMap = this.state.chainService.getEvmApiMap();
+    const substrateApiMap = this.state.chainService.getSubstrateApiMap();
+    const tonApiMap = this.state.chainService.getTonApiMap();
+    const cardanoApiMap = this.state.chainService.getCardanoApiMap();
+    const bitcoinApiMap = this.state.chainService.getBitcoinApiMap();
+    return new Promise(resolve => {
+      const unsub = (0, _helpers.subscribeBalance)([address], [chain], [asset], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, cardanoApiMap, bitcoinApiMap, result => {
+        this.setBalanceItem(result);
+        unsub();
+        resolve();
+      }, extrinsicType || _KoniTypes.ExtrinsicType.TRANSFER_BALANCE);
+    });
+  }
 
   /** Unsubscribe balance subscription */
   runUnsubscribeBalances() {

package/cjs/services/balance-service/transfer/bitcoin-transfer.js

@@ -0,0 +1,119 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createBitcoinTransaction = createBitcoinTransaction;
+var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _utils = require("@subwallet/extension-base/utils");
+var _types = require("@subwallet/keyring/types");
+var _utils2 = require("@subwallet/keyring/utils");
+var _uiKeyring = require("@subwallet/ui-keyring");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
+var _bitcoinjsLib = require("bitcoinjs-lib");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+async function createBitcoinTransaction(params) {
+  const {
+    bitcoinApi,
+    chain,
+    feeCustom: _feeCustom,
+    feeInfo: _feeInfo,
+    feeOption,
+    from,
+    network,
+    to,
+    transferAll,
+    value
+  } = params;
+  const feeCustom = _feeCustom;
+  const feeInfo = _feeInfo;
+  const bitcoinFee = (0, _utils.combineBitcoinFee)(feeInfo, feeOption, feeCustom);
+  const utxos = await (0, _utils.getTransferableBitcoinUtxos)(bitcoinApi, from);
+  try {
+    const amountValue = parseFloat(value);
+    const determineUtxosArgs = {
+      amount: amountValue,
+      feeRate: bitcoinFee.feeRate,
+      recipient: to,
+      sender: from,
+      utxos
+    };
+    const {
+      fee,
+      inputs,
+      isCustomFeeRate,
+      outputs,
+      size
+    } = transferAll ? (0, _utils.determineUtxosForSpendAll)(determineUtxosArgs) : (0, _utils.determineUtxosForSpend)(determineUtxosArgs);
+    const pair = _uiKeyring.keyring.getPair(from);
+    const tx = new _bitcoinjsLib.Psbt({
+      network
+    });
+    let transferAmount = new _bignumber.default(0);
+    for (const input of inputs) {
+      const addressInfo = (0, _utils2.getBitcoinAddressInfo)(pair.address);
+      if (addressInfo.type === _types.BitcoinAddressType.p2pkh || addressInfo.type === _types.BitcoinAddressType.p2sh) {
+        // BIP-44 (Legacy)
+        const hex = await bitcoinApi.api.getTxHex(input.txid);
+        tx.addInput({
+          hash: input.txid,
+          index: input.vout,
+          nonWitnessUtxo: Buffer.from(hex, 'hex')
+        });
+      } else if (addressInfo.type === _types.BitcoinAddressType.p2wpkh) {
+        // BIP-84 (Native SegWit)
+        tx.addInput({
+          hash: input.txid,
+          index: input.vout,
+          witnessUtxo: {
+            script: pair.bitcoin.output,
+            value: input.value
+          }
+        });
+      } else if (addressInfo.type === _types.BitcoinAddressType.p2tr) {
+        // BIP-86 (Taproot)
+        tx.addInput({
+          hash: input.txid,
+          index: input.vout,
+          witnessUtxo: {
+            script: pair.bitcoin.output,
+            value: input.value // UTXO value in satoshis
+          },
+
+          tapInternalKey: pair.bitcoin.internalPubkey // X-only public key (32 bytes)
+        });
+      } else {
+        throw new Error(`Unsupported address type: ${addressInfo.type}`);
+      }
+    }
+    for (const output of outputs) {
+      tx.addOutput({
+        address: output.address || from,
+        value: output.value
+      });
+      if (output.address === to) {
+        transferAmount = transferAmount.plus(output.value);
+      }
+    }
+    const customFeeRate = fee / size;
+    const customFeeRateResult = isCustomFeeRate ? customFeeRate.toString() : undefined;
+    return [tx, transferAmount.toString(), customFeeRateResult];
+  } catch (e) {
+    if (e instanceof _TransactionError.TransactionError) {
+      throw e;
+    }
+    console.warn('Failed to create Bitcoin transaction:', e);
+    throw new Error(`You don’t have enough BTC (${convertChainToSymbol(chain)}) for the transaction. Lower your BTC amount and try again`);
+  }
+}
+function convertChainToSymbol(chain) {
+  if (chain === _constants._BITCOIN_CHAIN_SLUG) {
+    return _constants._BITCOIN_NAME;
+  } else {
+    return _constants._BITCOIN_TESTNET_NAME;
+  }
+}

package/cjs/services/balance-service/transfer/token.js

@@ -116,6 +116,8 @@ const createSubstrateExtrinsic = async _ref => {
         transfer = api.tx.balances.transfer(to, new _util.BN(value));
       }
     }
+  } else if (_constants._TRANSFER_CHAIN_GROUP.truth.includes(networkKey)) {
+    transfer = api.tx.assetManager.transfer(to, (0, _utils3._getTokenOnChainInfo)(tokenInfo), value);
   }
   return [transfer, transferAmount || value];
 };

package/cjs/services/balance-service/transfer/xcm/index.js

@@ -146,19 +146,25 @@ exports.createXcmExtrinsicV2 = createXcmExtrinsicV2;
 const dryRunXcmExtrinsicV2 = async request => {
   try {
     const dryRunResult = await (0, _utils.dryRunXcm)(request);
-    const originDryRunResult = dryRunResult.origin;
-    if (originDryRunResult.success) {
-      const destinationDryRunResult = dryRunResult.destination;
-      if (destinationDryRunResult.success) {
-        return true;
+    const originDryRunRs = dryRunResult.origin;
+    if (originDryRunRs.success) {
+      const {
+        assetHub,
+        bridgeHub,
+        destination
+      } = dryRunResult;
+      if ((assetHub === null || assetHub === void 0 ? void 0 : assetHub.success) === false || (bridgeHub === null || bridgeHub === void 0 ? void 0 : bridgeHub.success) === false || (destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+        if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
+          // pass dry-run in these cases
+          return (0, _utils.isChainNotSupportDryRun)(destination.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(destination.failureReason);
+        }
+        return false;
       }
-
-      // pass dry-run in these cases
-      return (0, _utils.isChainNotSupportDryRun)(destinationDryRunResult.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(destinationDryRunResult.failureReason);
+      return true;
     }
 
     // pass dry-run in these cases
-    return (0, _utils.isChainNotSupportDryRun)(originDryRunResult.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(originDryRunResult.failureReason);
+    return (0, _utils.isChainNotSupportDryRun)(originDryRunRs.failureReason) || (0, _utils.isChainNotSupportPolkadotApi)(originDryRunRs.failureReason);
   } catch (e) {
     return false;
   }

package/cjs/services/balance-service/transfer/xcm/utils.js

@@ -11,17 +11,18 @@ exports.isChainNotSupportDryRun = isChainNotSupportDryRun;
 exports.isChainNotSupportPolkadotApi = isChainNotSupportPolkadotApi;
 exports.isUseTeleportProtocol = isUseTeleportProtocol;
 var _paraspellChainMap = require("@subwallet/extension-base/constants/paraspell-chain-map");
+var _environment = require("@subwallet/extension-base/types/environment");
+var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const paraSpellEndpoint = 'https://api.lightspell.xyz/v3';
+const version = '/v3';
 const paraSpellApi = {
-  buildXcm: `${paraSpellEndpoint}/x-transfer`,
-  dryRunXcm: `${paraSpellEndpoint}/dry-run`,
-  feeXcm: `${paraSpellEndpoint}/xcm-fee`
+  buildXcm: `${version}/x-transfer`,
+  dryRunXcm: `${version}/dry-run`,
+  feeXcm: `${version}/xcm-fee`
 };
-const paraSpellKey = process.env.PARASPELL_API_KEY || '';
 function txHexToSubmittableExtrinsic(api, hex) {
   try {
     (0, _util.assert)((0, _util.isHex)(hex), 'Expected a hex-encoded call');
@@ -98,13 +99,12 @@ async function buildXcm(request) {
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
   };
-  const response = await fetch(paraSpellApi.buildXcm, {
+  const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.buildXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {
@@ -138,13 +138,12 @@ async function dryRunXcm(request) {
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
   };
-  const response = await fetch(paraSpellApi.dryRunXcm, {
+  const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.dryRunXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {
@@ -182,13 +181,12 @@ async function estimateXcmFee(request) {
     to: paraSpellChainMap[toChainInfo.slug],
     currency: createParaSpellCurrency(psAssetType, psAssetValue, value)
   };
-  const response = await fetch(paraSpellApi.feeXcm, {
+  const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.feeXcm, {
     method: 'POST',
     body: JSON.stringify(bodyData),
     headers: {
       'Content-Type': 'application/json',
-      Accept: 'application/json',
-      'X-API-KEY': paraSpellKey
+      Accept: 'application/json'
     }
   });
   if (!response.ok) {

package/cjs/services/base/types.js

@@ -15,6 +15,8 @@ exports.ServiceStatus = ServiceStatus;
   ServiceStatus["INITIALIZED"] = "initialized";
   ServiceStatus["STARTED"] = "started";
   ServiceStatus["STARTING"] = "starting";
+  ServiceStatus["STARTED_FULL"] = "started_full";
+  ServiceStatus["STARTING_FULL"] = "starting_full";
   ServiceStatus["STOPPED"] = "stopped";
   ServiceStatus["STOPPING"] = "stopping";
 })(ServiceStatus || (exports.ServiceStatus = ServiceStatus = {}));

package/cjs/services/chain-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -41,12 +41,13 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network', 'truth_network', 'jamton'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub', 'chainflip_assethub'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
   supportBridged: ['rococo_assethub', 'statemint', 'statemine', 'polimec'],
-  bittensor: ['bittensor', 'bittensor_testnet']
+  bittensor: ['bittensor', 'bittensor_testnet'],
+  moonbeam: ['moonbeam', 'moonriver', 'moonbase']
 };
 exports._BALANCE_CHAIN_GROUP = _BALANCE_CHAIN_GROUP;
 const _BALANCE_TOKEN_GROUP = {
@@ -272,13 +273,14 @@ const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   // crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot', 'jamton'],
   centrifuge: ['centrifuge'],
-  disable_transfer: ['crab', 'pangolin']
+  disable_transfer: ['crab', 'pangolin'],
+  truth: ['truth_network']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {
@@ -327,6 +329,14 @@ const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 120000;
 // TODO: review
 exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = LATEST_CHAIN_DATA_FETCHING_INTERVAL;
 const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
+const _BITCOIN_CHAIN_SLUG = 'bitcoin';
+exports._BITCOIN_CHAIN_SLUG = _BITCOIN_CHAIN_SLUG;
+const _BITCOIN_TESTNET_CHAIN_SLUG = 'bitcoinTestnet';
+exports._BITCOIN_TESTNET_CHAIN_SLUG = _BITCOIN_TESTNET_CHAIN_SLUG;
+const _BITCOIN_NAME = 'Bitcoin';
+exports._BITCOIN_NAME = _BITCOIN_NAME;
+const _BITCOIN_TESTNET_NAME = 'Bitcoin Testnet';
+exports._BITCOIN_TESTNET_NAME = _BITCOIN_TESTNET_NAME;
 const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;
 const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
@@ -338,4 +348,6 @@ exports._MULTI_CHAIN_ASSET_SRC = _MULTI_CHAIN_ASSET_SRC;
 const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
 exports._CHAIN_LOGO_MAP_SRC = _CHAIN_LOGO_MAP_SRC;
 const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;
-exports._ASSET_LOGO_MAP_SRC = _ASSET_LOGO_MAP_SRC;
+exports._ASSET_LOGO_MAP_SRC = _ASSET_LOGO_MAP_SRC;
+const _BTC_SERVICE_TOKEN = process.env.BTC_SERVICE_TOKEN || '';
+exports._BTC_SERVICE_TOKEN = _BTC_SERVICE_TOKEN;

package/cjs/services/chain-service/handler/CardanoApi.js

@@ -3,20 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CardanoApi = exports.API_KEY = void 0;
+exports.CardanoApi = void 0;
 var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils");
 var _types = require("@subwallet/extension-base/services/chain-service/types");
+var _environment = require("@subwallet/extension-base/types/environment");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const API_KEY = {
-  mainnet: process.env.BLOCKFROST_API_KEY_MAIN || '',
-  testnet: process.env.BLOCKFROST_API_KEY_PREP || ''
-};
-exports.API_KEY = API_KEY;
+// export const API_KEY = {
+//   mainnet: process.env.BLOCKFROST_API_KEY_MAIN || '',
+//   testnet: process.env.BLOCKFROST_API_KEY_PREP || ''
+// };
+
 class CardanoApi {
   // private api: BlockFrostAPI;
 
@@ -33,7 +34,6 @@ class CardanoApi {
     this.chainSlug = chainSlug;
     this.apiUrl = apiUrl;
     this.isTestnet = isTestnet !== null && isTestnet !== void 0 ? isTestnet : true;
-    this.projectId = isTestnet ? API_KEY.testnet : API_KEY.mainnet;
     this.providerName = providerName || 'unknown';
     // this.api = this.createProvider(isTestnet);
     this.isReadyHandler = (0, _utils2.createPromiseHandler)();
@@ -45,6 +45,9 @@ class CardanoApi {
   get connectionStatus() {
     return this.connectionStatusSubject.getValue();
   }
+  fetchCardano(path, options) {
+    return (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.CARDANO, path, options, this.isTestnet);
+  }
   updateConnectionStatus(status) {
     const isConnected = status === _types._ChainConnectionStatus.CONNECTED;
     if (isConnected !== this.isApiConnectedSubject.value) {
@@ -115,12 +118,9 @@ class CardanoApi {
   }
   async getBalanceMap(address) {
     try {
-      const url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/addresses/${address}` : `https://cardano-mainnet.blockfrost.io/api/v0/addresses/${address}`;
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Project_id: this.projectId
-        }
+      const path = `/addresses/${address}`;
+      const response = await this.fetchCardano(path, {
+        method: 'GET'
       });
       const addressBalance = await response.json();
       return addressBalance.amount;
@@ -131,13 +131,10 @@ class CardanoApi {
   }
   async getUtxos(address, page, limit) {
     try {
-      let url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/addresses/${address}/utxos` : `https://cardano-mainnet.blockfrost.io/api/v0/addresses/${address}/utxos`;
-      url += `?page=${page}&count=${limit}`;
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Project_id: this.projectId
-        }
+      let path = `/addresses/${address}/utxos`;
+      path += `?page=${page}&count=${limit}`;
+      const response = await this.fetchCardano(path, {
+        method: 'GET'
       });
       const utxos = await response.json();
       return utxos;
@@ -148,12 +145,9 @@ class CardanoApi {
   }
   async getSpecificUtxo(txHash) {
     try {
-      const url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/txs/${txHash}/utxos` : `https://cardano-mainnet.blockfrost.io/api/v0/txs/${txHash}/utxos`;
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Project_id: this.projectId
-        }
+      const path = `/txs/${txHash}/utxos`;
+      const response = await this.fetchCardano(path, {
+        method: 'GET'
       });
       const utxo = await response.json();
       return utxo;
@@ -164,11 +158,10 @@ class CardanoApi {
   }
   async sendCardanoTxReturnHash(tx) {
     try {
-      const url = this.isTestnet ? 'https://cardano-preprod.blockfrost.io/api/v0/tx/submit' : 'https://cardano-mainnet.blockfrost.io/api/v0/tx/submit';
-      const response = await fetch(url, {
+      const path = '/tx/submit';
+      const response = await this.fetchCardano(path, {
         method: 'POST',
         headers: {
-          Project_id: this.projectId,
           'Content-Type': 'application/cbor'
         },
         body: (0, _utils.cborToBytes)(tx)
@@ -188,12 +181,9 @@ class CardanoApi {
   async getStatusByTxHash(txHash, ttl) {
     const cronTime = 30000;
     return (0, _utils.retryCardanoTxStatus)(async () => {
-      const url = this.isTestnet ? `https://cardano-preprod.blockfrost.io/api/v0/txs/${txHash}` : `https://cardano-mainnet.blockfrost.io/api/v0/txs/${txHash}`;
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Project_id: this.projectId
-        }
+      const path = `/txs/${txHash}`;
+      const response = await this.fetchCardano(path, {
+        method: 'GET'
       });
       const txInfo = await response.json();
       if (txInfo.block && txInfo.hash && txInfo.index >= 0) {

package/cjs/services/chain-service/handler/bitcoin/BitcoinApi.js

@@ -0,0 +1,105 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BitcoinApi = void 0;
+var _BlockStreamTestnet = require("@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/BlockStreamTestnet");
+var _SubWalletMainnet = require("@subwallet/extension-base/services/chain-service/handler/bitcoin/strategy/SubWalletMainnet");
+var _promise = require("@subwallet/extension-base/utils/promise");
+var _rxjs = require("rxjs");
+var _types = require("../../types");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// const isBlockStreamProvider = (apiUrl: string): boolean => apiUrl === 'https://blockstream-testnet.openbit.app' || apiUrl === 'https://electrs.openbit.app';
+// const BLOCKSTREAM_TESTNET_API_URL = 'https://blockstream.info/testnet/api/';
+// const MEMPOOL_TESTNET_V4_API_URL = 'https://mempool.space/testnet4/api/';
+
+class BitcoinApi {
+  apiRetry = 0;
+  isApiConnectedSubject = new _rxjs.BehaviorSubject(false);
+  connectionStatusSubject = new _rxjs.BehaviorSubject(_types._ChainConnectionStatus.DISCONNECTED);
+  isApiReady = false;
+  isApiReadyOnce = false;
+  constructor(chainSlug, apiUrl) {
+    let {
+      providerName
+    } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    this.chainSlug = chainSlug;
+    this.apiUrl = apiUrl;
+    this.providerName = providerName || 'unknown';
+    this.isReadyHandler = (0, _promise.createPromiseHandler)();
+    this.api = this.createApiStrategy(apiUrl);
+    this.connect();
+  }
+  get isApiConnected() {
+    return this.isApiConnectedSubject.getValue();
+  }
+  createApiStrategy(apiUrl) {
+    const isTestnet = apiUrl.includes('testnet');
+    const isBlockstreamUrl = apiUrl.includes('blockstream');
+    if (isTestnet) {
+      return isBlockstreamUrl ? new _BlockStreamTestnet.BlockStreamTestnetRequestStrategy(apiUrl) : new _BlockStreamTestnet.MempoolTestnetRequestStrategy(apiUrl);
+    }
+    return new _SubWalletMainnet.SubWalletMainnetRequestStrategy(apiUrl);
+  }
+  get connectionStatus() {
+    return this.connectionStatusSubject.getValue();
+  }
+  updateConnectionStatus(status) {
+    const isConnected = status === _types._ChainConnectionStatus.CONNECTED;
+    if (isConnected !== this.isApiConnectedSubject.value) {
+      this.isApiConnectedSubject.next(isConnected);
+    }
+    if (status !== this.connectionStatusSubject.value) {
+      this.connectionStatusSubject.next(status);
+    }
+  }
+  get isReady() {
+    return this.isReadyHandler.promise;
+  }
+  async updateApiUrl(apiUrl) {
+    if (this.apiUrl === apiUrl) {
+      return;
+    }
+    await this.disconnect();
+    this.apiUrl = apiUrl;
+    this.api = this.createApiStrategy(apiUrl);
+    this.connect();
+  }
+  async recoverConnect() {
+    await this.isReadyHandler.promise;
+  }
+  connect() {
+    this.updateConnectionStatus(_types._ChainConnectionStatus.CONNECTING);
+    this.onConnect();
+  }
+  async disconnect() {
+    this.onDisconnect();
+    this.updateConnectionStatus(_types._ChainConnectionStatus.DISCONNECTED);
+    return Promise.resolve();
+  }
+  destroy() {
+    return this.disconnect();
+  }
+  onConnect() {
+    if (!this.isApiConnected) {
+      console.log(`Connected to ${this.chainSlug} at ${this.apiUrl}`);
+      this.isApiReady = true;
+      if (this.isApiReadyOnce) {
+        this.isReadyHandler.resolve(this);
+      }
+    }
+    this.updateConnectionStatus(_types._ChainConnectionStatus.CONNECTED);
+  }
+  onDisconnect() {
+    this.updateConnectionStatus(_types._ChainConnectionStatus.DISCONNECTED);
+    if (this.isApiConnected) {
+      console.warn(`Disconnected from ${this.chainSlug} of ${this.apiUrl}`);
+      this.isApiReady = false;
+      this.isReadyHandler = (0, _promise.createPromiseHandler)();
+    }
+  }
+}
+exports.BitcoinApi = BitcoinApi;