@paraspell/swap 13.4.0 → 13.5.0

package/dist/index.mjs

@@ -1,5 +1,6 @@
 import { createChainClient as createChainClient$1, registerSwapExtension } from '@paraspell/sdk';
-import { getNativeAssets, RoutingResolutionError, findAssetInfoById, getOtherAssets, getChainProviders, parseUnits, getNativeAssetSymbol, padValueBy, formatUnits as formatUnits$1, AmountTooLowError, getBalance, localizeLocation, getAssets, Parents, isSymbolMatch, getParaId, UnableToComputeError, getAssetDecimals, InvalidCurrencyError, findAssetInfoOrThrow, isOverrideLocationSpecifier, UnsupportedOperationError, isSymbolSpecifier, findBestMatches, findAssetInfoBySymbol, findAssetInfoByLoc, deepEqual, normalizeExchange, EXCHANGE_CHAINS, reverseTransformLocation, isAssetEqual, isExternalChain, isSystemAsset, TransferToAhNotSupported, ScenarioNotSupportedError, applyDecimalAbstraction, isConfig, findAssetInfo, getRelayChainOf, hasSupportForAsset, Builder, isChainEvm, convertBuilderConfig, InvalidAddressError, MissingParameterError, DryRunFailedError, handleSwapExecuteTransfer, BatchMode, dryRun, getFailureInfo, getOriginXcmFee, getXcmFee, createChainClient as createChainClient$2, getExistentialDepositOrThrow } from '@paraspell/sdk-core';
+import { UnsupportedOperationError, assertCurrencyCore, dryRun, getFailureInfo, DryRunFailedError, isConfig, getNativeAssets, RoutingResolutionError, findAssetInfoById, getOtherAssets, getChainProviders, parseUnits, getNativeAssetSymbol, padValueBy, formatUnits as formatUnits$1, AmountTooLowError, getBalance, localizeLocation, getAssets, Parents, isSymbolMatch, getParaId, UnableToComputeError, getAssetDecimals, findNativeAssetInfoOrThrow, InvalidCurrencyError, findAssetInfoOrThrow, isOverrideLocationSpecifier, isSymbolSpecifier, findBestMatches, findAssetInfoBySymbol, findAssetInfoByLoc, deepEqual, normalizeExchange, EXCHANGE_CHAINS, reverseTransformLocation, isAssetEqual, isExternalChain, isSystemAsset, TransferToAhNotSupported, ScenarioNotSupportedError, applyDecimalAbstraction, findAssetInfo, getRelayChainOf, hasSupportForAsset, 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';
 import { FixedPointNumber } from '@acala-network/sdk-core';
@@ -15,7 +16,7 @@ import { Trade, Pair } from '@crypto-dex-sdk/amm';
 import { ParachainId } from '@crypto-dex-sdk/chain';
 import { addressToZenlinkAssetId } from '@crypto-dex-sdk/format';
 import { DEFULT_TOKEN_LIST_MAP, WrappedTokenInfo } from '@crypto-dex-sdk/token-lists';
-import { BigNumber, createSdkContext } from '@galacticcouncil/sdk';
+import { createSdkContext } from '@galacticcouncil/sdk-next';
 import { parseUnits as parseUnits$1, ethers } from 'ethers-v6';
 
 function _arrayLikeToArray(r, a) {
@@ -368,6 +369,66 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
+var buildExchangeApiVariant = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, builderOptions) {
+    var _t, _t2;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          if (!(dex.apiType === 'PAPI')) {
+            _context.n = 2;
+            break;
+          }
+          _context.n = 1;
+          return dex.createApiInstancePapi(builderOptions);
+        case 1:
+          _t = _context.v;
+          return _context.a(2, {
+            apiType: 'PAPI',
+            apiPapi: _t
+          });
+        case 2:
+          if (!(dex.apiType === 'PJS')) {
+            _context.n = 4;
+            break;
+          }
+          _context.n = 3;
+          return dex.createApiInstance(builderOptions);
+        case 3:
+          _t2 = _context.v;
+          return _context.a(2, {
+            apiType: 'PJS',
+            apiPjs: _t2
+          });
+        case 4:
+          return _context.a(2, {
+            apiType: 'GENERIC'
+          });
+      }
+    }, _callee);
+  }));
+  return function buildExchangeApiVariant(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var pickExchangeApiVariant = function pickExchangeApiVariant(exchange) {
+  if (exchange.apiType === 'PAPI') {
+    return {
+      apiType: 'PAPI',
+      apiPapi: exchange.apiPapi
+    };
+  }
+  if (exchange.apiType === 'PJS') {
+    return {
+      apiType: 'PJS',
+      apiPjs: exchange.apiPjs
+    };
+  }
+  return {
+    apiType: 'GENERIC'
+  };
+};
+
 var calculateTxFeePjs = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(tx, address) {
     var _yield$tx$paymentInfo, partialFee;
@@ -388,6 +449,10 @@ 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';
+};
+
 var isPjsExtrinsic = function isPjsExtrinsic(tx) {
   return _typeof(tx) === 'object' && tx !== null && 'send' in tx && typeof tx.send === 'function' && 'signAndSend' in tx && typeof tx.signAndSend === 'function' && 'signAsync' in tx && typeof tx.signAsync === 'function' && 'paymentInfo' in tx && typeof tx.paymentInfo === 'function';
 };
@@ -399,6 +464,14 @@ var pow10n = function pow10n(d) {
   return result;
 };
 
+var SAFE_INT = BigInt(Number.MAX_SAFE_INTEGER);
+// JSON.stringify replacer that converts bigint to number (or hex string if out
+// of safe-integer range) so papi-decoded values stringify identically to the
+// numeric form used in stored asset locations.
+var replaceBigIntNumeric = function replaceBigIntNumeric(_key, value) {
+  return typeof value === 'bigint' ? value <= SAFE_INT ? Number(value) : "0x".concat(value.toString(16)) : value;
+};
+
 var stripHeaderBytes = function stripHeaderBytes(hex, byteCount) {
   return '0x' + hex.slice(2 + byteCount * 2);
 };
@@ -413,44 +486,236 @@ var convertTxToTarget = /*#__PURE__*/function () {
             _context.n = 1;
             break;
           }
-          _t = tx.toHex();
-          _context.n = 3;
+          hex = tx.toHex();
+          _context.n = 5;
           break;
         case 1:
+          if (!isPapiTransaction(tx)) {
+            _context.n = 3;
+            break;
+          }
+          _t = toHex;
           _context.n = 2;
-          return api.txToHex(tx);
+          return tx.getEncodedData();
         case 2:
-          _t = _context.v;
+          hex = _t(_context.v);
+          _context.n = 5;
+          break;
         case 3:
-          hex = _t;
+          _context.n = 4;
+          return api.txToHex(tx);
+        case 4:
+          hex = _context.v;
+        case 5:
           if (!(isPjsTx && api.type === 'PAPI')) {
-            _context.n = 8;
+            _context.n = 10;
             break;
           }
-          _context.p = 4;
+          _context.p = 6;
           hex2 = stripHeaderBytes(hex, 2);
-          _context.n = 5;
+          _context.n = 7;
           return api.txFromHex(hex2);
-        case 5:
+        case 7:
           return _context.a(2, _context.v);
-        case 6:
-          _context.p = 6;
+        case 8:
+          _context.p = 8;
           _context.v;
           hex3 = stripHeaderBytes(hex, 3);
-          _context.n = 7;
+          _context.n = 9;
           return api.txFromHex(hex3);
-        case 7:
+        case 9:
           return _context.a(2, _context.v);
-        case 8:
+        case 10:
           return _context.a(2, api.txFromHex(hex));
       }
-    }, _callee, null, [[4, 6]]);
+    }, _callee, null, [[6, 8]]);
   }));
   return function convertTxToTarget(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
 
+var assignIsExchange = function assignIsExchange(result, options) {
+  var origin = options.origin,
+    exchange = options.exchange,
+    destination = options.destination;
+  if (!origin) {
+    result.origin.isExchange = true;
+  }
+  if (!destination && result.destination) {
+    result.destination.isExchange = true;
+  }
+  result.hops = result.hops.map(function (hop) {
+    var isExchange = hop.chain === exchange.chain;
+    return _objectSpread2(_objectSpread2({}, hop), {}, {
+      result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
+        isExchange: isExchange
+      }),
+      isExchange: isExchange
+    });
+  });
+  return result;
+};
+var dryRunTransaction = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, transaction, destChain, bypassOptions) {
+    var _ref2;
+    var api, exchange, sender, evmSenderAddress, destination, currencyFrom, currencyTo, amount, tx, chain, senderResolved, resolvedDest;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = options.api, exchange = options.exchange, sender = options.sender, evmSenderAddress = options.evmSenderAddress, destination = options.destination, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo, amount = options.amount;
+          tx = transaction.tx, chain = transaction.chain;
+          assertCurrencyCore(currencyTo);
+          senderResolved = evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender;
+          resolvedDest = (_ref2 = destChain !== null && destChain !== void 0 ? destChain : destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _ref2 !== void 0 ? _ref2 : exchange.chain;
+          return _context.a(2, dryRun({
+            api: api.clone(),
+            tx: tx,
+            origin: chain,
+            destination: resolvedDest,
+            sender: senderResolved,
+            swapConfig: {
+              currencyTo: currencyTo,
+              exchangeChain: exchange.chain
+            },
+            currency: _objectSpread2(_objectSpread2({}, currencyFrom), {}, {
+              amount: BigInt(amount)
+            }),
+            bypassOptions: bypassOptions
+          }));
+      }
+    }, _callee);
+  }));
+  return function dryRunTransaction(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var mergeDryRunResults = function mergeDryRunResults(options, originResult, exchangeResult) {
+  var exchange = options.exchange,
+    destination = options.destination;
+  var result = {
+    origin: originResult.origin,
+    destination: destination ? exchangeResult.destination : exchangeResult.origin,
+    hops: [].concat(_toConsumableArray(originResult.hops), _toConsumableArray(destination ? [{
+      chain: exchange.chain,
+      result: exchangeResult.origin
+    }] : []), _toConsumableArray(exchangeResult.hops))
+  };
+  return _objectSpread2(_objectSpread2({}, getFailureInfo(result)), result);
+};
+var dryRun2Transactions = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, transactions, originBypass, exchangeBypass) {
+    var _originBypass$mintFee;
+    var exchange, _transactions, firstTx, secondTx, firstRes, _getFailureInfo, failureReason, exchangeBypassOptions, secondRes;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          exchange = options.exchange;
+          _transactions = _slicedToArray(transactions, 2), firstTx = _transactions[0], secondTx = _transactions[1];
+          _context2.n = 1;
+          return dryRunTransaction(options, firstTx, exchange.chain, originBypass);
+        case 1:
+          firstRes = _context2.v;
+          _getFailureInfo = getFailureInfo(firstRes), failureReason = _getFailureInfo.failureReason;
+          exchangeBypassOptions = exchangeBypass !== null && exchangeBypass !== void 0 ? exchangeBypass : !failureReason ? {
+            sentAssetMintMode: 'preview',
+            mintFeeAssets: (_originBypass$mintFee = originBypass === null || originBypass === void 0 ? void 0 : originBypass.mintFeeAssets) !== null && _originBypass$mintFee !== void 0 ? _originBypass$mintFee : false
+          } : undefined;
+          _context2.n = 2;
+          return dryRunTransaction(options, secondTx, undefined, exchangeBypassOptions);
+        case 2:
+          secondRes = _context2.v;
+          return _context2.a(2, mergeDryRunResults(options, firstRes, secondRes));
+      }
+    }, _callee2);
+  }));
+  return function dryRun2Transactions(_x5, _x6, _x7, _x8) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+var dryRunTransactions = function dryRunTransactions(transactions, options, originBypass, exchangeBypass) {
+  if (transactions.length === 1) {
+    return dryRunTransaction(options, transactions[0], undefined, originBypass);
+  }
+  if (transactions.length === 2) {
+    return dryRun2Transactions(options, transactions, originBypass, exchangeBypass);
+  }
+  throw new UnsupportedOperationError('Router dry run supports up to two transactions per flow.');
+};
+var runDryRun = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(initialOptions, originBypassOptions) {
+    var _yield$prepareTransfo, options, dex, routerPlan, result;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
+        case 0:
+          validateTransferOptions(initialOptions);
+          _context3.n = 1;
+          return prepareTransformedOptions(initialOptions);
+        case 1:
+          _yield$prepareTransfo = _context3.v;
+          options = _yield$prepareTransfo.options;
+          dex = _yield$prepareTransfo.dex;
+          _context3.n = 2;
+          return buildTransactions(dex, options);
+        case 2:
+          routerPlan = _context3.v;
+          _context3.n = 3;
+          return dryRunTransactions(routerPlan, options, originBypassOptions);
+        case 3:
+          result = _context3.v;
+          return _context3.a(2, assignIsExchange(result, options));
+      }
+    }, _callee3);
+  }));
+  return function runDryRun(_x9, _x0) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+var dryRunRouter = function dryRunRouter(initialOptions) {
+  return runDryRun(initialOptions);
+};
+var dryRunRouterPreview = function dryRunRouterPreview(initialOptions, previewOptions) {
+  return runDryRun(initialOptions, {
+    sentAssetMintMode: 'preview',
+    mintFeeAssets: previewOptions === null || previewOptions === void 0 ? void 0 : previewOptions.mintFeeAssets
+  });
+};
+
+var BYPASS = {
+  sentAssetMintMode: 'bypass'
+};
+var maybePerformXcmFormatCheck = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, options, routerPlan) {
+    var config, result;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          config = api.config;
+          if (!(!isConfig(config) || !config.xcmFormatCheck)) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2);
+        case 1:
+          _context.n = 2;
+          return dryRunTransactions(routerPlan, options, BYPASS, BYPASS);
+        case 2:
+          result = _context.v;
+          if (!result.failureReason) {
+            _context.n = 3;
+            break;
+          }
+          throw new DryRunFailedError(result.failureReason, result.failureChain, 'XCM format check failed.');
+        case 3:
+          return _context.a(2);
+      }
+    }, _callee);
+  }));
+  return function maybePerformXcmFormatCheck(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var AssetHubPolkadot = {
 	isOmni: true,
 	assets: [
@@ -1150,6 +1415,16 @@ var AssetHubPaseo = {
 				]
 			}
 		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 3377
+					}
+				]
+			}
+		},
 		{
 			parents: 1,
 			interior: {
@@ -1272,17 +1547,13 @@ var Hydration = {
 	isOmni: true,
 	assets: [
 		{
-			parents: 1,
+			parents: 2,
 			interior: {
-				X3: [
-					{
-						Parachain: 1000
-					},
-					{
-						PalletInstance: 50
-					},
+				X1: [
 					{
-						GeneralIndex: 1337
+						GlobalConsensus: {
+							kusama: null
+						}
 					}
 				]
 			}
@@ -1297,7 +1568,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x2ec4884088d84e5c2970a034732e5209b0acfa93"
+							key: "0x52e1311e26610e6662a1e5b5bd113130b6815213"
 						}
 					}
 				]
@@ -1306,15 +1577,15 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
-					{
-						Parachain: 1000
-					},
+				X2: [
 					{
-						PalletInstance: 50
+						Parachain: 2034
 					},
 					{
-						GeneralIndex: 1984
+						AccountKey20: {
+							network: null,
+							key: "0x531a654d1696ed52e7275a8cede955e82620f99a"
+						}
 					}
 				]
 			}
@@ -1329,7 +1600,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xc64980e4eaf9a1151bd21712b9946b81e41e2b92"
+							key: "0x2b55b6a5751f26c5cfb02429085bfd5236751443"
 						}
 					}
 				]
