@paraspell/sdk-core 11.1.1 → 11.2.1

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isChainEvm, getAssetsObject, InvalidCurrencyError, isForeignAsset, extractAssetLocation, getNativeAssetSymbol, getOtherAssets, isAssetEqual, findAssetInfoOrThrow, getExistentialDeposit, findAssetInfo, isTAsset, getExistentialDepositOrThrow, isSymbolMatch, hasDryRunSupport, isOverrideLocationSpecifier, findAssetInfoByLoc, findAssetOnDestOrThrow, hasSupportForAsset, getRelayChainSymbol, isSymbolSpecifier, normalizeLocation, hasXcmPaymentApiSupport, normalizeSymbol, Native, getNativeAssets } from '@paraspell/assets';
+import { isChainEvm, getAssetsObject, InvalidCurrencyError, isForeignAsset, extractAssetLocation, getNativeAssetSymbol, getOtherAssets, isAssetEqual, findAssetInfo, isTAsset, findAssetInfoOrThrow, getExistentialDeposit, isOverrideLocationSpecifier, findAssetInfoByLoc, findAssetOnDestOrThrow, Native, isSymbolMatch, hasDryRunSupport, hasSupportForAsset, getRelayChainSymbol, isSymbolSpecifier, normalizeLocation, hasXcmPaymentApiSupport, getExistentialDepositOrThrow, normalizeSymbol, getNativeAssets } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
-import { isAddress, parseUnits, createPublicClient, http, getContract } from 'viem';
-import { getSupportedPalletsDetails, getDefaultPallet, getSupportedPallets } from '@paraspell/pallets';
+import { isAddress, parseUnits, createPublicClient, http, getContract, pad, toHex, getAddress, concat, keccak256 } from 'viem';
+import { getSupportedPalletsDetails, getDefaultPallet, getNativeAssetsPallet, getOtherAssetsPallets, getSupportedPallets } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
 import { replaceBigInt, isTLocation, Version, hasJunction, getJunctionValue, isRelayChain, Parents, PARACHAINS, deepEqual, isSystemChain, isDotKsmBridge } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
@@ -3474,6 +3474,129 @@ var createDirectExecuteXcm = function createDirectExecuteXcm(options) {
   return addXcmVersionHeader(fullXcm, version);
 };
 
+var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
+  var asset = findAssetInfo(origin, feeAsset, !isTLocation(destination) ? destination : null);
+  var usesRawOverriddenMultiAssets = Array.isArray(currency) && currency.every(isTAsset);
+  if (!asset && !usesRawOverriddenMultiAssets) {
+    throwUnsupportedCurrency(feeAsset, origin);
+  }
+  return asset !== null && asset !== void 0 ? asset : undefined;
+};
+
+var isAssetHub = function isAssetHub(chain) {
+  return chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama';
+};
+var isBridgeHub = function isBridgeHub(chain) {
+  return chain === 'BridgeHubPolkadot' || chain === 'BridgeHubKusama';
+};
+var isPeople = function isPeople(chain) {
+  return chain === 'PeoplePolkadot' || chain === 'PeopleKusama';
+};
+var isSystemPara = function isSystemPara(chain) {
+  return isAssetHub(chain) || isBridgeHub(chain) || isPeople(chain);
+};
+var mul = function mul(v, num) {
+  var den = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1n;
+  return v * num / den;
+};
+var padFee = function padFee(raw, origin, dest, side) {
+  var relayOrigin = isRelayChain(origin);
+  var relayDest = isRelayChain(dest);
+  var sysParaOrigin = isSystemPara(origin);
+  var sysParaDest = isSystemPara(dest);
+  var relayToPara = relayOrigin && !relayDest;
+  var sysParaToPara = sysParaOrigin && !sysParaDest;
+  var paraToPara = !relayOrigin && !sysParaOrigin;
+  if (sysParaToPara) return raw * 40n;
+  if (relayToPara) return side === 'origin' ? mul(raw, 320n, 100n) : mul(raw, 3000n, 100n);
+  if (paraToPara && side == 'origin' && origin === 'Mythos' && dest !== 'Ethereum') {
+    return 150000000000000000n;
+  }
+  if (paraToPara) return mul(raw, 130n, 100n);
+  // apply default 30% padding
+  return mul(raw, 130n, 100n);
+};
+var padFeeBy = function padFeeBy(amount, percent) {
+  return mul(amount, BigInt(100 + percent), 100n);
+};
+
+var determineAddress = function determineAddress(chain, address, senderAddress) {
+  if (isChainEvm(chain)) {
+    return isAddress(address) ? address : senderAddress;
+  }
+  return isAddress(address) ? senderAddress : address;
+};
+var getReverseTxFee = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, currencyInput) {
+    var api, origin, destination, senderAddress, address, currency, toAddress, fromAddress, tx, rawFee;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = _ref.api, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency;
+          toAddress = determineAddress(origin, address, senderAddress);
+          fromAddress = determineAddress(destination, address, senderAddress);
+          _context.n = 1;
+          return Builder(api).from(destination).to(origin).address(toAddress).senderAddress(fromAddress).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
+            amount: currency.amount
+          })).build();
+        case 1:
+          tx = _context.v;
+          _context.n = 2;
+          return api.calculateTransactionFee(tx, fromAddress);
+        case 2:
+          rawFee = _context.v;
+          return _context.a(2, padFee(rawFee, origin, destination, 'destination'));
+      }
+    }, _callee);
+  }));
+  return function getReverseTxFee(_x, _x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var AssetsPallet = /*#__PURE__*/function () {
+  function AssetsPallet() {
+    _classCallCheck(this, AssetsPallet);
+  }
+  return _createClass(AssetsPallet, [{
+    key: "setBalance",
+    value: function setBalance(address, asset, chain) {
+      assertHasId(asset);
+      var assetId = asset.assetId,
+        amount = asset.amount;
+      var id = chain === 'Astar' || chain === 'Shiden' || chain === 'Moonbeam' ? BigInt(assetId) : Number(assetId);
+      var addr = isChainEvm(chain) ? address : {
+        Id: address
+      };
+      return Promise.resolve({
+        assetStatusTx: {
+          module: 'Assets',
+          method: 'force_asset_status',
+          parameters: {
+            id: id,
+            owner: addr,
+            issuer: addr,
+            admin: addr,
+            freezer: addr,
+            min_balance: 0n,
+            is_sufficient: true,
+            is_frozen: false
+          }
+        },
+        balanceTx: {
+          module: 'Assets',
+          method: 'mint',
+          parameters: {
+            id: id,
+            beneficiary: addr,
+            amount: amount
+          }
+        }
+      });
+    }
+  }]);
+}();
+
 // Inspired by Moonbeam XCM-SDK
 // https://github.com/moonbeam-foundation/xcm-sdk/blob/ab835c15bf41612604b1c858d956a9f07705ed65/packages/utils/src/format/asset.ts#L1
 var formatAssetIdToERC20 = function formatAssetIdToERC20(id) {
@@ -3967,322 +4090,75 @@ var getOriginFeeDetails = /*#__PURE__*/function () {
   };
 }();
 
-var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
-  var asset = findAssetInfo(origin, feeAsset, !isTLocation(destination) ? destination : null);
-  var usesRawOverriddenMultiAssets = Array.isArray(currency) && currency.every(isTAsset);
-  if (!asset && !usesRawOverriddenMultiAssets) {
-    throwUnsupportedCurrency(feeAsset, origin);
-  }
-  return asset !== null && asset !== void 0 ? asset : undefined;
-};
-
-var isAssetHub = function isAssetHub(chain) {
-  return chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama';
-};
-var isBridgeHub = function isBridgeHub(chain) {
-  return chain === 'BridgeHubPolkadot' || chain === 'BridgeHubKusama';
-};
-var isPeople = function isPeople(chain) {
-  return chain === 'PeoplePolkadot' || chain === 'PeopleKusama';
-};
-var isSystemPara = function isSystemPara(chain) {
-  return isAssetHub(chain) || isBridgeHub(chain) || isPeople(chain);
-};
-var mul = function mul(v, num) {
-  var den = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1n;
-  return v * num / den;
-};
-var padFee = function padFee(raw, origin, dest, side) {
-  var relayOrigin = isRelayChain(origin);
-  var relayDest = isRelayChain(dest);
-  var sysParaOrigin = isSystemPara(origin);
-  var sysParaDest = isSystemPara(dest);
-  var relayToPara = relayOrigin && !relayDest;
-  var sysParaToPara = sysParaOrigin && !sysParaDest;
-  var paraToPara = !relayOrigin && !sysParaOrigin;
-  if (sysParaToPara) return raw * 40n;
-  if (relayToPara) return side === 'origin' ? mul(raw, 320n, 100n) : mul(raw, 3000n, 100n);
-  if (paraToPara && side == 'origin' && origin === 'Mythos' && dest !== 'Ethereum') {
-    return 150000000000000000n;
-  }
-  if (paraToPara) return mul(raw, 130n, 100n);
-  // apply default 30% padding
-  return mul(raw, 130n, 100n);
-};
-var padFeeBy = function padFeeBy(amount, percent) {
-  return mul(amount, BigInt(100 + percent), 100n);
-};
-
-var determineAddress = function determineAddress(chain, address, senderAddress) {
-  if (isChainEvm(chain)) {
-    return isAddress(address) ? address : senderAddress;
-  }
-  return isAddress(address) ? senderAddress : address;
-};
-var getReverseTxFee = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, currencyInput) {
-    var api, origin, destination, senderAddress, address, currency, toAddress, fromAddress, tx, rawFee;
+var dryRun = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var api, senderAddress, origin;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency;
-          toAddress = determineAddress(origin, address, senderAddress);
-          fromAddress = determineAddress(destination, address, senderAddress);
+          api = options.api, senderAddress = options.senderAddress, origin = options.origin;
+          validateAddress(senderAddress, origin, false);
           _context.n = 1;
-          return Builder(api).from(destination).to(origin).address(toAddress).senderAddress(fromAddress).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
-            amount: currency.amount
-          })).build();
+          return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
-          tx = _context.v;
+          _context.p = 1;
           _context.n = 2;
