@paraspell/sdk-core 11.14.7 → 11.14.8

package/dist/index.cjs

@@ -7470,7 +7470,7 @@ var send = /*#__PURE__*/function () {
 
 var buildDestInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, origin, destination, address, currency, originFee, isFeeAssetAh, destFeeDetail, totalHopFee, bridgeFee, destApi, destAsset, edDest, destBalance, destAmount, effectiveAmountForBalance, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, isSubBridge, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
+    var api, origin, destination, address, currency, originFee, isFeeAssetAh, destFeeDetail, totalHopFee, bridgeFee, destApi, destAsset, edDest, destBalance, destAmount, destFeeAssetEqual, effectiveDestFee, effectiveAmountForBalance, destBalanceSufficient, destBalanceAfter, createUnableToComputeError, isUnableToCompute, destbalanceAfterResult, destBalanceSufficientResult, receivedAmount, isSubBridge, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -7491,11 +7491,17 @@ var buildDestInfo = /*#__PURE__*/function () {
         case 2:
           destBalance = _context.v;
           destAmount = isFeeAssetAh ? currency.amount - originFee : currency.amount;
+          destFeeAssetEqual = assets.isSymbolMatch(destFeeDetail.asset.symbol, destAsset.symbol);
+          effectiveDestFee = destFeeAssetEqual ? destFeeDetail.fee : 0n;
           effectiveAmountForBalance = destAmount - totalHopFee;
-          destBalanceSufficient = effectiveAmountForBalance - destFeeDetail.fee > (destBalance < edDest ? edDest : 0n);
-          destBalanceSufficientResult = destFeeDetail.currency !== destAsset.symbol && destination !== 'Ethereum' ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceSufficient;
-          destBalanceAfter = destBalance - (destFeeDetail.currency === destAsset.symbol ? destFeeDetail.fee : 0n) + effectiveAmountForBalance;
-          destbalanceAfterResult = destFeeDetail.currency !== destAsset.symbol && destination !== 'Ethereum' ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceAfter;
+          destBalanceSufficient = effectiveAmountForBalance - effectiveDestFee > (destBalance < edDest ? edDest : 0n);
+          destBalanceAfter = destBalance - effectiveDestFee + effectiveAmountForBalance;
+          createUnableToComputeError = function createUnableToComputeError() {
+            return new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same');
+          };
+          isUnableToCompute = destFeeDetail.feeType === 'paymentInfo' && !destFeeAssetEqual;
+          destbalanceAfterResult = isUnableToCompute ? createUnableToComputeError() : destBalanceAfter;
+          destBalanceSufficientResult = isUnableToCompute ? createUnableToComputeError() : destBalanceSufficient;
           isSubBridge = sdkCommon.isSubstrateBridge(origin, destination);
           if (isSubBridge) {
             nativeAssetOfOriginSymbol = assets.getNativeAssetSymbol(origin);
@@ -7538,7 +7544,7 @@ var buildDestInfo = /*#__PURE__*/function () {
         case 4:
           destXcmFeeBalance = destBalance;
         case 5:
-          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeDetail.currency === destAsset.symbol ? effectiveAmountForBalance : 0n);
+          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeAssetEqual ? effectiveAmountForBalance : 0n);
           return _context.a(2, {
             receivedCurrency: {
               sufficient: destBalanceSufficientResult,
@@ -7553,7 +7559,7 @@ var buildDestInfo = /*#__PURE__*/function () {
               fee: destFeeDetail.fee,
               balance: destXcmFeeBalance,
               balanceAfter: destXcmFeeBalanceAfter,
-              currencySymbol: destFeeDetail.currency,
+              currencySymbol: destFeeDetail.asset.symbol,
               asset: destFeeDetail.asset
             }
           });
@@ -8568,20 +8574,16 @@ var createTypeThenAutoReserve = /*#__PURE__*/function () {
   };
 }();
 
-var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
-  var _feeResult$assetHub;
-  var totalFee = 0n;
-  if (((_feeResult$assetHub = feeResult.assetHub) === null || _feeResult$assetHub === void 0 ? void 0 : _feeResult$assetHub.fee) !== undefined) {
-    totalFee += feeResult.assetHub.fee;
-  }
-  if (feeResult.destination.fee !== undefined) {
-    totalFee += feeResult.destination.fee;
-  }
-  return totalFee;
+var calculateTotalXcmFee = function calculateTotalXcmFee(asset, feeResult) {
+  var totalHopFee = feeResult.hops.reduce(function (acc, hop) {
+    return assets.isAssetXcEqual(hop.result.asset, asset) ? acc + hop.result.fee : acc;
+  }, 0n);
+  var destFee = assets.isAssetXcEqual(feeResult.destination.asset, asset) ? feeResult.destination.fee : 0n;
+  return totalHopFee + destFee;
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, buildTx, origin, destination, currency, address, senderAddress, feeAsset, isSubBridge, destApi, asset, amount, destAsset, ed, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, tx, totalFee, method, feeToSubtract;
+    var api, buildTx, origin, destination, currency, address, senderAddress, feeAsset, isSubBridge, destApi, asset, amount, destAsset, ed, balance, xcmFeeResult, dryRunError, hops, _xcmFeeResult$destina, destFee, destFeeType, destFeeAsset, destDryRunError, erroredHop, hopError, isUnableToCompute, tx, totalFee, method, feeToSubtract;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -8633,19 +8635,22 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           });
         case 5:
           xcmFeeResult = _context.v;
-          dryRunError = xcmFeeResult.origin.dryRunError, assetHubFeeResult = xcmFeeResult.assetHub, bridgeHubFeeResult = xcmFeeResult.bridgeHub, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeCurrency = _xcmFeeResult$destina.currency, destDryRunError = _xcmFeeResult$destina.dryRunError;
+          dryRunError = xcmFeeResult.origin.dryRunError, hops = xcmFeeResult.hops, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeType = _xcmFeeResult$destina.feeType, destFeeAsset = _xcmFeeResult$destina.asset, destDryRunError = _xcmFeeResult$destina.dryRunError;
           if (!dryRunError) {
             _context.n = 6;
             break;
           }
           throw new DryRunFailedError(dryRunError, 'origin');
         case 6:
-          hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
-          if (!hopDryRunError) {
+          erroredHop = hops.find(function (hop) {
+            return hop.result.dryRunError;
+          });
+          hopError = erroredHop === null || erroredHop === void 0 ? void 0 : erroredHop.result.dryRunError;
+          if (!hopError) {
             _context.n = 7;
             break;
           }
-          throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
+          throw new DryRunFailedError(hopError, erroredHop.chain);
         case 7:
           if (!destDryRunError) {
             _context.n = 8;
@@ -8653,7 +8658,8 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           }
           throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
         case 8:
-          if (!(assets.normalizeSymbol(asset.symbol) !== assets.normalizeSymbol(destFeeCurrency))) {
+          isUnableToCompute = !assets.isSymbolMatch(assets.normalizeSymbol(destAsset.symbol), assets.normalizeSymbol(destFeeAsset.symbol)) && destFeeType === 'paymentInfo';
+          if (!isUnableToCompute) {
             _context.n = 9;
             break;
           }
@@ -8663,7 +8669,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           return buildTx();
         case 10:
           tx = _context.v;
-          totalFee = calculateTotalXcmFee(xcmFeeResult);
+          totalFee = calculateTotalXcmFee(asset, xcmFeeResult);
           method = api.getMethod(tx);
           if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
             feeToSubtract = totalFee;

package/dist/index.mjs

@@ -7471,7 +7471,7 @@ var send = /*#__PURE__*/function () {
 
 var buildDestInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, origin, destination, address, currency, originFee, isFeeAssetAh, destFeeDetail, totalHopFee, bridgeFee, destApi, destAsset, edDest, destBalance, destAmount, effectiveAmountForBalance, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, isSubBridge, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
+    var api, origin, destination, address, currency, originFee, isFeeAssetAh, destFeeDetail, totalHopFee, bridgeFee, destApi, destAsset, edDest, destBalance, destAmount, destFeeAssetEqual, effectiveDestFee, effectiveAmountForBalance, destBalanceSufficient, destBalanceAfter, createUnableToComputeError, isUnableToCompute, destbalanceAfterResult, destBalanceSufficientResult, receivedAmount, isSubBridge, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -7492,11 +7492,17 @@ var buildDestInfo = /*#__PURE__*/function () {
         case 2:
           destBalance = _context.v;
           destAmount = isFeeAssetAh ? currency.amount - originFee : currency.amount;
+          destFeeAssetEqual = isSymbolMatch(destFeeDetail.asset.symbol, destAsset.symbol);
+          effectiveDestFee = destFeeAssetEqual ? destFeeDetail.fee : 0n;
           effectiveAmountForBalance = destAmount - totalHopFee;
-          destBalanceSufficient = effectiveAmountForBalance - destFeeDetail.fee > (destBalance < edDest ? edDest : 0n);
-          destBalanceSufficientResult = destFeeDetail.currency !== destAsset.symbol && destination !== 'Ethereum' ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceSufficient;
-          destBalanceAfter = destBalance - (destFeeDetail.currency === destAsset.symbol ? destFeeDetail.fee : 0n) + effectiveAmountForBalance;
-          destbalanceAfterResult = destFeeDetail.currency !== destAsset.symbol && destination !== 'Ethereum' ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceAfter;
+          destBalanceSufficient = effectiveAmountForBalance - effectiveDestFee > (destBalance < edDest ? edDest : 0n);
+          destBalanceAfter = destBalance - effectiveDestFee + effectiveAmountForBalance;
+          createUnableToComputeError = function createUnableToComputeError() {
+            return new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same');
+          };
+          isUnableToCompute = destFeeDetail.feeType === 'paymentInfo' && !destFeeAssetEqual;
+          destbalanceAfterResult = isUnableToCompute ? createUnableToComputeError() : destBalanceAfter;
+          destBalanceSufficientResult = isUnableToCompute ? createUnableToComputeError() : destBalanceSufficient;
           isSubBridge = isSubstrateBridge(origin, destination);
           if (isSubBridge) {
             nativeAssetOfOriginSymbol = getNativeAssetSymbol(origin);
@@ -7539,7 +7545,7 @@ var buildDestInfo = /*#__PURE__*/function () {
         case 4:
           destXcmFeeBalance = destBalance;
         case 5:
-          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeDetail.currency === destAsset.symbol ? effectiveAmountForBalance : 0n);
+          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeAssetEqual ? effectiveAmountForBalance : 0n);
           return _context.a(2, {
             receivedCurrency: {
               sufficient: destBalanceSufficientResult,
@@ -7554,7 +7560,7 @@ var buildDestInfo = /*#__PURE__*/function () {
               fee: destFeeDetail.fee,
               balance: destXcmFeeBalance,
               balanceAfter: destXcmFeeBalanceAfter,
-              currencySymbol: destFeeDetail.currency,
+              currencySymbol: destFeeDetail.asset.symbol,
               asset: destFeeDetail.asset
             }
           });
@@ -8569,20 +8575,16 @@ var createTypeThenAutoReserve = /*#__PURE__*/function () {
   };
 }();
 
-var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
-  var _feeResult$assetHub;
-  var totalFee = 0n;
-  if (((_feeResult$assetHub = feeResult.assetHub) === null || _feeResult$assetHub === void 0 ? void 0 : _feeResult$assetHub.fee) !== undefined) {
-    totalFee += feeResult.assetHub.fee;
-  }
-  if (feeResult.destination.fee !== undefined) {
-    totalFee += feeResult.destination.fee;
-  }
-  return totalFee;
+var calculateTotalXcmFee = function calculateTotalXcmFee(asset, feeResult) {
+  var totalHopFee = feeResult.hops.reduce(function (acc, hop) {
+    return isAssetXcEqual(hop.result.asset, asset) ? acc + hop.result.fee : acc;
+  }, 0n);
+  var destFee = isAssetXcEqual(feeResult.destination.asset, asset) ? feeResult.destination.fee : 0n;
+  return totalHopFee + destFee;
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, buildTx, origin, destination, currency, address, senderAddress, feeAsset, isSubBridge, destApi, asset, amount, destAsset, ed, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, tx, totalFee, method, feeToSubtract;
+    var api, buildTx, origin, destination, currency, address, senderAddress, feeAsset, isSubBridge, destApi, asset, amount, destAsset, ed, balance, xcmFeeResult, dryRunError, hops, _xcmFeeResult$destina, destFee, destFeeType, destFeeAsset, destDryRunError, erroredHop, hopError, isUnableToCompute, tx, totalFee, method, feeToSubtract;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -8634,19 +8636,22 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           });
         case 5:
           xcmFeeResult = _context.v;
-          dryRunError = xcmFeeResult.origin.dryRunError, assetHubFeeResult = xcmFeeResult.assetHub, bridgeHubFeeResult = xcmFeeResult.bridgeHub, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeCurrency = _xcmFeeResult$destina.currency, destDryRunError = _xcmFeeResult$destina.dryRunError;
+          dryRunError = xcmFeeResult.origin.dryRunError, hops = xcmFeeResult.hops, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeType = _xcmFeeResult$destina.feeType, destFeeAsset = _xcmFeeResult$destina.asset, destDryRunError = _xcmFeeResult$destina.dryRunError;
           if (!dryRunError) {
             _context.n = 6;
             break;
           }
           throw new DryRunFailedError(dryRunError, 'origin');
         case 6:
-          hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
-          if (!hopDryRunError) {
+          erroredHop = hops.find(function (hop) {
+            return hop.result.dryRunError;
+          });
+          hopError = erroredHop === null || erroredHop === void 0 ? void 0 : erroredHop.result.dryRunError;
+          if (!hopError) {
             _context.n = 7;
             break;
           }
-          throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
+          throw new DryRunFailedError(hopError, erroredHop.chain);
         case 7:
           if (!destDryRunError) {
             _context.n = 8;
@@ -8654,7 +8659,8 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           }
           throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
         case 8:
-          if (!(normalizeSymbol(asset.symbol) !== normalizeSymbol(destFeeCurrency))) {
+          isUnableToCompute = !isSymbolMatch(normalizeSymbol(destAsset.symbol), normalizeSymbol(destFeeAsset.symbol)) && destFeeType === 'paymentInfo';
+          if (!isUnableToCompute) {
             _context.n = 9;
             break;
           }
@@ -8664,7 +8670,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           return buildTx();
         case 10:
           tx = _context.v;
-          totalFee = calculateTotalXcmFee(xcmFeeResult);
+          totalFee = calculateTotalXcmFee(asset, xcmFeeResult);
           method = api.getMethod(tx);
           if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
             feeToSubtract = totalFee;

package/package.json

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