@paraspell/sdk-core 8.6.1 → 8.6.2

package/dist/index.cjs

@@ -716,6 +716,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.
@@ -2362,7 +2364,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, exports.Parents.ZERO),
+    assets: createVersionedMultiAssets(version, asset.amount, {
+      parents: exports.Parents.ZERO,
+      interior: 'Here'
+    }),
     fee_asset_item: DEFAULT_FEE_ASSET
   }, includeFee && {
     weight_limit: 'Unlimited'
@@ -2375,21 +2380,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({}, exports.Version.V4, [{
-    id: {
-      parents: exports.Parents.TWO,
-      interior: {
-        X1: [{
-          GlobalConsensus: ecosystem
-        }]
-      }
-    },
-    fun: {
-      Fungible: amount.toString()
-    }
-  }]);
-};
 var createMultiAsset = function createMultiAsset(version, amount, multiLocation) {
   if (version === exports.Version.V4) {
     return {
@@ -2411,22 +2401,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' ? exports.Parents.ZERO : exports.Parents.ONE;
@@ -2468,10 +2463,10 @@ 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), ")}."));
   }
@@ -2537,19 +2532,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;
@@ -2557,11 +2554,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,
@@ -2601,10 +2598,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',
@@ -4822,12 +4819,12 @@ 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,
                 scenario: scenario,
                 destination: destination,
                 paraIdTo: paraId,
-                overriddenAsset: overriddenAsset,
                 version: version,
                 senderAddress: senderAddress,
                 pallet: pallet,
@@ -4874,8 +4871,11 @@ var ParachainNode = /*#__PURE__*/function () {
     }
   }, {
     key: "createCurrencySpec",
-    value: function createCurrencySpec$1(amount, scenario, version, _asset, overridedMultiLocation) {
-      return createCurrencySpec(amount, version, scenario === 'ParaToRelay' ? exports.Parents.ONE : exports.Parents.ZERO, overridedMultiLocation);
+    value: function createCurrencySpec(amount, scenario, version, _asset) {
+      return createVersionedMultiAssets(version, amount, {
+        parents: scenario === 'ParaToRelay' ? exports.Parents.ONE : exports.Parents.ZERO,
+        interior: 'Here'
+      });
     }
   }, {
     key: "createPolkadotXcmHeader",
@@ -5047,12 +5047,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;
       });
@@ -5062,7 +5068,7 @@ var PolkadotXCMTransferImpl = /*#__PURE__*/function () {
         parameters: _objectSpread2({
           dest: header,
           beneficiary: addressSelection,
-          assets: currencySelection,
+          assets: resolvedMultiAssets,
           fee_asset_item: feeAssetIndex
         }, fees !== undefined ? {
           weight_limit: fees
@@ -5090,13 +5096,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'));
     }
   }, {
@@ -5109,8 +5116,8 @@ 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);
@@ -5194,16 +5201,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 = exports.Version.V4;
+        var customMultiLocation = {
+          parents: exports.Parents.TWO,
+          interior: {
+            X1: [{
+              GlobalConsensus: targetChain
+            }]
+          }
+        };
         var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-          header: createBridgePolkadotXcmDest(exports.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 = exports.Version.V3;
         var _modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-          header: createBridgePolkadotXcmDest(exports.Version.V3, targetChain, input.destination, input.paraIdTo),
-          currencySelection: createCurrencySpec(input.asset.amount, exports.Version.V3, exports.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');
       }
@@ -5230,7 +5247,7 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
         header: createPolkadotXcmHeader(scenario, this.version, destination, paraIdTo, ETHEREUM_JUNCTION, exports.Parents.TWO),
         addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, this.version, paraIdTo),
-        currencySelection: createCurrencySpec(input.asset.amount, exports.Version.V3, exports.Parents.TWO, asset.multiLocation)
+        currencySelection: createVersionedMultiAssets(exports.Version.V3, asset.amount, asset.multiLocation)
       });
       return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited');
     }
@@ -5240,7 +5257,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;
@@ -5257,7 +5273,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');
     }
@@ -5268,7 +5284,6 @@ 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,
@@ -5279,13 +5294,13 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
         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(_versionOrDefault, asset.amount, DOT_MULTILOCATION)
         });
       }
       return input;