-          return api.calculateTransactionFee(tx, fromAddress);
+          return dryRunInternal(options);
         case 2:
-          rawFee = _context.v;
-          return _context.a(2, padFee(rawFee, origin, destination, 'destination'));
+          return _context.a(2, _context.v);
+        case 3:
+          _context.p = 3;
+          _context.n = 4;
+          return api.disconnect();
+        case 4:
+          return _context.f(3);
+        case 5:
+          return _context.a(2);
       }
-    }, _callee);
+    }, _callee, null, [[1,, 3, 5]]);
   }));
-  return function getReverseTxFee(_x, _x2) {
-    return _ref2.apply(this, arguments);
+  return function dryRun(_x) {
+    return _ref.apply(this, arguments);
   };
 }();
 
-var isSufficientOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, origin, destination, senderAddress, feeNative, currency, asset, feeAsset) {
-    var edNative, balanceNative, isNativeAssetToOrigin, isNativeAssetToDest, isSufficientNative, balanceAsset, edAsset, isSufficientAsset;
+var dryRunOrigin = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var api, chain, address, result;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          if (!feeAsset) {
-            _context.n = 1;
-            break;
-          }
-          return _context.a(2, undefined);
+          api = options.api, chain = options.chain, address = options.address;
+          validateAddress(address, chain, false);
+          _context.n = 1;
+          return api.init(chain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
-          edNative = getExistentialDepositOrThrow(origin);
+          _context.p = 1;
           _context.n = 2;
-          return getBalanceNativeInternal({
-            api: api,
-            chain: origin,
-            address: senderAddress
-          });
+          return api.getDryRunCall(options);
         case 2:
-          balanceNative = _context.v;
-          isNativeAssetToOrigin = isSymbolMatch(asset.symbol, getNativeAssetSymbol(origin));
-          isNativeAssetToDest = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
-          if (!(isNativeAssetToOrigin && isNativeAssetToDest)) {
+          result = _context.v;
+          if (!result.success) {
             _context.n = 3;
             break;
           }
-          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+          return _context.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
+            currency: getNativeAssetSymbol(chain)
+          }));
         case 3:
-          if (isNativeAssetToOrigin) {
-            _context.n = 5;
-            break;
-          }
-          isSufficientNative = balanceNative - edNative - feeNative > 0n;
-          _context.n = 4;
-          return getAssetBalance({
-            api: api,
-            chain: origin,
-            address: senderAddress,
-            currency: currency
-          });
+          return _context.a(2, result);
         case 4:
-          balanceAsset = _context.v;
-          edAsset = getExistentialDepositOrThrow(origin, currency);
-          isSufficientAsset = balanceAsset - edAsset > 0n;
-          return _context.a(2, isSufficientNative && isSufficientAsset);
+          _context.p = 4;
+          _context.n = 5;
+          return api.disconnect();
         case 5:
-          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+          return _context.f(4);
         case 6:
           return _context.a(2);
       }
-    }, _callee);
+    }, _callee, null, [[1,, 4, 6]]);
   }));
-  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var isSufficientDestination = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, destination, address, amount, asset, feeNative) {
-    var isNativeAsset, existentialDeposit, nativeBalance;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
-        case 0:
-          isNativeAsset = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
-          if (isNativeAsset) {
-            _context2.n = 1;
-            break;
-          }
-          return _context2.a(2, undefined);
-        case 1:
-          existentialDeposit = getExistentialDepositOrThrow(destination);
-          _context2.n = 2;
-          return getBalanceNativeInternal({
-            api: api,
-            chain: destination,
-            address: address
-          });
-        case 2:
-          nativeBalance = _context2.v;
-          return _context2.a(2, nativeBalance + amount - existentialDeposit - feeNative > 0n);
-      }
-    }, _callee2);
-  }));
-  return function isSufficientDestination(_x9, _x0, _x1, _x10, _x11, _x12) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var createOriginLocation = function createOriginLocation(origin, destination) {
-  if (isRelayChain(origin)) return DOT_LOCATION;
-  return {
-    parents: isRelayChain(destination) ? Parents.ZERO : Parents.ONE,
-    interior: {
-      X1: [{
-        Parachain: getParaId(origin)
-      }]
-    }
-  };
-};
-var getDestXcmFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, origin, hopChain, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, _sufficient, fee, newForwardedXcms, destParaId;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
-        case 0:
-          api = options.api, origin = options.origin, hopChain = options.prevChain, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, address = options.address, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          calcPaymentInfoFee = /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-              var originAsset, _t;
-              return _regenerator().w(function (_context) {
-                while (1) switch (_context.p = _context.n) {
-                  case 0:
-                    if (!(destination === 'Ethereum')) {
-                      _context.n = 1;
-                      break;
-                    }
-                    return _context.a(2, 0n);
-                  case 1:
-                    originAsset = findAssetInfoOrThrow(origin, currency, destination);
-                    if (!originAsset.location) {
-                      _context.n = 7;
-                      break;
-                    }
-                    _context.p = 2;
-                    _context.n = 3;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      location: originAsset.location
-                    });
-                  case 3:
-                    return _context.a(2, _context.v);
-                  case 4:
-                    _context.p = 4;
-                    _t = _context.v;
-                    if (!(_t instanceof InvalidCurrencyError)) {
-                      _context.n = 6;
-                      break;
-                    }
-                    _context.n = 5;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol
-                    });
-                  case 5:
-                    return _context.a(2, _context.v);
-                  case 6:
-                    throw _t;
-                  case 7:
-                    _context.n = 8;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol
-                    });
-                  case 8:
-                    return _context.a(2, _context.v);
-                }
-              }, _callee, null, [[2, 4]]);
-            }));
-            return function calcPaymentInfoFee() {
-              return _ref2.apply(this, arguments);
-            };
-          }();
-          if (!(!hasDryRunSupport(destination) || !forwardedXcms || destination === 'Ethereum')) {
-            _context2.n = 3;
-            break;
-          }
-          _context2.n = 1;
-          return calcPaymentInfoFee();
-        case 1:
-          _fee = _context2.v;
-          _context2.n = 2;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
-        case 2:
-          sufficient = _context2.v;
-          return _context2.a(2, {
-            fee: _fee,
-            feeType: 'paymentInfo',
-            sufficient: sufficient
-          });
-        case 3:
-          _context2.n = 4;
-          return api.getDryRunXcm({
-            originLocation: addXcmVersionHeader(createOriginLocation(hopChain, destination), Version.V4),
-            xcm: forwardedXcms[1][0],
-            chain: destination,
-            origin: origin,
-            asset: asset,
-            originFee: originFee,
-            feeAsset: resolvedFeeAsset,
-            amount: BigInt(currency.amount) < 2n ? 2n : BigInt(currency.amount)
-          });
-        case 4:
-          dryRunResult = _context2.v;
-          if (dryRunResult.success) {
-            _context2.n = 8;
-            break;
-          }
-          if (!disableFallback) {
-            _context2.n = 5;
-            break;
-          }
-          return _context2.a(2, {
-            dryRunError: dryRunResult.failureReason
-          });
-        case 5:
-          _context2.n = 6;
-          return calcPaymentInfoFee();
-        case 6:
-          _fee2 = _context2.v;
-          _context2.n = 7;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee2);
-        case 7:
-          _sufficient = _context2.v;
-          return _context2.a(2, {
-            fee: _fee2,
-            feeType: 'paymentInfo',
-            dryRunError: dryRunResult.failureReason,
-            sufficient: _sufficient
-          });
-        case 8:
-          fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
-          return _context2.a(2, {
-            fee: fee,
-            feeType: 'dryRun',
-            sufficient: true,
-            forwardedXcms: newForwardedXcms,
-            destParaId: destParaId
-          });
-      }
-    }, _callee2);
-  }));
-  return function getDestXcmFee(_x) {
+  return function dryRunOrigin(_x) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -5017,287 +4893,332 @@ var addEthereumBridgeFees = /*#__PURE__*/function () {
   };
 }();
 
