@paraspell/sdk-core 8.9.0 → 8.9.1

package/dist/index.cjs

@@ -2,8 +2,8 @@
 
 var assets = require('@paraspell/assets');
 var sdkCommon = require('@paraspell/sdk-common');
-var pallets = require('@paraspell/pallets');
 var ethers = require('ethers');
+var pallets = require('@paraspell/pallets');
 var viem = require('viem');
 
 function _arrayLikeToArray(r, a) {
@@ -2165,7 +2165,14 @@ var constructRelayToParaParameters = function constructRelayToParaParameters(_re
   var paraId = resolveParaId(paraIdTo, destination);
   return _objectSpread2({
     dest: createPolkadotXcmHeader('RelayToPara', version, destination, paraId),
-    beneficiary: generateAddressPayload(api, 'RelayToPara', null, address, version, paraId),
+    beneficiary: createVersionedBeneficiary({
+      api: api,
+      scenario: 'RelayToPara',
+      pallet: null,
+      recipientAddress: address,
+      version: version,
+      paraId: paraId
+    }),
     assets: createVersionedMultiAssets(version, asset.amount, {
       parents: sdkCommon.Parents.ZERO,
       interior: 'Here'
@@ -2688,76 +2695,89 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
   };
 }();
 
-var generateAddressPayload = function generateAddressPayload(api, scenario, pallet, recipientAddress, version, nodeId) {
-  var isMultiLocation = _typeof(recipientAddress) === 'object';
-  if (isMultiLocation) {
-    return addXcmVersionHeader(recipientAddress, version);
+var createBeneficiaryMultiLocation = function createBeneficiaryMultiLocation(_ref) {
+  var api = _ref.api,
+    scenario = _ref.scenario,
+    pallet = _ref.pallet,
+    recipientAddress = _ref.recipientAddress,
+    version = _ref.version,
+    paraId = _ref.paraId;
+  if (sdkCommon.isTMultiLocation(recipientAddress)) {
+    return recipientAddress;
   }
   var isEthAddress = ethers.ethers.isAddress(recipientAddress);
+  var getAccountPayload = function getAccountPayload(allowNetwork) {
+    if (isEthAddress) {
+      return {
+        AccountKey20: _objectSpread2({
+          key: recipientAddress
+        }, allowNetwork ? {
+          network: 'any'
+        } : {})
+      };
+    }
+    return {
+      AccountId32: _objectSpread2({
+        id: api.accountToHex(recipientAddress)
+      }, allowNetwork ? {
+        network: 'any'
+      } : {})
+    };
+  };
   if (scenario === 'ParaToRelay') {
-    return addXcmVersionHeader({
+    return {
       parents: pallet === 'XTokens' ? sdkCommon.Parents.ONE : sdkCommon.Parents.ZERO,
       interior: createX1Payload(version, {
-        AccountId32: _objectSpread2(_objectSpread2({}, version === exports.Version.V1 && {
-          network: 'any'
-        }), {}, {
+        AccountId32: _objectSpread2({
           id: api.accountToHex(recipientAddress)
-        })
+        }, version === exports.Version.V1 ? {
+          network: 'any'
+        } : {})
       })
-    }, version);
-  }
-  if (scenario === 'ParaToPara' && pallet === 'XTokens') {
-    return addXcmVersionHeader({
+    };
+  } else if (scenario === 'ParaToPara' && pallet === 'XTokens') {
+    return {
       parents: sdkCommon.Parents.ONE,
       interior: {
         X2: [{
-          Parachain: nodeId
-        }, isEthAddress ? {
-          AccountKey20: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
-            network: 'any'
-          }), {}, {
-            key: recipientAddress
-          })
-        } : {
-          AccountId32: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
-            network: 'any'
-          }), {}, {
-            id: api.accountToHex(recipientAddress)
-          })
-        }]
+          Parachain: paraId
+        }, getAccountPayload(version === exports.Version.V1 || version === exports.Version.V2)]
       }
-    }, version);
-  }
-  if (scenario === 'ParaToPara' && pallet === 'PolkadotXcm') {
-    return addXcmVersionHeader({
+    };
+  } else if (scenario === 'ParaToPara' && pallet === 'PolkadotXcm') {
+    return {
       parents: sdkCommon.Parents.ZERO,
-      interior: createX1Payload(version, isEthAddress ? {
-        AccountKey20: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
-          network: 'any'
-        }), {}, {
-          key: recipientAddress
-        })
-      } : {
-        AccountId32: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
-          network: 'any'
-        }), {}, {
-          id: api.accountToHex(recipientAddress)
-        })
-      })
-    }, version);
+      interior: createX1Payload(version, getAccountPayload(version === exports.Version.V1 || version === exports.Version.V2))
+    };
+  } else {
+    return {
+      parents: sdkCommon.Parents.ZERO,
+      interior: createX1Payload(version, getAccountPayload(false))
+    };
   }
