@paraspell/swap 13.2.2 → 13.3.0

package/dist/index.mjs

@@ -1,6 +1,5 @@
-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 { toHex } from 'polkadot-api/utils';
+import { createChainClient as createChainClient$1, registerSwapExtension } from '@paraspell/sdk';
+import { getNativeAssets, RoutingResolutionError, findAssetInfoById, getOtherAssets, getChainProviders, parseUnits, getNativeAssetSymbol, padValueBy, formatUnits as formatUnits$1, AmountTooLowError, getBalance, localizeLocation, getAssets, Parents, isSymbolMatch, getParaId, UnableToComputeError, getAssetDecimals, InvalidCurrencyError, findAssetInfoOrThrow, isOverrideLocationSpecifier, UnsupportedOperationError, isSymbolSpecifier, findBestMatches, findAssetInfoBySymbol, findAssetInfoByLoc, deepEqual, normalizeExchange, EXCHANGE_CHAINS, reverseTransformLocation, isAssetEqual, isExternalChain, isSystemAsset, TransferToAhNotSupported, ScenarioNotSupportedError, applyDecimalAbstraction, isConfig, findAssetInfo, getRelayChainOf, hasSupportForAsset, Builder, isChainEvm, convertBuilderConfig, InvalidAddressError, MissingParameterError, DryRunFailedError, handleSwapExecuteTransfer, BatchMode, dryRun, getFailureInfo, getOriginXcmFee, getXcmFee, createChainClient as createChainClient$2, getExistentialDepositOrThrow } from '@paraspell/sdk-core';
 import 'polkadot-api';
 import { Wallet } from '@acala-network/sdk';
 import { FixedPointNumber } from '@acala-network/sdk-core';
@@ -405,7 +404,7 @@ var stripHeaderBytes = function stripHeaderBytes(hex, byteCount) {
 };
 var convertTxToTarget = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(tx, api) {
-    var isPjsTx, hex, hex2, hex3, _t, _t2;
+    var isPjsTx, hex, hex2, hex3, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
@@ -418,11 +417,10 @@ var convertTxToTarget = /*#__PURE__*/function () {
           _context.n = 3;
           break;
         case 1:
-          _t2 = toHex;
           _context.n = 2;
-          return tx.getEncodedData();
+          return api.txToHex(tx);
         case 2:
-          _t = _t2(_context.v);
+          _t = _context.v;
         case 3:
           hex = _t;
           if (!(isPjsTx && api.type === 'PAPI')) {
@@ -1745,6 +1743,54 @@ var Hydration = {
 				]
 			}
 		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0xca30f9ff99394c55deda293df223e3740635c72e"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x49f925bf72718f4abbc57adef1b705931f928a2a"
+						}
+					}
+				]
+			}
+		},
+		{
+			parents: 1,
+			interior: {
+				X2: [
+					{
+						Parachain: 2034
+					},
+					{
+						AccountKey20: {
+							network: null,
+							key: "0x987ddc8b236fb23e1e48882b206396ca9b42648b"
+						}
+					}
+				]
+			}
+		},
 		{
 			parents: 1,
 			interior: {
@@ -7205,13 +7251,13 @@ var ExchangeChain = /*#__PURE__*/function () {
   }, {
     key: "handleMultiSwap",
     value: function () {
-      var _handleMultiSwap = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, options, toDestTransactionFee) {
+      var _handleMultiSwap = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, toDestTransactionFee) {
         var singleSwapResult;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
               _context.n = 1;
-              return this.swapCurrency(api, options, toDestTransactionFee);
+              return this.swapCurrency(options, toDestTransactionFee);
             case 1:
               singleSwapResult = _context.v;
               return _context.a(2, {
@@ -7221,7 +7267,7 @@ var ExchangeChain = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
-      function handleMultiSwap(_x, _x2, _x3) {
+      function handleMultiSwap(_x, _x2) {
         return _handleMultiSwap.apply(this, arguments);
       }
       return handleMultiSwap;
@@ -7237,7 +7283,7 @@ var ExchangeChain = /*#__PURE__*/function () {
           }
         }, _callee2, this);
       }));
-      function createApiInstance(_x4) {
+      function createApiInstance(_x3) {
         return _createApiInstance.apply(this, arguments);
       }
       return createApiInstance;
@@ -7253,7 +7299,7 @@ var ExchangeChain = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function createApiInstancePapi(_x5) {
+      function createApiInstancePapi(_x4) {
         return _createApiInstancePapi.apply(this, arguments);
       }
       return createApiInstancePapi;
@@ -7456,24 +7502,24 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
   return _createClass(AcalaExchange, [{
     key: "swapCurrency",
     value: function () {
-      var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, options, toDestTransactionFee) {
-        var papiApi, assetFrom, assetTo, amount, sender, origin, isForFeeEstimation, wallet, fromToken, toToken, acalaDex, dex, swapFee, totalNativeCurrencyFee, balance, pctDestFee, amountWithoutFee, tradeResult, tx, amountOutRes, amountOut, nativeAssetSymbol, amountOutWithFee;
+      var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, toDestTransactionFee) {
+        var api, apiPjs, 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, sender = options.sender, origin = options.origin, isForFeeEstimation = options.isForFeeEstimation;
-              wallet = new Wallet(api);
+              api = options.api, apiPjs = options.apiPjs, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, sender = options.sender, origin = options.origin, isForFeeEstimation = options.isForFeeEstimation;
+              wallet = new Wallet(apiPjs);
               _context.n = 1;
               return wallet.isReady;
             case 1:
               fromToken = wallet.getToken(assetFrom.symbol);
               toToken = wallet.getToken(assetTo.symbol);
               acalaDex = new AcalaDex({
-                api: api,
+                api: apiPjs,
                 wallet: wallet
               });
               dex = new AggregateDex({
-                api: api,
+                api: apiPjs,
                 wallet: wallet,
                 providers: [acalaDex]
               });
@@ -7485,7 +7531,7 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
               Logger.log('Total fee native:', totalNativeCurrencyFee);
               _context.n = 3;
               return getBalance({
-                api: papiApi,
+                api: api,
                 address: sender,
                 chain: this.chain
               });
@@ -7542,7 +7588,7 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee, this);
       }));
-      function swapCurrency(_x, _x2, _x3) {
+      function swapCurrency(_x, _x2) {
         return _swapCurrency.apply(this, arguments);
       }
       return swapCurrency;
@@ -7550,24 +7596,24 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
   }, {
     key: "getAmountOut",
     value: function () {
-      var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, options) {
-        var assetFrom, assetTo, amount, origin, wallet, fromToken, toToken, acalaDex, dex, pctDestFee, amountWithoutFee, tradeResult, amountOutRes;
+      var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+        var apiPjs, assetFrom, assetTo, amount, origin, wallet, fromToken, toToken, acalaDex, dex, pctDestFee, amountWithoutFee, tradeResult, amountOutRes;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin;
-              wallet = new Wallet(api);
+              apiPjs = options.apiPjs, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin;
+              wallet = new Wallet(apiPjs);
               _context2.n = 1;
               return wallet.isReady;
             case 1:
               fromToken = wallet.getToken(assetFrom.symbol);
               toToken = wallet.getToken(assetTo.symbol);
               acalaDex = new AcalaDex({
-                api: api,
+                api: apiPjs,
                 wallet: wallet
               });
               dex = new AggregateDex({
-                api: api,
+                api: apiPjs,
                 wallet: wallet,
                 providers: [acalaDex]
               });
@@ -7587,7 +7633,7 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee2);
       }));
-      function getAmountOut(_x4, _x5) {
+      function getAmountOut(_x3) {
         return _getAmountOut.apply(this, arguments);
       }
       return getAmountOut;
@@ -7619,7 +7665,7 @@ var AcalaExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee4, this);
       }));
