@paraspell/sdk-core 8.6.1 → 8.7.0

package/dist/index.mjs

@@ -714,6 +714,8 @@ var NODES_WITH_RELAY_CHAINS_DOT_KSM = [].concat(NODE_NAMES_DOT_KSM, ['Polkadot',
  * Supported XCM pallets.
  */
 var SUPPORTED_PALLETS = ['XTokens', 'OrmlXTokens', 'PolkadotXcm', 'RelayerXcm', 'XTransfer', 'XcmPallet'];
+var SYSTEM_NODES_POLKADOT = ['PeoplePolkadot', 'CoretimePolkadot', 'Collectives'];
+var SYSTEM_NODES_KUSAMA = ['PeopleKusama', 'CoretimeKusama'];
 
 /**
  * Error thrown when multiple assets with the same symbol are found.
@@ -2360,7 +2362,10 @@ var constructRelayToParaParameters = function constructRelayToParaParameters(_re
   return _objectSpread2({
     dest: createPolkadotXcmHeader('RelayToPara', version, destination, paraId),
     beneficiary: generateAddressPayload(api, 'RelayToPara', null, address, version, paraId),
-    assets: createCurrencySpec(asset.amount, version, Parents.ZERO),
+    assets: createVersionedMultiAssets(version, asset.amount, {
+      parents: Parents.ZERO,
+      interior: 'Here'
+    }),
     fee_asset_item: DEFAULT_FEE_ASSET
   }, includeFee && {
     weight_limit: 'Unlimited'
@@ -2373,21 +2378,6 @@ var isTMultiLocation = function isTMultiLocation(value) {
 var isTMultiAsset = function isTMultiAsset(value) {
   return _typeof(value) === 'object' && value !== null && 'id' in value && 'fun' in value;
 };
-var createBridgeCurrencySpec = function createBridgeCurrencySpec(amount, ecosystem) {
-  return _defineProperty({}, Version.V4, [{
-    id: {
-      parents: Parents.TWO,
-      interior: {
-        X1: [{
-          GlobalConsensus: ecosystem
-        }]
-      }
-    },
-    fun: {
-      Fungible: amount.toString()
-    }
-  }]);
-};
 var createMultiAsset = function createMultiAsset(version, amount, multiLocation) {
   if (version === Version.V4) {
     return {
@@ -2409,22 +2399,27 @@ var createMultiAsset = function createMultiAsset(version, amount, multiLocation)
 var addXcmVersionHeader = function addXcmVersionHeader(obj, version) {
   return _defineProperty({}, version, obj);
 };
-var getCurrency = function getCurrency(amount, version, parents, overriddenCurrency) {
-  var interior = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'Here';
+var extractVersionFromHeader = function extractVersionFromHeader(versionHeader) {
+  var keys = Object.keys(versionHeader);
+  if (keys.length !== 1) {
+    throw new Error('Invalid version header: expected exactly one key.');
+  }
+  var version = keys[0];
+  var value = versionHeader[version];
+  if (value === undefined) {
+    throw new Error('Invalid version header: value is undefined.');
+  }
+  return [version, value];
+};
+var maybeOverrideMultiAssets = function maybeOverrideMultiAssets(version, amount, multiAssets, overriddenCurrency) {
   if (!overriddenCurrency) {
-    return [createMultiAsset(version, amount, {
-      parents: parents,
-      interior: interior
-    })];
+    return multiAssets;
   }
-  return isTMultiLocation(overriddenCurrency) ? [createMultiAsset(version, amount, overriddenCurrency)] :
-  // It must be TMultiAsset if not TMultiLocation
-  overriddenCurrency;
+  return isTMultiLocation(overriddenCurrency) ? [createMultiAsset(version, amount, overriddenCurrency)] : overriddenCurrency;
 };
-var createCurrencySpec = function createCurrencySpec(amount, version, parents, overriddenCurrency) {
-  var interior = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'Here';
-  var currency = getCurrency(amount, version, parents, overriddenCurrency, interior);
-  return addXcmVersionHeader(currency, version);
+var createVersionedMultiAssets = function createVersionedMultiAssets(version, amount, multiLocation) {
+  var multiAssets = createMultiAsset(version, amount, multiLocation);
+  return addXcmVersionHeader([multiAssets], version);
 };
 var createPolkadotXcmHeader = function createPolkadotXcmHeader(scenario, version, destination, nodeId, junction, parents) {
   var parentsResolved = parents !== null && parents !== void 0 ? parents : scenario === 'RelayToPara' ? Parents.ZERO : Parents.ONE;
@@ -2466,20 +2461,81 @@ var resolveTNodeFromMultiLocation = function resolveTNodeFromMultiLocation(relay
   return node;
 };
 var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, node) {
-  var _ref4 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+  var _ref3 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
       isDestination: false
     },
-    isDestination = _ref4.isDestination;
+    isDestination = _ref3.isDestination;
   if ('multilocation' in currency) {
     throw new InvalidCurrencyError("\n      Selected chain doesn't support multilocation you provided. Maybe you meant custom multilocation. If so, you need to use override option. Your selection should look like this: {multilocation: Override(".concat(JSON.stringify(currency.multilocation), ")}."));
   }
   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;
 };
@@ -2535,19 +2591,21 @@ var buildMultiLocation = function buildMultiLocation(_ref) {
   }
 };
 var getModifiedCurrencySelection = function getModifiedCurrencySelection(version, input) {
-  var amount = input.asset.amount;
+  var amount = input.asset.amount,
+    overriddenAsset = input.overriddenAsset;
+  if (overriddenAsset) {
+    return addXcmVersionHeader(maybeOverrideMultiAssets(version, amount, [], overriddenAsset), version);
+  }
   var multiLocation = buildMultiLocation(input);
   var multiAsset = createMultiAsset(version, amount, multiLocation);
   return addXcmVersionHeader(multiAsset, version);
 };
 
-var getCurrencySelection = function getCurrencySelection(input, isAssetHub, currencySelection) {
-  var origin = input.origin,
-    overriddenAsset = input.overriddenAsset;
+var getCurrencySelection = function getCurrencySelection(input, useMultiAssets, currencySelection) {
+  var origin = input.origin;
   var _getNode = getNode(origin),
     version = _getNode.version;
-  if (overriddenAsset !== undefined) return addXcmVersionHeader(overriddenAsset, version);
-  if (isAssetHub) {
+  if (useMultiAssets) {
     return getModifiedCurrencySelection(version, input);
   }
   return currencySelection;
@@ -2555,11 +2613,11 @@ var getCurrencySelection = function getCurrencySelection(input, isAssetHub, curr
 
 var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, currencySelection, addressSelection, amount, fees, overriddenAsset) {
   if (isMultiAssetTransfer) {
-    var isMultiAsset = overriddenAsset && !isTMultiLocation(overriddenAsset);
-    var feeAssetIndex = isMultiAsset ? overriddenAsset.findIndex(function (asset) {
+    var isOverridenMultiAssets = overriddenAsset && !isTMultiLocation(overriddenAsset);
+    var feeAssetIndex = isOverridenMultiAssets ? overriddenAsset.findIndex(function (asset) {
       return asset.isFeeAsset;
     }) : undefined;
-    return _objectSpread2(_objectSpread2(_defineProperty({}, isMultiAsset ? 'assets' : 'asset', currencySelection), isMultiAsset && {
+    return _objectSpread2(_objectSpread2(_defineProperty({}, isOverridenMultiAssets ? 'assets' : 'asset', currencySelection), isOverridenMultiAssets && {
       fee_item: feeAssetIndex
     }), {}, {
       dest: addressSelection,
@@ -2599,10 +2657,10 @@ var XTokensTransferImpl = /*#__PURE__*/function () {
       var isAssetHubDest = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
       var isAstarOrShidenToRelay = scenario === 'ParaToRelay' && (origin === 'Astar' || origin === 'Shiden');
       var isTuring = origin === 'Turing';
-      var isMultiAsset = overriddenAsset && !isTMultiLocation(overriddenAsset);
-      var shouldUseMultiasset = isTuring || isAstarOrShidenToRelay || isAssetHubDest && !isBifrostOrigin || !!isMultiAsset;
+      var isOverridenMultiAssets = overriddenAsset && !isTMultiLocation(overriddenAsset);
+      var shouldUseMultiasset = isTuring || isAstarOrShidenToRelay || isAssetHubDest && !isBifrostOrigin || !!isOverridenMultiAssets;
       var modifiedCurrencySelection = getCurrencySelection(input, shouldUseMultiasset, currencySelection);
-      var section = shouldUseMultiasset ? isMultiAsset ? 'transfer_multiassets' : 'transfer_multiasset' : 'transfer';
+      var section = shouldUseMultiasset ? isOverridenMultiAssets ? 'transfer_multiassets' : 'transfer_multiasset' : 'transfer';
       var parameters = getXTokensParameters(shouldUseMultiasset, modifiedCurrencySelection, addressSelection, asset.amount, fees, overriddenAsset);
       var call = {
         module: pallet !== null && pallet !== void 0 ? pallet : 'XTokens',
@@ -3669,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: [
@@ -4477,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');
@@ -4485,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) {
@@ -4554,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;
@@ -4562,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);
     })) {
@@ -4569,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;
@@ -4609,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);
@@ -4628,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,
@@ -4658,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
@@ -4673,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,
@@ -4682,7 +4758,7 @@ var send = /*#__PURE__*/function () {
             pallet: pallet,
             method: method
           }));