@@ -1338,17 +1609,14 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
-					{
-						Parachain: 2004
-					},
+				X2: [
 					{
-						PalletInstance: 110
+						Parachain: 2034
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xe57ebd2d67b462e9926e04a8e33f01cd0d64346d"
+							key: "0x987ddc8b236fb23e1e48882b206396ca9b42648b"
 						}
 					}
 				]
@@ -1364,7 +1632,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x02759d14d0d4f452b9c76f5a230750e8857d36f2"
+							key: "0x8a598fe3e3a471ce865332e330d303502a0e2f52"
 						}
 					}
 				]
@@ -1373,7 +1641,30 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				Here: null
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						GeneralIndex: 0
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X3: [
+					{
+						Parachain: 1000
+					},
+					{
+						PalletInstance: 50
+					},
+					{
+						GeneralIndex: 1984
+					}
+				]
 			}
 		},
 		{
@@ -1397,12 +1688,12 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2030
+						Parachain: 2034
 					},
 					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0900000000000000000000000000000000000000000000000000000000000000"
+						AccountKey20: {
+							network: null,
+							key: "0x1806860d27ee903c1ec7586d4f7d598d7591f124"
 						}
 					}
 				]
@@ -1413,32 +1704,31 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2000
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x0e13b904f4168f93814216b6874ca8349457f263"
+						GeneralKey: {
+							length: 21,
+							data: "0x025a4d6acdc4e3e5ab15717f407afe957f7a2425780000000000000000000000"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 2,
+			parents: 1,
 			interior: {
-				X2: [
+				X3: [
 					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
+						Parachain: 2004
+					},
+					{
+						PalletInstance: 110
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x18084fba666a33d37592fa2633fd49a74dd93a88"
+							key: "0x931715fee2d06333043d11f658c8ce934ac61d0c"
 						}
 					}
 				]
@@ -1447,14 +1737,27 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X2: [
+				X1: [
 					{
-						Parachain: 2034
+						Parachain: 2086
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X3: [
+					{
+						Parachain: 2004
+					},
+					{
+						PalletInstance: 110
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x69003a65189f6ed993d3bd3e2b74f1db39f405ce"
+							key: "0xab3f0245b83feb11d15aaffefd7ad465a59817ed"
 						}
 					}
 				]
@@ -1462,31 +1765,65 @@ var Hydration = {
 		},
 		{
 			parents: 1,
+			interior: {
+				X3: [
+					{
+						Parachain: 2094
+					},
+					{
+						PalletInstance: 53
+					},
+					{
+						GeneralIndex: 2
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 3369
+					}
+				]
+			}
+		},
+		{
+			parents: 2,
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x34d5ffb83d14d82f87aaf2f13be895a3c814c2ad"
+							key: "0x45804880de22913dafe09f4980848ece6ecbaf78"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 1,
+			parents: 2,
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x8a598fe3e3a471ce865332e330d303502a0e2f52"
+							key: "0x57e114b691db790c35207b2e685d4a43181e6061"
 						}
 					}
 				]
@@ -1511,13 +1848,10 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2004
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x11a8f7ffbb7e0fbed88bc20179dd45b4bd6874ff"
-						}
+						PalletInstance: 10
 					}
 				]
 			}
@@ -1527,12 +1861,12 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2032
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0xc09cf2f85367f3c2ab66e094283de3a499cb9108"
+						GeneralKey: {
+							length: 2,
+							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
 						}
 					}
 				]
@@ -1548,7 +1882,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x35774c305aaf441a102d47988d35f0f5428471b3"
+							key: "0xc09cf2f85367f3c2ab66e094283de3a499cb9108"
 						}
 					}
 				]
@@ -1557,15 +1891,15 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X2: [
+				X3: [
 					{
-						Parachain: 2034
+						Parachain: 1000
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x1806860d27ee903c1ec7586d4f7d598d7591f124"
-						}
+						PalletInstance: 50
+					},
+					{
+						GeneralIndex: 31337
 					}
 				]
 			}
@@ -1591,12 +1925,12 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2000
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x52e1311e26610e6662a1e5b5bd113130b6815213"
+						GeneralKey: {
+							length: 2,
+							data: "0x0000000000000000000000000000000000000000000000000000000000000000"
 						}
 					}
 				]
@@ -1616,7 +1950,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x45804880de22913dafe09f4980848ece6ecbaf78"
+							key: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
 						}
 					}
 				]
@@ -1627,12 +1961,12 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2030
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x00f283c7a97ecb60dd905cdab52febceec04dc0f"
+						GeneralKey: {
+							length: 2,
+							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
 						}
 					}
 				]
@@ -1641,17 +1975,14 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
-					{
-						Parachain: 2004
-					},
+				X2: [
 					{
-						PalletInstance: 110
+						Parachain: 2034
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x52b2f622f5676e92dbea3092004eb9ffb85a8d07"
+							key: "0x69003a65189f6ed993d3bd3e2b74f1db39f405ce"
 						}
 					}
 				]
@@ -1662,28 +1993,32 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2000
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x4c892a298a9c6b4ced988b3d6e9cf93333aadcf7"
+						GeneralKey: {
+							length: 21,
+							data: "0x02f4c723e61709d90f89939c1852f516e373d418a80000000000000000000000"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 1,
+			parents: 2,
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xf5f744a4d14a5f49ce173e39b8361733a6e55152"
+							key: "0x5a98fcbea516cf06857215779fd812ca3bef1b32"
 						}
 					}
 				]
@@ -1702,23 +2037,27 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x99fec54a5ad36d50a4bba3a41cab983a5bb86a7d"
+							key: "0xe57ebd2d67b462e9926e04a8e33f01cd0d64346d"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 1,
+			parents: 2,
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x2b55b6a5751f26c5cfb02429085bfd5236751443"
+							key: "0x56072c95faa701256059aa122697b133aded9279"
 						}
 					}
 				]
@@ -1727,33 +2066,34 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
-					{
-						Parachain: 2004
-					},
+				X2: [
 					{
-						PalletInstance: 110
+						Parachain: 2034
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x3f9610a50630bc7d4530736942ee2bc9e00e8de8"
+							key: "0x49f925bf72718f4abbc57adef1b705931f928a2a"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 1,
+			parents: 2,
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xca30f9ff99394c55deda293df223e3740635c72e"
+							key: "0xaa7a9ca87d3694b5755f213b5d04094b8d0f0a6f"
 						}
 					}
 				]
@@ -1764,13 +2104,10 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2043
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x49f925bf72718f4abbc57adef1b705931f928a2a"
-						}
+						PalletInstance: 10
 					}
 				]
 			}
@@ -1780,13 +2117,10 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2046
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x987ddc8b236fb23e1e48882b206396ca9b42648b"
-						}
+						PalletInstance: 5
 					}
 				]
 			}
@@ -1796,33 +2130,33 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2034
+						Parachain: 2030
 					},
 					{
-						GeneralIndex: 0
+						GeneralKey: {
+							length: 2,
+							data: "0x0903000000000000000000000000000000000000000000000000000000000000"
+						}
 					}
 				]
 			}
 		},
 		{
-			parents: 1,
-			interior: {
-				X1: [
-					{
-						Parachain: 2008
-					}
-				]
-			}
-		},
-		{
-			parents: 1,
+			parents: 2,
 			interior: {
 				X2: [
 					{
-						Parachain: 2026
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
 					},
 					{
-						PalletInstance: 2
+						AccountKey20: {
+							network: null,
+							key: "0xcccccccccc33d538dbc2ee4feab0a7a1ff4e8a94"
+						}
 					}
 				]
 			}
@@ -1830,9 +2164,18 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X1: [
+				X3: [
 					{
-						Parachain: 2037
+						Parachain: 2004
+					},
+					{
+						PalletInstance: 110
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x3f9610a50630bc7d4530736942ee2bc9e00e8de8"
+						}
 					}
 				]
 			}
@@ -1840,9 +2183,15 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X1: [
+				X2: [
 					{
-						Parachain: 3369
+						Parachain: 2030
+					},
+					{
+						GeneralKey: {
+							length: 2,
+							data: "0x0900000000000000000000000000000000000000000000000000000000000000"
+						}
 					}
 				]
 			}
@@ -1852,20 +2201,33 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2094
+						Parachain: 2034
 					},
 					{
-						PalletInstance: 10
+						AccountKey20: {
+							network: null,
+							key: "0x00f283c7a97ecb60dd905cdab52febceec04dc0f"
+						}
 					}
 				]
 			}
 		},
 		{
-			parents: 1,
+			parents: 2,
 			interior: {
-				X1: [
+				X2: [
 					{
-						Parachain: 3370
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x514910771af9ca656af840dff83e8264ecf986ca"
+						}
 					}
 				]
 			}
@@ -1883,7 +2245,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x931715fee2d06333043d11f658c8ce934ac61d0c"
+							key: "0xe9f9a2e3deae4093c00fbc57b22bb51a4c05ad88"
 						}
 					}
 				]
@@ -1892,15 +2254,15 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
-					{
-						Parachain: 1000
-					},
+				X2: [
 					{
-						PalletInstance: 50
+						Parachain: 2000
 					},
 					{
-						GeneralIndex: 31337
+						GeneralKey: {
+							length: 21,
+							data: "0x0254a37a01cd75b616d63e0ab665bffdb0143c52ae0000000000000000000000"
+						}
 					}
 				]
 			}
@@ -1910,10 +2272,10 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2043
+						Parachain: 3417
 					},
 					{
-						PalletInstance: 10
+						GeneralIndex: 0
 					}
 				]
 			}
@@ -1921,19 +2283,15 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X1: [
+				X2: [
 					{
-						Parachain: 3345
-					}
-				]
-			}
-		},
-		{
-			parents: 1,
-			interior: {
-				X1: [
+						Parachain: 2031
+					},
 					{
-						Parachain: 2101
+						GeneralKey: {
+							length: 2,
+							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+						}
 					}
 				]
 			}
@@ -1948,7 +2306,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x531a654d1696ed52e7275a8cede955e82620f99a"
+							key: "0xc64980e4eaf9a1151bd21712b9946b81e41e2b92"
 						}
 					}
 				]
@@ -1973,27 +2331,28 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X2: [
+				X3: [
 					{
-						Parachain: 2032
+						Parachain: 2004
 					},
 					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0002000000000000000000000000000000000000000000000000000000000000"
+						PalletInstance: 110
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0xda430218862d3db25de9f61458645dde49a9e9c1"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 2,
+			parents: 1,
 			interior: {
 				X1: [
 					{
-						GlobalConsensus: {
-							kusama: null
-						}
+						Parachain: 2008
 					}
 				]
 			}
@@ -2012,7 +2371,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x57e114b691db790c35207b2e685d4a43181e6061"
+							key: "0x9d39a5de30e57443bff2a8307a4256c8797a3497"
 						}
 					}
 				]
@@ -2021,28 +2380,9 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X2: [
-					{
-						Parachain: 2004
-					},
-					{
-						PalletInstance: 10
-					}
-				]
-			}
-		},
-		{
-			parents: 1,
-			interior: {
-				X2: [
-					{
-						Parachain: 2030
-					},
+				X1: [
 					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
-						}
+						Parachain: 3344
 					}
 				]
 			}
@@ -2061,47 +2401,45 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x5a98fcbea516cf06857215779fd812ca3bef1b32"
+							key: "0x1abaea1f7c830bd89acc67ec4af516284b1bc33c"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 2,
+			parents: 1,
 			interior: {
-				X2: [
+				X3: [
 					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
+						Parachain: 2004
+					},
+					{
+						PalletInstance: 110
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x56072c95faa701256059aa122697b133aded9279"
+							key: "0x484ecce6775143d3335ed2c7bcb22151c53b9f49"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 2,
+			parents: 1,
 			interior: {
-				X2: [
+				X3: [
 					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
+						Parachain: 2004
+					},
+					{
+						PalletInstance: 110
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xaa7a9ca87d3694b5755f213b5d04094b8d0f0a6f"
+							key: "0x52b2f622f5676e92dbea3092004eb9ffb85a8d07"
 						}
 					}
 				]
@@ -2110,34 +2448,23 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X2: [
-					{
-						Parachain: 2030
-					},
-					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0903000000000000000000000000000000000000000000000000000000000000"
-						}
-					}
-				]
+				Here: null
 			}
 		},
 		{
-			parents: 2,
+			parents: 1,
 			interior: {
-				X2: [
+				X3: [
 					{
-						GlobalConsensus: {
-							Ethereum: {
-								chainId: 1
-							}
-						}
+						Parachain: 2004
+					},
+					{
+						PalletInstance: 110
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x514910771af9ca656af840dff83e8264ecf986ca"
+							key: "0x06e605775296e851ff43b4daa541bb0984e9d6fd"
 						}
 					}
 				]
@@ -2146,17 +2473,14 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
-					{
-						Parachain: 2004
-					},
+				X2: [
 					{
-						PalletInstance: 110
+						Parachain: 2000
 					},
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x484ecce6775143d3335ed2c7bcb22151c53b9f49"
+						GeneralKey: {
+							length: 21,
+							data: "0x0207df96d1341a7d16ba1ad431e2c847d978bc2bce0000000000000000000000"
 						}
 					}
 				]
@@ -2185,9 +2509,12 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X1: [
+				X2: [
 					{
-						Parachain: 2006
+						Parachain: 2026
+					},
+					{
+						PalletInstance: 2
 					}
 				]
 			}
@@ -2195,18 +2522,9 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
-					{
-						Parachain: 2004
-					},
-					{
-						PalletInstance: 110
-					},
+				X1: [
 					{
-						AccountKey20: {
-							network: null,
-							key: "0x06e605775296e851ff43b4daa541bb0984e9d6fd"
-						}
+						Parachain: 3370
 					}
 				]
 			}
@@ -2214,17 +2532,14 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
-					{
-						Parachain: 2004
-					},
+				X2: [
 					{
-						PalletInstance: 110
+						Parachain: 2034
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xc30e9ca94cf52f3bf5692aacf81353a27052c46f"
+							key: "0x2ec4884088d84e5c2970a034732e5209b0acfa93"
 						}
 					}
 				]
