@paraspell/sdk-core 10.10.5 → 10.10.7

package/dist/index.cjs

@@ -695,7 +695,7 @@ var DOT_MULTILOCATION = {
   parents: sdkCommon.Parents.ONE,
   interior: 'Here'
 };
-var CHAINS_DOT_RESERVE_AH = new Set(['Polimec', 'Moonbeam', 'BifrostPolkadot', 'PeoplePolkadot', 'Ajuna']);
+var CHAINS_DOT_RESERVE_AH = new Set(['Polimec', 'Moonbeam', 'AssetHubPolkadot', 'AssetHubKusama', 'AssetHubWestend', 'AssetHubPaseo', 'BifrostPolkadot', 'BifrostKusama', 'PeoplePolkadot', 'PeopleKusama', 'Ajuna']);
 var ASSET_HUB_EXECUTION_FEE = 2200000000n; // 0.22 DOT
 var TX_CLIENT_TIMEOUT_MS = 20 * 60 * 1000; // 20 minutes
 var DRY_RUN_CLIENT_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
@@ -2826,14 +2826,17 @@ var createBeneficiaryLocation = function createBeneficiaryLocation(_ref2) {
   };
 };
 
-var getChainLocation = function getChainLocation(chain) {
-  var interior = chain === 'Polkadot' ? 'Here' : {
+var getChainLocation = function getChainLocation(chain, destChain) {
+  var fromRelay = sdkCommon.isRelayChain(chain);
+  var toRelay = sdkCommon.isRelayChain(destChain);
+  var parents = fromRelay ? sdkCommon.Parents.ZERO : sdkCommon.Parents.ONE;
+  var interior = toRelay ? 'Here' : {
     X1: [{
-      Parachain: getParaId(chain)
+      Parachain: getParaId(destChain)
     }]
   };
   return {
-    parents: sdkCommon.Parents.ONE,
+    parents: parents,
     interior: interior
   };
 };
@@ -3106,15 +3109,15 @@ var getTNode = function getTNode(paraId, ecosystem) {
   })) !== null && _NODE_NAMES_DOT_KSM$f !== void 0 ? _NODE_NAMES_DOT_KSM$f : null;
 };
 
-var getAssetReserveChain = function getAssetReserveChain(origin, assetLocation) {
+var getAssetReserveChain = function getAssetReserveChain(chain, destChain, assetLocation) {
   var hasGlobalConsensusJunction = sdkCommon.hasJunction(assetLocation, 'GlobalConsensus');
   var paraId = sdkCommon.getJunctionValue(assetLocation, 'Parachain');
   if (paraId) {
-    var chain = getTNode(paraId, getRelayChainOf(origin).toLowerCase());
-    if (!chain) {
+    var resolvedChain = getTNode(paraId, getRelayChainOf(chain).toLowerCase());
+    if (!resolvedChain) {
       throw new InvalidParameterError("Chain with paraId ".concat(paraId, " not found"));
     }
-    return chain;
+    return resolvedChain;
   }
   if (hasGlobalConsensusJunction) {
     return 'AssetHubPolkadot';
@@ -3125,9 +3128,9 @@ var getAssetReserveChain = function getAssetReserveChain(origin, assetLocation)
       Here: null
     }
   })) {
-    return CHAINS_DOT_RESERVE_AH.has(origin) ? 'AssetHubPolkadot' : 'Polkadot';
+    return CHAINS_DOT_RESERVE_AH.has(destChain) ? 'AssetHubPolkadot' : 'Polkadot';
   }
