@paraspell/sdk-core 10.4.6 → 10.4.7

package/dist/index.cjs

@@ -4580,25 +4580,31 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
 }();
 
 var isSufficientOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node, senderAddress, fee) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node, senderAddress, fee, feeAsset) {
     var existentialDeposit, nativeBalance;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
+          if (!feeAsset) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 1:
           existentialDeposit = assets.getExistentialDepositOrThrow(node);
-          _context.n = 1;
+          _context.n = 2;
           return getBalanceNativeInternal({
             api: api,
             node: node,
             address: senderAddress
           });
-        case 1:
+        case 2:
           nativeBalance = _context.v;
           return _context.a(2, nativeBalance - existentialDeposit - fee > 0n);
       }
     }, _callee);
   }));
-  return function isSufficientOrigin(_x, _x2, _x3, _x4) {
+  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -4627,7 +4633,7 @@ var isSufficientDestination = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function isSufficientDestination(_x5, _x6, _x7, _x8, _x9) {
+  return function isSufficientDestination(_x6, _x7, _x8, _x9, _x0) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -4781,6 +4787,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
           return _context2.a(2, {
             fee: fee,
             feeType: 'dryRun',
+            sufficient: true,
             forwardedXcms: newForwardedXcms,
             destParaId: destParaId
           });
@@ -5033,7 +5040,7 @@ var dryRunOrigin = /*#__PURE__*/function () {
 
 var getOriginXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, currencySymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight;
+    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight, currencySymbol;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5042,7 +5049,7 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
-          currencySymbol = resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(origin);
+          nativeAssetSymbol = assets.getNativeAssetSymbol(origin);
           if (assets.hasDryRunSupport(origin)) {
             _context.n = 4;
             break;
@@ -5053,12 +5060,12 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           rawFee = _context.v;
           paddedFee = padFee(rawFee, origin, destination, 'origin');
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, paddedFee);
+          return isSufficientOrigin(api, origin, senderAddress, paddedFee, resolvedFeeAsset);
         case 3:
           sufficient = _context.v;
           return _context.a(2, {
             fee: paddedFee,
-            currency: currencySymbol,
+            currency: nativeAssetSymbol,
             feeType: 'paymentInfo',
             sufficient: sufficient
           });
@@ -5090,21 +5097,23 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           _rawFee = _context.v;
           _paddedFee = padFee(_rawFee, origin, destination, 'origin');
           _context.n = 8;
-          return isSufficientOrigin(api, origin, senderAddress, _paddedFee);
+          return isSufficientOrigin(api, origin, senderAddress, _paddedFee, resolvedFeeAsset);
         case 8:
           _sufficient = _context.v;
           return _context.a(2, {
             fee: _paddedFee,
-            currency: currencySymbol,
+            currency: nativeAssetSymbol,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
             sufficient: _sufficient
           });
         case 9:
           fee = dryRunResult.fee, forwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId, weight = dryRunResult.weight;
+          currencySymbol = resolvedFeeAsset ? resolvedFeeAsset.symbol : nativeAssetSymbol;
           return _context.a(2, {
             fee: fee,
             feeType: 'dryRun',
+            sufficient: true,
             currency: currencySymbol,
             forwardedXcms: forwardedXcms,
             destParaId: destParaId,
@@ -5118,20 +5127,176 @@ var getOriginXcmFee = /*#__PURE__*/function () {
   };
 }();
 
+var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
+  return assetCheckEnabled ? assets.findAsset(origin, currency, !sdkCommon.isTMultiLocation(destination) ? destination : null) : null;
+};
+
+var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
+  var origin = _ref.from,
+    destination = _ref.to,
+    currency = _ref.currency;
+  var isDestAssetHub = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
+  var allowedChainsToAh = ['AssetHubPolkadot', 'BifrostPolkadot', 'BifrostKusama', 'Hydration', 'Moonbeam', 'Ajuna', 'Polimec'];
+  if (!sdkCommon.isRelayChain(origin) && !isBridge && isDestAssetHub && !allowedChainsToAh.includes(origin) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT') {
+    throw new TransferToAhNotSupported("Node ".concat(origin, " does not support DOT transfer to AssetHub"));
+  }
+  var isRelayDestination = !sdkCommon.isTMultiLocation(destination) && sdkCommon.isRelayChain(destination);
+  var isMultiLocationDestination = _typeof(destination) === 'object';
+  if (!isBridge && !isRelayDestination && !isMultiLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !assets.hasSupportForAsset(destination, asset.symbol)) {
+    throw new assets.InvalidCurrencyError("Destination node ".concat(destination, " does not support currency ").concat(JSON.stringify(currency), "."));
+  }
+  if (!isBridge && asset === null && assetCheckEnabled) {
+    throwUnsupportedCurrency(currency, origin);
+  }
+};
+
+var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset) {
+  var currency = options.currency,
+    feeAsset = options.feeAsset,
+    origin = options.from,
+    destination = options.to;
+  if ('multilocation' in currency && assets.isOverrideMultiLocationSpecifier(currency.multilocation)) {
+    return currency.multilocation.value;
+  }
+  if ('multiasset' in currency) {
+    if (!feeAsset) {
+      throw new assets.InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
+    }
+    if ('multilocation' in feeAsset && assets.isOverrideMultiLocationSpecifier(feeAsset.multilocation)) {
+      throw new assets.InvalidCurrencyError('Fee asset cannot be an overridden multi location specifier');
+    }
+    if (currency.multiasset.every(function (asset) {
+      return assets.isTMultiAsset(asset);
+    })) {
+      if (!feeAsset) {
+        throw new assets.InvalidCurrencyError('Fee asset not provided');
+      }
+      if (!('multilocation' in feeAsset)) {
+        throw new assets.InvalidCurrencyError('Fee asset must be specified by multilocation when using raw overridden multi assets');
+      }
+      return currency.multiasset.map(function (multiAsset) {
+        var ml = assets.extractMultiAssetLoc(multiAsset);
+        return _objectSpread2(_objectSpread2({}, multiAsset), {}, {
+          isFeeAsset: sdkCommon.deepEqual(ml, feeAsset.multilocation)
+        });
+      });
+    }
+    // MultiAsset is an array of TCurrencyCore, search for assets
+    var assets$1 = currency.multiasset.map(function (currency) {
+      var asset = assets.findAsset(origin, currency, !sdkCommon.isTMultiLocation(destination) ? destination : null);
+      if (asset && !asset.multiLocation) {
+        throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(currency), " does not have a multiLocation"));
+      }
+      if (!asset) {
+        throw new assets.InvalidCurrencyError("Origin node ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
+      }
+      if (!resolvedFeeAsset) {
+        throw new assets.InvalidCurrencyError('Fee asset not found');
+      }
+      validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
+      var originTyped = origin;
+      var originNode = getNode(originTyped);
+      return _objectSpread2({
+        isFeeAsset: assets.isAssetEqual(resolvedFeeAsset, asset)
+      }, createMultiAsset(originNode.version, currency.amount, asset.multiLocation));
+    });
+    if (assets$1.filter(function (asset) {
+      return asset.isFeeAsset;
+    }).length > 1) {
+      throw new assets.InvalidCurrencyError("Fee asset matches multiple assets in multiassets");
+    }
+    if (assets$1.filter(function (asset) {
+      return asset.isFeeAsset;
+    }).length === 0) {
+      throw new assets.InvalidCurrencyError("Fee asset not found in multiassets");
+    }
+    return assets$1;
+  }
+  return undefined;
+};
+
+var selectXcmVersion = function selectXcmVersion(forcedVersion, originVersion, destMaxVersion) {
+  if (forcedVersion) {
+    return forcedVersion;
+  }
+  var destVersion = destMaxVersion !== null && destMaxVersion !== void 0 ? destMaxVersion : originVersion;
+  if (originVersion === sdkCommon.Version.V4 && destVersion === sdkCommon.Version.V3) {
+    return sdkCommon.Version.V3;
+  }
+  return originVersion;
+};
+
+var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
+  if (sdkCommon.isRelayChain(origin)) return true;
+  var hasMultiAsset = 'multiasset' in currency;
+  var hasOverriddenMultilocation = 'multilocation' in currency && assets.isOverrideMultiLocationSpecifier(currency.multilocation);
+  return !(hasMultiAsset || hasOverriddenMultilocation);
+};
+
+var validateDestinationAddress = function validateDestinationAddress(address, destination) {
+  if (typeof address === 'string' && !sdkCommon.isTMultiLocation(destination)) {
+    validateAddress(address, destination);
+  }
+};
+
+var validateCurrency = function validateCurrency(currency, feeAsset) {
+  if ('multiasset' in currency) {
+    if (currency.multiasset.length === 0) {
+      throw new assets.InvalidCurrencyError('Overridden multi assets cannot be empty');
+    }
+    if (currency.multiasset.length === 1) {
+      throw new assets.InvalidCurrencyError('Please provide more than one multi asset');
+    }
+    if (currency.multiasset.length > 1 && !currency.multiasset.every(function (asset) {
+      return assets.isTMultiAsset(asset);
+    }) && !feeAsset) {
+      throw new assets.InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
+    }
+  }
+};
+var validateDestination = function validateDestination(origin, destination) {
+  if (sdkCommon.isRelayChain(origin) && !sdkCommon.isTMultiLocation(destination) && sdkCommon.isRelayChain(destination) && origin !== destination) {
+    throw new IncompatibleNodesError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
+  }
+  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam'];
+  if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
+    throw new IncompatibleNodesError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
+  }
+  var isMultiLocationDestination = _typeof(destination) === 'object';
+  var isBridge = !sdkCommon.isTMultiLocation(destination) && sdkCommon.isDotKsmBridge(origin, destination);
+  var isRelayDestination = !sdkCommon.isTMultiLocation(destination) && sdkCommon.isRelayChain(destination);
+  if (!isRelayDestination && !isMultiLocationDestination) {
+    var originRelayChainSymbol = assets.getRelayChainSymbol(origin);
+    var destinationRelayChainSymbol = assets.getRelayChainSymbol(destination);
+    if (!isBridge && originRelayChainSymbol !== destinationRelayChainSymbol) {
+      throw new IncompatibleNodesError();
+    }
+  }
+};
+var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled, currency) {
+  if (!assetCheckEnabled && 'symbol' in currency && assets.isSymbolSpecifier(currency.symbol)) {
+    throw new assets.InvalidCurrencyError('Symbol specifier is not supported when asset check is disabled. Please use normal symbol instead.');
+  }
+  if (!assetCheckEnabled && 'id' in currency) {
+    throw new assets.InvalidCurrencyError('Asset ID is not supported when asset check is disabled. Please use normal symbol instead');
+  }
+};
+
 var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, rawOriginFee, originFee, sufficient;