-      function getDexConfig(_x6) {
+      function getDexConfig(_x4) {
         return _getDexConfig2.apply(this, arguments);
       }
       return getDexConfig;
@@ -7728,54 +7774,6 @@ var getDexConfig$1 = /*#__PURE__*/function () {
   };
 }();
 
-var getQuotedAmount = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, chain, assetFromML, assetToML, amountIn) {
-    var includeFee,
-      localizedFrom,
-      localizedTo,
-      quoted,
-      _args = arguments,
-      _t;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
-        case 0:
-          includeFee = _args.length > 5 && _args[5] !== undefined ? _args[5] : true;
-          _context.p = 1;
-          localizedFrom = localizeLocation(chain, assetFromML);
-          localizedTo = localizeLocation(chain, assetToML);
-          _context.n = 2;
-          return api.getUnsafeApi().apis.AssetConversionApi.quote_price_exact_tokens_for_tokens(transform(localizedFrom), transform(localizedTo), amountIn, includeFee);
-        case 2:
-          quoted = _context.v;
-          if (!(quoted !== undefined)) {
-            _context.n = 3;
-            break;
-          }
-          return _context.a(2, {
-            amountOut: BigInt(quoted.toString()),
-            usedFromML: localizedFrom,
-            usedToML: localizedTo
-          });
-        case 3:
-          _context.n = 5;
-          break;
-        case 4:
-          _context.p = 4;
-          _t = _context.v;
-          // eslint-disable-next-line no-console
-          console.error('Error (localized):', _t);
-        case 5:
-          throw new RoutingResolutionError('Swap failed: Pool not found');
-        case 6:
-          return _context.a(2);
-      }
-    }, _callee, null, [[1, 4]]);
-  }));
-  return function getQuotedAmount(_x, _x2, _x3, _x4, _x5) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
   function AssetHubExchange() {
     _classCallCheck(this, AssetHubExchange);
@@ -7783,68 +7781,115 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
   }
   _inherits(AssetHubExchange, _ExchangeChain);
   return _createClass(AssetHubExchange, [{
-    key: "swapCurrency",
+    key: "quoteOrThrow",
     value: function () {
-      var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_api, options, toDestTxFee) {
-        var assetFrom, assetTo, amount, sender, slippagePct, origin, papiApi, pctDestFee, amountWithoutFee, _yield$getQuotedAmoun, amountOut, usedFromML, usedToML, slippageMultiplier, minAmountOut, tx, toDestFeeCurrencyTo, finalAmountOut, _t;
+      var _quoteOrThrow = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, fromLocation, toLocation, amount) {
+        var includeFee,
+          quoted,
+          cause,
+          message,
+          _args = arguments,
+          _t;
         return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
+          while (1) switch (_context.p = _context.n) {
+            case 0:
+              includeFee = _args.length > 4 && _args[4] !== undefined ? _args[4] : true;
+              _context.p = 1;
+              _context.n = 2;
+              return api.queryRuntimeApi({
+                module: 'AssetConversionApi',
+                method: 'quote_price_exact_tokens_for_tokens',
+                params: [fromLocation, toLocation, amount, includeFee]
+              });
+            case 2:
+              quoted = _context.v;
+              _context.n = 4;
+              break;
+            case 3:
+              _context.p = 3;
+              _t = _context.v;
+              cause = _t;
+            case 4:
+              if (!(quoted == null)) {
+                _context.n = 5;
+                break;
+              }
+              message = cause instanceof Error ? " (".concat(cause.message, ")") : '';
+              throw new RoutingResolutionError("Swap failed: Pool not found".concat(message));
+            case 5:
+              return _context.a(2, BigInt(quoted));
+          }
+        }, _callee, null, [[1, 3]]);
+      }));
+      function quoteOrThrow(_x, _x2, _x3, _x4) {
+        return _quoteOrThrow.apply(this, arguments);
+      }
+      return quoteOrThrow;
+    }()
+  }, {
+    key: "swapCurrency",
+    value: function () {
+      var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, toDestTxFee) {
+        var api, assetFrom, assetTo, amount, sender, slippagePct, origin, localizedFrom, localizedTo, pctDestFee, amountWithoutFee, amountOut, slippageMultiplier, minAmountOut, tx, toDestFeeCurrencyTo, finalAmountOut, _t2;
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
             case 0:
-              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, sender = options.sender, slippagePct = options.slippagePct, origin = options.origin, papiApi = options.papiApi;
+              api = options.api, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, sender = options.sender, slippagePct = options.slippagePct, origin = options.origin;
+              localizedFrom = localizeLocation(this.chain, assetFrom.location);
+              localizedTo = localizeLocation(this.chain, assetTo.location);
               pctDestFee = origin ? DEST_FEE_BUFFER_PCT : 0;
               amountWithoutFee = padValueBy(amount, pctDestFee);
-              _context.n = 1;
-              return getQuotedAmount(papiApi, this.chain, assetFrom.location, assetTo.location, amountWithoutFee);
+              _context2.n = 1;
+              return this.quoteOrThrow(api, localizedFrom, localizedTo, amountWithoutFee);
             case 1:
-              _yield$getQuotedAmoun = _context.v;
-              amountOut = _yield$getQuotedAmoun.amountOut;
-              usedFromML = _yield$getQuotedAmoun.usedFromML;
-              usedToML = _yield$getQuotedAmoun.usedToML;
+              amountOut = _context2.v;
               slippageMultiplier = Number(slippagePct);
               minAmountOut = padValueBy(amountOut, -slippageMultiplier);
-              tx = papiApi.getUnsafeApi().tx.AssetConversion.swap_exact_tokens_for_tokens({
-                path: [transform(usedFromML), transform(usedToML)],
-                amount_in: amountWithoutFee,
-                amount_out_min: minAmountOut,
-                send_to: sender,
-                keep_alive: !!assetFrom.isNative
+              tx = api.deserializeExtrinsics({
+                module: 'AssetConversion',
+                method: 'swap_exact_tokens_for_tokens',
+                params: {
+                  path: [localizedFrom, localizedTo],
+                  amount_in: amountWithoutFee,
+                  amount_out_min: minAmountOut,
+                  send_to: sender,
+                  keep_alive: !!assetFrom.isNative
+                }
               });
               if (!(assetTo.symbol == getNativeAssetSymbol(this.chain))) {
-                _context.n = 2;
+                _context2.n = 2;
                 break;
               }
-              _t = toDestTxFee;
-              _context.n = 4;
+              _t2 = toDestTxFee;
+              _context2.n = 4;
               break;
             case 2:
-              _context.n = 3;
-              return getQuotedAmount(papiApi, this.chain, {
+              _context2.n = 3;
+              return this.quoteOrThrow(api, {
                 parents: Parents.ONE,
                 interior: {
                   Here: null
                 }
-              }, assetTo.location, toDestTxFee, true).then(function (res) {
-                return res.amountOut;
-              });
+              }, localizedTo, toDestTxFee, true);
             case 3:
-              _t = _context.v;
+              _t2 = _context2.v;
             case 4:
-              toDestFeeCurrencyTo = _t;
+              toDestFeeCurrencyTo = _t2;
               finalAmountOut = amountOut - padValueBy(toDestFeeCurrencyTo, FEE_BUFFER_PCT);
               if (!(finalAmountOut <= 0n)) {
-                _context.n = 5;
+                _context2.n = 5;
                 break;
               }
               throw new AmountTooLowError();
             case 5:
-              return _context.a(2, {
+              return _context2.a(2, {
                 tx: tx,
                 amountOut: finalAmountOut
               });
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-      function swapCurrency(_x, _x2, _x3) {
+      function swapCurrency(_x5, _x6) {
         return _swapCurrency.apply(this, arguments);
       }
       return swapCurrency;
@@ -7852,17 +7897,17 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
   }, {
     key: "handleMultiSwap",
     value: function () {
-      var _handleMultiSwap = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, options, toDestTransactionFee) {
+      var _handleMultiSwap = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options, toDestTransactionFee) {
         var assetFrom, assetTo, nativeAsset, isAssetFromNative, isAssetToNative, singleSwapResult, optionsHop1, resultHop1, hop1Received, assumedInputForHop2, optionsHop2, resultHop2;
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
               assetFrom = options.assetFrom, assetTo = options.assetTo;
               nativeAsset = getExchangeAsset(this.chain, {
                 symbol: getNativeAssetSymbol(this.chain)
               });
               if (nativeAsset) {
-                _context2.n = 1;
+                _context3.n = 1;
                 break;
               }
               throw new RoutingResolutionError('Native asset not found for this exchange chain.');
@@ -7870,20 +7915,20 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
               isAssetFromNative = assetFrom.symbol === nativeAsset.symbol;
               isAssetToNative = assetTo.symbol === nativeAsset.symbol;
               if (!(isAssetFromNative && isAssetToNative)) {
-                _context2.n = 2;
+                _context3.n = 2;
                 break;
               }
               throw new RoutingResolutionError('Cannot swap native asset to itself.');
             case 2:
               if (!(isAssetFromNative || isAssetToNative)) {
-                _context2.n = 4;
+                _context3.n = 4;
                 break;
               }
-              _context2.n = 3;
-              return this.swapCurrency(api, _objectSpread2({}, options), toDestTransactionFee);
+              _context3.n = 3;
+              return this.swapCurrency(options, toDestTransactionFee);
             case 3:
-              singleSwapResult = _context2.v;
-              return _context2.a(2, {
+              singleSwapResult = _context3.v;
+              return _context3.a(2, {
                 txs: [singleSwapResult.tx],
                 amountOut: singleSwapResult.amountOut
               });
@@ -7892,12 +7937,12 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
               optionsHop1 = _objectSpread2(_objectSpread2({}, options), {}, {
                 assetTo: nativeAsset
               });
-              _context2.n = 5;
-              return this.swapCurrency(api, optionsHop1, 0n);
+              _context3.n = 5;
+              return this.swapCurrency(optionsHop1, 0n);
             case 5:
-              resultHop1 = _context2.v;
+              resultHop1 = _context3.v;
               if (!(resultHop1.amountOut <= 0n)) {
-                _context2.n = 6;
+                _context3.n = 6;
                 break;
               }
               throw new AmountTooLowError("First hop (".concat(assetFrom.symbol, " -> ").concat(nativeAsset.symbol, ") resulted in zero or negative output."));
@@ -7905,7 +7950,8 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
               hop1Received = resultHop1.amountOut;
               assumedInputForHop2 = padValueBy(hop1Received, -2);
               optionsHop2 = {
-                papiApi: options.papiApi,
+                apiPjs: options.apiPjs,
+                api: options.api,
                 slippagePct: options.slippagePct,
                 sender: options.sender,
                 origin: undefined,
@@ -7914,26 +7960,26 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
                 amount: assumedInputForHop2,
                 feeCalcAddress: options.feeCalcAddress
               };
-              _context2.n = 7;
-              return this.swapCurrency(api, optionsHop2, toDestTransactionFee);
+              _context3.n = 7;
+              return this.swapCurrency(optionsHop2, toDestTransactionFee);
             case 7:
-              resultHop2 = _context2.v;
+              resultHop2 = _context3.v;
               if (!(resultHop2.amountOut <= 0n)) {
-                _context2.n = 8;
+                _context3.n = 8;
                 break;
               }
               throw new AmountTooLowError("Second hop (".concat(nativeAsset.symbol, " -> ").concat(assetTo.symbol, ") resulted in zero or negative output."));
             case 8:
-              return _context2.a(2, {
+              return _context3.a(2, {
                 txs: [resultHop1.tx, resultHop2.tx],
                 amountOut: resultHop2.amountOut
               });
             case 9:
-              return _context2.a(2);
+              return _context3.a(2);
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-      function handleMultiSwap(_x4, _x5, _x6) {
+      function handleMultiSwap(_x7, _x8) {
         return _handleMultiSwap.apply(this, arguments);
       }
       return handleMultiSwap;
@@ -7941,17 +7987,17 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
   }, {
     key: "getAmountOut",
     value: function () {
-      var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(_api, options) {
-        var assetFrom, assetTo, amount, origin, papiApi, nativeAsset, isAssetFromNative, isAssetToNative, pctDestFee, amountWithoutFee, _yield$getQuotedAmoun2, amountOut, _yield$getQuotedAmoun3, hop1AmountOut, assumedInputForHop2, _yield$getQuotedAmoun4, finalAmountOut;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+      var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(options) {
+        var api, assetFrom, assetTo, amount, origin, nativeAsset, isAssetFromNative, isAssetToNative, pctDestFee, amountWithoutFee, hop1AmountOut, assumedInputForHop2, finalAmountOut;
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
             case 0:
-              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin, papiApi = options.papiApi;
+              api = options.api, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin;
               nativeAsset = getExchangeAsset(this.chain, {
                 symbol: getNativeAssetSymbol(this.chain)
               });
               if (nativeAsset) {
-                _context3.n = 1;
+                _context4.n = 1;
                 break;
               }
               throw new RoutingResolutionError('Native asset not found for this exchange chain.');
@@ -7959,7 +8005,7 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
               isAssetFromNative = assetFrom.symbol === nativeAsset.symbol;
               isAssetToNative = assetTo.symbol === nativeAsset.symbol;
               if (!(isAssetFromNative && isAssetToNative)) {
-                _context3.n = 2;
+                _context4.n = 2;
                 break;
               }
               throw new RoutingResolutionError('Cannot swap native asset to itself.');
@@ -7967,46 +8013,39 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
               pctDestFee = origin ? DEST_FEE_BUFFER_PCT : 0;
               amountWithoutFee = padValueBy(amount, pctDestFee);
               if (!(isAssetFromNative || isAssetToNative)) {
-                _context3.n = 4;
+                _context4.n = 3;
                 break;
               }
-              _context3.n = 3;
-              return getQuotedAmount(papiApi, this.chain, assetFrom.location, assetTo.location, amountWithoutFee);
+              return _context4.a(2, this.quoteOrThrow(api, localizeLocation(this.chain, assetFrom.location), localizeLocation(this.chain, assetTo.location), amountWithoutFee));
             case 3:
-              _yield$getQuotedAmoun2 = _context3.v;
-              amountOut = _yield$getQuotedAmoun2.amountOut;
-              return _context3.a(2, amountOut);
+              _context4.n = 4;
+              return this.quoteOrThrow(api, localizeLocation(this.chain, assetFrom.location), localizeLocation(this.chain, nativeAsset.location), amountWithoutFee);
             case 4:
-              _context3.n = 5;
-              return getQuotedAmount(papiApi, this.chain, assetFrom.location, nativeAsset.location, amountWithoutFee);
-            case 5:
-              _yield$getQuotedAmoun3 = _context3.v;
-              hop1AmountOut = _yield$getQuotedAmoun3.amountOut;
+              hop1AmountOut = _context4.v;
               if (!(hop1AmountOut <= 0n)) {
-                _context3.n = 6;
+                _context4.n = 5;
                 break;
               }
               throw new AmountTooLowError("First hop (".concat(assetFrom.symbol, " -> ").concat(nativeAsset.symbol, ") resulted in zero or negative output."));
-            case 6:
+            case 5:
               assumedInputForHop2 = padValueBy(hop1AmountOut, -2);
-              _context3.n = 7;
-              return getQuotedAmount(papiApi, this.chain, nativeAsset.location, assetTo.location, assumedInputForHop2);
-            case 7:
-              _yield$getQuotedAmoun4 = _context3.v;
-              finalAmountOut = _yield$getQuotedAmoun4.amountOut;
+              _context4.n = 6;
+              return this.quoteOrThrow(api, localizeLocation(this.chain, nativeAsset.location), localizeLocation(this.chain, assetTo.location), assumedInputForHop2);
+            case 6:
+              finalAmountOut = _context4.v;
               if (!(finalAmountOut <= 0n)) {
-                _context3.n = 8;
+                _context4.n = 7;
                 break;
               }
               throw new AmountTooLowError("Second hop (".concat(nativeAsset.symbol, " -> ").concat(assetTo.symbol, ") resulted in zero or negative output."));
+            case 7:
+              return _context4.a(2, finalAmountOut);
             case 8:
-              return _context3.a(2, finalAmountOut);
-            case 9:
-              return _context3.a(2);
+              return _context4.a(2);
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function getAmountOut(_x7, _x8) {
+      function getAmountOut(_x9) {
         return _getAmountOut.apply(this, arguments);
       }
       return getAmountOut;
@@ -8014,15 +8053,15 @@ var AssetHubExchange = /*#__PURE__*/function (_ExchangeChain) {
   }, {
     key: "getDexConfig",
     value: function () {
-      var _getDexConfig2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(api) {
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+      var _getDexConfig2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(api) {
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
             case 0:
-              return _context4.a(2, getDexConfig$1(api, this.chain));
+              return _context5.a(2, getDexConfig$1(api, this.chain));
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function getDexConfig(_x9) {
+      function getDexConfig(_x0) {
         return _getDexConfig2.apply(this, arguments);
       }
       return getDexConfig;
@@ -8376,12 +8415,12 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
   return _createClass(BifrostExchange, [{
     key: "swapCurrency",
     value: function () {
-      var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, options, toDestTxFee) {
-        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;
+      var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, toDestTxFee) {
+        var apiPjs, 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, sender = options.sender, slippagePct = options.slippagePct, origin = options.origin;
+              apiPjs = options.apiPjs, 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);
@@ -8402,7 +8441,7 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
               tokenTo = new Token(tokenWrappedTo.wrapped);
               currencyCombinations = getCurrencyCombinations(chainId, tokenFrom, tokenTo);
               _context.n = 3;
-              return getFilteredPairs(api, chainId, currencyCombinations);
+              return getFilteredPairs(apiPjs, chainId, currencyCombinations);
             case 3:
               pairs = _context.v;
               Logger.log('To dest tx fee in native currency:', toDestTxFee);
@@ -8420,12 +8459,12 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
               trade = getBestTrade(chainId, pairs, amountInFinal, tokenTo);
               allowedSlippage = new Percent(Number(slippagePct) * 100, 10000);
               _context.n = 5;
-              return api.derive.chain.bestNumber();
+              return apiPjs.derive.chain.bestNumber();
             case 5:
               blockNumber = _context.v;
               deadline = blockNumber.toNumber() + 20;
               _SwapRouter$swapCallP = SwapRouter.swapCallParameters(trade, {
-                api: api,
+                api: apiPjs,
                 allowedSlippage: allowedSlippage,
                 recipient: sender,
                 deadline: deadline
@@ -8463,7 +8502,7 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee, this);
       }));
-      function swapCurrency(_x, _x2, _x3) {
+      function swapCurrency(_x, _x2) {
         return _swapCurrency.apply(this, arguments);
       }
       return swapCurrency;
@@ -8471,12 +8510,12 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
   }, {
     key: "getAmountOut",
     value: function () {
-      var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, options) {
-        var assetFrom, assetTo, amount, origin, chainId, tokenMap, tokenWrappedFrom, tokenWrappedTo, tokenFrom, tokenTo, currencyCombinations, pairs, pctDestFee, amountWithoutFee, amountIn, trade;
+      var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+        var apiPjs, assetFrom, assetTo, amount, origin, chainId, tokenMap, tokenWrappedFrom, tokenWrappedTo, tokenFrom, tokenTo, currencyCombinations, pairs, pctDestFee, amountWithoutFee, amountIn, trade;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin;
+              apiPjs = options.apiPjs, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin;
               chainId = getParaId(this.chain);
               tokenMap = getTokenMap(this.chain, chainId);
               tokenWrappedFrom = findToken(tokenMap, assetFrom.symbol);
@@ -8497,7 +8536,7 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
               tokenTo = new Token(tokenWrappedTo.wrapped);
               currencyCombinations = getCurrencyCombinations(chainId, tokenFrom, tokenTo);
               _context2.n = 3;
-              return getFilteredPairs(api, chainId, currencyCombinations);
+              return getFilteredPairs(apiPjs, chainId, currencyCombinations);
             case 3:
               pairs = _context2.v;
               pctDestFee = origin ? DEST_FEE_BUFFER_PCT : 0;
@@ -8508,7 +8547,7 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee2, this);
       }));
-      function getAmountOut(_x4, _x5) {
+      function getAmountOut(_x3) {
         return _getAmountOut.apply(this, arguments);
       }
       return getAmountOut;
@@ -8524,7 +8563,7 @@ var BifrostExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee3, this);
       }));
-      function getDexConfig$1(_x6) {
+      function getDexConfig$1(_x4) {
         return _getDexConfig2.apply(this, arguments);
       }
       return getDexConfig$1;
@@ -8638,13 +8677,13 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
   return _createClass(HydrationExchange, [{
     key: "swapCurrency",
     value: function () {
-      var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, options, toDestTransactionFee) {
-        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;
+      var _swapCurrency = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, toDestTransactionFee) {
+        var apiPjs, origin, assetFrom, assetTo, sender, slippagePct, amount, _createSdkContext, tradeRouter, txBuilderFactory, currencyFromInfo, currencyToInfo, tradeFee, amountWithoutFee, amountNormalized, trade, substrateTx, tx, amountOut, nativeCurrencyInfo, nativeCurrencyDecimals, priceInfo, currencyToPrice, feeInCurrencyTo, amountOutModified;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              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;
+              apiPjs = options.apiPjs, origin = options.origin, assetFrom = options.assetFrom, assetTo = options.assetTo, sender = options.sender, slippagePct = options.slippagePct, amount = options.amount;
+              _createSdkContext = createSdkContext(apiPjs), tradeRouter = _createSdkContext.api.router, txBuilderFactory = _createSdkContext.tx;
               _context.n = 1;
               return getAssetInfo(tradeRouter, assetFrom);
             case 1:
@@ -8743,7 +8782,7 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee, this);
       }));
-      function swapCurrency(_x, _x2, _x3) {
+      function swapCurrency(_x, _x2) {
         return _swapCurrency.apply(this, arguments);
       }
       return swapCurrency;
@@ -8751,13 +8790,13 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
   }, {
     key: "getAmountOut",
     value: function () {
-      var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, options) {
-        var assetFrom, assetTo, amount, origin, _options$slippagePct, slippagePct, _createSdkContext2, tradeRouter, currencyFromInfo, currencyToInfo, pctDestFee, amountWithoutFee, amountNormalized, trade, amountOut, slippageMultiplier;
+      var _getAmountOut = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+        var apiPjs, assetFrom, assetTo, amount, origin, _options$slippagePct, slippagePct, _createSdkContext2, tradeRouter, currencyFromInfo, currencyToInfo, pctDestFee, amountWithoutFee, amountNormalized, trade, amountOut, slippageMultiplier;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin, _options$slippagePct = options.slippagePct, slippagePct = _options$slippagePct === void 0 ? '0' : _options$slippagePct;
-              _createSdkContext2 = createSdkContext(api), tradeRouter = _createSdkContext2.api.router;
+              apiPjs = options.apiPjs, assetFrom = options.assetFrom, assetTo = options.assetTo, amount = options.amount, origin = options.origin, _options$slippagePct = options.slippagePct, slippagePct = _options$slippagePct === void 0 ? '0' : _options$slippagePct;
+              _createSdkContext2 = createSdkContext(apiPjs), tradeRouter = _createSdkContext2.api.router;
               _context2.n = 1;
               return getAssetInfo(tradeRouter, assetFrom);
             case 1:
@@ -8791,7 +8830,7 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee2);
       }));
-      function getAmountOut(_x4, _x5) {
+      function getAmountOut(_x3) {
         return _getAmountOut.apply(this, arguments);
       }
       return getAmountOut;
@@ -8834,7 +8873,7 @@ var HydrationExchange = /*#__PURE__*/function (_ExchangeChain) {
           }
         }, _callee3, this);
       }));
-      function getDexConfig(_x6) {
+      function getDexConfig(_x4) {
         return _getDexConfig.apply(this, arguments);
       }
       return getDexConfig;
@@ -9339,8 +9378,9 @@ var selectBestExchange = /*#__PURE__*/function () {
                   case 4:
                     toDestTxFee = _context.v;
                     _context.n = 5;
-                    return dex.handleMultiSwap(modifiedOptions.exchange.apiPjs, _objectSpread2(_objectSpread2({}, modifiedOptions), {}, {
-                      papiApi: modifiedOptions.exchange.apiPapi,
+                    return dex.handleMultiSwap(_objectSpread2(_objectSpread2({}, modifiedOptions), {}, {
+                      api: modifiedOptions.exchange.api,
+                      apiPjs: modifiedOptions.exchange.apiPjs,
                       assetFrom: modifiedOptions.exchange.assetFrom,
                       assetTo: modifiedOptions.exchange.assetTo,
                       isForFeeEstimation: isForFeeEstimation
@@ -9709,8 +9749,9 @@ var createSwapTx = /*#__PURE__*/function () {
         case 1:
           toDestTxFee = _context2.v;
           _context2.n = 2;
-          return exchange.handleMultiSwap(options.exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
-            papiApi: options.exchange.apiPapi,
+          return exchange.handleMultiSwap(_objectSpread2(_objectSpread2({}, options), {}, {
+            api: options.exchange.api,
+            apiPjs: options.exchange.apiPjs,
             assetFrom: options.exchange.assetFrom,
             assetTo: options.exchange.assetTo,
             isForFeeEstimation: isForFeeEstimation
@@ -9748,8 +9789,9 @@ var prepareExtrinsics = /*#__PURE__*/function () {
           }
           _context.p = 1;
           _context.n = 2;
-          return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
-            papiApi: exchange.apiPapi,
+          return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
+            api: exchange.api,
+            apiPjs: exchange.apiPjs,
             assetFrom: exchange.assetFrom,
             assetTo: exchange.assetTo
           }));
@@ -9772,9 +9814,10 @@ var prepareExtrinsics = /*#__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,
             calculateMinAmountOut: function calculateMinAmountOut(amountIn, assetTo) {
-              return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
+              return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
                 amount: amountIn,
-                papiApi: options.exchange.apiPapi,
+                api: options.exchange.api,
+                apiPjs: options.exchange.apiPjs,
                 assetFrom: options.exchange.assetFrom,
                 assetTo: assetTo !== null && assetTo !== void 0 ? assetTo : options.exchange.assetTo
               }));
@@ -10177,9 +10220,10 @@ var getRouterFees = /*#__PURE__*/function () {
                   case 0:
                     amt = overrideAmount !== undefined ? applyDecimalAbstraction(overrideAmount, exchange.assetFrom.decimals, true) : amount;
                     _context.n = 1;
-                    return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
+                    return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
                       amount: amt,
-                      papiApi: exchange.apiPapi,
+                      api: exchange.api,
+                      apiPjs: exchange.apiPjs,
                       assetFrom: exchange.assetFrom,
                       assetTo: exchange.assetTo
                     }));
@@ -10202,9 +10246,10 @@ var getRouterFees = /*#__PURE__*/function () {
                       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.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
+                        return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
                           amount: amountIn,
-                          papiApi: options.exchange.apiPapi,
+                          apiPjs: options.exchange.apiPjs,
+                          api: options.exchange.api,
                           assetFrom: options.exchange.assetFrom,
                           assetTo: assetTo !== null && assetTo !== void 0 ? assetTo : options.exchange.assetTo,
                           slippagePct: '1'
@@ -10222,9 +10267,10 @@ var getRouterFees = /*#__PURE__*/function () {
             };
           }();
           _context2.n = 2;
-          return dex.getAmountOut(exchange.apiPjs, _objectSpread2(_objectSpread2({}, options), {}, {
+          return dex.getAmountOut(_objectSpread2(_objectSpread2({}, options), {}, {
             amount: amount,
-            papiApi: exchange.apiPapi,
+            api: exchange.api,
+            apiPjs: exchange.apiPjs,
             assetFrom: exchange.assetFrom,
             assetTo: exchange.assetTo
           }));
@@ -10387,20 +10433,21 @@ var selectBestExchangeAmountOut = /*#__PURE__*/function () {
         case 0:
           return _context2.a(2, selectBestExchangeCommon(options, originApi, /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dex, assetFromExchange, assetTo, _options, parsedAmount) {
-              var pjsApi, papiApi;
+              var exchangeApi, exchangePjsApi;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
                     _context.n = 1;
-                    return dex.createApiInstance();
+                    return options.api.createApiForChain(dex.chain);
                   case 1:
-                    pjsApi = _context.v;
+                    exchangeApi = _context.v;
                     _context.n = 2;
-                    return dex.createApiInstancePapi();
+                    return dex.createApiInstance();
                   case 2:
-                    papiApi = _context.v;
-                    return _context.a(2, dex.getAmountOut(pjsApi, {
-                      papiApi: papiApi,
+                    exchangePjsApi = _context.v;
+                    return _context.a(2, dex.getAmountOut({
+                      api: exchangeApi,
+                      apiPjs: exchangePjsApi,
                       assetFrom: assetFromExchange,
                       assetTo: assetTo,
                       amount: BigInt(parsedAmount)
@@ -10423,7 +10470,7 @@ var selectBestExchangeAmountOut = /*#__PURE__*/function () {
 var getBestAmountOut = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _assetFromOrigin$deci;
-    var api, exchange, amount, from, originApi, isExchangeAutoSelect, dex, _resolveAssets, assetFromOrigin, assetFrom, assetTo, res, config, exchangeConfig, pjsApi, papiApi, _t, _t2, _t3, _t4;
+    var api, exchange, amount, from, originApi, isExchangeAutoSelect, dex, _resolveAssets, assetFromOrigin, assetFrom, assetTo, res, config, exchangeConfig, pjsApi, exchangeApi, _t, _t2, _t3, _t4;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -10479,13 +10526,14 @@ var getBestAmountOut = /*#__PURE__*/function () {
         case 9:
           pjsApi = _context.v;
           _context.n = 10;
-          return dex.createApiInstancePapi(exchangeConfig);
+          return api.createApiForChain(dex.chain);
         case 10:
-          papiApi = _context.v;
+          exchangeApi = _context.v;
           _t3 = dex.chain;
           _context.n = 11;
-          return dex.getAmountOut(pjsApi, {
-            papiApi: papiApi,
+          return dex.getAmountOut({
+            api: exchangeApi,
+            apiPjs: pjsApi,
             assetFrom: assetFrom,
             assetTo: assetTo,
             amount: applyDecimalAbstraction(amount, (_assetFromOrigin$deci = assetFromOrigin === null || assetFromOrigin === void 0 ? void 0 : assetFromOrigin.decimals) !== null && _assetFromOrigin$deci !== void 0 ? _assetFromOrigin$deci : assetFrom.decimals, (exchangeConfig === null || exchangeConfig === void 0 ? void 0 : exchangeConfig.abstractDecimals) !== false)
@@ -10585,7 +10633,7 @@ var computeLocalTransferableAmount = /*#__PURE__*/function () {
             location: exchange.assetFrom.location
           };
           _context.n = 1;
-          return getBalance$1({
+          return getBalance({
             api: exchange.api,
             chain: exchange.chain,
             address: sender,
@@ -10782,202 +10830,113 @@ var transfer = /*#__PURE__*/function () {
   };
 }();
 
-var RouterBuilderCore = /*#__PURE__*/function () {
-  function RouterBuilderCore(api, options) {
-    _classCallCheck(this, RouterBuilderCore);
+var SwapBuilderCore = /*#__PURE__*/function () {
+  function SwapBuilderCore(api, options) {
+    _classCallCheck(this, SwapBuilderCore);
     this._api = api;
     this._options = options !== null && options !== void 0 ? options : {};
   }
-  /**
-   * Specifies the origin chain of the transfer.
-   *
-   * @param chain - The origin chain.
-   * @returns The current builder instance.
-   */
-  return _createClass(RouterBuilderCore, [{
+  return _createClass(SwapBuilderCore, [{
     key: "from",
     value: function from(chain) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         from: chain
       }));
     }
-    /**
-     * Specifies the exchange chain to use.
-     *
-     * @param chain - The exchange chain, or `undefined` to auto-select.
-     * @returns The current builder instance.
-     */
   }, {
     key: "exchange",
     value: function exchange(chain) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         exchange: normalizeExchange(chain)
       }));
     }
-    /**
-     * Specifies the destination chain of the transfer.
-     *
-     * @param chain - The destination chain.
-     * @returns The current builder instance.
-     */
   }, {
     key: "to",
     value: function to(chain) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         to: chain
       }));
     }
-    /**
-     * Specifies the currency to send from the origin chain.
-     *
-     * @param currencyFrom - The currency to send.
-     * @returns The current builder instance.
-     */
   }, {
     key: "currencyFrom",
     value: function currencyFrom(currency) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         currencyFrom: currency
       }));
     }
-    /**
-     * Specifies the currency that the origin currency will be exchanged to and received on the destination chain.
-     *
-     * @param currencyTo - The currency to receive.
-     * @returns The current builder instance.
-     */
   }, {
     key: "currencyTo",
     value: function currencyTo(currency) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         currencyTo: currency
       }));
     }
-    /**
-     * Specifies the asset used to pay XCM fees.
-     *
-     * @param currency - The fee asset currency, or `undefined` to use the default.
-     * @returns The current builder instance.
-     */
   }, {
     key: "feeAsset",
     value: function feeAsset(currency) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         feeAsset: currency
       }));
     }
-    /**
-     * Specifies the amount to transfer.
-     *
-     * @param amount - The amount to transfer.
-     * @returns The current builder instance.
-     */
   }, {
     key: "amount",
     value: function amount(_amount) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         amount: _amount.toString()
       }));
     }
-    /**
-     * Specifies the recipient address on the destination chain.
-     *
-     * @param recipient - The recipient address.
-     * @returns The current builder instance.
-     */
   }, {
     key: "recipient",
     value: function recipient(address) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         recipient: address
       }));
     }
-    /**
-     * Specifies the sender address initiating the transfer.
-     *
-     * @param senderAddress - The sender address.
-     * @returns The current builder instance.
-     */
   }, {
     key: "sender",
     value: function sender(address) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         sender: address
       }));
     }
-    /**
-     * Specifies the signer for the transaction.
-     *
-     * @param signer - The signer instance.
-     * @returns The current builder instance.
-     */
   }, {
     key: "signer",
     value: function signer(_signer) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         signer: _signer
       }));
     }
-    /**
-     * Specifies the EVM sender address, required if `evmSigner` is provided. Used when dealing with EVM chains.
-     *
-     * @param evmSenderAddress - The EVM sender address.
-     * @returns The current builder instance.
-     */
   }, {
     key: "evmSenderAddress",
     value: function evmSenderAddress(address) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         evmSenderAddress: address
       }));
     }
-    /**
-     * Specifies the EVM signer, required if `evmSenderAddress` is provided.
-     *
-     * @param evmSigner - The EVM signer.
-     * @returns The current builder instance.
-     */
   }, {
     key: "evmSigner",
     value: function evmSigner(signer) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         evmSigner: signer
       }));
     }
-    /**
-     * Specifies the maximum slippage percentage for swaps.
-     *
-     * @param slippagePct - The slippage percentage.
-     * @returns The current builder instance.
-     */
   }, {
     key: "slippagePct",
     value: function slippagePct(pct) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         slippagePct: pct
       }));
     }