-        case 24:
+        case 25:
         case "end":
           return _context.stop();
       }
@@ -4752,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,12 +4896,13 @@ var ParachainNode = /*#__PURE__*/function () {
                 header: this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, paraId),
                 addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, versionOrDefault, paraId),
                 address: address,
-                currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset, overriddenAsset),
+                currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset),
+                overriddenAsset: overriddenAsset,
                 asset: asset,
+                feeAsset: feeAsset,
                 scenario: scenario,
                 destination: destination,
                 paraIdTo: paraId,
-                overriddenAsset: overriddenAsset,
                 version: version,
                 senderAddress: senderAddress,
                 pallet: pallet,
@@ -4872,8 +4949,11 @@ var ParachainNode = /*#__PURE__*/function () {
     }
   }, {
     key: "createCurrencySpec",
-    value: function createCurrencySpec$1(amount, scenario, version, _asset, overridedMultiLocation) {
-      return createCurrencySpec(amount, version, scenario === 'ParaToRelay' ? Parents.ONE : Parents.ZERO, overridedMultiLocation);
+    value: function createCurrencySpec(amount, scenario, version, _asset) {
+      return createVersionedMultiAssets(version, amount, {
+        parents: scenario === 'ParaToRelay' ? Parents.ONE : Parents.ZERO,
+        interior: 'Here'
+      });
     }
   }, {
     key: "createPolkadotXcmHeader",
@@ -5045,12 +5125,18 @@ var PolkadotXCMTransferImpl = /*#__PURE__*/function () {
     value: function transferPolkadotXCM(_ref, section) {
       var api = _ref.api,
         header = _ref.header,
+        asset = _ref.asset,
         addressSelection = _ref.addressSelection,
         currencySelection = _ref.currencySelection,
         overriddenAsset = _ref.overriddenAsset,
         pallet = _ref.pallet,
         method = _ref.method;
       var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+      var _extractVersionFromHe = extractVersionFromHeader(currencySelection),
+        _extractVersionFromHe2 = _slicedToArray(_extractVersionFromHe, 2),
+        version = _extractVersionFromHe2[0],
+        multiAssets = _extractVersionFromHe2[1];
+      var resolvedMultiAssets = addXcmVersionHeader(maybeOverrideMultiAssets(version, asset.amount, multiAssets, overriddenAsset), version);
       var feeAssetIndex = overriddenAsset === undefined || isTMultiLocation(overriddenAsset) ? DEFAULT_FEE_ASSET : overriddenAsset.findIndex(function (asset) {
         return asset.isFeeAsset;
       });
@@ -5060,7 +5146,7 @@ var PolkadotXCMTransferImpl = /*#__PURE__*/function () {
         parameters: _objectSpread2({
           dest: header,
           beneficiary: addressSelection,
-          assets: currencySelection,
+          assets: resolvedMultiAssets,
           fee_asset_item: feeAssetIndex
         }, fees !== undefined ? {
           weight_limit: fees
@@ -5088,13 +5174,14 @@ var AssetHubKusama$1 = /*#__PURE__*/function (_ParachainNode) {
       if (destination === 'AssetHubPolkadot') {
         return Promise.resolve(getNode('AssetHubPolkadot').handleBridgeTransfer(input, 'Polkadot'));
       }
-      if (scenario === 'ParaToPara' && asset.symbol === 'KSM' && !isForeignAsset(asset)) {
+      var isSystemNode = !isTMultiLocation(destination) && SYSTEM_NODES_KUSAMA.includes(destination);
+      if (scenario === 'ParaToPara' && asset.symbol === 'KSM' && !isForeignAsset(asset) && !isSystemNode) {
         throw new ScenarioNotSupportedError(this.node, scenario, 'Para to Para scenarios for KSM transfer from AssetHub are not supported, you have to transfer KSM to Relay chain and transfer to destination chain from Relay chain.');
       }
       if (scenario === 'ParaToPara' && asset.symbol === 'DOT' && !isForeignAsset(asset)) {
         throw new ScenarioNotSupportedError(this.node, scenario, 'Bridged DOT cannot currently be transfered from AssetHubKusama, if you are sending different DOT asset, please specify {id: <DOTID>}.');
       }
-      var section = scenario === 'ParaToPara' ? 'limited_reserve_transfer_assets' : 'limited_teleport_assets';
+      var section = scenario === 'ParaToPara' && !isSystemNode ? 'limited_reserve_transfer_assets' : 'limited_teleport_assets';
       return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, section, 'Unlimited'));
     }
   }, {
@@ -5107,12 +5194,124 @@ var AssetHubKusama$1 = /*#__PURE__*/function (_ParachainNode) {
     }
   }, {
     key: "createCurrencySpec",
-    value: function createCurrencySpec(amount, scenario, version, asset, overridedMultiLocation) {
-      return getNode('AssetHubPolkadot').createCurrencySpec(amount, scenario, version, asset, overridedMultiLocation);
+    value: function createCurrencySpec(amount, scenario, version, asset) {
+      return getNode('AssetHubPolkadot').createCurrencySpec(amount, scenario, version, asset);
     }
   }]);
 }(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) {
@@ -5157,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)) {
@@ -5166,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'
         }
       };
@@ -5192,16 +5391,26 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
     value: function handleBridgeTransfer(input, targetChain) {
       var _input$asset$symbol, _input$asset$symbol2, _input$asset$symbol3, _input$asset$symbol4;
       if (targetChain === 'Kusama' && ((_input$asset$symbol = input.asset.symbol) === null || _input$asset$symbol === void 0 ? void 0 : _input$asset$symbol.toUpperCase()) === 'KSM' || targetChain === 'Polkadot' && ((_input$asset$symbol2 = input.asset.symbol) === null || _input$asset$symbol2 === void 0 ? void 0 : _input$asset$symbol2.toUpperCase()) === 'DOT') {
+        var overriddenVersion = Version.V4;
+        var customMultiLocation = {
+          parents: Parents.TWO,
+          interior: {
+            X1: [{
+              GlobalConsensus: targetChain
+            }]
+          }
+        };
         var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-          header: createBridgePolkadotXcmDest(Version.V4, targetChain, input.destination, input.paraIdTo),
+          header: createBridgePolkadotXcmDest(overriddenVersion, targetChain, input.destination, input.paraIdTo),
           addressSelection: generateAddressMultiLocationV4(input.api, input.address),
-          currencySelection: createBridgeCurrencySpec(input.asset.amount, targetChain)
+          currencySelection: createVersionedMultiAssets(overriddenVersion, input.asset.amount, customMultiLocation)
         });
         return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited');
       } else if (targetChain === 'Polkadot' && ((_input$asset$symbol3 = input.asset.symbol) === null || _input$asset$symbol3 === void 0 ? void 0 : _input$asset$symbol3.toUpperCase()) === 'KSM' || targetChain === 'Kusama' && ((_input$asset$symbol4 = input.asset.symbol) === null || _input$asset$symbol4 === void 0 ? void 0 : _input$asset$symbol4.toUpperCase()) === 'DOT') {
+        var _overriddenVersion = Version.V3;
         var _modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-          header: createBridgePolkadotXcmDest(Version.V3, targetChain, input.destination, input.paraIdTo),
-          currencySelection: createCurrencySpec(input.asset.amount, Version.V3, Parents.ONE, input.overriddenAsset)
+          header: createBridgePolkadotXcmDest(_overriddenVersion, targetChain, input.destination, input.paraIdTo),
+          currencySelection: createVersionedMultiAssets(_overriddenVersion, input.asset.amount, DOT_MULTILOCATION)
         });
         return PolkadotXCMTransferImpl.transferPolkadotXCM(_modifiedInput, 'limited_reserve_transfer_assets', 'Unlimited');
       }