@@ -5293,8 +5308,9 @@ 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: "transferPolkadotXCM",
@@ -5320,7 +5336,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)) {
@@ -5340,18 +5357,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, exports.Parents.ZERO, multiLocation, interior);
+        var multiLocation = asset ? asset.multiLocation : undefined;
+        return createVersionedMultiAssets(version, amount, multiLocation !== null && multiLocation !== void 0 ? multiLocation : {
+          parents: exports.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]);
       }
@@ -5497,16 +5516,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' ? exports.Parents.ONE : exports.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' ? exports.Parents.ONE : exports.Parents.TWO,
+          interior: asset.symbol === 'WETH' ? {
+            X2: [ETHEREUM_JUNCTION, {
+              AccountKey20: {
+                key: (_getAssetId = getAssetId('Ethereum', 'WETH')) !== null && _getAssetId !== void 0 ? _getAssetId : ''
+              }
+            }]
+          } : 'Here'
+        })
       }), 'transfer_assets', 'Unlimited'));
     }
   }, {
@@ -5773,16 +5794,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: exports.Parents.ZERO,
+          interior: {
+            X1: {
+              PalletInstance: 5
+            }
           }
-        };
-        return createCurrencySpec(amount, version, exports.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]);
       }
     }
   }]);
@@ -6167,8 +6190,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: exports.Parents.ZERO,
@@ -6189,11 +6212,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'));
     }
   }, {
@@ -6214,8 +6236,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: exports.Parents.ZERO,
@@ -6236,11 +6258,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'));
     }
   }, {
@@ -6531,7 +6552,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, exports.Version.V1, exports.Parents.ZERO, overriddenAsset)[0];
+      var version = exports.Version.V1;
+      var multiAssets = [createMultiAsset(version, asset.amount, {
+        parents: exports.Parents.ZERO,
+        interior: 'Here'
+      })];
+      var resolvedMultiAssets = maybeOverrideMultiAssets(version, asset.amount, multiAssets, overriddenAsset);
       var dest = getDestination(input);
       var section = 'transfer';
       var destWeight = determineDestWeight(destination);
@@ -6539,7 +6565,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
         }
@@ -7003,14 +7029,7 @@ var Polimec = {
 	],
 	otherAssets: [
 		{
-			assetId: "10",
-			symbol: "DOT",
-			decimals: 10,
-			existentialDeposit: "100000000"
-		},
-		{
-			assetId: "1984",
-			symbol: "USDt",
+			symbol: "USDC",
 			decimals: 6,
 			multiLocation: {
 				parents: 1,
@@ -7023,7 +7042,7 @@ var Polimec = {
 							PalletInstance: 50
 						},
 						{
-							GeneralIndex: 1984
+							GeneralIndex: 1337
 						}
 					]
 				}
@@ -7031,8 +7050,7 @@ var Polimec = {
 			existentialDeposit: "70000"
 		},
 		{
-			assetId: "1337",
-			symbol: "USDC",
+			symbol: "USDt",
 			decimals: 6,
 			multiLocation: {
 				parents: 1,
@@ -7045,12 +7063,23 @@ var Polimec = {
 							PalletInstance: 50
 						},
 						{
-							GeneralIndex: 1337
+							GeneralIndex: 1984
 						}
 					]
 				}
 			},
 			existentialDeposit: "70000"
+		},
+		{
+			symbol: "DOT",
+			decimals: 10,
+			multiLocation: {
+				parents: 1,
+				interior: {
+					Here: null
+				}
+			},
+			existentialDeposit: "100000000"
 		}
 	]
 };

package/dist/index.d.ts