+    var api, tx, origin, destination, currency, senderAddress, feeAsset, rawOriginFee, originFee, resolvedFeeAsset, sufficient;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, currency = _ref.currency, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset;
           _context.n = 1;
           return api.calculateTransactionFee(tx, senderAddress);
         case 1:
           rawOriginFee = _context.v;
           originFee = padFee(rawOriginFee, origin, destination, 'origin');
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 2;
-          return isSufficientOrigin(api, origin, senderAddress, originFee);
+          return isSufficientOrigin(api, origin, senderAddress, originFee, resolvedFeeAsset);
         case 2:
           sufficient = _context.v;
           return _context.a(2, {
@@ -5468,12 +5633,13 @@ var BRIDGE_FEE_DOT = 682395810n; // 0.068239581 DOT
 var BRIDGE_FEE_KSM = 12016807000n; // 0.012016807 KSM
 var getXcmFeeEstimate = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, origin, destination, currency, address, senderAddress, originAsset, destApi, _ref2, _ref3, fixedOriginFee, fixedDestinationFee, originSufficient, _destinationSufficient, originFeeDetails, currencyInput, destinationFee, destinationSufficient, destFeeDetails, _t;
+    var api, origin, destination, currency, feeAsset, address, senderAddress, originAsset, resolvedFeeAsset, destApi, _ref2, _ref3, fixedOriginFee, fixedDestinationFee, originSufficient, _destinationSufficient, originFeeDetails, currencyInput, destinationFee, destinationSufficient, destFeeDetails, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, address = options.address, senderAddress = options.senderAddress;
+          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, feeAsset = options.feeAsset, address = options.address, senderAddress = options.senderAddress;
           originAsset = assets.findAssetForNodeOrThrow(origin, currency, destination);
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -5487,7 +5653,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
           }
           _ref2 = origin === 'AssetHubPolkadot' ? [BRIDGE_FEE_DOT, BRIDGE_FEE_KSM] : [BRIDGE_FEE_KSM, BRIDGE_FEE_DOT], _ref3 = _slicedToArray(_ref2, 2), fixedOriginFee = _ref3[0], fixedDestinationFee = _ref3[1];
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, fixedOriginFee);
+          return isSufficientOrigin(api, origin, senderAddress, fixedOriginFee, resolvedFeeAsset);
         case 3:
           originSufficient = _context.v;
           _context.n = 4;
