@paraspell/swap 13.7.2 → 13.9.0

package/dist/index.mjs

@@ -9,6 +9,7 @@ import { firstValueFrom } from 'rxjs';
 import { createChainClient, formatUnits } from '@paraspell/sdk-pjs';
 import { options } from '@acala-network/api';
 import { WsProvider, ApiPromise } from '@polkadot/api';
+import { snakeToCamel } from '@paraspell/sdk-common';
 import { Amount, Token, getCurrencyCombinations } from '@crypto-dex-sdk/currency';
 import { Percent } from '@crypto-dex-sdk/math';
 import { PAIR_ADDRESSES, isNativeCurrency, addressToNodeCurrency, SwapRouter } from '@crypto-dex-sdk/parachains-bifrost';
@@ -1072,6 +1073,16 @@ var AssetHubPolkadot = {
 				]
 			}
 		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 3377
+					}
+				]
+			}
+		},
 		{
 			parents: 2,
 			interior: {
@@ -1683,6 +1694,22 @@ var Hydration = {
 				]
 			}
 		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0xcec8977efb147760919b983a952033f936c590df"
+						}
+					}
+				]
+			}
+		},
 		{
 			parents: 1,
 			interior: {
@@ -1829,6 +1856,26 @@ var Hydration = {
 				]
 			}
 		},
+		{
+			parents: 2,
+			interior: {
+				X2: [
+					{
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x38eeb52f0771140d10c4e9a9a72349a329fe8a6a"
+						}
+					}
+				]
+			}
+		},
 		{
 			parents: 2,
 			interior: {
@@ -1920,22 +1967,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2000
-					},
-					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0000000000000000000000000000000000000000000000000000000000000000"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 2,
 			interior: {
@@ -2519,6 +2550,16 @@ var Hydration = {
 				]
 			}
 		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 3370
+					}
+				]
+			}
+		},
 		{
 			parents: 1,
 			interior: {
@@ -2659,6 +2700,26 @@ var Hydration = {
 				]
 			}
 		},
+		{
+			parents: 2,
+			interior: {
+				X2: [
+					{
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0xd166337499e176bbc38a1fbd113ab144e5bd2df7"
+						}
+					}
+				]
+			}
+		},
 		{
 			parents: 2,
 			interior: {
@@ -8393,11 +8454,6 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
 // variant carries no data (e.g. `Kusama` -> `kusama`). Struct/tuple variants
 // like `Ethereum { chain_id }` keep their PascalCase.
 var LOWERCASED_PLAIN_VARIANTS = new Set(['Polkadot', 'Kusama', 'Westend', 'Rococo', 'Wococo', 'BitcoinCore', 'BitcoinCash', 'PolkadotBulletin']);
-var snakeToCamel = function snakeToCamel(key) {
-  return key.replace(/_([a-z])/g, function (_, c) {
-    return c.toUpperCase();
-  });
-};
 var isBinary = function isBinary(v) {
   return _typeof(v) === 'object' && v !== null && 'asHex' in v && typeof v.asHex === 'function';
 };
@@ -8558,7 +8614,7 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
                   keep_alive: !!assetFrom.isNative
                 }
               });