@@ -231,7 +231,7 @@ declare abstract class ParachainNode<TApi, TRes> {
     transfer(options: TSendInternalOptions<TApi, TRes>): Promise<TRes>;
     getRelayToParaOverrides(): TRelayToParaOverrides;
     transferRelayToPara(options: TRelayToParaOptions<TApi, TRes>): TSerializedApiCall;
-    createCurrencySpec(amount: TAmount, scenario: TScenario, version: Version, _asset?: TAsset, overridedMultiLocation?: TMultiLocation | TMultiAsset[]): TXcmVersioned<TMultiAsset[]>;
+    createCurrencySpec(amount: TAmount, scenario: TScenario, version: Version, _asset?: TAsset): TXcmVersioned<TMultiAsset[]>;
     createPolkadotXcmHeader(scenario: TScenario, version: Version, destination: TDestination, paraId?: number): TXcmVersioned<TMultiLocation>;
     getNativeAssetSymbol(): string;
     protected transferToEthereum<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
@@ -257,7 +257,27 @@ declare class AssetHubKusama<TApi, TRes> extends ParachainNode<TApi, TRes> imple
     constructor();
     transferPolkadotXCM<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
     getRelayToParaOverrides(): TRelayToParaOverrides;
-    createCurrencySpec(amount: string, scenario: TScenario, version: Version, asset?: TAsset, overridedMultiLocation?: TMultiLocation | TMultiAsset[]): TXcmVersioned<TMultiAsset[]>;
+    createCurrencySpec(amount: string, scenario: TScenario, version: Version, asset?: TAsset): {
+        V1: TMultiAsset[];
+        V2?: undefined;
+        V3?: undefined;
+        V4?: undefined;
+    } | {
+        V2: TMultiAsset[];
+        V1?: undefined;
+        V3?: undefined;
+        V4?: undefined;
+    } | {
+        V3: TMultiAsset[];
+        V1?: undefined;
+        V2?: undefined;
+        V4?: undefined;
+    } | {
+        V4: TMultiAsset[];
+        V1?: undefined;
+        V2?: undefined;
+        V3?: undefined;
+    };
 }
 
 declare class AssetHubPolkadot<TApi, TRes> extends ParachainNode<TApi, TRes> implements IPolkadotXCMTransfer {
@@ -270,7 +290,27 @@ declare class AssetHubPolkadot<TApi, TRes> extends ParachainNode<TApi, TRes> imp
     private getSection;
     transferPolkadotXCM<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
     getRelayToParaOverrides(): TRelayToParaOverrides;
-    createCurrencySpec(amount: TAmount, scenario: TScenario, version: Version, asset?: TAsset, overridedMultiLocation?: TMultiLocation | TMultiAsset[]): TXcmVersioned<TMultiAsset[]>;
+    createCurrencySpec(amount: TAmount, scenario: TScenario, version: Version, asset?: TAsset): {
+        V1: TMultiAsset[];
+        V2?: undefined;
+        V3?: undefined;
+        V4?: undefined;
+    } | {
+        V2: TMultiAsset[];
+        V1?: undefined;
+        V3?: undefined;
+        V4?: undefined;
+    } | {
+        V3: TMultiAsset[];
+        V1?: undefined;
+        V2?: undefined;
+        V4?: undefined;
+    } | {
+        V4: TMultiAsset[];
+        V1?: undefined;
+        V2?: undefined;
+        V3?: undefined;
+    };
 }
 
 declare class Astar<TApi, TRes> extends ParachainNode<TApi, TRes> implements IPolkadotXCMTransfer, IXTokensTransfer {
@@ -406,7 +446,27 @@ declare class Crab<TApi, TRes> extends ParachainNode<TApi, TRes> implements IPol
     constructor();
     transferPolkadotXCM<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
     transferRelayToPara(): TSerializedApiCall;
-    createCurrencySpec(amount: string, scenario: TScenario, version: Version, _asset?: TAsset, overridedMultiLocation?: TMultiLocation): TXcmVersioned<TMultiAsset[]>;
+    createCurrencySpec(amount: string, scenario: TScenario, version: Version, _asset?: TAsset): {
+        V1: TMultiAsset[];
+        V2?: undefined;
+        V3?: undefined;
+        V4?: undefined;
+    } | {
+        V2: TMultiAsset[];
+        V1?: undefined;
+        V3?: undefined;
+        V4?: undefined;
+    } | {
+        V3: TMultiAsset[];
+        V1?: undefined;
+        V2?: undefined;
+        V4?: undefined;
+    } | {
+        V4: TMultiAsset[];
+        V1?: undefined;
+        V2?: undefined;
+        V3?: undefined;
+    };
 }
 
 declare class Crust<TApi, TRes> extends ParachainNode<TApi, TRes> implements IXTokensTransfer {
@@ -489,14 +549,14 @@ declare class Manta<TApi, TRes> extends ParachainNode<TApi, TRes> implements IXT
 
 declare class Moonbeam<TApi, TRes> extends ParachainNode<TApi, TRes> implements IPolkadotXCMTransfer {
     constructor();
-    private getJunctions;
+    private getMultiLocation;
     transferPolkadotXCM<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
     getRelayToParaOverrides(): TRelayToParaOverrides;
 }
 
 declare class Moonriver<TApi, TRes> extends ParachainNode<TApi, TRes> implements IPolkadotXCMTransfer {
     constructor();
-    private getJunctions;
+    private getMultiLocation;
     transferPolkadotXCM<TApi, TRes>(input: TPolkadotXCMTransferOptions<TApi, TRes>): Promise<TRes>;
     getRelayToParaOverrides(): TRelayToParaOverrides;
 }
@@ -696,11 +756,11 @@ type TPolkadotXCMTransferOptions<TApi, TRes> = {
     addressSelection: TXcmVersioned<TMultiLocation>;
     address: TAddress;
     currencySelection: TXcmVersioned<TMultiAsset[]>;
+    overriddenAsset?: TMultiLocation | TMultiAssetWithFee[];
     scenario: TScenario;
     asset: WithAmount<TAsset>;
     destination: TDestination;
     paraIdTo?: number;
-    overriddenAsset?: TMultiLocation | TMultiAssetWithFee[];
     version?: Version;
     senderAddress?: string;
     pallet?: string;
@@ -715,7 +775,7 @@ type TXTokensTransferOptions<TApi, TRes> = {
     origin: TNodePolkadotKusama;
     destination: TDestination;
     paraIdTo?: number;
-    overriddenAsset?: TMultiLocation | TMultiAsset[];
+    overriddenAsset?: TMultiLocation | TMultiAssetWithFee[];
     pallet?: string;
     method?: string;
 };

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,10 +2461,10 @@ 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), ")}."));
   }