@@ -5591,161 +5757,6 @@ var transferRelayToPara = /*#__PURE__*/function () {
   };
 }();
 
-var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
-  return assetCheckEnabled ? assets.findAsset(origin, currency, !sdkCommon.isTMultiLocation(destination) ? destination : null) : null;
-};
-
-var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
-  var origin = _ref.from,
-    destination = _ref.to,
-    currency = _ref.currency;
-  var isDestAssetHub = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
-  var allowedChainsToAh = ['AssetHubPolkadot', 'BifrostPolkadot', 'BifrostKusama', 'Hydration', 'Moonbeam', 'Ajuna', 'Polimec'];
-  if (!sdkCommon.isRelayChain(origin) && !isBridge && isDestAssetHub && !allowedChainsToAh.includes(origin) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT') {
-    throw new TransferToAhNotSupported("Node ".concat(origin, " does not support DOT transfer to AssetHub"));
-  }
-  var isRelayDestination = !sdkCommon.isTMultiLocation(destination) && sdkCommon.isRelayChain(destination);
-  var isMultiLocationDestination = _typeof(destination) === 'object';
-  if (!isBridge && !isRelayDestination && !isMultiLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !assets.hasSupportForAsset(destination, asset.symbol)) {
-    throw new assets.InvalidCurrencyError("Destination node ".concat(destination, " does not support currency ").concat(JSON.stringify(currency), "."));
-  }
-  if (!isBridge && asset === null && assetCheckEnabled) {
-    throwUnsupportedCurrency(currency, origin);
-  }
-};
-
-var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset) {
-  var currency = options.currency,
-    feeAsset = options.feeAsset,
-    origin = options.from,
-    destination = options.to;
-  if ('multilocation' in currency && assets.isOverrideMultiLocationSpecifier(currency.multilocation)) {
-    return currency.multilocation.value;
-  }
-  if ('multiasset' in currency) {
-    if (!feeAsset) {
-      throw new assets.InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
-    }
-    if ('multilocation' in feeAsset && assets.isOverrideMultiLocationSpecifier(feeAsset.multilocation)) {
-      throw new assets.InvalidCurrencyError('Fee asset cannot be an overridden multi location specifier');
-    }
-    if (currency.multiasset.every(function (asset) {
-      return assets.isTMultiAsset(asset);
-    })) {
-      if (!feeAsset) {
-        throw new assets.InvalidCurrencyError('Fee asset not provided');
-      }
-      if (!('multilocation' in feeAsset)) {
-        throw new assets.InvalidCurrencyError('Fee asset must be specified by multilocation when using raw overridden multi assets');
-      }
-      return currency.multiasset.map(function (multiAsset) {
-        var ml = assets.extractMultiAssetLoc(multiAsset);
-        return _objectSpread2(_objectSpread2({}, multiAsset), {}, {
-          isFeeAsset: sdkCommon.deepEqual(ml, feeAsset.multilocation)
-        });
-      });
-    }
-    // MultiAsset is an array of TCurrencyCore, search for assets
-    var assets$1 = currency.multiasset.map(function (currency) {
-      var asset = assets.findAsset(origin, currency, !sdkCommon.isTMultiLocation(destination) ? destination : null);
-      if (asset && !asset.multiLocation) {
-        throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(currency), " does not have a multiLocation"));
-      }
-      if (!asset) {
-        throw new assets.InvalidCurrencyError("Origin node ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
-      }
-      if (!resolvedFeeAsset) {
-        throw new assets.InvalidCurrencyError('Fee asset not found');
-      }
-      validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
-      var originTyped = origin;
-      var originNode = getNode(originTyped);
-      return _objectSpread2({
-        isFeeAsset: assets.isAssetEqual(resolvedFeeAsset, asset)
-      }, createMultiAsset(originNode.version, currency.amount, asset.multiLocation));
-    });
-    if (assets$1.filter(function (asset) {
-      return asset.isFeeAsset;
-    }).length > 1) {
-      throw new assets.InvalidCurrencyError("Fee asset matches multiple assets in multiassets");
-    }
-    if (assets$1.filter(function (asset) {
-      return asset.isFeeAsset;
-    }).length === 0) {
-      throw new assets.InvalidCurrencyError("Fee asset not found in multiassets");
-    }
-    return assets$1;
-  }
-  return undefined;
-};
-
-var selectXcmVersion = function selectXcmVersion(forcedVersion, originVersion, destMaxVersion) {
-  if (forcedVersion) {
-    return forcedVersion;
-  }
-  var destVersion = destMaxVersion !== null && destMaxVersion !== void 0 ? destMaxVersion : originVersion;
-  if (originVersion === sdkCommon.Version.V4 && destVersion === sdkCommon.Version.V3) {
-    return sdkCommon.Version.V3;
-  }
-  return originVersion;
-};
-
-var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
-  if (sdkCommon.isRelayChain(origin)) return true;
-  var hasMultiAsset = 'multiasset' in currency;
-  var hasOverriddenMultilocation = 'multilocation' in currency && assets.isOverrideMultiLocationSpecifier(currency.multilocation);
-  return !(hasMultiAsset || hasOverriddenMultilocation);
-};
-
-var validateDestinationAddress = function validateDestinationAddress(address, destination) {
-  if (typeof address === 'string' && !sdkCommon.isTMultiLocation(destination)) {
-    validateAddress(address, destination);
-  }
-};
-
-var validateCurrency = function validateCurrency(currency, feeAsset) {
-  if ('multiasset' in currency) {
-    if (currency.multiasset.length === 0) {
-      throw new assets.InvalidCurrencyError('Overridden multi assets cannot be empty');
-    }
-    if (currency.multiasset.length === 1) {
-      throw new assets.InvalidCurrencyError('Please provide more than one multi asset');
-    }
-    if (currency.multiasset.length > 1 && !currency.multiasset.every(function (asset) {
-      return assets.isTMultiAsset(asset);
-    }) && !feeAsset) {
-      throw new assets.InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
-    }
-  }
-};
-var validateDestination = function validateDestination(origin, destination) {
-  if (sdkCommon.isRelayChain(origin) && !sdkCommon.isTMultiLocation(destination) && sdkCommon.isRelayChain(destination) && origin !== destination) {
-    throw new IncompatibleNodesError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
-  }
-  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam'];
-  if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
-    throw new IncompatibleNodesError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
-  }
-  var isMultiLocationDestination = _typeof(destination) === 'object';
-  var isBridge = !sdkCommon.isTMultiLocation(destination) && sdkCommon.isDotKsmBridge(origin, destination);
-  var isRelayDestination = !sdkCommon.isTMultiLocation(destination) && sdkCommon.isRelayChain(destination);
-  if (!isRelayDestination && !isMultiLocationDestination) {
-    var originRelayChainSymbol = assets.getRelayChainSymbol(origin);
-    var destinationRelayChainSymbol = assets.getRelayChainSymbol(destination);
-    if (!isBridge && originRelayChainSymbol !== destinationRelayChainSymbol) {
-      throw new IncompatibleNodesError();
-    }
-  }
-};
-var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled, currency) {
-  if (!assetCheckEnabled && 'symbol' in currency && assets.isSymbolSpecifier(currency.symbol)) {
-    throw new assets.InvalidCurrencyError('Symbol specifier is not supported when asset check is disabled. Please use normal symbol instead.');
-  }
-  if (!assetCheckEnabled && 'id' in currency) {
-    throw new assets.InvalidCurrencyError('Asset ID is not supported when asset check is disabled. Please use normal symbol instead');
-  }
-};
-
 var send = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, originVersion, destVersion, resolvedVersion, isLocalTransfer, overriddenAsset, resolvedAsset, finalAsset, finalVersion, normalizedAsset;