-var getFailureInfo$1 = function getFailureInfo(results, hops) {
-  // Check standard chains first for backwards compatibility
-  for (var _i = 0, _arr = ['destination', 'assetHub', 'bridgeHub']; _i < _arr.length; _i++) {
-    var chain = _arr[_i];
-    var res = results[chain];
-    if (res && !res.success && res.failureReason) {
-      return {
-        failureReason: res.failureReason,
-        failureChain: chain
-      };
+var AssetManagerPallet = /*#__PURE__*/function () {
+  function AssetManagerPallet() {
+    _classCallCheck(this, AssetManagerPallet);
+  }
+  return _createClass(AssetManagerPallet, [{
+    key: "setBalance",
+    value: function setBalance(address, asset) {
+      assertHasId(asset);
+      var assetId = asset.assetId,
+        amount = asset.amount;
+      return Promise.resolve({
+        balanceTx: {
+          module: 'AssetManager',
+          method: 'updateBalance',
+          parameters: {
+            who: {
+              Id: address
+            },
+            currency_id: {
+              ForeignAsset: assetId
+            },
+            amount: amount
+          }
+        }
+      });
+    }
+  }]);
+}();
+
+var BalancesPallet = /*#__PURE__*/function () {
+  function BalancesPallet() {
+    _classCallCheck(this, BalancesPallet);
+  }
+  return _createClass(BalancesPallet, [{
+    key: "setBalance",
+    value: function setBalance(address, assetInfo, chain) {
+      var amount = assetInfo.amount;
+      var notUseId = chain.startsWith('Hydration') || chain === 'Basilisk' || isChainEvm(chain);
+      return Promise.resolve({
+        balanceTx: {
+          module: 'Balances',
+          method: 'force_set_balance',
+          parameters: {
+            who: notUseId ? address : {
+              Id: address
+            },
+            new_free: amount
+          }
+        }
+      });
     }
+  }]);
+}();
+
+var CurrenciesPallet = /*#__PURE__*/function () {
+  function CurrenciesPallet() {
+    _classCallCheck(this, CurrenciesPallet);
   }
-  var _iterator = _createForOfIteratorHelper(hops),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var hop = _step.value;
-      if (!hop.result.success && hop.result.failureReason) {
-        return {
-          failureReason: hop.result.failureReason,
-          failureChain: hop.chain
-        };
-      }
+  return _createClass(CurrenciesPallet, [{
+    key: "setBalance",
+    value: function setBalance(address, assetInfo) {
+      assertHasId(assetInfo);
+      var assetId = assetInfo.assetId,
+        amount = assetInfo.amount;
+      return Promise.resolve({
+        balanceTx: {
+          module: 'Currencies',
+          method: 'update_balance',
+          parameters: {
+            who: address,
+            currency_id: Number(assetId),
+            amount: amount
+          }
+        }
+      });
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+  }]);
+}();
+
+var ForeignAssetsPallet = /*#__PURE__*/function () {
+  function ForeignAssetsPallet() {
+    _classCallCheck(this, ForeignAssetsPallet);
   }
-  return {};
+  return _createClass(ForeignAssetsPallet, [{
+    key: "setBalance",
+    value: function setBalance(address, asset) {
+      assertHasLocation(asset);
+      var location = asset.location,
+        amount = asset.amount;
+      return Promise.resolve({
+        assetStatusTx: {
+          module: 'ForeignAssets',
+          method: 'force_asset_status',
+          parameters: {
+            id: location,
+            owner: {
+              Id: address
+            },
+            issuer: {
+              Id: address
+            },
+            admin: {
+              Id: address
+            },
+            freezer: {
+              Id: address
+            },
+            min_balance: 0n,
+            is_sufficient: true,
+            is_frozen: false
+          }
+        },
+        balanceTx: {
+          module: 'ForeignAssets',
+          method: 'mint',
+          parameters: {
+            id: location,
+            beneficiary: {
+              Id: address
+            },
+            amount: amount
+          }
+        }
+      });
+    }
+  }]);
+}();
+
+var SIZE = 32;
+var BALANCE_SLOT = 0;
+var calculateMappingSlot = function calculateMappingSlot(key) {
+  var normalizedKey = getAddress(key);
+  var keyPadded = pad(normalizedKey, {
+    size: SIZE
+  });
+  var slotHex = pad(toHex(BALANCE_SLOT), {
+    size: SIZE
+  });
+  var encoded = concat([keyPadded, slotHex]);
+  return keccak256(encoded);
 };
-var dryRunInternal = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var _traversalResult$brid, _traversalResult$asse, _traversalResult$dest;
-    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, resolvedFeeAsset, asset, amount, originDryRun, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubChain, bridgeHubChain, processedBridgeHub, bridgeHubHopIndex, originWithCurrency, assetHubWithCurrency, bridgeHubWithCurrency, destinationWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
-        case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset, swapConfig = options.swapConfig;
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          asset = findAssetInfoOrThrow(origin, currency, destination);
-          amount = abstractDecimals(currency.amount, asset.decimals, api);
-          _context2.n = 1;
-          return api.getDryRunCall({
-            tx: tx,
-            chain: origin,
-            address: senderAddress,
-            feeAsset: resolvedFeeAsset
-          });
-        case 1:
-          originDryRun = _context2.v;
-          if (originDryRun.success) {
-            _context2.n = 2;
-            break;
-          }
-          return _context2.a(2, {
-            failureReason: originDryRun.failureReason,
-            failureChain: 'origin',
-            origin: originDryRun,
-            hops: []
-          });
-        case 2:
-          initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
-          processHop = /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
-              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, isDestination, hopDryRun, hopCurrency;
-              return _regenerator().w(function (_context) {
-                while (1) switch (_context.n) {
-                  case 0:
-                    hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange, isDestination = params.isDestination;
-                    if (hasDryRunSupport(currentChain)) {
-                      _context.n = 1;
-                      break;
-                    }
-                    return _context.a(2, {
-                      success: false,
-                      failureReason: "DryRunApi is not available on chain ".concat(currentChain)
-                    });
-                  case 1:
-                    _context.n = 2;
-                    return hopApi.getDryRunXcm({
-                      originLocation: addXcmVersionHeader(createOriginLocation(currentOrigin, currentChain), Version.V4),
-                      xcm: forwardedXcms[1][0],
-                      chain: currentChain,
-                      origin: currentOrigin,
-                      asset: currentAsset,
-                      feeAsset: resolvedFeeAsset,
-                      originFee: originDryRun.fee,
-                      amount: amount
-                    });
-                  case 2:
-                    hopDryRun = _context.v;
-                    if (!hopDryRun.success) {
-                      _context.n = 3;
-                      break;
-                    }
-                    if (destination === 'Ethereum' && (currentChain.includes('AssetHub') || currentChain.includes('BridgeHub'))) {
-                      hopCurrency = getNativeAssetSymbol(currentChain);
-                    } else if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
-                      hopCurrency = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo).symbol;
-                    } else if (isDestination) {
-                      hopCurrency = findAssetOnDestOrThrow(origin, currentChain, currency).symbol;
-                    } else {
-                      hopCurrency = asset.symbol;
-                    }
-                    return _context.a(2, _objectSpread2(_objectSpread2({}, hopDryRun), {}, {
-                      currency: hopCurrency
-                    }));
-                  case 3:
-                    return _context.a(2, hopDryRun);
+var SystemPallet = /*#__PURE__*/function () {
+  function SystemPallet() {
+    _classCallCheck(this, SystemPallet);
+  }
+  return _createClass(SystemPallet, [{
+    key: "setBalance",
+    value: function () {
+      var _setBalance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(address, assetInfo, _chain, api) {
+        var contractAddr, slot, amountEncoded, storageKey;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
+            case 0:
+              assertHasId(assetInfo);
+              contractAddr = formatAssetIdToERC20(assetInfo.assetId);
+              slot = calculateMappingSlot(address);
+              amountEncoded = pad(toHex(assetInfo.amount), {
+                size: SIZE
+              });
+              _context.n = 1;
+              return api.getEvmStorage(contractAddr, slot);
+            case 1:
+              storageKey = _context.v;
+              return _context.a(2, {
+                balanceTx: {
+                  module: 'System',
+                  method: 'set_storage',
+                  parameters: {
+                    items: [[storageKey, amountEncoded]]
+                  }
                 }
-              }, _callee);
-            }));
-            return function processHop(_x2) {
-              return _ref2.apply(this, arguments);
-            };
-          }();
-          _context2.n = 3;
-          return traverseXcmHops({
-            api: api,
-            origin: origin,
-            destination: destination,
-            currency: currency,
-            initialForwardedXcms: initialForwardedXcms,
-            initialDestParaId: initialDestParaId,
-            swapConfig: swapConfig,
-            processHop: processHop,
-            shouldContinue: function shouldContinue(hopResult) {
-              return hopResult.success;
-            },
-            extractNextHopData: function extractNextHopData(hopResult) {
-              return {
-                forwardedXcms: hopResult.success ? hopResult.forwardedXcms : undefined,
-                destParaId: hopResult.success ? hopResult.destParaId : undefined
-              };
-            }
-          });
-        case 3:
-          traversalResult = _context2.v;
-          // Process Ethereum bridge fees
-          assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
-          bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
-          if (!((_traversalResult$brid = traversalResult.bridgeHub) !== null && _traversalResult$brid !== void 0 && _traversalResult$brid.success)) {
-            _context2.n = 5;
-            break;
-          }
-          _context2.n = 4;
-          return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubChain);
-        case 4:
-          _t = _context2.v;
-          _context2.n = 6;
-          break;
-        case 5:
-          _t = traversalResult.bridgeHub;
-        case 6:
-          processedBridgeHub = _t;
-          // Update bridge hub in hops if needed
-          if (processedBridgeHub && processedBridgeHub.success && traversalResult.bridgeHub && traversalResult.bridgeHub.success && processedBridgeHub.fee !== traversalResult.bridgeHub.fee) {
-            bridgeHubHopIndex = traversalResult.hops.findIndex(function (hop) {
-              return hop.chain === bridgeHubChain;
-            });
-            if (bridgeHubHopIndex !== -1 && traversalResult.hops[bridgeHubHopIndex].result.success) {
-              traversalResult.hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, traversalResult.hops[bridgeHubHopIndex].result), {}, {
-                fee: processedBridgeHub.fee
               });
-            }
           }
-          originWithCurrency = originDryRun.success ? _objectSpread2(_objectSpread2({}, originDryRun), {}, {
-            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(origin)
-          }) : originDryRun;
-          assetHubWithCurrency = (_traversalResult$asse = traversalResult.assetHub) !== null && _traversalResult$asse !== void 0 && _traversalResult$asse.success ? _objectSpread2(_objectSpread2({}, traversalResult.assetHub), {}, {
-            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(assetHubChain)
-          }) : traversalResult.assetHub;
-          bridgeHubWithCurrency = processedBridgeHub !== null && processedBridgeHub !== void 0 && processedBridgeHub.success ? _objectSpread2(_objectSpread2({}, processedBridgeHub), {}, {
-            currency: getNativeAssetSymbol(bridgeHubChain)
-          }) : processedBridgeHub;
-          destinationWithCurrency = (_traversalResult$dest = traversalResult.destination) !== null && _traversalResult$dest !== void 0 && _traversalResult$dest.success ? _objectSpread2(_objectSpread2({}, traversalResult.destination), {}, {
-            currency: asset === null || asset === void 0 ? void 0 : asset.symbol
-          }) : traversalResult.destination;
-          _getFailureInfo = getFailureInfo$1({
-            destination: destinationWithCurrency,
-            assetHub: assetHubWithCurrency,
-            bridgeHub: bridgeHubWithCurrency
-          }, traversalResult.hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
-          return _context2.a(2, {
-            failureReason: failureReason,
-            failureChain: failureChain,
-            origin: originWithCurrency,
-            assetHub: assetHubWithCurrency,
-            bridgeHub: bridgeHubWithCurrency,
-            destination: destinationWithCurrency,
-            hops: traversalResult.hops
-          });
+        }, _callee);
+      }));
+      function setBalance(_x, _x2, _x3, _x4) {
+        return _setBalance.apply(this, arguments);
       }
