@paraspell/sdk-core 11.14.0 → 11.14.2

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { base58 } from '@scure/base';
 import { isAddress, parseUnits as parseUnits$1, formatUnits as formatUnits$1, createPublicClient, http, getContract, pad, toHex, getAddress, concat, keccak256 } from 'viem';
 import { getSupportedPalletsDetails, getDefaultPallet, getSupportedPallets, getNativeAssetsPallet, getOtherAssetsPallets } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
-import { replaceBigInt, isTLocation, Version, hasJunction, getJunctionValue, isRelayChain, Parents, isExternalChain, deepEqual, PARACHAINS, isSubstrateBridge, isTrustedChain, isSystemChain } from '@paraspell/sdk-common';
+import { replaceBigInt, isTLocation, Version, hasJunction, getJunctionValue, isRelayChain, deepEqual, Parents, isExternalChain, PARACHAINS, isSubstrateBridge, isTrustedChain, isSystemChain } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
 import { moonbeam, moonriver, mainnet } from 'viem/chains';
 
@@ -772,11 +772,11 @@ var createVersionedAssets = function createVersionedAssets(version, amount, loca
   return addXcmVersionHeader([asset], version);
 };
 
-var getCurrencySelection = function getCurrencySelection(asset) {
+var getCurrencySelection = function getCurrencySelection(chain, asset) {
   if (asset.location) return {
     location: asset.location
   };
-  if (isForeignAsset(asset) && asset.assetId) {
+  if (isForeignAsset(asset) && asset.assetId && !chain.startsWith('Bifrost')) {
     return {
       id: asset.assetId
     };
@@ -790,7 +790,7 @@ var maybeOverrideAssets = function maybeOverrideAssets(version, amount, assets,
   if (!overriddenCurrency) {
     return assets;
   }
-  return isTLocation(overriddenCurrency) ? [createAsset(version, amount, overriddenCurrency)] : overriddenCurrency;
+  return isTLocation(overriddenCurrency) ? createAsset(version, amount, overriddenCurrency) : overriddenCurrency;
 };
 var maybeOverrideAsset = function maybeOverrideAsset(version, amount, asset, overriddenCurrency) {
   if (!overriddenCurrency) {
@@ -918,6 +918,33 @@ var createTx = /*#__PURE__*/function () {
   };
 }();
 
+var getAssetReserveChain = function getAssetReserveChain(chain, assetLocation) {
+  var hasGlobalConsensusJunction = hasJunction(assetLocation, 'GlobalConsensus');
+  var paraId = getJunctionValue(assetLocation, 'Parachain');
+  if (paraId) {
+    var resolvedChain = getTChain(paraId, getRelayChainOf(chain));
+    if (!resolvedChain) {
+      throw new InvalidParameterError("Chain with paraId ".concat(paraId, " not found"));
+    }
+    return resolvedChain;
+  }
+  if (isRelayChain(chain)) return chain;
+  var relaychain = getRelayChainOf(chain);
+  var ahChain = "AssetHub".concat(relaychain);
+  if (hasGlobalConsensusJunction) {
+    return ahChain;
+  }
+  if (deepEqual(assetLocation, {
+    parents: Parents.ONE,
+    interior: {
+      Here: null
+    }
+  })) {
+    return ahChain;
+  }
+  return chain;
+};
+
 /**
  * Retrieves the chain instance for a given chain.
  *
@@ -3230,27 +3257,22 @@ var constructRelayToParaParameters = function constructRelayToParaParameters(_re
     asset = _ref.assetInfo,
     address = _ref.address,
     paraIdTo = _ref.paraIdTo;
-  var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-      includeFee: false
-    },
-    includeFee = _ref2.includeFee;
   var paraId = resolveParaId(paraIdTo, destination);
   var beneficiaryLocation = createBeneficiaryLocation({
     api: api,
     address: address,
     version: version
   });
-  return _objectSpread2({
+  return {
     dest: createVersionedDestination(version, origin, destination, paraId),
     beneficiary: addXcmVersionHeader(beneficiaryLocation, version),
     assets: createVersionedAssets(version, asset.amount, {
       parents: Parents.ZERO,
       interior: 'Here'
     }),
-    fee_asset_item: DEFAULT_FEE_ASSET
-  }, includeFee && {
+    fee_asset_item: DEFAULT_FEE_ASSET,
     weight_limit: 'Unlimited'
-  });
+  };
 };
 
 var createDestination = function createDestination(version, origin, destination, chainId, junction, parents) {
@@ -3307,33 +3329,6 @@ var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, chain
   throw new InvalidCurrencyError("".concat(isDestination ? 'Destination' : 'Origin', " chain ").concat(chain, " does not support currency ").concat(JSON.stringify(currency, replaceBigInt), "."));
 };
 
-var getAssetReserveChain = function getAssetReserveChain(chain, assetLocation) {
-  var hasGlobalConsensusJunction = hasJunction(assetLocation, 'GlobalConsensus');
-  var paraId = getJunctionValue(assetLocation, 'Parachain');
-  if (paraId) {
-    var resolvedChain = getTChain(paraId, getRelayChainOf(chain));
-    if (!resolvedChain) {
-      throw new InvalidParameterError("Chain with paraId ".concat(paraId, " not found"));
-    }
-    return resolvedChain;
-  }
-  if (isRelayChain(chain)) return chain;
-  var relaychain = getRelayChainOf(chain);
-  var ahChain = "AssetHub".concat(relaychain);
-  if (hasGlobalConsensusJunction) {
-    return ahChain;
-  }
-  if (deepEqual(assetLocation, {
-    parents: Parents.ONE,
-    interior: {
-      Here: null
-    }
-  })) {
-    return ahChain;
-  }
-  return chain;
-};
-
 var prepareExecuteContext = function prepareExecuteContext(_ref) {
   var chain = _ref.chain,
     destChain = _ref.destChain,
@@ -3650,21 +3645,26 @@ var getReserveFeeFromHops = function getReserveFeeFromHops(hops) {
   }
   return hops[0].result.fee;
 };
-var FEE_PADDING_PERCENTAGE$2 = 40;
+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, checkAmount, destChain, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, call, dryRunResult, originFeeEstimate, originFee, reserveFeeEstimate, reserveFee, xcm, weight;
+    var api, senderAddress, paraIdTo, destChain, assetInfo, currency, feeCurrency, address, feeAssetInfo, version, checkAmount, 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:
-          api = options.api, senderAddress = options.senderAddress, paraIdTo = options.paraIdTo, assetInfo = options.assetInfo, currency = options.currency, feeCurrency = options.feeCurrency, address = options.address, feeAssetInfo = options.feeAssetInfo, version = options.version;
+          api = options.api, senderAddress = options.senderAddress, paraIdTo = options.paraIdTo, destChain = options.destChain, assetInfo = options.assetInfo, currency = options.currency, feeCurrency = options.feeCurrency, address = options.address, feeAssetInfo = options.feeAssetInfo, version = options.version;
           assertSenderAddress(senderAddress);
           assertAddressIsString(address);
           checkAmount = function checkAmount(fee) {
             if (assetInfo.amount <= fee) throw new AmountTooLowError();
           };
           checkAmount(MIN_FEE);
-          destChain = getTChain(paraIdTo, getRelayChainOf(chain));
+          if (!(destChain === undefined)) {
+            _context.n = 1;
+            break;
+          }
+          throw new InvalidParameterError('Could not determine destination chain for execute transfer');
+        case 1:
           internalOptions = {
             api: api,
             chain: chain,
@@ -3687,7 +3687,7 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
               reserveFee: MIN_FEE
             }
           })), MAX_WEIGHT);
-          _context.n = 1;
+          _context.n = 2;
           return dryRunInternal({
             api: api,
             tx: api.callTxMethod(call),
@@ -3699,18 +3699,18 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             feeAsset: feeCurrency,
             useRootOrigin: true
           });
-        case 1:
+        case 2:
           dryRunResult = _context.v;
           if (dryRunResult.origin.success) {
-            _context.n = 2;
+            _context.n = 3;
             break;
           }
           throw new DryRunFailedError(dryRunResult.failureReason);
-        case 2:
+        case 3:
           originFeeEstimate = dryRunResult.origin.fee;
-          originFee = padValueBy(originFeeEstimate, FEE_PADDING_PERCENTAGE$2);
+          originFee = padValueBy(originFeeEstimate, FEE_PADDING_PERCENTAGE$1);
           reserveFeeEstimate = getReserveFeeFromHops(dryRunResult.hops);
-          reserveFee = padValueBy(reserveFeeEstimate, FEE_PADDING_PERCENTAGE$2);
+          reserveFee = padValueBy(reserveFeeEstimate, FEE_PADDING_PERCENTAGE$1);
           checkAmount(feeAssetInfo && !isAssetEqual(assetInfo, feeAssetInfo) ? reserveFee : originFee + reserveFee);
           xcm = createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
@@ -3718,9 +3718,9 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
               reserveFee: reserveFee
             }
           }));
-          _context.n = 3;
+          _context.n = 4;
           return api.getXcmWeight(xcm);
-        case 3:
+        case 4:
           weight = _context.v;
           return _context.a(2, createExecuteCall(chain, xcm, weight));
       }
@@ -3786,21 +3786,27 @@ var determineAddress = function determineAddress(chain, address, senderAddress)
 };
 var getReverseTxFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, currencyInput) {
-    var api, origin, destination, senderAddress, address, toAddress, fromAddress, _yield$Builder$from$t, tx, rawFee;
+    var api, origin, destination, senderAddress, address, skipReverseFeeCalculation, toAddress, fromAddress, _yield$Builder$from$t, 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;
+          api = _ref.api, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, skipReverseFeeCalculation = _ref.skipReverseFeeCalculation;
+          if (!skipReverseFeeCalculation) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, 0n);
+        case 1:
           toAddress = determineAddress(origin, address, senderAddress);
           fromAddress = determineAddress(destination, address, senderAddress);
-          _context.n = 1;
+          _context.n = 2;
           return Builder(api).from(destination).to(origin).address(toAddress).senderAddress(fromAddress).currency(currencyInput)['buildInternal']();
-        case 1:
+        case 2:
           _yield$Builder$from$t = _context.v;
           tx = _yield$Builder$from$t.tx;
-          _context.n = 2;
+          _context.n = 3;
           return api.calculateTransactionFee(tx, fromAddress);
-        case 2:
+        case 3:
           rawFee = _context.v;
           return _context.a(2, padFee(rawFee, origin, destination, 'destination'));
       }
@@ -3912,7 +3918,7 @@ var getBalanceForeignXTokens = /*#__PURE__*/function () {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          if (!(chain === 'Astar' || chain === 'Shiden' || chain.startsWith('Integritee'))) {
+          if (!(chain === 'Astar' || chain === 'Shiden' || chain === 'CrustShadow' || chain.startsWith('Integritee'))) {
             _context.n = 1;
             break;
           }
@@ -5796,7 +5802,7 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
   };
 }();
 
-var FEE_PADDING_PERCENTAGE$1 = 20;
+var FEE_PADDING_PERCENTAGE = 20;
 var validateAmount = function validateAmount(amount, requiredFee) {
   if (amount <= requiredFee) {
     throw new AmountTooLowError("Asset amount is too low, please increase the amount or use a different fee asset.");
@@ -5862,7 +5868,7 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
         throw new DryRunFailedError("Exchange (destination) failed: ".concat(dryRunResult.destination.failureReason || 'Unknown reason'));
       }
       if (dryRunResult.destination && dryRunResult.destination.success) {
-        fees.exchangeFee = padValueBy(dryRunResult.destination.fee, FEE_PADDING_PERCENTAGE$1);
+        fees.exchangeFee = padValueBy(dryRunResult.destination.fee, FEE_PADDING_PERCENTAGE);
       }
     } else {
       // Normal case: exchange is an intermediate hop
@@ -5871,7 +5877,7 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
         throw new DryRunFailedError("Exchange hop failed: ".concat(exchangeHop.result.failureReason || 'Unknown reason'));
       }
       if (exchangeHop.result.success) {
-        fees.exchangeFee = padValueBy(exchangeHop.result.fee, FEE_PADDING_PERCENTAGE$1);
+        fees.exchangeFee = padValueBy(exchangeHop.result.fee, FEE_PADDING_PERCENTAGE);
       }
     }
   } else {
@@ -5888,7 +5894,7 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
       throw new DryRunFailedError("Hop before exchange failed: ".concat(hopBeforeExchange.result.failureReason || 'Unknown reason'));
     }
     if (hopBeforeExchange.result.success) {
-      fees.originReserveFee = padValueBy(hopBeforeExchange.result.fee, FEE_PADDING_PERCENTAGE$1);
+      fees.originReserveFee = padValueBy(hopBeforeExchange.result.fee, FEE_PADDING_PERCENTAGE);
     }
   } else if (!destChain && hops.length > 0) {
     // Special case: when destChain is undefined and we have hops,
@@ -5898,7 +5904,7 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
       throw new DryRunFailedError("Origin reserve hop failed: ".concat(lastHop.result.failureReason || 'Unknown reason'));
     }
     if (lastHop.result.success) {
-      fees.originReserveFee = padValueBy(lastHop.result.fee, FEE_PADDING_PERCENTAGE$1);
+      fees.originReserveFee = padValueBy(lastHop.result.fee, FEE_PADDING_PERCENTAGE);
     }
   }
   // Handle destination reserve fee (hop after exchange)
@@ -5909,7 +5915,7 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
       throw new DryRunFailedError("Hop after exchange failed: ".concat(hopAfterExchange.result.failureReason || 'Unknown reason'));
     }
     if (hopAfterExchange.result.success) {
-      fees.destReserveFee = padValueBy(hopAfterExchange.result.fee, FEE_PADDING_PERCENTAGE$1);
+      fees.destReserveFee = padValueBy(hopAfterExchange.result.fee, FEE_PADDING_PERCENTAGE);
     }
   }
   return fees;