@@ -10098,11 +10109,11 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getOriginXcmFeeEstimate",
     value: (function () {
       var _getOriginXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
-        var _this$_options6, from, to, senderAddress, tx;
+        var _this$_options6, from, to, senderAddress, currency, tx;
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
             case 0:
-              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress;
+              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress, currency = _this$_options6.currency;
               assertToIsString(to);
               _context7.n = 1;
               return this.build();
@@ -10115,6 +10126,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 tx: tx,
                 origin: from,
                 destination: to,
+                currency: currency,
                 senderAddress: senderAddress
               });
             case 3:

package/dist/index.d.ts

@@ -844,7 +844,7 @@ type TGetXcmFeeBaseOptions<TRes> = {
 };
 type TGetXcmFeeOptions<TApi, TRes> = WithApi<TGetXcmFeeBaseOptions<TRes>, TApi, TRes>;
 type TGetXcmFeeEstimateOptions<TApi, TRes> = Omit<TGetXcmFeeOptions<TApi, TRes>, 'disableFallback'>;
-type TGetOriginXcmFeeEstimateOptions<TApi, TRes> = Omit<TGetXcmFeeOptions<TApi, TRes>, 'disableFallback' | 'address' | 'currency'>;
+type TGetOriginXcmFeeEstimateOptions<TApi, TRes> = Omit<TGetXcmFeeOptions<TApi, TRes>, 'disableFallback' | 'address'>;
 type TGetXcmFeeBuilderOptions = {
     disableFallback: boolean;
 };
