@paraspell/swap 14.2.1 → 14.3.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { createChainClient as createChainClient$1, registerSwapExtension } from '@paraspell/sdk';
-import { UnsupportedOperationError, assertCurrencyCore, dryRun, getDryRunError, DryRunFailedError, isConfig, getNativeAssets, RoutingResolutionError, findAssetInfoById, getOtherAssets, getChainProviders, parseUnits, getNativeAssetSymbol, padValueBy, formatUnits as formatUnits$1, AmountTooLowError, getBalance, localizeLocation, getAssets, Parents, isSymbolMatch, getParaId, UnableToComputeError, findNativeAssetInfoOrThrow, InvalidCurrencyError, findAssetInfoOrThrow, findAssetInfoByLoc, isSymbolSpecifier, findBestMatches, findAssetInfoBySymbol, deepEqual, normalizeExchange, EXCHANGE_CHAINS, reverseTransformLocation, getAssetsImpl, isAssetEqual, isExternalChain, isSystemAsset, ScenarioNotSupportedError, applyDecimalAbstraction, findAssetInfo, getRelayChainOf, Builder, isChainEvm, convertBuilderConfig, handleSwapExecuteTransfer, getXcmFee, getOriginXcmFee as getOriginXcmFee$1, InvalidAddressError, MissingParameterError, BatchMode, createChainClient as createChainClient$2, getExistentialDepositOrThrow, buildHopInfo, getRelayChainSymbol, aggregateHopFees, buildDestInfo, buildOriginInfo } from '@paraspell/sdk-core';
+import { createChainClient as createChainClient$1, getPaymentInfo, registerSwapExtension } from '@paraspell/sdk';
+import { UnsupportedOperationError, assertCurrencyCore, dryRun, getDryRunError, DryRunFailedError, isConfig, getNativeAssets, RoutingResolutionError, findAssetInfoById, getOtherAssets, getChainProviders, parseUnits, getNativeAssetSymbol, padValueBy, formatUnits as formatUnits$1, AmountTooLowError, getBalance, localizeLocation, getAssets, Parents, isSymbolMatch, getParaId, UnableToComputeError, findNativeAssetInfoOrThrow, InvalidCurrencyError, findAssetInfoOrThrow, findAssetInfoByLoc, isSymbolSpecifier, findBestMatches, findAssetInfoBySymbol, getSupportedAssetsImpl, isAssetEqual, findAssetInfoOnDestImpl, normalizeExchange, EXCHANGE_CHAINS, deepEqual, reverseTransformLocation, getAssetsImpl, ScenarioNotSupportedError, applyDecimalAbstraction, findAssetInfo, Builder, isChainEvm, convertBuilderConfig, handleSwapExecuteTransfer, getXcmFee, getOriginXcmFee as getOriginXcmFee$1, InvalidAddressError, MissingParameterError, BatchMode, createChainClient as createChainClient$2, getExistentialDepositOrThrow, buildHopInfo, getRelayChainSymbol, aggregateHopFees, buildDestInfo, buildOriginInfo } from '@paraspell/sdk-core';
 import { toHex } from 'polkadot-api/utils';
 import 'polkadot-api';
 import { Wallet } from '@acala-network/sdk';
@@ -328,6 +328,23 @@ function _regeneratorDefine(e, r, n, t) {
     }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
   }, _regeneratorDefine(e, r, n, t);
 }