@@ -6095,7 +6101,7 @@ var handleToAhTeleport = /*#__PURE__*/function () {
           // Enter dummy fee values just to get the dry run to pass
           asset.amount, asset.amount / 2n);
           _context.n = 4;
-          return getXcmFeeInternal({
+          return getXcmFeeOnce({
             api: api,
             tx: dummyTx,
             origin: origin,
@@ -6664,28 +6670,26 @@ var Parachain = /*#__PURE__*/function () {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'transfer_assets_using_type_and_then',
-        includeFee: true
+        transferType: 'typeAndThen'
       };
     }
   }, {
     key: "transferRelayToPara",
     value: function () {
       var _transferRelayToPara = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-        var api, version, pallet, assetInfo, address, senderAddress, destination, paraIdTo, methodOverride, _this$getRelayToParaO, method, includeFee, customMethod, paraId, destChain, scenario;
+        var api, version, pallet, assetInfo, address, senderAddress, destination, paraIdTo, method, _this$getRelayToParaO, transferType, paraId, destChain, scenario;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              api = options.api, version = options.version, pallet = options.pallet, assetInfo = options.assetInfo, address = options.address, senderAddress = options.senderAddress, destination = options.destination, paraIdTo = options.paraIdTo, methodOverride = options.method;
-              _this$getRelayToParaO = this.getRelayToParaOverrides(), method = _this$getRelayToParaO.method, includeFee = _this$getRelayToParaO.includeFee;
+              api = options.api, version = options.version, pallet = options.pallet, assetInfo = options.assetInfo, address = options.address, senderAddress = options.senderAddress, destination = options.destination, paraIdTo = options.paraIdTo, method = options.method;
+              _this$getRelayToParaO = this.getRelayToParaOverrides(), transferType = _this$getRelayToParaO.transferType;
               if (!this.isReceivingTempDisabled('RelayToPara')) {
                 _context2.n = 1;
                 break;
               }
               throw new InvalidParameterError("Receiving on ".concat(this.chain, " is temporarily disabled"));
             case 1:
-              customMethod = methodOverride !== null && methodOverride !== void 0 ? methodOverride : method;
-              if (!(customMethod === 'transfer_assets_using_type_and_then')) {
+              if (!(transferType === 'typeAndThen')) {
                 _context2.n = 3;
                 break;
               }
@@ -6698,7 +6702,7 @@ var Parachain = /*#__PURE__*/function () {
               }
               throw new InvalidParameterError('Cannot override destination when using type and then transfer.');
             case 2:
-              return _context2.a(2, createTypeAndThenCall(getRelayChainOf(destChain), _objectSpread2(_objectSpread2({}, options), {}, {
+              return _context2.a(2, createTypeThenAutoReserve(getRelayChainOf(destChain), _objectSpread2(_objectSpread2({}, options), {}, {
                 beneficiaryLocation: createBeneficiaryLocation({
                   api: api,
                   address: address,
@@ -6714,10 +6718,8 @@ var Parachain = /*#__PURE__*/function () {
             case 3:
               return _context2.a(2, {
                 module: pallet !== null && pallet !== void 0 ? pallet : 'XcmPallet',
-                method: customMethod,
-                parameters: constructRelayToParaParameters(options, version, {
-                  includeFee: includeFee
-                })
+                method: method !== null && method !== void 0 ? method : 'limited_teleport_assets',
+                parameters: constructRelayToParaParameters(options, version)
               });
           }
         }, _callee2, this);
@@ -7012,6 +7014,11 @@ var Acala = /*#__PURE__*/function (_Parachain) {
       var currencySelection = this.getCurrencySelection(asset);
       return transferXTokens(input, currencySelection);
     }
+  }, {
+    key: "transferRelayToPara",
+    value: function transferRelayToPara() {
+      throw new ChainNotSupportedError();
+    }
   }, {
     key: "transferLocalNativeAsset",
     value: function () {
@@ -7312,8 +7319,7 @@ var AssetHubKusama = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }, {
@@ -7563,23 +7569,17 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
               _call = _context3.v;
               return _context3.a(2, api.callTxMethod(_call));
             case 9:
-              if (!(scenario === 'ParaToPara' && assetInfo.symbol === 'KSM' && !isForeignAsset(assetInfo))) {
-                _context3.n = 10;
-                break;
-              }
-              throw new ScenarioNotSupportedError(this.chain, scenario, 'Bridged KSM cannot currently be transfered from AssetHubPolkadot, if you are sending different KSM asset, please specify {id: <KSMID>}.');
-            case 10:
               method = this.getMethod(scenario, destination); // Patch transfer_assets to use type_and_then transfer
               if (!(method === 'transfer_assets' && isSymbolMatch(assetInfo.symbol, getRelayChainSymbol(this.chain)))) {
-                _context3.n = 12;
+                _context3.n = 11;
                 break;
               }
               _t2 = api;
-              _context3.n = 11;
+              _context3.n = 10;
               return createTypeAndThenCall(this.chain, options);
-            case 11:
+            case 10:
               return _context3.a(2, _t2.callTxMethod.call(_t2, _context3.v));
-            case 12:
+            case 11:
               modifiedInput = this.patchInput(options);
               return _context3.a(2, transferPolkadotXcm(modifiedInput, method, 'Unlimited'));
           }
@@ -7594,8 +7594,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }, {
@@ -7704,6 +7703,11 @@ var Astar = /*#__PURE__*/function (_Parachain) {
       var assetInfo = _ref.assetInfo;
       return assetInfo.symbol !== this.getNativeAssetSymbol();
     }
+  }, {
+    key: "transferRelayToPara",
+    value: function transferRelayToPara() {
+      throw new ChainNotSupportedError();
+    }
   }, {
     key: "transferLocalNonNativeAsset",
     value: function transferLocalNonNativeAsset(options) {
@@ -7905,8 +7909,7 @@ var BridgeHubKusama = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }]);
@@ -7936,8 +7939,7 @@ var BridgeHubPolkadot = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }]);
@@ -8042,8 +8044,7 @@ var Collectives = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }]);
@@ -8077,8 +8078,7 @@ var CoretimeKusama = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }]);
@@ -8112,8 +8112,7 @@ var CoretimePolkadot = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }]);
@@ -8358,8 +8357,7 @@ var Encointer = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }]);
@@ -9363,8 +9361,7 @@ var PeoplePolkadot = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }]);
@@ -9519,8 +9516,7 @@ var PeopleKusama = /*#__PURE__*/function (_Parachain) {
     key: "getRelayToParaOverrides",
     value: function getRelayToParaOverrides() {
       return {
-        method: 'limited_teleport_assets',
-        includeFee: true
+        transferType: 'teleport'
       };
     }
   }]);