-    /**
-     * Sets a callback to receive status updates during the transfer.
-     *
-     * @param callback - The status change callback.
-     * @returns The current builder instance.
-     */
   }, {
     key: "onStatusChange",
     value: function onStatusChange(callback) {
-      return new RouterBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
+      return new SwapBuilderCore(this._api, _objectSpread2(_objectSpread2({}, this._options), {}, {
         onStatusChange: callback
       }));
     }
-    /**
-     * Returns the XCM fee for origin, exchange, and destination.
-     *
-     * @returns The XCM fee result.
-     */
   }, {
     key: "getXcmFees",
-    value: (function () {
+    value: function () {
       var _getXcmFees2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
         var _options$disableFallb;
         var disableFallback;
@@ -10995,7 +10954,7 @@ var RouterBuilderCore = /*#__PURE__*/function () {
         return _getXcmFees2.apply(this, arguments);
       }
       return getXcmFees$1;
-    }())
+    }()
   }, {
     key: "getTransferableAmount",
     value: function () {
@@ -11032,12 +10991,6 @@ var RouterBuilderCore = /*#__PURE__*/function () {
       }
       return getMinTransferableAmount$1;
     }()
-    /**
-     * 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: "signAndSubmit",
     value: function signAndSubmit() {
@@ -11045,9 +10998,6 @@ var RouterBuilderCore = /*#__PURE__*/function () {
         api: this._api
       }));
     }
-    /**
-     * Builds the transactions for the transfer with the provided parameters.
-     */
   }, {
     key: "build",
     value: function build() {
@@ -11071,12 +11021,12 @@ var RouterBuilderCore = /*#__PURE__*/function () {
     }
   }]);
 }();
-var RouterBuilder = function RouterBuilder(api) {
-  return new RouterBuilderCore(api);
+var SwapBuilder = function SwapBuilder(api) {
+  return new SwapBuilderCore(api);
 };
 
 registerSwapExtension({
-  RouterBuilder: RouterBuilder
+  SwapBuilder: SwapBuilder
 });
 
-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 };
+export { DEST_FEE_BUFFER_PCT, FALLBACK_FEE_CALC_ADDRESS, FALLBACK_FEE_CALC_EVM_ADDRESS, FEE_BUFFER_PCT, SwapBuilder, SwapBuilderCore, getExchangeAssets, getExchangeConfig, getExchangePairs, getSupportedAssetsFrom, getSupportedAssetsTo, getSupportedFeeAssets };