@paraspell/sdk-core 10.1.0 → 10.1.2

package/dist/index.cjs

@@ -609,7 +609,7 @@ var DryRunFailedError = /*#__PURE__*/function (_Error) {
     _classCallCheck(this, DryRunFailedError);
     var message = "Dry run failed: ".concat(reason);
     if (dryRunType) {
-      message = "Dry run ".concat(dryRunType, " failed: ").concat(reason);
+      message = "Dry run on ".concat(dryRunType, " failed: ").concat(reason);
     }
     _this = _callSuper(this, DryRunFailedError, [message]);
     _this.name = 'DryRunFailedError';
@@ -2778,6 +2778,10 @@ var getNode = function getNode(node) {
   return nodeMap[node];
 };
 
+var replaceBigInt = function replaceBigInt(_key, value) {
+  return typeof value === 'bigint' ? value.toString() : value;
+};
+
 var resolveParaId = function resolveParaId(paraId, destination) {
   if (sdkCommon.isTMultiLocation(destination) || sdkCommon.isRelayChain(destination) || destination === 'Ethereum') {
     return undefined;
@@ -4084,11 +4088,11 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
 };
 var getDestXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
-    var api, origin, destination, currency, forwardedXcms, asset, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, dryRunResult, fee, newForwardedXcms, destParaId;
+    var api, origin, hopNode, destination, currency, forwardedXcms, asset, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, dryRunResult, fee, newForwardedXcms, destParaId;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
+          api = options.api, origin = options.origin, hopNode = options.prevNode, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           calcPaymentInfoFee = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -4107,7 +4111,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
                       _context.next = 5;
                       break;
                     }
-                    throw new assets.InvalidCurrencyError("Currency ".concat(JSON.stringify(currency), " not found in ").concat(origin));
+                    throw new assets.InvalidCurrencyError("Currency ".concat(JSON.stringify(currency, replaceBigInt), " not found in ").concat(origin));
                   case 5:
                     if (!originAsset.multiLocation) {
                       _context.next = 19;
@@ -4173,7 +4177,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
         case 8:
           _context2.next = 10;
           return api.getDryRunXcm({
-            originLocation: addXcmVersionHeader(createOriginLocation(origin, destination), exports.Version.V4),
+            originLocation: addXcmVersionHeader(createOriginLocation(hopNode, destination), exports.Version.V4),
             xcm: forwardedXcms[1][0],
             node: destination,
             origin: origin,
@@ -4553,7 +4557,7 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
 
 var getXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, destApi, destFeeRes, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, nextChain, hopApi, hopResult, failingRecord, hopIsDestination, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, destApi, destFeeRes, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, nextChain, hopApi, hopResult, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -4602,6 +4606,7 @@ var getXcmFee = /*#__PURE__*/function () {
             forwardedXcms: undefined,
             // force paymentInfo
             origin: origin,
+            prevNode: origin,
             destination: destination,
             currency: currency,
             address: address,
@@ -4650,7 +4655,7 @@ var getXcmFee = /*#__PURE__*/function () {
           destinationFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
         case 38:
           if (!(Array.isArray(forwardedXcms) && forwardedXcms.length > 0 && forwardedXcms[1].length > 0 && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
-            _context.next = 70;
+            _context.next = 74;
             break;
           }
           nextChain = getTNode(nextParaId, determineRelayChain(origin) === 'Polkadot' ? 'polkadot' : 'kusama');
@@ -4669,7 +4674,8 @@ var getXcmFee = /*#__PURE__*/function () {
           return getDestXcmFee({
             api: hopApi,
             forwardedXcms: forwardedXcms,
-            origin: currentOrigin,
+            origin: origin,
+            prevNode: currentOrigin,
             destination: nextChain,
             currency: currency,
             address: address,
@@ -4682,7 +4688,7 @@ var getXcmFee = /*#__PURE__*/function () {
         case 48:
           hopResult = _context.sent;
           if (!hopResult.dryRunError) {
-            _context.next = 60;
+            _context.next = 64;
             break;
           }
           failingRecord = {
@@ -4703,14 +4709,23 @@ var getXcmFee = /*#__PURE__*/function () {
           }
           // We failed before the true destination, use fallback via paymentInfo.
           if (hopIsDestination) {
-            _context.next = 59;
+            _context.next = 63;
             break;
           }
-          _context.next = 56;
+          _destApi = api.clone();
+          if (!(destination !== 'Ethereum')) {
+            _context.next = 58;
+            break;
+          }
+          _context.next = 58;
+          return _destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
+        case 58:
+          _context.next = 60;
           return getDestXcmFee({
-            api: hopApi,
+            api: _destApi,
             forwardedXcms: undefined,
-            origin: nextChain,
+            origin: origin,
+            prevNode: currentOrigin,
             destination: destination,
             currency: currency,
             address: address,
@@ -4719,13 +4734,13 @@ var getXcmFee = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
-        case 56:
+        case 60:
           destFallback = _context.sent;
           destinationFee = destFallback.fee;
           destinationFeeType = destFallback.feeType;
-        case 59:
-          return _context.abrupt("break", 70);
-        case 60:
+        case 63:
+          return _context.abrupt("break", 74);
+        case 64:
           if (nextChain === destination || sdkCommon.isRelayChain(nextChain) && !sdkCommon.isRelayChain(destination)) {
             destinationFee = hopResult.fee;
             destinationFeeType = hopResult.feeType;
@@ -4745,35 +4760,35 @@ var getXcmFee = /*#__PURE__*/function () {
           forwardedXcms = hopResult.forwardedXcms;
           nextParaId = hopResult.destParaId;
           currentOrigin = nextChain;
-        case 64:
-          _context.prev = 64;
-          _context.next = 67;
-          return hopApi.disconnect();
-        case 67:
-          return _context.finish(64);
         case 68:
+          _context.prev = 68;
+          _context.next = 71;
+          return hopApi.disconnect();
+        case 71:
+          return _context.finish(68);
+        case 72:
           _context.next = 38;
           break;
-        case 70:
+        case 74:
           processedBridgeHubData = intermediateFees.bridgeHub;
           if (!(intermediateFees.bridgeHub && !intermediateFees.bridgeHub.dryRunError && destination === 'Ethereum')) {
-            _context.next = 81;
+            _context.next = 85;
             break;
           }
           ahApi = api.clone();
-          _context.next = 75;
+          _context.next = 79;
           return ahApi.init(assetHubNode, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 75:
-          _context.next = 77;
+        case 79:
+          _context.next = 81;
           return getParaEthTransferFees(ahApi);
-        case 77:
+        case 81:
           _yield$getParaEthTran = _context.sent;
           _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 1);
           bridgeFee = _yield$getParaEthTran2[0];
           processedBridgeHubData = _objectSpread2(_objectSpread2({}, intermediateFees.bridgeHub), {}, {
             fee: intermediateFees.bridgeHub.fee + bridgeFee
           });
-        case 81:
+        case 85:
           intermediateFees.bridgeHub = processedBridgeHubData;
           return _context.abrupt("return", _objectSpread2(_objectSpread2({
             origin: _objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
@@ -4796,11 +4811,11 @@ var getXcmFee = /*#__PURE__*/function () {
               dryRunError: destinationDryRunError
             })
           }));
-        case 83:
+        case 87:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[16,, 25, 30], [43,, 64, 68]]);
+    }, _callee, null, [[16,, 25, 30], [43,, 68, 72]]);
   }));
   return function getXcmFee(_x) {
     return _ref2.apply(this, arguments);
@@ -4874,6 +4889,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
         case 18:
           _context.next = 20;
           return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+            api: destApi,
             destination: destination
           }), currencyInput);
         case 20:
@@ -6072,7 +6088,7 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
           },
           weight_limit: {
             Limited: {
-              ref_time: 100n,
+              ref_time: 150n,
               proof_size: 0n
             }
           }
@@ -6093,7 +6109,7 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
               fees: {
                 id: asset.multiLocation,
                 fun: {
-                  Fungible: amountWithoutFee
+                  Fungible: amountWithoutFee - executionFee
                 }
               },
               weight_limit: 'Unlimited'
@@ -6443,11 +6459,11 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "handleExecuteTransfer",
     value: function () {
       var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(input) {
-        var api, senderAddress, asset, decimals, multiplier, base, scaledMultiplier, MIN_FEE, maxU64, dummyTx, dryRunResult, feeDotShifted, toMl, feeConverted, feeConvertedPadded;
+        var api, senderAddress, asset, feeAsset, decimals, multiplier, base, scaledMultiplier, MIN_FEE, maxU64, dummyTx, dryRunResult, paddedFee;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              api = input.api, senderAddress = input.senderAddress, asset = input.asset;
+              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset;
               if (senderAddress) {
                 _context3.next = 3;
                 break;
@@ -6470,7 +6486,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
                 node: this.node,
                 tx: dummyTx,
                 address: senderAddress,
-                isFeeAsset: false
+                isFeeAsset: !!feeAsset
               });
             case 13:
               dryRunResult = _context3.sent;
@@ -6478,35 +6494,17 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
                 _context3.next = 16;
                 break;
               }
-              throw new DryRunFailedError("Dry run failed: ".concat(dryRunResult.failureReason));
+              throw new DryRunFailedError(dryRunResult.failureReason);
             case 16:
               if (dryRunResult.weight) {
                 _context3.next = 18;
                 break;
               }
-              throw new DryRunFailedError('Dry run failed: weight not found');
+              throw new DryRunFailedError('weight not found');
             case 18:
-              feeDotShifted = dryRunResult.fee / 10n;
-              toMl = transformMultiLocation(asset.multiLocation);
-              _context3.next = 22;
-              return api.quoteAhPrice(DOT_MULTILOCATION, toMl, feeDotShifted);
-            case 22:
-              feeConverted = _context3.sent;
-              if (feeConverted) {
-                _context3.next = 25;
-                break;
-              }
-              throw new InvalidParameterError("Pool DOT -> ".concat(asset.symbol, " not found."));
-            case 25:
-              if (!(BigInt(asset.amount) - feeConverted < 0)) {
-                _context3.next = 27;
-                break;
-              }
-              throw new InvalidParameterError("Insufficient balance. Fee: ".concat(feeConverted, ", Amount: ").concat(asset.amount));
-            case 27:
-              feeConvertedPadded = feeConverted * 3n / 2n; // increases fee by 50%
-              return _context3.abrupt("return", createExecuteXcm(input, dryRunResult.weight, feeConvertedPadded));
-            case 29:
+              paddedFee = dryRunResult.fee * 120n / 100n;
+              return _context3.abrupt("return", createExecuteXcm(input, dryRunResult.weight, paddedFee));
+            case 20:
             case "end":
               return _context3.stop();
           }
@@ -8993,7 +8991,7 @@ function _getEthErc20Balance() {
 
 var buildDestInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, origin, destination, address, currency, originFee, destAsset, isFeeAssetAh, destFeeDetail, assetHubFee, bridgeFee, destApi, destCurrency, edDest, edDestBn, destBalance, destAmount, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, isAssetHubToAssetHubRoute, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
+    var api, origin, destination, address, currency, originFee, destAsset, isFeeAssetAh, destFeeDetail, assetHubFee, bridgeFee, destApi, destCurrency, edDest, edDestBn, destBalance, destAmount, effectiveAmountForBalance, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, isAssetHubToAssetHubRoute, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -9042,9 +9040,13 @@ var buildDestInfo = /*#__PURE__*/function () {
         case 19:
           destBalance = _context.t0;
           destAmount = isFeeAssetAh ? BigInt(currency.amount) - originFee : BigInt(currency.amount);
-          destBalanceSufficient = destAmount - destFeeDetail.fee > (destBalance < edDestBn ? edDestBn : 0);
+          effectiveAmountForBalance = destAmount;
+          if (destination === 'Ethereum' && assetHubFee !== undefined) {
+            effectiveAmountForBalance -= assetHubFee;
+          }
+          destBalanceSufficient = effectiveAmountForBalance - destFeeDetail.fee > (destBalance < edDestBn ? edDestBn : 0);
           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) + destAmount;
+          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;
           isAssetHubToAssetHubRoute = origin === 'AssetHubKusama' && destination === 'AssetHubPolkadot' || origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama';
           if (isAssetHubToAssetHubRoute) {
@@ -9069,44 +9071,41 @@ var buildDestInfo = /*#__PURE__*/function () {
               receivedAmount = destbalanceAfterResult - destBalance;
             }
           }
-          if (destination === 'Ethereum' && assetHubFee && !(receivedAmount instanceof UnableToComputeError)) {
-            receivedAmount -= assetHubFee;
-          }
           isDestFeeInNativeCurrency = destFeeDetail.currency === assets.getNativeAssetSymbol(destination);
           if (!isDestFeeInNativeCurrency) {
-            _context.next = 43;
+            _context.next = 44;
             break;
           }
           if (!(destination === 'Ethereum')) {
-            _context.next = 36;
+            _context.next = 37;
             break;
           }
-          _context.next = 33;
+          _context.next = 34;
           return getEthErc20Balance({
             symbol: assets.getNativeAssetSymbol(destination)
           }, address);
-        case 33:
+        case 34:
           _context.t1 = _context.sent;
-          _context.next = 39;
+          _context.next = 40;
           break;
-        case 36:
-          _context.next = 38;
+        case 37:
+          _context.next = 39;
           return getBalanceNativeInternal({
             address: address,
             node: destination,
             api: destApi
           });
-        case 38:
-          _context.t1 = _context.sent;
         case 39:
+          _context.t1 = _context.sent;
+        case 40:
           destRecipientNativeBalance = _context.t1;
           destXcmFeeBalance = destRecipientNativeBalance;
-          _context.next = 44;
+          _context.next = 45;
           break;
-        case 43:
-          destXcmFeeBalance = destBalance;
         case 44:
-          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeDetail.currency === destAsset.symbol ? BigInt(currency.amount) : 0n);
+          destXcmFeeBalance = destBalance;
+        case 45:
+          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeDetail.currency === destAsset.symbol ? effectiveAmountForBalance : 0n);
           return _context.abrupt("return", {
             receivedCurrency: {
               sufficient: destBalanceSufficientResult,
@@ -9123,7 +9122,7 @@ var buildDestInfo = /*#__PURE__*/function () {
               currencySymbol: destFeeDetail.currency
             }
           });
-        case 46:
+        case 47:
         case "end":
           return _context.stop();
       }
@@ -9420,7 +9419,7 @@ var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, edBN, balance, xcmFeeResult, dryRunError, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, totalFee, method, feeToSubtract;
+    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, edBN, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -9485,7 +9484,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           });
         case 22:
           xcmFeeResult = _context.sent;
-          dryRunError = xcmFeeResult.origin.dryRunError, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeCurrency = _xcmFeeResult$destina.currency, destDryRunError = _xcmFeeResult$destina.dryRunError;
+          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;
           if (!(destFee === undefined)) {
             _context.next = 26;
             break;
@@ -9498,18 +9497,25 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           }
           throw new DryRunFailedError(dryRunError, 'origin');
         case 28:
+          hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
+          if (!hopDryRunError) {
+            _context.next = 31;
+            break;
+          }
+          throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
+        case 31:
           if (!destDryRunError) {
-            _context.next = 30;
+            _context.next = 33;
             break;
           }
           throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
-        case 30:
+        case 33:
           if (!(assets.normalizeSymbol(asset.symbol) !== assets.normalizeSymbol(destFeeCurrency))) {
-            _context.next = 32;
+            _context.next = 35;
             break;
           }
           throw new UnableToComputeError("The XCM fee could not be calculated because the origin or destination chain does not support DryRun.\n       As a result, fee estimation is only available through PaymentInfo, which provides the cost in the native asset.\n       This limitation restricts support to transfers involving the native asset of the Destination chain only.");
-        case 32:
+        case 35:
           totalFee = calculateTotalXcmFee(xcmFeeResult);
           method = api.getMethod(tx);
           if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
@@ -9518,7 +9524,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
             feeToSubtract = destFee;
           }
           return _context.abrupt("return", BigInt(currency.amount) - feeToSubtract > (balance < edBN ? edBN : 0));
-        case 36:
+        case 39:
         case "end":
           return _context.stop();
       }