@@ -9761,6 +9757,11 @@ var Shiden = /*#__PURE__*/function (_Parachain) {
       var assetInfo = _ref.assetInfo;
       return assetInfo.symbol !== this.getNativeAssetSymbol();
     }
+  }, {
+    key: "transferRelayToPara",
+    value: function transferRelayToPara() {
+      throw new ChainNotSupportedError();
+    }
   }, {
     key: "transferLocalNonNativeAsset",
     value: function transferLocalNonNativeAsset(options) {
@@ -10577,7 +10578,7 @@ var wrapTxBypass = /*#__PURE__*/function () {
             api: api,
             chain: chain,
             address: address,
-            currency: getCurrencySelection(asset)
+            currency: getCurrencySelection(chain, asset)
           });
         case 9:
           balance = _context.v;
@@ -11061,13 +11062,13 @@ var getFailureInfo = function getFailureInfo(chains, hops) {
   }
   return {};
 };
-var getXcmFeeInternal = /*#__PURE__*/function () {
+var getXcmFeeOnce = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, useRootOrigin, asset, amount, _yield$getOriginXcmFe, originFeeRaw, originCurrency, originAsset, originFeeType, originDryRunError, originDryRunSubError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destCurrency, destAsset, destFeeType, destDryRunError, destDryRunSubError, destSufficient, destResult, _destApi, destFallback, assetHubChain, processedBridgeHub, bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason, _t, _t2, _t3, _t4;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, useRootOrigin, skipReverseFeeCalculation, asset, amount, _yield$getOriginXcmFe, originFeeRaw, originAsset, originFeeType, originDryRunError, originDryRunSubError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destCurrency, destAsset, destFeeType, destDryRunError, destDryRunSubError, destSufficient, destResult, _destApi, destFallback, assetHubChain, processedBridgeHub, bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason, _t, _t2, _t3, _t4;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, disableFallback = _ref.disableFallback, swapConfig = _ref.swapConfig, useRootOrigin = _ref.useRootOrigin;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, disableFallback = _ref.disableFallback, swapConfig = _ref.swapConfig, useRootOrigin = _ref.useRootOrigin, skipReverseFeeCalculation = _ref.skipReverseFeeCalculation;
           asset = findAssetInfoOrThrow(origin, currency, destination);
           amount = abstractDecimals(currency.amount, asset.decimals, api);
           _context2.n = 1;
@@ -11085,7 +11086,6 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
         case 1:
           _yield$getOriginXcmFe = _context2.v;
           originFeeRaw = _yield$getOriginXcmFe.fee;
-          originCurrency = _yield$getOriginXcmFe.currency;
           originAsset = _yield$getOriginXcmFe.asset;
           originFeeType = _yield$getOriginXcmFe.feeType;
           originDryRunError = _yield$getOriginXcmFe.dryRunError;
@@ -11138,7 +11138,8 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             senderAddress: senderAddress,
             disableFallback: disableFallback,
-            swapConfig: swapConfig
+            swapConfig: swapConfig,
+            skipReverseFeeCalculation: skipReverseFeeCalculation
           });
         case 7:
           destFeeRes = _context2.v;