-    }, _callee2);
-  }));
-  return function dryRunInternal(_x) {
-    return _ref.apply(this, arguments);
-  };
+      return setBalance;
+    }()
+  }]);
 }();
 
-var dryRun = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, senderAddress, origin;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
-        case 0:
-          api = options.api, senderAddress = options.senderAddress, origin = options.origin;
-          validateAddress(senderAddress, origin, false);
-          _context.n = 1;
-          return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 1:
-          _context.p = 1;
-          _context.n = 2;
-          return dryRunInternal(options);
-        case 2:
-          return _context.a(2, _context.v);
-        case 3:
-          _context.p = 3;
-          _context.n = 4;
-          return api.disconnect();
-        case 4:
-          return _context.f(3);
-        case 5:
-          return _context.a(2);
-      }
-    }, _callee, null, [[1,, 3, 5]]);
-  }));
-  return function dryRun(_x) {
-    return _ref.apply(this, arguments);
-  };
+var TokensPallet = /*#__PURE__*/function () {
+  function TokensPallet() {
+    _classCallCheck(this, TokensPallet);
+  }
+  return _createClass(TokensPallet, [{
+    key: "setBalance",
+    value: function setBalance(address, asset, chain) {
+      var isBifrost = chain.startsWith('Bifrost');
+      if (!isBifrost) assertHasId(asset);
+      var id = isBifrost ? getChain('BifrostPolkadot').getCurrencySelection(asset) : (assertHasId(asset), asset.assetId);
+      var amount = asset.amount;
+      return Promise.resolve({
+        balanceTx: {
+          module: 'Tokens',
+          method: 'set_balance',
+          parameters: {
+            who: {
+              Id: address
+            },
+            currency_id: id,
+            new_free: amount,
+            new_reserved: 0n
+          }
+        }
+      });
+    }
+  }]);
 }();
 
-var dryRunOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, chain, address, result;
+var palletRegistry = {
+  Balances: BalancesPallet,
+  Tokens: TokensPallet,
+  Currencies: CurrenciesPallet,
+  Assets: AssetsPallet,
+  ForeignAssets: ForeignAssetsPallet,
+  AssetManager: AssetManagerPallet,
+  System: SystemPallet
+};
+var getPalletInstance = function getPalletInstance(type) {
+  var HandlerClass = palletRegistry[type];
+  return new HandlerClass();
+};
+
+var MINT_AMOUNT = 1000n; // Mint 1000 units of asset
+var pickOtherPallet = function pickOtherPallet(asset, pallets) {
+  if (isForeignAsset(asset) && asset.assetId === undefined) {
+    var _pallets$find;
+    // No assetId means it's probably a ForeignAssets pallet asset
+    return (_pallets$find = pallets.find(function (pallet) {
+      return pallet.startsWith('Foreign');
+    })) !== null && _pallets$find !== void 0 ? _pallets$find : pallets[0];
+  }
+  return pallets[0];
+};
+var createMintTxs = function createMintTxs(chain, asset, address, api) {
+  var nativePallet = getNativeAssetsPallet(chain);
+  var otherPallets = getOtherAssetsPallets(chain);
+  var isMainNativeAsset = isSymbolMatch(asset.symbol, getNativeAssetSymbol(chain));
+  var pallet = isForeignAsset(asset) || !isMainNativeAsset ? pickOtherPallet(asset, otherPallets) : nativePallet;
+  var palletInstance = getPalletInstance(pallet);
+  return palletInstance.setBalance(address, asset, chain, api);
+};
+var createRequiredMintTxs = function createRequiredMintTxs(chain, currency, amountHuman, address, api) {
+  var asset = findAssetInfoOrThrow(chain, currency, null);
+  var amount = parseUnits(amountHuman.toString(), asset.decimals);
+  return createMintTxs(chain, _objectSpread2(_objectSpread2({}, asset), {}, {
+    amount: amount
+  }), address, api);
+};
+var createOptionalMintTxs = function createOptionalMintTxs(chain, currency, amountHuman, address, api) {
+  var asset = findAssetInfo(chain, currency, null);
+  if (!asset) return null;
+  var amount = parseUnits(amountHuman.toString(), asset.decimals);
+  return createMintTxs(chain, _objectSpread2(_objectSpread2({}, asset), {}, {
+    amount: amount
+  }), address, api);
+};
+var resultToExtrinsics = function resultToExtrinsics(api, address, _ref) {
+  var assetStatusTx = _ref.assetStatusTx,
+    balanceTx = _ref.balanceTx;
+  return [].concat(_toConsumableArray(assetStatusTx ? [api.callTxMethod(assetStatusTx)] : []), _toConsumableArray(assetStatusTx ? [api.callDispatchAsMethod(api.callTxMethod(balanceTx), address)] : [api.callTxMethod(balanceTx)]));
+};
+var wrapTxBypass = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, chain, asset, feeAsset, address, tx) {
+    var mintNativeAssetRes, mintRelayAssetRes, mintFeeAssetRes, amount, mintAmount, mintAssetRes;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
+      while (1) switch (_context.n) {
         case 0:
-          api = options.api, chain = options.chain, address = options.address;
-          validateAddress(address, chain, false);
           _context.n = 1;
-          return api.init(chain, DRY_RUN_CLIENT_TIMEOUT_MS);
+          return createRequiredMintTxs(chain, {
+            symbol: Native(getNativeAssetSymbol(chain))
+          }, MINT_AMOUNT, address, api);
         case 1:
-          _context.p = 1;
+          mintNativeAssetRes = _context.v;
           _context.n = 2;
-          return api.getDryRunCall(options);
+          return createOptionalMintTxs(chain, {
+            location: {
+              parents: Parents.ONE,
+              interior: {
+                Here: null
+              }
+            }
+          }, MINT_AMOUNT, address, api);
         case 2:
-          result = _context.v;
-          if (!result.success) {
-            _context.n = 3;
+          mintRelayAssetRes = _context.v;
+          if (!feeAsset) {
+            _context.n = 4;
             break;
           }
-          return _context.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
-            currency: getNativeAssetSymbol(chain)
-          }));
+          amount = parseUnits(MINT_AMOUNT.toString(), feeAsset.decimals);
+          _context.n = 3;
+          return createMintTxs(chain, _objectSpread2(_objectSpread2({}, feeAsset), {}, {
+            amount: amount
+          }), address, api);
         case 3:
-          return _context.a(2, result);
+          mintFeeAssetRes = _context.v;
         case 4:
-          _context.p = 4;
+          // mint asset that is being sent
+          mintAmount = parseUnits(MINT_AMOUNT.toString(), asset.decimals);
           _context.n = 5;
-          return api.disconnect();
+          return createMintTxs(chain, _objectSpread2(_objectSpread2({}, asset), {}, {
+            amount: asset.amount + mintAmount
+          }), address, api);
         case 5:
-          return _context.f(4);
-        case 6:
-          return _context.a(2);
+          mintAssetRes = _context.v;
+          return _context.a(2, api.callBatchMethod([].concat(_toConsumableArray([mintNativeAssetRes, mintRelayAssetRes, mintFeeAssetRes, mintAssetRes].flatMap(function (tx) {
+            return tx ? resultToExtrinsics(api, address, tx) : [];
+          })), [api.callDispatchAsMethod(tx, address)]), BatchMode.BATCH_ALL));
       }
-    }, _callee, null, [[1,, 4, 6]]);
+    }, _callee);
   }));
-  return function dryRunOrigin(_x) {
-    return _ref.apply(this, arguments);
+  return function wrapTxBypass(_x, _x2, _x3, _x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
   };
 }();
 
-var getOriginXcmFee = /*#__PURE__*/function () {
+var getOriginXcmFeeInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, asset, amount, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight, currencySymbol;
+    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, _ref$useRootOrigin, useRootOrigin, asset, amount, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, fee, forwardedXcms, destParaId, weight, currencySymbol;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, disableFallback = _ref.disableFallback, feeAsset = _ref.feeAsset, currency = _ref.currency;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, disableFallback = _ref.disableFallback, feeAsset = _ref.feeAsset, currency = _ref.currency, _ref$useRootOrigin = _ref.useRootOrigin, useRootOrigin = _ref$useRootOrigin === void 0 ? false : _ref$useRootOrigin;
           asset = findAssetInfoOrThrow(origin, currency, destination);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
@@ -5332,12 +5253,17 @@ var getOriginXcmFee = /*#__PURE__*/function () {
             tx: tx,
             chain: origin,
             address: senderAddress,
-            feeAsset: resolvedFeeAsset
+            asset: _objectSpread2(_objectSpread2({}, asset), {}, {
+              amount: amount
+            }),
+            feeAsset: resolvedFeeAsset,
+            // Force dryRun pass
+            useRootOrigin: useRootOrigin
           });
         case 5:
           dryRunResult = _context.v;
           if (dryRunResult.success) {
-            _context.n = 9;
+            _context.n = 8;
             break;
           }
           if (!disableFallback) {
@@ -5353,20 +5279,14 @@ var getOriginXcmFee = /*#__PURE__*/function () {
         case 7:
           _rawFee = _context.v;
           _paddedFee = padFee(_rawFee, origin, destination, 'origin');
-          _context.n = 8;
-          return isSufficientOrigin(api, origin, destination, senderAddress, _paddedFee, _objectSpread2(_objectSpread2({}, currency), {}, {
-            amount: amount
-          }), asset, resolvedFeeAsset);
-        case 8:
-          _sufficient = _context.v;
           return _context.a(2, {
             fee: _paddedFee,
             currency: nativeAssetSymbol,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
-            sufficient: _sufficient
+            sufficient: false
           });
-        case 9:
+        case 8:
           fee = dryRunResult.fee, forwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId, weight = dryRunResult.weight;
           currencySymbol = resolvedFeeAsset ? resolvedFeeAsset.symbol : nativeAssetSymbol;
           return _context.a(2, {
@@ -5381,11 +5301,40 @@ var getOriginXcmFee = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function getOriginXcmFee(_x) {
+  return function getOriginXcmFeeInternal(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
 
+var getOriginXcmFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var forced, real;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          _context.n = 1;
+          return getOriginXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
+            useRootOrigin: true
+          }));
+        case 1:
+          forced = _context.v;
+          _context.n = 2;
+          return getOriginXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
+            useRootOrigin: false
+          }));
+        case 2:
+          real = _context.v;
+          return _context.a(2, _objectSpread2(_objectSpread2({}, forced), {}, {
+            sufficient: real.sufficient
+          }));
+      }
+    }, _callee);
+  }));
+  return function getOriginXcmFee(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
   return assetCheckEnabled ? findAssetInfo(origin, currency, !isTLocation(destination) ? destination : null) : null;
 };