-  return addXcmVersionHeader({
+};
+
+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: sdkCommon.Parents.ZERO,
-    interior: createX1Payload(version, isEthAddress ? {
-      AccountKey20: {
-        key: recipientAddress
-      }
-    } : {
-      AccountId32: {
-        id: api.accountToHex(recipientAddress)
-      }
-    })
-  }, version);
+    interior: newInterior
+  });
 };
 
 var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version, messageId) {
@@ -2785,7 +2805,13 @@ var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version, messag
         assets: {
           Wild: 'All'
         },
-        beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', senderAddress, version, undefined))[0]
+        beneficiary: createBeneficiaryMultiLocation({
+          api: api,
+          scenario: scenario,
+          pallet: 'PolkadotXcm',
+          recipientAddress: senderAddress,
+          version: version
+        })
       }
     }]
   }, {
@@ -3599,7 +3625,14 @@ var ParachainNode = /*#__PURE__*/function () {
               input = {
                 api: api,
                 asset: asset,
-                addressSelection: generateAddressPayload(api, scenario, 'XTokens', address, versionOrDefault, paraId),
+                addressSelection: createVersionedBeneficiary({
+                  api: api,
+                  scenario: scenario,
+                  pallet: 'XTokens',
+                  recipientAddress: address,
+                  version: versionOrDefault,
+                  paraId: paraId
+                }),
                 fees: getFees(scenario),
                 origin: this.node,
                 scenario: scenario,
@@ -3640,7 +3673,14 @@ var ParachainNode = /*#__PURE__*/function () {
               return _context.abrupt("return", this.transferPolkadotXCM({
                 api: api,
                 header: this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, paraId),
-                addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, versionOrDefault, paraId),
+                addressSelection: createVersionedBeneficiary({
+                  api: api,
+                  scenario: scenario,
+                  pallet: 'PolkadotXcm',
+                  recipientAddress: address,
+                  version: versionOrDefault,
+                  paraId: paraId
+                }),
                 address: address,
                 currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset),
                 overriddenAsset: overriddenAsset,
@@ -3946,27 +3986,10 @@ var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
-var transformMultiLocation = function transformMultiLocation(multiLocation) {
-  var newInterior;
-  if (multiLocation.interior === 'Here') {
-    newInterior = 'Here';
-  } else {
-    var junctions = Object.values(multiLocation.interior).flat().filter(function (junction) {
-      return _typeof(junction) === 'object' && junction !== null;
-    });
-    var filteredJunctions = junctions.filter(function (junction) {
-      return !('Parachain' in junction);
-    });
-    if (filteredJunctions.length === 0) {
-      newInterior = 'Here';
-    } else {
-      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
-    }
-  }
-  return _objectSpread2(_objectSpread2({}, multiLocation), {}, {
-    parents: sdkCommon.Parents.ZERO,
-    interior: newInterior
-  });
+var createVersionedBeneficiary = function createVersionedBeneficiary(options) {
+  var version = options.version;
+  var multiLocation = createBeneficiaryMultiLocation(options);
+  return addXcmVersionHeader(multiLocation, version);
 };
 
 var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
@@ -3983,7 +4006,14 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
     _extractVersionFromHe2 = _slicedToArray(_extractVersionFromHe, 2);
     _extractVersionFromHe2[0];
     var dest = _extractVersionFromHe2[1];
-  var beneficiaryWithHeader = generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, paraIdTo);
+  var beneficiaryWithHeader = createVersionedBeneficiary({
+    api: api,
+    scenario: scenario,
+    pallet: 'PolkadotXcm',
+    recipientAddress: address,
+    version: version,
+    paraId: paraIdTo
+  });
   var _extractVersionFromHe3 = extractVersionFromHeader(beneficiaryWithHeader),
     _extractVersionFromHe4 = _slicedToArray(_extractVersionFromHe3, 2);
     _extractVersionFromHe4[0];
@@ -4093,7 +4123,13 @@ var createCustomXcmToBifrost = function createCustomXcmToBifrost(_ref, version)
       assets: {
         Wild: 'All'
       },
-      beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, undefined))[0]
+      beneficiary: createBeneficiaryMultiLocation({
+        api: api,
+        scenario: scenario,
+        pallet: 'PolkadotXcm',
+        recipientAddress: address,
+        version: version
+      })
     }
   }]);
 };
