@paraspell/swap 12.9.7 → 12.10.0-rc.1

package/dist/index.mjs

@@ -1,9 +1,9 @@
-import { UnsupportedOperationError, createChainClient as createChainClient$1, getNativeAssets, RoutingResolutionError, findAssetInfoById, getOtherAssets, getChainProviders, parseUnits, getNativeAssetSymbol, padValueBy, formatUnits as formatUnits$1, AmountTooLowError, getBalance, localizeLocation, getAssets, transform, Parents, isSymbolMatch, getParaId, UnableToComputeError, getAssetDecimals, InvalidCurrencyError, findAssetInfoOrThrow, isOverrideLocationSpecifier, isSymbolSpecifier, findBestMatches, findAssetInfoBySymbol, findAssetInfoByLoc, deepEqual, normalizeExchange, EXCHANGE_CHAINS, reverseTransformLocation, isAssetEqual, isExternalChain, isSystemAsset, TransferToAhNotSupported, ScenarioNotSupportedError, applyDecimalAbstraction, findAssetInfo, getRelayChainOf, hasSupportForAsset, Builder, isChainEvm, InvalidAddressError, MissingParameterError, DryRunFailedError, handleSwapExecuteTransfer, dryRun, getFailureInfo, getOriginXcmFee, getXcmFee, getExistentialDepositOrThrow, registerSwapExtension } from '@paraspell/sdk';
-export { EXCHANGE_CHAINS } from '@paraspell/sdk';
-import { InvalidTxError, Binary } from 'polkadot-api';
+import { createChainClient as createChainClient$1, getBalance, transform, registerSwapExtension } from '@paraspell/sdk';
+import { getNativeAssets, RoutingResolutionError, findAssetInfoById, getOtherAssets, getChainProviders, parseUnits, getNativeAssetSymbol, padValueBy, formatUnits as formatUnits$1, AmountTooLowError, 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, getBalance as getBalance$1 } from '@paraspell/sdk-core';
+import 'polkadot-api';
 import { Wallet } from '@acala-network/sdk';
 import { FixedPointNumber } from '@acala-network/sdk-core';
-import { AcalaDex as AcalaDex$1, AggregateDex } from '@acala-network/sdk-swap';
+import { AcalaDex, AggregateDex } from '@acala-network/sdk-swap';
 import { firstValueFrom } from 'rxjs';
 import { createChainClient, formatUnits } from '@paraspell/sdk-pjs';
 import { options } from '@acala-network/api';
@@ -399,82 +399,59 @@ var pow10n = function pow10n(d) {
   return result;
 };
 
-var submitTransaction = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(tx, signer, onSign) {
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          return _context.a(2, new Promise(function (resolve, reject) {
-            tx.signSubmitAndWatch(signer).subscribe({
-              next: function next(event) {
-                if (event.type === 'signed') {
-                  onSign === null || onSign === void 0 || onSign();
-                }
-                if (event.type === 'finalized') {
-                  if (!event.ok) {
-                    var _event$dispatchError;
-                    var errorMsg = (_event$dispatchError = event.dispatchError) !== null && _event$dispatchError !== void 0 && _event$dispatchError.value ? JSON.stringify(event.dispatchError.value) : 'Transaction failed';
-                    reject(new UnsupportedOperationError(errorMsg));
-                  } else {
-                    resolve(event);
-                  }
-                }
-              },
-              error: function error(_error) {
-                if (_error instanceof InvalidTxError) {
-                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                  var typedErr = _error.error;
-                  reject(new UnsupportedOperationError("Invalid transaction: ".concat(JSON.stringify(typedErr))));
-                } else {
-                  reject(_error instanceof Error ? _error : new UnsupportedOperationError(String(_error)));
-                }
-              }
-            });
-          }));
-      }
-    }, _callee);
-  }));
-  return function submitTransaction(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var convertTxToPapi = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(tx, papiApi) {
-    var pjsHex, stripHeaderBytes, tryTxFromCallData, hex2, hex3;
+var stripHeaderBytes = function stripHeaderBytes(hex, byteCount) {
+  return '0x' + hex.slice(2 + byteCount * 2);
+};
+var convertTxToTarget = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(tx, api) {
+    var isPjsTx, hex, hex2, hex3, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
-          pjsHex = tx.toHex();
-          stripHeaderBytes = function stripHeaderBytes(hex, byteCount) {
-            return '0x' + hex.slice(2 + byteCount * 2);
-          };
-          tryTxFromCallData = function tryTxFromCallData(hex) {
-            return papiApi.getUnsafeApi().txFromCallData(Binary.fromHex(hex));
-          };
-          _context.p = 1;
-          hex2 = stripHeaderBytes(pjsHex, 2);
+          isPjsTx = isPjsExtrinsic(tx);
+          if (!isPjsTx) {
+            _context.n = 1;
+            break;
+          }
+          _t = tx.toHex();
+          _context.n = 3;
+          break;
+        case 1:
           _context.n = 2;
-          return tryTxFromCallData(hex2);
+          return tx.getEncodedData();
         case 2:
-          return _context.a(2, _context.v);
+          _t = _context.v.asHex();
         case 3:
-          _context.p = 3;
+          hex = _t;
+          if (!(isPjsTx && api.type === 'PAPI')) {
+            _context.n = 8;
+            break;
+          }
+          _context.p = 4;
+          hex2 = stripHeaderBytes(hex, 2);
+          _context.n = 5;
+          return api.txFromHex(hex2);
+        case 5:
+          return _context.a(2, _context.v);
+        case 6:
+          _context.p = 6;
           _context.v;
-          hex3 = stripHeaderBytes(pjsHex, 3); // let any further error bubble up
-          _context.n = 4;
-          return tryTxFromCallData(hex3);
-        case 4:
+          hex3 = stripHeaderBytes(hex, 3);
+          _context.n = 7;
+          return api.txFromHex(hex3);
+        case 7:
           return _context.a(2, _context.v);
+        case 8:
+          return _context.a(2, api.txFromHex(hex));
       }
-    }, _callee, null, [[1, 3]]);
+    }, _callee, null, [[4, 6]]);
   }));