-  return origin;
+  return chain;
 };
 
 var prepareExecuteContext = function prepareExecuteContext(_ref) {
@@ -3140,7 +3143,7 @@ var prepareExecuteContext = function prepareExecuteContext(_ref) {
   assertHasLocation(asset);
   if (feeAsset) assertHasLocation(feeAsset);
   var amount = BigInt(asset.amount);
-  var reserveChain = getAssetReserveChain(chain, asset.multiLocation);
+  var reserveChain = getAssetReserveChain(chain, destChain, asset.multiLocation);
   var multiAsset = createMultiAsset(version, amount, asset.multiLocation);
   var multiAssetLocalized = createMultiAsset(version, amount, localizeLocation(chain, asset.multiLocation));
   var multiAssetLocalizedToDest = createMultiAsset(version, amount, localizeLocation(destChain, asset.multiLocation));
@@ -3238,7 +3241,7 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
       mainInstructions = [{
         InitiateTeleport: {
           assets: createAssetsFilter(multiAssetLocalized),
-          dest: getChainLocation(reserveChain),
+          dest: getChainLocation(chain, reserveChain),
           xcm: [{
             BuyExecution: {
               fees: updateAsset(multiAssetLocalizedToReserve, feeMultiAsset ? amount : amount - originFee),
@@ -3253,7 +3256,7 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
       mainInstructions = [{
         InitiateReserveWithdraw: {
           assets: createAssetsFilter(multiAssetLocalized),
-          reserve: getChainLocation(reserveChain),
+          reserve: getChainLocation(chain, reserveChain),
           xcm: [{
             BuyExecution: {
               fees:
@@ -4899,7 +4902,7 @@ function _traverseXcmHops() {
           _context2.n = 4;
           return hopApi.init(nextChain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 4:
-          isDestination = nextChain === destination || sdkCommon.isRelayChain(nextChain) && !sdkCommon.isRelayChain(destination);
+          isDestination = nextChain === destination;
           isAssetHub = nextChain === assetHubNode;
           isBridgeHub = nextChain === bridgeHubNode;
           _context2.n = 5;
@@ -7001,18 +7004,18 @@ var createExchangeInstructions = /*#__PURE__*/function () {
 }();
 var createSwapExecuteXcm = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, chain, exchangeChain, destChain, assetFrom, assetTo, _options$fees2, originReserveFee, exchangeFee, destReserveFee, recipientAddress, version, paraIdTo, multiAssetFrom, multiAssetTo, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, finalXcm, fullXcm;
+    var api, chain, exchangeChain, destChain, assetFrom, assetTo, _options$fees2, originReserveFee, exchangeFee, destReserveFee, recipientAddress, version, paraIdTo, multiAssetFrom, amountOut, multiAssetTo, multiAssetToLocalizedToDest, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, finalXcm, fullXcm;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
           api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetFrom = options.assetFrom, assetTo = options.assetTo, _options$fees2 = options.fees, originReserveFee = _options$fees2.originReserveFee, exchangeFee = _options$fees2.exchangeFee, destReserveFee = _options$fees2.destReserveFee, recipientAddress = options.recipientAddress, version = options.version, paraIdTo = options.paraIdTo;
           assertHasLocation(assetFrom);
           assertHasLocation(assetTo);
-          multiAssetFrom = createMultiAsset(version, BigInt(assetFrom.amount), localizeLocation(exchangeChain, assetFrom.multiLocation));
-          multiAssetTo = createMultiAsset(version,
-          // Exchange fee 0n means we are creating a dummy tx
+          multiAssetFrom = createMultiAsset(version, BigInt(assetFrom.amount), localizeLocation(exchangeChain, assetFrom.multiLocation)); // Exchange fee 0n means we are creating a dummy tx
           // Set want to 1000n to prevent NoDeal
-          exchangeFee === 0n ? 1000n : BigInt(assetTo.amount), localizeLocation(exchangeChain, assetTo.multiLocation));
+          amountOut = chain && exchangeFee === 0n ? 1000n : BigInt(assetTo.amount);
+          multiAssetTo = createMultiAsset(version, amountOut, localizeLocation(exchangeChain, assetTo.multiLocation));
+          multiAssetToLocalizedToDest = createMultiAsset(version, amountOut, localizeLocation(destChain !== null && destChain !== void 0 ? destChain : exchangeChain, assetTo.multiLocation));
           _prepareCommonExecute = prepareCommonExecuteXcm({
             api: api,
             chain: chain !== null && chain !== void 0 ? chain : exchangeChain,
@@ -7025,7 +7028,7 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
               reserveFee: originReserveFee
             },
             version: version
-          }, multiAssetTo), prefix = _prepareCommonExecute.prefix, depositInstruction = _prepareCommonExecute.depositInstruction;
+          }, multiAssetToLocalizedToDest), prefix = _prepareCommonExecute.prefix, depositInstruction = _prepareCommonExecute.depositInstruction;
           _context2.n = 1;
           return createExchangeInstructions(options, multiAssetFrom, multiAssetTo);
         case 1:
@@ -7042,7 +7045,7 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
               reserveFee: destReserveFee
             },
             suffixXcm: [depositInstruction]
-          }) : [];
+          }) : [depositInstruction];
           finalXcm = chain ? createBaseExecuteXcm({
             chain: chain,
             destChain: exchangeChain,
@@ -7067,7 +7070,7 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
 }();
 
 var MIN_FEE = 1000n;
-var FEE_PADDING_PERCENTAGE = 40;
+var FEE_PADDING_PERCENTAGE = 20;
 var validateAmount = function validateAmount(amount, requiredFee) {
   if (amount <= requiredFee) {
     throw new InvalidParameterError("Asset amount is too low, please increase the amount or use a different fee asset.");
@@ -7183,8 +7186,8 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
   return fees;
 };
 var createXcmAndCall = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var xcm, api, chain, exchangeChain, weight, call;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, dryRunWeight) {
+    var xcm, api, chain, exchangeChain, hasApiSupport, weight, call, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -7193,10 +7196,21 @@ var createXcmAndCall = /*#__PURE__*/function () {
         case 1:
           xcm = _context2.v;
           api = options.api, chain = options.chain, exchangeChain = options.exchangeChain;
+          hasApiSupport = assets.hasXcmPaymentApiSupport(chain !== null && chain !== void 0 ? chain : exchangeChain);
+          if (!hasApiSupport) {
+            _context2.n = 3;
+            break;
+          }
           _context2.n = 2;
           return api.getXcmWeight(xcm);
         case 2:
-          weight = _context2.v;
+          _t = _context2.v;
+          _context2.n = 4;
+          break;
+        case 3:
+          _t = dryRunWeight !== null && dryRunWeight !== void 0 ? dryRunWeight : MAX_WEIGHT;
+        case 4:
+          weight = _t;
           call = createExecuteCall(chain !== null && chain !== void 0 ? chain : exchangeChain, xcm, weight);
           return _context2.a(2, {
             xcm: xcm,
@@ -7206,7 +7220,7 @@ var createXcmAndCall = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function createXcmAndCall(_x2) {
+  return function createXcmAndCall(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -7315,7 +7329,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: updatedAssetTo,
             fees: extractedFees
-          }));
+          }), firstDryRunResult.origin.success ? firstDryRunResult.origin.weight : undefined);
         case 9:
           _yield$createXcmAndCa2 = _context3.v;
           secondCall = _yield$createXcmAndCa2.call;
@@ -7353,7 +7367,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: finalAssetTo,
             fees: finalFees
-          }));
+          }), secondDryRunResult.origin.success ? secondDryRunResult.origin.weight : undefined);
         case 12:
           _yield$createXcmAndCa3 = _context3.v;
           finalCall = _yield$createXcmAndCa3.call;
@@ -7363,7 +7377,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function handleSwapExecuteTransfer(_x3) {
+  return function handleSwapExecuteTransfer(_x4) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -12058,6 +12072,8 @@ exports.handleToAhTeleport = handleToAhTeleport;
 exports.localizeLocation = localizeLocation;
 exports.maybeOverrideMultiAsset = maybeOverrideMultiAsset;
 exports.maybeOverrideMultiAssets = maybeOverrideMultiAssets;
+exports.padFee = padFee;
+exports.padFeeBy = padFeeBy;
 exports.resolveModuleError = resolveModuleError;
 exports.resolveParaId = resolveParaId;
 exports.reverseTransformMultiLocation = reverseTransformMultiLocation;

package/dist/index.d.ts

@@ -1982,6 +1982,9 @@ declare const getXcmFee: <TApi, TRes, TDisableFallback extends boolean>({ api, t
 
 declare const getXcmFeeEstimate: <TApi, TRes>(options: TGetXcmFeeEstimateOptions<TApi, TRes>) => Promise<TGetXcmFeeEstimateResult>;
 
+declare const padFee: (raw: bigint, origin: TNodeDotKsmWithRelayChains, dest: TNodeWithRelayChains, side: "origin" | "destination") => bigint;
+declare const padFeeBy: (amount: bigint, percent: number) => bigint;
+
 declare const getBridgeStatus: <TApi, TRes>(api: IPolkadotApi<TApi, TRes>) => Promise<TBridgeStatus>;
 
 declare const send: <TApi, TRes>(options: TSendOptions<TApi, TRes>) => Promise<TRes>;
@@ -2025,7 +2028,7 @@ declare const createBeneficiaryLocation: <TApi, TRes>({ api, address: recipientA
 
 declare const createX1Payload: (version: Version, junction: TJunction) => TJunctions;
 
-declare const getChainLocation: (chain: TNodeWithRelayChains) => TMultiLocation;
+declare const getChainLocation: (chain: TNodeWithRelayChains, destChain: TNodeWithRelayChains) => TMultiLocation;
 
 /**
  * This function localizes a multiLocation by removing the `Parachain` junction
@@ -2077,5 +2080,5 @@ declare const handleToAhTeleport: <TApi, TRes>(origin: TNodePolkadotKusama, inpu
 
 declare const validateAddress: (address: TAddress, node: TNodeWithRelayChains, isDestination?: boolean) => void;
 
-export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, addEthereumBridgeFees, addXcmVersionHeader, assertAddressIsString, assertHasLocation, assertToIsString, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createMultiAsset, createVersionedMultiAssets, createX1Payload, deriveAccountId, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChainLocation, getChainVersion, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getRelayChainOf, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, localizeLocation, maybeOverrideMultiAsset, maybeOverrideMultiAssets, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, sortMultiAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, addEthereumBridgeFees, addXcmVersionHeader, assertAddressIsString, assertHasLocation, assertToIsString, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createMultiAsset, createVersionedMultiAssets, createX1Payload, deriveAccountId, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChainLocation, getChainVersion, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getRelayChainOf, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, localizeLocation, maybeOverrideMultiAsset, maybeOverrideMultiAssets, padFee, padFeeBy, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, sortMultiAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, verifyEdOnDestination };
 export type { HopProcessParams, HopTraversalConfig, HopTraversalResult, IPolkadotApi, IPolkadotXCMTransfer, IXTokensTransfer, IXTransferTransfer, OneKey, TAddress, TApiOrUrl, TAssetClaimOptions, TAssetClaimOptionsBase, TBalanceResponse, TBatchOptions, TBifrostToken, TBridgeStatus, TConditionalXcmFeeDetail, TConditionalXcmFeeHopInfo, TCreateBaseSwapXcmOptions, TCreateBaseTransferXcmOptions, TCreateBeneficiaryOptions, TCreateBeneficiaryXTokensOptions, TCreateSwapXcmInternalOptions, TCreateSwapXcmOptions, TCreateTransferXcmOptions, TDestWeight, TDestXcmFeeDetail, TDestination, TDryRunBaseOptions, TDryRunCallBaseOptions, TDryRunCallOptions, TDryRunChain, TDryRunNodeFailure, TDryRunNodeResult, TDryRunNodeResultInternal, TDryRunNodeSuccess, TDryRunOptions, TDryRunResult, TDryRunXcmBaseOptions, TDryRunXcmOptions, TEdJsonMap, TEvmBuilderOptions, TEvmBuilderOptionsBase, TEvmNodeFrom, TFeeType, TForeignAssetId, TForeignOrNativeAsset, TForeignOrTokenAsset, TGetAssetBalanceOptions, TGetAssetBalanceOptionsBase, TGetBalanceForeignOptions, TGetBalanceForeignOptionsBase, TGetBalanceNativeOptions, TGetBalanceNativeOptionsBase, TGetFeeForDestNodeBaseOptions, TGetFeeForDestNodeOptions, TGetMaxForeignTransferableAmountOptions, TGetMaxForeignTransferableAmountOptionsBase, TGetMaxNativeTransferableAmountOptions, TGetMaxNativeTransferableAmountOptionsBase, TGetOriginFeeDetailsOptions, TGetOriginFeeDetailsOptionsBase, TGetOriginXcmFeeBaseOptions, TGetOriginXcmFeeEstimateOptions, TGetOriginXcmFeeOptions, TGetReverseTxFeeOptions, TGetTransferInfoOptions, TGetTransferInfoOptionsBase, TGetTransferableAmountOptions, TGetTransferableAmountOptionsBase, TGetXcmFeeBaseOptions, TGetXcmFeeBuilderOptions, TGetXcmFeeEstimateDetail, TGetXcmFeeEstimateOptions, TGetXcmFeeEstimateResult, TGetXcmFeeOptions, TGetXcmFeeResult, THopInfo, THopTransferInfo, THubKey, TMantaAsset, TModuleError, TNativeTokenAsset, TNodeConfig, TNodeConfigMap, TNodleAsset, TOriginFeeDetails, TOtherReserveAsset, TPolkadotXCMTransferOptions, TPolkadotXcmMethod, TProviderEntry, TRelayToParaDestination, TRelayToParaOptions, TRelayToParaOverrides, TReserveAsset, TScenario, TSelfReserveAsset, TSendBaseOptions, TSendBaseOptionsWithSenderAddress, TSendInternalOptions, TSendOptions, TSerializeEthTransferOptions, TSerializedApiCall, TSerializedEthTransfer, TSwapFeeEstimates, TTransferFeeEstimates, TTransferInfo, TTransferLocalOptions, TVerifyEdOnDestinationOptions, TVerifyEdOnDestinationOptionsBase, TWeight, TXTokensCurrencySelection, TXTokensMethod, TXTokensTransferOptions, TXTransferMethod, TXTransferTransferOptions, TXcmAsset, TXcmFeeBase, TXcmFeeChain, TXcmFeeDetail, TXcmFeeDetailWithFallback, TXcmFeeHopInfo, TXcmForeignAsset, TXcmPalletMethod, TXcmVersioned, TZeitgeistAsset, WithApi, WithRequiredSenderAddress, XcmFeeHopResult };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isNodeEvm, getAssetsObject, InvalidCurrencyError, getNativeAssetSymbol, getOtherAssets, extractMultiAssetLoc, isAssetEqual, isForeignAsset, findAssetForNodeOrThrow, getExistentialDeposit, findAsset, isTMultiAsset, getExistentialDepositOrThrow, isSymbolMatch, hasDryRunSupport, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, findAssetOnDestOrThrow, hasSupportForAsset, getRelayChainSymbol, isSymbolSpecifier, normalizeMultiLocation, normalizeSymbol, getAssetId, getNativeAssets } from '@paraspell/assets';
+import { isNodeEvm, getAssetsObject, InvalidCurrencyError, getNativeAssetSymbol, getOtherAssets, extractMultiAssetLoc, isAssetEqual, isForeignAsset, findAssetForNodeOrThrow, getExistentialDeposit, findAsset, isTMultiAsset, getExistentialDepositOrThrow, isSymbolMatch, hasDryRunSupport, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, findAssetOnDestOrThrow, hasSupportForAsset, getRelayChainSymbol, isSymbolSpecifier, normalizeMultiLocation, normalizeSymbol, hasXcmPaymentApiSupport, getAssetId, getNativeAssets } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, createPublicClient, http, getContract } from 'viem';
@@ -696,7 +696,7 @@ var DOT_MULTILOCATION = {
   parents: Parents.ONE,
   interior: 'Here'
 };
-var CHAINS_DOT_RESERVE_AH = new Set(['Polimec', 'Moonbeam', 'BifrostPolkadot', 'PeoplePolkadot', 'Ajuna']);
+var CHAINS_DOT_RESERVE_AH = new Set(['Polimec', 'Moonbeam', 'AssetHubPolkadot', 'AssetHubKusama', 'AssetHubWestend', 'AssetHubPaseo', 'BifrostPolkadot', 'BifrostKusama', 'PeoplePolkadot', 'PeopleKusama', 'Ajuna']);
 var ASSET_HUB_EXECUTION_FEE = 2200000000n; // 0.22 DOT
 var TX_CLIENT_TIMEOUT_MS = 20 * 60 * 1000; // 20 minutes
 var DRY_RUN_CLIENT_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
@@ -2827,14 +2827,17 @@ var createBeneficiaryLocation = function createBeneficiaryLocation(_ref2) {
   };
 };
 
-var getChainLocation = function getChainLocation(chain) {
-  var interior = chain === 'Polkadot' ? 'Here' : {
+var getChainLocation = function getChainLocation(chain, destChain) {
+  var fromRelay = isRelayChain(chain);
+  var toRelay = isRelayChain(destChain);
+  var parents = fromRelay ? Parents.ZERO : Parents.ONE;
+  var interior = toRelay ? 'Here' : {
     X1: [{
-      Parachain: getParaId(chain)
+      Parachain: getParaId(destChain)
     }]
   };
   return {
-    parents: Parents.ONE,
+    parents: parents,
     interior: interior
   };
 };
@@ -3107,15 +3110,15 @@ var getTNode = function getTNode(paraId, ecosystem) {
   })) !== null && _NODE_NAMES_DOT_KSM$f !== void 0 ? _NODE_NAMES_DOT_KSM$f : null;
 };
 
-var getAssetReserveChain = function getAssetReserveChain(origin, assetLocation) {
+var getAssetReserveChain = function getAssetReserveChain(chain, destChain, assetLocation) {
   var hasGlobalConsensusJunction = hasJunction(assetLocation, 'GlobalConsensus');
   var paraId = getJunctionValue(assetLocation, 'Parachain');
   if (paraId) {
-    var chain = getTNode(paraId, getRelayChainOf(origin).toLowerCase());
-    if (!chain) {
+    var resolvedChain = getTNode(paraId, getRelayChainOf(chain).toLowerCase());
+    if (!resolvedChain) {
       throw new InvalidParameterError("Chain with paraId ".concat(paraId, " not found"));
     }
-    return chain;
+    return resolvedChain;
   }
   if (hasGlobalConsensusJunction) {
     return 'AssetHubPolkadot';
@@ -3126,9 +3129,9 @@ var getAssetReserveChain = function getAssetReserveChain(origin, assetLocation)
       Here: null
     }
   })) {
-    return CHAINS_DOT_RESERVE_AH.has(origin) ? 'AssetHubPolkadot' : 'Polkadot';
+    return CHAINS_DOT_RESERVE_AH.has(destChain) ? 'AssetHubPolkadot' : 'Polkadot';
   }
-  return origin;
+  return chain;
 };
 
 var prepareExecuteContext = function prepareExecuteContext(_ref) {
@@ -3141,7 +3144,7 @@ var prepareExecuteContext = function prepareExecuteContext(_ref) {
   assertHasLocation(asset);
   if (feeAsset) assertHasLocation(feeAsset);
   var amount = BigInt(asset.amount);
-  var reserveChain = getAssetReserveChain(chain, asset.multiLocation);
+  var reserveChain = getAssetReserveChain(chain, destChain, asset.multiLocation);
   var multiAsset = createMultiAsset(version, amount, asset.multiLocation);
   var multiAssetLocalized = createMultiAsset(version, amount, localizeLocation(chain, asset.multiLocation));
   var multiAssetLocalizedToDest = createMultiAsset(version, amount, localizeLocation(destChain, asset.multiLocation));
@@ -3239,7 +3242,7 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
       mainInstructions = [{
         InitiateTeleport: {
           assets: createAssetsFilter(multiAssetLocalized),
-          dest: getChainLocation(reserveChain),
+          dest: getChainLocation(chain, reserveChain),
           xcm: [{
             BuyExecution: {
               fees: updateAsset(multiAssetLocalizedToReserve, feeMultiAsset ? amount : amount - originFee),
@@ -3254,7 +3257,7 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
       mainInstructions = [{
         InitiateReserveWithdraw: {
           assets: createAssetsFilter(multiAssetLocalized),
-          reserve: getChainLocation(reserveChain),
+          reserve: getChainLocation(chain, reserveChain),
           xcm: [{
             BuyExecution: {
               fees:
@@ -4900,7 +4903,7 @@ function _traverseXcmHops() {
           _context2.n = 4;
           return hopApi.init(nextChain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 4:
-          isDestination = nextChain === destination || isRelayChain(nextChain) && !isRelayChain(destination);
+          isDestination = nextChain === destination;
           isAssetHub = nextChain === assetHubNode;
           isBridgeHub = nextChain === bridgeHubNode;
           _context2.n = 5;
@@ -7002,18 +7005,18 @@ var createExchangeInstructions = /*#__PURE__*/function () {
 }();
 var createSwapExecuteXcm = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, chain, exchangeChain, destChain, assetFrom, assetTo, _options$fees2, originReserveFee, exchangeFee, destReserveFee, recipientAddress, version, paraIdTo, multiAssetFrom, multiAssetTo, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, finalXcm, fullXcm;
+    var api, chain, exchangeChain, destChain, assetFrom, assetTo, _options$fees2, originReserveFee, exchangeFee, destReserveFee, recipientAddress, version, paraIdTo, multiAssetFrom, amountOut, multiAssetTo, multiAssetToLocalizedToDest, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, finalXcm, fullXcm;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
           api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetFrom = options.assetFrom, assetTo = options.assetTo, _options$fees2 = options.fees, originReserveFee = _options$fees2.originReserveFee, exchangeFee = _options$fees2.exchangeFee, destReserveFee = _options$fees2.destReserveFee, recipientAddress = options.recipientAddress, version = options.version, paraIdTo = options.paraIdTo;
           assertHasLocation(assetFrom);
           assertHasLocation(assetTo);
-          multiAssetFrom = createMultiAsset(version, BigInt(assetFrom.amount), localizeLocation(exchangeChain, assetFrom.multiLocation));
-          multiAssetTo = createMultiAsset(version,
-          // Exchange fee 0n means we are creating a dummy tx
+          multiAssetFrom = createMultiAsset(version, BigInt(assetFrom.amount), localizeLocation(exchangeChain, assetFrom.multiLocation)); // Exchange fee 0n means we are creating a dummy tx
           // Set want to 1000n to prevent NoDeal
-          exchangeFee === 0n ? 1000n : BigInt(assetTo.amount), localizeLocation(exchangeChain, assetTo.multiLocation));
+          amountOut = chain && exchangeFee === 0n ? 1000n : BigInt(assetTo.amount);
+          multiAssetTo = createMultiAsset(version, amountOut, localizeLocation(exchangeChain, assetTo.multiLocation));
+          multiAssetToLocalizedToDest = createMultiAsset(version, amountOut, localizeLocation(destChain !== null && destChain !== void 0 ? destChain : exchangeChain, assetTo.multiLocation));
           _prepareCommonExecute = prepareCommonExecuteXcm({
             api: api,
             chain: chain !== null && chain !== void 0 ? chain : exchangeChain,
@@ -7026,7 +7029,7 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
               reserveFee: originReserveFee
             },
             version: version
-          }, multiAssetTo), prefix = _prepareCommonExecute.prefix, depositInstruction = _prepareCommonExecute.depositInstruction;
+          }, multiAssetToLocalizedToDest), prefix = _prepareCommonExecute.prefix, depositInstruction = _prepareCommonExecute.depositInstruction;
           _context2.n = 1;
           return createExchangeInstructions(options, multiAssetFrom, multiAssetTo);
         case 1:
@@ -7043,7 +7046,7 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
               reserveFee: destReserveFee
             },
             suffixXcm: [depositInstruction]
-          }) : [];
+          }) : [depositInstruction];
           finalXcm = chain ? createBaseExecuteXcm({
             chain: chain,
             destChain: exchangeChain,
@@ -7068,7 +7071,7 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
 }();
 
 var MIN_FEE = 1000n;
-var FEE_PADDING_PERCENTAGE = 40;
+var FEE_PADDING_PERCENTAGE = 20;
 var validateAmount = function validateAmount(amount, requiredFee) {
   if (amount <= requiredFee) {
     throw new InvalidParameterError("Asset amount is too low, please increase the amount or use a different fee asset.");
@@ -7184,8 +7187,8 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
   return fees;
 };
 var createXcmAndCall = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var xcm, api, chain, exchangeChain, weight, call;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, dryRunWeight) {
+    var xcm, api, chain, exchangeChain, hasApiSupport, weight, call, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -7194,10 +7197,21 @@ var createXcmAndCall = /*#__PURE__*/function () {
         case 1:
           xcm = _context2.v;
           api = options.api, chain = options.chain, exchangeChain = options.exchangeChain;
+          hasApiSupport = hasXcmPaymentApiSupport(chain !== null && chain !== void 0 ? chain : exchangeChain);
+          if (!hasApiSupport) {
+            _context2.n = 3;
+            break;
+          }
           _context2.n = 2;
           return api.getXcmWeight(xcm);
         case 2:
-          weight = _context2.v;
+          _t = _context2.v;
+          _context2.n = 4;
+          break;
+        case 3:
+          _t = dryRunWeight !== null && dryRunWeight !== void 0 ? dryRunWeight : MAX_WEIGHT;
+        case 4:
+          weight = _t;
           call = createExecuteCall(chain !== null && chain !== void 0 ? chain : exchangeChain, xcm, weight);
           return _context2.a(2, {
             xcm: xcm,
@@ -7207,7 +7221,7 @@ var createXcmAndCall = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function createXcmAndCall(_x2) {
+  return function createXcmAndCall(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -7316,7 +7330,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: updatedAssetTo,
             fees: extractedFees
-          }));
+          }), firstDryRunResult.origin.success ? firstDryRunResult.origin.weight : undefined);
         case 9:
           _yield$createXcmAndCa2 = _context3.v;
           secondCall = _yield$createXcmAndCa2.call;
@@ -7354,7 +7368,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: finalAssetTo,
             fees: finalFees
-          }));
+          }), secondDryRunResult.origin.success ? secondDryRunResult.origin.weight : undefined);
         case 12:
           _yield$createXcmAndCa3 = _context3.v;
           finalCall = _yield$createXcmAndCa3.call;