@@ -5588,7 +5537,7 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   };
 }();
 
-var getFailureInfo = function getFailureInfo(chains, hops) {
+var getFailureInfo$1 = function getFailureInfo(chains, hops) {
   var _chains$origin, _chains$assetHub, _chains$bridgeHub, _chains$destination;
   // Check standard chains first for backwards compatibility
   if ((_chains$origin = chains.origin) !== null && _chains$origin !== void 0 && _chains$origin.dryRunError) return {
@@ -5627,8 +5576,8 @@ var getFailureInfo = function getFailureInfo(chains, hops) {
   }
   return {};
 };
-var getXcmFee = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
+var getXcmFeeInternal = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref, useRootOrigin) {
     var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, asset, amount, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destCurrency, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, assetHubChain, processedBridgeHub, bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
@@ -5637,7 +5586,7 @@ var getXcmFee = /*#__PURE__*/function () {
           asset = findAssetInfoOrThrow(origin, currency, destination);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
           _context2.n = 1;
-          return getOriginXcmFee({
+          return getOriginXcmFeeInternal({
             api: api,
             tx: tx,
             origin: origin,
@@ -5645,7 +5594,8 @@ var getXcmFee = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             feeAsset: feeAsset,
             currency: currency,
-            disableFallback: disableFallback
+            disableFallback: disableFallback,
+            useRootOrigin: useRootOrigin
           });
         case 1:
           _yield$getOriginXcmFe = _context2.v;
@@ -5691,13 +5641,12 @@ var getXcmFee = /*#__PURE__*/function () {
         case 5:
           destFeeRes = _context2.v;
           _result = {
-            origin: _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
+            origin: _objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
               fee: originFee
             }), originFeeType && {
               feeType: originFeeType
-            }), sufficientOriginFee !== undefined && {
-              sufficient: sufficientOriginFee
             }), {}, {
+              sufficient: sufficientOriginFee,
               currency: originCurrency
             }, originDryRunError && {
               dryRunError: originDryRunError
@@ -5715,7 +5664,7 @@ var getXcmFee = /*#__PURE__*/function () {
             }),
             hops: []
           };
-          _getFailureInfo = getFailureInfo({
+          _getFailureInfo = getFailureInfo$1({
             origin: _result.origin,
             destination: _result.destination
           }, []), _failureChain = _getFailureInfo.failureChain, _failureReason = _getFailureInfo.failureReason;
@@ -5774,7 +5723,7 @@ var getXcmFee = /*#__PURE__*/function () {
                 }
               }, _callee);
             }));
-            return function processHop(_x2) {
+            return function processHop(_x3) {
               return _ref3.apply(this, arguments);
             };
           }();
@@ -5927,7 +5876,7 @@ var getXcmFee = /*#__PURE__*/function () {
               };
             })
           });
-          _getFailureInfo2 = getFailureInfo({
+          _getFailureInfo2 = getFailureInfo$1({
             origin: result.origin,
             assetHub: result.assetHub,
             bridgeHub: result.bridgeHub,
@@ -5940,11 +5889,59 @@ var getXcmFee = /*#__PURE__*/function () {
       }
     }, _callee2, null, [[3,, 6, 8]]);
   }));
-  return function getXcmFee(_x) {
+  return function getXcmFeeInternal(_x, _x2) {
     return _ref2.apply(this, arguments);
   };
 }();
 
+var getXcmFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var _real$assetHub, _real$bridgeHub;
+    var forced, real;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          _context.n = 1;
+          return getXcmFeeInternal(options, true);
+        case 1:
+          forced = _context.v;
+          _context.n = 2;
+          return getXcmFeeInternal(options, false);
+        case 2:
+          real = _context.v;
+          return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, forced), {}, {
+            origin: _objectSpread2(_objectSpread2({}, forced.origin), {}, {
+              sufficient: real.origin.sufficient
+            }),
+            destination: _objectSpread2(_objectSpread2({}, forced.destination), {}, {
+              sufficient: real.destination.sufficient
+            })
+          }, forced.assetHub ? {
+            assetHub: _objectSpread2(_objectSpread2({}, forced.assetHub), {}, {
+              sufficient: (_real$assetHub = real.assetHub) === null || _real$assetHub === void 0 ? void 0 : _real$assetHub.sufficient
+            })
+          } : {}), forced.bridgeHub ? {
+            bridgeHub: _objectSpread2(_objectSpread2({}, forced.bridgeHub), {}, {
+              sufficient: (_real$bridgeHub = real.bridgeHub) === null || _real$bridgeHub === void 0 ? void 0 : _real$bridgeHub.sufficient
+            })
+          } : {}), {}, {
+            hops: forced.hops.map(function (hop, index) {
+              var _real$hops$index;
+              return _objectSpread2(_objectSpread2({}, hop), {}, {
+                result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
+                  sufficient: (_real$hops$index = real.hops[index]) === null || _real$hops$index === void 0 ? void 0 : _real$hops$index.result.sufficient
+                })
+              });
+            })
+          }));
+      }
+    }, _callee);
+  }));
+  return function getXcmFee(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var BRIDGE_FEE_DOT = 682395810n; // 0.068239581 DOT
 var BRIDGE_FEE_KSM = 12016807000n; // 0.012016807 KSM
 var getXcmFeeEstimate = /*#__PURE__*/function () {
@@ -6500,68 +6497,13 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
   };
 }();
 
-var attemptDryRunFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var origin, currency, builder, reductionPcts, lastReduction, result, _i, _reductionPcts, percentage, modifiedBuilder, _t, _t2, _t3, _t4, _t5, _t6, _t7;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          origin = options.origin, currency = options.currency, builder = options.builder;
-          reductionPcts = [0, 10, 20, 30, 40, 50];
-          lastReduction = reductionPcts[reductionPcts.length - 1];
-          result = null;
-          _i = 0, _reductionPcts = reductionPcts;
-        case 1:
-          if (!(_i < _reductionPcts.length)) {
-            _context.n = 5;
-            break;
-          }
-          percentage = _reductionPcts[_i];
-          modifiedBuilder = builder.currency(_objectSpread2(_objectSpread2({}, currency), {}, {
-            amount: padFeeBy(BigInt(currency.amount), -percentage)
-          }));
-          _t = getOriginXcmFee;
-          _t2 = _objectSpread2;
-          _t3 = _objectSpread2({}, options);
-          _t4 = {};
-          _context.n = 2;
-          return modifiedBuilder.build();
-        case 2:
-          _t5 = _context.v;
-          _t6 = {
-            tx: _t5
-          };
-          _t7 = _t2(_t3, _t4, _t6);
-          _context.n = 3;
-          return _t(_t7);
-        case 3:
-          result = _context.v;
-          if (!(result.feeType === 'dryRun' || percentage === lastReduction || !hasDryRunSupport(origin))) {
-            _context.n = 4;
-            break;
-          }
-          return _context.a(2, result);
-        case 4:
-          _i++;
-          _context.n = 1;
-          break;
-        case 5:
-          return _context.a(2, result);
-      }
-    }, _callee);
-  }));
-  return function attemptDryRunFee(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 var getTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, senderAddress, chain, destination, currency, builder, feeAsset, resolvedFeeAsset, asset, amount, balance, ed, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$attemptDryRunF, fee, transferable;
+    var api, senderAddress, chain, destination, currency, tx, feeAsset, resolvedFeeAsset, asset, amount, balance, ed, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, builder = _ref.builder, feeAsset = _ref.feeAsset;
+          api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, tx = _ref.tx, feeAsset = _ref.feeAsset;
           validateAddress(senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = findAssetInfoOrThrow(chain, currency, null);
@@ -6584,9 +6526,9 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
             break;
           }
           _context.n = 2;
-          return attemptDryRunFee({
+          return getOriginXcmFee({
             api: api,
-            builder: builder,
+            tx: tx,
             origin: chain,
             destination: chain,
             senderAddress: senderAddress,
@@ -6597,8 +6539,8 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
             disableFallback: false
           });
         case 2:
-          _yield$attemptDryRunF = _context.v;
-          fee = _yield$attemptDryRunF.fee;
+          _yield$getOriginXcmFe = _context.v;
+          fee = _yield$getOriginXcmFe.fee;
           if (!(fee === undefined)) {
             _context.n = 3;
             break;
@@ -6921,22 +6863,16 @@ var getTransferInfo = /*#__PURE__*/function () {
           bridgeHubFeeResult = _yield$getXcmFee.bridgeHub;
           destFeeDetail = _yield$getXcmFee.destination;
           hops = _yield$getXcmFee.hops;
-          if (!(originFee === undefined)) {
-            _context2.n = 10;
-            break;
-          }
-          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on chain ").concat(origin, "."));
-        case 10:
           isFeeAssetAh = origin === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, originAsset);
           originBalanceAfter = originBalance - amount;
           originBalanceFeeAfter = isFeeAssetAh ? originBalanceFee - amount : originBalanceFee - originFee;
           originBalanceNativeSufficient = originBalanceFee >= originFee;
           originBalanceSufficient = originBalanceAfter >= edOrigin;
           if (!assetHubFeeResult) {
-            _context2.n = 12;
+            _context2.n = 11;
             break;
           }
-          _context2.n = 11;
+          _context2.n = 10;
           return buildHopInfo({
             api: api,
             chain: "AssetHub".concat(getRelayChainOf(origin)),
@@ -6946,15 +6882,15 @@ var getTransferInfo = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             ahAddress: ahAddress
           });
-        case 11:
+        case 10:
           assetHub = _context2.v;
-        case 12:
+        case 11:
           if (!bridgeHubFeeResult) {
-            _context2.n = 14;
+            _context2.n = 13;
             break;
           }
           bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
-          _context2.n = 13;
+          _context2.n = 12;
           return buildHopInfo({
             api: api,
             chain: bridgeHubChain,
@@ -6964,15 +6900,15 @@ var getTransferInfo = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             ahAddress: ahAddress
           });
-        case 13:
+        case 12:
           bridgeHub = _context2.v;
-        case 14:
+        case 13:
           builtHops = [];
           if (!(hops && hops.length > 0)) {
-            _context2.n = 16;
+            _context2.n = 15;
             break;
           }
-          _context2.n = 15;
+          _context2.n = 14;
           return Promise.all(hops.map(/*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(hop) {
               var result;
@@ -7002,10 +6938,10 @@ var getTransferInfo = /*#__PURE__*/function () {
               return _ref3.apply(this, arguments);
             };
           }()));
-        case 15:
+        case 14:
           builtHops = _context2.v;
-        case 16:
-          _context2.n = 17;
+        case 15:
+          _context2.n = 16;
           return buildDestInfo({
             api: api,
             origin: origin,
@@ -7020,7 +6956,7 @@ var getTransferInfo = /*#__PURE__*/function () {
             assetHubFee: assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.fee,
             bridgeFee: bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.fee
           });
-        case 17:
+        case 16:
           destinationInfo = _context2.v;
           return _context2.a(2, {
             chain: {
@@ -7049,17 +6985,17 @@ var getTransferInfo = /*#__PURE__*/function () {
             hops: builtHops,
             destination: destinationInfo
           });
-        case 18:
-          _context2.p = 18;
+        case 17:
+          _context2.p = 17;
           api.setDisconnectAllowed(true);
-          _context2.n = 19;
+          _context2.n = 18;
           return api.disconnect();
+        case 18:
+          return _context2.f(17);
         case 19:
-          return _context2.f(18);
-        case 20:
           return _context2.a(2);
       }
-    }, _callee2, null, [[3,, 18, 20]]);
+    }, _callee2, null, [[3,, 17, 19]]);
   }));
   return function getTransferInfo(_x) {
     return _ref2.apply(this, arguments);
@@ -7216,14 +7152,264 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
   };
 }();
 