+function _regeneratorValues(e) {
+  if (null != e) {
+    var t = e["function" == typeof Symbol && Symbol.iterator || "@@iterator"],
+      r = 0;
+    if (t) return t.call(e);
+    if ("function" == typeof e.next) return e;
+    if (!isNaN(e.length)) return {
+      next: function () {
+        return e && r >= e.length && (e = void 0), {
+          value: e && e[r++],
+          done: !e
+        };
+      }
+    };
+  }
+  throw new TypeError(typeof e + " is not iterable");
+}
 function _setPrototypeOf(t, e) {
   return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
     return t.__proto__ = e, t;
@@ -451,7 +468,7 @@ var calculateTxFeePjs = /*#__PURE__*/function () {
 }();
 
 var isPapiTransaction = function isPapiTransaction(tx) {
-  return _typeof(tx) === 'object' && tx !== null && 'getEncodedData' in tx && typeof tx.getEncodedData === 'function' && 'signSubmitAndWatch' in tx && typeof tx.signSubmitAndWatch === 'function';
+  return _typeof(tx) === 'object' && tx !== null && 'getEncodedData' in tx && typeof tx.getEncodedData === 'function' && 'createSubmitAndWatch' in tx && typeof tx.createSubmitAndWatch === 'function';
 };
 
 var isPjsExtrinsic = function isPjsExtrinsic(tx) {
@@ -1763,22 +1780,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2000
-					},
-					{
-						GeneralKey: {
-							length: 21,
-							data: "0x025a4d6acdc4e3e5ab15717f407afe957f7a2425780000000000000000000000"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -1804,32 +1805,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X1: [
-					{
-						Parachain: 2086
-					}
-				]
-			}
-		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2034
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0x6b9ac524ec8f08c49ec80176b138d16eb461c3d8"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -1855,22 +1830,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X3: [
-					{
-						Parachain: 2094
-					},
-					{
-						PalletInstance: 53
-					},
-					{
-						GeneralIndex: 2
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -1955,19 +1914,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2004
-					},
-					{
-						PalletInstance: 10
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2052,22 +1998,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2030
-					},
-					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2084,22 +2014,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2000
-					},
-					{
-						GeneralKey: {
-							length: 21,
-							data: "0x02f4c723e61709d90f89939c1852f516e373d418a80000000000000000000000"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 2,
 			interior: {
@@ -2214,19 +2128,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2046
-					},
-					{
-						PalletInstance: 5
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2243,26 +2144,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 2,
-			interior: {
-				X2: [
-					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0xcccccccccc33d538dbc2ee4feab0a7a1ff4e8a94"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2365,35 +2246,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2000
-					},
-					{
-						GeneralKey: {
-							length: 21,
-							data: "0x0254a37a01cd75b616d63e0ab665bffdb0143c52ae0000000000000000000000"
-						}
-					}
-				]
-			}
-		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 3417
-					},
-					{
-						GeneralIndex: 0
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2497,52 +2349,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2034
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0x6a21891db0940491603f3cca0a9f4dba4c6e810c"
-						}
-					}
-				]
-			}
-		},
-		{
-			parents: 1,
-			interior: {
-				X1: [
-					{
-						Parachain: 3344
-					}
-				]
-			}
-		},
-		{
-			parents: 2,
-			interior: {
-				X2: [
-					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0x1abaea1f7c830bd89acc67ec4af516284b1bc33c"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2624,22 +2430,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2000
-					},
-					{
-						GeneralKey: {
-							length: 21,
-							data: "0x0207df96d1341a7d16ba1ad431e2c847d978bc2bce0000000000000000000000"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 2,
 			interior: {
@@ -2715,26 +2505,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 2,
-			interior: {
-				X2: [
-					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2793,56 +2563,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 2,
-			interior: {
-				X2: [
-					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0xa3931d71877c0e7a3148cb7eb4463524fec27fbd"
-						}
-					}
-				]
-			}
-		},
-		{
-			parents: 1,
-			interior: {
-				X1: [
-					{
-						Parachain: 2035
-					}
-				]
-			}
-		},
-		{
-			parents: 2,
-			interior: {
-				X2: [
-					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0xd166337499e176bbc38a1fbd113ab144e5bd2df7"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 2,
 			interior: {
@@ -2879,22 +2599,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2000
-					},
-					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0003000000000000000000000000000000000000000000000000000000000000"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2961,22 +2665,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2092
-					},
-					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -2990,22 +2678,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2000
-					},
-					{
-						GeneralKey: {
-							length: 21,
-							data: "0x02c80084af223c8b598536178d9361dc55bfda68180000000000000000000000"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -3048,34 +2720,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X5: [
-					{
-						Parachain: 2094
-					},
-					{
-						PalletInstance: 53
-					},
-					{
-						GeneralIndex: 2
-					},
-					{
-						GeneralKey: {
-							length: 4,
-							data: "0x4555524300000000000000000000000000000000000000000000000000000000"
-						}
-					},
-					{
-						GeneralKey: {
-							length: 32,
-							data: "0xcf4f5a26e2090bb3adcf02c7a9d73dbfe6659cc690461475b86437fa49c71136"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -3117,42 +2761,6 @@ var Hydration = {
 				]
 			}
 		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2004
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0x9c4c6eaad9b926ba09f702f4ad880ef71998ef18"
-						}
-					}
-				]
-			}
-		},
-		{
-			parents: 2,
-			interior: {
-				X2: [
-					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0x8236a87084f8b84306f72007f36f2618a5634494"
-						}
-					}
-				]
-			}
-		},
 		{
 			parents: 1,
 			interior: {
@@ -3219,26 +2827,6 @@ var Hydration = {
 					}
 				]
 			}
-		},
-		{
-			parents: 2,
-			interior: {
-				X2: [
-					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
-					},
-					{
-						AccountKey20: {
-							network: null,
-							key: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-						}
-					}
-				]
-			}
 		}
 	],
 	pairs: [
@@ -6649,15 +6237,49 @@ var Acala = {
 			{
 				parents: 1,
 				interior: {
-					X2: [
+					X2: [
+						{
+							Parachain: 2032
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0002000000000000000000000000000000000000000000000000000000000000"
+							}
+						}
+					]
+				}
+			}
+		],
+		[
+			{
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 22222012
+						}
+					]
+				}
+			},
+			{
+				parents: 1,
+				interior: {
+					X3: [
 						{
-							Parachain: 2032
+							Parachain: 1000
 						},
 						{
-							GeneralKey: {
-								length: 2,
-								data: "0x0002000000000000000000000000000000000000000000000000000000000000"
-							}
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 1984
 						}
 					]
 				}
@@ -6691,7 +6313,7 @@ var Acala = {
 							PalletInstance: 50
 						},
 						{
-							GeneralIndex: 1984
+							GeneralIndex: 50000069
 						}
 					]
 				}
