@paraspell/sdk-core 8.6.2 → 8.7.1

package/dist/index.mjs

@@ -2471,10 +2471,71 @@ var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, node)
   throw new InvalidCurrencyError("".concat(isDestination ? 'Destination' : 'Origin', " node ").concat(node, " does not support currency ").concat(JSON.stringify(currency), "."));
 };
 
+var isPrimitive = function isPrimitive(obj) {
+  return obj !== Object(obj);
+};
+var _deepEqual = function deepEqual(obj1, obj2) {
+  if (obj1 === obj2) return true;
+  if (isPrimitive(obj1) && isPrimitive(obj2)) return obj1 === obj2;
+  if (_typeof(obj1) !== 'object' || obj1 === null || _typeof(obj2) !== 'object' || obj2 === null) {
+    return false;
+  }
+  if (Array.isArray(obj1) !== Array.isArray(obj2)) {
+    return false;
+  }
+  var obj1Keys = Object.keys(obj1).map(function (key) {
+    return key.toLowerCase();
+  });
+  var obj2Keys = Object.keys(obj2).map(function (key) {
+    return key.toLowerCase();
+  });
+  if (obj1Keys.length !== obj2Keys.length) return false;
+  var _iterator = _createForOfIteratorHelper(obj1Keys),
+    _step;
+  try {
+    var _loop = function _loop() {
+        var key = _step.value;
+        var keyInObj2 = obj2Keys.find(function (k) {
+          return k === key;
+        });
+        if (!keyInObj2) return {
+          v: false
+        };
+        var obj1Value = obj1[Object.keys(obj1).find(function (k) {
+          return k.toLowerCase() === key;
+        })];
+        var obj2Value = obj2[Object.keys(obj2).find(function (k) {
+          return k.toLowerCase() === key;
+        })];
+        if (!_deepEqual(obj1Value, obj2Value)) return {
+          v: false
+        };
+      },
+      _ret;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      _ret = _loop();
+      if (_ret) return _ret.v;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return true;
+};
+
 var isForeignAsset = function isForeignAsset(asset) {
   return _typeof(asset) === 'object' && asset !== null && ('assetId' in asset || 'multiLocation' in asset) && !('isNative' in asset);
 };
 
+var isAssetEqual = function isAssetEqual(asset1, asset2) {
+  var ml1 = asset1.multiLocation;
+  var ml2 = asset2.multiLocation;
+  if (ml1 && ml2 && _deepEqual(ml1, ml2)) return true;
+  if (isForeignAsset(asset1) && isForeignAsset(asset2) && asset1.assetId === asset2.assetId) return true;
+  return asset1.symbol.toLowerCase() === asset2.symbol.toLowerCase();
+};
+
 var isSymbolSpecifier = function isSymbolSpecifier(currencySymbolValue) {
   return _typeof(currencySymbolValue) === 'object' && 'type' in currencySymbolValue && 'value' in currencySymbolValue;
 };
@@ -3666,6 +3727,14 @@ var resolveAsset = function resolveAsset(currency, origin, destination, assetChe
   return assetCheckEnabled ? getAssetBySymbolOrId(origin, currency, !isTMultiLocation(destination) ? destination : null) : null;
 };
 
+var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination) {
+  var asset = getAssetBySymbolOrId(origin, feeAsset, !isTMultiLocation(destination) ? destination : null);
+  if (!asset) {
+    throwUnsupportedCurrency(feeAsset, origin);
+  }
+  return asset !== null && asset !== void 0 ? asset : undefined;
+};
+
 var AssetHubPolkadot$2 = {
 	defaultPallet: "PolkadotXcm",
 	supportedPallets: [
@@ -4474,7 +4543,7 @@ var getSupportedPalletsDetails = function getSupportedPalletsDetails(node) {
   return palletsMap[node].supportedPallets;
 };
 
-var validateCurrency = function validateCurrency(currency) {
+var validateCurrency = function validateCurrency(currency, feeAsset) {
   if ('multiasset' in currency) {
     if (currency.multiasset.length === 0) {
       throw new InvalidCurrencyError('Overridden multi assets cannot be empty');
@@ -4482,16 +4551,9 @@ var validateCurrency = function validateCurrency(currency) {
     if (currency.multiasset.length === 1) {
       throw new InvalidCurrencyError('Please provide more than one multi asset');
     }
-    if (currency.multiasset.length > 1 && !currency.multiasset.some(function (asset) {
-      return asset.isFeeAsset;
-    })) {
+    if (currency.multiasset.length > 1 && !feeAsset) {
       throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
     }
-    if (currency.multiasset.length > 1 && currency.multiasset.filter(function (asset) {
-      return asset.isFeeAsset;
-    }).length > 1) {
-      throw new InvalidCurrencyError('Overridden multi assets cannot have more than one fee asset');
-    }
   }
 };
 var validateDestination = function validateDestination(origin, destination) {
@@ -4551,7 +4613,7 @@ var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled
   }
 };
 
-var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled) {
+var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge, assetCheckEnabled, feeAsset) {
   var currency = options.currency,
     origin = options.from,
     destination = options.to;
@@ -4559,6 +4621,9 @@ var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge,
     return currency.multilocation.value;
   }
   if ('multiasset' in currency) {
+    if (!feeAsset) {
+      throw new InvalidCurrencyError('Overridden multi assets cannot be used without specifying fee asset');
+    }
     if (currency.multiasset.every(function (asset) {
       return isTMultiAsset(asset);
     })) {
@@ -4566,18 +4631,30 @@ var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge,
     }
     // MultiAsset is an array of TCurrencyCore, search for assets
     var assets = currency.multiasset.map(function (currency) {
-      var _currency$isFeeAsset;
       var asset = getAssetBySymbolOrId(origin, currency, !isTMultiLocation(destination) ? destination : null);
       if (asset && (!isForeignAsset(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)));
+      }
       validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
       var originTyped = origin;
       var originNode = getNode(originTyped);
       return _objectSpread2({
-        isFeeAsset: (_currency$isFeeAsset = currency.isFeeAsset) !== null && _currency$isFeeAsset !== void 0 ? _currency$isFeeAsset : false
-      }, createMultiAsset(originNode.version, currency.amount, asset === null || asset === void 0 ? void 0 : asset.multiLocation));
+        isFeeAsset: isAssetEqual(feeAsset, 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;
@@ -4606,12 +4683,12 @@ var validateDestinationAddress = function validateDestinationAddress(address, de
 
 var send = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-    var api, origin, currency, address, destination, paraIdTo, version, senderAddress, pallet, method, isBridge, assetCheckEnabled, asset, overriddenAsset, resolvedAsset, originNode;
+    var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, overriddenAsset, resolvedAsset, originNode;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = options.api, origin = options.from, currency = options.currency, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, pallet = options.pallet, method = options.method;
-          validateCurrency(currency);
+          api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, pallet = options.pallet, method = options.method;
+          validateCurrency(currency, feeAsset);
           validateDestination(origin, destination);
           validateDestinationAddress(address, destination);
           if (senderAddress) validateAddress(senderAddress, origin, false);
@@ -4625,23 +4702,24 @@ var send = /*#__PURE__*/function () {
           assetCheckEnabled = determineAssetCheckEnabled(origin, currency, isBridge);
           validateAssetSpecifiers(assetCheckEnabled, currency);
           asset = resolveAsset(currency, origin, destination, assetCheckEnabled);
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination) : undefined;
           validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
           if (!isRelayChain(origin)) {
-            _context.next = 18;
+            _context.next = 19;
             break;
           }
           if (!(destination === 'Ethereum')) {
-            _context.next = 15;
+            _context.next = 16;
             break;
           }
           throw new Error('Transfers from relay chain to Ethereum are not supported.');
-        case 15:
+        case 16:
           if (asset) {
-            _context.next = 17;
+            _context.next = 18;
             break;
           }
           throw new Error('Asset is required for relay chain to relay chain transfers.');
-        case 17:
+        case 18:
           return _context.abrupt("return", transferRelayToPara({
             api: api,
             origin: origin,
@@ -4655,11 +4733,11 @@ var send = /*#__PURE__*/function () {
             pallet: pallet,
             method: method
           }));
-        case 18:
-          overriddenAsset = resolveOverriddenAsset(options, isBridge, assetCheckEnabled);
-          _context.next = 21;
+        case 19:
+          overriddenAsset = resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset);
+          _context.next = 22;
           return api.init(origin);
-        case 21:
+        case 22:
           // In case asset check is disabled, we create asset object from currency symbol
           resolvedAsset = asset !== null && asset !== void 0 ? asset : {
             symbol: 'symbol' in currency ? currency.symbol : undefined
@@ -4670,6 +4748,7 @@ var send = /*#__PURE__*/function () {
             asset: _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
               amount: 'multiasset' in currency ? 0 : currency.amount
             }),
+            feeAsset: resolvedFeeAsset,
             address: address,
             to: destination,
             paraIdTo: paraIdTo,
@@ -4679,7 +4758,7 @@ var send = /*#__PURE__*/function () {
             pallet: pallet,
             method: method
           }));
-        case 24:
+        case 25:
         case "end":
           return _context.stop();
       }
@@ -4749,11 +4828,11 @@ var ParachainNode = /*#__PURE__*/function () {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-        var api, asset, address, destination, paraIdTo, overriddenAsset, version, senderAddress, pallet, method, isRelayDestination, scenario, paraId, versionOrDefault, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input;
+        var api, asset, feeAsset, address, destination, paraIdTo, overriddenAsset, version, senderAddress, pallet, method, isRelayDestination, scenario, paraId, versionOrDefault, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              api = options.api, asset = options.asset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, overriddenAsset = options.overriddenAsset, version = options.version, senderAddress = options.senderAddress, pallet = options.pallet, method = options.method;
+              api = options.api, asset = options.asset, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, overriddenAsset = options.overriddenAsset, version = options.version, senderAddress = options.senderAddress, pallet = options.pallet, method = options.method;
               isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
               scenario = isRelayDestination ? 'ParaToRelay' : 'ParaToPara';
               paraId = resolveParaId(paraIdTo, destination);
@@ -4820,6 +4899,7 @@ var ParachainNode = /*#__PURE__*/function () {
                 currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset),
                 overriddenAsset: overriddenAsset,
                 asset: asset,
+                feeAsset: feeAsset,
                 scenario: scenario,
                 destination: destination,
                 paraIdTo: paraId,
@@ -5120,6 +5200,118 @@ var AssetHubKusama$1 = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
+var transformMultiLocation = function transformMultiLocation(multiLocation) {
+  var newInterior;
+  if (multiLocation.interior === 'Here') {
+    newInterior = 'Here';
+  } else {
+    var junctions = Object.values(multiLocation.interior).flat().filter(function (junction) {
+      return _typeof(junction) === 'object' && junction !== null;
+    });
+    var filteredJunctions = junctions.filter(function (junction) {
+      return !('Parachain' in junction);
+    });
+    if (filteredJunctions.length === 0) {
+      newInterior = 'Here';
+    } else {
+      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
+    }
+  }
+  return _objectSpread2(_objectSpread2({}, multiLocation), {}, {
+    parents: Parents.ZERO,
+    interior: newInterior
+  });
+};
+
+var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
+  var api = input.api,
+    _input$version = input.version,
+    version = _input$version === void 0 ? Version.V4 : _input$version,
+    asset = input.asset,
+    scenario = input.scenario,
+    destination = input.destination,
+    paraIdTo = input.paraIdTo,
+    address = input.address;
+  var destWithHeader = createPolkadotXcmHeader(scenario, version, destination, paraIdTo);
+  var _extractVersionFromHe = extractVersionFromHeader(destWithHeader),
+    _extractVersionFromHe2 = _slicedToArray(_extractVersionFromHe, 2);
+    _extractVersionFromHe2[0];
+    var dest = _extractVersionFromHe2[1];
+  var beneficiaryWithHeader = generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, paraIdTo);
+  var _extractVersionFromHe3 = extractVersionFromHeader(beneficiaryWithHeader),
+    _extractVersionFromHe4 = _slicedToArray(_extractVersionFromHe3, 2);
+    _extractVersionFromHe4[0];
+    var beneficiary = _extractVersionFromHe4[1];
+  var transformedMultiLocation = transformMultiLocation(asset.multiLocation);
+  var amountWithoutFee = BigInt(asset.amount) - executionFee;
+  var call = {
+    module: 'PolkadotXcm',
+    section: 'execute',
+    parameters: {
+      message: _defineProperty({}, version, [{
+        WithdrawAsset: [{
+          id: transformedMultiLocation,
+          fun: {
+            Fungible: asset.amount
+          }
+        }]
+      }, {
+        BuyExecution: {
+          fees: {
+            id: transformedMultiLocation,
+            fun: {
+              Fungible: executionFee
+            }
+          },
+          weight_limit: {
+            Limited: {
+              ref_time: 100n,
+              proof_size: 0n
+            }
+          }
+        }
+      }, {
+        DepositReserveAsset: {
+          assets: {
+            Definite: [{
+              id: transformedMultiLocation,
+              fun: {
+                Fungible: amountWithoutFee
+              }
+            }]
+          },
+          dest: dest,
+          xcm: [{
+            BuyExecution: {
+              fees: {
+                id: asset.multiLocation,
+                fun: {
+                  Fungible: amountWithoutFee
+                }
+              },
+              weight_limit: 'Unlimited'
+            }
+          }, {
+            DepositAsset: {
+              assets: {
+                Wild: {
+                  AllCounted: 1
+                }
+              },
+              beneficiary: beneficiary
+            }
+          }]
+        }
+      }]),
+      max_weight: {
+        ref_time: weight.refTime,
+        proof_size: weight.proofSize
+      }
+    }
+  };
+  return api.callTxMethod(call);
+};
+
 var generateAddressMultiLocationV4 = function generateAddressMultiLocationV4(api, address) {
   var isMultiLocation = _typeof(address) === 'object';
   if (isMultiLocation) {
@@ -5164,7 +5356,8 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
     _this.handleBifrostEthTransfer = function (input) {
       var api = input.api,
         scenario = input.scenario,
-        version = input.version,
+        _input$version = input.version,
+        version = _input$version === void 0 ? _this.version : _input$version,
         destination = input.destination,
         asset = input.asset;
       if (!isForeignAsset(asset)) {
@@ -5173,19 +5366,18 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       if (!asset.multiLocation) {
         throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
       }
-      var versionOrDefault = version !== null && version !== void 0 ? version : _this.version;
       var call = {
         module: 'PolkadotXcm',
         section: 'transfer_assets_using_type_and_then',
         parameters: {
-          dest: _this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, getParaId('BifrostPolkadot')),
-          assets: _defineProperty({}, versionOrDefault, [createMultiAsset(versionOrDefault, asset.amount, asset.multiLocation)]),
+          dest: _this.createPolkadotXcmHeader(scenario, version, destination, getParaId('BifrostPolkadot')),
+          assets: _defineProperty({}, version, [createMultiAsset(version, asset.amount, asset.multiLocation)]),
           assets_transfer_type: 'LocalReserve',
-          remote_fees_id: _defineProperty({}, versionOrDefault, {
+          remote_fees_id: _defineProperty({}, version, {
             Concrete: asset.multiLocation
           }),
           fees_transfer_type: 'LocalReserve',
-          custom_xcm_on_dest: createCustomXcmToBifrost(input, versionOrDefault),
+          custom_xcm_on_dest: createCustomXcmToBifrost(input, version),
           weight_limit: 'Unlimited'
         }
       };
@@ -5284,11 +5476,12 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
         paraIdTo = input.paraIdTo,
         scenario = input.scenario,
         api = input.api,
-        version = input.version,
+        _input$version2 = input.version,
+        version = _input$version2 === void 0 ? this.version : _input$version2,
         address = input.address;
       if ((((_asset$symbol = asset.symbol) === null || _asset$symbol === void 0 ? void 0 : _asset$symbol.toUpperCase()) === 'USDT' || ((_asset$symbol2 = asset.symbol) === null || _asset$symbol2 === void 0 ? void 0 : _asset$symbol2.toUpperCase()) === 'USDC') && destination === 'BifrostPolkadot') {
-        var _input$version;
-        var versionOrDefault = (_input$version = input.version) !== null && _input$version !== void 0 ? _input$version : Version.V2;
+        var _input$version3;
+        var versionOrDefault = (_input$version3 = input.version) !== null && _input$version3 !== void 0 ? _input$version3 : Version.V2;
         return _objectSpread2(_objectSpread2({}, input), {}, {
           header: this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, paraIdTo),
           addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, versionOrDefault, paraIdTo),
@@ -5296,9 +5489,8 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
         });
       }
       if ((destination === 'Hydration' || destination === 'Polimec' || destination === 'Moonbeam' || destination === 'BifrostPolkadot') && asset.symbol === 'DOT') {
-        var _versionOrDefault = version !== null && version !== void 0 ? version : this.version;
         return _objectSpread2(_objectSpread2({}, input), {}, {
-          currencySelection: createVersionedMultiAssets(_versionOrDefault, asset.amount, DOT_MULTILOCATION)
+          currencySelection: createVersionedMultiAssets(version, asset.amount, DOT_MULTILOCATION)
         });
       }
       return input;
@@ -5310,12 +5502,92 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       if (destination === 'Polimec' || destination === 'Moonbeam') return 'transfer_assets';
       return scenario === 'ParaToPara' && !isSystemNode ? 'limited_reserve_transfer_assets' : 'limited_teleport_assets';
     }
+  }, {
+    key: "handleExecuteTransfer",
+    value: function () {
+      var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(input) {
+        var api, senderAddress, asset, MIN_FEE, maxU64, dummyTx, dryRunResult, feeDotShifted, toMl, feeConverted, feeConvertedPadded;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              api = input.api, senderAddress = input.senderAddress, asset = input.asset;
+              if (senderAddress) {
+                _context.next = 3;
+                break;
+              }
+              throw new Error('Please provide senderAddress');
+            case 3:
+              validateAddress(senderAddress, this.node, false);
+              MIN_FEE = 150000n;
+              maxU64 = (1n << 64n) - 1n;
+              dummyTx = createExecuteXcm(input, {
+                refTime: maxU64,
+                proofSize: maxU64
+              }, MIN_FEE);
+              _context.next = 9;
+              return api.getDryRun({
+                node: this.node,
+                tx: dummyTx,
+                address: senderAddress
+              });
+            case 9:
+              dryRunResult = _context.sent;
+              if (dryRunResult.success) {
+                _context.next = 12;
+                break;
+              }
+              throw new Error("Dry run failed: ".concat(dryRunResult.failureReason));
+            case 12:
+              if (dryRunResult.weight) {
+                _context.next = 14;
+                break;
+              }
+              throw new Error('Dry run failed: weight not found');
+            case 14:
+              feeDotShifted = dryRunResult.fee / 10n;
+              toMl = transformMultiLocation(asset.multiLocation);
+              _context.next = 18;
+              return api.quoteAhPrice(DOT_MULTILOCATION, toMl, feeDotShifted);
+            case 18:
+              feeConverted = _context.sent;
+              if (feeConverted) {
+                _context.next = 21;
+                break;
+              }
+              throw new Error("Pool DOT -> ".concat(asset.symbol, " not found."));
+            case 21:
+              if (!(BigInt(asset.amount) - feeConverted < 0)) {
+                _context.next = 23;
+                break;
+              }
+              throw new Error("Insufficient balance. Fee: ".concat(feeConverted, ", Amount: ").concat(asset.amount));
+            case 23:
+              feeConvertedPadded = feeConverted * 3n / 2n; // increases fee by 50%
+              return _context.abrupt("return", createExecuteXcm(input, dryRunResult.weight, feeConvertedPadded));
+            case 25:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function handleExecuteTransfer(_x) {
+        return _handleExecuteTransfer.apply(this, arguments);
+      }
+      return handleExecuteTransfer;
+    }()
   }, {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario,
         asset = input.asset,
-        destination = input.destination;
+        destination = input.destination,
+        feeAsset = input.feeAsset;
+      if (feeAsset) {
+        if (!isAssetEqual(feeAsset, asset)) {
+          throw new InvalidCurrencyError("Fee asset does not match transfer asset.");
+        }
+        return Promise.resolve(this.handleExecuteTransfer(input));
+      }
       if (destination === 'AssetHubKusama') {
         return Promise.resolve(this.handleBridgeTransfer(input, 'Kusama'));
       }
@@ -6735,7 +7007,10 @@ var Polimec$1 = /*#__PURE__*/function (_ParachainNode) {
         section: 'transfer_assets_using_type_and_then',
         parameters: {
           dest: this.createPolkadotXcmHeader('RelayToPara', version, destination, getParaId('AssetHubPolkadot')),
-          assets: _defineProperty({}, version, [createMultiAsset(version, asset.amount, DOT_MULTILOCATION)]),
+          assets: _defineProperty({}, version, [createMultiAsset(version, asset.amount, {
+            parents: Parents.ZERO,
+            interior: 'Here'
+          })]),
           assets_transfer_type: 'Teleport',
           remote_fees_id: _defineProperty({}, version, {
             Concrete: {
@@ -19030,13 +19305,13 @@ var getBalanceForeignPolkadotXcm = /*#__PURE__*/function () {
             _context.next = 12;
             break;
           }
-          if (!(asset.assetId === undefined)) {
+          if (!(asset.multiLocation === undefined)) {
             _context.next = 11;
             break;
           }
-          throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
+          throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multi-location"));
         case 11:
-          return _context.abrupt("return", api.getForeignAssetsByIdBalance(address, asset.assetId));
+          return _context.abrupt("return", api.getAssetHubForeignBalance(address, asset.multiLocation));
         case 12:
           if (!(node === 'AssetHubPolkadot')) {
             _context.next = 18;
@@ -19846,59 +20121,6 @@ var createApiInstanceForNode = /*#__PURE__*/function () {
   };
 }();
 
-var isPrimitive = function isPrimitive(obj) {
-  return obj !== Object(obj);
-};
-var _deepEqual = function deepEqual(obj1, obj2) {
-  if (obj1 === obj2) return true;
-  if (isPrimitive(obj1) && isPrimitive(obj2)) return obj1 === obj2;
-  if (_typeof(obj1) !== 'object' || obj1 === null || _typeof(obj2) !== 'object' || obj2 === null) {
-    return false;
-  }
-  if (Array.isArray(obj1) !== Array.isArray(obj2)) {
-    return false;
-  }
-  var obj1Keys = Object.keys(obj1).map(function (key) {
-    return key.toLowerCase();
-  });
-  var obj2Keys = Object.keys(obj2).map(function (key) {
-    return key.toLowerCase();
-  });
-  if (obj1Keys.length !== obj2Keys.length) return false;
-  var _iterator = _createForOfIteratorHelper(obj1Keys),
-    _step;
-  try {
-    var _loop = function _loop() {
-        var key = _step.value;
-        var keyInObj2 = obj2Keys.find(function (k) {
-          return k === key;
-        });
-        if (!keyInObj2) return {
-          v: false
-        };
-        var obj1Value = obj1[Object.keys(obj1).find(function (k) {
-          return k.toLowerCase() === key;
-        })];
-        var obj2Value = obj2[Object.keys(obj2).find(function (k) {
-          return k.toLowerCase() === key;
-        })];
-        if (!_deepEqual(obj1Value, obj2Value)) return {
-          v: false
-        };
-      },
-      _ret;
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      _ret = _loop();
-      if (_ret) return _ret.v;
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return true;
-};
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
@@ -20421,6 +20643,19 @@ var GeneralBuilder = /*#__PURE__*/function () {
         method: method
       }));
     }
+    /**
+     * Optional fee asset for the transaction.
+     *
+     * @param currency - The currency to be used for the fee.
+     * @returns An instance of the Builder
+     */
+  }, {
+    key: "feeAsset",
+    value: function feeAsset(currency) {
+      return new GeneralBuilder(this.api, this.batchManager, _objectSpread2(_objectSpread2({}, this._options), {}, {
+        feeAsset: currency
+      }));
+    }
     /**
      * Adds the transfer transaction to the batch.
      *
@@ -20563,4 +20798,4 @@ var Builder = function Builder(api) {
   return new GeneralBuilder(api, new BatchTransactionManager());
 };
 
-export { AssetClaimBuilder, BatchMode, Builder, DuplicateAssetError, DuplicateAssetIdError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, Foreign, ForeignAbstract, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidCurrencyError, NODES_WITH_RELAY_CHAINS, NODES_WITH_RELAY_CHAINS_DOT_KSM, NODE_NAMES, NODE_NAMES_DOT_KSM, Native, NoXCMSupportImplementedError, NodeNotSupportedError, Override, Parents, PolkadotXcmError, SUPPORTED_PALLETS, ScenarioNotSupportedError, Version, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createX1Payload, _deepEqual as deepEqual, determineRelayChain, findAssetById, findAssetByMultiLocation, findAssetBySymbol, findBestMatches, generateAddressMultiLocationV4, generateAddressPayload, getAllAssetsSymbols, getAssetBalance, getAssetBalanceInternal, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssetMultiLocation, getAssets, getAssetsObject, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getDefaultPallet, getDryRun, getExistentialDeposit, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNativeAssetSymbol, getNativeAssets, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOtherAssets, getParaEthTransferFees, getParaId, getRelayChainSymbol, getSupportedAssets, getSupportedPallets, getSupportedPalletsDetails, getTNode, getTransferInfo, getTransferableAmount, hasDryRunSupport, hasSupportForAsset, isEthersContract, isEthersSigner, isForeignAsset, isNodeEvm, isOverrideMultiLocationSpecifier, isRelayChain, isSymbolSpecifier, normalizeSymbol, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, BatchMode, Builder, DuplicateAssetError, DuplicateAssetIdError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, Foreign, ForeignAbstract, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidCurrencyError, NODES_WITH_RELAY_CHAINS, NODES_WITH_RELAY_CHAINS_DOT_KSM, NODE_NAMES, NODE_NAMES_DOT_KSM, Native, NoXCMSupportImplementedError, NodeNotSupportedError, Override, Parents, PolkadotXcmError, SUPPORTED_PALLETS, ScenarioNotSupportedError, Version, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createX1Payload, _deepEqual as deepEqual, determineRelayChain, findAssetById, findAssetByMultiLocation, findAssetBySymbol, findBestMatches, generateAddressMultiLocationV4, generateAddressPayload, getAllAssetsSymbols, getAssetBalance, getAssetBalanceInternal, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssetMultiLocation, getAssets, getAssetsObject, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getDefaultPallet, getDryRun, getExistentialDeposit, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNativeAssetSymbol, getNativeAssets, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOtherAssets, getParaEthTransferFees, getParaId, getRelayChainSymbol, getSupportedAssets, getSupportedPallets, getSupportedPalletsDetails, getTNode, getTransferInfo, getTransferableAmount, hasDryRunSupport, hasSupportForAsset, isAssetEqual, isEthersContract, isEthersSigner, isForeignAsset, isNodeEvm, isOverrideMultiLocationSpecifier, isRelayChain, isSymbolSpecifier, normalizeSymbol, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "8.6.2",
+  "version": "8.7.1",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",