-              if (!(assetTo.symbol == getNativeAssetSymbol(this.chain))) {
+              if (!(toDestTxFee === 0n || assetTo.symbol == getNativeAssetSymbol(this.chain))) {
                 _context2.n = 2;
                 break;
               }
@@ -11625,7 +11681,7 @@ var buildExecuteSwapHops = /*#__PURE__*/function () {
 var getExecuteSwapInfo = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, options) {
     var _origin$chain, _destination$chain;
-    var api, origin, exchange, currencyFrom, currencyTo, destination, amount, sender, recipient, evmSenderAddress, _yield$getSwapExecute, xcmFeeResult, amountOut, originChain, destChain, senderAddress, recipientAddress, originAsset, originInfo, builtHops, exchangeHopIdx, postSwapHops, _aggregateHopFees, totalHopFee, bridgeFee, destinationInfo;
+    var api, origin, exchange, currencyFrom, currencyTo, destination, amount, sender, recipient, evmSenderAddress, _yield$getSwapExecute, xcmFeeResult, amountOut, originChain, destChain, senderAddress, recipientAddress, originAsset, _yield$buildOriginInf, selectedCurrency, originXcmFee, originInfo, builtHops, exchangeHopIdx, postSwapHops, _aggregateHopFees, totalHopFee, bridgeFee, destinationInfo;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -11648,15 +11704,22 @@ var getExecuteSwapInfo = /*#__PURE__*/function () {
             api: api,
             origin: originChain,
             sender: senderAddress,
-            currency: currencyFrom,
-            originAsset: originAsset,
+            assets: [_objectSpread2(_objectSpread2({}, originAsset), {}, {
+              amount: BigInt(amount)
+            })],
             amount: BigInt(amount),
             originFee: xcmFeeResult.origin.fee,
             originFeeAsset: xcmFeeResult.origin.asset,
             isFeeAssetAh: false
           });
         case 2:
-          originInfo = _context.v;
+          _yield$buildOriginInf = _context.v;
+          selectedCurrency = _yield$buildOriginInf.selectedCurrency;
+          originXcmFee = _yield$buildOriginInf.xcmFee;
+          originInfo = {
+            selectedCurrency: selectedCurrency[0],
+            xcmFee: originXcmFee
+          };
           _context.n = 3;
           return buildExecuteSwapHops({
             api: api,
@@ -11685,6 +11748,7 @@ var getExecuteSwapInfo = /*#__PURE__*/function () {
             }),
             originFee: xcmFeeResult.origin.fee,
             isFeeAssetAh: false,
+            paysDestFee: true,
             destFeeDetail: xcmFeeResult.destination,
             totalHopFee: totalHopFee,
             bridgeFee: bridgeFee
@@ -11713,21 +11777,40 @@ var getExecuteSwapInfo = /*#__PURE__*/function () {
   };
 }();
 
-var buildExchangeOriginInfo = function buildExchangeOriginInfo(exchange, sender, amount, swapFee) {
-  return buildOriginInfo({
-    api: exchange.api,
-    origin: exchange.chain,
-    sender: sender,
-    currency: {
-      location: exchange.assetFrom.location
-    },
-    originAsset: exchange.assetFrom,
-    amount: amount,
-    originFee: swapFee.fee,
-    originFeeAsset: swapFee.asset,
-    isFeeAssetAh: false
-  });
-};
+var buildExchangeOriginInfo = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(exchange, sender, amount, swapFee) {
+    var _yield$buildOriginInf, selectedCurrency, xcmFee;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          _context.n = 1;
+          return buildOriginInfo({
+            api: exchange.api,
+            origin: exchange.chain,
+            sender: sender,
+            assets: [_objectSpread2(_objectSpread2({}, exchange.assetFrom), {}, {
+              amount: amount
+            })],
+            amount: amount,
+            originFee: swapFee.fee,
+            originFeeAsset: swapFee.asset,
+            isFeeAssetAh: false
+          });
+        case 1:
+          _yield$buildOriginInf = _context.v;
+          selectedCurrency = _yield$buildOriginInf.selectedCurrency;
+          xcmFee = _yield$buildOriginInf.xcmFee;
+          return _context.a(2, {
+            selectedCurrency: selectedCurrency[0],
+            xcmFee: xcmFee
+          });
+      }
+    }, _callee);
+  }));
+  return function buildExchangeOriginInfo(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var buildExchangeDestInfo = function buildExchangeDestInfo(exchange, recipient, amountOut, currencyTo) {
   return buildDestInfo({
     api: exchange.api,
@@ -11739,6 +11822,7 @@ var buildExchangeDestInfo = function buildExchangeDestInfo(exchange, recipient,
     }),
     originFee: 0n,
     isFeeAssetAh: false,
+    paysDestFee: true,
     destFeeDetail: {
       fee: 0n,
       asset: exchange.assetTo,
@@ -11748,33 +11832,33 @@ var buildExchangeDestInfo = function buildExchangeDestInfo(exchange, recipient,
   });
 };
 var getSwapInfo = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(initialOptions) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(initialOptions) {
     var _origin$chain, _destination$chain, _sendingInfo$hops, _receivingInfo$hops, _sendingInfo$origin, _receivingInfo$destin;
     var _yield$prepareTransfo, options, dex, api, origin, exchange, currencyTo, destination, amount, sender, evmSenderAddress, senderAddress, sendingInfo, _yield$getSwapFee, swapChain, amountOut, receivingInfo, originChain, destChain, exchangeHopEntry, hops, finalOrigin, finalDestination, _t, _t2, _t3, _t4, _t5;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.p = _context2.n) {
         case 0:
           validateTransferOptions(initialOptions);
-          _context.n = 1;
+          _context2.n = 1;
           return prepareTransformedOptions(initialOptions, true);
         case 1:
-          _yield$prepareTransfo = _context.v;
+          _yield$prepareTransfo = _context2.v;
           options = _yield$prepareTransfo.options;
           dex = _yield$prepareTransfo.dex;
           if (!canUseExecuteTransfer(dex, options)) {
-            _context.n = 5;
+            _context2.n = 5;
             break;
           }
-          _context.p = 2;
-          _context.n = 3;
+          _context2.p = 2;
+          _context2.n = 3;
           return getExecuteSwapInfo(dex, options);
         case 3:
-          return _context.a(2, _context.v);
+          return _context2.a(2, _context2.v);
         case 4:
-          _context.p = 4;
-          _t = _context.v;
+          _context2.p = 4;
+          _t = _context2.v;
           if (isFilteredError(_t)) {
-            _context.n = 5;
+            _context2.n = 5;
             break;
           }
           throw _t;
@@ -11783,10 +11867,10 @@ var getSwapInfo = /*#__PURE__*/function () {
           assertCurrencyCore(currencyTo);
           senderAddress = evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender;
           if (!(origin && origin.chain !== exchange.chain)) {
-            _context.n = 7;
+            _context2.n = 7;
             break;
           }
-          _context.n = 6;
+          _context2.n = 6;
           return createToExchangeBuilder({
             origin: origin,
             exchange: exchange,
@@ -11796,24 +11880,24 @@ var getSwapInfo = /*#__PURE__*/function () {
             api: api
           }).getTransferInfo();
         case 6:
-          _t2 = _context.v;
-          _context.n = 8;
+          _t2 = _context2.v;
+          _context2.n = 8;
           break;
         case 7:
           _t2 = undefined;
         case 8:
           sendingInfo = _t2;
-          _context.n = 9;
+          _context2.n = 9;
           return getSwapFee(dex, options);
         case 9:
-          _yield$getSwapFee = _context.v;
+          _yield$getSwapFee = _context2.v;
           swapChain = _yield$getSwapFee.result;
           amountOut = _yield$getSwapFee.amountOut;
           if (!(destination && destination.chain !== exchange.chain)) {
-            _context.n = 11;
+            _context2.n = 11;
             break;
           }
-          _context.n = 10;
+          _context2.n = 10;
           return createFromExchangeBuilder({
             exchange: exchange,
             destination: destination,
@@ -11822,8 +11906,8 @@ var getSwapInfo = /*#__PURE__*/function () {
             api: api
           }).getTransferInfo();
         case 10:
-          _t3 = _context.v;
-          _context.n = 12;
+          _t3 = _context2.v;
+          _context2.n = 12;
           break;
         case 11:
           _t3 = undefined;
@@ -11844,34 +11928,34 @@ var getSwapInfo = /*#__PURE__*/function () {
           } : undefined;
           hops = [].concat(_toConsumableArray((_sendingInfo$hops = sendingInfo === null || sendingInfo === void 0 ? void 0 : sendingInfo.hops) !== null && _sendingInfo$hops !== void 0 ? _sendingInfo$hops : []), _toConsumableArray(exchangeHopEntry ? [exchangeHopEntry] : []), _toConsumableArray((_receivingInfo$hops = receivingInfo === null || receivingInfo === void 0 ? void 0 : receivingInfo.hops) !== null && _receivingInfo$hops !== void 0 ? _receivingInfo$hops : []));
           if (!((_sendingInfo$origin = sendingInfo === null || sendingInfo === void 0 ? void 0 : sendingInfo.origin) !== null && _sendingInfo$origin !== void 0)) {
-            _context.n = 13;
+            _context2.n = 13;
             break;
           }
           _t4 = _sendingInfo$origin;
-          _context.n = 15;
+          _context2.n = 15;
           break;
         case 13:
-          _context.n = 14;
+          _context2.n = 14;
           return buildExchangeOriginInfo(exchange, senderAddress, amount, swapChain);
         case 14:
-          _t4 = _context.v;
+          _t4 = _context2.v;
         case 15:
           finalOrigin = _t4;
           if (!((_receivingInfo$destin = receivingInfo === null || receivingInfo === void 0 ? void 0 : receivingInfo.destination) !== null && _receivingInfo$destin !== void 0)) {
-            _context.n = 16;
+            _context2.n = 16;
             break;
           }
           _t5 = _receivingInfo$destin;
-          _context.n = 18;
+          _context2.n = 18;
           break;
         case 16:
-          _context.n = 17;
+          _context2.n = 17;
           return buildExchangeDestInfo(exchange, sender, amountOut, currencyTo);
         case 17:
-          _t5 = _context.v;
+          _t5 = _context2.v;
         case 18:
           finalDestination = _t5;
-          return _context.a(2, {
+          return _context2.a(2, {
             chain: {
               origin: originChain,
               destination: destChain,
@@ -11886,10 +11970,10 @@ var getSwapInfo = /*#__PURE__*/function () {
             })
           });
       }
-    }, _callee, null, [[2, 4]]);
+    }, _callee2, null, [[2, 4]]);
   }));