@@ -4185,7 +4221,14 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
       }
       var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
         header: createPolkadotXcmHeader(scenario, this.version, destination, paraIdTo, ETHEREUM_JUNCTION, sdkCommon.Parents.TWO),
-        addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, this.version, paraIdTo),
+        addressSelection: createVersionedBeneficiary({
+          api: api,
+          scenario: scenario,
+          pallet: 'PolkadotXcm',
+          recipientAddress: address,
+          version: this.version,
+          paraId: paraIdTo
+        }),
         currencySelection: createVersionedMultiAssets(exports.Version.V3, asset.amount, asset.multiLocation)
       });
       return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited');
@@ -4211,7 +4254,14 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
       };
       var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
         header: this.createPolkadotXcmHeader(scenario, version, destination, paraId),
-        addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, paraId),
+        addressSelection: createVersionedBeneficiary({
+          api: api,
+          scenario: scenario,
+          pallet: 'PolkadotXcm',
+          recipientAddress: address,
+          version: version,
+          paraId: paraId
+        }),
         currencySelection: createVersionedMultiAssets(version, asset.amount, customMultiLocation)
       });
       return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'limited_teleport_assets', 'Unlimited');
@@ -4233,7 +4283,14 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         var versionOrDefault = (_input$version3 = input.version) !== null && _input$version3 !== void 0 ? _input$version3 : exports.Version.V2;
         return _objectSpread2(_objectSpread2({}, input), {}, {
           header: this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, paraIdTo),
-          addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, versionOrDefault, paraIdTo),
+          addressSelection: createVersionedBeneficiary({
+            api: api,
+            scenario: scenario,
+            pallet: 'PolkadotXcm',
+            recipientAddress: address,
+            version: versionOrDefault,
+            paraId: paraIdTo
+          }),
           currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset)
         });
       }
@@ -5065,7 +5122,13 @@ var createCustomXcmPolimec = function createCustomXcmPolimec(api, address, scena
               AllCounted: 1
             }
           },
-          beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, undefined))[0]
+          beneficiary: createBeneficiaryMultiLocation({
+            api: api,
+            scenario: scenario,
+            pallet: 'PolkadotXcm',
+            recipientAddress: address,
+            version: version
+          })
         }
       }]
     }
@@ -5142,7 +5205,13 @@ var createCustomXcmAh = function createCustomXcmAh(_ref, version) {
           AllCounted: 1
         }
       },
-      beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, undefined))[0]
+      beneficiary: createBeneficiaryMultiLocation({
+        api: api,
+        scenario: scenario,
+        pallet: 'PolkadotXcm',
+        recipientAddress: address,
+        version: version
+      })
     }
   }]);
 };
@@ -7544,10 +7613,11 @@ exports.claimAssets = claimAssets;
 exports.computeFeeFromDryRun = computeFeeFromDryRun;
 exports.computeFeeFromDryRunPjs = computeFeeFromDryRunPjs;
 exports.createApiInstanceForNode = createApiInstanceForNode;
+exports.createBeneficiaryMultiLocation = createBeneficiaryMultiLocation;
+exports.createVersionedBeneficiary = createVersionedBeneficiary;
 exports.createX1Payload = createX1Payload;
 exports.determineRelayChain = determineRelayChain;
 exports.generateAddressMultiLocationV4 = generateAddressMultiLocationV4;
-exports.generateAddressPayload = generateAddressPayload;
 exports.getAssetBalance = getAssetBalance;
 exports.getAssetBalanceInternal = getAssetBalanceInternal;
 exports.getBalanceForeign = getBalanceForeign;

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import * as _paraspell_assets from '@paraspell/assets';
 import { TMultiAsset, TCurrencyInputWithAmount, TCurrencyInput, WithAmount, TAsset, TMultiAssetWithFee, TCurrencyCore, TAmount } from '@paraspell/assets';
 export * from '@paraspell/assets';
