@subwallet/extension-base 1.3.50-0 → 1.3.51-0

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.50-0'
+  version: '1.3.51-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -37,10 +37,11 @@ class BitcoinApi {
     return this.isApiConnectedSubject.getValue();
   }
   createApiStrategy(apiUrl) {
+    const _apiUrl = 'https://blockstream.info/testnet/api/'; // todo: for test
     const isTestnet = apiUrl.includes('testnet');
     const isBlockstreamUrl = apiUrl.includes('blockstream');
     if (isTestnet) {
-      return isBlockstreamUrl ? new _BlockStreamTestnet.BlockStreamTestnetRequestStrategy(apiUrl) : new _BlockStreamTestnet.MempoolTestnetRequestStrategy(apiUrl);
+      return isBlockstreamUrl ? new _BlockStreamTestnet.BlockStreamTestnetRequestStrategy(_apiUrl) : new _BlockStreamTestnet.MempoolTestnetRequestStrategy(_apiUrl);
     }
     return new _SubWalletMainnet.SubWalletMainnetRequestStrategy(apiUrl);
   }
@@ -57,6 +58,7 @@ class BitcoinApi {
     }
   }
   get isReady() {
+    // todo: recheck if bitcoinApi need this
     return this.isReadyHandler.promise;
   }
   async updateApiUrl(apiUrl) {

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

@@ -21,6 +21,7 @@ var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _utils5 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
+var _validate = require("@subwallet/keyring/utils/address/validate");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -380,8 +381,10 @@ class SwapBaseHandler {
     if (recipient) {
       const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(recipient);
       const isEvmDestChain = (0, _utils3._isChainEvmCompatible)(swapToChain);
-      if (isEvmAddress !== isEvmDestChain) {
-        // todo: update condition if support swap chain # EVM or Substrate
+      const isBtcAddress = (0, _validate.isBitcoinAddress)(recipient);
+      const isBtcDestChain = (0, _utils3._isPureBitcoinChain)(swapToChain);
+      if (isEvmAddress !== isEvmDestChain || isBtcAddress !== isBtcDestChain) {
+        // todo: update condition if support swap chain # EVM, Substrate, Bitcoin
         return [new _TransactionError.TransactionError(_swap.SwapErrorType.INVALID_RECIPIENT)];
       }
     }

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

@@ -8,6 +8,7 @@ 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");
+var _bitcoinTransfer = require("@subwallet/extension-base/services/balance-service/transfer/bitcoin-transfer");
 var _smartContract = require("@subwallet/extension-base/services/balance-service/transfer/smart-contract");
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
@@ -17,6 +18,9 @@ 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"));
+var bitcoin = _interopRequireWildcard(require("bitcoinjs-lib"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -66,6 +70,8 @@ class ChainflipSwapHandler {
   async handleSubmitStep(params) {
     const {
       address,
+      currentStep,
+      process,
       quote,
       recipient,
       slippage
@@ -74,10 +80,10 @@ class ChainflipSwapHandler {
     const fromAsset = this.chainService.getAssetBySlug(pair.from);
     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 chainType = (0, _utils._isChainSubstrateCompatible)(chainInfo) ? _KoniTypes.ChainType.SUBSTRATE : (0, _utils._isPureBitcoinChain)(chainInfo) ? _KoniTypes.ChainType.BITCOIN : _KoniTypes.ChainType.EVM; // todo: improve throw error for unknown chain
     const receiver = (0, _utils2._reformatAddressWithChain)(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
     const minReceive = new _bignumber.default(quote.rate).times(1 - slippage).toString();
-    const processMetadata = params.process.steps[params.currentStep].metadata;
+    const processMetadata = process.steps[currentStep].metadata;
     const quoteMetadata = processMetadata;
     const fromAssetId = quoteMetadata.fromAssetId;
     const toAssetId = quoteMetadata.toAssetId;
@@ -122,17 +128,17 @@ class ChainflipSwapHandler {
     const txData = {
       address,
       provider: this.providerInfo,
-      quote: params.quote,
-      slippage: params.slippage,
+      quote,
+      slippage,
       recipient,
-      depositChannelId: depositChannelId,
-      depositAddress: depositAddress,
-      process: params.process
+      depositChannelId,
+      depositAddress,
+      process
     };
     let extrinsic;
     if (chainType === _KoniTypes.ChainType.SUBSTRATE) {
-      const chainApi = this.chainService.getSubstrateApi(chainInfo.slug);
-      const substrateApi = await chainApi.isReady;
+      const _substrateApi = this.chainService.getSubstrateApi(chainInfo.slug);
+      const substrateApi = await _substrateApi.isReady;
       const [submittableExtrinsic] = await (0, _token.createSubstrateExtrinsic)({
         from: address,
         networkKey: chainInfo.slug,
@@ -144,9 +150,8 @@ class ChainflipSwapHandler {
         value: quote.fromAmount
       });
       extrinsic = submittableExtrinsic;
-    } else {
-      const id = (0, _getId.getId)();
-      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, chainInfo.slug, 'evm');
+    } else if (chainType === _KoniTypes.ChainType.EVM) {
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee((0, _getId.getId)(), chainInfo.slug, 'evm');
       if ((0, _utils._isNativeToken)(fromAsset)) {
         const [transactionConfig] = await (0, _smartContract.getEVMTransactionObject)({
           chain: chainInfo.slug,
@@ -171,6 +176,24 @@ class ChainflipSwapHandler {
         });
         extrinsic = transactionConfig;
       }
+    } else if (chainType === _KoniTypes.ChainType.BITCOIN) {
+      const bitcoinApi = this.chainService.getBitcoinApi(chainInfo.slug);
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee((0, _getId.getId)(), chainInfo.slug, 'bitcoin');
+      const network = chainInfo.isTestnet ? bitcoin.networks.testnet : bitcoin.networks.bitcoin;
+      const [transaction] = await (0, _bitcoinTransfer.createBitcoinTransaction)({
+        bitcoinApi,
+        chain: chainInfo.slug,
+        from: address,
+        feeInfo,
+        to: depositAddress,
+        transferAll: false,
+        value: quote.fromAmount,
+        network
+      });
+      extrinsic = transaction;
+    } else {
+      // todo: update this when support new chainType rather than substrate, evm, bitcoin
+      throw new Error('Unknown swap chain type');
     }
     return {
       txChain: fromAsset.originChain,

package/cjs/utils/account/common.js

@@ -64,6 +64,7 @@ const _reformatAddressWithChain = (address, chainInfo) => {
     const isTestnet = chainInfo.isTestnet;
     return reformatAddress(address, isTestnet ? 0 : 1);
   } else {
+    // EVM, Bitcoin
     return address;
   }
 };

package/cjs/utils/account/transform.js

@@ -177,7 +177,7 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
       case _types2.AccountChainType.CARDANO:
         return [...BASE_TRANSFER_ACTIONS];
       case _types2.AccountChainType.BITCOIN:
-        return [...BASE_TRANSFER_ACTIONS];
+        return [...BASE_TRANSFER_ACTIONS, _KoniTypes.ExtrinsicType.SWAP];
     }
   } else if (signMode === _types2.AccountSignMode.QR) {
     switch (networkType) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.50-0",
+  "version": "1.3.51-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2866,12 +2866,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.110",
-    "@subwallet/extension-base": "^1.3.50-0",
-    "@subwallet/extension-chains": "^1.3.50-0",
-    "@subwallet/extension-dapp": "^1.3.50-0",
-    "@subwallet/extension-inject": "^1.3.50-0",
+    "@subwallet/extension-base": "^1.3.51-0",
+    "@subwallet/extension-chains": "^1.3.51-0",
+    "@subwallet/extension-dapp": "^1.3.51-0",
+    "@subwallet/extension-inject": "^1.3.51-0",
     "@subwallet/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.50-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.51-0",
     "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.50-0'
+  version: '1.3.51-0'
 };

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

@@ -31,10 +31,11 @@ export class BitcoinApi {
     return this.isApiConnectedSubject.getValue();
   }
   createApiStrategy(apiUrl) {
+    const _apiUrl = 'https://blockstream.info/testnet/api/'; // todo: for test
     const isTestnet = apiUrl.includes('testnet');
     const isBlockstreamUrl = apiUrl.includes('blockstream');
     if (isTestnet) {
-      return isBlockstreamUrl ? new BlockStreamTestnetRequestStrategy(apiUrl) : new MempoolTestnetRequestStrategy(apiUrl);
+      return isBlockstreamUrl ? new BlockStreamTestnetRequestStrategy(_apiUrl) : new MempoolTestnetRequestStrategy(_apiUrl);
     }
     return new SubWalletMainnetRequestStrategy(apiUrl);
   }
@@ -51,6 +52,7 @@ export class BitcoinApi {
     }
   }
   get isReady() {
+    // todo: recheck if bitcoinApi need this
     return this.isReadyHandler.promise;
   }
   async updateApiUrl(apiUrl) {

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

@@ -10,13 +10,14 @@ import { _isSufficientToken } from '@subwallet/extension-base/core/utils';
 import { createXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _isAcrossChainBridge, AcrossErrorMsg } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
 import { estimateXcmFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
-import { _getAssetDecimals, _getAssetOriginChain, _getAssetSymbol, _getChainNativeTokenSlug, _getTokenMinAmount, _isChainEvmCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetOriginChain, _getAssetSymbol, _getChainNativeTokenSlug, _getTokenMinAmount, _isChainEvmCompatible, _isNativeToken, _isPureBitcoinChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { DEFAULT_EXCESS_AMOUNT_WEIGHT, FEE_RATE_MULTIPLIER } from '@subwallet/extension-base/services/swap-service/utils';
 import { BasicTxErrorType, SwapStepType, TransferTxErrorType } from '@subwallet/extension-base/types';
 import { CommonStepType, DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
 import { DynamicSwapType, SwapErrorType, SwapFeeType } from '@subwallet/extension-base/types/swap';
 import { _reformatAddressWithChain, balanceFormatter, formatNumber } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
+import { isBitcoinAddress } from '@subwallet/keyring/utils/address/validate';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -372,8 +373,10 @@ export class SwapBaseHandler {
     if (recipient) {
       const isEvmAddress = isEthereumAddress(recipient);
       const isEvmDestChain = _isChainEvmCompatible(swapToChain);
-      if (isEvmAddress !== isEvmDestChain) {
-        // todo: update condition if support swap chain # EVM or Substrate
+      const isBtcAddress = isBitcoinAddress(recipient);
+      const isBtcDestChain = _isPureBitcoinChain(swapToChain);
+      if (isEvmAddress !== isEvmDestChain || isBtcAddress !== isBtcDestChain) {
+        // todo: update condition if support swap chain # EVM, Substrate, Bitcoin
         return [new TransactionError(SwapErrorType.INVALID_RECIPIENT)];
       }
     }

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

@@ -4,15 +4,17 @@
 import { COMMON_ASSETS } from '@subwallet/chain-list';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { createBitcoinTransaction } from '@subwallet/extension-base/services/balance-service/transfer/bitcoin-transfer';
 import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
 import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
-import { _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken, _isPureBitcoinChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { BasicTxErrorType, CommonStepType, DynamicSwapType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types';
 import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
 import { _reformatAddressWithChain, fetchFromProxyService } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import BigNumber from 'bignumber.js';
+import * as bitcoin from 'bitcoinjs-lib';
 const INTERMEDIARY_MAINNET_ASSET_SLUG = COMMON_ASSETS.USDC_ETHEREUM;
 const INTERMEDIARY_TESTNET_ASSET_SLUG = COMMON_ASSETS.USDC_SEPOLIA;
 export class ChainflipSwapHandler {
@@ -58,6 +60,8 @@ export class ChainflipSwapHandler {
   async handleSubmitStep(params) {
     const {
       address,
+      currentStep,
+      process,
       quote,
       recipient,
       slippage
@@ -66,10 +70,10 @@ export class ChainflipSwapHandler {
     const fromAsset = this.chainService.getAssetBySlug(pair.from);
     const chainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const toChainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
-    const chainType = _isChainSubstrateCompatible(chainInfo) ? ChainType.SUBSTRATE : ChainType.EVM;
+    const chainType = _isChainSubstrateCompatible(chainInfo) ? ChainType.SUBSTRATE : _isPureBitcoinChain(chainInfo) ? ChainType.BITCOIN : ChainType.EVM; // todo: improve throw error for unknown chain
     const receiver = _reformatAddressWithChain(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
     const minReceive = new BigNumber(quote.rate).times(1 - slippage).toString();
-    const processMetadata = params.process.steps[params.currentStep].metadata;
+    const processMetadata = process.steps[currentStep].metadata;
     const quoteMetadata = processMetadata;
     const fromAssetId = quoteMetadata.fromAssetId;
     const toAssetId = quoteMetadata.toAssetId;
@@ -114,17 +118,17 @@ export class ChainflipSwapHandler {
     const txData = {
       address,
       provider: this.providerInfo,
-      quote: params.quote,
-      slippage: params.slippage,
+      quote,
+      slippage,
       recipient,
-      depositChannelId: depositChannelId,
-      depositAddress: depositAddress,
-      process: params.process
+      depositChannelId,
+      depositAddress,
+      process
     };
     let extrinsic;
     if (chainType === ChainType.SUBSTRATE) {
-      const chainApi = this.chainService.getSubstrateApi(chainInfo.slug);
-      const substrateApi = await chainApi.isReady;
+      const _substrateApi = this.chainService.getSubstrateApi(chainInfo.slug);
+      const substrateApi = await _substrateApi.isReady;
       const [submittableExtrinsic] = await createSubstrateExtrinsic({
         from: address,
         networkKey: chainInfo.slug,
@@ -136,9 +140,8 @@ export class ChainflipSwapHandler {
         value: quote.fromAmount
       });
       extrinsic = submittableExtrinsic;
-    } else {
-      const id = getId();
-      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(id, chainInfo.slug, 'evm');
+    } else if (chainType === ChainType.EVM) {
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(getId(), chainInfo.slug, 'evm');
       if (_isNativeToken(fromAsset)) {
         const [transactionConfig] = await getEVMTransactionObject({
           chain: chainInfo.slug,
@@ -163,6 +166,24 @@ export class ChainflipSwapHandler {
         });
         extrinsic = transactionConfig;
       }
+    } else if (chainType === ChainType.BITCOIN) {
+      const bitcoinApi = this.chainService.getBitcoinApi(chainInfo.slug);
+      const feeInfo = await this.swapBaseHandler.feeService.subscribeChainFee(getId(), chainInfo.slug, 'bitcoin');
+      const network = chainInfo.isTestnet ? bitcoin.networks.testnet : bitcoin.networks.bitcoin;
+      const [transaction] = await createBitcoinTransaction({
+        bitcoinApi,
+        chain: chainInfo.slug,
+        from: address,
+        feeInfo,
+        to: depositAddress,
+        transferAll: false,
+        value: quote.fromAmount,
+        network
+      });
+      extrinsic = transaction;
+    } else {
+      // todo: update this when support new chainType rather than substrate, evm, bitcoin
+      throw new Error('Unknown swap chain type');
     }
     return {
       txChain: fromAsset.originChain,

package/utils/account/common.js

@@ -49,6 +49,7 @@ export const _reformatAddressWithChain = (address, chainInfo) => {
     const isTestnet = chainInfo.isTestnet;
     return reformatAddress(address, isTestnet ? 0 : 1);
   } else {
+    // EVM, Bitcoin
     return address;
   }
 };

package/utils/account/transform.js

@@ -166,7 +166,7 @@ export const getAccountTransactionActions = (signMode, networkType, type, _meta,
       case AccountChainType.CARDANO:
         return [...BASE_TRANSFER_ACTIONS];
       case AccountChainType.BITCOIN:
-        return [...BASE_TRANSFER_ACTIONS];
+        return [...BASE_TRANSFER_ACTIONS, ExtrinsicType.SWAP];
     }
   } else if (signMode === AccountSignMode.QR) {
     switch (networkType) {