@@ -10358,6 +10364,7 @@ exports.getXcmFee = getXcmFee;
 exports.getXcmFeeEstimate = getXcmFeeEstimate;
 exports.isEthersContract = isEthersContract;
 exports.isEthersSigner = isEthersSigner;
+exports.replaceBigInt = replaceBigInt;
 exports.resolveModuleError = resolveModuleError;
 exports.resolveParaId = resolveParaId;
 exports.reverseTransformMultiLocation = reverseTransformMultiLocation;

package/dist/index.d.ts

@@ -673,7 +673,7 @@ declare class DryRunFailedError extends Error {
      * @param reason - The reason why the dry run failed.
      * @param dryRunType - Optional. Specifies if the error is related to the 'origin' or 'destination' dry run.
      */
-    constructor(reason: string, dryRunType?: 'origin' | 'destination');
+    constructor(reason: string, dryRunType?: 'origin' | 'destination' | 'assetHub' | 'bridgeHub');
 }
 
 /**
@@ -869,6 +869,7 @@ type TGetOriginXcmFeeBaseOptions<TRes> = {
 };
 type TGetOriginXcmFeeOptions<TApi, TRes> = WithApi<TGetOriginXcmFeeBaseOptions<TRes>, TApi, TRes>;
 type TGetFeeForDestNodeBaseOptions = {
+    prevNode: TNodeDotKsmWithRelayChains;
     origin: TNodeDotKsmWithRelayChains;
     destination: TNodeWithRelayChains;
     senderAddress: string;
@@ -881,7 +882,7 @@ type TGetFeeForDestNodeBaseOptions = {
     disableFallback: boolean;
 };
 type TGetFeeForDestNodeOptions<TApi, TRes> = WithApi<TGetFeeForDestNodeBaseOptions, TApi, TRes>;
-type TGetReverseTxFeeOptions<TApi, TRes> = Omit<TGetFeeForDestNodeOptions<TApi, TRes>, 'destination' | 'disableFallback' | 'forwardedXcms' | 'asset' | 'originFee'> & {
+type TGetReverseTxFeeOptions<TApi, TRes> = Omit<TGetFeeForDestNodeOptions<TApi, TRes>, 'destination' | 'disableFallback' | 'forwardedXcms' | 'asset' | 'originFee' | 'prevNode'> & {
     destination: TNodeDotKsmWithRelayChains;
 };
 type THubKey = 'assetHub' | 'bridgeHub';
@@ -1869,6 +1870,8 @@ declare const reverseTransformMultiLocation: (multiLocation: TMultiLocation) =>
  */
 declare const transformMultiLocation: (multiLocation: TMultiLocation) => TMultiLocation;
 