-  return function convertTxToPapi(_x, _x2) {
+  return function convertTxToTarget(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
 
-var AssetHubPolkadotDex = {
+var AssetHubPolkadot = {
 	isOmni: true,
 	assets: [
 		{
@@ -891,7 +868,7 @@ var AssetHubPolkadotDex = {
 	pairs: [
 	]
 };
-var AssetHubKusamaDex = {
+var AssetHubKusama = {
 	isOmni: true,
 	assets: [
 		{
@@ -1058,7 +1035,7 @@ var AssetHubKusamaDex = {
 	pairs: [
 	]
 };
-var AssetHubPaseoDex = {
+var AssetHubPaseo = {
 	isOmni: true,
 	assets: [
 		{
@@ -1190,7 +1167,7 @@ var AssetHubPaseoDex = {
 	pairs: [
 	]
 };
-var AssetHubWestendDex = {
+var AssetHubWestend = {
 	isOmni: true,
 	assets: [
 		{
@@ -1291,7 +1268,7 @@ var AssetHubWestendDex = {
 	pairs: [
 	]
 };
-var HydrationDex = {
+var Hydration = {
 	isOmni: true,
 	assets: [
 		{
@@ -2343,7 +2320,7 @@ var HydrationDex = {
 	pairs: [
 	]
 };
-var KaruraDex = {
+var Karura = {
 	isOmni: false,
 	assets: [
 		{
@@ -4701,7 +4678,7 @@ var KaruraDex = {
 		]
 	]
 };
-var AcalaDex = {
+var Acala = {
 	isOmni: false,
 	assets: [
 		{
@@ -6266,7 +6243,7 @@ var AcalaDex = {
 		]
 	]
 };
-var BifrostKusamaDex = {
+var BifrostKusama = {
 	isOmni: false,
 	assets: [
 		{
@@ -6815,7 +6792,7 @@ var BifrostKusamaDex = {
 		]
 	]
 };
-var BifrostPolkadotDex = {
+var BifrostPolkadot = {
 	isOmni: false,
 	assets: [
 		{
@@ -7153,28 +7130,28 @@ var BifrostPolkadotDex = {
 	]
 };
 var assets = {
-	AssetHubPolkadotDex: AssetHubPolkadotDex,
-	AssetHubKusamaDex: AssetHubKusamaDex,
-	AssetHubPaseoDex: AssetHubPaseoDex,
-	AssetHubWestendDex: AssetHubWestendDex,
-	HydrationDex: HydrationDex,
-	KaruraDex: KaruraDex,
-	AcalaDex: AcalaDex,
-	BifrostKusamaDex: BifrostKusamaDex,
-	BifrostPolkadotDex: BifrostPolkadotDex
+	AssetHubPolkadot: AssetHubPolkadot,
+	AssetHubKusama: AssetHubKusama,
+	AssetHubPaseo: AssetHubPaseo,
+	AssetHubWestend: AssetHubWestend,
+	Hydration: Hydration,
+	Karura: Karura,
+	Acala: Acala,
+	BifrostKusama: BifrostKusama,
+	BifrostPolkadot: BifrostPolkadot
 };
 
 var assetsMapJson = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  AcalaDex: AcalaDex,
-  AssetHubKusamaDex: AssetHubKusamaDex,
-  AssetHubPaseoDex: AssetHubPaseoDex,
-  AssetHubPolkadotDex: AssetHubPolkadotDex,
-  AssetHubWestendDex: AssetHubWestendDex,
-  BifrostKusamaDex: BifrostKusamaDex,
-  BifrostPolkadotDex: BifrostPolkadotDex,
-  HydrationDex: HydrationDex,
-  KaruraDex: KaruraDex,
+  Acala: Acala,
+  AssetHubKusama: AssetHubKusama,
+  AssetHubPaseo: AssetHubPaseo,
+  AssetHubPolkadot: AssetHubPolkadot,
+  AssetHubWestend: AssetHubWestend,
+  BifrostKusama: BifrostKusama,
+  BifrostPolkadot: BifrostPolkadot,
+  Hydration: Hydration,
+  Karura: Karura,
   default: assets
 });
 
@@ -7195,21 +7172,15 @@ var Logger = {
 };
 
 var ExchangeChain = /*#__PURE__*/function () {
-  function ExchangeChain(chain, exchangeChain) {
+  function ExchangeChain(chain) {
     _classCallCheck(this, ExchangeChain);
     this._chain = chain;
-    this._exchangeChain = exchangeChain;
   }
   return _createClass(ExchangeChain, [{
     key: "chain",
     get: function get() {
       return this._chain;
     }
-  }, {
-    key: "exchangeChain",
-    get: function get() {
-      return this._exchangeChain;
-    }
   }, {
     key: "handleMultiSwap",
     value: function () {
@@ -7359,7 +7330,7 @@ var getDexConfig$2 = /*#__PURE__*/function () {
             seen.add(key);
             directPairs.push([a.location, b.location]);
           });
-          acalaDex = new AcalaDex$1({
+          acalaDex = new AcalaDex({
             api: api,
             wallet: wallet
           });
@@ -7465,18 +7436,18 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "swapCurrency",
     value: function () {
       var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, options, toDestTransactionFee) {
-        var papiApi, assetFrom, assetTo, amount, senderAddress, origin, isForFeeEstimation, wallet, fromToken, toToken, acalaDex, dex, swapFee, totalNativeCurrencyFee, balance, pctDestFee, amountWithoutFee, tradeResult, tx, amountOutRes, amountOut, nativeAssetSymbol, amountOutWithFee;
+        var papiApi, assetFrom, assetTo, amount, sender, origin, isForFeeEstimation, wallet, fromToken, toToken, acalaDex, dex, swapFee, totalNativeCurrencyFee, balance, pctDestFee, amountWithoutFee, tradeResult, tx, amountOutRes, amountOut, nativeAssetSymbol, amountOutWithFee;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              papiApi = options.papiApi, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, senderAddress = options.senderAddress, origin = options.origin, isForFeeEstimation = options.isForFeeEstimation;
+              papiApi = options.papiApi, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, sender = options.sender, origin = options.origin, isForFeeEstimation = options.isForFeeEstimation;
               wallet = new Wallet(api);
               _context.n = 1;
               return wallet.isReady;
             case 1:
               fromToken = wallet.getToken(assetFrom.symbol);
               toToken = wallet.getToken(assetTo.symbol);
-              acalaDex = new AcalaDex$1({
+              acalaDex = new AcalaDex({
                 api: api,
                 wallet: wallet
               });
@@ -7494,7 +7465,7 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
               _context.n = 3;
               return getBalance({
                 api: papiApi,
-                address: senderAddress,
+                address: sender,
                 chain: this.chain
               });
             case 3:
@@ -7570,7 +7541,7 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
             case 1:
               fromToken = wallet.getToken(assetFrom.symbol);
               toToken = wallet.getToken(assetTo.symbol);
-              acalaDex = new AcalaDex$1({
+              acalaDex = new AcalaDex({
                 api: api,
                 wallet: wallet
               });
@@ -7794,11 +7765,11 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "swapCurrency",
     value: function () {
       var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_api, options, toDestTxFee) {
-        var assetFrom, assetTo, amount, senderAddress, slippagePct, origin, papiApi, pctDestFee, amountWithoutFee, _yield$getQuotedAmoun, amountOut, usedFromML, usedToML, slippageMultiplier, minAmountOut, tx, toDestFeeCurrencyTo, finalAmountOut, _t;
+        var assetFrom, assetTo, amount, sender, slippagePct, origin, papiApi, pctDestFee, amountWithoutFee, _yield$getQuotedAmoun, amountOut, usedFromML, usedToML, slippageMultiplier, minAmountOut, tx, toDestFeeCurrencyTo, finalAmountOut, _t;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, senderAddress = options.senderAddress, slippagePct = options.slippagePct, origin = options.origin, papiApi = options.papiApi;
+              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, sender = options.sender, slippagePct = options.slippagePct, origin = options.origin, papiApi = options.papiApi;
               pctDestFee = origin ? DEST_FEE_BUFFER_PCT : 0;
               amountWithoutFee = padValueBy(amount, pctDestFee);
               _context.n = 1;
@@ -7814,7 +7785,7 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
                 path: [transform(usedFromML), transform(usedToML)],
                 amount_in: amountWithoutFee,
                 amount_out_min: minAmountOut,
-                send_to: senderAddress,
+                send_to: sender,
                 keep_alive: !!assetFrom.isNative
               });
               if (!(assetTo.symbol == getNativeAssetSymbol(this.chain))) {
@@ -7866,7 +7837,7 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
           while (1) switch (_context2.n) {
             case 0:
               assetFrom = options.assetFrom, assetTo = options.assetTo;
-              nativeAsset = getExchangeAsset(this.exchangeChain, {
+              nativeAsset = getExchangeAsset(this.chain, {
                 symbol: getNativeAssetSymbol(this.chain)
               });
               if (nativeAsset) {
@@ -7915,7 +7886,7 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
               optionsHop2 = {
                 papiApi: options.papiApi,
                 slippagePct: options.slippagePct,
-                senderAddress: options.senderAddress,
+                sender: options.sender,
                 origin: undefined,
                 assetFrom: nativeAsset,
                 assetTo: assetTo,
@@ -7955,7 +7926,7 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
           while (1) switch (_context3.n) {
             case 0:
               assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin, papiApi = options.papiApi;
-              nativeAsset = getExchangeAsset(this.exchangeChain, {
+              nativeAsset = getExchangeAsset(this.chain, {
                 symbol: getNativeAssetSymbol(this.chain)
               });
               if (nativeAsset) {
@@ -8385,11 +8356,11 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "swapCurrency",
     value: function () {
       var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, options, toDestTxFee) {
-        var assetFrom, assetTo, amount, senderAddress, slippagePct, origin, chainId, tokenMap, tokenWrappedFrom, tokenWrappedTo, tokenFrom, tokenTo, currencyCombinations, pairs, pctDestFee, amountWithoutFee, amountInFinal, trade, allowedSlippage, blockNumber, deadline, _SwapRouter$swapCallP, extrinsic, amountOut, nativeSymbol, amountOutWithFee;
+        var assetFrom, assetTo, amount, sender, slippagePct, origin, chainId, tokenMap, tokenWrappedFrom, tokenWrappedTo, tokenFrom, tokenTo, currencyCombinations, pairs, pctDestFee, amountWithoutFee, amountInFinal, trade, allowedSlippage, blockNumber, deadline, _SwapRouter$swapCallP, extrinsic, amountOut, nativeSymbol, amountOutWithFee;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, senderAddress = options.senderAddress, slippagePct = options.slippagePct, origin = options.origin;
+              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, sender = options.sender, slippagePct = options.slippagePct, origin = options.origin;
               chainId = getParaId(this.chain);
               tokenMap = getTokenMap(this.chain, chainId);
               tokenWrappedFrom = findToken(tokenMap, assetFrom.symbol);
@@ -8435,7 +8406,7 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
               _SwapRouter$swapCallP = SwapRouter.swapCallParameters(trade, {
                 api: api,
                 allowedSlippage: allowedSlippage,
-                recipient: senderAddress,
+                recipient: sender,
                 deadline: deadline
               }), extrinsic = _SwapRouter$swapCallP.extrinsic;
               if (!(extrinsic === null)) {
@@ -8565,11 +8536,11 @@ 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, senderAddress, trade, nativeCurrencyInfo, nativeCurrencyDecimals, substrateTx, tx, swapFee, feeNative, currencyFromPriceInfo, currencyFromPrice, feeInCurrencyFrom, finalFee;
+    var amount, slippagePct, feeCalcAddress, sender, trade, nativeCurrencyInfo, nativeCurrencyDecimals, substrateTx, tx, swapFee, feeNative, currencyFromPriceInfo, currencyFromPrice, feeInCurrencyFrom, finalFee;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          amount = _ref.amount, slippagePct = _ref.slippagePct, feeCalcAddress = _ref.feeCalcAddress, senderAddress = _ref.senderAddress;
+          amount = _ref.amount, slippagePct = _ref.slippagePct, feeCalcAddress = _ref.feeCalcAddress, sender = _ref.sender;
           _context.n = 1;
           return tradeRouter.getBestSell(currencyFromInfo.id, currencyToInfo.id, amount.toString());
         case 1:
@@ -8594,7 +8565,7 @@ var calculateFee = /*#__PURE__*/function () {
           throw new UnableToComputeError('Native currency decimals not found');
         case 4:
           _context.n = 5;
-          return txBuilderFactory.trade(trade).withSlippage(Number(slippagePct)).withBeneficiary(senderAddress).build();
+          return txBuilderFactory.trade(trade).withSlippage(Number(slippagePct)).withBeneficiary(sender).build();
         case 5:
           substrateTx = _context.v;
           tx = substrateTx.get();
@@ -8647,11 +8618,11 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
     key: "swapCurrency",
     value: function () {
       var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, options, toDestTransactionFee) {
-        var origin, assetFrom, assetTo, senderAddress, slippagePct, amount, _createSdkContext, tradeRouter, txBuilderFactory, currencyFromInfo, currencyToInfo, tradeFee, amountWithoutFee, amountNormalized, trade, substrateTx, tx, amountOut, nativeCurrencyInfo, nativeCurrencyDecimals, priceInfo, currencyToPrice, feeInCurrencyTo, amountOutModified;
+        var origin, assetFrom, assetTo, sender, slippagePct, amount, _createSdkContext, tradeRouter, txBuilderFactory, currencyFromInfo, currencyToInfo, tradeFee, amountWithoutFee, amountNormalized, trade, substrateTx, tx, amountOut, nativeCurrencyInfo, nativeCurrencyDecimals, priceInfo, currencyToPrice, feeInCurrencyTo, amountOutModified;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              origin = options.origin, assetFrom = options.assetFrom, assetTo = options.assetTo, senderAddress = options.senderAddress, slippagePct = options.slippagePct, amount = options.amount;
+              origin = options.origin, assetFrom = options.assetFrom, assetTo = options.assetTo, sender = options.sender, slippagePct = options.slippagePct, amount = options.amount;
               _createSdkContext = createSdkContext(api), tradeRouter = _createSdkContext.api.router, txBuilderFactory = _createSdkContext.tx;
               _context.n = 1;
               return getAssetInfo(tradeRouter, assetFrom);
@@ -8692,7 +8663,7 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
             case 7:
               trade = _context.v;
               _context.n = 8;
-              return txBuilderFactory.trade(trade).withSlippage(Number(slippagePct)).withBeneficiary(senderAddress).build();
+              return txBuilderFactory.trade(trade).withSlippage(Number(slippagePct)).withBeneficiary(sender).build();
             case 8:
               substrateTx = _context.v;
               tx = substrateTx.get();
@@ -8852,15 +8823,15 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
 
 var record = {
   // Reuse classes for Kusama equivalents
-  AssetHubPolkadotDex: new AssetHubExchange('AssetHubPolkadot', 'AssetHubPolkadotDex'),
-  AssetHubKusamaDex: new AssetHubExchange('AssetHubKusama', 'AssetHubKusamaDex'),
-  AssetHubPaseoDex: new AssetHubExchange('AssetHubPaseo', 'AssetHubPaseoDex'),
-  AssetHubWestendDex: new AssetHubExchange('AssetHubWestend', 'AssetHubWestendDex'),
-  HydrationDex: new HydrationExchange('Hydration', 'HydrationDex'),
-  AcalaDex: new AcalaExchange('Acala', 'AcalaDex'),
-  KaruraDex: new AcalaExchange('Karura', 'KaruraDex'),
-  BifrostPolkadotDex: new BifrostExchange('BifrostPolkadot', 'BifrostPolkadotDex'),
-  BifrostKusamaDex: new BifrostExchange('BifrostKusama', 'BifrostKusamaDex')
+  AssetHubPolkadot: new AssetHubExchange('AssetHubPolkadot'),
+  AssetHubKusama: new AssetHubExchange('AssetHubKusama'),
+  AssetHubPaseo: new AssetHubExchange('AssetHubPaseo'),
+  AssetHubWestend: new AssetHubExchange('AssetHubWestend'),
+  Hydration: new HydrationExchange('Hydration'),
+  Acala: new AcalaExchange('Acala'),
+  Karura: new AcalaExchange('Karura'),
+  BifrostPolkadot: new BifrostExchange('BifrostPolkadot'),
+  BifrostKusama: new BifrostExchange('BifrostKusama')
 };
 var createExchangeInstance = function createExchangeInstance(chain) {
   return record[chain];
@@ -8873,7 +8844,7 @@ var getExchangeConfig = function getExchangeConfig(exchange) {
   var assets = stored.assets.map(function (location) {
     return findAssetInfoOrThrow(chain, {
       location: location
-    }, null);
+    });
   });
   return {
     isOmni: stored.isOmni,
@@ -8905,7 +8876,7 @@ var getExchangeAsset = function getExchangeAsset(exchange, currency) {
         throw new RoutingResolutionError("Multiple assets found for symbol ".concat(currency.symbol, ". Please specify the asset by location."));
       }
     }
-    asset = findAssetInfoBySymbol(null, otherAssets, nativeAssets, currency.symbol);
+    asset = findAssetInfoBySymbol(otherAssets, nativeAssets, currency.symbol);
   } else if ('location' in currency && !isOverrideLocationSpecifier(currency.location)) {
     asset = findAssetInfoByLoc(assets, currency.location);
   } else if ('id' in currency) {
@@ -9054,7 +9025,7 @@ var getSupportedAssetsTo = function getSupportedAssetsTo(exchangeInput, to) {
 var getSupportedFeeAssets = function getSupportedFeeAssets(from, exchangeInput) {
   var exchange = normalizeExchange(exchangeInput);
   var supportedAssets = getSupportedAssetsFrom(from, exchange);
-  var chains = from ? [from] : (exchange === undefined ? _toConsumableArray(EXCHANGE_CHAINS) : Array.isArray(exchange) ? exchange : [exchange]).map(function (ex) {
+  var chains = from ? [from] : (exchange === undefined ? EXCHANGE_CHAINS : Array.isArray(exchange) ? exchange : [exchange]).map(function (ex) {
     return createExchangeInstance(ex).chain;
   }).filter(function (chain, i, arr) {
     return arr.indexOf(chain) === i;
@@ -9100,13 +9071,13 @@ var supportsExchangePair = function supportsExchangePair(exchange, assetA, asset
 };
 
 var canBuildToExchangeTx = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, exchangeChain, originApi, assetFromOrigin, builderOptions) {
-    var from, amount, _t2;
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, exchangeChain, originApi, assetFromOrigin) {
+    var from, amount, api, _t2;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
           // Try building the to exchange extrinsic to see if it will succeed for this exchange
-          from = options.from, amount = options.amount;
+          from = options.from, amount = options.amount, api = options.api;
           _context.p = 1;
           if (!(from && from !== exchangeChain && originApi && assetFromOrigin)) {
             _context.n = 3;
@@ -9115,7 +9086,7 @@ var canBuildToExchangeTx = /*#__PURE__*/function () {
           _context.n = 2;
           return buildToExchangeExtrinsic({
             amount: BigInt(amount),
-            senderAddress: FALLBACK_FEE_CALC_ADDRESS,
+            sender: FALLBACK_FEE_CALC_ADDRESS,
             evmSenderAddress: FALLBACK_FEE_CALC_EVM_ADDRESS,
             origin: {
               api: originApi,
@@ -9123,9 +9094,9 @@ var canBuildToExchangeTx = /*#__PURE__*/function () {
               assetFrom: assetFromOrigin
             },
             exchange: {
-              baseChain: exchangeChain
+              chain: exchangeChain
             },
-            builderOptions: builderOptions
+            api: api
           });
         case 2:
           _context.v;
@@ -9153,19 +9124,19 @@ var canBuildToExchangeTx = /*#__PURE__*/function () {
       }
     }, _callee, null, [[1, 5]]);
   }));
-  return function canBuildToExchangeTx(_x, _x2, _x3, _x4, _x5) {
+  return function canBuildToExchangeTx(_x, _x2, _x3, _x4) {
     return _ref.apply(this, arguments);
   };
 }();
 
 var selectBestExchangeCommon = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, originApi, computeAmountOut, builderOptions) {
-    var from, exchange, to, currencyFrom, currencyTo, assetFromOrigin, filteredExchangeChains, bestExchange, maxAmountOut, errors, triedAnyExchange, _iterator, _step, exchangeChain, dex, originSpecified, destinationSpecified, assetFromExchange, assetTo, res, parsedAmount, amountOut, _t, _t2;
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, originApi, computeAmountOut) {
+    var api, from, exchange, to, currencyFrom, currencyTo, assetFromOrigin, filteredExchangeChains, bestExchange, maxAmountOut, errors, triedAnyExchange, _iterator, _step, exchangeChain, dex, originSpecified, destinationSpecified, assetFromExchange, assetTo, res, config, parsedAmount, amountOut, _t, _t2;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
-          from = options.from, exchange = options.exchange, to = options.to, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo;
-          assetFromOrigin = from ? findAssetInfo(from, currencyFrom, null) : undefined;
+          api = options.api, from = options.from, exchange = options.exchange, to = options.to, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo;
+          assetFromOrigin = from ? findAssetInfo(from, currencyFrom) : undefined;
           if (!(from && !assetFromOrigin)) {
             _context.n = 1;
             break;
@@ -9195,14 +9166,14 @@ var selectBestExchangeCommon = /*#__PURE__*/function () {
           dex = createExchangeInstance(exchangeChain);
           originSpecified = from && from !== dex.chain;
           destinationSpecified = to && to !== dex.chain;
-          assetFromExchange = originSpecified && assetFromOrigin ? getExchangeAssetByOriginAsset(dex.exchangeChain, assetFromOrigin) : getExchangeAsset(dex.exchangeChain, currencyFrom);
+          assetFromExchange = originSpecified && assetFromOrigin ? getExchangeAssetByOriginAsset(dex.chain, assetFromOrigin) : getExchangeAsset(dex.chain, currencyFrom);
           if (assetFromExchange) {
             _context.n = 5;
             break;
           }
           return _context.a(3, 14);
         case 5:
-          assetTo = getExchangeAsset(dex.exchangeChain, currencyTo, true);
+          assetTo = getExchangeAsset(dex.chain, currencyTo, true);
           if (assetTo) {
             _context.n = 6;
             break;
@@ -9224,7 +9195,7 @@ var selectBestExchangeCommon = /*#__PURE__*/function () {
           triedAnyExchange = true;
           Logger.log("Checking ".concat(exchangeChain, "..."));
           _context.n = 9;
-          return canBuildToExchangeTx(options, dex.chain, originApi, assetFromOrigin, builderOptions);
+          return canBuildToExchangeTx(options, dex.chain, originApi, assetFromOrigin);
         case 9:
           res = _context.v;
           if (res.success) {
@@ -9234,12 +9205,11 @@ var selectBestExchangeCommon = /*#__PURE__*/function () {
           errors.set(dex.chain, res.error);
           return _context.a(3, 14);
         case 10:
-          parsedAmount = applyDecimalAbstraction(options.amount, assetFromExchange === null || assetFromExchange === void 0 ? void 0 : assetFromExchange.decimals, !!(builderOptions !== null && builderOptions !== void 0 && builderOptions.abstractDecimals)).toString();
+          config = api.config;
+          parsedAmount = applyDecimalAbstraction(options.amount, assetFromExchange === null || assetFromExchange === void 0 ? void 0 : assetFromExchange.decimals, !(isConfig(config) && config.abstractDecimals === false)).toString();
           _context.p = 11;
           _context.n = 12;
-          return computeAmountOut(dex, assetFromExchange, assetTo, _objectSpread2(_objectSpread2({}, options), {}, {
-            amount: parsedAmount
-          }));
+          return computeAmountOut(dex, assetFromExchange, assetTo, options, parsedAmount);
         case 12:
           amountOut = _context.v;
           if (amountOut > maxAmountOut) {
@@ -9292,18 +9262,20 @@ var selectBestExchangeCommon = /*#__PURE__*/function () {
       }
     }, _callee, null, [[11, 13], [3, 16, 17, 18]]);
   }));
-  return function selectBestExchangeCommon(_x, _x2, _x3, _x4) {
+  return function selectBestExchangeCommon(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
 
 var selectBestExchange = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, originApi, builderOptions, isForFeeEstimation) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, originApi, isForFeeEstimation) {
+    var api;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
+          api = options.api;
           return _context2.a(2, selectBestExchangeCommon(options, originApi, /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, assetFromExchange, assetTo, options) {
+            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;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
@@ -9311,7 +9283,7 @@ var selectBestExchange = /*#__PURE__*/function () {
                     _t = _objectSpread2;
                     _t2 = _objectSpread2({}, options);
                     _t3 = {};
-                    _t4 = BigInt(options.amount);
+                    _t4 = BigInt(parsedAmount);
                     _context.n = 1;
                     return dex.createApiInstance();
                   case 1:
@@ -9320,50 +9292,53 @@ var selectBestExchange = /*#__PURE__*/function () {
                     return dex.createApiInstancePapi();
                   case 2:
                     _t6 = _context.v;
-                    _t7 = dex.chain;
-                    _t8 = dex.exchangeChain;
+                    _context.n = 3;
+                    return api.createApiForChain(dex.chain);
+                  case 3:
+                    _t7 = _context.v;
+                    _t8 = dex.chain;
                     _t9 = assetFromExchange;
                     _t0 = assetTo;
                     _t1 = {
-                      api: _t5,
+                      apiPjs: _t5,
                       apiPapi: _t6,
-                      baseChain: _t7,
-                      exchangeChain: _t8,
+                      api: _t7,
+                      chain: _t8,
                       assetFrom: _t9,
                       assetTo: _t0
                     };
-                    _t10 = determineFeeCalcAddress(options.senderAddress, options.recipientAddress);
+                    _t10 = determineFeeCalcAddress(options.sender, options.recipient);
                     modifiedOptions = _t(_t2, _t3, {
                       amount: _t4,
                       exchange: _t1,
                       feeCalcAddress: _t10
                     });
-                    _context.n = 3;
+                    _context.n = 4;
                     return calculateFromExchangeFee(modifiedOptions);
-                  case 3:
+                  case 4:
                     toDestTxFee = _context.v;
-                    _context.n = 4;
-                    return dex.handleMultiSwap(modifiedOptions.exchange.api, _objectSpread2(_objectSpread2({}, modifiedOptions), {}, {
+                    _context.n = 5;
+                    return dex.handleMultiSwap(modifiedOptions.exchange.apiPjs, _objectSpread2(_objectSpread2({}, modifiedOptions), {}, {
                       papiApi: modifiedOptions.exchange.apiPapi,
                       assetFrom: modifiedOptions.exchange.assetFrom,
                       assetTo: modifiedOptions.exchange.assetTo,
                       isForFeeEstimation: isForFeeEstimation
                     }), toDestTxFee);
-                  case 4:
+                  case 5:
                     _yield$dex$handleMult = _context.v;
                     amountOut = _yield$dex$handleMult.amountOut;
                     return _context.a(2, amountOut);
                 }
               }, _callee);
             }));
-            return function (_x5, _x6, _x7, _x8) {
+            return function (_x4, _x5, _x6, _x7, _x8) {
               return _ref2.apply(this, arguments);
             };
-          }(), builderOptions));
+          }()));
       }
     }, _callee2);
   }));
-  return function selectBestExchange(_x, _x2, _x3, _x4) {
+  return function selectBestExchange(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -9381,16 +9356,16 @@ var resolveAssets = function resolveAssets(dex, _ref) {
   if (originSpecified && !assetFromOrigin) {
     throw new RoutingResolutionError("Currency from ".concat(JSON.stringify(currencyFrom), " not found in ").concat(from, "."));
   }
-  var assetFromExchange = originSpecified && assetFromOrigin ? getExchangeAssetByOriginAsset(dex.exchangeChain, assetFromOrigin) : getExchangeAsset(dex.exchangeChain, currencyFrom);
+  var assetFromExchange = originSpecified && assetFromOrigin ? getExchangeAssetByOriginAsset(dex.chain, assetFromOrigin) : getExchangeAsset(dex.chain, currencyFrom);
   if (!assetFromExchange) {
-    if (!originSpecified && findAssetInfo(dex.chain, currencyFrom, null)) {
-      throw new RoutingResolutionError("Currency from ".concat(JSON.stringify(currencyFrom), " exists in ").concat(dex.chain, " but is not swappable on ").concat(dex.exchangeChain, "."));
+    if (!originSpecified && findAssetInfo(dex.chain, currencyFrom)) {
+      throw new RoutingResolutionError("Currency from ".concat(JSON.stringify(currencyFrom), " exists in ").concat(dex.chain, " but is not swappable on ").concat(dex.chain, "."));
     }
-    throw new RoutingResolutionError("Currency from ".concat(JSON.stringify(currencyFrom), " not found in ").concat(dex.exchangeChain, "."));
+    throw new RoutingResolutionError("Currency from ".concat(JSON.stringify(currencyFrom), " not found in ").concat(dex.chain, "."));
   }
-  var assetTo = getExchangeAsset(dex.exchangeChain, currencyTo);
+  var assetTo = getExchangeAsset(dex.chain, currencyTo);
   if (!assetTo) {
-    throw new RoutingResolutionError("Currency to ".concat(JSON.stringify(currencyTo), " not found in ").concat(dex.exchangeChain, "."));
+    throw new RoutingResolutionError("Currency to ".concat(JSON.stringify(currencyTo), " not found in ").concat(dex.chain, "."));
   }
   if (destinationSpecified && !hasSupportForAsset(to, assetTo.symbol)) {
     throw new RoutingResolutionError("Currency to ".concat(JSON.stringify(currencyTo), " not supported by ").concat(to, "."));
@@ -9399,7 +9374,7 @@ var resolveAssets = function resolveAssets(dex, _ref) {
   if (feeAsset && originSpecified && !feeAssetFromOrigin) {
     throw new RoutingResolutionError("Fee asset ".concat(JSON.stringify(feeAsset), " not found in ").concat(from, "."));
   }
-  var feeAssetFromExchange = feeAsset ? feeAssetFromOrigin ? getExchangeAssetByOriginAsset(dex.exchangeChain, feeAssetFromOrigin) : (_getExchangeAsset = getExchangeAsset(dex.exchangeChain, feeAsset)) !== null && _getExchangeAsset !== void 0 ? _getExchangeAsset : undefined : undefined;
+  var feeAssetFromExchange = feeAsset ? feeAssetFromOrigin ? getExchangeAssetByOriginAsset(dex.chain, feeAssetFromOrigin) : (_getExchangeAsset = getExchangeAsset(dex.chain, feeAsset)) !== null && _getExchangeAsset !== void 0 ? _getExchangeAsset : undefined : undefined;
   var resolvedFeeAssetLocation = (_feeAssetFromOrigin$l = feeAssetFromOrigin === null || feeAssetFromOrigin === void 0 ? void 0 : feeAssetFromOrigin.location) !== null && _feeAssetFromOrigin$l !== void 0 ? _feeAssetFromOrigin$l : feeAssetFromExchange === null || feeAssetFromExchange === void 0 ? void 0 : feeAssetFromExchange.location;
   if (feeAsset && resolvedFeeAssetLocation) {
     var sdkAsset = findAssetInfoOrThrow(from !== null && from !== void 0 ? from : dex.chain, {
@@ -9419,18 +9394,16 @@ var resolveAssets = function resolveAssets(dex, _ref) {
 };
 
 var createToExchangeBuilder = function createToExchangeBuilder(_ref) {
-  var _ref$origin = _ref.origin,
-    from = _ref$origin.chain,
-    assetFrom = _ref$origin.assetFrom,
-    baseChain = _ref.exchange.baseChain,
-    senderAddress = _ref.senderAddress,
+  var origin = _ref.origin,
+    exchange = _ref.exchange,
+    sender = _ref.sender,
     evmSenderAddress = _ref.evmSenderAddress,
     amount = _ref.amount,
-    builderOptions = _ref.builderOptions;
-  return Builder(builderOptions).from(from).to(baseChain).currency({
-    location: assetFrom.location,
+    api = _ref.api;
+  return Builder(api.clone()).from(origin.chain).to(exchange.chain).currency({
+    location: origin.assetFrom.location,
     amount: amount
-  }).address(senderAddress).senderAddress(isChainEvm(from) ? evmSenderAddress : senderAddress);
+  }).sender(isChainEvm(origin.chain) ? evmSenderAddress : sender).recipient(sender);
 };
 var buildToExchangeExtrinsic = function buildToExchangeExtrinsic(options) {
   return createToExchangeBuilder(options).build();
@@ -9441,22 +9414,16 @@ var getToExchangeFee = function getToExchangeFee(options, disableFallback) {
   });
 };
 var createFromExchangeBuilder = function createFromExchangeBuilder(_ref2) {
-  var _ref2$exchange = _ref2.exchange,
-    apiPapi = _ref2$exchange.apiPapi,
-    baseChain = _ref2$exchange.baseChain,
-    assetTo = _ref2$exchange.assetTo,
-    _ref2$destination = _ref2.destination,
-    chain = _ref2$destination.chain,
-    address = _ref2$destination.address,
+  var exchange = _ref2.exchange,
+    destination = _ref2.destination,
     amount = _ref2.amount,
-    senderAddress = _ref2.senderAddress,
-    builderOptions = _ref2.builderOptions;
-  return Builder(_objectSpread2(_objectSpread2({}, builderOptions), {}, {
-    apiOverrides: _objectSpread2(_objectSpread2({}, builderOptions === null || builderOptions === void 0 ? void 0 : builderOptions.apiOverrides), {}, _defineProperty({}, baseChain, apiPapi))
-  })).from(baseChain).to(chain).currency({
-    location: assetTo.location,
+    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
-  }).address(address).senderAddress(senderAddress);
+  }).sender(sender).recipient(destination.address);
 };
 var buildFromExchangeExtrinsic = function buildFromExchangeExtrinsic(options) {
   return createFromExchangeBuilder(options).build();
@@ -9466,28 +9433,29 @@ var getFromExchangeFee = function getFromExchangeFee(options, disableFallback) {
     disableFallback: disableFallback
   });
 };
-var determineFeeCalcAddress = function determineFeeCalcAddress(senderAddress, recipientAddress) {
-  if (!ethers.isAddress(senderAddress)) {
+var determineFeeCalcAddress = function determineFeeCalcAddress(sender, recipient) {
+  if (!ethers.isAddress(sender)) {
     // Use wallet address for fee calculation
-    return senderAddress;
+    return sender;
   }
-  if (recipientAddress && !ethers.isAddress(recipientAddress)) {
+  if (recipient && !ethers.isAddress(recipient)) {
     // Use recipient address for fee calculation
-    return recipientAddress;
+    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, builderOptions) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _assetFromOrigin$deci;
     var isForFeeEstimation,
+      api,
       from,
       to,
       exchange,
-      senderAddress,
-      recipientAddress,
+      sender,
+      recipient,
       amount,
       originApi,
       dex,
@@ -9499,6 +9467,9 @@ var prepareTransformedOptions = /*#__PURE__*/function () {
       feeAssetFromExchange,
       originSpecified,
       destinationSpecified,
+      exchangeApi,
+      config,
+      exchangeConfig,
       transformed,
       _args = arguments,
       _t,
@@ -9517,19 +9488,18 @@ var prepareTransformedOptions = /*#__PURE__*/function () {
       _t12,
       _t13,
       _t14,
-      _t15,
-      _t16;
+      _t15;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          isForFeeEstimation = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
-          from = options.from, to = options.to, exchange = options.exchange, senderAddress = options.senderAddress, recipientAddress = options.recipientAddress, amount = options.amount;
+          isForFeeEstimation = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
+          api = options.api, from = options.from, to = options.to, exchange = options.exchange, sender = options.sender, recipient = options.recipient, amount = options.amount;
           if (!from) {
             _context.n = 2;
             break;
           }
           _context.n = 1;
-          return createChainClient$1(from, builderOptions);
+          return api.createApiForChain(from);
         case 1:
           _t = _context.v;
           _context.n = 3;
@@ -9547,13 +9517,13 @@ var prepareTransformedOptions = /*#__PURE__*/function () {
           break;
         case 4:
           _context.n = 5;
-          return selectBestExchange(options, originApi, builderOptions, isForFeeEstimation);
+          return selectBestExchange(options, originApi === null || originApi === void 0 ? void 0 : originApi.api, isForFeeEstimation);
         case 5:
           _t2 = _context.v;
         case 6:
           dex = _t2;
           _resolveAssets = resolveAssets(dex, options), assetFromOrigin = _resolveAssets.assetFromOrigin, assetFromExchange = _resolveAssets.assetFromExchange, assetTo = _resolveAssets.assetTo, feeAssetFromOrigin = _resolveAssets.feeAssetFromOrigin, feeAssetFromExchange = _resolveAssets.feeAssetFromExchange;
-          if (supportsExchangePair(dex.exchangeChain, assetFromExchange, assetTo)) {
+          if (supportsExchangePair(dex.chain, assetFromExchange, assetTo)) {
             _context.n = 7;
             break;
           }
@@ -9561,51 +9531,55 @@ var prepareTransformedOptions = /*#__PURE__*/function () {
         case 7:
           originSpecified = from && originApi && from !== dex.chain;
           destinationSpecified = to && to !== dex.chain;
+          _context.n = 8;
+          return api.createApiForChain(dex.chain);
+        case 8:
+          exchangeApi = _context.v;
+          config = api.config;
+          exchangeConfig = convertBuilderConfig(config);
           _t3 = _objectSpread2;
           _t4 = _objectSpread2({}, options);
           _t5 = {};
-          _t6 = applyDecimalAbstraction(amount, (_assetFromOrigin$deci = assetFromOrigin === null || assetFromOrigin === void 0 ? void 0 : assetFromOrigin.decimals) !== null && _assetFromOrigin$deci !== void 0 ? _assetFromOrigin$deci : assetFromExchange.decimals, !!(builderOptions !== null && builderOptions !== void 0 && builderOptions.abstractDecimals));
-          _t7 = originSpecified && assetFromOrigin ? {
-            api: originApi,
+          _t6 = applyDecimalAbstraction(amount, (_assetFromOrigin$deci = assetFromOrigin === null || assetFromOrigin === void 0 ? void 0 : assetFromOrigin.decimals) !== null && _assetFromOrigin$deci !== void 0 ? _assetFromOrigin$deci : assetFromExchange.decimals, (exchangeConfig === null || exchangeConfig === void 0 ? void 0 : exchangeConfig.abstractDecimals) !== false);
+          _t7 = originSpecified && assetFromOrigin && originApi ? {
+            api: originApi.api,
             chain: from,
             assetFrom: assetFromOrigin,
             feeAssetInfo: feeAssetFromOrigin
           } : undefined;
-          _context.n = 8;
-          return dex.createApiInstance(builderOptions);
-        case 8:
-          _t8 = _context.v;
           _context.n = 9;
-          return dex.createApiInstancePapi(builderOptions);
+          return dex.createApiInstance(exchangeConfig);
         case 9:
+          _t8 = _context.v;
+          _context.n = 10;
+          return dex.createApiInstancePapi(exchangeConfig);
+        case 10:
           _t9 = _context.v;
-          _t0 = dex.chain;
-          _t1 = dex.exchangeChain;
+          _t0 = exchangeApi;
+          _t1 = dex.chain;
           _t10 = assetFromExchange;
           _t11 = assetTo;
           _t12 = feeAssetFromExchange;
           _t13 = {
-            api: _t8,
+            apiPjs: _t8,
             apiPapi: _t9,
-            baseChain: _t0,
-            exchangeChain: _t1,
+            api: _t0,
+            chain: _t1,
             assetFrom: _t10,
             assetTo: _t11,
             feeAssetInfo: _t12
           };
-          _t14 = destinationSpecified && recipientAddress ? {
+          _t14 = destinationSpecified && recipient ? {
             chain: to,
-            address: recipientAddress
+            address: recipient
           } : undefined;
-          _t15 = determineFeeCalcAddress(senderAddress, recipientAddress);
-          _t16 = builderOptions;
+          _t15 = determineFeeCalcAddress(sender, recipient);
           transformed = _t3(_t4, _t5, {
             amount: _t6,
             origin: _t7,
             exchange: _t13,
             destination: _t14,
-            feeCalcAddress: _t15,
-            builderOptions: _t16
+            feeCalcAddress: _t15
           });
           return _context.a(2, {
             dex: dex,
@@ -9614,7 +9588,7 @@ var prepareTransformedOptions = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function prepareTransformedOptions(_x, _x2) {
+  return function prepareTransformedOptions(_x) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -9639,20 +9613,20 @@ var validateTransferOptions = function validateTransferOptions(options) {
   var from = options.from,
     exchange = options.exchange,
     evmSenderAddress = options.evmSenderAddress,
-    senderAddress = options.senderAddress,
-    recipientAddress = options.recipientAddress,
+    sender = options.sender,
+    recipient = options.recipient,
     to = options.to;
   if (exchange === undefined && from === undefined) {
     throw new MissingParameterError('from', 'Origin chain is required when exchange is auto');
   }
-  if (to && !recipientAddress) {
-    throw new MissingParameterError('recipientAddress', 'Recipient address is required');
+  if (to && !recipient) {
+    throw new MissingParameterError('recipient', 'Recipient address is required');
   }
-  if (to && recipientAddress) validateDestinationAddress(recipientAddress, to);
+  if (to && recipient) validateDestinationAddress(recipient, to);
   if (evmSenderAddress !== undefined && !ethers.isAddress(evmSenderAddress)) {
     throw new InvalidAddressError('Evm injector address is not a valid Ethereum address');
   }
-  if (ethers.isAddress(senderAddress)) {
+  if (ethers.isAddress(sender)) {
     throw new InvalidAddressError('Injector address cannot be an Ethereum address. Please use an Evm injector address instead.');
   }
   if (from && isChainEvm(from) && !evmSenderAddress) {
@@ -9663,12 +9637,12 @@ var validateTransferOptions = function validateTransferOptions(options) {
 var FEE_ESTIMATION_UNITS = '100';
 var calculateFromExchangeFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var exchange, destination, feeCalcAddress, senderAddress, builderOptions, dummyAmount, tx;
+    var exchange, destination, feeCalcAddress, sender, api, dummyAmount, tx, _yield$exchange$api$g, partialFee;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          exchange = options.exchange, destination = options.destination, feeCalcAddress = options.feeCalcAddress, senderAddress = options.senderAddress, builderOptions = options.builderOptions;
-          if (!(!destination || destination.chain === exchange.baseChain)) {
+          exchange = options.exchange, destination = options.destination, feeCalcAddress = options.feeCalcAddress, sender = options.sender, api = options.api;
+          if (!(!destination || destination.chain === exchange.chain)) {
             _context.n = 1;
             break;
           }
@@ -9680,12 +9654,17 @@ var calculateFromExchangeFee = /*#__PURE__*/function () {
             exchange: exchange,
             destination: destination,
             amount: dummyAmount,
-            senderAddress: senderAddress,
-            builderOptions: builderOptions
+            sender: sender,
+            api: api
           });
         case 2:
           tx = _context.v;
-          return _context.a(2, tx.getEstimatedFees(feeCalcAddress));
+          _context.n = 3;
+          return exchange.api.getPaymentInfo(tx, feeCalcAddress);
+        case 3:
+          _yield$exchange$api$g = _context.v;
+          partialFee = _yield$exchange$api$g.partialFee;
+          return _context.a(2, partialFee);
       }
     }, _callee);
   }));
@@ -9709,7 +9688,7 @@ var createSwapTx = /*#__PURE__*/function () {
         case 1:
           toDestTxFee = _context2.v;
           _context2.n = 2;
-          return exchange.handleMultiSwap(options.exchange.api, _objectSpread2(_objectSpread2({}, options), {}, {
+          return exchange.handleMultiSwap(options.exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
             papiApi: options.exchange.apiPapi,
             assetFrom: options.exchange.assetFrom,
             assetTo: options.exchange.assetTo,
@@ -9719,7 +9698,7 @@ var createSwapTx = /*#__PURE__*/function () {
           swapResult = _context2.v;
           _context2.n = 3;
           return Promise.all(swapResult.txs.map(function (tx) {
-            return isPjsExtrinsic(tx) ? convertTxToPapi(tx, options.exchange.apiPapi) : Promise.resolve(tx);
+            return convertTxToTarget(tx, options.exchange.api);
           }));
         case 3:
           txs = _context2.v;
@@ -9737,18 +9716,18 @@ var createSwapTx = /*#__PURE__*/function () {
 
 var prepareExtrinsics = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, options) {
-    var origin, exchange, destination, currencyTo, amount, evmSenderAddress, senderAddress, recipientAddress, builderOptions, _origin$assetFrom, _origin$feeAssetInfo, _amountOut, tx, toExchangeTx, _yield$createSwapTx, swapTxs, amountOut, toDestTx, _t, _t2, _t3;
+    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:
-          origin = options.origin, exchange = options.exchange, destination = options.destination, currencyTo = options.currencyTo, amount = options.amount, evmSenderAddress = options.evmSenderAddress, senderAddress = options.senderAddress, recipientAddress = options.recipientAddress, builderOptions = options.builderOptions;
+          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(exchange.api, _objectSpread2(_objectSpread2({}, options), {}, {
+          return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
             papiApi: exchange.apiPapi,
             assetFrom: exchange.assetFrom,
             assetTo: exchange.assetTo
@@ -9757,8 +9736,9 @@ var prepareExtrinsics = /*#__PURE__*/function () {
           _amountOut = _context.v;
           _context.n = 3;
           return handleSwapExecuteTransfer({
+            api: api,
             chain: origin === null || origin === void 0 ? void 0 : origin.chain,
-            exchangeChain: exchange.baseChain,
+            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)
@@ -9766,19 +9746,19 @@ var prepareExtrinsics = /*#__PURE__*/function () {
             assetInfoTo: _objectSpread2(_objectSpread2({}, exchange.assetTo), {}, {
               amount: _amountOut
             }),
-            senderAddress: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : senderAddress,
+            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,
-            recipientAddress: recipientAddress !== null && recipientAddress !== void 0 ? recipientAddress : senderAddress,
             calculateMinAmountOut: function calculateMinAmountOut(amountIn, assetTo) {
-              return dex.getAmountOut(exchange.api, _objectSpread2(_objectSpread2({}, options), {}, {
+              return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
                 amount: amountIn,
                 papiApi: options.exchange.apiPapi,
                 assetFrom: options.exchange.assetFrom,
                 assetTo: assetTo !== null && assetTo !== void 0 ? assetTo : options.exchange.assetTo
               }));
             }
-          }, builderOptions);
+          });
         case 3:
           tx = _context.v;
           return _context.a(2, {
@@ -9795,7 +9775,7 @@ var prepareExtrinsics = /*#__PURE__*/function () {
           }
           throw _t;
         case 5:
-          if (!(origin && origin.chain !== exchange.baseChain)) {
+          if (!(origin && origin.chain !== exchange.chain)) {
             _context.n = 7;
             break;
           }
@@ -9817,7 +9797,7 @@ var prepareExtrinsics = /*#__PURE__*/function () {
           _yield$createSwapTx = _context.v;
           swapTxs = _yield$createSwapTx.txs;
           amountOut = _yield$createSwapTx.amountOut;
-          if (!(destination && destination.chain !== exchange.baseChain)) {
+          if (!(destination && destination.chain !== exchange.chain)) {
             _context.n = 11;
             break;
           }
@@ -9826,8 +9806,8 @@ var prepareExtrinsics = /*#__PURE__*/function () {
             exchange: exchange,
             destination: destination,
             amount: amountOut,
-            senderAddress: senderAddress,
-            builderOptions: builderOptions
+            sender: sender,
+            api: api
           });
         case 10:
           _t3 = _context.v;
@@ -9872,19 +9852,15 @@ var buildTransactions = /*#__PURE__*/function () {
             transactions.push({
               api: origin.api,
               chain: origin.chain,
-              destinationChain: exchange.baseChain,
+              destinationChain: exchange.chain,
               tx: toExchangeTx,
               type: 'TRANSFER'
             });
           }
           if (toDestTx) {
-            batchedTx = exchange.apiPapi.getUnsafeApi().tx.Utility.batch_all({
-              calls: [].concat(_toConsumableArray(swapTxs.map(function (tx) {
-                return tx.decodedCall;
-              })), [toDestTx.decodedCall])
-            });
+            batchedTx = exchange.api.callBatchMethod([].concat(_toConsumableArray(swapTxs), [toDestTx]), BatchMode.BATCH_ALL);
             transactions.push({
-              api: exchange.apiPapi,
+              api: exchange.api.api,
               chain: dex.chain,
               destinationChain: destination === null || destination === void 0 ? void 0 : destination.chain,
               tx: batchedTx,
@@ -9894,20 +9870,16 @@ var buildTransactions = /*#__PURE__*/function () {
           } else {
             if (swapTxs.length === 1) {
               transactions.push({
-                api: isExecute ? (_origin$api = origin === null || origin === void 0 ? void 0 : origin.api) !== null && _origin$api !== void 0 ? _origin$api : exchange.apiPapi : exchange.apiPapi,
+                api: isExecute ? (_origin$api = origin === null || origin === void 0 ? void 0 : origin.api) !== null && _origin$api !== void 0 ? _origin$api : exchange.api.api : exchange.api.api,
                 chain: isExecute ? (_origin$chain = origin === null || origin === void 0 ? void 0 : origin.chain) !== null && _origin$chain !== void 0 ? _origin$chain : dex.chain : dex.chain,
                 tx: swapTxs[0],
                 amountOut: amountOut,
                 type: 'SWAP'
               });
             } else {
-              batchedSwapTx = exchange.apiPapi.getUnsafeApi().tx.Utility.batch_all({
-                calls: swapTxs.map(function (tx) {
-                  return tx.decodedCall;
-                })
-              });
+              batchedSwapTx = exchange.api.callBatchMethod(swapTxs, BatchMode.BATCH_ALL);
               transactions.push({
-                api: exchange.apiPapi,
+                api: exchange.api.api,
                 chain: dex.chain,
                 tx: batchedSwapTx,
                 amountOut: amountOut,
@@ -9925,14 +9897,14 @@ var buildTransactions = /*#__PURE__*/function () {
 }();
 
 var buildApiTransactions = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(initialOptions, builderOptions) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(initialOptions) {
     var _yield$prepareTransfo, options, dex;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           validateTransferOptions(initialOptions);
           _context.n = 1;
-          return prepareTransformedOptions(initialOptions, builderOptions);
+          return prepareTransformedOptions(initialOptions);
         case 1:
           _yield$prepareTransfo = _context.v;
           options = _yield$prepareTransfo.options;
@@ -9941,7 +9913,7 @@ var buildApiTransactions = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function buildApiTransactions(_x, _x2) {
+  return function buildApiTransactions(_x) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -9957,7 +9929,7 @@ var assignIsExchange = function assignIsExchange(result, options) {
     result.destination.isExchange = true;
   }
   result.hops = result.hops.map(function (hop) {
-    var isExchange = hop.chain === exchange.baseChain;
+    var isExchange = hop.chain === exchange.chain;
     return _objectSpread2(_objectSpread2({}, hop), {}, {
       result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
         isExchange: isExchange
@@ -9970,25 +9942,23 @@ var assignIsExchange = function assignIsExchange(result, options) {
 var dryRunTransaction = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, transaction, destChain, bypassOptions) {
     var _ref2;
-    var exchange, senderAddress, evmSenderAddress, recipientAddress, destination, currencyFrom, currencyTo, amount, api, tx, chain, address, senderAddressResolved, resolvedDest;
+    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:
-          exchange = options.exchange, senderAddress = options.senderAddress, evmSenderAddress = options.evmSenderAddress, recipientAddress = options.recipientAddress, destination = options.destination, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo, amount = options.amount;
-          api = transaction.api, tx = transaction.tx, chain = transaction.chain;
-          address = recipientAddress !== null && recipientAddress !== void 0 ? recipientAddress : senderAddress;
-          senderAddressResolved = evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : senderAddress;
-          resolvedDest = (_ref2 = destChain !== null && destChain !== void 0 ? destChain : destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _ref2 !== void 0 ? _ref2 : exchange.baseChain;
+          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,
+            api: api.clone(),
             tx: tx,
             origin: chain,
             destination: resolvedDest,
-            senderAddress: senderAddressResolved,
-            address: address,
+            sender: senderResolved,
             swapConfig: {
               currencyTo: currencyTo,
-              exchangeChain: exchange.baseChain
+              exchangeChain: exchange.chain
             },
             currency: _objectSpread2(_objectSpread2({}, currencyFrom), {}, {
               amount: BigInt(amount)
@@ -10009,7 +9979,7 @@ var mergeDryRunResults = function mergeDryRunResults(options, originResult, exch
     origin: originResult.origin,
     destination: destination ? exchangeResult.destination : exchangeResult.origin,
     hops: [].concat(_toConsumableArray(originResult.hops), _toConsumableArray(destination ? [{
-      chain: exchange.baseChain,
+      chain: exchange.chain,
       result: exchangeResult.origin
     }] : []), _toConsumableArray(exchangeResult.hops))
   };
@@ -10024,7 +9994,7 @@ var dryRun2Transactions = /*#__PURE__*/function () {
           exchange = options.exchange;
           _transactions = _slicedToArray(transactions, 2), firstTx = _transactions[0], secondTx = _transactions[1];
           _context2.n = 1;
-          return dryRunTransaction(options, firstTx, exchange.baseChain);
+          return dryRunTransaction(options, firstTx, exchange.chain);
         case 1:
           firstRes = _context2.v;
           _getFailureInfo = getFailureInfo(firstRes), failureReason = _getFailureInfo.failureReason;
@@ -10054,14 +10024,14 @@ var dryRunTransactions = function dryRunTransactions(transactions, options) {
   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, builderOptions) {
+  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) {
         case 0:
           validateTransferOptions(initialOptions);
           _context3.n = 1;
-          return prepareTransformedOptions(initialOptions, builderOptions);
+          return prepareTransformedOptions(initialOptions);
         case 1:
           _yield$prepareTransfo = _context3.v;
           options = _yield$prepareTransfo.options;
@@ -10078,18 +10048,18 @@ var dryRunRouter = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function dryRunRouter(_x7, _x8) {
+  return function dryRunRouter(_x7) {
     return _ref4.apply(this, arguments);
   };
 }();
 
 var getSwapFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(exchange, options, disableFallback) {
-    var senderAddress, assetFrom, amount, txs, amountOut, isForFeeEstimation, swapResult, buildTx, result, finalFee, _t;
+    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) {
         case 0:
-          senderAddress = options.senderAddress, assetFrom = options.exchange.assetFrom, amount = options.amount;
+          sender = options.sender, _options$exchange = options.exchange, assetFrom = _options$exchange.assetFrom, api = _options$exchange.api, amount = options.amount;
           isForFeeEstimation = true;
           _context2.p = 1;
           _context2.n = 2;
@@ -10136,11 +10106,11 @@ var getSwapFee = /*#__PURE__*/function () {
           }();
           _context2.n = 6;
           return getOriginXcmFee({
-            api: options.exchange.apiPapi,
+            api: api,
             buildTx: buildTx,
             origin: exchange.chain,
             destination: exchange.chain,
-            senderAddress: senderAddress,
+            sender: sender,
             currency: {
               location: assetFrom.location,
               amount: amount
@@ -10167,11 +10137,11 @@ var getSwapFee = /*#__PURE__*/function () {
 var getRouterFees = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(dex, options, disableFallback) {
     var _sendingChain$hops, _receivingChain$origi, _receivingChain$hops, _sendingChain$origin, _receivingChain$desti, _sendingChain$failure, _sendingChain$failure2;
-    var origin, exchange, currencyFrom, currencyTo, feeAsset, destination, amount, recipientAddress, evmSenderAddress, senderAddress, builderOptions, _origin$chain, _destination$chain, buildTx, mainAmountOut, executeResult, transformedHops, sendingChain, _yield$getSwapFee, swapChain, amountOut, receivingChain, mergedHops, finalOrigin, finalDestination, _t, _t2, _t3;
+    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) {
         case 0:
-          origin = options.origin, exchange = options.exchange, currencyFrom = options.currencyFrom, currencyTo = options.currencyTo, feeAsset = options.feeAsset, destination = options.destination, amount = options.amount, recipientAddress = options.recipientAddress, evmSenderAddress = options.evmSenderAddress, senderAddress = options.senderAddress, builderOptions = options.builderOptions;
+          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;
@@ -10186,7 +10156,7 @@ var getRouterFees = /*#__PURE__*/function () {
                   case 0:
                     amt = overrideAmount !== undefined ? applyDecimalAbstraction(overrideAmount, exchange.assetFrom.decimals, true) : amount;
                     _context.n = 1;
-                    return dex.getAmountOut(exchange.api, _objectSpread2(_objectSpread2({}, options), {}, {
+                    return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
                       amount: amt,
                       papiApi: exchange.apiPapi,
                       assetFrom: exchange.assetFrom,
@@ -10196,8 +10166,9 @@ var getRouterFees = /*#__PURE__*/function () {
                     amountOut = _context.v;
                     _context.n = 2;
                     return handleSwapExecuteTransfer({
+                      api: api,
                       chain: origin === null || origin === void 0 ? void 0 : origin.chain,
-                      exchangeChain: exchange.baseChain,
+                      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)
@@ -10207,10 +10178,10 @@ var getRouterFees = /*#__PURE__*/function () {
                       }),
                       currencyTo: currencyTo,
                       feeAssetInfo: (_origin$feeAssetInfo = origin === null || origin === void 0 ? void 0 : origin.feeAssetInfo) !== null && _origin$feeAssetInfo !== void 0 ? _origin$feeAssetInfo : exchange.feeAssetInfo,
-                      senderAddress: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : senderAddress,
-                      recipientAddress: recipientAddress !== null && recipientAddress !== void 0 ? recipientAddress : senderAddress,
+                      sender: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : sender,
+                      recipient: recipient !== null && recipient !== void 0 ? recipient : sender,
                       calculateMinAmountOut: function calculateMinAmountOut(amountIn, assetTo) {
-                        return dex.getAmountOut(exchange.api, _objectSpread2(_objectSpread2({}, options), {}, {
+                        return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
                           amount: amountIn,
                           papiApi: options.exchange.apiPapi,
                           assetFrom: options.exchange.assetFrom,
@@ -10218,7 +10189,7 @@ var getRouterFees = /*#__PURE__*/function () {
                           slippagePct: '1'
                         }));
                       }
-                    }, builderOptions);
+                    });
                   case 2:
                     tx = _context.v;
                     return _context.a(2, tx);
@@ -10230,7 +10201,7 @@ var getRouterFees = /*#__PURE__*/function () {
             };
           }();
           _context2.n = 2;
-          return dex.getAmountOut(exchange.api, _objectSpread2(_objectSpread2({}, options), {}, {
+          return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
             amount: amount,
             papiApi: exchange.apiPapi,
             assetFrom: exchange.assetFrom,
@@ -10240,11 +10211,12 @@ var getRouterFees = /*#__PURE__*/function () {
           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.baseChain,
-            destination: (_destination$chain = destination === null || destination === void 0 ? void 0 : destination.chain) !== null && _destination$chain !== void 0 ? _destination$chain : exchange.baseChain,
-            senderAddress: evmSenderAddress !== null && evmSenderAddress !== void 0 ? evmSenderAddress : senderAddress,
-            address: recipientAddress !== null && recipientAddress !== void 0 ? recipientAddress : senderAddress,
+            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)
             }),
@@ -10252,23 +10224,26 @@ var getRouterFees = /*#__PURE__*/function () {
             disableFallback: disableFallback,
             swapConfig: {
               currencyTo: currencyTo,
-              exchangeChain: exchange.baseChain,
+              exchangeChain: exchange.chain,
               amountOut: mainAmountOut
             }
-          }, builderOptions);
+          });
         case 3:
           executeResult = _context2.v;
-          if (!(executeResult.failureReason === 'NoDeal' && exchange.exchangeChain === 'HydrationDex')) {
+          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.baseChain) {
-              return _objectSpread2(_objectSpread2({}, hop), {}, {
-                isExchange: true
-              });
+            if (hop.chain === exchange.chain) {
+              return {
+                chain: hop.chain,
+                result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
+                  isExchange: true
+                })
+              };
             }
             return hop;
           });
@@ -10290,7 +10265,7 @@ var getRouterFees = /*#__PURE__*/function () {
           }
           throw _t;
         case 6:
-          if (!(origin && origin.chain !== exchange.baseChain)) {
+          if (!(origin && origin.chain !== exchange.chain)) {
             _context2.n = 8;
             break;
           }
@@ -10312,7 +10287,7 @@ var getRouterFees = /*#__PURE__*/function () {
           _yield$getSwapFee = _context2.v;
           swapChain = _yield$getSwapFee.result;
           amountOut = _yield$getSwapFee.amountOut;
-          if (!(destination && destination.chain !== exchange.baseChain)) {
+          if (!(destination && destination.chain !== exchange.chain)) {
             _context2.n = 12;
             break;
           }
@@ -10321,8 +10296,8 @@ var getRouterFees = /*#__PURE__*/function () {
             exchange: exchange,
             destination: destination,
             amount: amountOut,
-            senderAddress: senderAddress,
-            builderOptions: builderOptions
+            sender: sender,
+            api: api
           }, disableFallback);
         case 11:
           _t3 = _context2.v;
@@ -10333,12 +10308,11 @@ var getRouterFees = /*#__PURE__*/function () {
         case 13:
           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.baseChain,
+            chain: exchange.chain,
             result: _objectSpread2(_objectSpread2({}, swapChain), {}, {
               fee: swapChain.fee + ((_receivingChain$origi = receivingChain === null || receivingChain === void 0 ? void 0 : receivingChain.origin.fee) !== null && _receivingChain$origi !== void 0 ? _receivingChain$origi : 0n),
               isExchange: true
-            }),
-            isExchange: true
+            })
           }] : []), _toConsumableArray((_receivingChain$hops = receivingChain === null || receivingChain === void 0 ? void 0 : receivingChain.hops) !== null && _receivingChain$hops !== void 0 ? _receivingChain$hops : []));
           finalOrigin = (_sendingChain$origin = sendingChain === null || sendingChain === void 0 ? void 0 : sendingChain.origin) !== null && _sendingChain$origin !== void 0 ? _sendingChain$origin : _objectSpread2(_objectSpread2({}, swapChain), !origin && {
             isExchange: true
@@ -10364,14 +10338,14 @@ var getRouterFees = /*#__PURE__*/function () {
 }();
 
 var getXcmFees = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(initialOptions, disableFallback, builderOptions) {
+  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);
           _context.n = 1;
-          return prepareTransformedOptions(initialOptions, builderOptions, true);
+          return prepareTransformedOptions(initialOptions, true);
         case 1:
           _yield$prepareTransfo = _context.v;
           options = _yield$prepareTransfo.options;
@@ -10380,65 +10354,65 @@ var getXcmFees = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function getXcmFees(_x, _x2, _x3) {
+  return function getXcmFees(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
 
 var selectBestExchangeAmountOut = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, originApi, builderOptions) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, originApi) {
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
           return _context2.a(2, selectBestExchangeCommon(options, originApi, /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, assetFromExchange, assetTo, options) {
-              var api, papiApi;
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, assetFromExchange, assetTo, _options, parsedAmount) {
+              var pjsApi, papiApi;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
                     _context.n = 1;
                     return dex.createApiInstance();
                   case 1:
-                    api = _context.v;
+                    pjsApi = _context.v;
                     _context.n = 2;
                     return dex.createApiInstancePapi();
                   case 2:
                     papiApi = _context.v;
-                    return _context.a(2, dex.getAmountOut(api, {
+                    return _context.a(2, dex.getAmountOut(pjsApi, {
                       papiApi: papiApi,
                       assetFrom: assetFromExchange,
                       assetTo: assetTo,
-                      amount: BigInt(options.amount)
+                      amount: BigInt(parsedAmount)
                     }));
                 }
               }, _callee);
             }));
-            return function (_x4, _x5, _x6, _x7) {
+            return function (_x3, _x4, _x5, _x6, _x7) {
               return _ref2.apply(this, arguments);
             };
-          }(), builderOptions));
+          }()));
       }
     }, _callee2);
   }));
-  return function selectBestExchangeAmountOut(_x, _x2, _x3) {
+  return function selectBestExchangeAmountOut(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
 
 var getBestAmountOut = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, builderOptions) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _assetFromOrigin$deci;
-    var exchange, amount, from, originApi, isExchangeAutoSelect, dex, _resolveAssets, assetFromOrigin, assetFrom, assetTo, res, api, papiApi, _t, _t2, _t3, _t4;
+    var api, exchange, amount, from, originApi, isExchangeAutoSelect, dex, _resolveAssets, assetFromOrigin, assetFrom, assetTo, res, config, exchangeConfig, pjsApi, papiApi, _t, _t2, _t3, _t4;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          exchange = options.exchange, amount = options.amount, from = options.from;
+          api = options.api, exchange = options.exchange, amount = options.amount, from = options.from;
           if (!from) {
             _context.n = 2;
             break;
           }
           _context.n = 1;
-          return createChainClient$1(from, builderOptions);
+          return createChainClient$2(api, from);
         case 1:
           _t = _context.v;
           _context.n = 3;
@@ -10453,7 +10427,7 @@ var getBestAmountOut = /*#__PURE__*/function () {
             break;
           }
           _context.n = 4;
-          return selectBestExchangeAmountOut(options, originApi, builderOptions);
+          return selectBestExchangeAmountOut(options, originApi);
         case 4:
           _t2 = _context.v;
           _context.n = 6;
@@ -10468,7 +10442,7 @@ var getBestAmountOut = /*#__PURE__*/function () {
             break;
           }
           _context.n = 7;
-          return canBuildToExchangeTx(options, dex.chain, originApi, assetFromOrigin, builderOptions);
+          return canBuildToExchangeTx(options, dex.chain, originApi, assetFromOrigin);
         case 7:
           res = _context.v;
           if (res.success) {
@@ -10477,21 +10451,23 @@ var getBestAmountOut = /*#__PURE__*/function () {
           }
           throw res.error;
         case 8:
+          config = api.config;
+          exchangeConfig = convertBuilderConfig(config);
           _context.n = 9;
-          return dex.createApiInstance(builderOptions);
+          return dex.createApiInstance(exchangeConfig);
         case 9:
-          api = _context.v;
+          pjsApi = _context.v;
           _context.n = 10;
-          return dex.createApiInstancePapi(builderOptions);
+          return dex.createApiInstancePapi(exchangeConfig);
         case 10:
           papiApi = _context.v;
-          _t3 = dex.exchangeChain;
+          _t3 = dex.chain;
           _context.n = 11;
-          return dex.getAmountOut(api, {
+          return dex.getAmountOut(pjsApi, {
             papiApi: papiApi,
             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, !!(builderOptions !== null && builderOptions !== void 0 && builderOptions.abstractDecimals))
+            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;
@@ -10502,7 +10478,7 @@ var getBestAmountOut = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function getBestAmountOut(_x, _x2) {
+  return function getBestAmountOut(_x) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -10515,10 +10491,10 @@ var computeExchangeMinAmount = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           exchange = options.exchange;
-          existentialDeposit = getExistentialDepositOrThrow(exchange.baseChain, {
+          existentialDeposit = getExistentialDepositOrThrow(exchange.chain, {
             location: exchange.assetFrom.location
           });
-          nativeSymbol = getNativeAssetSymbol(exchange.baseChain);
+          nativeSymbol = getNativeAssetSymbol(exchange.chain);
           isNativeAsset = exchange.assetFrom.symbol === nativeSymbol;
           if (isNativeAsset) {
             _context.n = 1;
@@ -10541,19 +10517,19 @@ var computeExchangeMinAmount = /*#__PURE__*/function () {
   };
 }();
 var getMinTransferableAmount = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(initialOptions, builderOptions) {
-    var _yield$prepareTransfo, dex, options, origin, exchange, senderAddress, evmSenderAddress, amount, builder;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(initialOptions) {
+    var _yield$prepareTransfo, dex, options, origin, exchange, sender, evmSenderAddress, amount, api, builder;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
           validateTransferOptions(initialOptions);
           _context2.n = 1;
-          return prepareTransformedOptions(initialOptions, builderOptions);
+          return prepareTransformedOptions(initialOptions);
         case 1:
           _yield$prepareTransfo = _context2.v;
           dex = _yield$prepareTransfo.dex;
           options = _yield$prepareTransfo.options;
-          origin = options.origin, exchange = options.exchange, senderAddress = options.senderAddress, evmSenderAddress = options.evmSenderAddress, amount = options.amount;
+          origin = options.origin, exchange = options.exchange, sender = options.sender, evmSenderAddress = options.evmSenderAddress, amount = options.amount, api = options.api;
           if (!origin) {
             _context2.n = 2;
             break;
@@ -10561,10 +10537,10 @@ var getMinTransferableAmount = /*#__PURE__*/function () {
           builder = createToExchangeBuilder({
             origin: origin,
             exchange: exchange,
-            senderAddress: senderAddress,
+            sender: sender,
             evmSenderAddress: evmSenderAddress,
             amount: amount,
-            builderOptions: builderOptions
+            api: api
           });
           return _context2.a(2, builder.getMinTransferableAmount());
         case 2:
@@ -10572,33 +10548,33 @@ var getMinTransferableAmount = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function getMinTransferableAmount(_x3, _x4) {
+  return function getMinTransferableAmount(_x3) {
     return _ref2.apply(this, arguments);
   };
 }();
 
 var computeLocalTransferableAmount = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, options) {
-    var exchange, senderAddress, currency, balance, existentialDeposit, swapFee, nativeSymbol, _result$fee, _yield$getSwapFee, result, transferable;
+    var exchange, sender, currency, balance, existentialDeposit, swapFee, nativeSymbol, _result$fee, _yield$getSwapFee, result, transferable;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          exchange = options.exchange, senderAddress = options.senderAddress;
+          exchange = options.exchange, sender = options.sender;
           currency = {
             location: exchange.assetFrom.location
           };
           _context.n = 1;
-          return getBalance({
-            api: exchange.apiPapi,
-            chain: exchange.baseChain,
-            address: senderAddress,
+          return getBalance$1({
+            api: exchange.api,
+            chain: exchange.chain,
+            address: sender,
             currency: currency
           });
         case 1:
           balance = _context.v;
-          existentialDeposit = getExistentialDepositOrThrow(exchange.baseChain, currency);
+          existentialDeposit = getExistentialDepositOrThrow(exchange.chain, currency);
           swapFee = 0n;
-          nativeSymbol = getNativeAssetSymbol(exchange.baseChain);
+          nativeSymbol = getNativeAssetSymbol(exchange.chain);
           if (!(exchange.assetFrom.symbol === nativeSymbol)) {
             _context.n = 3;
             break;
@@ -10620,30 +10596,30 @@ var computeLocalTransferableAmount = /*#__PURE__*/function () {
   };
 }();
 var getTransferableAmount = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(initialOptions, builderOptions) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(initialOptions) {
     var _yield$prepareTransfo, dex, options, transformedOptions, builder;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
           validateTransferOptions(initialOptions);
           _context2.n = 1;
-          return prepareTransformedOptions(initialOptions, builderOptions);
+          return prepareTransformedOptions(initialOptions);
         case 1:
           _yield$prepareTransfo = _context2.v;
           dex = _yield$prepareTransfo.dex;
           options = _yield$prepareTransfo.options;
           transformedOptions = options;
-          if (!(transformedOptions.origin && transformedOptions.origin.chain !== transformedOptions.exchange.baseChain)) {
+          if (!(transformedOptions.origin && transformedOptions.origin.chain !== transformedOptions.exchange.chain)) {
             _context2.n = 2;
             break;
           }
           builder = createToExchangeBuilder({
             origin: transformedOptions.origin,
             exchange: transformedOptions.exchange,
-            senderAddress: transformedOptions.senderAddress,
+            sender: transformedOptions.sender,
             evmSenderAddress: transformedOptions.evmSenderAddress,
             amount: transformedOptions.amount,
-            builderOptions: builderOptions
+            api: transformedOptions.api
           });
           return _context2.a(2, builder.getTransferableAmount());
         case 2:
@@ -10651,24 +10627,25 @@ var getTransferableAmount = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function getTransferableAmount(_x3, _x4) {
+  return function getTransferableAmount(_x3) {
     return _ref2.apply(this, arguments);
   };
 }();
 
 var executeRouterPlan = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(plan, _ref) {
-    var signer, evmSigner, onStatusChange, _iterator, _step, _step$value, currentStep, _step$value$, tx, type, chain, destinationChain, _t;
+    var signer, evmSigner, onStatusChange, api, txHashes, _iterator, _step, _step$value, currentStep, _step$value$, tx, type, chain, destinationChain, _t, _t2, _t3;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
-          signer = _ref.signer, evmSigner = _ref.evmSigner, onStatusChange = _ref.onStatusChange;
+          signer = _ref.signer, evmSigner = _ref.evmSigner, onStatusChange = _ref.onStatusChange, api = _ref.api;
+          txHashes = [];
           _iterator = _createForOfIteratorHelper(plan.entries());
           _context.p = 1;
           _iterator.s();
         case 2:
           if ((_step = _iterator.n()).done) {
-            _context.n = 6;
+            _context.n = 7;
             break;
           }
           _step$value = _slicedToArray(_step.value, 2), currentStep = _step$value[0], _step$value$ = _step$value[1], tx = _step$value$.tx, type = _step$value$.type, chain = _step$value$.chain, destinationChain = _step$value$.destinationChain;
@@ -10683,79 +10660,56 @@ var executeRouterPlan = /*#__PURE__*/function () {
             _context.n = 4;
             break;
           }
+          _t = txHashes;
           _context.n = 3;
-          return submitTransaction(tx, evmSigner);
+          return api.signAndSubmitFinalized(tx, evmSigner);
         case 3:
-          _context.n = 5;
+          _t.push.call(_t, _context.v);
+          _context.n = 6;
           break;
         case 4:
+          _t2 = txHashes;
           _context.n = 5;
-          return submitTransaction(tx, signer);
+          return api.signAndSubmitFinalized(tx, signer);
         case 5:
-          _context.n = 2;
-          break;
+          _t2.push.call(_t2, _context.v);
         case 6:
-          _context.n = 8;
+          _context.n = 2;
           break;
         case 7:
-          _context.p = 7;
-          _t = _context.v;
-          _iterator.e(_t);
+          _context.n = 9;
+          break;
         case 8:
           _context.p = 8;
-          _iterator.f();
-          return _context.f(8);
+          _t3 = _context.v;
+          _iterator.e(_t3);
         case 9:
+          _context.p = 9;
+          _iterator.f();
+          return _context.f(9);
+        case 10:
           onStatusChange === null || onStatusChange === void 0 || onStatusChange({
             type: 'COMPLETED',
             currentStep: plan.length - 1,
             routerPlan: plan
           });
-        case 10:
-          return _context.a(2);
+          return _context.a(2, txHashes);
       }
-    }, _callee, null, [[1, 7, 8, 9]]);
+    }, _callee, null, [[1, 8, 9, 10]]);
   }));
   return function executeRouterPlan(_x, _x2) {
     return _ref2.apply(this, arguments);
   };
 }();
 
-/**
- * This function allows users to send one type of token and receive a different one on the destination chain
- * in a one operation. It integrates with multiple exchanges like Acala, Basilisk, Bifrost, HydraDX, Interlay,
- * Karura, and Kintsugi, covering over 500 asset pools.
- *
- * **Example Usage:**
- * ```typescript
- * await transfer({
- *   from: 'Polkadot',
- *   to: 'Astar',
- *   currencyFrom: { symbol: 'DOT' },
- *   currencyTo: { symbol: 'ASTR' },
- *   amount: '1000000',
- *   slippagePct: '1',
- *   senderAddress: 'your_injector_address',
- *   recipientAddress: 'recipient_address',
- *   signer: 'your_signer',
- *   onStatusChange: (status) => {
- *     console.log(status);
- *   },
- * });
- * ```
- *
- * @param initialOptions - An object containing transfer details such as origin, destination, currencies, amount, addresses, and signers.
- * @returns A Promise that resolves when the transfer is complete.
- * @throws An error if required parameters are missing or invalid.
- */
 var transfer = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(initialOptions, builderOptions) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(initialOptions) {
     var _options$destination;
-    var from, exchangeChain, signer, evmSigner, senderAddress, evmSenderAddress, onStatusChange, _yield$prepareTransfo, dex, options, routerPlan;
+    var api, from, exchangeChain, signer, evmSigner, sender, evmSenderAddress, onStatusChange, _yield$prepareTransfo, dex, options, routerPlan;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          from = initialOptions.from, exchangeChain = initialOptions.exchange, signer = initialOptions.signer, evmSigner = initialOptions.evmSigner, senderAddress = initialOptions.senderAddress, evmSenderAddress = initialOptions.evmSenderAddress, onStatusChange = initialOptions.onStatusChange;
+          api = initialOptions.api, from = initialOptions.from, exchangeChain = initialOptions.exchange, signer = initialOptions.signer, evmSigner = initialOptions.evmSigner, sender = initialOptions.sender, evmSenderAddress = initialOptions.evmSenderAddress, onStatusChange = initialOptions.onStatusChange;
           validateTransferOptions(initialOptions);
           if (!(evmSigner !== undefined && evmSenderAddress === undefined)) {
             _context.n = 1;
@@ -10781,7 +10735,7 @@ var transfer = /*#__PURE__*/function () {
             });
           }
           _context.n = 4;
-          return prepareTransformedOptions(initialOptions, builderOptions);
+          return prepareTransformedOptions(initialOptions);
         case 4:
           _yield$prepareTransfo = _context.v;
           dex = _yield$prepareTransfo.dex;
@@ -10790,34 +10744,27 @@ var transfer = /*#__PURE__*/function () {
           return buildTransactions(dex, options);
         case 5:
           routerPlan = _context.v;
-          _context.n = 6;
-          return executeRouterPlan(routerPlan, {
+          return _context.a(2, executeRouterPlan(routerPlan, {
             signer: signer,
-            senderAddress: senderAddress,
+            sender: sender,
             destination: (_options$destination = options.destination) === null || _options$destination === void 0 ? void 0 : _options$destination.chain,
             evmSigner: evmSigner,
             evmSenderAddress: evmSenderAddress,
-            onStatusChange: onStatusChange
-          });
-        case 6:
-          return _context.a(2);
+            onStatusChange: onStatusChange,
+            api: api
+          }));
       }
     }, _callee);
   }));
-  return function transfer(_x, _x2) {
+  return function transfer(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 
-/**
- * Builder class for constructing and executing cross-chain transfers using the XCM Router.
- *
- * @deprecated Use `@paraspell/sdk` with the "swap" extension installed instead.
- */
 var RouterBuilderCore = /*#__PURE__*/function () {
-  function RouterBuilderCore(builderOptions, options) {
+  function RouterBuilderCore(api, options) {
     _classCallCheck(this, RouterBuilderCore);
-    this._builderOptions = builderOptions;
+    this._api = api;
     this._options = options !== null && options !== void 0 ? options : {};
   }
   /**
@@ -10829,7 +10776,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   return _createClass(RouterBuilderCore, [{
     key: "from",
     value: function from(chain) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         from: chain
       }));
     }
@@ -10842,7 +10789,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "exchange",
     value: function exchange(chain) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         exchange: normalizeExchange(chain)
       }));
     }
@@ -10855,7 +10802,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "to",
     value: function to(chain) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         to: chain
       }));
     }
@@ -10868,7 +10815,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "currencyFrom",
     value: function currencyFrom(currency) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         currencyFrom: currency
       }));
     }
@@ -10881,7 +10828,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "currencyTo",
     value: function currencyTo(currency) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         currencyTo: currency
       }));
     }
@@ -10894,7 +10841,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "feeAsset",
     value: function feeAsset(currency) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         feeAsset: currency
       }));
     }
@@ -10907,21 +10854,21 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "amount",
     value: function amount(_amount) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         amount: _amount.toString()
       }));
     }
     /**
      * Specifies the recipient address on the destination chain.
      *
-     * @param recipientAddress - The recipient address.
+     * @param recipient - The recipient address.
      * @returns The current builder instance.
      */
   }, {
-    key: "recipientAddress",
-    value: function recipientAddress(address) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
-        recipientAddress: address
+    key: "recipient",
+    value: function recipient(address) {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+        recipient: address
       }));
     }
     /**
@@ -10931,22 +10878,22 @@ var RouterBuilderCore = /*#__PURE__*/function () {
      * @returns The current builder instance.
      */
   }, {
-    key: "senderAddress",
-    value: function senderAddress(address) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
-        senderAddress: address
+    key: "sender",
+    value: function sender(address) {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+        sender: address
       }));
     }
     /**
-     * Specifies the Polkadot signer for the transaction.
+     * Specifies the signer for the transaction.
      *
-     * @param signer - The Polkadot signer instance.
+     * @param signer - The signer instance.
      * @returns The current builder instance.
      */
   }, {
     key: "signer",
     value: function signer(_signer) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         signer: _signer
       }));
     }
@@ -10959,7 +10906,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "evmSenderAddress",
     value: function evmSenderAddress(address) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         evmSenderAddress: address
       }));
     }
@@ -10972,7 +10919,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "evmSigner",
     value: function evmSigner(signer) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         evmSigner: signer
       }));
     }
@@ -10985,7 +10932,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "slippagePct",
     value: function slippagePct(pct) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         slippagePct: pct
       }));
     }
@@ -10998,7 +10945,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
   }, {
     key: "onStatusChange",
     value: function onStatusChange(callback) {
-      return new RouterBuilderCore(this._builderOptions, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         onStatusChange: callback
       }));
     }
@@ -11017,7 +10964,9 @@ var RouterBuilderCore = /*#__PURE__*/function () {
           while (1) switch (_context.n) {
             case 0:
               disableFallback = (_options$disableFallb = options === null || options === void 0 ? void 0 : options.disableFallback) !== null && _options$disableFallb !== void 0 ? _options$disableFallb : false;
-              return _context.a(2, getXcmFees(this._options, disableFallback, this._builderOptions));
+              return _context.a(2, getXcmFees(_objectSpread2(_objectSpread2({}, this._options), {}, {
+                api: this._api
+              }), disableFallback));
           }
         }, _callee, this);
       }));
@@ -11033,7 +10982,9 @@ var RouterBuilderCore = /*#__PURE__*/function () {
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              return _context2.a(2, getTransferableAmount(this._options, this._builderOptions));
+              return _context2.a(2, getTransferableAmount(_objectSpread2(_objectSpread2({}, this._options), {}, {
+                api: this._api
+              })));
           }
         }, _callee2, this);
       }));
@@ -11049,7 +11000,9 @@ var RouterBuilderCore = /*#__PURE__*/function () {
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              return _context3.a(2, getMinTransferableAmount(this._options, this._builderOptions));
+              return _context3.a(2, getMinTransferableAmount(_objectSpread2(_objectSpread2({}, this._options), {}, {
+                api: this._api
+              })));
           }
         }, _callee3, this);
       }));
@@ -11061,65 +11014,49 @@ var RouterBuilderCore = /*#__PURE__*/function () {
     /**
      * Executes the transfer with the provided parameters.
      *
+     * @returns An array of finalized transaction hashes (hex) in execution order.
      * @throws Error if required parameters are missing.
      */
   }, {
-    key: "build",
-    value: function build() {
-      return transfer(this._options, this._builderOptions);
+    key: "signAndSubmit",
+    value: function signAndSubmit() {
+      return transfer(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        api: this._api
+      }));
     }
     /**
      * Builds the transactions for the transfer with the provided parameters.
      */
   }, {
-    key: "buildTransactions",
-    value: function buildTransactions() {
-      return buildApiTransactions(this._options, this._builderOptions);
+    key: "build",
+    value: function build() {
+      return buildApiTransactions(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        api: this._api
+      }));
     }
   }, {
     key: "dryRun",
     value: function dryRun() {
-      return dryRunRouter(this._options, this._builderOptions);
+      return dryRunRouter(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        api: this._api
+      }));
     }
   }, {
     key: "getBestAmountOut",
     value: function getBestAmountOut$1() {
-      return getBestAmountOut(this._options, this._builderOptions);
+      return getBestAmountOut(_objectSpread2(_objectSpread2({}, this._options), {}, {
+        api: this._api
+      }));
     }
   }]);
 }();
-/**
- * Creates a new `RouterBuilder` instance for constructing and executing cross-chain transfers using the XCM Router.
- *
- * @deprecated Use `@paraspell/sdk` with the "swap" extension installed instead.
- *
- * **Example usage:**
- * ```typescript
- * await RouterBuilder(options)
- *   .from('Polkadot')
- *   .exchange('HydrationDex')
- *   .to('Astar')
- *   .currencyFrom({ symbol: 'DOT' })
- *   .currencyTo({ symbol: 'ASTR' })
- *   .amount(1000000n)
- *   .slippagePct('1')
- *   .senderAddress('sender_address')
- *   .recipientAddress('recipient_address')
- *   .signer(yourSigner)
- *   .onStatusChange((status) => {
- *     console.log(status);
- *   })
- *   .build();
- * ```
- *
- * @returns A new `RouterBuilder`.
- */
-var RouterBuilder = function RouterBuilder(options) {
-  return new RouterBuilderCore(options);
+var RouterBuilder = function RouterBuilder(api) {
+  return new RouterBuilderCore(api);
 };
 
+// @ts-expect-error - Temporary. Will be removed once the swap extension is fully integrated into the SDK.
 registerSwapExtension({
   RouterBuilder: RouterBuilder
 });
 
-export { DEST_FEE_BUFFER_PCT, FALLBACK_FEE_CALC_ADDRESS, FALLBACK_FEE_CALC_EVM_ADDRESS, FEE_BUFFER_PCT, RouterBuilder, RouterBuilderCore, buildApiTransactions, buildTransactions, createExchangeInstance, getExchangeAssets, getExchangeConfig, getExchangePairs, getSupportedAssetsFrom, getSupportedAssetsTo, getSupportedFeeAssets, transfer };
+export { DEST_FEE_BUFFER_PCT, FALLBACK_FEE_CALC_ADDRESS, FALLBACK_FEE_CALC_EVM_ADDRESS, FEE_BUFFER_PCT, RouterBuilder, RouterBuilderCore, getExchangeAssets, getExchangeConfig, getExchangePairs, getSupportedAssetsFrom, getSupportedAssetsTo, getSupportedFeeAssets };