@@ -11149,7 +11150,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
               feeType: originFeeType
             }), {}, {
               sufficient: sufficientOriginFee,
-              currency: originCurrency,
+              currency: originAsset.symbol,
               asset: originAsset
             }, originDryRunError && {
               dryRunError: originDryRunError
@@ -11222,7 +11223,8 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                       originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
                       disableFallback: disableFallback,
                       hasPassedExchange: hasPassedExchange,
-                      swapConfig: swapConfig
+                      swapConfig: swapConfig,
+                      skipReverseFeeCalculation: skipReverseFeeCalculation
                     });
                   case 1:
                     hopResult = _context.v;
@@ -11300,7 +11302,8 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             senderAddress: senderAddress,
             disableFallback: disableFallback,
-            swapConfig: swapConfig
+            swapConfig: swapConfig,
+            skipReverseFeeCalculation: skipReverseFeeCalculation
           });
         case 14:
           destFallback = _context2.v;
@@ -11372,7 +11375,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             }), sufficientOriginFee !== undefined && {
               sufficient: sufficientOriginFee
             }), {}, {
-              currency: originCurrency,
+              currency: originAsset.symbol,
               asset: originAsset
             }, originDryRunError && {
               dryRunError: originDryRunError
@@ -11417,32 +11420,32 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
       }
     }, _callee2, null, [[5,, 8, 10]]);
   }));
-  return function getXcmFeeInternal(_x) {
+  return function getXcmFeeOnce(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
 
-var getXcmFee = /*#__PURE__*/function () {
+var getXcmFeeInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var buildTx, api, _real$assetHub, _real$bridgeHub, tx, real, forced, _forced, _t;
+    var buildTx, _real$assetHub, _real$bridgeHub, tx, real, forced, _forced, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
-          buildTx = options.buildTx, api = options.api;
+          buildTx = options.buildTx;
           _context.p = 1;
           _context.n = 2;
           return buildTx();
         case 2:
           tx = _context.v;
           _context.n = 3;
-          return getXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
+          return getXcmFeeOnce(_objectSpread2(_objectSpread2({}, options), {}, {
             tx: tx,
             useRootOrigin: false
           }));
         case 3:
           real = _context.v;
           _context.n = 4;
-          return getBypassResultWithRetries(options, getXcmFeeInternal, tx);
+          return getBypassResultWithRetries(options, getXcmFeeOnce, tx);
         case 4:
           forced = _context.v;
           return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, forced), {}, {
@@ -11480,7 +11483,7 @@ var getXcmFee = /*#__PURE__*/function () {
           throw _t;
         case 6:
           _context.n = 7;
-          return getBypassResultWithRetries(options, getXcmFeeInternal);
+          return getBypassResultWithRetries(options, getXcmFeeOnce);
         case 7:
           _forced = _context.v;
           return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, _forced), {}, {
@@ -11507,21 +11510,40 @@ var getXcmFee = /*#__PURE__*/function () {
               });
             })
           }));
-        case 8:
-          _context.p = 8;
-          _context.n = 9;
-          return api.disconnect();
-        case 9:
-          return _context.f(8);
-        case 10:
-          return _context.a(2);
       }
-    }, _callee, null, [[1, 5, 8, 10]]);
+    }, _callee, null, [[1, 5]]);
   }));
-  return function getXcmFee(_x) {
+  return function getXcmFeeInternal(_x) {
     return _ref.apply(this, arguments);
   };
 }();
+var getXcmFee = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var api;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.p = _context2.n) {
+        case 0:
+          api = options.api;
+          _context2.p = 1;
+          _context2.n = 2;
+          return getXcmFeeInternal(options);
+        case 2:
+          return _context2.a(2, _context2.v);
+        case 3:
+          _context2.p = 3;
+          _context2.n = 4;
+          return api.disconnect();
+        case 4:
+          return _context2.f(3);
+        case 5:
+          return _context2.a(2);
+      }
+    }, _callee2, null, [[1,, 3, 5]]);
+  }));
+  return function getXcmFee(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 
 var BRIDGE_FEE_DOT = 682395810n; // 0.068239581 DOT
 var BRIDGE_FEE_KSM = 12016807000n; // 0.012016807 KSM
@@ -11749,9 +11771,18 @@ var send = /*#__PURE__*/function () {
           resolvedAsset = asset !== null && asset !== void 0 ? asset : {
             symbol: 'symbol' in currency ? currency.symbol : undefined
           };
-          finalAsset = Array.isArray(currency) ? _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
+          finalAsset = Array.isArray(currency) ? // TODO: Refactor this
+          // We use a dummy values when overriding with multi-assets
+          // since these values won't be used but need to pass checks
+          _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
             amount: 0n,
-            assetId: '1'
+            assetId: '1',
+            location: {
+              parents: Parents.ZERO,
+              interior: {
+                Here: null
+              }
+            }
           }) : _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
             amount: finalAmount
           });