-  return function getSwapInfo(_x) {
-    return _ref.apply(this, arguments);
+  return function getSwapInfo(_x5) {
+    return _ref2.apply(this, arguments);
   };
 }();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/swap",
-  "version": "13.7.2",
+  "version": "13.9.0",
   "description": "Tool for XCM cross-chain asset exchanging across Polkadot and Kusama ecosystems",
   "type": "module",
   "exports": {
@@ -46,29 +46,27 @@
     "ethers-v6": "npm:ethers@^6.16.0",
     "jsbi": "^4.3.2",
     "lodash-es": "^4.18.1",
-    "polkadot-api": "^2.1.4",
+    "polkadot-api": "^2.1.6",
     "postcss": "^8.5.15",
     "react": "^19.2.6",
     "rxjs": "^7.8.2",
-    "@paraspell/sdk": "13.7.2",
-    "@paraspell/sdk-pjs": "13.7.2",
-    "@paraspell/sdk-core": "13.7.2"
+    "@paraspell/sdk": "13.9.0",
+    "@paraspell/sdk-common": "13.9.0",
+    "@paraspell/sdk-core": "13.9.0",
+    "@paraspell/sdk-pjs": "13.9.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.7",
     "@babel/plugin-syntax-import-attributes": "^7.29.7",
     "@babel/preset-env": "^7.29.7",
     "@codecov/rollup-plugin": "^2.0.1",
     "@rollup/plugin-babel": "^7.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/lodash-es": "^4.17.12",
     "@vitest/coverage-v8": "^4.1.7",
     "dotenv": "^17.4.2",
     "rollup": "^4.60.4",
     "rollup-plugin-dts": "^6.4.1",
-    "ts-node": "^10.9.2",
-    "tslib": "^2.8.1"
+    "tsx": "^4.22.4"
   },
   "scripts": {
     "compile": "tsc --noEmit",
@@ -81,6 +79,6 @@
     "test:cov": "vitest run --coverage",
     "test:watch": "vitest",
     "runAll": "pnpm compile && pnpm format:write && pnpm lint && pnpm test",
-    "updateAssets": "node --loader ts-node/esm --experimental-specifier-resolution=node ./scripts/updateAssets.ts"
+    "updateAssets": "tsx ./scripts/updateAssets.ts"
   }
 }