+declare const replaceBigInt: (_key: string, value: unknown) => unknown;
+
 declare const resolveParaId: (paraId: number | undefined, destination: TDestination) => number | undefined;
 
 declare const validateAddress: (address: TAddress, node: TNodeWithRelayChains, isDestination?: boolean) => void;
@@ -1881,5 +1884,5 @@ declare const validateAddress: (address: TAddress, node: TNodeWithRelayChains, i
  */
 declare const determineRelayChain: (node: TNodeWithRelayChains) => TRelaychain;
 
-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, Version, XTokensError, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, generateAddressMultiLocationV4, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, isEthersContract, isEthersSigner, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, 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, Version, XTokensError, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, generateAddressMultiLocationV4, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, isEthersContract, isEthersSigner, replaceBigInt, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };
 export type { IPolkadotApi, IPolkadotXCMTransfer, IXTokensTransfer, IXTransferTransfer, OneKey, TAddress, TApiOrUrl, TAssetClaimOptions, TAssetClaimOptionsBase, TBalanceResponse, TBatchOptions, TBifrostToken, TBridgeStatus, TCreateBeneficiaryOptions, TDestWeight, TDestination, TDryRunBaseOptions, TDryRunCallBaseOptions, TDryRunCallOptions, 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, THubKey, TMantaAsset, TModuleError, TNativeTokenAsset, TNodeConfig, TNodeConfigMap, TNodleAsset, TOriginFeeDetails, TOtherReserveAsset, TPolkadotXCMTransferOptions, TPolkadotXcmSection, TProviderEntry, TRelayToParaDestination, TRelayToParaOptions, TRelayToParaOverrides, TRelaychain, TReserveAsset, TScenario, TSelfReserveAsset, TSendBaseOptions, TSendBaseOptionsWithSenderAddress, TSendInternalOptions, TSendOptions, TSerializeEthTransferOptions, TSerializedApiCall, TSerializedEthTransfer, TTransferInfo, TTransferLocalOptions, TVerifyEdOnDestinationOptions, TVerifyEdOnDestinationOptionsBase, TVersionClaimAssets, TWeight, TXTokensCurrencySelection, TXTokensSection, TXTokensTransferOptions, TXTransferSection, TXTransferTransferOptions, TXcmAsset, TXcmFeeBase, TXcmFeeDetail, TXcmForeignAsset, TXcmPalletSection, TXcmVersioned, TZeitgeistAsset, WithApi, WithRequiredSenderAddress };