@@ -1768,7 +1768,7 @@ declare const getOriginXcmFee: <TApi, TRes>({ api, tx, origin, destination, send
     destParaId?: number;
 }>;
 
-declare const getOriginXcmFeeEstimate: <TApi, TRes>({ api, tx, origin, destination, senderAddress }: TGetOriginXcmFeeEstimateOptions<TApi, TRes>) => Promise<TGetXcmFeeEstimateDetail>;
+declare const getOriginXcmFeeEstimate: <TApi, TRes>({ api, tx, origin, destination, currency, senderAddress, feeAsset }: TGetOriginXcmFeeEstimateOptions<TApi, TRes>) => Promise<TGetXcmFeeEstimateDetail>;
 
 declare const getXcmFee: <TApi, TRes>({ api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback }: TGetXcmFeeOptions<TApi, TRes>) => Promise<TGetXcmFeeResult>;
 

package/dist/index.mjs

@@ -4581,25 +4581,31 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
 }();
 
 var isSufficientOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node, senderAddress, fee) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node, senderAddress, fee, feeAsset) {
     var existentialDeposit, nativeBalance;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
+          if (!feeAsset) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 1:
           existentialDeposit = getExistentialDepositOrThrow(node);
-          _context.n = 1;
+          _context.n = 2;
           return getBalanceNativeInternal({
             api: api,
             node: node,
             address: senderAddress
           });
-        case 1:
+        case 2:
           nativeBalance = _context.v;
           return _context.a(2, nativeBalance - existentialDeposit - fee > 0n);
       }
     }, _callee);
   }));