+import * as _paraspell_sdk_common from '@paraspell/sdk-common';
 import { TMultiLocation, TNodeDotKsmWithRelayChains, TNodeWithRelayChains, TNodePolkadotKusama, TNode, TJunction, TEcosystemType, TJunctions } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
 import { TPallet } from '@paraspell/pallets';
@@ -238,6 +239,14 @@ type TWeight = {
     refTime: bigint;
     proofSize: bigint;
 };
+type TCreateBeneficiaryOptions<TApi, TRes> = {
+    api: IPolkadotApi<TApi, TRes>;
+    scenario: TScenario;
+    pallet: TPallet | null;
+    recipientAddress: TAddress;
+    version: Version;
+    paraId?: number;
+};
 
 type TAssetClaimOptionsBase = {
     node: TNodeWithRelayChains;
@@ -1447,6 +1456,8 @@ declare const transferRelayToPara: <TApi, TRes>(options: TRelayToParaOptions<TAp
 
 declare const createApiInstanceForNode: <TApi, TRes>(api: IPolkadotApi<TApi, TRes>, node: TNodeDotKsmWithRelayChains) => Promise<TApi>;
 
+declare const createVersionedBeneficiary: <TApi, TRes>(options: TCreateBeneficiaryOptions<TApi, TRes>) => OneKey<Version, _paraspell_sdk_common.TMultiLocation>;
+
 declare const createX1Payload: (version: Version, junction: TJunction) => TJunctions;
 
 declare const computeFeeFromDryRun: (dryRun: any, node: TNodeDotKsmWithRelayChains, executionFee: bigint) => bigint;
@@ -1457,8 +1468,6 @@ declare const resolveModuleError: (node: TNodeDotKsmWithRelayChains, error: TMod
 
 declare const generateAddressMultiLocationV4: <TApi, TRes>(api: IPolkadotApi<TApi, TRes>, address: TAddress) => TXcmVersioned<TMultiLocation>;
 
-declare const generateAddressPayload: <TApi, TRes>(api: IPolkadotApi<TApi, TRes>, scenario: TScenario, pallet: TPallet | null, recipientAddress: TAddress, version: Version, nodeId: number | undefined) => TXcmVersioned<TMultiLocation>;
-
 declare const getFees: (scenario: TScenario) => number;
 
 /**
@@ -1469,6 +1478,8 @@ declare const getFees: (scenario: TScenario) => number;
  */
 declare const getNode: <TApi, TRes, T extends keyof ReturnType<typeof nodes>>(node: T) => ReturnType<typeof nodes<TApi, TRes>>[T];
 
+declare const createBeneficiaryMultiLocation: <TApi, TRes>({ api, scenario, pallet, recipientAddress, version, paraId }: TCreateBeneficiaryOptions<TApi, TRes>) => TMultiLocation;
+
 declare const transformMultiLocation: (multiLocation: TMultiLocation) => TMultiLocation;
 
 declare const resolveParaId: (paraId: number | undefined, destination: TDestination) => number | undefined;
@@ -1490,4 +1501,4 @@ declare const determineRelayChain: (node: TNodeWithRelayChains) => TRelaychain;
  */
 declare const isRelayChain: (node: TNodeWithRelayChains) => node is "Polkadot" | "Kusama";
 
-export { AssetClaimBuilder, BatchMode, Builder, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, type IPolkadotApi, type IPolkadotXCMTransfer, type IXTokensTransfer, type IXTransferTransfer, IncompatibleNodesError, InvalidAddressError, NoXCMSupportImplementedError, NodeNotSupportedError, type OneKey, PolkadotXcmError, ScenarioNotSupportedError, type TAddress, type TApiOrUrl, type TAssetClaimOptions, type TAssetClaimOptionsBase, type TBalanceResponse, type TBatchOptions, type TBifrostToken, type TDestWeight, type TDestination, type TDryRunBaseOptions, type TDryRunOptions, type TDryRunResult, type TEdJsonMap, type TEvmBuilderOptions, type TEvmBuilderOptionsBase, type TEvmNodeFrom, type TForeignAssetId, type TForeignOrNativeAsset, type TForeignOrTokenAsset, type TGetAssetBalanceOptions, type TGetAssetBalanceOptionsBase, type TGetBalanceForeignOptions, type TGetBalanceForeignOptionsBase, type TGetBalanceNativeOptions, type TGetBalanceNativeOptionsBase, type TGetMaxForeignTransferableAmountOptions, type TGetMaxForeignTransferableAmountOptionsBase, type TGetMaxNativeTransferableAmountOptions, type TGetMaxNativeTransferableAmountOptionsBase, type TGetOriginFeeDetailsOptions, type TGetOriginFeeDetailsOptionsBase, type TGetTransferInfoOptions, type TGetTransferInfoOptionsBase, type TGetTransferableAmountOptions, type TGetTransferableAmountOptionsBase, type TMantaAsset, type TModuleError, type TNativeTokenAsset, type TNodeConfig, type TNodeConfigMap, type TNodleAsset, type TOriginFeeDetails, type TOtherReserveAsset, type TPolkadotXCMTransferOptions, type TPolkadotXcmSection, type TProviderEntry, type TRelayToParaDestination, type TRelayToParaOptions, type TRelayToParaOverrides, type TRelaychain, type TReserveAsset, type TScenario, type TSelfReserveAsset, type TSendBaseOptions, type TSendInternalOptions, type TSendOptions, type TSerializeEthTransferOptions, type TSerializedApiCall, type TSerializedEthTransfer, type TTransferInfo, type TVerifyEdOnDestinationOptions, type TVerifyEdOnDestinationOptionsBase, type TVersionClaimAssets, type TWeight, type TXTokensCurrencySelection, type TXTokensSection, type TXTokensTransferOptions, type TXTransferSection, type TXTransferTransferOptions, type TXcmAsset, type TXcmForeignAsset, type TXcmPalletSection, type TXcmVersioned, type TZeitgeistAsset, Version, type WithApi, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createX1Payload, determineRelayChain, generateAddressMultiLocationV4, generateAddressPayload, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getDryRun, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, isEthersContract, isEthersSigner, isRelayChain, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, BatchMode, Builder, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, type IPolkadotApi, type IPolkadotXCMTransfer, type IXTokensTransfer, type IXTransferTransfer, IncompatibleNodesError, InvalidAddressError, NoXCMSupportImplementedError, NodeNotSupportedError, type OneKey, PolkadotXcmError, ScenarioNotSupportedError, type TAddress, type TApiOrUrl, type TAssetClaimOptions, type TAssetClaimOptionsBase, type TBalanceResponse, type TBatchOptions, type TBifrostToken, type TCreateBeneficiaryOptions, type TDestWeight, type TDestination, type TDryRunBaseOptions, type TDryRunOptions, type TDryRunResult, type TEdJsonMap, type TEvmBuilderOptions, type TEvmBuilderOptionsBase, type TEvmNodeFrom, type TForeignAssetId, type TForeignOrNativeAsset, type TForeignOrTokenAsset, type TGetAssetBalanceOptions, type TGetAssetBalanceOptionsBase, type TGetBalanceForeignOptions, type TGetBalanceForeignOptionsBase, type TGetBalanceNativeOptions, type TGetBalanceNativeOptionsBase, type TGetMaxForeignTransferableAmountOptions, type TGetMaxForeignTransferableAmountOptionsBase, type TGetMaxNativeTransferableAmountOptions, type TGetMaxNativeTransferableAmountOptionsBase, type TGetOriginFeeDetailsOptions, type TGetOriginFeeDetailsOptionsBase, type TGetTransferInfoOptions, type TGetTransferInfoOptionsBase, type TGetTransferableAmountOptions, type TGetTransferableAmountOptionsBase, type TMantaAsset, type TModuleError, type TNativeTokenAsset, type TNodeConfig, type TNodeConfigMap, type TNodleAsset, type TOriginFeeDetails, type TOtherReserveAsset, type TPolkadotXCMTransferOptions, type TPolkadotXcmSection, type TProviderEntry, type TRelayToParaDestination, type TRelayToParaOptions, type TRelayToParaOverrides, type TRelaychain, type TReserveAsset, type TScenario, type TSelfReserveAsset, type TSendBaseOptions, type TSendInternalOptions, type TSendOptions, type TSerializeEthTransferOptions, type TSerializedApiCall, type TSerializedEthTransfer, type TTransferInfo, type TVerifyEdOnDestinationOptions, type TVerifyEdOnDestinationOptionsBase, type TVersionClaimAssets, type TWeight, type TXTokensCurrencySelection, type TXTokensSection, type TXTokensTransferOptions, type TXTransferSection, type TXTransferTransferOptions, type TXcmAsset, type TXcmForeignAsset, type TXcmPalletSection, type TXcmVersioned, type TZeitgeistAsset, Version, type WithApi, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, determineRelayChain, generateAddressMultiLocationV4, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getDryRun, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, isEthersContract, isEthersSigner, isRelayChain, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };

package/dist/index.mjs

@@ -2,9 +2,9 @@ import { InvalidCurrencyError, isForeignAsset, getOtherAssets, getAssetsObject,
 export * from '@paraspell/assets';
 import { Parents, isTMultiLocation, NODE_NAMES_DOT_KSM, deepEqual, hasJunction } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
+import { Contract, ethers } from 'ethers';
 import { getDefaultPallet, getSupportedPalletsDetails } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
-import { Contract, ethers } from 'ethers';
 import { getContract, createPublicClient, http } from 'viem';
 
 function _arrayLikeToArray(r, a) {
@@ -2166,7 +2166,14 @@ var constructRelayToParaParameters = function constructRelayToParaParameters(_re
   var paraId = resolveParaId(paraIdTo, destination);
   return _objectSpread2({
     dest: createPolkadotXcmHeader('RelayToPara', version, destination, paraId),
-    beneficiary: generateAddressPayload(api, 'RelayToPara', null, address, version, paraId),
+    beneficiary: createVersionedBeneficiary({
+      api: api,
+      scenario: 'RelayToPara',
+      pallet: null,
+      recipientAddress: address,
+      version: version,
+      paraId: paraId
+    }),
     assets: createVersionedMultiAssets(version, asset.amount, {
       parents: Parents.ZERO,
       interior: 'Here'
@@ -2689,76 +2696,89 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
   };
 }();
 
-var generateAddressPayload = function generateAddressPayload(api, scenario, pallet, recipientAddress, version, nodeId) {
-  var isMultiLocation = _typeof(recipientAddress) === 'object';
-  if (isMultiLocation) {
-    return addXcmVersionHeader(recipientAddress, version);
+var createBeneficiaryMultiLocation = function createBeneficiaryMultiLocation(_ref) {
+  var api = _ref.api,
+    scenario = _ref.scenario,
+    pallet = _ref.pallet,
+    recipientAddress = _ref.recipientAddress,
+    version = _ref.version,
+    paraId = _ref.paraId;
+  if (isTMultiLocation(recipientAddress)) {
+    return recipientAddress;
   }
   var isEthAddress = ethers.isAddress(recipientAddress);
+  var getAccountPayload = function getAccountPayload(allowNetwork) {
+    if (isEthAddress) {
+      return {
+        AccountKey20: _objectSpread2({
+          key: recipientAddress
+        }, allowNetwork ? {
+          network: 'any'
+        } : {})
+      };
+    }
+    return {
+      AccountId32: _objectSpread2({
+        id: api.accountToHex(recipientAddress)
+      }, allowNetwork ? {
+        network: 'any'
+      } : {})
+    };
+  };
   if (scenario === 'ParaToRelay') {
-    return addXcmVersionHeader({
+    return {
       parents: pallet === 'XTokens' ? Parents.ONE : Parents.ZERO,
       interior: createX1Payload(version, {
-        AccountId32: _objectSpread2(_objectSpread2({}, version === Version.V1 && {
-          network: 'any'
-        }), {}, {
+        AccountId32: _objectSpread2({
           id: api.accountToHex(recipientAddress)
-        })
+        }, version === Version.V1 ? {
+          network: 'any'
+        } : {})
       })
-    }, version);
-  }
-  if (scenario === 'ParaToPara' && pallet === 'XTokens') {
-    return addXcmVersionHeader({
+    };
+  } else if (scenario === 'ParaToPara' && pallet === 'XTokens') {
+    return {
       parents: Parents.ONE,
       interior: {
         X2: [{
-          Parachain: nodeId
-        }, isEthAddress ? {
-          AccountKey20: _objectSpread2(_objectSpread2({}, (version === Version.V1 || version === Version.V2) && {
-            network: 'any'
-          }), {}, {
-            key: recipientAddress
-          })
-        } : {
-          AccountId32: _objectSpread2(_objectSpread2({}, (version === Version.V1 || version === Version.V2) && {
-            network: 'any'
-          }), {}, {
-            id: api.accountToHex(recipientAddress)
-          })
-        }]
+          Parachain: paraId
+        }, getAccountPayload(version === Version.V1 || version === Version.V2)]
       }
-    }, version);
-  }
-  if (scenario === 'ParaToPara' && pallet === 'PolkadotXcm') {
-    return addXcmVersionHeader({
+    };
+  } else if (scenario === 'ParaToPara' && pallet === 'PolkadotXcm') {
+    return {
       parents: Parents.ZERO,
-      interior: createX1Payload(version, isEthAddress ? {
-        AccountKey20: _objectSpread2(_objectSpread2({}, (version === Version.V1 || version === Version.V2) && {
-          network: 'any'
-        }), {}, {
-          key: recipientAddress
-        })
-      } : {
-        AccountId32: _objectSpread2(_objectSpread2({}, (version === Version.V1 || version === Version.V2) && {
-          network: 'any'
-        }), {}, {
-          id: api.accountToHex(recipientAddress)
-        })
-      })
-    }, version);
+      interior: createX1Payload(version, getAccountPayload(version === Version.V1 || version === Version.V2))
+    };
+  } else {
+    return {
+      parents: Parents.ZERO,
+      interior: createX1Payload(version, getAccountPayload(false))
+    };
   }
-  return addXcmVersionHeader({
+};
+
+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: createX1Payload(version, isEthAddress ? {
-      AccountKey20: {
-        key: recipientAddress
-      }
-    } : {
-      AccountId32: {
-        id: api.accountToHex(recipientAddress)
-      }
-    })
-  }, version);
+    interior: newInterior
+  });
 };
 
 var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version, messageId) {
@@ -2786,7 +2806,13 @@ var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version, messag
         assets: {
           Wild: 'All'
         },
-        beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', senderAddress, version, undefined))[0]
+        beneficiary: createBeneficiaryMultiLocation({
+          api: api,
+          scenario: scenario,
+          pallet: 'PolkadotXcm',
+          recipientAddress: senderAddress,
+          version: version
+        })
       }
     }]
   }, {
@@ -3600,7 +3626,14 @@ var ParachainNode = /*#__PURE__*/function () {
               input = {
                 api: api,
                 asset: asset,
-                addressSelection: generateAddressPayload(api, scenario, 'XTokens', address, versionOrDefault, paraId),
+                addressSelection: createVersionedBeneficiary({
+                  api: api,
+                  scenario: scenario,
+                  pallet: 'XTokens',
+                  recipientAddress: address,
+                  version: versionOrDefault,
+                  paraId: paraId
+                }),
                 fees: getFees(scenario),
                 origin: this.node,
                 scenario: scenario,
@@ -3641,7 +3674,14 @@ var ParachainNode = /*#__PURE__*/function () {
               return _context.abrupt("return", this.transferPolkadotXCM({
                 api: api,
                 header: this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, paraId),
-                addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, versionOrDefault, paraId),
+                addressSelection: createVersionedBeneficiary({
+                  api: api,
+                  scenario: scenario,
+                  pallet: 'PolkadotXcm',
+                  recipientAddress: address,
+                  version: versionOrDefault,
+                  paraId: paraId
+                }),
                 address: address,
                 currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset),
                 overriddenAsset: overriddenAsset,
@@ -3947,27 +3987,10 @@ var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
-var transformMultiLocation = function transformMultiLocation(multiLocation) {
-  var newInterior;
-  if (multiLocation.interior === 'Here') {
-    newInterior = 'Here';
-  } else {
-    var junctions = Object.values(multiLocation.interior).flat().filter(function (junction) {
-      return _typeof(junction) === 'object' && junction !== null;
-    });
-    var filteredJunctions = junctions.filter(function (junction) {
-      return !('Parachain' in junction);
-    });
-    if (filteredJunctions.length === 0) {
-      newInterior = 'Here';
-    } else {
-      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
-    }
-  }
-  return _objectSpread2(_objectSpread2({}, multiLocation), {}, {
-    parents: Parents.ZERO,
-    interior: newInterior
-  });
+var createVersionedBeneficiary = function createVersionedBeneficiary(options) {
+  var version = options.version;
+  var multiLocation = createBeneficiaryMultiLocation(options);
+  return addXcmVersionHeader(multiLocation, version);
 };
 
 var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
@@ -3984,7 +4007,14 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
     _extractVersionFromHe2 = _slicedToArray(_extractVersionFromHe, 2);
     _extractVersionFromHe2[0];
     var dest = _extractVersionFromHe2[1];
-  var beneficiaryWithHeader = generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, paraIdTo);
+  var beneficiaryWithHeader = createVersionedBeneficiary({
+    api: api,
+    scenario: scenario,
+    pallet: 'PolkadotXcm',
+    recipientAddress: address,
+    version: version,
+    paraId: paraIdTo
+  });
   var _extractVersionFromHe3 = extractVersionFromHeader(beneficiaryWithHeader),
     _extractVersionFromHe4 = _slicedToArray(_extractVersionFromHe3, 2);
     _extractVersionFromHe4[0];
@@ -4094,7 +4124,13 @@ var createCustomXcmToBifrost = function createCustomXcmToBifrost(_ref, version)
       assets: {
         Wild: 'All'
       },
-      beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, undefined))[0]
+      beneficiary: createBeneficiaryMultiLocation({
+        api: api,
+        scenario: scenario,
+        pallet: 'PolkadotXcm',
+        recipientAddress: address,
+        version: version
+      })
     }
   }]);
 };