package/dist/index.mjs

@@ -610,7 +610,7 @@ var DryRunFailedError = /*#__PURE__*/function (_Error) {
     _classCallCheck(this, DryRunFailedError);
     var message = "Dry run failed: ".concat(reason);
     if (dryRunType) {
-      message = "Dry run ".concat(dryRunType, " failed: ").concat(reason);
+      message = "Dry run on ".concat(dryRunType, " failed: ").concat(reason);
     }
     _this = _callSuper(this, DryRunFailedError, [message]);
     _this.name = 'DryRunFailedError';
@@ -2779,6 +2779,10 @@ var getNode = function getNode(node) {
   return nodeMap[node];
 };
 
+var replaceBigInt = function replaceBigInt(_key, value) {
+  return typeof value === 'bigint' ? value.toString() : value;
+};
+
 var resolveParaId = function resolveParaId(paraId, destination) {
   if (isTMultiLocation(destination) || isRelayChain(destination) || destination === 'Ethereum') {
     return undefined;
@@ -4085,11 +4089,11 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
 };
 var getDestXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
-    var api, origin, destination, currency, forwardedXcms, asset, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, dryRunResult, fee, newForwardedXcms, destParaId;
+    var api, origin, hopNode, destination, currency, forwardedXcms, asset, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, dryRunResult, fee, newForwardedXcms, destParaId;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
+          api = options.api, origin = options.origin, hopNode = options.prevNode, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           calcPaymentInfoFee = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -4108,7 +4112,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
                       _context.next = 5;
                       break;
                     }
-                    throw new InvalidCurrencyError("Currency ".concat(JSON.stringify(currency), " not found in ").concat(origin));
+                    throw new InvalidCurrencyError("Currency ".concat(JSON.stringify(currency, replaceBigInt), " not found in ").concat(origin));
                   case 5:
                     if (!originAsset.multiLocation) {
                       _context.next = 19;
@@ -4174,7 +4178,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
         case 8:
           _context2.next = 10;
           return api.getDryRunXcm({
-            originLocation: addXcmVersionHeader(createOriginLocation(origin, destination), Version.V4),
+            originLocation: addXcmVersionHeader(createOriginLocation(hopNode, destination), Version.V4),
             xcm: forwardedXcms[1][0],
             node: destination,
             origin: origin,
@@ -4554,7 +4558,7 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
 
 var getXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, destApi, destFeeRes, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, nextChain, hopApi, hopResult, failingRecord, hopIsDestination, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, destApi, destFeeRes, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, nextChain, hopApi, hopResult, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -4603,6 +4607,7 @@ var getXcmFee = /*#__PURE__*/function () {
             forwardedXcms: undefined,
             // force paymentInfo
             origin: origin,
+            prevNode: origin,
             destination: destination,
             currency: currency,
             address: address,
@@ -4651,7 +4656,7 @@ var getXcmFee = /*#__PURE__*/function () {
           destinationFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
         case 38:
           if (!(Array.isArray(forwardedXcms) && forwardedXcms.length > 0 && forwardedXcms[1].length > 0 && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
-            _context.next = 70;
+            _context.next = 74;
             break;
           }
           nextChain = getTNode(nextParaId, determineRelayChain(origin) === 'Polkadot' ? 'polkadot' : 'kusama');
@@ -4670,7 +4675,8 @@ var getXcmFee = /*#__PURE__*/function () {
           return getDestXcmFee({
             api: hopApi,
             forwardedXcms: forwardedXcms,
-            origin: currentOrigin,
+            origin: origin,
+            prevNode: currentOrigin,
             destination: nextChain,
             currency: currency,
             address: address,
@@ -4683,7 +4689,7 @@ var getXcmFee = /*#__PURE__*/function () {
         case 48:
           hopResult = _context.sent;
           if (!hopResult.dryRunError) {
-            _context.next = 60;
+            _context.next = 64;
             break;
           }
           failingRecord = {
@@ -4704,14 +4710,23 @@ var getXcmFee = /*#__PURE__*/function () {
           }
           // We failed before the true destination, use fallback via paymentInfo.
           if (hopIsDestination) {
-            _context.next = 59;
+            _context.next = 63;
             break;
           }
-          _context.next = 56;
+          _destApi = api.clone();
+          if (!(destination !== 'Ethereum')) {
+            _context.next = 58;
+            break;
+          }
+          _context.next = 58;
+          return _destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
+        case 58:
+          _context.next = 60;
           return getDestXcmFee({
-            api: hopApi,
+            api: _destApi,
             forwardedXcms: undefined,
-            origin: nextChain,
+            origin: origin,
+            prevNode: currentOrigin,
             destination: destination,
             currency: currency,
             address: address,
@@ -4720,13 +4735,13 @@ var getXcmFee = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
-        case 56:
+        case 60:
           destFallback = _context.sent;
           destinationFee = destFallback.fee;
           destinationFeeType = destFallback.feeType;
-        case 59:
-          return _context.abrupt("break", 70);
-        case 60:
+        case 63:
+          return _context.abrupt("break", 74);
+        case 64:
           if (nextChain === destination || isRelayChain(nextChain) && !isRelayChain(destination)) {
             destinationFee = hopResult.fee;
             destinationFeeType = hopResult.feeType;
@@ -4746,35 +4761,35 @@ var getXcmFee = /*#__PURE__*/function () {
           forwardedXcms = hopResult.forwardedXcms;
           nextParaId = hopResult.destParaId;
           currentOrigin = nextChain;
-        case 64:
-          _context.prev = 64;
-          _context.next = 67;
-          return hopApi.disconnect();
-        case 67:
-          return _context.finish(64);
         case 68:
+          _context.prev = 68;
+          _context.next = 71;
+          return hopApi.disconnect();
+        case 71:
+          return _context.finish(68);
+        case 72:
           _context.next = 38;
           break;
-        case 70:
+        case 74:
           processedBridgeHubData = intermediateFees.bridgeHub;
           if (!(intermediateFees.bridgeHub && !intermediateFees.bridgeHub.dryRunError && destination === 'Ethereum')) {
-            _context.next = 81;
+            _context.next = 85;
             break;
           }
           ahApi = api.clone();
-          _context.next = 75;
+          _context.next = 79;
           return ahApi.init(assetHubNode, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 75:
-          _context.next = 77;
+        case 79:
+          _context.next = 81;
           return getParaEthTransferFees(ahApi);
-        case 77:
+        case 81:
           _yield$getParaEthTran = _context.sent;
           _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 1);
           bridgeFee = _yield$getParaEthTran2[0];
           processedBridgeHubData = _objectSpread2(_objectSpread2({}, intermediateFees.bridgeHub), {}, {
             fee: intermediateFees.bridgeHub.fee + bridgeFee
           });
-        case 81:
+        case 85:
           intermediateFees.bridgeHub = processedBridgeHubData;
           return _context.abrupt("return", _objectSpread2(_objectSpread2({
             origin: _objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
@@ -4797,11 +4812,11 @@ var getXcmFee = /*#__PURE__*/function () {
               dryRunError: destinationDryRunError
             })
           }));
-        case 83:
+        case 87:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[16,, 25, 30], [43,, 64, 68]]);
+    }, _callee, null, [[16,, 25, 30], [43,, 68, 72]]);
   }));
   return function getXcmFee(_x) {
     return _ref2.apply(this, arguments);
@@ -4875,6 +4890,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
         case 18:
           _context.next = 20;
           return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+            api: destApi,
             destination: destination
           }), currencyInput);
         case 20:
@@ -6073,7 +6089,7 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
           },
           weight_limit: {
             Limited: {
-              ref_time: 100n,
+              ref_time: 150n,
               proof_size: 0n
             }
           }
@@ -6094,7 +6110,7 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
               fees: {
                 id: asset.multiLocation,
                 fun: {
-                  Fungible: amountWithoutFee
+                  Fungible: amountWithoutFee - executionFee
                 }
               },
               weight_limit: 'Unlimited'
@@ -6444,11 +6460,11 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "handleExecuteTransfer",
     value: function () {
       var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(input) {
-        var api, senderAddress, asset, decimals, multiplier, base, scaledMultiplier, MIN_FEE, maxU64, dummyTx, dryRunResult, feeDotShifted, toMl, feeConverted, feeConvertedPadded;
+        var api, senderAddress, asset, feeAsset, decimals, multiplier, base, scaledMultiplier, MIN_FEE, maxU64, dummyTx, dryRunResult, paddedFee;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              api = input.api, senderAddress = input.senderAddress, asset = input.asset;
+              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset;
               if (senderAddress) {
                 _context3.next = 3;
                 break;
@@ -6471,7 +6487,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
                 node: this.node,
                 tx: dummyTx,
                 address: senderAddress,
-                isFeeAsset: false
+                isFeeAsset: !!feeAsset
               });
             case 13:
               dryRunResult = _context3.sent;
@@ -6479,35 +6495,17 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
                 _context3.next = 16;
                 break;
               }
-              throw new DryRunFailedError("Dry run failed: ".concat(dryRunResult.failureReason));
+              throw new DryRunFailedError(dryRunResult.failureReason);
             case 16:
               if (dryRunResult.weight) {
                 _context3.next = 18;
                 break;
               }
-              throw new DryRunFailedError('Dry run failed: weight not found');
+              throw new DryRunFailedError('weight not found');
             case 18:
-              feeDotShifted = dryRunResult.fee / 10n;
-              toMl = transformMultiLocation(asset.multiLocation);
-              _context3.next = 22;
-              return api.quoteAhPrice(DOT_MULTILOCATION, toMl, feeDotShifted);
-            case 22:
-              feeConverted = _context3.sent;
-              if (feeConverted) {
-                _context3.next = 25;
-                break;
-              }
-              throw new InvalidParameterError("Pool DOT -> ".concat(asset.symbol, " not found."));
-            case 25:
-              if (!(BigInt(asset.amount) - feeConverted < 0)) {
-                _context3.next = 27;
-                break;
-              }
-              throw new InvalidParameterError("Insufficient balance. Fee: ".concat(feeConverted, ", Amount: ").concat(asset.amount));
-            case 27:
-              feeConvertedPadded = feeConverted * 3n / 2n; // increases fee by 50%
-              return _context3.abrupt("return", createExecuteXcm(input, dryRunResult.weight, feeConvertedPadded));
-            case 29:
+              paddedFee = dryRunResult.fee * 120n / 100n;
+              return _context3.abrupt("return", createExecuteXcm(input, dryRunResult.weight, paddedFee));
+            case 20:
             case "end":
               return _context3.stop();
           }
@@ -8994,7 +8992,7 @@ function _getEthErc20Balance() {
 
 var buildDestInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, origin, destination, address, currency, originFee, destAsset, isFeeAssetAh, destFeeDetail, assetHubFee, bridgeFee, destApi, destCurrency, edDest, edDestBn, destBalance, destAmount, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, isAssetHubToAssetHubRoute, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
+    var api, origin, destination, address, currency, originFee, destAsset, isFeeAssetAh, destFeeDetail, assetHubFee, bridgeFee, destApi, destCurrency, edDest, edDestBn, destBalance, destAmount, effectiveAmountForBalance, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, isAssetHubToAssetHubRoute, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -9043,9 +9041,13 @@ var buildDestInfo = /*#__PURE__*/function () {
         case 19:
           destBalance = _context.t0;
           destAmount = isFeeAssetAh ? BigInt(currency.amount) - originFee : BigInt(currency.amount);
-          destBalanceSufficient = destAmount - destFeeDetail.fee > (destBalance < edDestBn ? edDestBn : 0);
+          effectiveAmountForBalance = destAmount;
+          if (destination === 'Ethereum' && assetHubFee !== undefined) {
+            effectiveAmountForBalance -= assetHubFee;
+          }
+          destBalanceSufficient = effectiveAmountForBalance - destFeeDetail.fee > (destBalance < edDestBn ? edDestBn : 0);
           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) + destAmount;
+          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;
           isAssetHubToAssetHubRoute = origin === 'AssetHubKusama' && destination === 'AssetHubPolkadot' || origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama';
           if (isAssetHubToAssetHubRoute) {
@@ -9070,44 +9072,41 @@ var buildDestInfo = /*#__PURE__*/function () {
               receivedAmount = destbalanceAfterResult - destBalance;
             }
           }
-          if (destination === 'Ethereum' && assetHubFee && !(receivedAmount instanceof UnableToComputeError)) {
-            receivedAmount -= assetHubFee;
-          }
           isDestFeeInNativeCurrency = destFeeDetail.currency === getNativeAssetSymbol(destination);
           if (!isDestFeeInNativeCurrency) {
-            _context.next = 43;
+            _context.next = 44;
             break;
           }
           if (!(destination === 'Ethereum')) {
-            _context.next = 36;
+            _context.next = 37;
             break;
           }
-          _context.next = 33;
+          _context.next = 34;
           return getEthErc20Balance({
             symbol: getNativeAssetSymbol(destination)
           }, address);
-        case 33:
+        case 34:
           _context.t1 = _context.sent;
-          _context.next = 39;
+          _context.next = 40;
           break;
-        case 36:
-          _context.next = 38;
+        case 37:
+          _context.next = 39;
           return getBalanceNativeInternal({
             address: address,
             node: destination,
             api: destApi
           });
-        case 38:
-          _context.t1 = _context.sent;
         case 39:
+          _context.t1 = _context.sent;
+        case 40:
           destRecipientNativeBalance = _context.t1;
           destXcmFeeBalance = destRecipientNativeBalance;
-          _context.next = 44;
+          _context.next = 45;
           break;
-        case 43:
-          destXcmFeeBalance = destBalance;
         case 44:
-          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeDetail.currency === destAsset.symbol ? BigInt(currency.amount) : 0n);
+          destXcmFeeBalance = destBalance;
+        case 45:
+          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeDetail.currency === destAsset.symbol ? effectiveAmountForBalance : 0n);
           return _context.abrupt("return", {
             receivedCurrency: {
               sufficient: destBalanceSufficientResult,
@@ -9124,7 +9123,7 @@ var buildDestInfo = /*#__PURE__*/function () {
               currencySymbol: destFeeDetail.currency
             }
           });
-        case 46:
+        case 47:
         case "end":
           return _context.stop();
       }
@@ -9421,7 +9420,7 @@ var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, edBN, balance, xcmFeeResult, dryRunError, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, totalFee, method, feeToSubtract;
+    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, edBN, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -9486,7 +9485,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           });
         case 22:
           xcmFeeResult = _context.sent;
-          dryRunError = xcmFeeResult.origin.dryRunError, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeCurrency = _xcmFeeResult$destina.currency, destDryRunError = _xcmFeeResult$destina.dryRunError;
+          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;
           if (!(destFee === undefined)) {
             _context.next = 26;
             break;
@@ -9499,18 +9498,25 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           }
           throw new DryRunFailedError(dryRunError, 'origin');
         case 28:
+          hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
+          if (!hopDryRunError) {
+            _context.next = 31;
+            break;
+          }
+          throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
+        case 31:
           if (!destDryRunError) {
-            _context.next = 30;
+            _context.next = 33;
             break;
           }
           throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
-        case 30:
+        case 33:
           if (!(normalizeSymbol(asset.symbol) !== normalizeSymbol(destFeeCurrency))) {
-            _context.next = 32;
+            _context.next = 35;
             break;
           }
           throw new UnableToComputeError("The XCM fee could not be calculated because the origin or destination chain does not support DryRun.\n       As a result, fee estimation is only available through PaymentInfo, which provides the cost in the native asset.\n       This limitation restricts support to transfers involving the native asset of the Destination chain only.");
-        case 32:
+        case 35:
           totalFee = calculateTotalXcmFee(xcmFeeResult);
           method = api.getMethod(tx);
           if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
@@ -9519,7 +9525,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
             feeToSubtract = destFee;
           }
           return _context.abrupt("return", BigInt(currency.amount) - feeToSubtract > (balance < edBN ? edBN : 0));
-        case 36:
+        case 39:
         case "end":
           return _context.stop();
       }
@@ -10301,4 +10307,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, Version, XTokensError, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, generateAddressMultiLocationV4, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, isEthersContract, isEthersSigner, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, 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, Version, XTokensError, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, generateAddressMultiLocationV4, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, isEthersContract, isEthersSigner, replaceBigInt, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "10.1.0",
+  "version": "10.1.2",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -27,9 +27,9 @@
     "@scure/base": "^1.2.5",
     "ethers": "^6.13.7",
     "viem": "^2.28.1",
-    "@paraspell/assets": "10.1.0",
-    "@paraspell/sdk-common": "10.1.0",
-    "@paraspell/pallets": "10.1.0"
+    "@paraspell/pallets": "10.1.2",
+    "@paraspell/sdk-common": "10.1.2",
+    "@paraspell/assets": "10.1.2"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.27.1",