@@ -11946,7 +11977,7 @@ var buildHopInfo = /*#__PURE__*/function () {
 
 var getTransferInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, buildTx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, amount, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, originFeeAsset, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubChain, builtHops, totalHopFee, destinationInfo, _t;
+    var api, buildTx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, amount, originBalanceFee, originBalance, edOrigin, _yield$getXcmFeeInter, _yield$getXcmFeeInter2, originFee, originFeeCurrency, originFeeAsset, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubChain, builtHops, totalHopFee, destinationInfo, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
@@ -12014,15 +12045,15 @@ var getTransferInfo = /*#__PURE__*/function () {
             disableFallback: false
           });
         case 9:
-          _yield$getXcmFee = _context2.v;
-          _yield$getXcmFee$orig = _yield$getXcmFee.origin;
-          originFee = _yield$getXcmFee$orig.fee;
-          originFeeCurrency = _yield$getXcmFee$orig.currency;
-          originFeeAsset = _yield$getXcmFee$orig.asset;
-          assetHubFeeResult = _yield$getXcmFee.assetHub;
-          bridgeHubFeeResult = _yield$getXcmFee.bridgeHub;
-          destFeeDetail = _yield$getXcmFee.destination;
-          hops = _yield$getXcmFee.hops;
+          _yield$getXcmFeeInter = _context2.v;
+          _yield$getXcmFeeInter2 = _yield$getXcmFeeInter.origin;
+          originFee = _yield$getXcmFeeInter2.fee;
+          originFeeCurrency = _yield$getXcmFeeInter2.currency;
+          originFeeAsset = _yield$getXcmFeeInter2.asset;
+          assetHubFeeResult = _yield$getXcmFeeInter.assetHub;
+          bridgeHubFeeResult = _yield$getXcmFeeInter.bridgeHub;
+          destFeeDetail = _yield$getXcmFeeInter.destination;
+          hops = _yield$getXcmFeeInter.hops;
           isFeeAssetAh = origin === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, originAsset);
           originBalanceAfter = originBalance - amount;
           originBalanceFeeAfter = isFeeAssetAh ? originBalanceFee - amount : originBalanceFee - originFee;
@@ -12392,15 +12423,20 @@ var buildTypeAndThenCall = function buildTypeAndThenCall(_ref, isDotAsset, custo
     reserve = _ref.reserve,
     dest = _ref.dest,
     assetInfo = _ref.assetInfo,
-    version = _ref.options.version;
+    _ref$options = _ref.options,
+    version = _ref$options.version,
+    pallet = _ref$options.pallet,
+    method = _ref$options.method;
   var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : assetInfo.location;
   var finalDest = origin.chain === reserve.chain ? dest.chain : reserve.chain;
   var destLocation = createDestination(version, origin.chain, finalDest, getParaId(finalDest));
   var reserveType = origin.chain === reserve.chain ? 'LocalReserve' : 'DestinationReserve';
   var feeMultiAsset = createAsset(version, assetInfo.amount, isRelayChain(origin.chain) ? localizeLocation(origin.chain, feeAssetLocation) : feeAssetLocation);
+  var module = pallet !== null && pallet !== void 0 ? pallet : isRelayChain(origin.chain) ? 'XcmPallet' : 'PolkadotXcm';
+  var methodName = method !== null && method !== void 0 ? method : 'transfer_assets_using_type_and_then';
   return {
-    module: isRelayChain(origin.chain) ? 'XcmPallet' : 'PolkadotXcm',
-    method: 'transfer_assets_using_type_and_then',
+    module: module,
+    method: methodName,
     parameters: {
       dest: addXcmVersionHeader(destLocation, version),
       assets: addXcmVersionHeader(assets, version),
@@ -12413,130 +12449,76 @@ var buildTypeAndThenCall = function buildTypeAndThenCall(_ref, isDotAsset, custo
   };
 };
 
-var FEE_PADDING_PERCENTAGE = 20;
-var FEE_ETH_ASSET_PADDING_PERCENTAGE = 100;
-var FEE_PADDING_HYDRATION = 500;
-var getPadding = function getPadding(chain, _ref) {
-  var assetInfo = _ref.assetInfo,
-    dest = _ref.dest;
-  var isEthAsset = assetInfo.location && findAssetInfoByLoc(getOtherAssets('Ethereum'), assetInfo.location);
-  if (chain === 'Hydration') return FEE_PADDING_HYDRATION;
-  if (isEthAsset && dest.chain.startsWith('AssetHub')) return FEE_ETH_ASSET_PADDING_PERCENTAGE;
-  return FEE_PADDING_PERCENTAGE;
-};
-var computeInstructionFee = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref2, version, xcm, context) {
-    var chain, api, padding, _t;
+var FEE_PADDING = 30;
+var sumHopFees = function sumHopFees(result, asset) {
+  return result.hops.reduce(function (acc, hop) {
+    // only add if asset is equal
+    return isAssetEqual(hop.result.asset, asset) ? acc + hop.result.fee : acc;
+  }, 0n);
+};
+var computeAllFees = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, buildTx) {
+    var origin, dest, assetInfo, _context$options, senderAddress, address, currency, feeCurrency, result, hopFees, destFee;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          chain = _ref2.chain, api = _ref2.api;
-          padding = getPadding(chain, context);
-          _t = padValueBy;
-          _context.n = 1;
-          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), [], {
-            location: DOT_LOCATION
-          }, true);
-        case 1:
-          return _context.a(2, _t(_context.v, padding));
-      }
-    }, _callee);
-  }));
-  return function computeInstructionFee(_x, _x2, _x3, _x4) {
-    return _ref3.apply(this, arguments);
-  };
-}();
-var computeAllFees = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context, customXcm, isDotAsset, refundInstruction) {
-    var reserve, dest, version, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
-        case 0:
-          reserve = context.reserve, dest = context.dest, version = context.options.version;
-          if (!customXcm.some(function (x) {
-            return 'DepositReserveAsset' in x || 'InitiateTeleport' in x;
-          })) {
-            _context2.n = 6;
+          origin = context.origin, dest = context.dest, assetInfo = context.assetInfo, _context$options = context.options, senderAddress = _context$options.senderAddress, address = _context$options.address, currency = _context$options.currency, feeCurrency = _context$options.feeCurrency;
+          assertSenderAddress(senderAddress);
+          assertAddressIsString(address);
+          if (hasDryRunSupport(context.origin.chain)) {
+            _context.n = 1;
             break;
           }
-          _context2.n = 1;
-          return computeInstructionFee(reserve, version, customXcm, context);
+          return _context.a(2, null);
         case 1:
-          _t3 = _context2.v;
-          if (!refundInstruction) {
-            _context2.n = 3;
-            break;
-          }
-          _context2.n = 2;
-          return computeInstructionFee(reserve, version, [refundInstruction], context);
+          _context.n = 2;
+          return getXcmFeeInternal({
+            api: origin.api,
+            buildTx: buildTx,
+            origin: origin.chain,
+            destination: dest.chain,
+            senderAddress: senderAddress,
+            address: address,
+            currency: currency,
+            feeAsset: feeCurrency,
+            disableFallback: false,
+            skipReverseFeeCalculation: true
+          });
         case 2:
-          _t4 = _context2.v;
-          _context2.n = 4;
-          break;
-        case 3:
-          _t4 = 0n;
-        case 4:
-          _t5 = _t4;
-          _context2.n = 5;
-          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, function () {
-            var instr = customXcm.find(function (j) {
-              return 'DepositReserveAsset' in j || 'InitiateTeleport' in j;
-            });
-            return instr ? 'DepositReserveAsset' in instr ? instr.DepositReserveAsset.xcm : instr.InitiateTeleport.xcm : undefined;
-          }(), context);
-        case 5:
-          _t6 = _context2.v;
-          _t2 = {
-            reserveFee: _t3,
-            refundFee: _t5,
-            destFee: _t6
-          };
-          _context2.n = 13;
-          break;
-        case 6:
-          if (isDotAsset) {
-            _context2.n = 8;
-            break;
-          }
-          _context2.n = 7;
-          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, customXcm, context);
-        case 7:
-          _t7 = _context2.v;
-          _context2.n = 9;
-          break;
-        case 8:
-          _t7 = 0n;
-        case 9:
-          _t8 = _t7;
-          if (isDotAsset) {
-            _context2.n = 11;
-            break;
-          }
-          _context2.n = 10;
-          return computeInstructionFee(hasXcmPaymentApiSupport(reserve.chain) ? reserve : dest, version, [refundInstruction], context);
-        case 10:
-          _t9 = _context2.v;
-          _context2.n = 12;
-          break;
-        case 11:
-          _t9 = 0n;
-        case 12:
-          _t0 = _t9;
-          _t2 = {
-            reserveFee: 0n,
-            destFee: _t8,
-            refundFee: _t0
-          };
-        case 13:
-          return _context2.a(2, _t2);
+          result = _context.v;
+          hopFees = sumHopFees(result, assetInfo);
+          destFee = result.destination.fee;
+          return _context.a(2, {
+            hopFees: padValueBy(hopFees, FEE_PADDING),
+            destFee: padValueBy(destFee, FEE_PADDING)
+          });
       }