-  return function isSufficientOrigin(_x, _x2, _x3, _x4) {
+  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -4628,7 +4634,7 @@ var isSufficientDestination = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function isSufficientDestination(_x5, _x6, _x7, _x8, _x9) {
+  return function isSufficientDestination(_x6, _x7, _x8, _x9, _x0) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -4782,6 +4788,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
           return _context2.a(2, {
             fee: fee,
             feeType: 'dryRun',
+            sufficient: true,
             forwardedXcms: newForwardedXcms,
             destParaId: destParaId
           });
@@ -5034,7 +5041,7 @@ var dryRunOrigin = /*#__PURE__*/function () {
 
 var getOriginXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, currencySymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight;
+    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight, currencySymbol;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5043,7 +5050,7 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
-          currencySymbol = resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(origin);
+          nativeAssetSymbol = getNativeAssetSymbol(origin);
           if (hasDryRunSupport(origin)) {
             _context.n = 4;
             break;
@@ -5054,12 +5061,12 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           rawFee = _context.v;
           paddedFee = padFee(rawFee, origin, destination, 'origin');
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, paddedFee);
+          return isSufficientOrigin(api, origin, senderAddress, paddedFee, resolvedFeeAsset);
         case 3:
           sufficient = _context.v;
           return _context.a(2, {
             fee: paddedFee,
-            currency: currencySymbol,
+            currency: nativeAssetSymbol,
             feeType: 'paymentInfo',
             sufficient: sufficient
           });
@@ -5091,21 +5098,23 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           _rawFee = _context.v;
           _paddedFee = padFee(_rawFee, origin, destination, 'origin');
           _context.n = 8;
-          return isSufficientOrigin(api, origin, senderAddress, _paddedFee);
+          return isSufficientOrigin(api, origin, senderAddress, _paddedFee, resolvedFeeAsset);
         case 8:
           _sufficient = _context.v;
           return _context.a(2, {
             fee: _paddedFee,
-            currency: currencySymbol,
+            currency: nativeAssetSymbol,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
             sufficient: _sufficient
           });
         case 9:
           fee = dryRunResult.fee, forwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId, weight = dryRunResult.weight;
+          currencySymbol = resolvedFeeAsset ? resolvedFeeAsset.symbol : nativeAssetSymbol;
           return _context.a(2, {
             fee: fee,
             feeType: 'dryRun',
+            sufficient: true,
             currency: currencySymbol,
             forwardedXcms: forwardedXcms,
             destParaId: destParaId,
@@ -5119,20 +5128,176 @@ var getOriginXcmFee = /*#__PURE__*/function () {
   };
 }();
 
+var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
+  return assetCheckEnabled ? findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null) : null;
+};
+
+var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
+  var origin = _ref.from,
+    destination = _ref.to,
+    currency = _ref.currency;
+  var isDestAssetHub = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
+  var allowedChainsToAh = ['AssetHubPolkadot', 'BifrostPolkadot', 'BifrostKusama', 'Hydration', 'Moonbeam', 'Ajuna', 'Polimec'];
+  if (!isRelayChain(origin) && !isBridge && isDestAssetHub && !allowedChainsToAh.includes(origin) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT') {
+    throw new TransferToAhNotSupported("Node ".concat(origin, " does not support DOT transfer to AssetHub"));
+  }
+  var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
+  var isMultiLocationDestination = _typeof(destination) === 'object';
+  if (!isBridge && !isRelayDestination && !isMultiLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !hasSupportForAsset(destination, asset.symbol)) {
+    throw new InvalidCurrencyError("Destination node ".concat(destination, " does not support currency ").concat(JSON.stringify(currency), "."));
+  }
+  if (!isBridge && asset === null && assetCheckEnabled) {
+    throwUnsupportedCurrency(currency, origin);
+  }
+};
+
+var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset) {
+  var currency = options.currency,
+    feeAsset = options.feeAsset,
+    origin = options.from,
+    destination = options.to;
+  if ('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation)) {
+    return currency.multilocation.value;
+  }
+  if ('multiasset' in currency) {
+    if (!feeAsset) {
+      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
+    }
+    if ('multilocation' in feeAsset && isOverrideMultiLocationSpecifier(feeAsset.multilocation)) {
+      throw new InvalidCurrencyError('Fee asset cannot be an overridden multi location specifier');
+    }
+    if (currency.multiasset.every(function (asset) {
+      return isTMultiAsset(asset);
+    })) {
+      if (!feeAsset) {
+        throw new InvalidCurrencyError('Fee asset not provided');
+      }
+      if (!('multilocation' in feeAsset)) {
+        throw new InvalidCurrencyError('Fee asset must be specified by multilocation when using raw overridden multi assets');
+      }
+      return currency.multiasset.map(function (multiAsset) {
+        var ml = extractMultiAssetLoc(multiAsset);
+        return _objectSpread2(_objectSpread2({}, multiAsset), {}, {
+          isFeeAsset: deepEqual(ml, feeAsset.multilocation)
+        });
+      });
+    }
+    // MultiAsset is an array of TCurrencyCore, search for assets
+    var assets = currency.multiasset.map(function (currency) {
+      var asset = findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null);
+      if (asset && !asset.multiLocation) {
+        throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(currency), " does not have a multiLocation"));
+      }
+      if (!asset) {
+        throw new InvalidCurrencyError("Origin node ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
+      }
+      if (!resolvedFeeAsset) {
+        throw new InvalidCurrencyError('Fee asset not found');
+      }
+      validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
+      var originTyped = origin;
+      var originNode = getNode(originTyped);
+      return _objectSpread2({
+        isFeeAsset: isAssetEqual(resolvedFeeAsset, asset)
+      }, createMultiAsset(originNode.version, currency.amount, asset.multiLocation));
+    });
+    if (assets.filter(function (asset) {
+      return asset.isFeeAsset;
+    }).length > 1) {
+      throw new InvalidCurrencyError("Fee asset matches multiple assets in multiassets");
+    }
+    if (assets.filter(function (asset) {
+      return asset.isFeeAsset;
+    }).length === 0) {
+      throw new InvalidCurrencyError("Fee asset not found in multiassets");
+    }
+    return assets;
+  }
+  return undefined;
+};
+
+var selectXcmVersion = function selectXcmVersion(forcedVersion, originVersion, destMaxVersion) {
+  if (forcedVersion) {
+    return forcedVersion;
+  }
+  var destVersion = destMaxVersion !== null && destMaxVersion !== void 0 ? destMaxVersion : originVersion;
+  if (originVersion === Version.V4 && destVersion === Version.V3) {
+    return Version.V3;
+  }
+  return originVersion;
+};
+
+var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
+  if (isRelayChain(origin)) return true;
+  var hasMultiAsset = 'multiasset' in currency;
+  var hasOverriddenMultilocation = 'multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation);
+  return !(hasMultiAsset || hasOverriddenMultilocation);
+};
+
+var validateDestinationAddress = function validateDestinationAddress(address, destination) {
+  if (typeof address === 'string' && !isTMultiLocation(destination)) {
+    validateAddress(address, destination);
+  }
+};
+
+var validateCurrency = function validateCurrency(currency, feeAsset) {
+  if ('multiasset' in currency) {
+    if (currency.multiasset.length === 0) {
+      throw new InvalidCurrencyError('Overridden multi assets cannot be empty');
+    }
+    if (currency.multiasset.length === 1) {
+      throw new InvalidCurrencyError('Please provide more than one multi asset');
+    }
+    if (currency.multiasset.length > 1 && !currency.multiasset.every(function (asset) {
+      return isTMultiAsset(asset);
+    }) && !feeAsset) {
+      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
+    }
+  }
+};
+var validateDestination = function validateDestination(origin, destination) {
+  if (isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(destination) && origin !== destination) {
+    throw new IncompatibleNodesError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
+  }
+  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam'];
+  if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
+    throw new IncompatibleNodesError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
+  }
+  var isMultiLocationDestination = _typeof(destination) === 'object';
+  var isBridge = !isTMultiLocation(destination) && isDotKsmBridge(origin, destination);
+  var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
+  if (!isRelayDestination && !isMultiLocationDestination) {
+    var originRelayChainSymbol = getRelayChainSymbol(origin);
+    var destinationRelayChainSymbol = getRelayChainSymbol(destination);
+    if (!isBridge && originRelayChainSymbol !== destinationRelayChainSymbol) {
+      throw new IncompatibleNodesError();
+    }
+  }
+};
+var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled, currency) {
+  if (!assetCheckEnabled && 'symbol' in currency && isSymbolSpecifier(currency.symbol)) {
+    throw new InvalidCurrencyError('Symbol specifier is not supported when asset check is disabled. Please use normal symbol instead.');
+  }
+  if (!assetCheckEnabled && 'id' in currency) {
+    throw new InvalidCurrencyError('Asset ID is not supported when asset check is disabled. Please use normal symbol instead');
+  }
+};
+
 var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, rawOriginFee, originFee, sufficient;
