@subwallet/extension-base 1.3.49-0 → 1.3.50-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.49-0'
+  version: '1.3.50-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -72,16 +72,15 @@ class ChainflipSwapHandler {
     } = params;
     const pair = quote.pair;
     const fromAsset = this.chainService.getAssetBySlug(pair.from);
-    const toAsset = this.chainService.getAssetBySlug(pair.to);
     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, _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();
     const processMetadata = params.process.steps[params.currentStep].metadata;
     const quoteMetadata = processMetadata;
+    const fromAssetId = quoteMetadata.fromAssetId;
+    const toAssetId = quoteMetadata.toAssetId;
     if (!processMetadata || !quoteMetadata) {
       throw new Error('Metadata for Chainflip not found');
     }
@@ -114,6 +113,7 @@ class ChainflipSwapHandler {
       method: 'GET'
     }, this.isTestnet);
     const data = await response.json();
+    console.log('Chainflip channel info:', data);
     if (!data.id || !data.address || data.address === '' || !data.issuedBlock || !data.network || !data.channelId) {
       throw new Error('Error get Chainflip data');
     }
@@ -223,6 +223,8 @@ class ChainflipSwapHandler {
         receiver: (0, _utils2._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain),
         srcChain: metadata.srcChain,
         destChain: metadata.destChain,
+        fromAssetId: metadata.fromAssetId,
+        toAssetId: metadata.toAssetId,
         version: 2
       }
     };

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.49-0",
+  "version": "1.3.50-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.49-0",
-    "@subwallet/extension-chains": "^1.3.49-0",
-    "@subwallet/extension-dapp": "^1.3.49-0",
-    "@subwallet/extension-inject": "^1.3.49-0",
+    "@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/keyring": "^0.1.12",
-    "@subwallet/subwallet-api-sdk": "^1.3.49-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.50-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.49-0'
+  version: '1.3.50-0'
 };

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

@@ -6,7 +6,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 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 { _getAssetSymbol, _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken } 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';
@@ -64,16 +64,15 @@ export class ChainflipSwapHandler {
     } = params;
     const pair = quote.pair;
     const fromAsset = this.chainService.getAssetBySlug(pair.from);
-    const toAsset = this.chainService.getAssetBySlug(pair.to);
     const chainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const toChainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
     const chainType = _isChainSubstrateCompatible(chainInfo) ? ChainType.SUBSTRATE : ChainType.EVM;
     const receiver = _reformatAddressWithChain(recipient !== null && recipient !== void 0 ? recipient : address, toChainInfo);
-    const fromAssetId = _getAssetSymbol(fromAsset);
-    const toAssetId = _getAssetSymbol(toAsset);
     const minReceive = new BigNumber(quote.rate).times(1 - slippage).toString();
     const processMetadata = params.process.steps[params.currentStep].metadata;
     const quoteMetadata = processMetadata;
+    const fromAssetId = quoteMetadata.fromAssetId;
+    const toAssetId = quoteMetadata.toAssetId;
     if (!processMetadata || !quoteMetadata) {
       throw new Error('Metadata for Chainflip not found');
     }
@@ -106,6 +105,7 @@ export class ChainflipSwapHandler {
       method: 'GET'
     }, this.isTestnet);
     const data = await response.json();
+    console.log('Chainflip channel info:', data);
     if (!data.id || !data.address || data.address === '' || !data.issuedBlock || !data.network || !data.channelId) {
       throw new Error('Error get Chainflip data');
     }
@@ -215,6 +215,8 @@ export class ChainflipSwapHandler {
         receiver: _reformatAddressWithChain(params.request.recipient || params.request.address, destinationChain),
         srcChain: metadata.srcChain,
         destChain: metadata.destChain,
+        fromAssetId: metadata.fromAssetId,
+        toAssetId: metadata.toAssetId,
         version: 2
       }
     };

package/types/swap/index.d.ts

@@ -226,4 +226,6 @@ export interface HydrationSwapStepMetadata extends BaseSwapStepMetadata {
 export interface ChainFlipSwapStepMetadata extends BaseSwapStepMetadata {
     srcChain: string;
     destChain: string;
+    fromAssetId: string;
+    toAssetId: string;
 }