@@ -2235,12 +2550,12 @@ var Hydration = {
 			interior: {
 				X2: [
 					{
-						Parachain: 2032
+						Parachain: 2034
 					},
 					{
-						GeneralKey: {
-							length: 2,
-							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+						AccountKey20: {
+							network: null,
+							key: "0xca30f9ff99394c55deda293df223e3740635c72e"
 						}
 					}
 				]
@@ -2260,18 +2575,76 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
+							key: "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599"
 						}
 					}
 				]
 			}
 		},
 		{
-			parents: 2,
+			parents: 1,
 			interior: {
-				X2: [
+				X3: [
 					{
-						GlobalConsensus: {
+						Parachain: 1000
+					},
+					{
+						PalletInstance: 50
+					},
+					{
+						GeneralIndex: 1337
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x0e13b904f4168f93814216b6874ca8349457f263"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x11a8f7ffbb7e0fbed88bc20179dd45b4bd6874ff"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 2101
+					}
+				]
+			}
+		},
+		{
+			parents: 2,
+			interior: {
+				X2: [
+					{
+						GlobalConsensus: {
 							Ethereum: {
 								chainId: 1
 							}
@@ -2280,12 +2653,22 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xdac17f958d2ee523a2206206994597c13d831ec7"
+							key: "0xa3931d71877c0e7a3148cb7eb4463524fec27fbd"
 						}
 					}
 				]
 			}
 		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 2035
+					}
+				]
+			}
+		},
 		{
 			parents: 2,
 			interior: {
@@ -2306,6 +2689,219 @@ var Hydration = {
 				]
 			}
 		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x35774c305aaf441a102d47988d35f0f5428471b3"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2000
+					},
+					{
+						GeneralKey: {
+							length: 2,
+							data: "0x0003000000000000000000000000000000000000000000000000000000000000"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x02759d14d0d4f452b9c76f5a230750e8857d36f2"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 2,
+			interior: {
+				X2: [
+					{
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0xdac17f958d2ee523a2206206994597c13d831ec7"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 2,
+			interior: {
+				X2: [
+					{
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x18084fba666a33d37592fa2633fd49a74dd93a88"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 3345
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2092
+					},
+					{
+						GeneralKey: {
+							length: 2,
+							data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2094
+					},
+					{
+						PalletInstance: 10
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2000
+					},
+					{
+						GeneralKey: {
+							length: 21,
+							data: "0x02c80084af223c8b598536178d9361dc55bfda68180000000000000000000000"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2032
+					},
+					{
+						GeneralKey: {
+							length: 2,
+							data: "0x0002000000000000000000000000000000000000000000000000000000000000"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 2037
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X5: [
+					{
+						Parachain: 2094
+					},
+					{
+						PalletInstance: 53
+					},
+					{
+						GeneralIndex: 2
+					},
+					{
+						GeneralKey: {
+							length: 4,
+							data: "0x4555524300000000000000000000000000000000000000000000000000000000"
+						}
+					},
+					{
+						GeneralKey: {
+							length: 32,
+							data: "0xcf4f5a26e2090bb3adcf02c7a9d73dbfe6659cc690461475b86437fa49c71136"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x34d5ffb83d14d82f87aaf2f13be895a3c814c2ad"
+						}
+					}
+				]
+			}
+		},
 		{
 			parents: 1,
 			interior: {
@@ -2319,7 +2915,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xab3f0245b83feb11d15aaffefd7ad465a59817ed"
+							key: "0xc30e9ca94cf52f3bf5692aacf81353a27052c46f"
 						}
 					}
 				]
@@ -2328,22 +2924,81 @@ var Hydration = {
 		{
 			parents: 1,
 			interior: {
-				X3: [
+				X2: [
 					{
 						Parachain: 2004
 					},
 					{
-						PalletInstance: 110
+						AccountKey20: {
+							network: null,
+							key: "0x9c4c6eaad9b926ba09f702f4ad880ef71998ef18"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 2,
+			interior: {
+				X2: [
+					{
+						GlobalConsensus: {
+							Ethereum: {
+								chainId: 1
+							}
+						}
 					},
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xe9f9a2e3deae4093c00fbc57b22bb51a4c05ad88"
+							key: "0x8236a87084f8b84306f72007f36f2618a5634494"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0xf5f744a4d14a5f49ce173e39b8361733a6e55152"
 						}
 					}
 				]
 			}
 		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x4c892a298a9c6b4ced988b3d6e9cf93333aadcf7"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X1: [
+					{
+						Parachain: 2006
+					}
+				]
+			}
+		},
 		{
 			parents: 1,
 			interior: {
@@ -2357,7 +3012,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0xda430218862d3db25de9f61458645dde49a9e9c1"
+							key: "0x99fec54a5ad36d50a4bba3a41cab983a5bb86a7d"
 						}
 					}
 				]
@@ -2377,7 +3032,7 @@ var Hydration = {
 					{
 						AccountKey20: {
 							network: null,
-							key: "0x9d39a5de30e57443bff2a8307a4256c8797a3497"
+							key: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
 						}
 					}
 				]
@@ -5390,6 +6045,40 @@ var Acala = {
 				}
 			}
 		],
+		[
+			{
+				parents: 1,
+				interior: {
+					X2: [
+						{
+							Parachain: 2000
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0000000000000000000000000000000000000000000000000000000000000000"
+							}
+						}
+					]
+				}
+			},
+			{
+				parents: 1,
+				interior: {
+					X2: [
+						{
+							Parachain: 2032
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
+						}
+					]
+				}
+			}
+		],
 		[
 			{
 				parents: 1,
@@ -5874,6 +6563,40 @@ var Acala = {
 				}
 			}
 		],
+		[
+			{
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 22222012
+						}
+					]
+				}
+			},
+			{
+				parents: 1,
+				interior: {
+					X2: [
+						{
+							Parachain: 2032
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0001000000000000000000000000000000000000000000000000000000000000"
+							}
+						}
+					]
+				}
+			}
+		],
 		[
 			{
 				parents: 1,
@@ -7495,8 +8218,11 @@ var createAcalaClient = /*#__PURE__*/function () {
 
 var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
   function AcalaExchange() {
+    var _this;
     _classCallCheck(this, AcalaExchange);
-    return _callSuper(this, AcalaExchange, arguments);
+    _this = _callSuper(this, AcalaExchange, arguments);
+    _this.apiType = 'PJS';
+    return _this;
   }
   _inherits(AcalaExchange, _ExchangeChain);
   return _createClass(AcalaExchange, [{
@@ -7673,97 +8399,80 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
   }]);
 }(ExchangeChain);
 
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-var capitalizeLocation = function capitalizeLocation(obj) {
-  obj.interior = _capitalizeKeys(obj.interior);
-  return obj;
+// NetworkId enum variants that polkadot.js `.toJSON()` lowercases when the
+// 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 _capitalizeKeys = function capitalizeKeys(obj) {
-  var depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-  if (_typeof(obj) !== 'object' || obj === null) {
-    return obj; // Primitive value, return as is
-  }
-  if (Array.isArray(obj)) {
-    // Process each element in the array
-    return obj.map(function (element) {
-      return _capitalizeKeys(element, depth);
-    });
-  }
-  var newObj = {};
-  for (var key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      var value = obj[key];
-      var isLeafNode = _typeof(value) !== 'object' || value === null;
-      var capitalizedKey = void 0;
-      if (depth <= 2 || !isLeafNode) {
-        // Capitalize the key
-        capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
-      } else {
-        // Do not capitalize leaf nodes beyond depth 2
-        capitalizedKey = key;
-      }
-      if (key === 'generalKey' && typeof value === 'string') {
-        var data = value;
-        var hexString = data.startsWith('0x') ? data.slice(2) : data;
-        var byteLength = hexString.length / 2; // Each byte is two hex characters
-        // Pad hexString with trailing zeros to make it 32 bytes (64 hex characters)
-        var paddedHexString = hexString.padEnd(64, '0'); // 64 hex chars = 32 bytes
-        data = '0x' + paddedHexString;
-        value = {
-          length: byteLength,
-          data: data
-        };
-      }
-      // Recursively process nested objects
-      newObj[capitalizedKey] = _capitalizeKeys(value, depth + 1);
+var isBinary = function isBinary(v) {
+  return _typeof(v) === 'object' && v !== null && 'asHex' in v && typeof v.asHex === 'function';
+};
+var JUNCTIONS_VARIANT = /^X[1-8]$/;
+// Recursively convert polkadot-api's `{ type, value }` enum encoding into the
+// flat `{ VariantName: value }` shape used by stored asset locations (which
+// originate from polkadot.js's `.toJSON()`).
+//
+// Reproduces three pjs `.toJSON()` quirks so output is byte-identical:
+//   - plain NetworkId variants lowercased (`Kusama` -> `kusama`)
+//   - struct field names snake_case -> camelCase (`chain_id` -> `chainId`)
+//   - `Binary` byte values rendered as `0x...` hex strings
+var _papiLocationToJson = function papiLocationToJson(value) {
+  if (value === undefined) return null;
+  if (isBinary(value)) return value.asHex();
+  if (_typeof(value) !== 'object' || value === null) return value;
+  if (Array.isArray(value)) return value.map(_papiLocationToJson);
+  var obj = value;
+  if (Object.keys(obj).length === 2 && typeof obj.type === 'string' && Object.prototype.hasOwnProperty.call(obj, 'value')) {
+    // v3 Junctions encode X1 as a single Junction (not an array). pjs
+    // normalizes X1..X8 to array form, so we do the same.
+    if (JUNCTIONS_VARIANT.test(obj.type) && !Array.isArray(obj.value)) {
+      return _defineProperty({}, obj.type, [_papiLocationToJson(obj.value)]);
     }
+    var variant = obj.value === undefined && LOWERCASED_PLAIN_VARIANTS.has(obj.type) ? obj.type[0].toLowerCase() + obj.type.slice(1) : obj.type;
+    return _defineProperty({}, variant, _papiLocationToJson(obj.value));
   }
-  return newObj;
+  var out = {};
+  for (var _i = 0, _Object$entries = Object.entries(obj); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+      k = _Object$entries$_i[0],
+      v = _Object$entries$_i[1];
+    out[snakeToCamel(k)] = _papiLocationToJson(v);
+  }
+  return out;
 };
 
 var getDexConfig$1 = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, chain) {
-    var assets, response, pairs, poolLocations, filteredAssets, locations;
+    var assets, entries, poolLocations, filteredAssets;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           assets = getAssets(chain);
           _context.n = 1;
-          return api.query.assetConversion.pools.entries();
+          return api.getUnsafeApi().query.AssetConversion.Pools.getEntries();
         case 1:
-          response = _context.v;
-          pairs = response.map(function (_ref2) {
-            var _ref3 = _slicedToArray(_ref2, 1),
-              _ref3$0$args = _slicedToArray(_ref3[0].args, 1),
-              era = _ref3$0$args[0];
-            var _era$toJSON = era.toJSON(),
-              _era$toJSON2 = _slicedToArray(_era$toJSON, 2),
-              ml1 = _era$toJSON2[0],
-              ml2 = _era$toJSON2[1];
-            return [ml1, ml2];
-          });
+          entries = _context.v;
           poolLocations = new Set();
-          pairs.forEach(function (_ref4) {
-            var _ref5 = _slicedToArray(_ref4, 2),
-              ml1 = _ref5[0],
-              ml2 = _ref5[1];
-            var ml1Transformed = capitalizeLocation(ml1);
-            var ml2Transformed = capitalizeLocation(ml2);
-            poolLocations.add(JSON.stringify(ml1Transformed));
-            poolLocations.add(JSON.stringify(ml2Transformed));
+          entries.forEach(function (_ref2) {
+            var _ref2$keyArgs = _slicedToArray(_ref2.keyArgs, 1),
+              _ref2$keyArgs$ = _slicedToArray(_ref2$keyArgs[0], 2),
+              ml1 = _ref2$keyArgs$[0],
+              ml2 = _ref2$keyArgs$[1];
+            poolLocations.add(JSON.stringify(_papiLocationToJson(ml1), replaceBigIntNumeric));
+            poolLocations.add(JSON.stringify(_papiLocationToJson(ml2), replaceBigIntNumeric));
           });
           filteredAssets = assets.filter(function (asset) {
-            return poolLocations.has(JSON.stringify(asset.location)) || poolLocations.has(JSON.stringify(localizeLocation('AssetHubPolkadot', asset.location)));
-          });
-          locations = filteredAssets.map(function (asset) {
-            return asset.location;
+            return poolLocations.has(JSON.stringify(asset.location, replaceBigIntNumeric)) || poolLocations.has(JSON.stringify(localizeLocation('AssetHubPolkadot', asset.location), replaceBigIntNumeric));
           });
           return _context.a(2, {
             isOmni: true,
-            assets: locations,
+            assets: filteredAssets.map(function (asset) {
+              return asset.location;
+            }),
             pairs: []
           });
       }
@@ -7776,8 +8485,11 @@ var getDexConfig$1 = /*#__PURE__*/function () {
 
 var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
   function AssetHubExchange() {
+    var _this;
     _classCallCheck(this, AssetHubExchange);
-    return _callSuper(this, AssetHubExchange, arguments);
+    _this = _callSuper(this, AssetHubExchange, arguments);
+    _this.apiType = 'GENERIC';
+    return _this;
   }
   _inherits(AssetHubExchange, _ExchangeChain);
   return _createClass(AssetHubExchange, [{
@@ -7950,7 +8662,7 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
               hop1Received = resultHop1.amountOut;
               assumedInputForHop2 = padValueBy(hop1Received, -2);
               optionsHop2 = {
-                apiPjs: options.apiPjs,
+                apiType: 'GENERIC',
                 api: options.api,
                 slippagePct: options.slippagePct,
                 sender: options.sender,
@@ -8408,8 +9120,11 @@ var getDexConfig = /*#__PURE__*/function () {
 
 var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
   function BifrostExchange() {
+    var _this;
     _classCallCheck(this, BifrostExchange);
-    return _callSuper(this, BifrostExchange, arguments);
+    _this = _callSuper(this, BifrostExchange, arguments);
+    _this.apiType = 'PJS';
+    return _this;
   }
   _inherits(BifrostExchange, _ExchangeChain);
   return _createClass(BifrostExchange, [{
@@ -8572,17 +9287,17 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
 }(ExchangeChain);
 
 var getAssetInfo = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(tradeRouter, asset) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(assetClient, asset) {
     var assets;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           _context.n = 1;
-          return tradeRouter.getAllAssets();
+          return assetClient.getSupported();
         case 1:
           assets = _context.v;
           return _context.a(2, asset.assetId ? assets.find(function (a) {
-            return a.id === asset.assetId;
+            return a.id.toString() === asset.assetId;
           }) : assets.find(function (a) {
             return a.symbol === asset.symbol;
           }));
@@ -8595,8 +9310,8 @@ var getAssetInfo = /*#__PURE__*/function () {
 }();
 
 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, nativeCurrencyInfo, nativeCurrencyDecimals, substrateTx, tx, swapFee, feeNative, currencyFromPriceInfo, currencyFromPrice, feeInCurrencyFrom, finalFee;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, tradeRouter, txBuilderFactory, assetClient, currencyFromInfo, currencyToInfo, currencyFromDecimals, chain, toDestTransactionFee) {
+    var amount, slippagePct, feeCalcAddress, sender, trade, nativeCurrencyInfo, nativeCurrencyDecimals, substrateTx, tx, _yield$tx$getPaymentI, swapFee, feeNative, currencyFromPriceInfo, currencyFromPrice, feeInCurrencyFrom, finalFee;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -8606,7 +9321,7 @@ var calculateFee = /*#__PURE__*/function () {
         case 1:
           trade = _context.v;
           _context.n = 2;
-          return getAssetInfo(tradeRouter, {
+          return getAssetInfo(assetClient, {
             symbol: getNativeAssetSymbol(chain)
           });
         case 2:
@@ -8630,9 +9345,10 @@ var calculateFee = /*#__PURE__*/function () {
           substrateTx = _context.v;
           tx = substrateTx.get();
           _context.n = 6;
-          return calculateTxFeePjs(tx, feeCalcAddress);
+          return tx.getPaymentInfo(feeCalcAddress);
         case 6:
-          swapFee = _context.v;
+          _yield$tx$getPaymentI = _context.v;
+          swapFee = _yield$tx$getPaymentI.partial_fee;
           feeNative = swapFee + toDestTransactionFee + toDestTransactionFee;
           Logger.log('XCM to exch. fee:', toDestTransactionFee, nativeCurrencyInfo.symbol);
           Logger.log('XCM to dest. fee:', toDestTransactionFee, nativeCurrencyInfo.symbol);
@@ -8645,7 +9361,7 @@ var calculateFee = /*#__PURE__*/function () {
           return _context.a(2, feeNative);
         case 7:
           _context.n = 8;
-          return tradeRouter.getBestSpotPrice(currencyFromInfo.id, nativeCurrencyInfo.id);
+          return tradeRouter.getSpotPrice(currencyFromInfo.id, nativeCurrencyInfo.id);
         case 8:
           currencyFromPriceInfo = _context.v;
           if (!(currencyFromPriceInfo === undefined)) {
@@ -8654,7 +9370,7 @@ var calculateFee = /*#__PURE__*/function () {
           }
           throw new UnableToComputeError('Price not found');
         case 9:
-          currencyFromPrice = BigInt(currencyFromPriceInfo.amount.decimalPlaces(0).toString());
+          currencyFromPrice = currencyFromPriceInfo.amount;
           feeInCurrencyFrom = feeNative * pow10n(currencyFromPriceInfo.decimals + currencyFromDecimals) / (currencyFromPrice * pow10n(nativeCurrencyDecimals));
           Logger.log('Total fee in currency from:', feeInCurrencyFrom, currencyFromInfo.symbol);
           finalFee = padValueBy(feeInCurrencyFrom, FEE_BUFFER_PCT);
@@ -8663,97 +9379,100 @@ var calculateFee = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function calculateFee(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
+  return function calculateFee(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9) {
     return _ref2.apply(this, arguments);
   };
 }();
 
 var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
   function HydrationExchange() {
+    var _this;
     _classCallCheck(this, HydrationExchange);
-    return _callSuper(this, HydrationExchange, arguments);
+    _this = _callSuper(this, HydrationExchange, arguments);
+    _this.apiType = 'PAPI';
+    return _this;
   }
   _inherits(HydrationExchange, _ExchangeChain);
   return _createClass(HydrationExchange, [{
     key: "swapCurrency",
     value: function () {
       var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, toDestTransactionFee) {
-        var apiPjs, origin, assetFrom, assetTo, sender, slippagePct, amount, _createSdkContext, tradeRouter, txBuilderFactory, currencyFromInfo, currencyToInfo, tradeFee, amountWithoutFee, amountNormalized, trade, substrateTx, tx, amountOut, nativeCurrencyInfo, nativeCurrencyDecimals, priceInfo, currencyToPrice, feeInCurrencyTo, amountOutModified;
+        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;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              apiPjs = options.apiPjs, origin = options.origin, assetFrom = options.assetFrom, assetTo = options.assetTo, sender = options.sender, slippagePct = options.slippagePct, amount = options.amount;
-              _createSdkContext = createSdkContext(apiPjs), tradeRouter = _createSdkContext.api.router, txBuilderFactory = _createSdkContext.tx;
+              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 getAssetInfo(tradeRouter, assetFrom);
+              return createSdkContext(apiPapi);
             case 1:
-              currencyFromInfo = _context.v;
+              _yield$createSdkConte = _context.v;
+              tradeRouter = _yield$createSdkConte.api.router;
+              assetClient = _yield$createSdkConte.client.asset;
+              txBuilderFactory = _yield$createSdkConte.tx;
               _context.n = 2;
-              return getAssetInfo(tradeRouter, assetTo);
+              return getAssetInfo(assetClient, assetFrom);
             case 2:
+              currencyFromInfo = _context.v;
+              _context.n = 3;
+              return getAssetInfo(assetClient, assetTo);
+            case 3:
               currencyToInfo = _context.v;
               if (!(currencyFromInfo === undefined)) {
-                _context.n = 3;
+                _context.n = 4;
                 break;
               }
               throw new InvalidCurrencyError("Currency from doesn't exist");
-            case 3:
+            case 4:
               if (!(currencyToInfo === undefined)) {
-                _context.n = 4;
+                _context.n = 5;
                 break;
               }
               throw new InvalidCurrencyError("Currency to doesn't exist");
-            case 4:
-              _context.n = 5;
-              return calculateFee(options, tradeRouter, txBuilderFactory, currencyFromInfo, currencyToInfo, currencyFromInfo.decimals, this.chain, toDestTransactionFee);
             case 5:
+              _context.n = 6;
+              return calculateFee(options, tradeRouter, txBuilderFactory, assetClient, currencyFromInfo, currencyToInfo, currencyFromInfo.decimals, this.chain, toDestTransactionFee);
+            case 6:
               tradeFee = _context.v;
               amountWithoutFee = origin ? amount - tradeFee : amount;
               if (!(amountWithoutFee <= 0n)) {
-                _context.n = 6;
+                _context.n = 7;
                 break;
               }
               throw new AmountTooLowError();
-            case 6:
+            case 7:
               amountNormalized = formatUnits$1(amountWithoutFee, currencyFromInfo.decimals);
               Logger.log('Original amount', amount);
               Logger.log('Amount modified', amountWithoutFee);
-              _context.n = 7;
+              _context.n = 8;
               return tradeRouter.getBestSell(currencyFromInfo.id, currencyToInfo.id, amountNormalized);
-            case 7:
+            case 8:
               trade = _context.v;
-              _context.n = 8;
+              _context.n = 9;
               return txBuilderFactory.trade(trade).withSlippage(Number(slippagePct)).withBeneficiary(sender).build();
-            case 8:
+            case 9:
               substrateTx = _context.v;
               tx = substrateTx.get();
-              amountOut = BigInt(trade.amountOut.decimalPlaces(0).toString());
-              _context.n = 9;
-              return getAssetInfo(tradeRouter, {
+              amountOut = trade.amountOut;
+              _context.n = 10;
+              return getAssetInfo(assetClient, {
                 symbol: getNativeAssetSymbol(this.chain)
               });
-            case 9:
+            case 10:
               nativeCurrencyInfo = _context.v;
               if (!(nativeCurrencyInfo === undefined)) {
-                _context.n = 10;
-                break;
-              }
-              throw new InvalidCurrencyError('Native currency not found');
-            case 10:
-              nativeCurrencyDecimals = getAssetDecimals(this.chain, nativeCurrencyInfo.symbol);
-              if (!(nativeCurrencyDecimals === null)) {
                 _context.n = 11;
                 break;
               }
-              throw new UnableToComputeError('Native currency decimals not found');
+              throw new InvalidCurrencyError('Native currency not found');
             case 11:
+              _findNativeAssetInfoO = findNativeAssetInfoOrThrow(this.chain), nativeCurrencyDecimals = _findNativeAssetInfoO.decimals;
               _context.n = 12;
-              return tradeRouter.getBestSpotPrice(currencyToInfo.id, nativeCurrencyInfo.id);
+              return tradeRouter.getSpotPrice(currencyToInfo.id, nativeCurrencyInfo.id);
             case 12:
               priceInfo = _context.v;
               if (currencyToInfo.id === nativeCurrencyInfo.id) {
                 priceInfo = {
-                  amount: BigNumber(parseUnits$1('1', nativeCurrencyDecimals)),
+                  amount: parseUnits$1('1', nativeCurrencyDecimals),
                   decimals: nativeCurrencyDecimals
                 };
               }
@@ -8763,7 +9482,7 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
               }
               throw new UnableToComputeError('Price not found');
             case 13:
-              currencyToPrice = BigInt(priceInfo.amount.decimalPlaces(0).toString());
+              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;
@@ -8791,40 +9510,45 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "getAmountOut",
     value: function () {
       var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-        var apiPjs, assetFrom, assetTo, amount, origin, _options$slippagePct, slippagePct, _createSdkContext2, tradeRouter, currencyFromInfo, currencyToInfo, pctDestFee, amountWithoutFee, amountNormalized, trade, amountOut, slippageMultiplier;
+        var apiPapi, assetFrom, assetTo, amount, origin, _options$slippagePct, slippagePct, _yield$createSdkConte2, tradeRouter, assetClient, currencyFromInfo, currencyToInfo, pctDestFee, amountWithoutFee, amountNormalized, trade, amountOut, slippageMultiplier;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              apiPjs = options.apiPjs, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin, _options$slippagePct = options.slippagePct, slippagePct = _options$slippagePct === void 0 ? '0' : _options$slippagePct;
-              _createSdkContext2 = createSdkContext(apiPjs), tradeRouter = _createSdkContext2.api.router;
+              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 getAssetInfo(tradeRouter, assetFrom);
+              return createSdkContext(apiPapi);
             case 1:
-              currencyFromInfo = _context2.v;
+              _yield$createSdkConte2 = _context2.v;
+              tradeRouter = _yield$createSdkConte2.api.router;
+              assetClient = _yield$createSdkConte2.client.asset;
               _context2.n = 2;
-              return getAssetInfo(tradeRouter, assetTo);
+              return getAssetInfo(assetClient, assetFrom);
             case 2:
+              currencyFromInfo = _context2.v;
+              _context2.n = 3;
+              return getAssetInfo(assetClient, assetTo);
+            case 3:
               currencyToInfo = _context2.v;
               if (!(currencyFromInfo === undefined)) {
-                _context2.n = 3;
+                _context2.n = 4;
                 break;
               }
               throw new InvalidCurrencyError("Currency from doesn't exist");
-            case 3:
+            case 4:
               if (!(currencyToInfo === undefined)) {
-                _context2.n = 4;
+                _context2.n = 5;
                 break;
               }
               throw new InvalidCurrencyError("Currency to doesn't exist");
-            case 4:
+            case 5:
               pctDestFee = origin ? DEST_FEE_BUFFER_PCT : 0;
               amountWithoutFee = padValueBy(amount, pctDestFee);
               amountNormalized = formatUnits$1(amountWithoutFee, currencyFromInfo.decimals);
-              _context2.n = 5;
+              _context2.n = 6;
               return tradeRouter.getBestSell(currencyFromInfo.id, currencyToInfo.id, amountNormalized);
-            case 5:
+            case 6:
               trade = _context2.v;
-              amountOut = BigInt(trade.amountOut.decimalPlaces(0).toString());
+              amountOut = trade.amountOut;
               slippageMultiplier = Number(slippagePct);
               return _context2.a(2, padValueBy(amountOut, -slippageMultiplier));
           }
@@ -8839,14 +9563,18 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "getDexConfig",
     value: function () {
       var _getDexConfig = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(api) {
-        var _createSdkContext3, tradeRouter, assets, sdkAssets, transformedAssets;
+        var sdk, assets, sdkAssets, transformedAssets;
         return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+          while (1) switch (_context3.p = _context3.n) {
             case 0:
-              _createSdkContext3 = createSdkContext(api), tradeRouter = _createSdkContext3.api.router;
               _context3.n = 1;
-              return tradeRouter.getAllAssets();
+              return createSdkContext(api);
             case 1:
+              sdk = _context3.v;
+              _context3.p = 2;
+              _context3.n = 3;
+              return sdk.client.asset.getSupported();
+            case 3:
               assets = _context3.v;
               sdkAssets = getAssets(this.chain);
               transformedAssets = assets.map(function (_ref) {
@@ -8854,7 +9582,7 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
                 var symbol = _ref.symbol,
                   id = _ref.id;
                 var asset = (_sdkAssets$find = sdkAssets.find(function (a) {
-                  return !a.isNative && a.assetId === id;
+                  return !a.isNative && a.assetId === id.toString();
                 })) !== null && _sdkAssets$find !== void 0 ? _sdkAssets$find : sdkAssets.find(function (a) {
                   return a.symbol.toLowerCase() === symbol.toLowerCase();
                 });
@@ -8870,8 +9598,14 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
                 }),
                 pairs: []
               });
+            case 4:
+              _context3.p = 4;
+              sdk.destroy();
+              return _context3.f(4);
+            case 5:
+              return _context3.a(2);
           }
-        }, _callee3, this);
+        }, _callee3, this, [[2,, 4, 5]]);
       }));
       function getDexConfig(_x4) {
         return _getDexConfig.apply(this, arguments);
@@ -9327,65 +10061,116 @@ var selectBestExchangeCommon = /*#__PURE__*/function () {
   };
 }();
 
+var createToExchangeBuilder = function createToExchangeBuilder(_ref) {
+  var origin = _ref.origin,
+    exchange = _ref.exchange,
+    sender = _ref.sender,
+    evmSenderAddress = _ref.evmSenderAddress,
+    amount = _ref.amount,
+    api = _ref.api;
+  return Builder(api.clone()).from(origin.chain).to(exchange.chain).currency({
+    location: origin.assetFrom.location,
+    amount: amount
+  }).sender(isChainEvm(origin.chain) ? evmSenderAddress : sender).recipient(sender);
+};
+var buildToExchangeExtrinsic = function buildToExchangeExtrinsic(options) {
+  return createToExchangeBuilder(options).build();
+};
+var getToExchangeFee = function getToExchangeFee(options, disableFallback) {
+  return createToExchangeBuilder(options).getXcmFee({
+    disableFallback: disableFallback
+  });
+};
+var getToExchangeOriginFee = function getToExchangeOriginFee(options, disableFallback) {
+  return createToExchangeBuilder(options).getOriginXcmFee({
+    disableFallback: disableFallback
+  });
+};
+var createFromExchangeBuilder = function createFromExchangeBuilder(_ref2) {
+  var exchange = _ref2.exchange,
+    destination = _ref2.destination,
+    amount = _ref2.amount,
+    sender = _ref2.sender,
+    api = _ref2.api;
+  var apiForChain = api.clone();
+  return Builder(apiForChain).from(exchange.chain).to(destination.chain).currency({
+    location: exchange.assetTo.location,
+    amount: amount
+  }).sender(sender).recipient(destination.address);
+};
+var buildFromExchangeExtrinsic = function buildFromExchangeExtrinsic(options) {
+  return createFromExchangeBuilder(options).build();
+};
+var getFromExchangeFee = function getFromExchangeFee(options, disableFallback) {
+  return createFromExchangeBuilder(options).getXcmFee({
+    disableFallback: disableFallback
+  });
+};
+var determineFeeCalcAddress = function determineFeeCalcAddress(sender, recipient) {
+  if (!ethers.isAddress(sender)) {
+    // Use wallet address for fee calculation
+    return sender;
+  }
+  if (recipient && !ethers.isAddress(recipient)) {
+    // Use recipient address for fee calculation
+    return recipient;
+  }
+  // If both addresses are ethereum addresses, use fallback address for fee calculation
+  return FALLBACK_FEE_CALC_ADDRESS;
+};
+
 var selectBestExchange = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, originApi, isForFeeEstimation) {
-    var api;
+    var api, exchangeConfig;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
           api = options.api;
+          exchangeConfig = convertBuilderConfig(api.config);
           return _context2.a(2, selectBestExchangeCommon(options, originApi, /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, assetFromExchange, assetTo, options, parsedAmount) {
-              var modifiedOptions, toDestTxFee, _yield$dex$handleMult, amountOut, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0, _t1, _t10;
+              var exchangeInfo, modifiedOptions, toDestTxFee, _yield$dex$handleMult, amountOut, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
                     _t = _objectSpread2;
-                    _t2 = _objectSpread2({}, options);
+                    _t2 = _objectSpread2;
                     _t3 = {};
-                    _t4 = BigInt(parsedAmount);
                     _context.n = 1;
-                    return dex.createApiInstance();
+                    return buildExchangeApiVariant(dex, exchangeConfig);
                   case 1:
-                    _t5 = _context.v;
+                    _t4 = _t2(_t3, _context.v);
+                    _t5 = {};
                     _context.n = 2;
-                    return dex.createApiInstancePapi();
+                    return api.createApiForChain(dex.chain);
                   case 2:
                     _t6 = _context.v;
-                    _context.n = 3;
-                    return api.createApiForChain(dex.chain);
-                  case 3:
-                    _t7 = _context.v;
-                    _t8 = dex.chain;
-                    _t9 = assetFromExchange;
-                    _t0 = assetTo;
-                    _t1 = {
-                      apiPjs: _t5,
-                      apiPapi: _t6,
-                      api: _t7,
-                      chain: _t8,
-                      assetFrom: _t9,
-                      assetTo: _t0
-                    };
-                    _t10 = determineFeeCalcAddress(options.sender, options.recipient);
-                    modifiedOptions = _t(_t2, _t3, {
-                      amount: _t4,
-                      exchange: _t1,
-                      feeCalcAddress: _t10
+                    _t7 = dex.chain;
+                    _t8 = assetFromExchange;
+                    _t9 = assetTo;
+                    exchangeInfo = _t(_t4, _t5, {
+                      api: _t6,
+                      chain: _t7,
+                      assetFrom: _t8,
+                      assetTo: _t9
                     });
-                    _context.n = 4;
+                    modifiedOptions = _objectSpread2(_objectSpread2({}, options), {}, {
+                      amount: BigInt(parsedAmount),
+                      exchange: exchangeInfo,
+                      feeCalcAddress: determineFeeCalcAddress(options.sender, options.recipient)
+                    });
+                    _context.n = 3;
                     return calculateFromExchangeFee(modifiedOptions);
-                  case 4:
+                  case 3:
                     toDestTxFee = _context.v;
-                    _context.n = 5;
-                    return dex.handleMultiSwap(_objectSpread2(_objectSpread2({}, modifiedOptions), {}, {
+                    _context.n = 4;
+                    return dex.handleMultiSwap(_objectSpread2(_objectSpread2(_objectSpread2({}, modifiedOptions), pickExchangeApiVariant(modifiedOptions.exchange)), {}, {
                       api: modifiedOptions.exchange.api,
-                      apiPjs: modifiedOptions.exchange.apiPjs,
                       assetFrom: modifiedOptions.exchange.assetFrom,
                       assetTo: modifiedOptions.exchange.assetTo,
                       isForFeeEstimation: isForFeeEstimation
                     }), toDestTxFee);
-                  case 5:
+                  case 4:
                     _yield$dex$handleMult = _context.v;
                     amountOut = _yield$dex$handleMult.amountOut;
                     return _context.a(2, amountOut);
@@ -9454,59 +10239,6 @@ var resolveAssets = function resolveAssets(dex, _ref) {
   };
 };
 
-var createToExchangeBuilder = function createToExchangeBuilder(_ref) {
-  var origin = _ref.origin,
-    exchange = _ref.exchange,
-    sender = _ref.sender,
-    evmSenderAddress = _ref.evmSenderAddress,
-    amount = _ref.amount,
-    api = _ref.api;
-  return Builder(api.clone()).from(origin.chain).to(exchange.chain).currency({
-    location: origin.assetFrom.location,
-    amount: amount
-  }).sender(isChainEvm(origin.chain) ? evmSenderAddress : sender).recipient(sender);
-};
-var buildToExchangeExtrinsic = function buildToExchangeExtrinsic(options) {
-  return createToExchangeBuilder(options).build();
-};
-var getToExchangeFee = function getToExchangeFee(options, disableFallback) {
-  return createToExchangeBuilder(options).getXcmFee({
-    disableFallback: disableFallback
-  });
-};
-var createFromExchangeBuilder = function createFromExchangeBuilder(_ref2) {
-  var exchange = _ref2.exchange,
-    destination = _ref2.destination,
-    amount = _ref2.amount,
-    sender = _ref2.sender,
-    api = _ref2.api;
-  var apiForChain = api.clone();
-  return Builder(apiForChain).from(exchange.chain).to(destination.chain).currency({
-    location: exchange.assetTo.location,
-    amount: amount
-  }).sender(sender).recipient(destination.address);
-};
-var buildFromExchangeExtrinsic = function buildFromExchangeExtrinsic(options) {
-  return createFromExchangeBuilder(options).build();
-};
-var getFromExchangeFee = function getFromExchangeFee(options, disableFallback) {
-  return createFromExchangeBuilder(options).getXcmFee({
-    disableFallback: disableFallback
-  });
-};
-var determineFeeCalcAddress = function determineFeeCalcAddress(sender, recipient) {
-  if (!ethers.isAddress(sender)) {
-    // Use wallet address for fee calculation
-    return sender;
-  }
-  if (recipient && !ethers.isAddress(recipient)) {
-    // Use recipient address for fee calculation
-    return recipient;
-  }
-  // If both addresses are ethereum addresses, use fallback address for fee calculation
-  return FALLBACK_FEE_CALC_ADDRESS;
-};
-
 var prepareTransformedOptions = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _assetFromOrigin$deci;
@@ -9545,11 +10277,7 @@ var prepareTransformedOptions = /*#__PURE__*/function () {
       _t0,
       _t1,
       _t10,
-      _t11,
-      _t12,
-      _t13,
-      _t14,
-      _t15;
+      _t11;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -9608,39 +10336,30 @@ var prepareTransformedOptions = /*#__PURE__*/function () {
             assetFrom: assetFromOrigin,
             feeAssetInfo: feeAssetFromOrigin
           } : undefined;
+          _t8 = _objectSpread2;
+          _t9 = _objectSpread2;
+          _t0 = {};
           _context.n = 9;
-          return dex.createApiInstance(exchangeConfig);
+          return buildExchangeApiVariant(dex, exchangeConfig);
         case 9:
-          _t8 = _context.v;
-          _context.n = 10;
-          return dex.createApiInstancePapi(exchangeConfig);
-        case 10:
-          _t9 = _context.v;
-          _t0 = exchangeApi;
-          _t1 = dex.chain;
-          _t10 = assetFromExchange;
-          _t11 = assetTo;
-          _t12 = feeAssetFromExchange;
-          _t13 = {
-            apiPjs: _t8,
-            apiPapi: _t9,
-            api: _t0,
-            chain: _t1,
-            assetFrom: _t10,
-            assetTo: _t11,
-            feeAssetInfo: _t12
-          };
-          _t14 = destinationSpecified && recipient ? {
+          _t1 = _t8(_t9(_t0, _context.v), {}, {
+            api: exchangeApi,
+            chain: dex.chain,
+            assetFrom: assetFromExchange,
+            assetTo: assetTo,
+            feeAssetInfo: feeAssetFromExchange
+          });
+          _t10 = destinationSpecified && recipient ? {
             chain: to,
             address: recipient
           } : undefined;
-          _t15 = determineFeeCalcAddress(sender, recipient);
+          _t11 = determineFeeCalcAddress(sender, recipient);
           transformed = _t3(_t4, _t5, {
             amount: _t6,
             origin: _t7,
-            exchange: _t13,
-            destination: _t14,
-            feeCalcAddress: _t15
+            exchange: _t1,
+            destination: _t10,
+            feeCalcAddress: _t11
           });
           return _context.a(2, {
             dex: dex,
@@ -9654,6 +10373,199 @@ var prepareTransformedOptions = /*#__PURE__*/function () {
   };
 }();
 
+var callDexAmountOut = function callDexAmountOut(dex, options) {
+  var _overrides$amount, _overrides$assetTo;
+  var overrides = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  return dex.getAmountOut(_objectSpread2(_objectSpread2(_objectSpread2({}, options), pickExchangeApiVariant(options.exchange)), {}, {
+    amount: (_overrides$amount = overrides.amount) !== null && _overrides$amount !== void 0 ? _overrides$amount : options.amount,
+    api: options.exchange.api,
+    assetFrom: options.exchange.assetFrom,
+    assetTo: (_overrides$assetTo = overrides.assetTo) !== null && _overrides$assetTo !== void 0 ? _overrides$assetTo : options.exchange.assetTo
+  }, overrides.slippagePct !== undefined && {
+    slippagePct: overrides.slippagePct
+  }));
+};
+var buildSwapExecuteTx = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, options) {
+    var _overrides$amount2, _origin$assetFrom, _origin$feeAssetInfo;
+    var overrides,
+      api,
+      origin,
+      exchange,
+      destination,
+      currencyTo,
+      amount,
+      sender,
+      recipient,
+      evmSenderAddress,
+      amt,
+      minAmountOutSlippage,
+      amountOut,
+      tx,
+      _args = arguments;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          overrides = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
+          api = options.api, origin = options.origin, exchange = options.exchange, destination = options.destination, currencyTo = options.currencyTo, amount = options.amount, sender = options.sender, recipient = options.recipient, evmSenderAddress = options.evmSenderAddress;
+          amt = (_overrides$amount2 = overrides.amount) !== null && _overrides$amount2 !== void 0 ? _overrides$amount2 : amount;
+          minAmountOutSlippage = overrides.feeEstimation ? '1' : undefined;
+          _context.n = 1;
+          return callDexAmountOut(dex, options, {
+            amount: amt
+          });
+        case 1:
+          amountOut = _context.v;
+          _context.n = 2;
+          return handleSwapExecuteTransfer({
+            api: api,
+            chain: origin === null || origin === void 0 ? void 0 : origin.chain,
+            exchangeChain: exchange.chain,
+            destChain: destination === null || destination === void 0 ? void 0 : destination.chain,
+            assetInfoFrom: _objectSpread2(_objectSpread2({}, (_origin$assetFrom = origin === null || origin === void 0 ? void 0 : origin.assetFrom) !== null && _origin$assetFrom !== void 0 ? _origin$assetFrom : exchange.assetFrom), {}, {
+              amount: amt
+            }),
+            assetInfoTo: _objectSpread2(_objectSpread2({}, exchange.assetTo), {}, {
+              amount: amountOut
+            }),
+            currencyTo: currencyTo,
+            feeAssetInfo: (_origin$feeAssetInfo = origin === null || origin === void 0 ? void 0 : origin.feeAssetInfo) !== null && _origin$feeAssetInfo !== void 0 ? _origin$feeAssetInfo : exchange.feeAssetInfo,
+            sender: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender,
+            recipient: recipient !== null && recipient !== void 0 ? recipient : sender,
+            calculateMinAmountOut: function calculateMinAmountOut(amountIn, assetTo) {
+              return callDexAmountOut(dex, options, {
+                amount: amountIn,
+                assetTo: assetTo,
+                slippagePct: minAmountOutSlippage
+              });
+            }
+          });
+        case 2:
+          tx = _context.v;
+          return _context.a(2, {
+            tx: tx,
+            amountOut: amountOut
+          });
+      }
+    }, _callee);
+  }));
+  return function buildSwapExecuteTx(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var createSwapExecuteBuildTx = function createSwapExecuteBuildTx(dex, options) {
+  return /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(overrideAmount) {
+      var amt, _yield$buildSwapExecu, tx;
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
+          case 0:
+            amt = overrideAmount !== undefined ? applyDecimalAbstraction(overrideAmount, options.exchange.assetFrom.decimals, true) : options.amount;
+            _context2.n = 1;
+            return buildSwapExecuteTx(dex, options, {
+              amount: amt,
+              feeEstimation: true
+            });
+          case 1:
+            _yield$buildSwapExecu = _context2.v;
+            tx = _yield$buildSwapExecu.tx;
+            return _context2.a(2, tx);
+        }
+      }, _callee2);
+    }));
+    return function (_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+};
+var canUseExecuteTransfer = function canUseExecuteTransfer(dex, options) {
+  return Boolean(options.origin || options.destination) && (dex.chain.includes('AssetHub') || dex.chain === 'Hydration');
+};
+var isFilteredError = function isFilteredError(error) {
+  return error instanceof DryRunFailedError && error.dryRunType === 'origin' && error.reason === 'Filtered';
+};
+var getSwapExecuteXcmFee = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(dex, options, disableFallback) {
+    var _origin$chain, _destination$chain;
+    var api, origin, exchange, currencyFrom, currencyTo, feeAsset, destination, amount, sender, recipient, evmSenderAddress, buildTx, amountOut, result;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
+        case 0:
+          api = options.api, origin = options.origin, exchange = options.exchange, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo, feeAsset = options.feeAsset, destination = options.destination, amount = options.amount, sender = options.sender, recipient = options.recipient, evmSenderAddress = options.evmSenderAddress;
+          assertCurrencyCore(currencyTo);
+          buildTx = createSwapExecuteBuildTx(dex, options);
+          _context3.n = 1;
+          return callDexAmountOut(dex, options);
+        case 1:
+          amountOut = _context3.v;
+          _context3.n = 2;
+          return getXcmFee({
+            api: api,
+            buildTx: buildTx,
+            origin: (_origin$chain = origin === null || origin === void 0 ? void 0 : origin.chain) !== null && _origin$chain !== void 0 ? _origin$chain : exchange.chain,
+            destination: (_destination$chain = destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _destination$chain !== void 0 ? _destination$chain : exchange.chain,
+            sender: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender,
+            recipient: recipient !== null && recipient !== void 0 ? recipient : sender,
+            currency: _objectSpread2(_objectSpread2({}, currencyFrom), {}, {
+              amount: amount
+            }),
+            feeAsset: feeAsset,
+            disableFallback: disableFallback,
+            swapConfig: {
+              currencyTo: currencyTo,
+              exchangeChain: exchange.chain,
+              amountOut: amountOut
+            }
+          });
+        case 2:
+          result = _context3.v;
+          if (!(result.failureReason === 'NoDeal' && exchange.chain === 'Hydration')) {
+            _context3.n = 3;
+            break;
+          }
+          throw new RoutingResolutionError('An error occured, either this route is not registered for swap on exchange chain, or the amount out was not able to be calculated.');
+        case 3:
+          return _context3.a(2, {
+            result: result,
+            amountOut: amountOut
+          });
+      }
+    }, _callee3);
+  }));
+  return function getSwapExecuteXcmFee(_x4, _x5, _x6) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+var getSwapExecuteOriginXcmFee = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(dex, options, disableFallback) {
+    var _origin$chain2, _destination$chain2;
+    var api, origin, exchange, currencyFrom, feeAsset, destination, amount, sender, evmSenderAddress, buildTx;
+    return _regenerator().w(function (_context4) {
+      while (1) switch (_context4.n) {
+        case 0:
+          api = options.api, origin = options.origin, exchange = options.exchange, currencyFrom = options.currencyFrom, feeAsset = options.feeAsset, destination = options.destination, amount = options.amount, sender = options.sender, evmSenderAddress = options.evmSenderAddress;
+          buildTx = createSwapExecuteBuildTx(dex, options);
+          assertCurrencyCore(currencyFrom);
+          return _context4.a(2, getOriginXcmFee$1({
+            api: api,
+            buildTx: buildTx,
+            origin: (_origin$chain2 = origin === null || origin === void 0 ? void 0 : origin.chain) !== null && _origin$chain2 !== void 0 ? _origin$chain2 : exchange.chain,
+            destination: (_destination$chain2 = destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _destination$chain2 !== void 0 ? _destination$chain2 : exchange.chain,
+            sender: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender,
+            currency: _objectSpread2(_objectSpread2({}, currencyFrom), {}, {
+              amount: amount
+            }),
+            feeAsset: feeAsset,
+            disableFallback: disableFallback
+          }));
+      }
+    }, _callee4);
+  }));
+  return function getSwapExecuteOriginXcmFee(_x7, _x8, _x9) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
 var validateDestinationAddress = function validateDestinationAddress(address, destination) {
   if (typeof address === 'string') {
     var isDestinationEvm = isChainEvm(destination);
@@ -9749,9 +10661,8 @@ var createSwapTx = /*#__PURE__*/function () {
         case 1:
           toDestTxFee = _context2.v;
           _context2.n = 2;
-          return exchange.handleMultiSwap(_objectSpread2(_objectSpread2({}, options), {}, {
+          return exchange.handleMultiSwap(_objectSpread2(_objectSpread2(_objectSpread2({}, options), pickExchangeApiVariant(options.exchange)), {}, {
             api: options.exchange.api,
-            apiPjs: options.exchange.apiPjs,
             assetFrom: options.exchange.assetFrom,
             assetTo: options.exchange.assetTo,
             isForFeeEstimation: isForFeeEstimation
@@ -9772,100 +10683,69 @@ var createSwapTx = /*#__PURE__*/function () {
     }, _callee2);
   }));
   return function createSwapTx(_x2, _x3) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var prepareExtrinsics = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, options) {
-    var api, origin, exchange, destination, currencyTo, amount, evmSenderAddress, sender, recipient, _origin$assetFrom, _origin$feeAssetInfo, _amountOut, tx, toExchangeTx, _yield$createSwapTx, swapTxs, amountOut, toDestTx, _t, _t2, _t3;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
-        case 0:
-          api = options.api, origin = options.origin, exchange = options.exchange, destination = options.destination, currencyTo = options.currencyTo, amount = options.amount, evmSenderAddress = options.evmSenderAddress, sender = options.sender, recipient = options.recipient;
-          if (!((origin || destination) && (dex.chain.includes('AssetHub') || dex.chain === 'Hydration'))) {
-            _context.n = 5;
-            break;
-          }
-          _context.p = 1;
-          _context.n = 2;
-          return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
-            api: exchange.api,
-            apiPjs: exchange.apiPjs,
-            assetFrom: exchange.assetFrom,
-            assetTo: exchange.assetTo
-          }));
-        case 2:
-          _amountOut = _context.v;
-          _context.n = 3;
-          return handleSwapExecuteTransfer({
-            api: api,
-            chain: origin === null || origin === void 0 ? void 0 : origin.chain,
-            exchangeChain: exchange.chain,
-            destChain: destination === null || destination === void 0 ? void 0 : destination.chain,
-            assetInfoFrom: _objectSpread2(_objectSpread2({}, (_origin$assetFrom = origin === null || origin === void 0 ? void 0 : origin.assetFrom) !== null && _origin$assetFrom !== void 0 ? _origin$assetFrom : exchange.assetFrom), {}, {
-              amount: BigInt(amount)
-            }),
-            assetInfoTo: _objectSpread2(_objectSpread2({}, exchange.assetTo), {}, {
-              amount: _amountOut
-            }),
-            sender: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender,
-            recipient: recipient !== null && recipient !== void 0 ? recipient : sender,
-            currencyTo: currencyTo,
-            feeAssetInfo: (_origin$feeAssetInfo = origin === null || origin === void 0 ? void 0 : origin.feeAssetInfo) !== null && _origin$feeAssetInfo !== void 0 ? _origin$feeAssetInfo : exchange.feeAssetInfo,
-            calculateMinAmountOut: function calculateMinAmountOut(amountIn, assetTo) {
-              return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
-                amount: amountIn,
-                api: options.exchange.api,
-                apiPjs: options.exchange.apiPjs,
-                assetFrom: options.exchange.assetFrom,
-                assetTo: assetTo !== null && assetTo !== void 0 ? assetTo : options.exchange.assetTo
-              }));
-            }
-          });
-        case 3:
-          tx = _context.v;
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var prepareExtrinsics = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, options) {
+    var api, origin, exchange, destination, sender, _yield$buildSwapExecu, tx, _amountOut, toExchangeTx, _yield$createSwapTx, swapTxs, amountOut, toDestTx, _t, _t2, _t3;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
+        case 0:
+          api = options.api, origin = options.origin, exchange = options.exchange, destination = options.destination, sender = options.sender;
+          if (!canUseExecuteTransfer(dex, options)) {
+            _context.n = 4;
+            break;
+          }
+          _context.p = 1;
+          _context.n = 2;
+          return buildSwapExecuteTx(dex, options);
+        case 2:
+          _yield$buildSwapExecu = _context.v;
+          tx = _yield$buildSwapExecu.tx;
+          _amountOut = _yield$buildSwapExecu.amountOut;
           return _context.a(2, {
             swapTxs: [tx],
             isExecute: true,
             amountOut: _amountOut
           });
-        case 4:
-          _context.p = 4;
+        case 3:
+          _context.p = 3;
           _t = _context.v;
-          if (_t instanceof DryRunFailedError && _t.dryRunType === 'origin' && _t.reason === 'Filtered') {
-            _context.n = 5;
+          if (isFilteredError(_t)) {
+            _context.n = 4;
             break;
           }
           throw _t;
-        case 5:
+        case 4:
           if (!(origin && origin.chain !== exchange.chain)) {
-            _context.n = 7;
+            _context.n = 6;
             break;
           }
-          _context.n = 6;
+          _context.n = 5;
           return buildToExchangeExtrinsic(_objectSpread2(_objectSpread2({}, options), {}, {
             origin: origin
           }));
-        case 6:
+        case 5:
           _t2 = _context.v;
-          _context.n = 8;
+          _context.n = 7;
           break;
-        case 7:
+        case 6:
           _t2 = undefined;
-        case 8:
+        case 7:
           toExchangeTx = _t2;
-          _context.n = 9;
+          _context.n = 8;
           return createSwapTx(dex, options);
-        case 9:
+        case 8:
           _yield$createSwapTx = _context.v;
           swapTxs = _yield$createSwapTx.txs;
           amountOut = _yield$createSwapTx.amountOut;
           if (!(destination && destination.chain !== exchange.chain)) {
-            _context.n = 11;
+            _context.n = 10;
             break;
           }
-          _context.n = 10;
+          _context.n = 9;
           return buildFromExchangeExtrinsic({
             exchange: exchange,
             destination: destination,
@@ -9873,13 +10753,13 @@ var prepareExtrinsics = /*#__PURE__*/function () {
             sender: sender,
             api: api
           });
-        case 10:
+        case 9:
           _t3 = _context.v;
-          _context.n = 12;
+          _context.n = 11;
           break;
-        case 11:
+        case 10:
           _t3 = undefined;
-        case 12:
+        case 11:
           toDestTx = _t3;
           return _context.a(2, {
             toExchangeTx: toExchangeTx,
@@ -9888,7 +10768,7 @@ var prepareExtrinsics = /*#__PURE__*/function () {
             amountOut: BigInt(amountOut)
           });
       }
-    }, _callee, null, [[1, 4]]);
+    }, _callee, null, [[1, 3]]);
   }));
   return function prepareExtrinsics(_x, _x2) {
     return _ref.apply(this, arguments);
@@ -9962,7 +10842,7 @@ var buildTransactions = /*#__PURE__*/function () {
 
 var buildApiTransactions = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(initialOptions) {
-    var _yield$prepareTransfo, options, dex;
+    var _yield$prepareTransfo, options, dex, routerPlan;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -9973,7 +10853,14 @@ var buildApiTransactions = /*#__PURE__*/function () {
           _yield$prepareTransfo = _context.v;
           options = _yield$prepareTransfo.options;
           dex = _yield$prepareTransfo.dex;
-          return _context.a(2, buildTransactions(dex, options));
+          _context.n = 2;
+          return buildTransactions(dex, options);
+        case 2:
+          routerPlan = _context.v;
+          _context.n = 3;
+          return maybePerformXcmFormatCheck(initialOptions.api, options, routerPlan);
+        case 3:
+          return _context.a(2, routerPlan);
       }
     }, _callee);
   }));
@@ -9982,143 +10869,78 @@ var buildApiTransactions = /*#__PURE__*/function () {
   };
 }();
 
-var assignIsExchange = function assignIsExchange(result, options) {
-  var origin = options.origin,
-    exchange = options.exchange,
-    destination = options.destination;
-  if (!origin) {
-    result.origin.isExchange = true;
-  }
-  if (!destination && result.destination) {
-    result.destination.isExchange = true;
-  }
-  result.hops = result.hops.map(function (hop) {
-    var isExchange = hop.chain === exchange.chain;
-    return _objectSpread2(_objectSpread2({}, hop), {}, {
-      result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
-        isExchange: isExchange
-      }),
-      isExchange: isExchange
-    });
-  });
-  return result;
-};
-var dryRunTransaction = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, transaction, destChain, bypassOptions) {
-    var _ref2;
-    var api, exchange, sender, evmSenderAddress, destination, currencyFrom, currencyTo, amount, tx, chain, senderResolved, resolvedDest;
+var getSwapOriginFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, options, disableFallback) {
+    var origin, exchange, _yield$getSwapFee, result, _t;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          api = options.api, exchange = options.exchange, sender = options.sender, evmSenderAddress = options.evmSenderAddress, destination = options.destination, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo, amount = options.amount;
-          tx = transaction.tx, chain = transaction.chain;
-          senderResolved = evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender;
-          resolvedDest = (_ref2 = destChain !== null && destChain !== void 0 ? destChain : destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _ref2 !== void 0 ? _ref2 : exchange.chain;
-          return _context.a(2, dryRun({
-            api: api.clone(),
-            tx: tx,
-            origin: chain,
-            destination: resolvedDest,
-            sender: senderResolved,
-            swapConfig: {
-              currencyTo: currencyTo,
-              exchangeChain: exchange.chain
-            },
-            currency: _objectSpread2(_objectSpread2({}, currencyFrom), {}, {
-              amount: BigInt(amount)
-            }),
-            bypassOptions: bypassOptions
-          }));
-      }
-    }, _callee);
-  }));
-  return function dryRunTransaction(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var mergeDryRunResults = function mergeDryRunResults(options, originResult, exchangeResult) {
-  var exchange = options.exchange,
-    destination = options.destination;
-  var result = {
-    origin: originResult.origin,
-    destination: destination ? exchangeResult.destination : exchangeResult.origin,
-    hops: [].concat(_toConsumableArray(originResult.hops), _toConsumableArray(destination ? [{
-      chain: exchange.chain,
-      result: exchangeResult.origin
-    }] : []), _toConsumableArray(exchangeResult.hops))
-  };
-  return _objectSpread2(_objectSpread2({}, getFailureInfo(result)), result);
-};
-var dryRun2Transactions = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, transactions) {
-    var exchange, _transactions, firstTx, secondTx, firstRes, _getFailureInfo, failureReason, bypassOptions, secondRes;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          exchange = options.exchange;
-          _transactions = _slicedToArray(transactions, 2), firstTx = _transactions[0], secondTx = _transactions[1];
-          _context2.n = 1;
-          return dryRunTransaction(options, firstTx, exchange.chain);
-        case 1:
-          firstRes = _context2.v;
-          _getFailureInfo = getFailureInfo(firstRes), failureReason = _getFailureInfo.failureReason;
-          bypassOptions = !failureReason ? {
-            sentAssetMintMode: 'preview',
-            mintFeeAssets: false
-          } : undefined;
-          _context2.n = 2;
-          return dryRunTransaction(options, secondTx, undefined, bypassOptions);
+          origin = options.origin, exchange = options.exchange;
+          if (!canUseExecuteTransfer(dex, options)) {
+            _context.n = 4;
+            break;
+          }
+          _context.p = 1;
+          _context.n = 2;
+          return getSwapExecuteOriginXcmFee(dex, options, disableFallback);
         case 2:
-          secondRes = _context2.v;
-          return _context2.a(2, mergeDryRunResults(options, firstRes, secondRes));
+          return _context.a(2, _context.v);
+        case 3:
+          _context.p = 3;
+          _t = _context.v;
+          if (isFilteredError(_t)) {
+            _context.n = 4;
+            break;
+          }
+          throw _t;
+        case 4:
+          if (!(origin && origin.chain !== exchange.chain)) {
+            _context.n = 5;
+            break;
+          }
+          return _context.a(2, getToExchangeOriginFee(_objectSpread2(_objectSpread2({}, options), {}, {
+            origin: origin
+          }), disableFallback));
+        case 5:
+          _context.n = 6;
+          return getSwapFee(dex, options, disableFallback);
+        case 6:
+          _yield$getSwapFee = _context.v;
+          result = _yield$getSwapFee.result;
+          return _context.a(2, result);
       }