+    var api, tx, origin, destination, currency, senderAddress, feeAsset, rawOriginFee, originFee, resolvedFeeAsset, sufficient;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, currency = _ref.currency, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset;
           _context.n = 1;
           return api.calculateTransactionFee(tx, senderAddress);
         case 1:
           rawOriginFee = _context.v;
           originFee = padFee(rawOriginFee, origin, destination, 'origin');
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 2;
-          return isSufficientOrigin(api, origin, senderAddress, originFee);
+          return isSufficientOrigin(api, origin, senderAddress, originFee, resolvedFeeAsset);
         case 2:
           sufficient = _context.v;
           return _context.a(2, {
@@ -5469,12 +5634,13 @@ var BRIDGE_FEE_DOT = 682395810n; // 0.068239581 DOT
 var BRIDGE_FEE_KSM = 12016807000n; // 0.012016807 KSM
 var getXcmFeeEstimate = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, origin, destination, currency, address, senderAddress, originAsset, destApi, _ref2, _ref3, fixedOriginFee, fixedDestinationFee, originSufficient, _destinationSufficient, originFeeDetails, currencyInput, destinationFee, destinationSufficient, destFeeDetails, _t;
+    var api, origin, destination, currency, feeAsset, address, senderAddress, originAsset, resolvedFeeAsset, destApi, _ref2, _ref3, fixedOriginFee, fixedDestinationFee, originSufficient, _destinationSufficient, originFeeDetails, currencyInput, destinationFee, destinationSufficient, destFeeDetails, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, address = options.address, senderAddress = options.senderAddress;
+          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, feeAsset = options.feeAsset, address = options.address, senderAddress = options.senderAddress;
           originAsset = findAssetForNodeOrThrow(origin, currency, destination);
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -5488,7 +5654,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
           }
           _ref2 = origin === 'AssetHubPolkadot' ? [BRIDGE_FEE_DOT, BRIDGE_FEE_KSM] : [BRIDGE_FEE_KSM, BRIDGE_FEE_DOT], _ref3 = _slicedToArray(_ref2, 2), fixedOriginFee = _ref3[0], fixedDestinationFee = _ref3[1];
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, fixedOriginFee);
+          return isSufficientOrigin(api, origin, senderAddress, fixedOriginFee, resolvedFeeAsset);
         case 3:
           originSufficient = _context.v;
           _context.n = 4;
@@ -5592,161 +5758,6 @@ var transferRelayToPara = /*#__PURE__*/function () {
   };
 }();
 