@@ -5228,7 +5437,7 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
         header: createPolkadotXcmHeader(scenario, this.version, destination, paraIdTo, ETHEREUM_JUNCTION, Parents.TWO),
         addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, this.version, paraIdTo),
-        currencySelection: createCurrencySpec(input.asset.amount, Version.V3, Parents.TWO, asset.multiLocation)
+        currencySelection: createVersionedMultiAssets(Version.V3, asset.amount, asset.multiLocation)
       });
       return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited');
     }
@@ -5238,7 +5447,6 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       var api = input.api,
         address = input.address,
         asset = input.asset,
-        overriddenAsset = input.overriddenAsset,
         scenario = input.scenario,
         destination = input.destination,
         paraIdTo = input.paraIdTo;
@@ -5255,7 +5463,7 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
         header: this.createPolkadotXcmHeader(scenario, version, destination, paraId),
         addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, paraId),
-        currencySelection: this.createCurrencySpec(asset.amount, scenario, version, asset, overriddenAsset !== null && overriddenAsset !== void 0 ? overriddenAsset : customMultiLocation)
+        currencySelection: createVersionedMultiAssets(version, asset.amount, customMultiLocation)
       });
       return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'limited_teleport_assets', 'Unlimited');
     }
@@ -5266,24 +5474,23 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       var asset = input.asset,
         destination = input.destination,
         paraIdTo = input.paraIdTo,