-var validateHops = function validateHops(hops) {
+var isSufficientOrigin = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, origin, destination, senderAddress, feeNative, currency, asset, feeAsset) {
+    var edNative, balanceNative, isNativeAssetToOrigin, isNativeAssetToDest, isSufficientNative, balanceAsset, edAsset, isSufficientAsset;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          if (!feeAsset) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 1:
+          edNative = getExistentialDepositOrThrow(origin);
+          _context.n = 2;
+          return getBalanceNativeInternal({
+            api: api,
+            chain: origin,
+            address: senderAddress
+          });
+        case 2:
+          balanceNative = _context.v;
+          isNativeAssetToOrigin = isSymbolMatch(asset.symbol, getNativeAssetSymbol(origin));
+          isNativeAssetToDest = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
+          if (!(isNativeAssetToOrigin && isNativeAssetToDest)) {
+            _context.n = 3;
+            break;
+          }
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+        case 3:
+          if (isNativeAssetToOrigin) {
+            _context.n = 5;
+            break;
+          }
+          isSufficientNative = balanceNative - edNative - feeNative > 0n;
+          _context.n = 4;
+          return getAssetBalance({
+            api: api,
+            chain: origin,
+            address: senderAddress,
+            currency: currency
+          });
+        case 4:
+          balanceAsset = _context.v;
+          edAsset = getExistentialDepositOrThrow(origin, currency);
+          isSufficientAsset = balanceAsset - edAsset > 0n;
+          return _context.a(2, isSufficientNative && isSufficientAsset);
+        case 5:
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+        case 6:
+          return _context.a(2);
+      }
+    }, _callee);
+  }));
+  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var isSufficientDestination = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, destination, address, amount, asset, feeNative) {
+    var isNativeAsset, existentialDeposit, nativeBalance;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          isNativeAsset = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
+          if (isNativeAsset) {
+            _context2.n = 1;
+            break;
+          }
+          return _context2.a(2, undefined);
+        case 1:
+          existentialDeposit = getExistentialDepositOrThrow(destination);
+          _context2.n = 2;
+          return getBalanceNativeInternal({
+            api: api,
+            chain: destination,
+            address: address
+          });
+        case 2:
+          nativeBalance = _context2.v;
+          return _context2.a(2, nativeBalance + amount - existentialDeposit - feeNative > 0n);
+      }
+    }, _callee2);
+  }));
+  return function isSufficientDestination(_x9, _x0, _x1, _x10, _x11, _x12) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var createOriginLocation = function createOriginLocation(origin, destination) {
+  if (isRelayChain(origin)) return DOT_LOCATION;
+  return {
+    parents: isRelayChain(destination) ? Parents.ZERO : Parents.ONE,
+    interior: {
+      X1: [{
+        Parachain: getParaId(origin)
+      }]
+    }
+  };
+};
+var getDestXcmFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var api, origin, hopChain, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, fee, newForwardedXcms, destParaId;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          api = options.api, origin = options.origin, hopChain = options.prevChain, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, address = options.address, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          calcPaymentInfoFee = /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+              var originAsset, _t;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.p = _context.n) {
+                  case 0:
+                    if (!(destination === 'Ethereum')) {
+                      _context.n = 1;
+                      break;
+                    }
+                    return _context.a(2, 0n);
+                  case 1:
+                    originAsset = findAssetInfoOrThrow(origin, currency, destination);
+                    if (!originAsset.location) {
+                      _context.n = 7;
+                      break;
+                    }
+                    _context.p = 2;
+                    _context.n = 3;
+                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                      destination: destination
+                    }), {
+                      location: originAsset.location
+                    });
+                  case 3:
+                    return _context.a(2, _context.v);
+                  case 4:
+                    _context.p = 4;
+                    _t = _context.v;
+                    if (!(_t instanceof InvalidCurrencyError)) {
+                      _context.n = 6;
+                      break;
+                    }
+                    _context.n = 5;
+                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                      destination: destination
+                    }), {
+                      symbol: originAsset.symbol
+                    });
+                  case 5:
+                    return _context.a(2, _context.v);
+                  case 6:
+                    throw _t;
+                  case 7:
+                    _context.n = 8;
+                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                      destination: destination
+                    }), {
+                      symbol: originAsset.symbol
+                    });
+                  case 8:
+                    return _context.a(2, _context.v);
+                }
+              }, _callee, null, [[2, 4]]);
+            }));
+            return function calcPaymentInfoFee() {
+              return _ref2.apply(this, arguments);
+            };
+          }();
+          if (!(!hasDryRunSupport(destination) || !forwardedXcms || destination === 'Ethereum')) {
+            _context2.n = 3;
+            break;
+          }
+          _context2.n = 1;
+          return calcPaymentInfoFee();
+        case 1:
+          _fee = _context2.v;
+          _context2.n = 2;
+          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
+        case 2:
+          sufficient = _context2.v;
+          return _context2.a(2, {
+            fee: _fee,
+            feeType: 'paymentInfo',
+            sufficient: !hasDryRunSupport(destination) ? sufficient : false
+          });
+        case 3:
+          _context2.n = 4;
+          return api.getDryRunXcm({
+            originLocation: addXcmVersionHeader(createOriginLocation(hopChain, destination), Version.V4),
+            xcm: forwardedXcms[1][0],
+            chain: destination,
+            origin: origin,
+            asset: asset,
+            originFee: originFee,
+            feeAsset: resolvedFeeAsset,
+            amount: BigInt(currency.amount) < 2n ? 2n : BigInt(currency.amount)
+          });
+        case 4:
+          dryRunResult = _context2.v;
+          if (dryRunResult.success) {
+            _context2.n = 7;
+            break;
+          }
+          if (!disableFallback) {
+            _context2.n = 5;
+            break;
+          }
+          return _context2.a(2, {
+            dryRunError: dryRunResult.failureReason
+          });
+        case 5:
+          _context2.n = 6;
+          return calcPaymentInfoFee();
+        case 6:
+          _fee2 = _context2.v;
+          return _context2.a(2, {
+            fee: _fee2,
+            feeType: 'paymentInfo',
+            dryRunError: dryRunResult.failureReason,
+            sufficient: false
+          });
+        case 7:
+          fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
+          return _context2.a(2, {
+            fee: fee,
+            feeType: 'dryRun',
+            sufficient: true,
+            forwardedXcms: newForwardedXcms,
+            destParaId: destParaId
+          });
+      }
+    }, _callee2);
+  }));
+  return function getDestXcmFee(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var getFailureInfo = function getFailureInfo(results, hops) {
+  // Check standard chains first for backwards compatibility
+  for (var _i = 0, _arr = ['destination', 'assetHub', 'bridgeHub']; _i < _arr.length; _i++) {
+    var chain = _arr[_i];
+    var res = results[chain];
+    if (res && !res.success && res.failureReason) {
+      return {
+        failureReason: res.failureReason,
+        failureChain: chain
+      };
+    }
+  }
   var _iterator = _createForOfIteratorHelper(hops),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var hop = _step.value;
-      if (!hop.result.success) {
-        throw new DryRunFailedError("Dry run failed on an intermediate hop (".concat(hop.chain, "). Reason: ").concat(hop.result.failureReason || 'Unknown'));
+      if (!hop.result.success && hop.result.failureReason) {
+        return {
+          failureReason: hop.result.failureReason,
+          failureChain: hop.chain
+        };
       }
     }
   } catch (err) {
@@ -7231,7 +7417,182 @@ var validateHops = function validateHops(hops) {
   } finally {
     _iterator.f();
   }
+  return {};
 };
+var dryRunInternal = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var _traversalResult$brid, _traversalResult$asse, _traversalResult$dest;
+    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, asset, amount, originDryRun, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubChain, bridgeHubChain, processedBridgeHub, bridgeHubHopIndex, originWithCurrency, assetHubWithCurrency, bridgeHubWithCurrency, destinationWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset, swapConfig = options.swapConfig, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi;
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          asset = findAssetInfoOrThrow(origin, currency, destination);
+          amount = abstractDecimals(currency.amount, asset.decimals, api);
+          _context2.n = 1;
+          return api.getDryRunCall({
+            tx: tx,
+            chain: origin,
+            address: senderAddress,
+            asset: _objectSpread2(_objectSpread2({}, asset), {}, {
+              amount: amount
+            }),
+            feeAsset: resolvedFeeAsset,
+            useRootOrigin: useRootOrigin
+          });
+        case 1:
+          originDryRun = _context2.v;
+          if (originDryRun.success) {
+            _context2.n = 2;
+            break;
+          }
+          return _context2.a(2, {
+            failureReason: originDryRun.failureReason,
+            failureChain: 'origin',
+            origin: originDryRun,
+            hops: []
+          });
+        case 2:
+          initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
+          processHop = /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
+              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, isDestination, hopDryRun, hopCurrency;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange, isDestination = params.isDestination;
+                    if (hasDryRunSupport(currentChain)) {
+                      _context.n = 1;
+                      break;
+                    }
+                    return _context.a(2, {
+                      success: false,
+                      failureReason: "DryRunApi is not available on chain ".concat(currentChain)
+                    });
+                  case 1:
+                    _context.n = 2;
+                    return hopApi.getDryRunXcm({
+                      originLocation: addXcmVersionHeader(createOriginLocation(currentOrigin, currentChain), Version.V4),
+                      xcm: forwardedXcms[1][0],
+                      chain: currentChain,
+                      origin: currentOrigin,
+                      asset: currentAsset,
+                      feeAsset: resolvedFeeAsset,
+                      originFee: originDryRun.fee,
+                      amount: amount
+                    });
+                  case 2:
+                    hopDryRun = _context.v;
+                    if (!hopDryRun.success) {
+                      _context.n = 3;
+                      break;
+                    }
+                    if (destination === 'Ethereum' && (currentChain.includes('AssetHub') || currentChain.includes('BridgeHub'))) {
+                      hopCurrency = getNativeAssetSymbol(currentChain);
+                    } else if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
+                      hopCurrency = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo).symbol;
+                    } else if (isDestination) {
+                      hopCurrency = findAssetOnDestOrThrow(origin, currentChain, currency).symbol;
+                    } else {
+                      hopCurrency = asset.symbol;
+                    }
+                    return _context.a(2, _objectSpread2(_objectSpread2({}, hopDryRun), {}, {
+                      currency: hopCurrency
+                    }));
+                  case 3:
+                    return _context.a(2, hopDryRun);
+                }
+              }, _callee);
+            }));
+            return function processHop(_x2) {
+              return _ref2.apply(this, arguments);
+            };
+          }();
+          _context2.n = 3;
+          return traverseXcmHops({
+            api: api,
+            origin: origin,
+            destination: destination,
+            currency: currency,
+            initialForwardedXcms: initialForwardedXcms,
+            initialDestParaId: initialDestParaId,
+            swapConfig: swapConfig,
+            processHop: processHop,
+            shouldContinue: function shouldContinue(hopResult) {
+              return hopResult.success;
+            },
+            extractNextHopData: function extractNextHopData(hopResult) {
+              return {
+                forwardedXcms: hopResult.success ? hopResult.forwardedXcms : undefined,
+                destParaId: hopResult.success ? hopResult.destParaId : undefined
+              };
+            }
+          });
+        case 3:
+          traversalResult = _context2.v;
+          // Process Ethereum bridge fees
+          assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
+          bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
+          if (!((_traversalResult$brid = traversalResult.bridgeHub) !== null && _traversalResult$brid !== void 0 && _traversalResult$brid.success)) {
+            _context2.n = 5;
+            break;
+          }
+          _context2.n = 4;
+          return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubChain);
+        case 4:
+          _t = _context2.v;
+          _context2.n = 6;
+          break;
+        case 5:
+          _t = traversalResult.bridgeHub;
+        case 6:
+          processedBridgeHub = _t;
+          // Update bridge hub in hops if needed
+          if (processedBridgeHub && processedBridgeHub.success && traversalResult.bridgeHub && traversalResult.bridgeHub.success && processedBridgeHub.fee !== traversalResult.bridgeHub.fee) {
+            bridgeHubHopIndex = traversalResult.hops.findIndex(function (hop) {
+              return hop.chain === bridgeHubChain;
+            });
+            if (bridgeHubHopIndex !== -1 && traversalResult.hops[bridgeHubHopIndex].result.success) {
+              traversalResult.hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, traversalResult.hops[bridgeHubHopIndex].result), {}, {
+                fee: processedBridgeHub.fee
+              });
+            }
+          }
+          originWithCurrency = originDryRun.success ? _objectSpread2(_objectSpread2({}, originDryRun), {}, {
+            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(origin)
+          }) : originDryRun;
+          assetHubWithCurrency = (_traversalResult$asse = traversalResult.assetHub) !== null && _traversalResult$asse !== void 0 && _traversalResult$asse.success ? _objectSpread2(_objectSpread2({}, traversalResult.assetHub), {}, {
+            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(assetHubChain)
+          }) : traversalResult.assetHub;
+          bridgeHubWithCurrency = processedBridgeHub !== null && processedBridgeHub !== void 0 && processedBridgeHub.success ? _objectSpread2(_objectSpread2({}, processedBridgeHub), {}, {
+            currency: getNativeAssetSymbol(bridgeHubChain)
+          }) : processedBridgeHub;
+          destinationWithCurrency = (_traversalResult$dest = traversalResult.destination) !== null && _traversalResult$dest !== void 0 && _traversalResult$dest.success ? _objectSpread2(_objectSpread2({}, traversalResult.destination), {}, {
+            currency: asset === null || asset === void 0 ? void 0 : asset.symbol
+          }) : traversalResult.destination;
+          _getFailureInfo = getFailureInfo({
+            destination: destinationWithCurrency,
+            assetHub: assetHubWithCurrency,
+            bridgeHub: bridgeHubWithCurrency
+          }, traversalResult.hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
+          return _context2.a(2, {
+            failureReason: failureReason,
+            failureChain: failureChain,
+            origin: originWithCurrency,
+            assetHub: assetHubWithCurrency,
+            bridgeHub: bridgeHubWithCurrency,
+            destination: destinationWithCurrency,
+            hops: traversalResult.hops
+          });
+      }
+    }, _callee2);
+  }));
+  return function dryRunInternal(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var getReserveFeeFromHops = function getReserveFeeFromHops(hops) {
   if (!hops || hops.length === 0 || !hops[0].result.success) {
     return MIN_FEE;
@@ -7241,7 +7602,7 @@ var getReserveFeeFromHops = function getReserveFeeFromHops(hops) {
 var FEE_PADDING_PERCENTAGE$1 = 40;
 var handleExecuteTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
-    var api, senderAddress, paraIdTo, assetInfo, currency, feeCurrency, address, feeAssetInfo, version, feeAssetBalance, checkAmount, destChain, internalOptions, call, dryRunResult, originFeeEstimate, originFee, reserveFeeEstimate, reserveFee, xcm, weight, _t;
+    var api, senderAddress, paraIdTo, assetInfo, currency, feeCurrency, address, feeAssetInfo, version, checkAmount, destChain, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, call, dryRunResult, originFeeEstimate, originFee, reserveFeeEstimate, reserveFee, xcm, weight;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -7253,25 +7614,6 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
           throw new InvalidParameterError('Please provide senderAddress');
         case 1:
           assertAddressIsString(address);
-          if (!(feeCurrency && feeAssetInfo && !isAssetEqual(assetInfo, feeAssetInfo))) {
-            _context.n = 3;
-            break;
-          }
-          _context.n = 2;
-          return getAssetBalanceInternal({
-            api: api,
-            address: senderAddress,
-            chain: chain,
-            currency: feeCurrency
-          });
-        case 2:
-          _t = _context.v;
-          _context.n = 4;
-          break;
-        case 3:
-          _t = undefined;
-        case 4:
-          feeAssetBalance = _t;
           checkAmount = function checkAmount(fee) {
             if (assetInfo.amount <= fee) {
               throw new InvalidParameterError("Asset amount is too low, please increase the amount or use a different fee asset.");
@@ -7292,14 +7634,16 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             version: version,
             paraIdTo: paraIdTo
-          };
+          }; // We mint 1000 units of feeAsset and use 100
+          FEE_ASSET_AMOUNT = 100;
+          feeAssetAmount = feeAssetInfo ? parseUnits(FEE_ASSET_AMOUNT.toString(), feeAssetInfo.decimals) : MIN_FEE;
           call = createExecuteCall(chain, createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
-              originFee: feeAssetBalance && feeAssetBalance > 1n ? feeAssetBalance : MIN_FEE,
+              originFee: feeAssetAmount,
               reserveFee: MIN_FEE
             }
           })), MAX_WEIGHT);