-var resolveAsset = function resolveAsset(currency, origin, destination, assetCheckEnabled) {
-  return assetCheckEnabled ? findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null) : null;
-};
-
-var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled, isBridge, asset) {
-  var origin = _ref.from,
-    destination = _ref.to,
-    currency = _ref.currency;
-  var isDestAssetHub = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
-  var allowedChainsToAh = ['AssetHubPolkadot', 'BifrostPolkadot', 'BifrostKusama', 'Hydration', 'Moonbeam', 'Ajuna', 'Polimec'];
-  if (!isRelayChain(origin) && !isBridge && isDestAssetHub && !allowedChainsToAh.includes(origin) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT') {
-    throw new TransferToAhNotSupported("Node ".concat(origin, " does not support DOT transfer to AssetHub"));
-  }
-  var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
-  var isMultiLocationDestination = _typeof(destination) === 'object';
-  if (!isBridge && !isRelayDestination && !isMultiLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !hasSupportForAsset(destination, asset.symbol)) {
-    throw new InvalidCurrencyError("Destination node ".concat(destination, " does not support currency ").concat(JSON.stringify(currency), "."));
-  }
-  if (!isBridge && asset === null && assetCheckEnabled) {
-    throwUnsupportedCurrency(currency, origin);
-  }
-};
-
-var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset) {
-  var currency = options.currency,
-    feeAsset = options.feeAsset,
-    origin = options.from,
-    destination = options.to;
-  if ('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation)) {
-    return currency.multilocation.value;
-  }
-  if ('multiasset' in currency) {
-    if (!feeAsset) {
-      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
-    }
-    if ('multilocation' in feeAsset && isOverrideMultiLocationSpecifier(feeAsset.multilocation)) {
-      throw new InvalidCurrencyError('Fee asset cannot be an overridden multi location specifier');
-    }
-    if (currency.multiasset.every(function (asset) {
-      return isTMultiAsset(asset);
-    })) {
-      if (!feeAsset) {
-        throw new InvalidCurrencyError('Fee asset not provided');
-      }
-      if (!('multilocation' in feeAsset)) {
-        throw new InvalidCurrencyError('Fee asset must be specified by multilocation when using raw overridden multi assets');
-      }
-      return currency.multiasset.map(function (multiAsset) {
-        var ml = extractMultiAssetLoc(multiAsset);
-        return _objectSpread2(_objectSpread2({}, multiAsset), {}, {
-          isFeeAsset: deepEqual(ml, feeAsset.multilocation)
-        });
-      });
-    }
-    // MultiAsset is an array of TCurrencyCore, search for assets
-    var assets = currency.multiasset.map(function (currency) {
-      var asset = findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null);
-      if (asset && !asset.multiLocation) {
-        throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(currency), " does not have a multiLocation"));
-      }
-      if (!asset) {
-        throw new InvalidCurrencyError("Origin node ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
-      }
-      if (!resolvedFeeAsset) {
-        throw new InvalidCurrencyError('Fee asset not found');
-      }
-      validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
-      var originTyped = origin;
-      var originNode = getNode(originTyped);
-      return _objectSpread2({
-        isFeeAsset: isAssetEqual(resolvedFeeAsset, asset)
-      }, createMultiAsset(originNode.version, currency.amount, asset.multiLocation));
-    });
-    if (assets.filter(function (asset) {
-      return asset.isFeeAsset;
-    }).length > 1) {
-      throw new InvalidCurrencyError("Fee asset matches multiple assets in multiassets");
-    }
-    if (assets.filter(function (asset) {
-      return asset.isFeeAsset;
-    }).length === 0) {
-      throw new InvalidCurrencyError("Fee asset not found in multiassets");
-    }
-    return assets;
-  }
-  return undefined;
-};
-
-var selectXcmVersion = function selectXcmVersion(forcedVersion, originVersion, destMaxVersion) {
-  if (forcedVersion) {
-    return forcedVersion;
-  }
-  var destVersion = destMaxVersion !== null && destMaxVersion !== void 0 ? destMaxVersion : originVersion;
-  if (originVersion === Version.V4 && destVersion === Version.V3) {
-    return Version.V3;
-  }
-  return originVersion;
-};
-
-var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
-  if (isRelayChain(origin)) return true;
-  var hasMultiAsset = 'multiasset' in currency;
-  var hasOverriddenMultilocation = 'multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation);
-  return !(hasMultiAsset || hasOverriddenMultilocation);
-};
-
-var validateDestinationAddress = function validateDestinationAddress(address, destination) {
-  if (typeof address === 'string' && !isTMultiLocation(destination)) {
-    validateAddress(address, destination);
-  }
-};
-
-var validateCurrency = function validateCurrency(currency, feeAsset) {
-  if ('multiasset' in currency) {
-    if (currency.multiasset.length === 0) {
-      throw new InvalidCurrencyError('Overridden multi assets cannot be empty');
-    }
-    if (currency.multiasset.length === 1) {
-      throw new InvalidCurrencyError('Please provide more than one multi asset');
-    }
-    if (currency.multiasset.length > 1 && !currency.multiasset.every(function (asset) {
-      return isTMultiAsset(asset);
-    }) && !feeAsset) {
-      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
-    }
-  }
-};
-var validateDestination = function validateDestination(origin, destination) {
-  if (isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(destination) && origin !== destination) {
-    throw new IncompatibleNodesError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
-  }
-  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam'];
-  if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
-    throw new IncompatibleNodesError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
-  }
-  var isMultiLocationDestination = _typeof(destination) === 'object';
-  var isBridge = !isTMultiLocation(destination) && isDotKsmBridge(origin, destination);
-  var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
-  if (!isRelayDestination && !isMultiLocationDestination) {
-    var originRelayChainSymbol = getRelayChainSymbol(origin);
-    var destinationRelayChainSymbol = getRelayChainSymbol(destination);
-    if (!isBridge && originRelayChainSymbol !== destinationRelayChainSymbol) {
-      throw new IncompatibleNodesError();
-    }
-  }
-};
-var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled, currency) {
-  if (!assetCheckEnabled && 'symbol' in currency && isSymbolSpecifier(currency.symbol)) {
-    throw new InvalidCurrencyError('Symbol specifier is not supported when asset check is disabled. Please use normal symbol instead.');
-  }
-  if (!assetCheckEnabled && 'id' in currency) {
-    throw new InvalidCurrencyError('Asset ID is not supported when asset check is disabled. Please use normal symbol instead');
-  }
-};
-
 var send = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, originVersion, destVersion, resolvedVersion, isLocalTransfer, overriddenAsset, resolvedAsset, finalAsset, finalVersion, normalizedAsset;
@@ -10099,11 +10110,11 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getOriginXcmFeeEstimate",
     value: (function () {
       var _getOriginXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
-        var _this$_options6, from, to, senderAddress, tx;
+        var _this$_options6, from, to, senderAddress, currency, tx;
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
             case 0:
-              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress;
+              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress, currency = _this$_options6.currency;
               assertToIsString(to);
               _context7.n = 1;
               return this.build();
@@ -10116,6 +10127,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 tx: tx,
                 origin: from,
                 destination: to,
+                currency: currency,
                 senderAddress: senderAddress
               });
             case 3:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "10.4.6",
+  "version": "10.4.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.30.5",
-    "@paraspell/assets": "10.4.6",
-    "@paraspell/sdk-common": "10.4.6",
-    "@paraspell/pallets": "10.4.6"
+    "@paraspell/assets": "10.4.7",
+    "@paraspell/pallets": "10.4.7",
+    "@paraspell/sdk-common": "10.4.7"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.27.1",