-    }, _callee2);
+    }, _callee);
   }));
-  return function computeAllFees(_x5, _x6, _x7, _x8) {
-    return _ref4.apply(this, arguments);
+  return function computeAllFees(_x, _x2) {
+    return _ref.apply(this, arguments);
   };
 }();
 
+var RELAY_ASSET_LOCATIONS = [RELAY_LOCATION, {
+  parents: 2,
+  interior: {
+    X1: [{
+      GlobalConsensus: {
+        Kusama: null
+      }
+    }]
+  }
+}, {
+  parents: 2,
+  interior: {
+    X1: [{
+      GlobalConsensus: {
+        Polkadot: null
+      }
+    }]
+  }
+}];
 var getSubBridgeReserve = function getSubBridgeReserve(chain, destination, location) {
   if (deepEqual(location, RELAY_LOCATION)) return chain;
   return destination;
@@ -12552,29 +12534,27 @@ var resolveReserveChain = function resolveReserveChain(chain, destination, asset
 };
 var createTypeAndThenCallContext = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options, overrideReserve) {
-    var api, destination, assetInfo, destinationChain, isSubBridge, reserveChain, destApi, reserveApi;
+    var api, destination, assetInfo, destinationChain, isSubBridge, reserveChain, isRelayAsset, destApi, reserveApi;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           api = options.api, destination = options.destination, assetInfo = options.assetInfo;
           assertHasLocation(assetInfo);
-          if (!isTLocation(destination)) {
-            _context.n = 1;
-            break;
-          }
-          throw new InvalidParameterError('Cannot override destination when using type and then transfer.');
-        case 1:
+          assertToIsString(destination);
           destinationChain = destination;
           isSubBridge = isSubstrateBridge(chain, destinationChain);
           reserveChain = resolveReserveChain(chain, destinationChain, assetInfo.location, isSubBridge, overrideReserve);
+          isRelayAsset = RELAY_ASSET_LOCATIONS.some(function (loc) {
+            return deepEqual(assetInfo.location, loc);
+          });
           destApi = api.clone();
-          _context.n = 2;
+          _context.n = 1;
           return destApi.init(destinationChain);
-        case 2:
+        case 1:
           reserveApi = reserveChain === chain ? api : reserveChain === destinationChain ? destApi : api.clone();
-          _context.n = 3;
+          _context.n = 2;
           return reserveApi.init(reserveChain);
-        case 3:
+        case 2:
           return _context.a(2, {
             origin: {
               api: api,
@@ -12589,6 +12569,7 @@ var createTypeAndThenCallContext = /*#__PURE__*/function () {
               chain: reserveChain
             },
             isSubBridge: isSubBridge,
+            isRelayAsset: isRelayAsset,
             assetInfo: assetInfo,
             options: options
           });
@@ -12600,26 +12581,37 @@ var createTypeAndThenCallContext = /*#__PURE__*/function () {
   };
 }();
 
-var createCustomXcm = function createCustomXcm(_ref, isDotAsset, assetCount, isForFeeCalc) {
-  var origin = _ref.origin,
-    dest = _ref.dest,
-    reserve = _ref.reserve,
-    isSubBridge = _ref.isSubBridge,
-    assetInfo = _ref.assetInfo,
-    options = _ref.options;
+var resolveBuyExecutionAmount = function resolveBuyExecutionAmount(_ref, isForFeeCalc, _ref2, systemAssetAmount) {
+  var isRelayAsset = _ref.isRelayAsset,
+    assetInfo = _ref.assetInfo;
+  var hopFees = _ref2.hopFees,
+    destFee = _ref2.destFee;
+  if (isForFeeCalc) {
+    // Rough estimates for dummy XCM call, that is later dryRunned
+    return isRelayAsset ? assetInfo.amount / 2n : systemAssetAmount / 2n;
+  }
+  // We have actual fees, calculate exact buy execution amount
+  return isRelayAsset ? assetInfo.amount - hopFees : destFee;
+};
+var createCustomXcm = function createCustomXcm(context, assetCount, isForFeeCalc, systemAssetAmount) {
   var fees = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
-    reserveFee: 0n,
-    refundFee: 0n,
+    hopFees: 0n,
     destFee: 0n
   };
+  var origin = context.origin,
+    dest = context.dest,
+    reserve = context.reserve,
+    isSubBridge = context.isSubBridge,
+    isRelayAsset = context.isRelayAsset,
+    assetInfo = context.assetInfo,
+    options = context.options;
   var destination = options.destination,
     version = options.version,
     address = options.address,
     paraIdTo = options.paraIdTo;
-  var reserveFee = fees.reserveFee,
-    refundFee = fees.refundFee,
+  var hopFees = fees.hopFees,
     destFee = fees.destFee;
-  var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : assetInfo.location;
+  var feeAssetLocation = !isRelayAsset ? RELAY_LOCATION : assetInfo.location;
   var feeLocLocalized = localizeLocation(dest.chain, feeAssetLocation, origin.chain);
   var asset = createAsset(version, assetInfo.amount, localizeLocation(dest.chain, assetInfo.location, origin.chain));
   var depositInstruction = {
@@ -12642,10 +12634,10 @@ var createCustomXcm = function createCustomXcm(_ref, isDotAsset, assetCount, isF
     }
   };
   var assetsFilter = [];
-  if (!isDotAsset) assetsFilter.push(createAsset(version, reserveFee + destFee, localizeLocation(reserve.chain, RELAY_LOCATION)));
+  if (!isRelayAsset) assetsFilter.push(createAsset(version, hopFees + destFee, localizeLocation(reserve.chain, RELAY_LOCATION)));
   assetsFilter.push(createAsset(version, assetInfo.amount, localizeLocation(reserve.chain, assetInfo.location)));
   if (isSubBridge || origin.chain !== reserve.chain && dest.chain !== reserve.chain) {
-    var buyExecutionAmount = !isDotAsset ? destFee : assetInfo.amount - reserveFee - refundFee;
+    var buyExecutionAmount = resolveBuyExecutionAmount(context, isForFeeCalc, fees, systemAssetAmount);
     if (buyExecutionAmount < 0n && !isForFeeCalc) throw new AmountTooLowError();
     var filter = isForFeeCalc ? {
       Wild: 'All'
@@ -12710,63 +12702,166 @@ var buildAssets = function buildAssets(chain, asset, feeAmount, isDotAsset, vers
   assets.push(createAsset(version, asset.amount, isRelayChain(chain) ? localizeLocation(chain, asset.location) : asset.location));
   return assets;
 };
+var DEFAULT_SYSTEM_ASSET_AMOUNT = '1';
+var resolveSystemAssetAmount = function resolveSystemAssetAmount(_ref, isForFeeCalc, fees) {
+  var origin = _ref.origin;
+  if (isForFeeCalc) {
+    var systemAsset = findNativeAssetInfoOrThrow(getRelayChainOf(origin.chain));
+    return parseUnits(DEFAULT_SYSTEM_ASSET_AMOUNT, systemAsset.decimals);
+  }
+  return fees.destFee + fees.hopFees;
+};
+var constructTypeAndThenCall = function constructTypeAndThenCall(context) {
+  var fees = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  var origin = context.origin,
+    assetInfo = context.assetInfo,
+    isSubBridge = context.isSubBridge,
+    isRelayAsset = context.isRelayAsset,
+    _context$options = context.options,
+    senderAddress = _context$options.senderAddress,
+    version = _context$options.version;
+  var assetCount = isRelayAsset ? 1 : 2;
+  var refundInstruction = senderAddress ? createRefundInstruction(origin.api, senderAddress, version, assetCount) : null;
+  var finalCustomXcm = [];
+  if (refundInstruction && !isSubBridge) finalCustomXcm.push(refundInstruction);
+  var resolvedFees = fees !== null && fees !== void 0 ? fees : {
+    hopFees: 0n,
+    destFee: 0n
+  };
+  var isForFeeCalc = fees === null;
+  var systemAssetAmount = resolveSystemAssetAmount(context, isForFeeCalc, resolvedFees);
+  finalCustomXcm.push.apply(finalCustomXcm, _toConsumableArray(createCustomXcm(context, assetCount, isForFeeCalc, systemAssetAmount, resolvedFees)));
+  var assets = buildAssets(origin.chain, assetInfo, systemAssetAmount, isRelayAsset, version);
+  return buildTypeAndThenCall(context, isRelayAsset, finalCustomXcm, assets);
+};
 /**
  * Creates a type and then call for transferring assets using XCM. Works only for DOT and snowbridge assets so far.
  */
 var createTypeAndThenCall = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options, overrideReserve) {
-    var api, senderAddress, version, context, assetInfo, isSubBridge, LOCATIONS, isRelayAsset, assetCount, customXcm, refundInstruction, fees, finalCustomXcm, totalFee, assets;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options, overrideReserve) {
+    var context, origin, assetInfo, fees;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, senderAddress = options.senderAddress, version = options.version;
           _context.n = 1;
           return createTypeAndThenCallContext(chain, options, overrideReserve);
         case 1:
           context = _context.v;
-          assetInfo = context.assetInfo, isSubBridge = context.isSubBridge;
-          LOCATIONS = [RELAY_LOCATION, {
-            parents: 2,
-            interior: {
-              X1: [{
-                GlobalConsensus: {
-                  Kusama: null
-                }
-              }]
-            }
-          }, {
-            parents: 2,
-            interior: {
-              X1: [{
-                GlobalConsensus: {
-                  Polkadot: null
-                }
-              }]
-            }
-          }];
-          isRelayAsset = LOCATIONS.some(function (loc) {
-            return deepEqual(assetInfo.location, loc);
-          });
-          assetCount = isRelayAsset ? 1 : 2;
-          customXcm = createCustomXcm(context, isRelayAsset, assetCount, true);
-          refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version, assetCount) : null;
+          origin = context.origin, assetInfo = context.assetInfo;
           _context.n = 2;
-          return computeAllFees(context, customXcm, isRelayAsset, refundInstruction);
+          return computeAllFees(context, function (amount, relative) {
+            var overridenAmount = amount ? relative ? assetInfo.amount + parseUnits(amount, assetInfo.decimals) : parseUnits(amount, assetInfo.decimals) : assetInfo.amount;
+            return Promise.resolve(origin.api.callTxMethod(constructTypeAndThenCall(_objectSpread2(_objectSpread2({}, context), {}, {
+              assetInfo: _objectSpread2(_objectSpread2({}, assetInfo), {}, {
+                amount: overridenAmount
+              })
+            }))));
+          });
         case 2:
           fees = _context.v;
-          finalCustomXcm = [];
-          if (refundInstruction && !isSubBridge) finalCustomXcm.push(refundInstruction);
-          finalCustomXcm.push.apply(finalCustomXcm, _toConsumableArray(createCustomXcm(context, isRelayAsset, assetCount, false, fees)));
-          totalFee = fees.reserveFee + fees.destFee + fees.refundFee;
-          assets = buildAssets(chain, assetInfo, totalFee, isRelayAsset, version);
-          return _context.a(2, buildTypeAndThenCall(context, isRelayAsset, finalCustomXcm, assets));
+          return _context.a(2, constructTypeAndThenCall(context, fees));
       }
     }, _callee);
   }));
   return function createTypeAndThenCall(_x, _x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var createCallForReserve = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, reserveChain, options) {
+    var api, destination, address, senderAddress, currency, feeCurrency, serialized, tx, dryRunResult, success;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = options.api, destination = options.destination, address = options.address, senderAddress = options.senderAddress, currency = options.currency, feeCurrency = options.feeCurrency;
+          _context.n = 1;
+          return createTypeAndThenCall(chain, options, reserveChain);
+        case 1:
+          serialized = _context.v;
+          assertAddressIsString(address);
+          assertToIsString(destination, 'Location destination is not supported for reserve auto-selection.');
+          assertSenderAddress(senderAddress);
+          tx = api.callTxMethod(serialized);
+          _context.n = 2;
+          return dryRunInternal({
+            api: api,
+            tx: tx,
+            origin: chain,
+            destination: destination,
+            address: address,
+            senderAddress: senderAddress,
+            currency: currency,
+            feeAsset: feeCurrency,
+            useRootOrigin: true
+          });
+        case 2:
+          dryRunResult = _context.v;
+          success = !dryRunResult.failureReason;
+          return _context.a(2, {
+            call: serialized,
+            success: success
+          });
+      }
+    }, _callee);
+  }));
+  return function createCallForReserve(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
+/**
+ * Creates a type-and-then call but auto-selects the asset reserve between AssetHub and the Relay chain
+ * by dry-running both variants and preferring the one that succeeds. If both fail, returns the
+ * AssetHub variant. Supports only relaychain assets.
+ */
+var createTypeThenAutoReserve = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(chain, options) {
+    var originSupports, destSupports, relay, assetHubReserve, ahResult, relayResult;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          // Use dry-run path only when BOTH origin and destination support it
+          originSupports = hasDryRunSupport(chain);
+          destSupports = options.destChain ? hasDryRunSupport(options.destChain) : false;
+          if (originSupports && destSupports) {
+            _context2.n = 2;
+            break;
+          }
+          _context2.n = 1;
+          return createTypeAndThenCall(chain, options);
+        case 1:
+          return _context2.a(2, _context2.v);
+        case 2:
+          relay = getRelayChainOf(chain);
+          assetHubReserve = "AssetHub".concat(relay);
+          _context2.n = 3;
+          return createCallForReserve(chain, assetHubReserve, options);
+        case 3:
+          ahResult = _context2.v;
+          if (!ahResult.success) {
+            _context2.n = 4;
+            break;
+          }
+          return _context2.a(2, ahResult.call);
+        case 4:
+          _context2.n = 5;
+          return createCallForReserve(chain, relay, options);
+        case 5:
+          relayResult = _context2.v;
+          if (!relayResult.success) {
+            _context2.n = 6;
+            break;
+          }
+          return _context2.a(2, relayResult.call);
+        case 6:
+          return _context2.a(2, ahResult.call);
+      }
+    }, _callee2);
+  }));
+  return function createTypeThenAutoReserve(_x4, _x5) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 
 var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
   var _feeResult$assetHub;