-          _context.n = 5;
+          _context.n = 2;
           return dryRunInternal({
             api: api,
             tx: api.callTxMethod(call),
@@ -7308,17 +7652,17 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             address: address,
             currency: currency,
-            feeAsset: feeCurrency
+            feeAsset: feeCurrency,
+            useRootOrigin: true
           });
-        case 5:
+        case 2:
           dryRunResult = _context.v;
           if (dryRunResult.origin.success) {
-            _context.n = 6;
+            _context.n = 3;
             break;
           }
           throw new DryRunFailedError(dryRunResult.failureReason);
-        case 6:
-          validateHops(dryRunResult.hops);
+        case 3:
           originFeeEstimate = dryRunResult.origin.fee;
           originFee = padFeeBy(originFeeEstimate, FEE_PADDING_PERCENTAGE$1);
           reserveFeeEstimate = getReserveFeeFromHops(dryRunResult.hops);
@@ -7330,9 +7674,9 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
               reserveFee: reserveFee
             }
           }));
-          _context.n = 7;
+          _context.n = 4;
           return api.getXcmWeight(xcm);
-        case 7:
+        case 4:
           weight = _context.v;
           return _context.a(2, createExecuteCall(chain, xcm, weight));
       }
@@ -7623,7 +7967,7 @@ var createXcmAndCall = /*#__PURE__*/function () {
 }();
 var handleSwapExecuteTransfer = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, senderAddress, recipientAddress, calculateMinAmountOut, version, internalOptions, dryRunParams, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, hasOriginReserveHop, requireExchangeSuccess, extractedFees, exchangeHop, totalFeesInFromAsset, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, secondCall, secondDryRunResult, finalFees, hasHopsInSecondRun, isOnExchangeChain, finalExchangeHopIndex, finalTotalFeesInFromAsset, finalAmountAvailableForSwap, finalMinAmountOut, finalAssetTo, _yield$createXcmAndCa3, finalCall;