-    }, _callee2);
+    }, _callee, null, [[1, 3]]);
   }));
-  return function dryRun2Transactions(_x5, _x6) {
-    return _ref3.apply(this, arguments);
+  return function getSwapOriginFee(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
   };
 }();
-var dryRunTransactions = function dryRunTransactions(transactions, options) {
-  if (transactions.length === 1) {
-    return dryRunTransaction(options, transactions[0]);
-  }
-  if (transactions.length === 2) {
-    return dryRun2Transactions(options, transactions);
-  }
-  throw new UnsupportedOperationError('Router dry run supports up to two transactions per flow.');
-};
-var dryRunRouter = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(initialOptions) {
-    var _yield$prepareTransfo, options, dex, routerPlan, result;
-    return _regenerator().w(function (_context3) {
-      while (1) switch (_context3.n) {
+
+var getOriginXcmFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(initialOptions, disableFallback) {
+    var _yield$prepareTransfo, options, dex;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
           validateTransferOptions(initialOptions);
-          _context3.n = 1;
-          return prepareTransformedOptions(initialOptions);
+          _context.n = 1;
+          return prepareTransformedOptions(initialOptions, true);
         case 1:
-          _yield$prepareTransfo = _context3.v;
+          _yield$prepareTransfo = _context.v;
           options = _yield$prepareTransfo.options;
           dex = _yield$prepareTransfo.dex;
-          _context3.n = 2;
-          return buildTransactions(dex, options);
-        case 2:
-          routerPlan = _context3.v;
-          _context3.n = 3;
-          return dryRunTransactions(routerPlan, options);
-        case 3:
-          result = _context3.v;
-          return _context3.a(2, assignIsExchange(result, options));
+          return _context.a(2, getSwapOriginFee(dex, options, disableFallback));
       }
-    }, _callee3);
+    }, _callee);
   }));