@@ -12827,7 +12922,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
         case 5:
           balance = _context.v;
           _context.n = 6;
-          return getXcmFee({
+          return getXcmFeeInternal({
             api: api,
             buildTx: buildTx,
             origin: origin,
@@ -13571,7 +13666,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
         var _options$disableFallb;
         var disableFallback, _yield$this$prepareNo2, normalizedOptions, buildTx, api, from, to, senderAddress, address, currency, feeAsset;
         return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.p = _context8.n) {
+          while (1) switch (_context8.n) {
             case 0:
               disableFallback = (_options$disableFallb = options === null || options === void 0 ? void 0 : options.disableFallback) !== null && _options$disableFallb !== void 0 ? _options$disableFallb : false;
               _context8.n = 1;
@@ -13583,9 +13678,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
               api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, address = normalizedOptions.address, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset;
               assertToIsString(to);
               assertAddressIsString(address);
-              _context8.p = 2;
-              _context8.n = 3;
-              return getXcmFee({
+              return _context8.a(2, getXcmFee({
                 api: api,
                 buildTx: buildTx,
                 origin: from,
@@ -13595,19 +13688,9 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 currency: currency,
                 feeAsset: feeAsset,
                 disableFallback: disableFallback
-              });
-            case 3:
-              return _context8.a(2, _context8.v);
-            case 4:
-              _context8.p = 4;
-              _context8.n = 5;
-              return this.api.disconnect();
-            case 5:
-              return _context8.f(4);
-            case 6:
-              return _context8.a(2);
+              }));
           }
-        }, _callee8, this, [[2,, 4, 6]]);
+        }, _callee8, this);
       }));
       function getXcmFee$1(_x7) {
         return _getXcmFee2.apply(this, arguments);
@@ -14022,4 +14105,4 @@ var Builder = function Builder(api) {
   return new GeneralBuilder(api, new BatchTransactionManager());
 };
 
-export { AmountTooLowError, AssetClaimBuilder, AssetsPallet, BatchMode, BridgeHaltedError, Builder, ChainNotSupportedError, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleChainsError, InvalidAddressError, InvalidParameterError, MissingChainApiError, NoXCMSupportImplementedError, PolkadotXcmError, PolkadotXcmExecutionError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, applyDecimalAbstraction, assertAddressIsString, assertHasId, assertHasLocation, assertIsForeign, assertSenderAddress, assertToIsString, blake2b256, blake2b512, calcPreviewMintAmount, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, computeOverridenAmount, convertSs58, createAsset, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createChainClient, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createTx, createTypeAndThenCall, createVersionedAssets, createX1Payload, deriveAccountId, dryRun, dryRunInternal, dryRunOrigin, encodeSs58, formatUnits, getAssetBalance, getAssetBalanceInternal, getAssetReserveChain, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChain, getChainConfig, getChainLocation, getChainProviders, getChainVersion, getCurrencySelection, getFailureInfo$1 as getFailureInfo, getMinTransferableAmount, getMinTransferableAmountInternal, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getOriginXcmFeeInternal, getParaEthTransferFees, getParaId, getRelayChainOf, getTChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, getXcmFeeInternal, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, localizeLocation, maybeOverrideAsset, maybeOverrideAssets, normalizeAmount, overrideTxAmount, padFee, padValueBy, parseUnits, resolveDestChain, resolveModuleError, resolveParaId, reverseTransformLocation, send, sortAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, validateAssetSpecifiers, validateCurrency, validateDestination, verifyEdOnDestination, wrapTxBypass };
+export { AmountTooLowError, AssetClaimBuilder, AssetsPallet, BatchMode, BridgeHaltedError, Builder, ChainNotSupportedError, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleChainsError, InvalidAddressError, InvalidParameterError, MissingChainApiError, NoXCMSupportImplementedError, PolkadotXcmError, PolkadotXcmExecutionError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, applyDecimalAbstraction, assertAddressIsString, assertHasId, assertHasLocation, assertIsForeign, assertSenderAddress, assertToIsString, blake2b256, blake2b512, calcPreviewMintAmount, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, computeOverridenAmount, constructTypeAndThenCall, convertSs58, createAsset, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createChainClient, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createTx, createTypeAndThenCall, createTypeThenAutoReserve, createVersionedAssets, createX1Payload, deriveAccountId, dryRun, dryRunInternal, dryRunOrigin, encodeSs58, formatUnits, getAssetBalance, getAssetBalanceInternal, getAssetReserveChain, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChain, getChainConfig, getChainLocation, getChainProviders, getChainVersion, getCurrencySelection, getFailureInfo$1 as getFailureInfo, getMinTransferableAmount, getMinTransferableAmountInternal, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getOriginXcmFeeInternal, getParaEthTransferFees, getParaId, getRelayChainOf, getTChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, getXcmFeeInternal, getXcmFeeOnce, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, localizeLocation, maybeOverrideAsset, maybeOverrideAssets, normalizeAmount, overrideTxAmount, padFee, padValueBy, parseUnits, resolveDestChain, resolveModuleError, resolveParaId, reverseTransformLocation, send, sortAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, validateAssetSpecifiers, validateCurrency, validateDestination, verifyEdOnDestination, wrapTxBypass };