+    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, senderAddress, recipientAddress, calculateMinAmountOut, version, internalOptions, dryRunParams, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, extractedFees, totalFeesInFromAsset, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, finalCall;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
@@ -7650,7 +7994,8 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
             swapConfig: {
               currencyTo: currencyTo,
               exchangeChain: exchangeChain
-            }
+            },
+            useRootOrigin: true
           }; // First dry run with dummy fees to extract actual fees
           _context3.n = 2;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
@@ -7669,38 +8014,8 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           }));
         case 3:
           firstDryRunResult = _context3.v;
-          exchangeHopIndex = findExchangeHopIndex(chain, firstDryRunResult.hops, exchangeChain, destChain); // Check if there's a hop before exchange (origin reserve hop)
-          hasOriginReserveHop = destChain ? exchangeHopIndex > 0 : firstDryRunResult.hops.length > 0; // If there's no origin reserve hop, we need the exchange hop/destination to succeed to get fees
-          requireExchangeSuccess = !hasOriginReserveHop;
-          extractedFees = extractFeesFromDryRun(chain, firstDryRunResult, exchangeHopIndex, destChain, false); // If we need exchange to succeed but it failed, throw error
-          if (!(requireExchangeSuccess && extractedFees.exchangeFee === 0n)) {
-            _context3.n = 6;
-            break;
-          }
-          if (!destChain) {
-            _context3.n = 5;
-            break;
-          }
-          if (!chain) {
-            _context3.n = 4;
-            break;
-          }
-          exchangeHop = firstDryRunResult.hops[exchangeHopIndex];
-          if (exchangeHop.result.success) {
-            _context3.n = 4;
-            break;
-          }
-          throw new DryRunFailedError("Exchange hop failed when no origin reserve exists: ".concat(exchangeHop.result.failureReason || 'Unknown reason'));
-        case 4:
-          _context3.n = 6;
-          break;
-        case 5:
-          if (!(firstDryRunResult.destination && !firstDryRunResult.destination.success)) {
-            _context3.n = 6;
-            break;
-          }
-          throw new DryRunFailedError("Exchange (destination) failed when no origin reserve exists: ".concat(firstDryRunResult.destination.failureReason || 'Unknown reason'));
-        case 6:
+          exchangeHopIndex = findExchangeHopIndex(chain, firstDryRunResult.hops, exchangeChain, destChain);
+          extractedFees = extractFeesFromDryRun(chain, firstDryRunResult, exchangeHopIndex, destChain, false);
           if (extractedFees.exchangeFee === 0n) {
             // We set the exchange fee to non-zero value to prevent creating dummy tx
             extractedFees.exchangeFee = MIN_FEE;
@@ -7710,67 +8025,27 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           validateAmount(BigInt(assetFrom.amount), totalFeesInFromAsset);
           updatedAssetTo = assetTo;
           if (!chain) {
-            _context3.n = 8;
+            _context3.n = 5;
             break;
           }
           amountAvailableForSwap = BigInt(assetFrom.amount) - totalFeesInFromAsset;
-          _context3.n = 7;
+          _context3.n = 4;
           return calculateMinAmountOut(amountAvailableForSwap);
-        case 7:
+        case 4:
           recalculatedMinAmountOut = _context3.v;
           updatedAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
             amount: recalculatedMinAmountOut
           });
-        case 8:
-          _context3.n = 9;
+        case 5:
+          _context3.n = 6;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetInfoTo: updatedAssetTo,
             fees: extractedFees
           }), firstDryRunResult.origin.success ? firstDryRunResult.origin.weight : undefined);
-        case 9:
+        case 6:
           _yield$createXcmAndCa2 = _context3.v;
-          secondCall = _yield$createXcmAndCa2.call;
-          _context3.n = 10;
-          return executeDryRun(_objectSpread2(_objectSpread2({}, dryRunParams), {}, {
-            tx: api.callTxMethod(secondCall)
-          }));
-        case 10:
-          secondDryRunResult = _context3.v;
-          hasHopsInSecondRun = secondDryRunResult.hops && secondDryRunResult.hops.length > 0;
-          isOnExchangeChain = chain === exchangeChain;
-          if (hasHopsInSecondRun && !isOnExchangeChain) {
-            finalExchangeHopIndex = findExchangeHopIndex(chain, secondDryRunResult.hops, exchangeChain, destChain);
-            finalFees = extractFeesFromDryRun(chain, secondDryRunResult, finalExchangeHopIndex, destChain, true);
-          } else {
-            finalFees = extractFeesFromDryRun(chain, secondDryRunResult, 0, destChain, true);
-          }
-          // Validate that we have enough after accounting for final fees
-          finalTotalFeesInFromAsset = chain ? finalFees.originReserveFee + finalFees.exchangeFee : 0n;
-          validateAmount(BigInt(assetFrom.amount), finalTotalFeesInFromAsset);
-          // If the final fees are different, we might need one more iteration
-          if (!(finalFees.exchangeFee !== extractedFees.exchangeFee || finalFees.originReserveFee !== extractedFees.originReserveFee)) {
-            _context3.n = 13;
-            break;
-          }
-          finalAmountAvailableForSwap = BigInt(assetFrom.amount) - finalTotalFeesInFromAsset;
-          _context3.n = 11;
-          return calculateMinAmountOut(finalAmountAvailableForSwap);
-        case 11:
-          finalMinAmountOut = _context3.v;
-          finalAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
-            amount: finalMinAmountOut
-          });
-          _context3.n = 12;
-          return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
-            assetInfoTo: finalAssetTo,
-            fees: finalFees
-          }), secondDryRunResult.origin.success ? secondDryRunResult.origin.weight : undefined);
-        case 12:
-          _yield$createXcmAndCa3 = _context3.v;
-          finalCall = _yield$createXcmAndCa3.call;
+          finalCall = _yield$createXcmAndCa2.call;
           return _context3.a(2, api.callTxMethod(finalCall));
-        case 13:
-          return _context3.a(2, api.callTxMethod(secondCall));
       }
     }, _callee3);
   }));
@@ -10637,7 +10912,7 @@ var Moonbeam = /*#__PURE__*/function (_Parachain) {
             case 3:
               location = this.getLocation(assetInfo, scenario);
               return _context.a(2, transferPolkadotXcm(_objectSpread2(_objectSpread2({}, input), {}, {
-                asset: createAsset(version, assetInfo.amount, location)
+                asset: createAsset(version, assetInfo.amount, localizeLocation(this.chain, location))
               }), 'transfer_assets', 'Unlimited'));
           }
         }, _callee, this);
@@ -12236,15 +12511,19 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getTransferableAmount",
     value: (function () {
       var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
-        var _this$_options7, from, to, senderAddress, currency, feeAsset;
+        var _this$_options7, from, to, senderAddress, currency, feeAsset, tx;
         return _regenerator().w(function (_context8) {
           while (1) switch (_context8.n) {
             case 0:
               _this$_options7 = this._options, from = _this$_options7.from, to = _this$_options7.to, senderAddress = _this$_options7.senderAddress, currency = _this$_options7.currency, feeAsset = _this$_options7.feeAsset;
               assertToIsString(to);
+              _context8.n = 1;
+              return this.build();
+            case 1:
+              tx = _context8.v;
               return _context8.a(2, getTransferableAmount({
                 api: this.api,
-                builder: this,
+                tx: tx,
                 origin: from,
                 destination: to,
                 senderAddress: senderAddress,
@@ -12371,4 +12650,4 @@ var Builder = function Builder(api) {
   return new GeneralBuilder(api, new BatchTransactionManager());
 };
 
-export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, ChainNotSupportedError, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleChainsError, InvalidAddressError, InvalidParameterError, MissingChainApiError, NoXCMSupportImplementedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, applyDecimalAbstraction, assertAddressIsString, assertHasId, assertHasLocation, assertIsForeign, assertToIsString, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createAsset, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createChainClient, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createTypeAndThenCall, createVersionedAssets, createX1Payload, deriveAccountId, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getAssetReserveChain, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChain, getChainConfig, getChainLocation, getChainProviders, getChainVersion, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getRelayChainOf, getTChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, localizeLocation, maybeOverrideAsset, maybeOverrideAssets, padFee, padFeeBy, resolveModuleError, resolveParaId, reverseTransformLocation, send, sortAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, AssetsPallet, BatchMode, BridgeHaltedError, Builder, ChainNotSupportedError, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleChainsError, InvalidAddressError, InvalidParameterError, MissingChainApiError, NoXCMSupportImplementedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, applyDecimalAbstraction, assertAddressIsString, assertHasId, assertHasLocation, assertIsForeign, assertToIsString, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createAsset, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createChainClient, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createTypeAndThenCall, createVersionedAssets, createX1Payload, deriveAccountId, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getAssetReserveChain, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChain, getChainConfig, getChainLocation, getChainProviders, getChainVersion, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getOriginXcmFeeInternal, getParaEthTransferFees, getParaId, getRelayChainOf, getTChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, localizeLocation, maybeOverrideAsset, maybeOverrideAssets, padFee, padFeeBy, resolveModuleError, resolveParaId, reverseTransformLocation, send, sortAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, verifyEdOnDestination, wrapTxBypass };