@@ -6717,15 +6339,15 @@ var Acala = {
 			{
 				parents: 1,
 				interior: {
-					X3: [
-						{
-							Parachain: 1000
-						},
+					X2: [
 						{
-							PalletInstance: 50
+							Parachain: 2032
 						},
 						{
-							GeneralIndex: 50000069
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -7173,9 +6795,15 @@ var BifrostKusama = {
 		{
 			parents: 1,
 			interior: {
-				X1: [
+				X2: [
 					{
 						Parachain: 2001
+					},
+					{
+						GeneralKey: {
+							length: 2,
+							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+						}
 					}
 				]
 			}
@@ -7333,9 +6961,15 @@ var BifrostKusama = {
 			{
 				parents: 1,
 				interior: {
-					X1: [
+					X2: [
 						{
 							Parachain: 2001
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -7351,9 +6985,15 @@ var BifrostKusama = {
 			{
 				parents: 1,
 				interior: {
-					X1: [
+					X2: [
 						{
 							Parachain: 2001
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -7379,9 +7019,15 @@ var BifrostKusama = {
 			{
 				parents: 1,
 				interior: {
-					X1: [
+					X2: [
 						{
 							Parachain: 2001
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -7602,9 +7248,15 @@ var BifrostKusama = {
 			{
 				parents: 1,
 				interior: {
-					X1: [
+					X2: [
 						{
 							Parachain: 2001
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -7630,9 +7282,15 @@ var BifrostKusama = {
 			{
 				parents: 1,
 				interior: {
-					X1: [
+					X2: [
 						{
 							Parachain: 2001
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -7686,9 +7344,15 @@ var BifrostPolkadot = {
 		{
 			parents: 1,
 			interior: {
-				X1: [
+				X2: [
 					{
 						Parachain: 2030
+					},
+					{
+						GeneralKey: {
+							length: 2,
+							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+						}
 					}
 				]
 			}
@@ -7798,9 +7462,15 @@ var BifrostPolkadot = {
 			{
 				parents: 1,
 				interior: {
-					X1: [
+					X2: [
 						{
 							Parachain: 2030
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -7857,9 +7527,15 @@ var BifrostPolkadot = {
 			{
 				parents: 1,
 				interior: {
-					X1: [
+					X2: [
 						{
 							Parachain: 2030
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -7919,9 +7595,15 @@ var BifrostPolkadot = {
 			{
 				parents: 1,
 				interior: {
-					X1: [
+					X2: [
 						{
 							Parachain: 2030
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
 						}
 					]
 				}
@@ -9362,7 +9044,7 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
 
 var calculateFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, tradeRouter, txBuilderFactory, currencyFromInfo, currencyToInfo, currencyFromDecimals, chain, toDestTransactionFee) {
-    var amount, slippagePct, feeCalcAddress, sender, trade, nativeAsset, substrateTx, tx, _yield$tx$getPaymentI, swapFee, feeNative, currencyFromPriceInfo, currencyFromPrice, feeInCurrencyFrom, finalFee;
+    var amount, slippagePct, feeCalcAddress, sender, trade, nativeAsset, substrateTx, tx, _yield$getPaymentInfo, swapFee, feeNative, currencyFromPriceInfo, currencyFromPrice, feeInCurrencyFrom, finalFee;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -9378,10 +9060,10 @@ var calculateFee = /*#__PURE__*/function () {
           substrateTx = _context.v;
           tx = substrateTx.get();
           _context.n = 3;
-          return tx.getPaymentInfo(feeCalcAddress);
+          return getPaymentInfo(tx, feeCalcAddress);
         case 3:
-          _yield$tx$getPaymentI = _context.v;
-          swapFee = _yield$tx$getPaymentI.partial_fee;
+          _yield$getPaymentInfo = _context.v;
+          swapFee = _yield$getPaymentInfo.partial_fee;
           feeNative = swapFee + toDestTransactionFee + toDestTransactionFee;
           Logger.log('XCM to exch. fee:', toDestTransactionFee, nativeAsset.symbol);
           Logger.log('XCM to dest. fee:', toDestTransactionFee, nativeAsset.symbol);
@@ -9453,78 +9135,77 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "swapCurrency",
     value: function () {
       var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, toDestTransactionFee) {
-        var apiPapi, origin, assetFrom, assetTo, sender, slippagePct, amount, _yield$createSdkConte, tradeRouter, assetClient, txBuilderFactory, currencyFromInfo, currencyToInfo, tradeFee, amountWithoutFee, amountNormalized, trade, substrateTx, tx, amountOut, nativeCurrencyInfo, _findNativeAssetInfoO, nativeCurrencyDecimals, priceInfo, currencyToPrice, feeInCurrencyTo, amountOutModified;
+        var apiPapi, origin, assetFrom, assetTo, sender, slippagePct, amount, sdk, tradeRouter, assetClient, txBuilderFactory, currencyFromInfo, currencyToInfo, tradeFee, amountWithoutFee, amountNormalized, trade, substrateTx, tx, amountOut, nativeCurrencyInfo, _findNativeAssetInfoO, nativeCurrencyDecimals, priceInfo, currencyToPrice, feeInCurrencyTo, amountOutModified;
         return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
+          while (1) switch (_context.p = _context.n) {
             case 0:
               apiPapi = options.apiPapi, origin = options.origin, assetFrom = options.assetFrom, assetTo = options.assetTo, sender = options.sender, slippagePct = options.slippagePct, amount = options.amount;
               _context.n = 1;
               return createSdkContext(apiPapi);
             case 1:
-              _yield$createSdkConte = _context.v;
-              tradeRouter = _yield$createSdkConte.api.router;
-              assetClient = _yield$createSdkConte.client.asset;
-              txBuilderFactory = _yield$createSdkConte.tx;
-              _context.n = 2;
+              sdk = _context.v;
+              tradeRouter = sdk.api.router, assetClient = sdk.client.asset, txBuilderFactory = sdk.tx;
+              _context.p = 2;
+              _context.n = 3;
               return getAssetInfo(assetClient, assetFrom);
-            case 2:
+            case 3:
               currencyFromInfo = _context.v;
-              _context.n = 3;
+              _context.n = 4;
               return getAssetInfo(assetClient, assetTo);
-            case 3:
+            case 4:
               currencyToInfo = _context.v;
               if (!(currencyFromInfo === undefined)) {
-                _context.n = 4;
+                _context.n = 5;
                 break;
               }
               throw new InvalidCurrencyError("Currency from doesn't exist");
-            case 4:
+            case 5:
               if (!(currencyToInfo === undefined)) {
-                _context.n = 5;
+                _context.n = 6;
                 break;
               }
               throw new InvalidCurrencyError("Currency to doesn't exist");
-            case 5:
-              _context.n = 6;
-              return calculateFee(options, tradeRouter, txBuilderFactory, currencyFromInfo, currencyToInfo, currencyFromInfo.decimals, this.chain, toDestTransactionFee);
             case 6:
+              _context.n = 7;
+              return calculateFee(options, tradeRouter, txBuilderFactory, currencyFromInfo, currencyToInfo, currencyFromInfo.decimals, this.chain, toDestTransactionFee);
+            case 7:
               tradeFee = _context.v;
               amountWithoutFee = origin ? amount - tradeFee : amount;
               if (!(amountWithoutFee <= 0n)) {
-                _context.n = 7;
+                _context.n = 8;
                 break;
               }
               throw new AmountTooLowError();
-            case 7:
+            case 8:
               amountNormalized = formatUnits$1(amountWithoutFee, currencyFromInfo.decimals);
               Logger.log('Original amount', amount);
               Logger.log('Amount modified', amountWithoutFee);
-              _context.n = 8;
+              _context.n = 9;
               return tradeRouter.getBestSell(currencyFromInfo.id, currencyToInfo.id, amountNormalized);
-            case 8:
+            case 9:
               trade = _context.v;
-              _context.n = 9;
+              _context.n = 10;
               return txBuilderFactory.trade(trade).withSlippage(Number(slippagePct)).withBeneficiary(sender).build();
-            case 9:
+            case 10:
               substrateTx = _context.v;
               tx = substrateTx.get();
               amountOut = trade.amountOut;
-              _context.n = 10;
+              _context.n = 11;
               return getAssetInfo(assetClient, {
                 symbol: getNativeAssetSymbol(this.chain)
               });
-            case 10:
+            case 11:
               nativeCurrencyInfo = _context.v;
               if (!(nativeCurrencyInfo === undefined)) {
-                _context.n = 11;
+                _context.n = 12;
                 break;
               }
               throw new InvalidCurrencyError('Native currency not found');
-            case 11:
+            case 12:
               _findNativeAssetInfoO = findNativeAssetInfoOrThrow(this.chain), nativeCurrencyDecimals = _findNativeAssetInfoO.decimals;
-              _context.n = 12;
+              _context.n = 13;
               return tradeRouter.getSpotPrice(currencyToInfo.id, nativeCurrencyInfo.id);
-            case 12:
+            case 13:
               priceInfo = _context.v;
               if (currencyToInfo.id === nativeCurrencyInfo.id) {
                 priceInfo = {
@@ -9533,29 +9214,35 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
                 };
               }
               if (!(priceInfo === undefined)) {
-                _context.n = 13;
+                _context.n = 14;
                 break;
               }
               throw new UnableToComputeError('Price not found');
-            case 13:
+            case 14:
               currencyToPrice = priceInfo.amount;
               feeInCurrencyTo = toDestTransactionFee * pow10n(priceInfo.decimals + currencyToInfo.decimals) * BigInt(FEE_BUFFER_PCT) / (currencyToPrice * pow10n(nativeCurrencyDecimals) * 100n);
               Logger.log('Amount out fee', feeInCurrencyTo, nativeCurrencyInfo.symbol);
               amountOutModified = amountOut - feeInCurrencyTo;
               if (!(amountOutModified <= 0n)) {
-                _context.n = 14;
+                _context.n = 15;
                 break;
               }
               throw new AmountTooLowError();
-            case 14:
+            case 15:
               Logger.log('Amount out original', amountOut);
               Logger.log('Amount out modified', amountOutModified);
               return _context.a(2, {
                 tx: tx,
                 amountOut: amountOutModified
               });
+            case 16:
+              _context.p = 16;
+              sdk.destroy();
+              return _context.f(16);
+            case 17:
+              return _context.a(2);
           }
-        }, _callee, this);
+        }, _callee, this, [[2,, 16, 17]]);
       }));
       function swapCurrency(_x, _x2) {
         return _swapCurrency.apply(this, arguments);
@@ -9566,49 +9253,55 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "getAmountOut",
     value: function () {
       var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-        var apiPapi, assetFrom, assetTo, amount, origin, _options$slippagePct, slippagePct, _yield$createSdkConte2, tradeRouter, assetClient, currencyFromInfo, currencyToInfo, pctDestFee, amountWithoutFee, amountNormalized, trade, amountOut, slippageMultiplier;
+        var apiPapi, assetFrom, assetTo, amount, origin, _options$slippagePct, slippagePct, sdk, tradeRouter, assetClient, currencyFromInfo, currencyToInfo, pctDestFee, amountWithoutFee, amountNormalized, trade, amountOut, slippageMultiplier;
         return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
+          while (1) switch (_context2.p = _context2.n) {
             case 0:
               apiPapi = options.apiPapi, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin, _options$slippagePct = options.slippagePct, slippagePct = _options$slippagePct === void 0 ? '0' : _options$slippagePct;
               _context2.n = 1;
               return createSdkContext(apiPapi);
             case 1:
-              _yield$createSdkConte2 = _context2.v;
-              tradeRouter = _yield$createSdkConte2.api.router;
-              assetClient = _yield$createSdkConte2.client.asset;
-              _context2.n = 2;
+              sdk = _context2.v;
+              tradeRouter = sdk.api.router, assetClient = sdk.client.asset;
+              _context2.p = 2;
+              _context2.n = 3;
               return getAssetInfo(assetClient, assetFrom);
-            case 2:
+            case 3:
               currencyFromInfo = _context2.v;
-              _context2.n = 3;
+              _context2.n = 4;
               return getAssetInfo(assetClient, assetTo);
-            case 3:
+            case 4:
               currencyToInfo = _context2.v;
               if (!(currencyFromInfo === undefined)) {
-                _context2.n = 4;
+                _context2.n = 5;
                 break;
               }
               throw new InvalidCurrencyError("Currency from doesn't exist");
-            case 4:
+            case 5:
               if (!(currencyToInfo === undefined)) {
-                _context2.n = 5;
+                _context2.n = 6;
                 break;
               }
               throw new InvalidCurrencyError("Currency to doesn't exist");
-            case 5:
+            case 6:
               pctDestFee = origin ? DEST_FEE_BUFFER_PCT : 0;
               amountWithoutFee = padValueBy(amount, pctDestFee);
               amountNormalized = formatUnits$1(amountWithoutFee, currencyFromInfo.decimals);
-              _context2.n = 6;
+              _context2.n = 7;
               return tradeRouter.getBestSell(currencyFromInfo.id, currencyToInfo.id, amountNormalized);
-            case 6:
+            case 7:
               trade = _context2.v;
               amountOut = trade.amountOut;
               slippageMultiplier = Number(slippagePct);
               return _context2.a(2, padValueBy(amountOut, -slippageMultiplier));
+            case 8:
+              _context2.p = 8;
+              sdk.destroy();
+              return _context2.f(8);
+            case 9:
+              return _context2.a(2);
           }
-        }, _callee2);
+        }, _callee2, null, [[2,, 8, 9]]);
       }));
       function getAmountOut(_x3) {
         return _getAmountOut.apply(this, arguments);
@@ -9619,7 +9312,7 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "getDexConfig",
     value: function () {
       var _getDexConfig = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(api) {
-        var sdk, assets, sdkAssets, transformedAssets;
+        var sdk, _yield$Promise$all, _yield$Promise$all2, assets, pools, sdkAssets, poolAssetIds, transformedAssets;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.p = _context3.n) {
             case 0:
@@ -9629,14 +9322,27 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
               sdk = _context3.v;
               _context3.p = 2;
               _context3.n = 3;
-              return sdk.client.asset.getSupported();
+              return Promise.all([sdk.client.asset.getSupported(), sdk.api.router.getPools()]);
             case 3:
-              assets = _context3.v;
+              _yield$Promise$all = _context3.v;
+              _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+              assets = _yield$Promise$all2[0];
+              pools = _yield$Promise$all2[1];
               sdkAssets = getAssets(this.chain);
-              transformedAssets = assets.map(function (_ref) {
+              poolAssetIds = new Set(pools.flatMap(function (_ref) {
+                var tokens = _ref.tokens;
+                return tokens.map(function (_ref2) {
+                  var id = _ref2.id;
+                  return id.toString();
+                });
+              }));
+              transformedAssets = assets.filter(function (_ref3) {
+                var id = _ref3.id;
+                return poolAssetIds.has(id.toString());
+              }).map(function (_ref4) {
                 var _sdkAssets$find;
-                var symbol = _ref.symbol,
-                  id = _ref.id;
+                var symbol = _ref4.symbol,
+                  id = _ref4.id;
                 var asset = (_sdkAssets$find = sdkAssets.find(function (a) {
                   return !a.isNative && a.assetId === id.toString();
                 })) !== null && _sdkAssets$find !== void 0 ? _sdkAssets$find : sdkAssets.find(function (a) {
@@ -9740,11 +9446,19 @@ var getExchangeAsset = function getExchangeAsset(exchange, currency) {
   return null;
 };
 
-var getExchangeAssetByOriginAsset = function getExchangeAssetByOriginAsset(exchange, originAsset) {
-  var exchangeAssets = getExchangeAssets(exchange);
-  return exchangeAssets.find(function (_ref) {
-    var location = _ref.location;
-    return deepEqual(location, originAsset.location);
+var resolveOriginAssetOnExchange = function resolveOriginAssetOnExchange(origin, exchange, transferableAssets, originAsset, ctx) {
+  if (!transferableAssets.some(function (asset) {
+    return isAssetEqual(asset, originAsset);
+  })) return null;
+  return findAssetInfoOnDestImpl(origin, exchange, {
+    location: originAsset.location
+  }, originAsset, ctx);
+};
+var getExchangeAssetByOriginAsset = function getExchangeAssetByOriginAsset(origin, exchange, originAsset, ctx) {
+  var assetOnExchange = resolveOriginAssetOnExchange(origin, exchange, getSupportedAssetsImpl(origin, exchange, ctx), originAsset, ctx);
+  if (!assetOnExchange) return undefined;
+  return getExchangeAssets(exchange).find(function (asset) {
+    return isAssetEqual(asset, assetOnExchange);
   });
 };
 
@@ -9794,16 +9508,34 @@ var getSupportedAssetsFromImpl = function getSupportedAssetsFromImpl(from, excha
     if (!from) return [];
     return getAssetsImpl(from, ctx);
   }
-  var exchangeAssets = Array.isArray(exchange) ? exchange.flatMap(function (exchange) {
-    return getExchangeAssets(exchange);
-  }) : getExchangeAssets(exchange);
-  if (!from || !Array.isArray(exchange) && from === createExchangeInstance(exchange).chain) {
-    return exchangeAssets;
+  var exchanges = Array.isArray(exchange) ? exchange : [exchange];
+  if (!from || !Array.isArray(exchange) && from === exchange) {
+    return exchanges.flatMap(function (ex) {
+      return getExchangeAssets(ex);
+    });
   }
+  var entries = exchanges.map(function (ex) {
+    return {
+      exchange: ex,
+      exchangeAssets: getExchangeAssets(ex),
+      transferableAssets: from === ex ? undefined : getSupportedAssetsImpl(from, ex, ctx)
+    };
+  });
   var fromAssets = getAssetsImpl(from, ctx);
   return fromAssets.filter(function (fromAsset) {
-    return exchangeAssets.some(function (exchangeAsset) {
-      return isAssetEqual(fromAsset, exchangeAsset);
+    return entries.some(function (_ref) {
+      var ex = _ref.exchange,
+        exchangeAssets = _ref.exchangeAssets,
+        transferableAssets = _ref.transferableAssets;
+      if (transferableAssets === undefined) {
+        return exchangeAssets.some(function (exchangeAsset) {
+          return isAssetEqual(exchangeAsset, fromAsset);
+        });
+      }
+      var assetOnExchange = resolveOriginAssetOnExchange(from, ex, transferableAssets, fromAsset, ctx);
+      return assetOnExchange !== null && exchangeAssets.some(function (exchangeAsset) {
+        return isAssetEqual(exchangeAsset, assetOnExchange);
+      });
     });
   });
 };
@@ -9811,7 +9543,7 @@ var getSupportedAssetsFromImpl = function getSupportedAssetsFromImpl(from, excha
  * Retrieves the list of assets supported for transfer from the origin chain to the exchange chain.
  *
  * @param from - The origin chain.
- * @param exchange - The exchange chain or 'Auto select'.
+ * @param exchangeInput - The exchange chain or 'Auto select'.
  * @returns An array of supported assets.
  */
 var getSupportedAssetsFrom = function getSupportedAssetsFrom(from, exchangeInput) {
@@ -9820,50 +9552,22 @@ var getSupportedAssetsFrom = function getSupportedAssetsFrom(from, exchangeInput
 
 var getSupportedAssetsToImpl = function getSupportedAssetsToImpl(exchangeInput, to, ctx) {
   var exchange = normalizeExchange(exchangeInput);
-  if (exchange === undefined) {
-    var allExchangeAssets = EXCHANGE_CHAINS.map(function (exchangeChain) {
-      return getExchangeAssets(exchangeChain);
-    }).flat();
-    if (to) {
-      var toAssets = getAssetsImpl(to, ctx);
-      var filteredExchangeAssets = allExchangeAssets.filter(function (asset) {
-        return toAssets.some(function (toAsset) {
-          return isAssetEqual(asset, toAsset);
-        });
-      });
-      if (isExternalChain(to)) {
-        filteredExchangeAssets.push.apply(filteredExchangeAssets, _toConsumableArray(allExchangeAssets.filter(function (asset) {
-          return isSystemAsset(asset);
-        })));
-      }
-      return filteredExchangeAssets;
-    }
-    return allExchangeAssets;
-  }
-  var exchangeAssets = Array.isArray(exchange) ? exchange.flatMap(function (exchange) {
-    return getExchangeAssets(exchange);
-  }) : getExchangeAssets(exchange);
-  if (to) {
-    var _toAssets = getAssetsImpl(to, ctx);
-    var _filteredExchangeAssets = exchangeAssets.filter(function (asset) {
-      return _toAssets.some(function (toAsset) {
-        return isAssetEqual(asset, toAsset);
+  var exchanges = exchange === undefined ? EXCHANGE_CHAINS : Array.isArray(exchange) ? exchange : [exchange];
+  return exchanges.flatMap(function (ex) {
+    var exchangeAssets = getExchangeAssets(ex);
+    if (!to || to === ex) return exchangeAssets;
+    var transferableAssets = getSupportedAssetsImpl(ex, to, ctx);
+    return exchangeAssets.filter(function (asset) {
+      return transferableAssets.some(function (transferable) {
+        return isAssetEqual(transferable, asset);
       });
     });
-    if (isExternalChain(to)) {
-      _filteredExchangeAssets.push.apply(_filteredExchangeAssets, _toConsumableArray(exchangeAssets.filter(function (asset) {
-        return isSystemAsset(asset);
-      })));
-    }
-    return _filteredExchangeAssets;
-  }
-  return exchangeAssets;
+  });
 };
 /**
- * Retrieves the list of assets supported for transfer to the destination chain.
+ * Retrieves the list of assets supported for transfer from the exchange chain to the destination chain.
  *
- * @param origin - The origin chain.
- * @param exchange - The exchange chain or 'Auto select'.
+ * @param exchangeInput - The exchange chain or 'Auto select'.
  * @param to - The destination chain.
  * @returns An array of supported assets.
  */
@@ -9990,20 +9694,20 @@ var canBuildToExchangeTx = /*#__PURE__*/function () {
 
 var selectBestExchangeCommon = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, originApi, computeAmountOut) {
-    var api, from, exchange, to, currencyFrom, currencyTo, assetFromOrigin, filteredExchangeChains, bestExchange, maxAmountOut, errors, triedAnyExchange, _iterator, _step, exchangeChain, dex, originSpecified, destinationSpecified, assetFromExchange, assetTo, res, config, parsedAmount, amountOut, _t, _t2;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
+    var api, from, exchange, to, currencyFrom, currencyTo, assetFromOrigin, filteredExchangeChains, bestExchange, maxAmountOut, errors, triedAnyExchange, _iterator, _step, _loop, _ret, _t2;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.p = _context2.n) {
         case 0:
           api = options.api, from = options.from, exchange = options.exchange, to = options.to, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo;
           assetFromOrigin = from ? findAssetInfo(from, currencyFrom) : undefined;
           if (!(from && !assetFromOrigin)) {
-            _context.n = 1;
+            _context2.n = 1;
             break;
           }
           throw new RoutingResolutionError("Currency from ".concat(JSON.stringify(options.currencyFrom), " not found in ").concat(options.from, "."));
         case 1:
           if (!('id' in currencyTo)) {
-            _context.n = 2;
+            _context2.n = 2;
             break;
           }
           throw new UnsupportedOperationError('Cannot select currencyTo by ID when auto-selecting is enabled. Please specify currencyTo by symbol or location.');
@@ -10014,114 +9718,126 @@ var selectBestExchangeCommon = /*#__PURE__*/function () {
           errors = new Map();
           triedAnyExchange = false;
           _iterator = _createForOfIteratorHelper(filteredExchangeChains);
-          _context.p = 3;
+          _context2.p = 3;
+          _loop = /*#__PURE__*/_regenerator().m(function _loop() {
+            var exchangeChain, dex, originSpecified, destinationSpecified, assetFromExchange, assetTo, res, config, parsedAmount, amountOut, _t;
+            return _regenerator().w(function (_context) {
+              while (1) switch (_context.p = _context.n) {
+                case 0:
+                  exchangeChain = _step.value;
+                  dex = createExchangeInstance(exchangeChain);
+                  originSpecified = from && from !== dex.chain;
+                  destinationSpecified = to && to !== dex.chain;
+                  assetFromExchange = originSpecified && assetFromOrigin ? getExchangeAssetByOriginAsset(from, dex.chain, assetFromOrigin) : getExchangeAsset(dex.chain, currencyFrom);
+                  if (assetFromExchange) {
+                    _context.n = 1;
+                    break;
+                  }
+                  return _context.a(2, 0);
+                case 1:
+                  assetTo = getExchangeAsset(dex.chain, currencyTo, true);
+                  if (assetTo) {
+                    _context.n = 2;
+                    break;
+                  }
+                  return _context.a(2, 0);
+                case 2:
+                  if (!(destinationSpecified && !getSupportedAssetsImpl(dex.chain, to).some(function (asset) {
+                    return isAssetEqual(asset, assetTo);
+                  }))) {
+                    _context.n = 3;
+                    break;
+                  }
+                  return _context.a(2, 0);
+                case 3:
+                  triedAnyExchange = true;
+                  Logger.log("Checking ".concat(exchangeChain, "..."));
+                  _context.n = 4;
+                  return canBuildToExchangeTx(options, dex.chain, originApi, assetFromOrigin);
+                case 4:
+                  res = _context.v;
+                  if (res.success) {
+                    _context.n = 5;
+                    break;
+                  }
+                  errors.set(dex.chain, res.error);
+                  return _context.a(2, 0);
+                case 5:
+                  config = api.config;
+                  parsedAmount = applyDecimalAbstraction(options.amount, assetFromExchange === null || assetFromExchange === void 0 ? void 0 : assetFromExchange.decimals, !(isConfig(config) && config.abstractDecimals === false)).toString();
+                  _context.p = 6;
+                  _context.n = 7;
+                  return computeAmountOut(dex, assetFromExchange, assetTo, options, parsedAmount);
+                case 7:
+                  amountOut = _context.v;
+                  if (amountOut > maxAmountOut) {
+                    bestExchange = dex;
+                    maxAmountOut = amountOut;
+                  }
+                  _context.n = 9;
+                  break;
+                case 8:
+                  _context.p = 8;
+                  _t = _context.v;
+                  if (_t instanceof Error) {
+                    errors.set(dex.chain, _t);
+                  }
+                  return _context.a(2, 0);
+                case 9:
+                  return _context.a(2);
+              }
+            }, _loop, null, [[6, 8]]);
+          });
           _iterator.s();
         case 4:
           if ((_step = _iterator.n()).done) {
-            _context.n = 15;
-            break;
-          }
-          exchangeChain = _step.value;
-          dex = createExchangeInstance(exchangeChain);
-          originSpecified = from && from !== dex.chain;
-          destinationSpecified = to && to !== dex.chain;
-          assetFromExchange = originSpecified && assetFromOrigin ? getExchangeAssetByOriginAsset(dex.chain, assetFromOrigin) : getExchangeAsset(dex.chain, currencyFrom);
-          if (assetFromExchange) {
-            _context.n = 5;
+            _context2.n = 7;
             break;
           }
-          return _context.a(3, 14);
+          return _context2.d(_regeneratorValues(_loop()), 5);
         case 5:
-          assetTo = getExchangeAsset(dex.chain, currencyTo, true);
-          if (assetTo) {
-            _context.n = 6;
+          _ret = _context2.v;
+          if (!(_ret === 0)) {
+            _context2.n = 6;
             break;
           }
-          return _context.a(3, 14);
+          return _context2.a(3, 6);
         case 6:
-          if (!(destinationSpecified && !findAssetInfo(to, {
-            location: assetTo.location
-          }))) {
-            _context.n = 7;
-            break;
-          }
-          return _context.a(3, 14);
-        case 7:
-          if (!(from && getRelayChainOf(from) !== getRelayChainOf(dex.chain))) {
-            _context.n = 8;
-            break;
-          }
-          return _context.a(3, 14);
-        case 8:
-          triedAnyExchange = true;
-          Logger.log("Checking ".concat(exchangeChain, "..."));
-          _context.n = 9;
-          return canBuildToExchangeTx(options, dex.chain, originApi, assetFromOrigin);
-        case 9:
-          res = _context.v;
-          if (res.success) {
-            _context.n = 10;
-            break;
-          }
-          errors.set(dex.chain, res.error);
-          return _context.a(3, 14);
-        case 10:
-          config = api.config;
-          parsedAmount = applyDecimalAbstraction(options.amount, assetFromExchange === null || assetFromExchange === void 0 ? void 0 : assetFromExchange.decimals, !(isConfig(config) && config.abstractDecimals === false)).toString();
-          _context.p = 11;
-          _context.n = 12;
-          return computeAmountOut(dex, assetFromExchange, assetTo, options, parsedAmount);
-        case 12:
-          amountOut = _context.v;
-          if (amountOut > maxAmountOut) {
-            bestExchange = dex;
-            maxAmountOut = amountOut;
-          }
-          _context.n = 14;
-          break;
-        case 13:
-          _context.p = 13;
-          _t = _context.v;
-          if (_t instanceof Error) {
-            errors.set(dex.chain, _t);
-          }
-          return _context.a(3, 14);
-        case 14:
-          _context.n = 4;
+          _context2.n = 4;
           break;
-        case 15:
-          _context.n = 17;
+        case 7:
+          _context2.n = 9;
           break;
-        case 16:
-          _context.p = 16;
-          _t2 = _context.v;
+        case 8:
+          _context2.p = 8;
+          _t2 = _context2.v;
           _iterator.e(_t2);
-        case 17:
-          _context.p = 17;
+        case 9:
+          _context2.p = 9;
           _iterator.f();
-          return _context.f(17);
-        case 18:
+          return _context2.f(9);
+        case 10:
           if (!(bestExchange === undefined)) {
-            _context.n = 20;
+            _context2.n = 12;
             break;
           }
           if (!(!triedAnyExchange && errors.size === 0)) {
-            _context.n = 19;
+            _context2.n = 11;
             break;
           }
           throw new RoutingResolutionError("No exchange found that supports asset pair: " + "".concat(JSON.stringify(assetFromOrigin === null || assetFromOrigin === void 0 ? void 0 : assetFromOrigin.symbol), " -> ").concat(JSON.stringify('symbol' in currencyTo ? currencyTo.symbol : ''), "."));
-        case 19:
+        case 11:
           throw new RoutingResolutionError("Could not select best exchange automatically. Please specify one manually. Errors: \n\n".concat(Array.from(errors.entries()).map(function (_ref2) {
             var _ref3 = _slicedToArray(_ref2, 2),
               key = _ref3[0],
               value = _ref3[1];
             return "".concat(key, ": ").concat(value.message);
           }).join('\n\n')));
-        case 20:
+        case 12:
           Logger.log("Selected exchange: ".concat(bestExchange.chain));
-          return _context.a(2, bestExchange);
+          return _context2.a(2, bestExchange);
       }
-    }, _callee, null, [[11, 13], [3, 16, 17, 18]]);
+    }, _callee, null, [[3, 8, 9, 10]]);
   }));
   return function selectBestExchangeCommon(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
@@ -10269,7 +9985,7 @@ var resolveAssets = function resolveAssets(dex, _ref) {
   if (originSpecified && !assetFromOrigin) {
     throw new RoutingResolutionError("Currency from ".concat(JSON.stringify(currencyFrom), " not found in ").concat(from, "."));
   }
-  var assetFromExchange = originSpecified && assetFromOrigin ? getExchangeAssetByOriginAsset(dex.chain, assetFromOrigin) : getExchangeAsset(dex.chain, currencyFrom);
+  var assetFromExchange = originSpecified && assetFromOrigin ? getExchangeAssetByOriginAsset(from, dex.chain, assetFromOrigin) : getExchangeAsset(dex.chain, currencyFrom);
   if (!assetFromExchange) {
     if (!originSpecified && findAssetInfo(dex.chain, currencyFrom)) {
       throw new RoutingResolutionError("Currency from ".concat(JSON.stringify(currencyFrom), " exists in ").concat(dex.chain, " but is not swappable on ").concat(dex.chain, "."));
@@ -10280,8 +9996,8 @@ var resolveAssets = function resolveAssets(dex, _ref) {
   if (!assetTo) {
     throw new RoutingResolutionError("Currency to ".concat(JSON.stringify(currencyTo), " not found in ").concat(dex.chain, "."));
   }
-  if (destinationSpecified && !findAssetInfo(to, {
-    location: assetTo.location
+  if (destinationSpecified && !getSupportedAssetsImpl(dex.chain, to).some(function (asset) {
+    return isAssetEqual(asset, assetTo);
   })) {
     throw new RoutingResolutionError("Currency to ".concat(JSON.stringify(currencyTo), " not supported by ").concat(to, "."));
   }
@@ -10289,7 +10005,7 @@ var resolveAssets = function resolveAssets(dex, _ref) {
   if (feeAsset && originSpecified && !feeAssetFromOrigin) {
     throw new RoutingResolutionError("Fee asset ".concat(JSON.stringify(feeAsset), " not found in ").concat(from, "."));
   }
-  var feeAssetFromExchange = feeAsset ? feeAssetFromOrigin ? getExchangeAssetByOriginAsset(dex.chain, feeAssetFromOrigin) : (_getExchangeAsset = getExchangeAsset(dex.chain, feeAsset)) !== null && _getExchangeAsset !== void 0 ? _getExchangeAsset : undefined : undefined;
+  var feeAssetFromExchange = feeAsset ? from && feeAssetFromOrigin ? getExchangeAssetByOriginAsset(from, dex.chain, feeAssetFromOrigin) : (_getExchangeAsset = getExchangeAsset(dex.chain, feeAsset)) !== null && _getExchangeAsset !== void 0 ? _getExchangeAsset : undefined : undefined;
   var resolvedFeeAssetLocation = (_feeAssetFromOrigin$l = feeAssetFromOrigin === null || feeAssetFromOrigin === void 0 ? void 0 : feeAssetFromOrigin.location) !== null && _feeAssetFromOrigin$l !== void 0 ? _feeAssetFromOrigin$l : feeAssetFromExchange === null || feeAssetFromExchange === void 0 ? void 0 : feeAssetFromExchange.location;
   if (feeAsset && resolvedFeeAssetLocation) {
     var sdkAsset = findAssetInfoOrThrow(from !== null && from !== void 0 ? from : dex.chain, {