-  return function dryRunRouter(_x7) {
-    return _ref4.apply(this, arguments);
+  return function getOriginXcmFee(_x, _x2) {
+    return _ref.apply(this, arguments);
   };
 }();
 
 var getSwapFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(exchange, options, disableFallback) {
+    var _result$fee;
     var sender, _options$exchange, assetFrom, api, amount, txs, amountOut, isForFeeEstimation, swapResult, buildTx, result, finalFee, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
@@ -10169,7 +10991,7 @@ var getSwapFee = /*#__PURE__*/function () {
             };
           }();
           _context2.n = 6;
-          return getOriginXcmFee({
+          return getOriginXcmFee$1({
             api: api,
             buildTx: buildTx,
             origin: exchange.chain,
@@ -10183,7 +11005,7 @@ var getSwapFee = /*#__PURE__*/function () {
           });
         case 6:
           result = _context2.v;
-          finalFee = result.fee * BigInt(txs.length);
+          finalFee = ((_result$fee = result.fee) !== null && _result$fee !== void 0 ? _result$fee : 0n) * BigInt(txs.length);
           return _context2.a(2, {
             result: _objectSpread2(_objectSpread2({}, result), {}, {
               fee: finalFee
@@ -10199,166 +11021,76 @@ var getSwapFee = /*#__PURE__*/function () {
 }();
 
 var getRouterFees = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(dex, options, disableFallback) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, options, disableFallback) {
     var _sendingChain$hops, _receivingChain$origi, _receivingChain$hops, _sendingChain$origin, _receivingChain$desti, _sendingChain$failure, _sendingChain$failure2;
-    var api, origin, exchange, currencyFrom, currencyTo, feeAsset, destination, amount, sender, recipient, evmSenderAddress, _origin$chain, _destination$chain, buildTx, mainAmountOut, executeResult, transformedHops, sendingChain, _yield$getSwapFee, swapChain, amountOut, receivingChain, mergedHops, finalOrigin, finalDestination, _t, _t2, _t3;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.p = _context2.n) {
+    var api, origin, exchange, destination, sender, _yield$getSwapExecute, result, transformedHops, sendingChain, _yield$getSwapFee, swapChain, amountOut, receivingChain, mergedHops, finalOrigin, finalDestination, _t, _t2, _t3;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          api = options.api, origin = options.origin, exchange = options.exchange, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo, feeAsset = options.feeAsset, destination = options.destination, amount = options.amount, sender = options.sender, recipient = options.recipient, evmSenderAddress = options.evmSenderAddress;
-          if (!((origin || destination) && (dex.chain.includes('AssetHub') || dex.chain === 'Hydration'))) {
-            _context2.n = 6;
-            break;
-          }
-          _context2.p = 1;
-          buildTx = /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(overrideAmount) {
-              var _origin$assetFrom, _origin$feeAssetInfo;
-              var amt, amountOut, tx;
-              return _regenerator().w(function (_context) {
-                while (1) switch (_context.n) {
-                  case 0:
-                    amt = overrideAmount !== undefined ? applyDecimalAbstraction(overrideAmount, exchange.assetFrom.decimals, true) : amount;
-                    _context.n = 1;
-                    return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
-                      amount: amt,
-                      api: exchange.api,
-                      apiPjs: exchange.apiPjs,
-                      assetFrom: exchange.assetFrom,
-                      assetTo: exchange.assetTo
-                    }));
-                  case 1:
-                    amountOut = _context.v;
-                    _context.n = 2;
-                    return handleSwapExecuteTransfer({
-                      api: api,
-                      chain: origin === null || origin === void 0 ? void 0 : origin.chain,
-                      exchangeChain: exchange.chain,
-                      destChain: destination === null || destination === void 0 ? void 0 : destination.chain,
-                      assetInfoFrom: _objectSpread2(_objectSpread2({}, (_origin$assetFrom = origin === null || origin === void 0 ? void 0 : origin.assetFrom) !== null && _origin$assetFrom !== void 0 ? _origin$assetFrom : exchange.assetFrom), {}, {
-                        amount: BigInt(amt)
-                      }),
-                      assetInfoTo: _objectSpread2(_objectSpread2({}, exchange.assetTo), {}, {
-                        amount: amountOut
-                      }),
-                      currencyTo: currencyTo,
-                      feeAssetInfo: (_origin$feeAssetInfo = origin === null || origin === void 0 ? void 0 : origin.feeAssetInfo) !== null && _origin$feeAssetInfo !== void 0 ? _origin$feeAssetInfo : exchange.feeAssetInfo,
-                      sender: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender,
-                      recipient: recipient !== null && recipient !== void 0 ? recipient : sender,
-                      calculateMinAmountOut: function calculateMinAmountOut(amountIn, assetTo) {
-                        return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
-                          amount: amountIn,
-                          apiPjs: options.exchange.apiPjs,
-                          api: options.exchange.api,
-                          assetFrom: options.exchange.assetFrom,
-                          assetTo: assetTo !== null && assetTo !== void 0 ? assetTo : options.exchange.assetTo,
-                          slippagePct: '1'
-                        }));
-                      }
-                    });
-                  case 2:
-                    tx = _context.v;
-                    return _context.a(2, tx);
-                }
-              }, _callee);
-            }));
-            return function buildTx(_x4) {
-              return _ref2.apply(this, arguments);
-            };
-          }();
-          _context2.n = 2;
-          return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
-            amount: amount,
-            api: exchange.api,
-            apiPjs: exchange.apiPjs,
-            assetFrom: exchange.assetFrom,
-            assetTo: exchange.assetTo
-          }));
-        case 2:
-          mainAmountOut = _context2.v;
-          _context2.n = 3;
-          return getXcmFee({
-            api: api,
-            buildTx: buildTx,
-            origin: (_origin$chain = origin === null || origin === void 0 ? void 0 : origin.chain) !== null && _origin$chain !== void 0 ? _origin$chain : exchange.chain,
-            destination: (_destination$chain = destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _destination$chain !== void 0 ? _destination$chain : exchange.chain,
-            sender: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender,
-            recipient: recipient !== null && recipient !== void 0 ? recipient : sender,
-            currency: _objectSpread2(_objectSpread2({}, currencyFrom), {}, {
-              amount: BigInt(amount)
-            }),
-            feeAsset: feeAsset,
-            disableFallback: disableFallback,
-            swapConfig: {
-              currencyTo: currencyTo,
-              exchangeChain: exchange.chain,
-              amountOut: mainAmountOut
-            }
-          });
-        case 3:
-          executeResult = _context2.v;
-          if (!(executeResult.failureReason === 'NoDeal' && exchange.chain === 'Hydration')) {
-            _context2.n = 4;
-            break;
-          }
-          throw new RoutingResolutionError('An error occured, either this route is not registered for swap on exchange chain, or the amount out was not able to be calculated.');
-        case 4:
-          transformedHops = executeResult.hops.map(function (hop) {
-            if (hop.chain === exchange.chain) {
-              return {
-                chain: hop.chain,
-                result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
-                  isExchange: true
-                })
-              };
-            }
-            return hop;
+          api = options.api, origin = options.origin, exchange = options.exchange, destination = options.destination, sender = options.sender;
+          if (!canUseExecuteTransfer(dex, options)) {
+            _context.n = 4;
+            break;
+          }
+          _context.p = 1;
+          _context.n = 2;
+          return getSwapExecuteXcmFee(dex, options, disableFallback);
+        case 2:
+          _yield$getSwapExecute = _context.v;
+          result = _yield$getSwapExecute.result;
+          transformedHops = result.hops.map(function (hop) {
+            return hop.chain === exchange.chain ? {
+              chain: hop.chain,
+              result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
+                isExchange: true
+              })
+            } : hop;
           });