@@ -7364,7 +7378,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function handleSwapExecuteTransfer(_x3) {
+  return function handleSwapExecuteTransfer(_x4) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -11985,4 +11999,4 @@ var Builder = function Builder(api) {
   return new GeneralBuilder(api, new BatchTransactionManager());
 };
 
-export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, addEthereumBridgeFees, addXcmVersionHeader, assertAddressIsString, assertHasLocation, assertToIsString, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createMultiAsset, createVersionedMultiAssets, createX1Payload, deriveAccountId, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChainLocation, getChainVersion, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getRelayChainOf, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, localizeLocation, maybeOverrideMultiAsset, maybeOverrideMultiAssets, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, sortMultiAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, addEthereumBridgeFees, addXcmVersionHeader, assertAddressIsString, assertHasLocation, assertToIsString, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createDirectExecuteXcm, createExecuteCall, createExecuteExchangeXcm, createMultiAsset, createVersionedMultiAssets, createX1Payload, deriveAccountId, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getChainLocation, getChainVersion, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getRelayChainOf, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, localizeLocation, maybeOverrideMultiAsset, maybeOverrideMultiAssets, padFee, padFeeBy, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, sortMultiAssets, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, traverseXcmHops, validateAddress, verifyEdOnDestination };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "10.10.5",
+  "version": "10.10.7",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "@noble/hashes": "^1.8.0",
     "@scure/base": "^1.2.6",
     "viem": "^2.31.6",
-    "@paraspell/sdk-common": "10.10.5",
-    "@paraspell/pallets": "10.10.5",
-    "@paraspell/assets": "10.10.5"
+    "@paraspell/pallets": "10.10.7",
+    "@paraspell/assets": "10.10.7",
+    "@paraspell/sdk-common": "10.10.7"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.27.1",