@@ -4186,7 +4222,14 @@ var AssetHubPolkadot = /*#__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),
+        addressSelection: createVersionedBeneficiary({
+          api: api,
+          scenario: scenario,
+          pallet: 'PolkadotXcm',
+          recipientAddress: address,
+          version: this.version,
+          paraId: paraIdTo
+        }),
         currencySelection: createVersionedMultiAssets(Version.V3, asset.amount, asset.multiLocation)
       });
       return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited');
@@ -4212,7 +4255,14 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
       };
       var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
         header: this.createPolkadotXcmHeader(scenario, version, destination, paraId),
-        addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, paraId),
+        addressSelection: createVersionedBeneficiary({
+          api: api,
+          scenario: scenario,
+          pallet: 'PolkadotXcm',
+          recipientAddress: address,
+          version: version,
+          paraId: paraId
+        }),
         currencySelection: createVersionedMultiAssets(version, asset.amount, customMultiLocation)
       });
       return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'limited_teleport_assets', 'Unlimited');
@@ -4234,7 +4284,14 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         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),
+          addressSelection: createVersionedBeneficiary({
+            api: api,
+            scenario: scenario,
+            pallet: 'PolkadotXcm',
+            recipientAddress: address,
+            version: versionOrDefault,
+            paraId: paraIdTo
+          }),
           currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset)
         });
       }
@@ -5066,7 +5123,13 @@ var createCustomXcmPolimec = function createCustomXcmPolimec(api, address, scena
               AllCounted: 1
             }
           },
-          beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, undefined))[0]
+          beneficiary: createBeneficiaryMultiLocation({
+            api: api,
+            scenario: scenario,
+            pallet: 'PolkadotXcm',
+            recipientAddress: address,
+            version: version
+          })
         }
       }]
     }
@@ -5143,7 +5206,13 @@ var createCustomXcmAh = function createCustomXcmAh(_ref, version) {
           AllCounted: 1
         }
       },
-      beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', address, version, undefined))[0]
+      beneficiary: createBeneficiaryMultiLocation({
+        api: api,
+        scenario: scenario,
+        pallet: 'PolkadotXcm',
+        recipientAddress: address,
+        version: version
+      })
     }
   }]);
 };
@@ -7531,4 +7600,4 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
   };
 }();
 
-export { AssetClaimBuilder, BatchMode, Builder, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, Version, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createX1Payload, determineRelayChain, generateAddressMultiLocationV4, generateAddressPayload, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getDryRun, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, isEthersContract, isEthersSigner, isRelayChain, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, BatchMode, Builder, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, Version, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, determineRelayChain, generateAddressMultiLocationV4, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getDryRun, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, isEthersContract, isEthersSigner, isRelayChain, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "8.9.0",
+  "version": "8.9.1",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -25,9 +25,9 @@
   "dependencies": {
     "ethers": "^6.13.5",
     "viem": "^2.23.5",
-    "@paraspell/pallets": "8.9.0",
-    "@paraspell/sdk-common": "8.9.0",
-    "@paraspell/assets": "8.9.0"
+    "@paraspell/pallets": "8.9.1",
+    "@paraspell/assets": "8.9.1",
+    "@paraspell/sdk-common": "8.9.1"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.26.0",