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

package/cjs/services/swap-service/handler/chainflip-handler.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ChainflipSwapHandler = exports.CHAINFLIP_BROKER_API = void 0;
+exports.ChainflipSwapHandler = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -12,9 +12,9 @@ var _smartContract = require("@subwallet/extension-base/services/balance-service
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _baseHandler = require("@subwallet/extension-base/services/swap-service/handler/base-handler");
-var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _utils3 = require("@subwallet/extension-base/utils");
+var _environment = require("@subwallet/extension-base/types/environment");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
@@ -22,9 +22,10 @@ var _bignumber = _interopRequireDefault(require("bignumber.js"));
 
 const INTERMEDIARY_MAINNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = _chainList.COMMON_ASSETS.USDC_SEPOLIA;
-const CHAINFLIP_BROKER_API = process.env.CHAINFLIP_BROKER_API || '';
-exports.CHAINFLIP_BROKER_API = CHAINFLIP_BROKER_API;
 class ChainflipSwapHandler {
+  // private baseUrl: string;
+  // private assetsUrl: string;
+
   constructor(chainService, balanceService, feeService) {
     let isTestnet = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
     this.swapBaseHandler = new _baseHandler.SwapBaseHandler({
@@ -36,8 +37,10 @@ class ChainflipSwapHandler {
     });
     this.isTestnet = isTestnet;
     this.providerSlug = isTestnet ? _types.SwapProviderId.CHAIN_FLIP_TESTNET : _types.SwapProviderId.CHAIN_FLIP_MAINNET;
-    this.baseUrl = (0, _utils2.getChainflipSwap)(isTestnet);
+    // this.baseUrl = getChainflipSwap(isTestnet);
+    // this.assetsUrl = getAssetsUrl(isTestnet);
   }
+
   get chainService() {
     return this.swapBaseHandler.chainService;
   }
@@ -73,7 +76,7 @@ class ChainflipSwapHandler {
     const chainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const toChainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const chainType = (0, _utils._isChainSubstrateCompatible)(chainInfo) ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
-    const receiver = (0, _utils3._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
+    const receiver = (0, _utils2._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
     const fromAssetId = (0, _utils._getAssetSymbol)(fromAsset);
     const toAssetId = (0, _utils._getAssetSymbol)(toAsset);
     const minReceive = new _bignumber.default(quote.rate).times(1 - slippage).toString();
@@ -85,23 +88,31 @@ class ChainflipSwapHandler {
     if (processMetadata.destChain !== quoteMetadata.destChain || processMetadata.srcChain !== quoteMetadata.srcChain) {
       throw new Error('Metadata for Chainflip not found');
     }
+    const assetsResponse = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.CHAINFLIP, '/assets', {
+      method: 'GET'
+    }, this.isTestnet);
+    const _allAssets = await assetsResponse.json();
+    const allAssets = _allAssets.assets;
+    const sourceAsset = allAssets.find(asset => asset.network === processMetadata.srcChain && asset.ticker === fromAssetId);
+    const destinationAsset = allAssets.find(asset => asset.network === processMetadata.destChain && asset.ticker === toAssetId);
+    if (!sourceAsset || !destinationAsset) {
+      throw new Error('Error get Chainflip data');
+    }
     const depositParams = {
-      sourceChain: processMetadata.srcChain,
       destinationAddress: receiver,
-      destinationAsset: toAssetId,
-      destinationChain: processMetadata.destChain,
+      destinationAsset: destinationAsset.id,
+      sourceAsset: sourceAsset.id,
       minimumPrice: minReceive,
       // minimum accepted price for swaps through the channel
       refundAddress: address,
       // address to which assets are refunded
-      retryDurationInBlocks: '100',
-      // 100 blocks * 6 seconds = 10 minutes before deposits are refunded
-      sourceAsset: fromAssetId
+      retryDurationInBlocks: '100' // 100 blocks * 6 seconds = 10 minutes before deposits are refunded
     };
-    const url = `${this.baseUrl}&${new URLSearchParams(depositParams).toString()}`;
-    const response = await fetch(url, {
+
+    const path = `/swap?${new URLSearchParams(depositParams).toString()}`;
+    const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.CHAINFLIP, path, {
       method: 'GET'
-    });
+    }, this.isTestnet);
     const data = await response.json();
     if (!data.id || !data.address || data.address === '' || !data.issuedBlock || !data.network || !data.channelId) {
       throw new Error('Error get Chainflip data');
@@ -208,8 +219,8 @@ class ChainflipSwapHandler {
         expectedReceive: params.selectedQuote.toAmount,
         originTokenInfo,
         destinationTokenInfo,
-        sender: (0, _utils3._reformatAddressWithChain)(params.request.address, originChain),
-        receiver: (0, _utils3._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
+        sender: (0, _utils2._reformatAddressWithChain)(params.request.address, originChain),
+        receiver: (0, _utils2._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
         srcChain: metadata.srcChain,
         destChain: metadata.destChain,
         version: 2

package/cjs/services/swap-service/handler/kyber-handler.js

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.KyberHandler = exports.KYBER_CLIENT_ID = void 0;
+exports.KyberHandler = void 0;
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
 var _types = require("@subwallet/extension-base/types");
+var _environment = require("@subwallet/extension-base/types/environment");
 var _utils = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -19,9 +20,6 @@ var _baseHandler = require("./base-handler");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const KYBER_CLIENT_ID = process.env.KYBER_CLIENT_ID || '';
-exports.KYBER_CLIENT_ID = KYBER_CLIENT_ID;
-const kyberUrl = 'https://aggregator-api.kyberswap.com';
 async function buildTxForKyberSwap(params, chain) {
   const {
     recipient,
@@ -46,14 +44,13 @@ async function buildTxForKyberSwap(params, chain) {
     amountIn,
     gasInclude: 'true'
   });
-  const url = `${kyberUrl}/${chain}/api/v1/routes?${queryParams.toString()}`;
+  const path = `/${chain}/api/v1/routes?${queryParams.toString()}`;
   try {
     var _routeData$data;
-    const res = await fetch(url, {
+    const res = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.KYBER, path, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
-        'x-client-id': KYBER_CLIENT_ID,
         accept: 'application/json'
       }
     });
@@ -86,11 +83,10 @@ async function buildTxForKyberSwap(params, chain) {
   };
   console.log('routeSummary2', routeSummary);
   try {
-    const res = await fetch(`${kyberUrl}/${chain}/api/v1/route/build`, {
+    const res = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.KYBER, `/${chain}/api/v1/route/build`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        'x-client-id': KYBER_CLIENT_ID,
         accept: 'application/json'
       },
       body: JSON.stringify(body)

package/cjs/services/swap-service/handler/simpleswap-handler.js

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.simpleSwapApiKey = exports.SimpleSwapHandler = void 0;
+exports.SimpleSwapHandler = void 0;
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
+var _environment = require("@subwallet/extension-base/types/environment");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireWildcard(require("bignumber.js"));
@@ -20,9 +21,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const apiUrl = 'https://api.simpleswap.io/v3';
-const simpleSwapApiKey = process.env.SIMPLE_SWAP_API_KEY || '';
-exports.simpleSwapApiKey = simpleSwapApiKey;
 const toBNString = (input, decimal) => {
   const raw = new _bignumber.BigNumber(input);
   return raw.shiftedBy(decimal).integerValue(_bignumber.BigNumber.ROUND_CEIL).toFixed();
@@ -54,12 +52,11 @@ const buildTxForSimpleSwap = async params => {
       userRefundAddress: sender,
       userRefundExtraId: ''
     };
-    const response = await fetch(`${apiUrl}/exchanges`, {
+    const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.SIMPLESWAP, '/exchanges', {
       method: 'POST',
       headers: {
-        accept: 'application/json',
         'Content-Type': 'application/json',
-        'x-api-key': simpleSwapApiKey
+        accept: 'application/json'
       },
       body: JSON.stringify(requestBody)
     });

package/cjs/services/swap-service/handler/uniswap-handler.js

@@ -13,6 +13,7 @@ var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/
 var _acrossBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge");
 var _utils = require("@subwallet/extension-base/services/swap-service/utils");
 var _types = require("@subwallet/extension-base/types");
+var _environment = require("@subwallet/extension-base/types/environment");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -22,10 +23,6 @@ var _baseHandler = require("./base-handler");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const API_URL = 'https://trade-api.gateway.uniswap.org/v1';
-const headers = {
-  'x-api-key': process.env.UNISWAP_API_KEY || ''
-};
 async function fetchCheckApproval(request) {
   const {
     address,
@@ -56,10 +53,9 @@ async function fetchCheckApproval(request) {
   } else {
     return undefined;
   }
-  const response = await fetch(`${API_URL}/check_approval`, {
+  const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.UNISWAP, '/check_approval', {
     method: 'POST',
     headers: {
-      ...headers,
       'Content-Type': 'application/json'
     },
     body: JSON.stringify({
@@ -624,10 +620,9 @@ class UniswapHandler {
       if (permitData) {
         body.permitData = permitData;
       }
-      postTransactionResponse = await fetch(`${API_URL}/swap`, {
+      postTransactionResponse = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.UNISWAP, '/swap', {
         method: 'POST',
         headers: {
-          ...headers,
           'Content-Type': 'application/json'
         },
         body: JSON.stringify(body)
@@ -638,10 +633,9 @@ class UniswapHandler {
       const dutchQuote = quote;
       const submitSwapOrder = async () => {
         try {
-          const res = await fetch(`${API_URL}/order`, {
+          const res = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.UNISWAP, '/order', {
             method: 'POST',
             headers: {
-              ...headers,
               'Content-Type': 'application/json'
             },
             body: JSON.stringify({
@@ -682,10 +676,9 @@ class UniswapHandler {
         const swapper = dutchQuote.orderInfo.swapper;
         return retryGetUniswapTx(async () => {
           try {
-            const response = await fetch(`${API_URL}/orders?orderId=${orderId}&swapper=${swapper}`, {
+            const response = await (0, _utils2.fetchFromProxyService)(_environment.ProxyServiceRoute.UNISWAP, `/orders?orderId=${orderId}&swapper=${swapper}`, {
               method: 'GET',
               headers: {
-                ...headers,
                 'Content-Type': 'application/json'
               }
             });

package/cjs/services/swap-service/utils.js

@@ -13,9 +13,6 @@ exports.findSwapTransitDestination = findSwapTransitDestination;
 exports.getAmountAfterSlippage = getAmountAfterSlippage;
 exports.getBridgeStep = getBridgeStep;
 exports.getChainRouteFromSteps = getChainRouteFromSteps;
-exports.getChainflipBroker = getChainflipBroker;
-exports.getChainflipOptions = getChainflipOptions;
-exports.getChainflipSwap = getChainflipSwap;
 exports.getFirstAmountFromSteps = getFirstAmountFromSteps;
 exports.getLastAmountFromSteps = getLastAmountFromSteps;
 exports.getSupportedSwapChains = getSupportedSwapChains;
@@ -29,7 +26,6 @@ exports.processStepsToPathActions = processStepsToPathActions;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _chainflipHandler = require("@subwallet/extension-base/services/swap-service/handler/chainflip-handler");
 var _types2 = require("@subwallet/extension-base/types");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -105,39 +101,52 @@ function convertSwapRate(rate, fromAsset, toAsset) {
   const bnRate = (0, _bignumber.default)(rate);
   return bnRate.times(10 ** decimalDiff).pow(-1).toNumber();
 }
-function getChainflipOptions(isTestnet) {
-  if (isTestnet) {
-    return {
-      network: getChainflipNetwork(isTestnet)
-    };
-  }
-  return {
-    network: getChainflipNetwork(isTestnet),
-    broker: getChainflipBroker(isTestnet)
-  };
-}
-function getChainflipNetwork(isTestnet) {
-  return isTestnet ? 'perseverance' : 'mainnet';
-}
-function getChainflipBroker(isTestnet) {
-  // noted: currently not use testnet broker
-  if (isTestnet) {
-    return {
-      url: `https://perseverance.chainflip-broker.io/rpc/${_chainflipHandler.CHAINFLIP_BROKER_API}`
-    };
-  } else {
-    return {
-      url: `https://chainflip-broker.io/rpc/${_chainflipHandler.CHAINFLIP_BROKER_API}`
-    };
-  }
-}
-function getChainflipSwap(isTestnet) {
-  if (isTestnet) {
-    return `https://perseverance.chainflip-broker.io/swap?apikey=${_chainflipHandler.CHAINFLIP_BROKER_API}`;
-  } else {
-    return `https://chainflip-broker.io/swap?apikey=${_chainflipHandler.CHAINFLIP_BROKER_API}`;
-  }
-}
+
+// export function getChainflipOptions (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return {
+//       network: getChainflipNetwork(isTestnet)
+//     };
+//   }
+
+//   return {
+//     network: getChainflipNetwork(isTestnet),
+//     broker: getChainflipBroker(isTestnet)
+//   };
+// }
+
+// function getChainflipNetwork (isTestnet: boolean) {
+//   return isTestnet ? 'perseverance' : 'mainnet';
+// }
+
+// export function getChainflipBroker (isTestnet: boolean) { // noted: currently not use testnet broker
+//   if (isTestnet) {
+//     return {
+//       url: `https://perseverance.chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
+//     };
+//   } else {
+//     return {
+//       url: `https://chainflip-broker.io/rpc/${CHAINFLIP_BROKER_API}`
+//     };
+//   }
+// }
+
+// export function getChainflipSwap (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return `https://perseverance.chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
+//   } else {
+//     return `https://chainflip-broker.io/swap?apikey=${CHAINFLIP_BROKER_API}`;
+//   }
+// }
+
+// export function getAssetsUrl (isTestnet: boolean) {
+//   if (isTestnet) {
+//     return 'https://perseverance.chainflip-broker.io/assets';
+//   } else {
+//     return 'https://chainflip-broker.io/assets';
+//   }
+// }
+
 function getBridgeStep(from, to) {
   return {
     action: _types2.DynamicSwapType.BRIDGE,

package/cjs/services/transaction-service/helpers/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTonTransaction = exports.isSubstrateTransaction = exports.isCardanoTransaction = exports.getValidationId = exports.getTransactionId = exports.getBaseTransactionInfo = void 0;
+exports.isTonTransaction = exports.isSubstrateTransaction = exports.isCardanoTransaction = exports.isBitcoinTransaction = exports.getValidationId = exports.getTransactionId = exports.getBaseTransactionInfo = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -32,7 +32,13 @@ const isCardanoTransaction = tx => {
   const cardanoTransactionConfig = tx;
   return cardanoTransactionConfig.cardanoPayload !== null && cardanoTransactionConfig.cardanoPayload !== undefined;
 };
+
+// TODO: [Review] this function
 exports.isCardanoTransaction = isCardanoTransaction;
+const isBitcoinTransaction = tx => {
+  return 'data' in tx && Array.isArray(tx.data.inputs);
+};
+exports.isBitcoinTransaction = isBitcoinTransaction;
 const typeName = type => {
   switch (type) {
     case _KoniTypes.ExtrinsicType.TRANSFER_BALANCE:

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

@@ -46,10 +46,6 @@ class TransactionService {
   }
   constructor(state) {
     this.state = state;
-    this.eventService = state.eventService;
-    this.historyService = state.historyService;
-    this.notificationService = state.notificationService;
-    this.chainService = state.chainService;
   }
   get allTransactions() {
     return Object.values(this.transactions);
@@ -81,6 +77,7 @@ class TransactionService {
       additionalValidator,
       address,
       chain,
+      chainType,
       extrinsicType
     } = validationResponse;
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
@@ -110,27 +107,30 @@ class TransactionService {
     const evmApi = this.state.chainService.getEvmApi(chainInfo.slug);
     const tonApi = this.state.chainService.getTonApi(chainInfo.slug);
     const cardanoApi = this.state.chainService.getCardanoApi(chainInfo.slug);
+    const bitcoinApi = this.state.chainService.getBitcoinApi(chainInfo.slug);
     // todo: should split into isEvmTx && isNoEvmApi. Because other chains type also has no Evm Api. Same to all blockchain.
     // todo: refactor check evmTransaction.
-    const isNoEvmApi = transaction && !(0, _helpers.isSubstrateTransaction)(transaction) && !(0, _helpers.isTonTransaction)(transaction) && !(0, _helpers.isCardanoTransaction)(transaction) && !evmApi;
+    const isNoEvmApi = transaction && !(0, _helpers.isSubstrateTransaction)(transaction) && !(0, _helpers.isTonTransaction)(transaction) && !(0, _helpers.isCardanoTransaction)(transaction) && !(0, _helpers.isBitcoinTransaction)(transaction) && !evmApi;
     const isNoTonApi = transaction && (0, _helpers.isTonTransaction)(transaction) && !tonApi;
     const isNoCardanoApi = transaction && (0, _helpers.isCardanoTransaction)(transaction) && !cardanoApi;
-    if (isNoEvmApi || isNoTonApi || isNoCardanoApi) {
+    const isNoBitcoinApi = transaction && (0, _helpers.isBitcoinTransaction)(transaction) && !bitcoinApi;
+    if (isNoEvmApi || isNoTonApi || isNoCardanoApi || isNoBitcoinApi) {
       validationResponse.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
     }
 
     // Estimate fee for transaction
     const id = (0, _getId.getId)();
-    const feeInfo = await this.state.feeService.subscribeChainFee(id, chain, 'evm');
+    const feeInfo = await this.state.feeService.subscribeChainFee(id, chain, chainType);
     const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(chain);
     const tokenPayFeeSlug = transactionInput.tokenPayFeeSlug;
     const isNonNativeTokenPayFee = tokenPayFeeSlug && !(0, _utils2._isNativeTokenBySlug)(tokenPayFeeSlug);
-    const nonNativeTokenPayFeeInfo = isNonNativeTokenPayFee ? this.chainService.getAssetBySlug(tokenPayFeeSlug) : undefined;
+    const nonNativeTokenPayFeeInfo = isNonNativeTokenPayFee ? this.state.chainService.getAssetBySlug(tokenPayFeeSlug) : undefined;
     const priceMap = (await this.state.priceService.getPrice()).priceMap;
     validationResponse.estimateFee = await (0, _transfer.estimateFeeForTransaction)(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, transactionInput.isTransferLocalTokenAndPayThatTokenAsFee);
     const chainInfoMap = this.state.chainService.getChainInfoMap();
 
     // Check account signing transaction
+
     (0, _transfer.checkSigningAccountForTransaction)(validationResponse, chainInfoMap);
     const nativeTokenAvailable = await this.state.balanceService.getTransferableBalance(address, chain, nativeTokenInfo.slug, extrinsicType);
 
@@ -193,7 +193,7 @@ class TransactionService {
   }
   fillTransactionDefaultInfo(transaction) {
     const isInternal = !transaction.url;
-    const transactionId = (0, _helpers.getTransactionId)(transaction.chainType, transaction.chain, isInternal, (0, _helpers2.isWalletConnectRequest)(transaction.id));
+    const transactionId = transaction.id || (0, _helpers.getTransactionId)(transaction.chainType, transaction.chain, isInternal, (0, _helpers2.isWalletConnectRequest)(transaction.id));
     return {
       ...transaction,
       createdAt: new Date().getTime(),
@@ -417,7 +417,7 @@ class TransactionService {
   }
   async sendTransaction(transaction) {
     // Send Transaction
-    const emitter = await (transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : transaction.chainType === 'evm' ? this.signAndSendEvmTransaction(transaction) : transaction.chainType === 'cardano' ? this.signAndSendCardanoTransaction(transaction) : this.signAndSendTonTransaction(transaction));
+    const emitter = await (transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : transaction.chainType === 'evm' ? this.signAndSendEvmTransaction(transaction) : transaction.chainType === 'cardano' ? this.signAndSendCardanoTransaction(transaction) : transaction.chainType === 'ton' ? this.signAndSendTonTransaction(transaction) : this.signAndSendBitcoinTransaction(transaction));
     const {
       eventsHandler,
       step
@@ -676,6 +676,7 @@ class TransactionService {
       extrinsicHash: transaction.extrinsicHash,
       time: transaction.createdAt,
       fee: transaction.estimateFee,
+      blockTime: undefined,
       blockNumber: 0,
       // Will be added in next step
       blockHash: '',
@@ -1065,6 +1066,24 @@ class TransactionService {
     if ([_KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.STAKING_BOND, _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL, _KoniTypes.ExtrinsicType.MINT_LDOT, _KoniTypes.ExtrinsicType.MINT_QDOT, _KoniTypes.ExtrinsicType.MINT_SDOT, _KoniTypes.ExtrinsicType.MINT_STDOT, _KoniTypes.ExtrinsicType.MINT_VDOT, _KoniTypes.ExtrinsicType.MINT_VMANTA].includes(transaction.extrinsicType)) {
       this.handlePostEarningTransaction(id);
     }
+
+    // Trigger balance update for Bitcoin transactions after receiving extrinsicHash
+    if (_KoniTypes.ExtrinsicType.TRANSFER_BALANCE && transaction.chainType === 'bitcoin') {
+      const balanceService = this.state.balanceService;
+      const inputData = (0, _utils3.parseTransactionData)(transaction.data);
+      try {
+        const sender = _uiKeyring.default.getPair(inputData.from);
+        balanceService.refreshBalanceForAddress(sender.address, transaction.chain, inputData.tokenSlug, transaction.extrinsicType).catch(error => console.error('Failed to run balance subscription:', error));
+      } catch (e) {
+        console.error(e);
+      }
+      try {
+        const recipient = _uiKeyring.default.getPair(inputData.to);
+        balanceService.refreshBalanceForAddress(recipient.address, transaction.chain, inputData.tokenSlug, transaction.extrinsicType).catch(error => console.error('Failed to run balance subscription:', error));
+      } catch (e) {
+        console.error(e);
+      }
+    }
   }
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
@@ -1104,6 +1123,7 @@ class TransactionService {
     let {
       blockHash,
       blockNumber,
+      blockTime,
       extrinsicHash,
       id
     } = _ref4;
@@ -1118,7 +1138,8 @@ class TransactionService {
       extrinsicHash,
       status: _KoniTypes.ExtrinsicStatus.SUCCESS,
       blockNumber: blockNumber || 0,
-      blockHash: blockHash || ''
+      blockHash: blockHash || '',
+      blockTime
     }).catch(console.error);
     const info = (0, _util.isHex)(extrinsicHash) ? extrinsicHash : (0, _helpers.getBaseTransactionInfo)(transaction, this.state.chainService.getChainInfoMap());
     this.state.notificationService.notify({
@@ -1193,14 +1214,14 @@ class TransactionService {
         errors,
         extrinsicHash
       });
-      this.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
+      this.state.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
         extrinsicHash: extrinsicHash || transaction.extrinsicHash,
         status: nextStatus,
         blockNumber: blockNumber || 0,
         blockHash: blockHash || ''
       }).catch(console.error);
-      const info = (0, _util.isHex)(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : (0, _helpers.getBaseTransactionInfo)(transaction, this.chainService.getChainInfoMap());
-      this.notificationService.notify({
+      const info = (0, _util.isHex)(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : (0, _helpers.getBaseTransactionInfo)(transaction, this.state.chainService.getChainInfoMap());
+      this.state.notificationService.notify({
         type: _KoniTypes.NotificationType.ERROR,
         title: (0, _i18next.t)('Transaction timed out'),
         message: (0, _i18next.t)('Transaction {{info}} timed out', {
@@ -1214,7 +1235,7 @@ class TransactionService {
         notifyViaBrowser: true
       });
     }
-    this.eventService.emit('transaction.timeout', transaction);
+    this.state.eventService.emit('transaction.timeout', transaction);
   }
   generateHashPayload(chain, transaction) {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
@@ -1894,6 +1915,106 @@ class TransactionService {
     });
     return emitter;
   }
+  emitterEventTransaction = (emitter, eventData, chain, payload) => {
+    // Emit signed event
+    emitter.emit('signed', eventData);
+    // Add start info
+    emitter.emit('send', eventData);
+    const event = this.state.chainService.getBitcoinApi(chain).api.sendRawTransaction(payload);
+    event.on('extrinsicHash', txHash => {
+      eventData.extrinsicHash = txHash;
+      emitter.emit('extrinsicHash', eventData);
+    });
+    event.on('success', transactionStatus => {
+      console.log(transactionStatus);
+      eventData.blockHash = transactionStatus.block_hash || undefined;
+      eventData.blockNumber = transactionStatus.block_height || undefined;
+      eventData.blockTime = transactionStatus.block_time ? transactionStatus.block_time * 1000 : undefined;
+      emitter.emit('success', eventData);
+    });
+    event.on('error', error => {
+      eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNABLE_TO_SEND, error));
+      emitter.emit('error', eventData);
+    });
+  };
+  signAndSendBitcoinTransaction(_ref22) {
+    let {
+      address,
+      chain,
+      id,
+      transaction,
+      url
+    } = _ref22;
+    const tx = transaction;
+    // const bitcoinApi = this.state.chainService.getBitcoinApi(chain);
+    // const chainInfo = this.state.chainService.getChainInfoByKey(chain);
+
+    const accountPair = _uiKeyring.default.getPair(address);
+    const account = (0, _utils4.pairToAccount)(accountPair);
+    const payload = {
+      payload: undefined,
+      payloadJson: undefined,
+      account,
+      canSign: true,
+      hashPayload: tx.toHex(),
+      id
+    };
+    const emitter = new _eventemitter.default();
+    const eventData = {
+      id,
+      errors: [],
+      warnings: [],
+      extrinsicHash: id
+    };
+    const isInjected = !!account.isInjected;
+    // const isExternal = !!account.isExternal;
+
+    if (isInjected) {
+      throw new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED);
+    } else {
+      this.state.requestService.addConfirmationBitcoin(id, url || _constants2.EXTENSION_REQUEST_URL, 'bitcoinSendTransactionRequest', payload, {}).then(_ref23 => {
+        let {
+          isApproved,
+          payload
+        } = _ref23;
+        if (isApproved) {
+          if (!payload) {
+            throw new Error('Bad signature');
+          }
+
+          // Emit signed event
+          emitter.emit('signed', eventData);
+          // Add start info
+          emitter.emit('send', eventData);
+          const bitcoinApi = this.state.chainService.getBitcoinApi(chain);
+          const event = bitcoinApi.api.sendRawTransaction(payload);
+          event.on('extrinsicHash', txHash => {
+            eventData.extrinsicHash = txHash;
+            emitter.emit('extrinsicHash', eventData);
+          });
+          event.on('success', transactionStatus => {
+            eventData.blockHash = transactionStatus.block_hash || undefined;
+            eventData.blockNumber = transactionStatus.block_height || undefined;
+            eventData.blockTime = transactionStatus.block_time ? transactionStatus.block_time * 1000 : undefined;
+            emitter.emit('success', eventData);
+          });
+          event.on('error', error => {
+            eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNABLE_TO_SEND, error));
+            emitter.emit('error', eventData);
+          });
+        } else {
+          this.removeTransaction(id);
+          eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.USER_REJECT_REQUEST));
+          emitter.emit('error', eventData);
+        }
+      }).catch(e => {
+        this.removeTransaction(id);
+        eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNABLE_TO_SIGN, e.message));
+        emitter.emit('error', eventData);
+      });
+    }
+    return emitter;
+  }
   handleTransactionTimeout(emitter, eventData) {
     const timeout = setTimeout(() => {
       const transaction = this.getTransaction(eventData.id);