-          return _context2.a(2, _objectSpread2(_objectSpread2({}, executeResult), {}, {
-            origin: _objectSpread2(_objectSpread2({}, executeResult.origin), !origin && {
+          return _context.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
+            origin: _objectSpread2(_objectSpread2({}, result.origin), !origin && {
               isExchange: true
             }),
-            destination: _objectSpread2(_objectSpread2({}, executeResult.destination), !destination && {
+            destination: _objectSpread2(_objectSpread2({}, result.destination), !destination && {
               isExchange: true
             }),
             hops: transformedHops
           }));
-        case 5:
-          _context2.p = 5;
-          _t = _context2.v;
-          if (_t instanceof DryRunFailedError && _t.dryRunType === 'origin' && _t.reason === 'Filtered') {
-            _context2.n = 6;
+        case 3:
+          _context.p = 3;
+          _t = _context.v;
+          if (isFilteredError(_t)) {
+            _context.n = 4;
             break;
           }
           throw _t;
-        case 6:
+        case 4:
           if (!(origin && origin.chain !== exchange.chain)) {
-            _context2.n = 8;
+            _context.n = 6;
             break;
           }
-          _context2.n = 7;
+          _context.n = 5;
           return getToExchangeFee(_objectSpread2(_objectSpread2({}, options), {}, {
             origin: origin
           }), disableFallback);
-        case 7:
-          _t2 = _context2.v;
-          _context2.n = 9;
+        case 5:
+          _t2 = _context.v;
+          _context.n = 7;
           break;
-        case 8:
+        case 6:
           _t2 = undefined;
-        case 9:
+        case 7:
           sendingChain = _t2;
-          _context2.n = 10;
+          _context.n = 8;
           return getSwapFee(dex, options);
-        case 10:
-          _yield$getSwapFee = _context2.v;
+        case 8:
+          _yield$getSwapFee = _context.v;
           swapChain = _yield$getSwapFee.result;
           amountOut = _yield$getSwapFee.amountOut;
           if (!(destination && destination.chain !== exchange.chain)) {
-            _context2.n = 12;
+            _context.n = 10;
             break;
           }
-          _context2.n = 11;
+          _context.n = 9;
           return getFromExchangeFee({
             exchange: exchange,
             destination: destination,
@@ -10366,13 +11098,13 @@ var getRouterFees = /*#__PURE__*/function () {
             sender: sender,
             api: api
           }, disableFallback);
-        case 11:
-          _t3 = _context2.v;
-          _context2.n = 13;
+        case 9:
+          _t3 = _context.v;
+          _context.n = 11;
           break;
-        case 12:
+        case 10:
           _t3 = undefined;
-        case 13:
+        case 11:
           receivingChain = _t3;
           mergedHops = [].concat(_toConsumableArray((_sendingChain$hops = sendingChain === null || sendingChain === void 0 ? void 0 : sendingChain.hops) !== null && _sendingChain$hops !== void 0 ? _sendingChain$hops : []), _toConsumableArray(sendingChain && receivingChain ? [{
             chain: exchange.chain,
@@ -10389,7 +11121,7 @@ var getRouterFees = /*#__PURE__*/function () {
           }), !origin && !destination && {
             fee: 0n
           });
-          return _context2.a(2, {
+          return _context.a(2, {
             failureReason: (_sendingChain$failure = sendingChain === null || sendingChain === void 0 ? void 0 : sendingChain.failureReason) !== null && _sendingChain$failure !== void 0 ? _sendingChain$failure : receivingChain === null || receivingChain === void 0 ? void 0 : receivingChain.failureReason,
             failureChain: (_sendingChain$failure2 = sendingChain === null || sendingChain === void 0 ? void 0 : sendingChain.failureChain) !== null && _sendingChain$failure2 !== void 0 ? _sendingChain$failure2 : receivingChain === null || receivingChain === void 0 ? void 0 : receivingChain.failureChain,
             origin: finalOrigin,
@@ -10397,7 +11129,7 @@ var getRouterFees = /*#__PURE__*/function () {
             hops: mergedHops
           });
       }
-    }, _callee2, null, [[1, 5]]);
+    }, _callee, null, [[1, 3]]);
   }));
   return function getRouterFees(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
@@ -10428,12 +11160,14 @@ var getXcmFees = /*#__PURE__*/function () {
 
 var selectBestExchangeAmountOut = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, originApi) {
+    var exchangeConfig;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
+          exchangeConfig = convertBuilderConfig(options.api.config);
           return _context2.a(2, selectBestExchangeCommon(options, originApi, /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, assetFromExchange, assetTo, _options, parsedAmount) {
-              var exchangeApi, exchangePjsApi;
+              var exchangeApi, _t, _t2, _t3, _t4;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
@@ -10441,17 +11175,19 @@ var selectBestExchangeAmountOut = /*#__PURE__*/function () {
                     return options.api.createApiForChain(dex.chain);
                   case 1:
                     exchangeApi = _context.v;
+                    _t = dex;
+                    _t2 = _objectSpread2;
+                    _t3 = _objectSpread2;
+                    _t4 = {};
                     _context.n = 2;
-                    return dex.createApiInstance();
+                    return buildExchangeApiVariant(dex, exchangeConfig);
                   case 2:
-                    exchangePjsApi = _context.v;
-                    return _context.a(2, dex.getAmountOut({
+                    return _context.a(2, _t.getAmountOut.call(_t, _t2(_t3(_t4, _context.v), {}, {
                       api: exchangeApi,
-                      apiPjs: exchangePjsApi,
                       assetFrom: assetFromExchange,
                       assetTo: assetTo,
                       amount: BigInt(parsedAmount)
-                    }));
+                    })));
                 }
               }, _callee);
             }));
@@ -10470,7 +11206,7 @@ var selectBestExchangeAmountOut = /*#__PURE__*/function () {
 var getBestAmountOut = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _assetFromOrigin$deci;
-    var api, exchange, amount, from, originApi, isExchangeAutoSelect, dex, _resolveAssets, assetFromOrigin, assetFrom, assetTo, res, config, exchangeConfig, pjsApi, exchangeApi, _t, _t2, _t3, _t4;
+    var api, exchange, amount, from, originApi, isExchangeAutoSelect, dex, _resolveAssets, assetFromOrigin, assetFrom, assetTo, res, config, exchangeConfig, exchangeApi, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -10522,27 +11258,29 @@ var getBestAmountOut = /*#__PURE__*/function () {
           config = api.config;
           exchangeConfig = convertBuilderConfig(config);
           _context.n = 9;
-          return dex.createApiInstance(exchangeConfig);
-        case 9:
-          pjsApi = _context.v;
-          _context.n = 10;
           return api.createApiForChain(dex.chain);
-        case 10:
+        case 9:
           exchangeApi = _context.v;
           _t3 = dex.chain;
+          _t4 = dex;
+          _t5 = _objectSpread2;
+          _t6 = _objectSpread2;
+          _t7 = {};
+          _context.n = 10;
+          return buildExchangeApiVariant(dex, exchangeConfig);
+        case 10:
           _context.n = 11;
-          return dex.getAmountOut({
+          return _t4.getAmountOut.call(_t4, _t5(_t6(_t7, _context.v), {}, {
             api: exchangeApi,
-            apiPjs: pjsApi,
             assetFrom: assetFrom,
             assetTo: assetTo,
             amount: applyDecimalAbstraction(amount, (_assetFromOrigin$deci = assetFromOrigin === null || assetFromOrigin === void 0 ? void 0 : assetFromOrigin.decimals) !== null && _assetFromOrigin$deci !== void 0 ? _assetFromOrigin$deci : assetFrom.decimals, (exchangeConfig === null || exchangeConfig === void 0 ? void 0 : exchangeConfig.abstractDecimals) !== false)
-          });
+          }));
         case 11:
-          _t4 = _context.v;
+          _t8 = _context.v;
           return _context.a(2, {
             exchange: _t3,
-            amountOut: _t4
+            amountOut: _t8
           });
       }
     }, _callee);
@@ -10813,6 +11551,9 @@ var transfer = /*#__PURE__*/function () {
           return buildTransactions(dex, options);
         case 5:
           routerPlan = _context.v;
+          _context.n = 6;
+          return maybePerformXcmFormatCheck(api, options, routerPlan);
+        case 6:
           return _context.a(2, executeRouterPlan(routerPlan, {
             signer: signer,
             sender: sender,
@@ -10830,6 +11571,329 @@ var transfer = /*#__PURE__*/function () {
   };
 }();
 
+var buildExecuteSwapHops = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
+    var api, hops, originChain, exchangeChain, currencyFrom, currencyTo, sender, exchangeHopIdx;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          api = _ref.api, hops = _ref.hops, originChain = _ref.originChain, exchangeChain = _ref.exchangeChain, currencyFrom = _ref.currencyFrom, currencyTo = _ref.currencyTo, sender = _ref.sender;
+          exchangeHopIdx = hops.findIndex(function (h) {
+            return h.chain === exchangeChain;
+          });
+          return _context2.a(2, Promise.all(hops.map(/*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(hop, idx) {
+              var _hop$result$fee;
+              var isSwapHop, isAfterSwap, result;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    isSwapHop = hop.chain === exchangeChain;
+                    isAfterSwap = exchangeHopIdx >= 0 && idx > exchangeHopIdx;
+                    _context.n = 1;
+                    return buildHopInfo({
+                      api: api,
+                      chain: hop.chain,
+                      fee: (_hop$result$fee = hop.result.fee) !== null && _hop$result$fee !== void 0 ? _hop$result$fee : 0n,
+                      originChain: originChain,
+                      currency: isAfterSwap ? currencyTo : currencyFrom,
+                      asset: hop.result.asset,
+                      sender: sender
+                    });
+                  case 1:
+                    result = _context.v;
+                    return _context.a(2, {
+                      chain: hop.chain,
+                      result: _objectSpread2(_objectSpread2({}, result), isSwapHop && {
+                        isExchange: true
+                      })
+                    });
+                }
+              }, _callee);
+            }));
+            return function (_x2, _x3) {
+              return _ref3.apply(this, arguments);
+            };
+          }())));
+      }
+    }, _callee2);
+  }));
+  return function buildExecuteSwapHops(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+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;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = options.api, origin = options.origin, exchange = options.exchange, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo, destination = options.destination, amount = options.amount, sender = options.sender, recipient = options.recipient, evmSenderAddress = options.evmSenderAddress;
+          assertCurrencyCore(currencyFrom);
+          assertCurrencyCore(currencyTo);
+          _context.n = 1;
+          return getSwapExecuteXcmFee(dex, options, false);
+        case 1:
+          _yield$getSwapExecute = _context.v;
+          xcmFeeResult = _yield$getSwapExecute.result;
+          amountOut = _yield$getSwapExecute.amountOut;
+          originChain = (_origin$chain = origin === null || origin === void 0 ? void 0 : origin.chain) !== null && _origin$chain !== void 0 ? _origin$chain : exchange.chain;
+          destChain = (_destination$chain = destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _destination$chain !== void 0 ? _destination$chain : exchange.chain;
+          senderAddress = evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender;
+          recipientAddress = recipient !== null && recipient !== void 0 ? recipient : sender;
+          originAsset = origin ? findAssetInfoOrThrow(originChain, currencyFrom, destChain) : exchange.assetFrom;
+          _context.n = 2;
+          return buildOriginInfo({
+            api: api,
+            origin: originChain,
+            sender: senderAddress,
+            currency: currencyFrom,
+            originAsset: originAsset,
+            amount: BigInt(amount),
+            originFee: xcmFeeResult.origin.fee,
+            originFeeAsset: xcmFeeResult.origin.asset,
+            isFeeAssetAh: false
+          });
+        case 2:
+          originInfo = _context.v;
+          _context.n = 3;
+          return buildExecuteSwapHops({
+            api: api,
+            hops: xcmFeeResult.hops,
+            originChain: originChain,
+            exchangeChain: exchange.chain,
+            currencyFrom: currencyFrom,
+            currencyTo: currencyTo,
+            sender: senderAddress
+          });
+        case 3:
+          builtHops = _context.v;
+          exchangeHopIdx = xcmFeeResult.hops.findIndex(function (h) {
+            return h.chain === exchange.chain;
+          });
+          postSwapHops = exchangeHopIdx >= 0 ? xcmFeeResult.hops.slice(exchangeHopIdx + 1) : xcmFeeResult.hops;
+          _aggregateHopFees = aggregateHopFees(postSwapHops, exchange.assetTo), totalHopFee = _aggregateHopFees.totalHopFee, bridgeFee = _aggregateHopFees.bridgeFee;
+          _context.n = 4;
+          return buildDestInfo({
+            api: api,
+            origin: originChain,
+            destination: destChain,
+            recipient: recipientAddress,
+            currency: _objectSpread2(_objectSpread2({}, currencyTo), {}, {
+              amount: amountOut
+            }),
+            originFee: xcmFeeResult.origin.fee,
+            isFeeAssetAh: false,
+            destFeeDetail: xcmFeeResult.destination,
+            totalHopFee: totalHopFee,
+            bridgeFee: bridgeFee
+          });
+        case 4:
+          destinationInfo = _context.v;
+          return _context.a(2, {
+            chain: {
+              origin: originChain,
+              destination: destChain,
+              ecosystem: getRelayChainSymbol(originChain)
+            },
+            origin: _objectSpread2(_objectSpread2({}, originInfo), !origin && {
+              isExchange: true
+            }),
+            hops: builtHops,
+            destination: _objectSpread2(_objectSpread2({}, destinationInfo), !destination && {
+              isExchange: true
+            })
+          });
+      }
+    }, _callee);
+  }));
+  return function getExecuteSwapInfo(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+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 buildExchangeDestInfo = function buildExchangeDestInfo(exchange, recipient, amountOut, currencyTo) {
+  return buildDestInfo({
+    api: exchange.api,
+    origin: exchange.chain,
+    destination: exchange.chain,
+    recipient: recipient,
+    currency: _objectSpread2(_objectSpread2({}, currencyTo), {}, {
+      amount: amountOut
+    }),
+    originFee: 0n,
+    isFeeAssetAh: false,
+    destFeeDetail: {
+      fee: 0n,
+      asset: exchange.assetTo,
+      feeType: 'noFeeRequired'
+    },
+    totalHopFee: 0n
+  });
+};
+var getSwapInfo = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(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) {
+        case 0:
+          validateTransferOptions(initialOptions);
+          _context.n = 1;
+          return prepareTransformedOptions(initialOptions, true);
+        case 1:
+          _yield$prepareTransfo = _context.v;
+          options = _yield$prepareTransfo.options;
+          dex = _yield$prepareTransfo.dex;
+          if (!canUseExecuteTransfer(dex, options)) {
+            _context.n = 5;
+            break;
+          }
+          _context.p = 2;
+          _context.n = 3;
+          return getExecuteSwapInfo(dex, options);
+        case 3:
+          return _context.a(2, _context.v);
+        case 4:
+          _context.p = 4;
+          _t = _context.v;
+          if (isFilteredError(_t)) {
+            _context.n = 5;
+            break;
+          }
+          throw _t;
+        case 5:
+          api = options.api, origin = options.origin, exchange = options.exchange, currencyTo = options.currencyTo, destination = options.destination, amount = options.amount, sender = options.sender, evmSenderAddress = options.evmSenderAddress;
+          assertCurrencyCore(currencyTo);
+          senderAddress = evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender;
+          if (!(origin && origin.chain !== exchange.chain)) {
+            _context.n = 7;
+            break;
+          }
+          _context.n = 6;
+          return createToExchangeBuilder({
+            origin: origin,
+            exchange: exchange,
+            sender: sender,
+            evmSenderAddress: evmSenderAddress,
+            amount: amount,
+            api: api
+          }).getTransferInfo();
+        case 6:
+          _t2 = _context.v;
+          _context.n = 8;
+          break;
+        case 7:
+          _t2 = undefined;
+        case 8:
+          sendingInfo = _t2;
+          _context.n = 9;
+          return getSwapFee(dex, options);
+        case 9:
+          _yield$getSwapFee = _context.v;
+          swapChain = _yield$getSwapFee.result;
+          amountOut = _yield$getSwapFee.amountOut;
+          if (!(destination && destination.chain !== exchange.chain)) {
+            _context.n = 11;
+            break;
+          }
+          _context.n = 10;
+          return createFromExchangeBuilder({
+            exchange: exchange,
+            destination: destination,
+            amount: amountOut,
+            sender: sender,
+            api: api
+          }).getTransferInfo();
+        case 10:
+          _t3 = _context.v;
+          _context.n = 12;
+          break;
+        case 11:
+          _t3 = undefined;
+        case 12:
+          receivingInfo = _t3;
+          originChain = (_origin$chain = origin === null || origin === void 0 ? void 0 : origin.chain) !== null && _origin$chain !== void 0 ? _origin$chain : exchange.chain;
+          destChain = (_destination$chain = destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _destination$chain !== void 0 ? _destination$chain : exchange.chain;
+          exchangeHopEntry = sendingInfo && receivingInfo ? {
+            chain: exchange.chain,
+            result: {
+              asset: exchange.assetTo,
+              xcmFee: {
+                fee: swapChain.fee + receivingInfo.origin.xcmFee.fee,
+                asset: swapChain.asset
+              },
+              isExchange: true
+            }
+          } : 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;
+            break;
+          }
+          _t4 = _sendingInfo$origin;
+          _context.n = 15;
+          break;
+        case 13:
+          _context.n = 14;
+          return buildExchangeOriginInfo(exchange, senderAddress, amount, swapChain);
+        case 14:
+          _t4 = _context.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;
+            break;
+          }
+          _t5 = _receivingInfo$destin;
+          _context.n = 18;
+          break;
+        case 16:
+          _context.n = 17;
+          return buildExchangeDestInfo(exchange, sender, amountOut, currencyTo);
+        case 17:
+          _t5 = _context.v;
+        case 18:
+          finalDestination = _t5;
+          return _context.a(2, {
+            chain: {
+              origin: originChain,
+              destination: destChain,
+              ecosystem: getRelayChainSymbol(originChain)
+            },
+            origin: _objectSpread2(_objectSpread2({}, finalOrigin), !sendingInfo && {
+              isExchange: true
+            }),
+            hops: hops,
+            destination: _objectSpread2(_objectSpread2({}, finalDestination), !receivingInfo && {
+              isExchange: true
+            })
+          });
+      }
+    }, _callee, null, [[2, 4]]);
+  }));
+  return function getSwapInfo(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var SwapBuilderCore = /*#__PURE__*/function () {
   function SwapBuilderCore(api, options) {
     _classCallCheck(this, SwapBuilderCore);
@@ -10956,18 +12020,57 @@ var SwapBuilderCore = /*#__PURE__*/function () {
       return getXcmFees$1;
     }()
   }, {
-    key: "getTransferableAmount",
+    key: "getOriginXcmFee",
     value: function () {
-      var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+      var _getOriginXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+        var _options$disableFallb2;
+        var disableFallback;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              return _context2.a(2, getTransferableAmount(_objectSpread2(_objectSpread2({}, this._options), {}, {
+              disableFallback = (_options$disableFallb2 = options === null || options === void 0 ? void 0 : options.disableFallback) !== null && _options$disableFallb2 !== void 0 ? _options$disableFallb2 : false;
+              return _context2.a(2, getOriginXcmFee(_objectSpread2(_objectSpread2({}, this._options), {}, {
                 api: this._api
-              })));
+              }), disableFallback));
           }
         }, _callee2, this);
       }));
+      function getOriginXcmFee$1(_x2) {
+        return _getOriginXcmFee2.apply(this, arguments);
+      }
+      return getOriginXcmFee$1;
+    }()
+  }, {
+    key: "getSwapInfo",
+    value: function () {
+      var _getSwapInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
+            case 0:
+              return _context3.a(2, getSwapInfo(_objectSpread2(_objectSpread2({}, this._options), {}, {
+                api: this._api
+              })));
+          }
+        }, _callee3, this);
+      }));
+      function getSwapInfo$1() {
+        return _getSwapInfo2.apply(this, arguments);
+      }
+      return getSwapInfo$1;
+    }()
+  }, {
+    key: "getTransferableAmount",
+    value: function () {
+      var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
+            case 0:
+              return _context4.a(2, getTransferableAmount(_objectSpread2(_objectSpread2({}, this._options), {}, {
+                api: this._api
+              })));
+          }
+        }, _callee4, this);
+      }));
       function getTransferableAmount$1() {
         return _getTransferableAmount2.apply(this, arguments);
       }
@@ -10976,15 +12079,15 @@ var SwapBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "getMinTransferableAmount",
     value: function () {
-      var _getMinTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+      var _getMinTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
             case 0:
-              return _context3.a(2, getMinTransferableAmount(_objectSpread2(_objectSpread2({}, this._options), {}, {
+              return _context5.a(2, getMinTransferableAmount(_objectSpread2(_objectSpread2({}, this._options), {}, {
                 api: this._api
               })));
           }
-        }, _callee3, this);
+        }, _callee5, this);
       }));
       function getMinTransferableAmount$1() {
         return _getMinTransferableAmount2.apply(this, arguments);
@@ -11012,6 +12115,13 @@ var SwapBuilderCore = /*#__PURE__*/function () {
         api: this._api
       }));
     }
+  }, {
+    key: "dryRunPreview",
+    value: function dryRunPreview(previewOptions) {
+      return dryRunRouterPreview(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        api: this._api
+      }), previewOptions);
+    }
   }, {
     key: "getBestAmountOut",
     value: function getBestAmountOut$1() {