@@ -2535,19 +2530,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 +2552,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 +2596,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',
@@ -4820,12 +4817,12 @@ 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,
                 scenario: scenario,
                 destination: destination,
                 paraIdTo: paraId,
-                overriddenAsset: overriddenAsset,
                 version: version,
                 senderAddress: senderAddress,
                 pallet: pallet,
@@ -4872,8 +4869,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 +5045,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 +5066,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 +5094,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,8 +5114,8 @@ 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);
@@ -5192,16 +5199,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 +5245,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 +5255,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 +5271,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,7 +5282,6 @@ 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,
@@ -5277,13 +5292,13 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
         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(_versionOrDefault, asset.amount, DOT_MULTILOCATION)
         });
       }
       return input;
@@ -5291,8 +5306,9 @@ 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: "transferPolkadotXCM",
@@ -5318,7 +5334,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 +5355,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 +5514,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 +5792,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 +6188,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 +6210,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 +6234,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 +6256,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 +6550,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 +6563,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 +7027,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 +7040,7 @@ var Polimec = {
 							PalletInstance: 50
 						},
 						{
-							GeneralIndex: 1984
+							GeneralIndex: 1337
 						}
 					]
 				}
@@ -7029,8 +7048,7 @@ var Polimec = {
 			existentialDeposit: "70000"
 		},
 		{
-			assetId: "1337",
-			symbol: "USDC",
+			symbol: "USDt",
 			decimals: 6,
 			multiLocation: {
 				parents: 1,
@@ -7043,12 +7061,23 @@ var Polimec = {
 							PalletInstance: 50
 						},
 						{
-							GeneralIndex: 1337
+							GeneralIndex: 1984
 						}
 					]
 				}
 			},
 			existentialDeposit: "70000"
+		},
+		{
+			symbol: "DOT",
+			decimals: 10,
+			multiLocation: {
+				parents: 1,
+				interior: {
+					Here: null
+				}
+			},
+			existentialDeposit: "100000000"
 		}
 	]
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "8.6.1",
+  "version": "8.6.2",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-typescript": "^12.1.2",
     "@vitest/coverage-v8": "^3.0.7",
-    "axios": "^1.8.1",
+    "axios": "^1.8.2",
     "dotenv": "^16.4.7",
     "prettier": "^3.5.2",
     "rollup": "^4.34.8",