-        overriddenAsset = input.overriddenAsset,
         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),
-          currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset, overriddenAsset)
+          currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset)
         });
       }
       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: _superPropGet(AssetHubPolkadot, "createCurrencySpec", this, 3)([asset.amount, 'ParaToRelay', _versionOrDefault, asset, overriddenAsset])
+          currencySelection: createVersionedMultiAssets(version, asset.amount, DOT_MULTILOCATION)
         });
       }
       return input;
@@ -5291,15 +5498,96 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
   }, {
     key: "getSection",
     value: function getSection(scenario, destination) {
+      var isSystemNode = !isTMultiLocation(destination) && SYSTEM_NODES_POLKADOT.includes(destination);
       if (destination === 'Polimec' || destination === 'Moonbeam') return 'transfer_assets';
-      return scenario === 'ParaToPara' ? 'limited_reserve_transfer_assets' : 'limited_teleport_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'));
       }
@@ -5318,7 +5606,8 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       if (destination === 'BifrostPolkadot' && isEthereumAsset) {
         return Promise.resolve(this.handleBifrostEthTransfer(input));
       }
-      if (scenario === 'ParaToPara' && asset.symbol === 'DOT' && !isForeignAsset(asset) && destination !== 'Hydration' && destination !== 'Polimec' && destination !== 'Moonbeam' && destination !== 'BifrostPolkadot') {
+      var isSystemNode = !isTMultiLocation(destination) && SYSTEM_NODES_POLKADOT.includes(destination);
+      if (scenario === 'ParaToPara' && asset.symbol === 'DOT' && !isForeignAsset(asset) && destination !== 'Hydration' && destination !== 'Polimec' && destination !== 'Moonbeam' && destination !== 'BifrostPolkadot' && destination !== 'PeoplePolkadot' && !isSystemNode) {
         throw new ScenarioNotSupportedError(this.node, scenario, 'Para to Para scenarios for DOT transfer from AssetHub are not supported, you have to transfer DOT to Relay chain and transfer to destination chain from Relay chain.');
       }
       if (scenario === 'ParaToPara' && asset.symbol === 'KSM' && !isForeignAsset(asset)) {
@@ -5338,18 +5627,20 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
     }
   }, {
     key: "createCurrencySpec",
-    value: function createCurrencySpec$1(amount, scenario, version, asset, overridedMultiLocation) {
+    value: function createCurrencySpec(amount, scenario, version, asset) {
       if (scenario === 'ParaToPara') {
-        var interior = {
-          X2: [{
-            PalletInstance: 50
-          }, {
-            // TODO: Handle missing assedId
-            GeneralIndex: asset && isForeignAsset(asset) && asset.assetId ? asset.assetId : 0
-          }]
-        };
-        var multiLocation = overridedMultiLocation !== undefined ? overridedMultiLocation : asset && isForeignAsset(asset) ? asset.multiLocation : undefined;
-        return createCurrencySpec(amount, version, Parents.ZERO, multiLocation, interior);
+        var multiLocation = asset ? asset.multiLocation : undefined;
+        return createVersionedMultiAssets(version, amount, multiLocation !== null && multiLocation !== void 0 ? multiLocation : {
+          parents: Parents.ZERO,
+          interior: {
+            X2: [{
+              PalletInstance: 50
+            }, {
+              // TODO: Handle missing assedId
+              GeneralIndex: asset && isForeignAsset(asset) && asset.assetId ? asset.assetId : 0
+            }]
+          }
+        });
       } else {
         return _superPropGet(AssetHubPolkadot, "createCurrencySpec", this, 3)([amount, scenario, version, asset]);
       }
@@ -5495,16 +5786,18 @@ var BifrostPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
     key: "transferToAssetHub",
     value: function transferToAssetHub(input) {
       var _getAssetId;
-      var overriddenAsset = input.overriddenAsset,
-        asset = input.asset;
+      var asset = input.asset;
       return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(_objectSpread2(_objectSpread2({}, input), {}, {
-        currencySelection: createCurrencySpec(asset.amount, this.version, asset.symbol === 'DOT' ? Parents.ONE : Parents.TWO, overriddenAsset, asset.symbol === 'WETH' ? {
-          X2: [ETHEREUM_JUNCTION, {
-            AccountKey20: {
-              key: (_getAssetId = getAssetId('Ethereum', 'WETH')) !== null && _getAssetId !== void 0 ? _getAssetId : ''
-            }
-          }]
-        } : undefined)
+        currencySelection: createVersionedMultiAssets(this.version, asset.amount, {
+          parents: asset.symbol === 'DOT' ? Parents.ONE : Parents.TWO,
+          interior: asset.symbol === 'WETH' ? {
+            X2: [ETHEREUM_JUNCTION, {
+              AccountKey20: {
+                key: (_getAssetId = getAssetId('Ethereum', 'WETH')) !== null && _getAssetId !== void 0 ? _getAssetId : ''
+              }
+            }]
+          } : 'Here'
+        })
       }), 'transfer_assets', 'Unlimited'));
     }
   }, {
@@ -5771,16 +6064,18 @@ var Crab$1 = /*#__PURE__*/function (_ParachainNode) {
     }
   }, {
     key: "createCurrencySpec",
-    value: function createCurrencySpec$1(amount, scenario, version, _asset, overridedMultiLocation) {
+    value: function createCurrencySpec(amount, scenario, version, _asset) {
       if (scenario === 'ParaToPara') {
-        var interior = {
-          X1: {
-            PalletInstance: 5
+        return createVersionedMultiAssets(version, amount, {
+          parents: Parents.ZERO,
+          interior: {
+            X1: {
+              PalletInstance: 5
+            }
           }
-        };
-        return createCurrencySpec(amount, version, Parents.ZERO, overridedMultiLocation, interior);
+        });
       } else {
-        return _superPropGet(Crab, "createCurrencySpec", this, 3)([amount, scenario, version, undefined, overridedMultiLocation]);
+        return _superPropGet(Crab, "createCurrencySpec", this, 3)([amount, scenario, version]);
       }
     }
   }]);
@@ -6165,8 +6460,8 @@ var Moonbeam$1 = /*#__PURE__*/function (_ParachainNode) {
   }
   _inherits(Moonbeam, _ParachainNode);
   return _createClass(Moonbeam, [{
-    key: "getJunctions",
-    value: function getJunctions(asset, scenario) {
+    key: "getMultiLocation",
+    value: function getMultiLocation(asset, scenario) {
       if (scenario === 'ParaToRelay') return DOT_MULTILOCATION;
       if (asset.symbol === this.getNativeAssetSymbol()) return {
         parents: Parents.ZERO,
@@ -6187,11 +6482,10 @@ var Moonbeam$1 = /*#__PURE__*/function (_ParachainNode) {
       var asset = input.asset,
         scenario = input.scenario,
         _input$version = input.version,
-        version = _input$version === void 0 ? this.version : _input$version,
-        overriddenAsset = input.overriddenAsset;
-      var multiLocation = this.getJunctions(asset, scenario);
+        version = _input$version === void 0 ? this.version : _input$version;
+      var multiLocation = this.getMultiLocation(asset, scenario);
       return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(_objectSpread2(_objectSpread2({}, input), {}, {
-        currencySelection: createCurrencySpec(asset.amount, version, multiLocation.parents, overriddenAsset, multiLocation.interior)
+        currencySelection: createVersionedMultiAssets(version, asset.amount, multiLocation)
       }), 'transfer_assets', 'Unlimited'));
     }
   }, {
@@ -6212,8 +6506,8 @@ var Moonriver$1 = /*#__PURE__*/function (_ParachainNode) {
   }
   _inherits(Moonriver, _ParachainNode);
   return _createClass(Moonriver, [{
-    key: "getJunctions",
-    value: function getJunctions(asset, scenario) {
+    key: "getMultiLocation",
+    value: function getMultiLocation(asset, scenario) {
       if (scenario === 'ParaToRelay') return DOT_MULTILOCATION;
       if (asset.symbol === this.getNativeAssetSymbol()) return {
         parents: Parents.ZERO,
@@ -6234,11 +6528,10 @@ var Moonriver$1 = /*#__PURE__*/function (_ParachainNode) {
       var asset = input.asset,
         scenario = input.scenario,
         _input$version = input.version,
-        version = _input$version === void 0 ? this.version : _input$version,
-        overriddenAsset = input.overriddenAsset;
-      var multiLocation = this.getJunctions(asset, scenario);
+        version = _input$version === void 0 ? this.version : _input$version;
+      var multiLocation = this.getMultiLocation(asset, scenario);
       return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(_objectSpread2(_objectSpread2({}, input), {}, {
-        currencySelection: createCurrencySpec(asset.amount, version, multiLocation.parents, overriddenAsset, multiLocation.interior)
+        currencySelection: createVersionedMultiAssets(version, asset.amount, multiLocation)
       }), 'transfer_assets', 'Unlimited'));
     }
   }, {
@@ -6529,7 +6822,12 @@ var XTransferTransferImpl = /*#__PURE__*/function () {
       if (isMultiLocationDestination) {
         throw new Error('Multilocation destinations are not supported for specific transfer you are trying to create. In special cases such as xTokens or xTransfer pallet try using address multilocation instead (for both destination and address in same multilocation set (eg. X2 - Parachain, Address). For further assistance please open issue in our repository.');
       }
-      var currencySpec = getCurrency(asset.amount, Version.V1, Parents.ZERO, overriddenAsset)[0];
+      var version = Version.V1;
+      var multiAssets = [createMultiAsset(version, asset.amount, {
+        parents: Parents.ZERO,
+        interior: 'Here'
+      })];
+      var resolvedMultiAssets = maybeOverrideMultiAssets(version, asset.amount, multiAssets, overriddenAsset);
       var dest = getDestination(input);
       var section = 'transfer';
       var destWeight = determineDestWeight(destination);
@@ -6537,7 +6835,7 @@ var XTransferTransferImpl = /*#__PURE__*/function () {
         module: pallet !== null && pallet !== void 0 ? pallet : 'XTransfer',
         section: method !== null && method !== void 0 ? method : section,
         parameters: {
-          asset: currencySpec,
+          asset: resolvedMultiAssets[0],
           dest: dest,
           dest_weight: destWeight
         }
@@ -7001,14 +7299,7 @@ var Polimec = {
 	],
 	otherAssets: [
 		{
-			assetId: "10",
-			symbol: "DOT",
-			decimals: 10,
-			existentialDeposit: "100000000"
-		},
-		{
-			assetId: "1984",
-			symbol: "USDt",
+			symbol: "USDC",
 			decimals: 6,
 			multiLocation: {
 				parents: 1,
@@ -7021,7 +7312,7 @@ var Polimec = {
 							PalletInstance: 50
 						},
 						{
-							GeneralIndex: 1984
+							GeneralIndex: 1337
 						}
 					]
 				}
@@ -7029,8 +7320,7 @@ var Polimec = {
 			existentialDeposit: "70000"
 		},
 		{
-			assetId: "1337",
-			symbol: "USDC",
+			symbol: "USDt",
 			decimals: 6,
 			multiLocation: {
 				parents: 1,
@@ -7043,12 +7333,23 @@ var Polimec = {
 							PalletInstance: 50
 						},
 						{
-							GeneralIndex: 1337
+							GeneralIndex: 1984
 						}
 					]
 				}
 			},
 			existentialDeposit: "70000"
+		},
+		{
+			symbol: "DOT",
+			decimals: 10,
+			multiLocation: {
+				parents: 1,
+				interior: {
+					Here: null
+				}
+			},
+			existentialDeposit: "100000000"
 		}
 	]
 };
@@ -19001,13 +19302,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;
@@ -19817,59 +20118,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 */
@@ -20392,6 +20640,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.
      *
@@ -20534,4 +20795,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 };