@paraspell/sdk-core 10.4.7 → 10.4.9

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isNodeEvm, getAssetsObject, getNativeAssetSymbol, getOtherAssets, getRelayChainSymbol, InvalidCurrencyError, isForeignAsset, findAssetForNodeOrThrow, findAsset, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, isTMultiAsset, getExistentialDeposit, isAssetEqual, findAssetOnDestOrThrow, normalizeSymbol, getExistentialDepositOrThrow, hasDryRunSupport, hasSupportForAsset, extractMultiAssetLoc, isSymbolSpecifier, normalizeMultiLocation, getAssetId } from '@paraspell/assets';
+import { isNodeEvm, getAssetsObject, getNativeAssetSymbol, getOtherAssets, getRelayChainSymbol, isForeignAsset, InvalidCurrencyError, findAssetForNodeOrThrow, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, findAsset, isTMultiAsset, getExistentialDeposit, getExistentialDepositOrThrow, isAssetEqual, findAssetOnDestOrThrow, normalizeSymbol, hasDryRunSupport, hasSupportForAsset, extractMultiAssetLoc, isSymbolSpecifier, normalizeMultiLocation, getAssetId } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, createPublicClient, http, getContract } from 'viem';
-import { Parents, Version, isTMultiLocation, isRelayChain, NODE_NAMES_DOT_KSM, hasJunction, deepEqual, isDotKsmBridge } from '@paraspell/sdk-common';
+import { Parents, isTMultiLocation, Version, isRelayChain, replaceBigInt, NODE_NAMES_DOT_KSM, hasJunction, deepEqual, isDotKsmBridge } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
 import { getSupportedPalletsDetails, getDefaultPallet } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
@@ -69,7 +69,7 @@ function _defineProperties(e, r) {
   }
 }
 function _createClass(e, r, t) {
-  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
+  return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
     writable: false
   }), e;
 }
@@ -705,6 +705,23 @@ var MAX_WEIGHT = {
   refTime: MAX_U64
 };
 
+var ERR_MULTILOCATION_DEST_NOT_SUPPORTED = '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 addXcmVersionHeader = function addXcmVersionHeader(obj, version) {
+  return _defineProperty({}, version, obj);
+};
+
+var assertToIsString = function assertToIsString(to, overrideMsg) {
+  if (isTMultiLocation(to)) {
+    throw new InvalidParameterError(overrideMsg !== null && overrideMsg !== void 0 ? overrideMsg : 'Multi-Location destination is not supported for XCM fee calculation.');
+  }
+};
+var assertAddressIsString = function assertAddressIsString(address) {
+  if (isTMultiLocation(address)) {
+    throw new InvalidParameterError('Multi-Location address is not supported for XCM fee calculation.');
+  }
+};
+
 var AssetHubPolkadot$1 = {
 	name: "AssetHub",
 	info: "PolkadotAssetHub",
@@ -2400,10 +2417,6 @@ var getNode = function getNode(node) {
   return nodeMap[node];
 };
 
-var replaceBigInt = function replaceBigInt(_key, value) {
-  return typeof value === 'bigint' ? value.toString() : value;
-};
-
 var resolveParaId = function resolveParaId(paraId, destination) {
   if (isTMultiLocation(destination) || isRelayChain(destination) || destination === 'Ethereum') {
     return undefined;
@@ -2438,66 +2451,6 @@ var determineRelayChain = function determineRelayChain(node) {
   return getRelayChainSymbol(node) === 'KSM' ? 'Kusama' : 'Polkadot';
 };
 
-var findParachainJunction = function findParachainJunction(multilocation) {
-  var interior = multilocation.interior;
-  if (interior === 'Here') {
-    return null;
-  }
-  for (var key in interior) {
-    var junctions = interior[key];
-    if (Array.isArray(junctions)) {
-      var _iterator = _createForOfIteratorHelper(junctions),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var junction = _step.value;
-          if ('Parachain' in junction) {
-            return Number(junction.Parachain);
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-    } else if (_typeof(junctions) === 'object' && junctions !== null && 'Parachain' in junctions) {
-      return Number(junctions.Parachain);
-    }
-  }
-  return null;
-};
-
-var constructRelayToParaParameters = function constructRelayToParaParameters(_ref, version) {
-  var api = _ref.api,
-    destination = _ref.destination,
-    asset = _ref.asset,
-    address = _ref.address,
-    paraIdTo = _ref.paraIdTo;
-  var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-      includeFee: false
-    },
-    includeFee = _ref2.includeFee;
-  var paraId = resolveParaId(paraIdTo, destination);
-  return _objectSpread2({
-    dest: createVersionedDestination('RelayToPara', version, destination, 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'
-    }),
-    fee_asset_item: DEFAULT_FEE_ASSET
-  }, includeFee && {
-    weight_limit: 'Unlimited'
-  });
-};
-
 var createMultiAsset = function createMultiAsset(version, amount, multiLocation) {
   if (version === Version.V4 || version === Version.V5) {
     return {
@@ -2516,83 +2469,28 @@ var createMultiAsset = function createMultiAsset(version, amount, multiLocation)
     }
   };
 };
-var addXcmVersionHeader = function addXcmVersionHeader(obj, version) {
-  return _defineProperty({}, version, obj);
-};
-var extractVersionFromHeader = function extractVersionFromHeader(versionHeader) {
-  var keys = Object.keys(versionHeader);
-  if (keys.length !== 1) {
-    throw new InvalidParameterError('Invalid version header: expected exactly one key.');
-  }
-  var version = keys[0];
-  var value = versionHeader[version];
-  if (value === undefined) {
-    throw new InvalidParameterError('Invalid version header: value is undefined.');
-  }
-  return [version, value];
+var createVersionedMultiAssets = function createVersionedMultiAssets(version, amount, multiLocation) {
+  var multiAsset = createMultiAsset(version, amount, multiLocation);
+  return addXcmVersionHeader([multiAsset], version);
 };
+
 var maybeOverrideMultiAssets = function maybeOverrideMultiAssets(version, amount, multiAssets, overriddenCurrency) {
   if (!overriddenCurrency) {
     return multiAssets;
   }
   return isTMultiLocation(overriddenCurrency) ? [createMultiAsset(version, amount, overriddenCurrency)] : overriddenCurrency;
 };
-var createVersionedMultiAssets = function createVersionedMultiAssets(version, amount, multiLocation) {
-  var multiAssets = createMultiAsset(version, amount, multiLocation);
-  return addXcmVersionHeader([multiAssets], version);
-};
-var createDestination = function createDestination(scenario, version, destination, nodeId, junction, parents) {
-  var parentsResolved = parents !== null && parents !== void 0 ? parents : scenario === 'RelayToPara' ? Parents.ZERO : Parents.ONE;
-  var interior = scenario === 'ParaToRelay' ? 'Here' : createX1Payload(version, junction !== null && junction !== void 0 ? junction : {
-    Parachain: nodeId
-  });
-  var isMultiLocationDestination = isTMultiLocation(destination);
-  return isMultiLocationDestination ? destination : {
-    parents: parentsResolved,
-    interior: interior
-  };
-};
-var createVersionedDestination = function createVersionedDestination(scenario, version, destination, nodeId, junction, parents) {
-  var plainDestination = createDestination(scenario, version, destination, nodeId, junction, parents);
-  return addXcmVersionHeader(plainDestination, version);
-};
-var createBridgePolkadotXcmDest = function createBridgePolkadotXcmDest(version, ecosystem, destination, nodeId) {
-  var multiLocation = {
-    parents: Parents.TWO,
-    interior: {
-      X2: [{
-        GlobalConsensus: ecosystem
-      }, {
-        Parachain: nodeId
-      }]
-    }
-  };
-  var isMultiLocationDestination = isTMultiLocation(destination);
-  return addXcmVersionHeader(isMultiLocationDestination ? destination : multiLocation, version);
-};
-var resolveTNodeFromMultiLocation = function resolveTNodeFromMultiLocation(relayChain, multiLocation) {
-  var _NODE_NAMES_DOT_KSM$f;
-  var parachainId = findParachainJunction(multiLocation);
-  if (parachainId === null) {
-    throw new InvalidParameterError('Parachain ID not found in destination multi location.');
-  }
-  var node = (_NODE_NAMES_DOT_KSM$f = NODE_NAMES_DOT_KSM.find(function (nodeName) {
-    return getParaId(nodeName) === parachainId && determineRelayChain(nodeName) === relayChain;
-  })) !== null && _NODE_NAMES_DOT_KSM$f !== void 0 ? _NODE_NAMES_DOT_KSM$f : null;
-  if (node === null) {
-    throw new InvalidParameterError('Node with specified paraId not found in destination multi location.');
+var maybeOverrideMultiAsset = function maybeOverrideMultiAsset(version, amount, multiAsset, overriddenCurrency) {
+  if (!overriddenCurrency) {
+    return multiAsset;
   }
-  return node;
-};
-var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, node) {
-  var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-      isDestination: false
-    },
-    isDestination = _ref2.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), ")}."));
+  if (Array.isArray(overriddenCurrency)) {
+    if (overriddenCurrency.length !== 1) {
+      throw new InvalidParameterError('Expected a single TMultiAsset in overriddenCurrency array.');
+    }
+    return overriddenCurrency[0];
   }
-  throw new InvalidCurrencyError("".concat(isDestination ? 'Destination' : 'Origin', " node ").concat(node, " does not support currency ").concat(JSON.stringify(currency), "."));
+  return createMultiAsset(version, amount, overriddenCurrency);
 };
 
 var resolveMultiLocationFromDest = function resolveMultiLocationFromDest(destination, asset) {
@@ -2658,12 +2556,13 @@ var getModifiedCurrencySelection = function getModifiedCurrencySelection(input)
   return createDefaultCurrencySelection(input);
 };
 
-var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, currencySelection, addressSelection, amount, fees, overriddenAsset) {
+var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, currencySelection, destLocation, amount, fees, version, overriddenAsset) {
+  var versionedDestLocation = addXcmVersionHeader(destLocation, version);
   if (!isMultiAssetTransfer) {
     return {
       currency_id: currencySelection,
       amount: BigInt(amount),
-      dest: addressSelection,
+      dest: versionedDestLocation,
       dest_weight_limit: fees
     };
   }
@@ -2676,7 +2575,7 @@ var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, c
   return _objectSpread2(_objectSpread2(_defineProperty({}, assetKey, currencySelection), isOverriddenMultiAssets && {
     fee_item: feeIndexWithFallback
   }), {}, {
-    dest: addressSelection,
+    dest: versionedDestLocation,
     dest_weight_limit: fees
   });
 };
@@ -2700,14 +2599,15 @@ var getXTokensMethod = function getXTokensMethod(useMultiAsset, overriddenAsset)
 };
 var buildXTokensCall = function buildXTokensCall(input, currencySelection, fees) {
   var overriddenAsset = input.overriddenAsset,
-    addressSelection = input.addressSelection,
+    destLocation = input.destLocation,
     asset = input.asset,
     pallet = input.pallet,
+    version = input.version,
     methodOverride = input.method;
   var useMultiAsset = shouldUseMultiAssetTransfer(input);
   var modifiedCurrencySelection = useMultiAsset ? getModifiedCurrencySelection(input) : currencySelection;
   var method = getXTokensMethod(useMultiAsset, overriddenAsset);
-  var parameters = getXTokensParameters(useMultiAsset, modifiedCurrencySelection, addressSelection, asset.amount, fees, overriddenAsset);
+  var parameters = getXTokensParameters(useMultiAsset, modifiedCurrencySelection, destLocation, asset.amount, fees, version, overriddenAsset);
   return {
     module: pallet !== null && pallet !== void 0 ? pallet : 'XTokens',
     method: methodOverride !== null && methodOverride !== void 0 ? methodOverride : method,
@@ -2715,22 +2615,129 @@ var buildXTokensCall = function buildXTokensCall(input, currencySelection, fees)
   };
 };
 
-var ERR_MULTILOCATION_DEST_NOT_SUPPORTED = '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 validateDestination$1 = function validateDestination(destination) {
-  var isMultiLocationDestination = _typeof(destination) === 'object';
-  if (isMultiLocationDestination) {
-    throw new InvalidParameterError(ERR_MULTILOCATION_DEST_NOT_SUPPORTED);
-  }
-};
+// Contains basic structure of xTokens call
 var transferXTokens = function transferXTokens(input, currencySelection) {
   var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : DEFAULT_FEE;
   var api = input.api,
     destination = input.destination;
-  validateDestination$1(destination);
+  assertToIsString(destination, ERR_MULTILOCATION_DEST_NOT_SUPPORTED);
   var call = buildXTokensCall(input, currencySelection, fees);
   return api.callTxMethod(call);
 };
 
+var findParachainJunction = function findParachainJunction(multilocation) {
+  var interior = multilocation.interior;
+  if (interior === 'Here') {
+    return null;
+  }
+  for (var key in interior) {
+    var junctions = interior[key];
+    if (Array.isArray(junctions)) {
+      var _iterator = _createForOfIteratorHelper(junctions),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var junction = _step.value;
+          if ('Parachain' in junction) {
+            return Number(junction.Parachain);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    } else if (_typeof(junctions) === 'object' && junctions !== null && 'Parachain' in junctions) {
+      return Number(junctions.Parachain);
+    }
+  }
+  return null;
+};
+
+var constructRelayToParaParameters = function constructRelayToParaParameters(_ref, version) {
+  var api = _ref.api,
+    destination = _ref.destination,
+    asset = _ref.asset,
+    address = _ref.address,
+    paraIdTo = _ref.paraIdTo;
+  var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+      includeFee: false
+    },
+    includeFee = _ref2.includeFee;
+  var paraId = resolveParaId(paraIdTo, destination);
+  return _objectSpread2({
+    dest: createVersionedDestination('RelayToPara', version, destination, 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'
+    }),
+    fee_asset_item: DEFAULT_FEE_ASSET
+  }, includeFee && {
+    weight_limit: 'Unlimited'
+  });
+};
+
+var createDestination = function createDestination(scenario, version, destination, nodeId, junction, parents) {
+  var parentsResolved = parents !== null && parents !== void 0 ? parents : scenario === 'RelayToPara' ? Parents.ZERO : Parents.ONE;
+  var interior = scenario === 'ParaToRelay' ? 'Here' : createX1Payload(version, junction !== null && junction !== void 0 ? junction : {
+    Parachain: nodeId
+  });
+  var isMultiLocationDestination = isTMultiLocation(destination);
+  return isMultiLocationDestination ? destination : {
+    parents: parentsResolved,
+    interior: interior
+  };
+};
+var createVersionedDestination = function createVersionedDestination(scenario, version, destination, nodeId, junction, parents) {
+  var plainDestination = createDestination(scenario, version, destination, nodeId, junction, parents);
+  return addXcmVersionHeader(plainDestination, version);
+};
+var createBridgeDestination = function createBridgeDestination(ecosystem, destination, nodeId) {
+  var multiLocation = {
+    parents: Parents.TWO,
+    interior: {
+      X2: [{
+        GlobalConsensus: ecosystem
+      }, {
+        Parachain: nodeId
+      }]
+    }
+  };
+  return isTMultiLocation(destination) ? destination : multiLocation;
+};
+var resolveTNodeFromMultiLocation = function resolveTNodeFromMultiLocation(relayChain, multiLocation) {
+  var _NODE_NAMES_DOT_KSM$f;
+  var parachainId = findParachainJunction(multiLocation);
+  if (parachainId === null) {
+    throw new InvalidParameterError('Parachain ID not found in destination multi location.');
+  }
+  var node = (_NODE_NAMES_DOT_KSM$f = NODE_NAMES_DOT_KSM.find(function (nodeName) {
+    return getParaId(nodeName) === parachainId && determineRelayChain(nodeName) === relayChain;
+  })) !== null && _NODE_NAMES_DOT_KSM$f !== void 0 ? _NODE_NAMES_DOT_KSM$f : null;
+  if (node === null) {
+    throw new InvalidParameterError('Node with specified paraId not found in destination multi location.');
+  }
+  return node;
+};
+var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, node) {
+  var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+      isDestination: false
+    },
+    isDestination = _ref.isDestination;
+  if ('multilocation' in currency) {
+    throw new InvalidCurrencyError("\n      Selected chain doesn't support multilocation you provided. Maybe you meant custom multilocation. If so, you need to use override option. Your selection should look like this: {multilocation: Override(".concat(JSON.stringify(currency.multilocation), ")}."));
+  }
+  throw new InvalidCurrencyError("".concat(isDestination ? 'Destination' : 'Origin', " node ").concat(node, " does not support currency ").concat(JSON.stringify(currency, replaceBigInt), "."));
+};
+
 /**
  * Retrieves the node name corresponding to a specified parachain ID.
  *
@@ -3373,29 +3380,23 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
               wallet: signer
             }
           });
-          foundAsset = findAsset(from, currency, to);
-          if (!(foundAsset === null)) {
-            _context.n = 3;
-            break;
-          }
-          throw new InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
-        case 3:
+          foundAsset = findAssetForNodeOrThrow(from, currency, to);
           if (!(foundAsset.symbol === getNativeAssetSymbol(from))) {
-            _context.n = 4;
+            _context.n = 3;
             break;
           }
           asset = NATIVE_ASSET_ID;
-          _context.n = 6;
+          _context.n = 5;
           break;
-        case 4:
+        case 3:
           if (!(!isForeignAsset(foundAsset) || !foundAsset.assetId)) {
-            _context.n = 5;
+            _context.n = 4;
             break;
           }
           throw new InvalidCurrencyError('Currency must be a foreign asset with valid assetId');
-        case 5:
+        case 4:
           asset = formatAssetIdToERC20(foundAsset.assetId);
-        case 6:
+        case 5:
           destMultiLocation = getDestinationMultilocation(api, address, to);
           weight = U_64_MAX; // Partially inspired by Moonbeam XCM-SDK
           // https://github.com/moonbeam-foundation/xcm-sdk/blob/ab835c15bf41612604b1c858d956a9f07705ed65/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts#L53
@@ -3405,27 +3406,27 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
           };
           multiCurrencySymbols = ['xcPINK', 'xcDED', 'xcSTINK', 'xcWIFD', 'xcNCTR'];
           useMultiAssets = from === 'Moonbeam' && to === 'AssetHubPolkadot' && multiCurrencySymbols.includes(foundAsset.symbol);
-          usdtAsset = findAsset(from, {
+          usdtAsset = findAssetForNodeOrThrow(from, {
             symbol: 'xcUSDT'
           }, to);
           if (!useMultiAssets) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
-          _context.n = 7;
+          _context.n = 6;
           return createTx('transferMultiCurrencies', [[[asset, currency.amount], [formatAssetIdToERC20((_usdtAsset$assetId = usdtAsset.assetId) !== null && _usdtAsset$assetId !== void 0 ? _usdtAsset$assetId : ''), '200000']], 1,
           // index of the fee asset
           destMultiLocation, weight]);
-        case 7:
+        case 6:
           _t = _context.v;
-          _context.n = 10;
-          break;
-        case 8:
           _context.n = 9;
+          break;
+        case 7:
+          _context.n = 8;
           return createTx('transfer', [asset, currency.amount, destMultiLocation, weight]);
-        case 9:
+        case 8:
           _t = _context.v;
-        case 10:
+        case 9:
           tx = _t;
           return _context.a(2, tx);
       }
@@ -3697,26 +3698,20 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           }
           throw new InvalidParameterError('Override multilocation is not supported for Evm transfers');
         case 5:
-          foundAsset = findAsset(from, currency, to);
-          if (!(foundAsset === null)) {
-            _context.n = 6;
-            break;
-          }
-          throw new InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
-        case 6:
+          foundAsset = findAssetForNodeOrThrow(from, currency, to);
           if (!(!isForeignAsset(foundAsset) || !foundAsset.multiLocation)) {
-            _context.n = 7;
+            _context.n = 6;
             break;
           }
           throw new InvalidCurrencyError('Currency must be a foreign asset with valid multi-location');
-        case 7:
+        case 6:
           ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), foundAsset.multiLocation);
           if (!(!ethAsset || !ethAsset.assetId)) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
           throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(foundAsset)));
-        case 8:
+        case 7:
           contract = getContract({
             abi: abi,
             address: xcmInterfacePrecompile,
@@ -3730,17 +3725,17 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           });
           senderAddress = (_signer$account = signer.account) === null || _signer$account === void 0 ? void 0 : _signer$account.address;
           if (senderAddress) {
-            _context.n = 9;
+            _context.n = 8;
             break;
           }
           throw new InvalidParameterError('Unable to get sender address');
+        case 8:
+          _context.n = 9;
+          return api.init(from, TX_CLIENT_TIMEOUT_MS);
         case 9:
           _context.n = 10;
-          return api.init(from, TX_CLIENT_TIMEOUT_MS);
-        case 10:
-          _context.n = 11;
           return generateMessageId(api, senderAddress, getParaId(from), ethAsset.assetId, address, currency.amount);
-        case 11:
+        case 10:
           messageId = _context.v;
           customXcm = createCustomXcmOnDest({
             api: api,
@@ -3753,17 +3748,17 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
             }),
             version: Version.V4
           }, from, messageId);
-          _context.n = 12;
+          _context.n = 11;
           return api.objectToHex(customXcm, 'XcmVersionedXcm');
-        case 12:
+        case 11:
           customXcmOnDest = _context.v;
-          _context.n = 13;
+          _context.n = 12;
           return api.createApiForNode('AssetHubPolkadot');
-        case 13:
+        case 12:
           assetHubApi = _context.v;
-          _context.n = 14;
+          _context.n = 13;
           return getParaEthTransferFees(assetHubApi);
-        case 14:
+        case 13:
           _yield$getParaEthTran = _context.v;
           _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
           bridgeFee = _yield$getParaEthTran2[0];
@@ -3778,7 +3773,7 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
               throw new InvalidParameterError('Input must be a valid number');
             }() : "0x".concat((num >>> 0).toString(16).padStart(8, '0'));
           }; // Execute the custom XCM message with the precompile
-          _context.n = 15;
+          _context.n = 14;
           return createTx('transferAssetsUsingTypeAndThenAddress', [
           // This represents (1,X1(Parachain(1000)))
           [1, ['0x00' + numberToHex32(getParaId('AssetHubPolkadot')).slice(2)]],
@@ -3790,7 +3785,7 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           0,
           // The TransferType corresponding to fee asset
           2, customXcmOnDest]);
-        case 15:
+        case 14:
           tx = _context.v;
           return _context.a(2, tx);
       }
@@ -3949,7 +3944,7 @@ var getOriginFeeDetails = /*#__PURE__*/function () {
 
 var getTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, senderAddress, node, destination, currency, tx, feeAsset, resolvedFeeAsset, asset, balance, ed, edBN, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
+    var api, senderAddress, node, destination, currency, tx, feeAsset, resolvedFeeAsset, asset, balance, ed, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -3966,22 +3961,15 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
           });
         case 1:
           balance = _context.v;
-          ed = getExistentialDeposit(node, currency);
-          if (!(ed === null)) {
-            _context.n = 2;
-            break;
-          }
-          throw new InvalidParameterError("Cannot get existential deposit for currency ".concat(JSON.stringify(currency), "."));
-        case 2:
-          edBN = BigInt(ed);
+          ed = getExistentialDepositOrThrow(node, currency);
           isNativeAsset = getNativeAssetSymbol(node) === asset.symbol;
           shouldSubstractFee = isNativeAsset || node === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, asset);
           feeToSubtract = 0n;
           if (!shouldSubstractFee) {
-            _context.n = 5;
+            _context.n = 4;
             break;
           }
-          _context.n = 3;
+          _context.n = 2;
           return getOriginXcmFee({
             api: api,
             tx: tx,
@@ -3992,18 +3980,18 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
             currency: currency,
             disableFallback: false
           });
-        case 3:
+        case 2:
           _yield$getOriginXcmFe = _context.v;
           fee = _yield$getOriginXcmFe.fee;
           if (!(fee === undefined)) {
-            _context.n = 4;
+            _context.n = 3;
             break;
           }
-          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency), " on node ").concat(node, "."));
-        case 4:
+          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on node ").concat(node, "."));
+        case 3:
           feeToSubtract = fee;
-        case 5:
-          transferable = balance - edBN - feeToSubtract;
+        case 4:
+          transferable = balance - ed - feeToSubtract;
           return _context.a(2, transferable > 0n ? transferable : 0n);
       }
     }, _callee);
@@ -4063,7 +4051,7 @@ var buildDestInfo = /*#__PURE__*/function () {
             _context.n = 2;
             break;
           }
-          throw new InvalidParameterError("Existential deposit not found for ".concat(destination, " with currency ").concat(JSON.stringify(currency)));
+          throw new InvalidParameterError("Existential deposit not found for ".concat(destination, " with currency ").concat(JSON.stringify(currency, replaceBigInt)));
         case 2:
           edDestBn = BigInt(edDest);
           destCurrency = destAsset.multiLocation ? {
@@ -4241,7 +4229,7 @@ var buildHopInfo = /*#__PURE__*/function () {
 
 var getTransferInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, originBalanceFee, originBalance, edOrigin, edOriginBn, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubNode, destinationInfo, _t;
+    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubNode, destinationInfo, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -4294,15 +4282,8 @@ var getTransferInfo = /*#__PURE__*/function () {
           });
         case 8:
           originBalance = _context.v;
-          edOrigin = getExistentialDeposit(origin, currency);
-          if (edOrigin) {
-            _context.n = 9;
-            break;
-          }
-          throw new InvalidParameterError("Existential deposit not found for ".concat(origin, " with currency ").concat(JSON.stringify(currency)));
-        case 9:
-          edOriginBn = BigInt(edOrigin);
-          _context.n = 10;
+          edOrigin = getExistentialDepositOrThrow(origin, currency);
+          _context.n = 9;
           return getXcmFee({
             api: api,
             tx: tx,
@@ -4314,7 +4295,7 @@ var getTransferInfo = /*#__PURE__*/function () {
             feeAsset: feeAsset,
             disableFallback: false
           });
-        case 10:
+        case 9:
           _yield$getXcmFee = _context.v;
           _yield$getXcmFee$orig = _yield$getXcmFee.origin;
           originFee = _yield$getXcmFee$orig.fee;
@@ -4323,21 +4304,21 @@ var getTransferInfo = /*#__PURE__*/function () {
           bridgeHubFeeResult = _yield$getXcmFee.bridgeHub;
           destFeeDetail = _yield$getXcmFee.destination;
           if (!(originFee === undefined)) {
-            _context.n = 11;
+            _context.n = 10;
             break;
           }
-          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency), " on node ").concat(origin, "."));
-        case 11:
+          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on node ").concat(origin, "."));
+        case 10:
           isFeeAssetAh = origin === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, originAsset);
           originBalanceAfter = originBalance - BigInt(currency.amount);
           originBalanceFeeAfter = isFeeAssetAh ? originBalanceFee - BigInt(currency.amount) : originBalanceFee - originFee;
           originBalanceNativeSufficient = originBalanceFee >= originFee;
-          originBalanceSufficient = originBalanceAfter >= edOriginBn;
+          originBalanceSufficient = originBalanceAfter >= edOrigin;
           if (!assetHubFeeResult) {
-            _context.n = 13;
+            _context.n = 12;
             break;
           }
-          _context.n = 12;
+          _context.n = 11;
           return buildHopInfo({
             api: api,
             node: determineRelayChain(origin) === 'Polkadot' ? 'AssetHubPolkadot' : 'AssetHubKusama',
@@ -4347,15 +4328,15 @@ var getTransferInfo = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             ahAddress: ahAddress
           });
-        case 12:
+        case 11:
           assetHub = _context.v;
-        case 13:
+        case 12:
           if (!bridgeHubFeeResult) {
-            _context.n = 15;
+            _context.n = 14;
             break;
           }
           bridgeHubNode = determineRelayChain(origin) === 'Polkadot' ? 'BridgeHubPolkadot' : 'BridgeHubKusama';
-          _context.n = 14;
+          _context.n = 13;
           return buildHopInfo({
             api: api,
             node: bridgeHubNode,
@@ -4365,10 +4346,10 @@ var getTransferInfo = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             ahAddress: ahAddress
           });
-        case 14:
+        case 13:
           bridgeHub = _context.v;
-        case 15:
-          _context.n = 16;
+        case 14:
+          _context.n = 15;
           return buildDestInfo({
             api: api,
             origin: origin,
@@ -4381,7 +4362,7 @@ var getTransferInfo = /*#__PURE__*/function () {
             assetHubFee: assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.fee,
             bridgeFee: bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.fee
           });
-        case 16:
+        case 15:
           destinationInfo = _context.v;
           return _context.a(2, {
             chain: {
@@ -4395,7 +4376,7 @@ var getTransferInfo = /*#__PURE__*/function () {
                 balance: originBalance,
                 balanceAfter: originBalanceAfter,
                 currencySymbol: originAsset.symbol,
-                existentialDeposit: edOriginBn
+                existentialDeposit: edOrigin
               },
               xcmFee: {
                 sufficient: originBalanceNativeSufficient,
@@ -4409,17 +4390,17 @@ var getTransferInfo = /*#__PURE__*/function () {
             bridgeHub: bridgeHub,
             destination: destinationInfo
           });
-        case 17:
-          _context.p = 17;
+        case 16:
+          _context.p = 16;
           api.setDisconnectAllowed(true);
-          _context.n = 18;
+          _context.n = 17;
           return api.disconnect();
+        case 17:
+          return _context.f(16);
         case 18:
-          return _context.f(17);
-        case 19:
           return _context.a(2);
       }
-    }, _callee, null, [[3,, 17, 19]]);
+    }, _callee, null, [[3,, 16, 18]]);
   }));
   return function getTransferInfo(_x) {
     return _ref2.apply(this, arguments);
@@ -4439,7 +4420,7 @@ var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, edBN, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
+    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, destCurrency, ed, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -4473,24 +4454,17 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           } : {
             symbol: asset.symbol
           };
-          ed = getExistentialDeposit(destination, destCurrency);
-          if (!(ed === null)) {
-            _context.n = 5;
-            break;
-          }
-          throw new InvalidParameterError("Cannot get existential deposit for currency ".concat(JSON.stringify(currency)));
-        case 5:
-          edBN = BigInt(ed);
-          _context.n = 6;
+          ed = getExistentialDepositOrThrow(destination, destCurrency);
+          _context.n = 5;
           return getAssetBalanceInternal({
             address: address,
             node: destination,
             api: destApi,
             currency: destCurrency
           });
-        case 6:
+        case 5:
           balance = _context.v;
-          _context.n = 7;
+          _context.n = 6;
           return getXcmFee({
             api: api,
             tx: tx,
@@ -4502,40 +4476,40 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
             feeAsset: feeAsset,
             disableFallback: false
           });
-        case 7:
+        case 6:
           xcmFeeResult = _context.v;
           dryRunError = xcmFeeResult.origin.dryRunError, assetHubFeeResult = xcmFeeResult.assetHub, bridgeHubFeeResult = xcmFeeResult.bridgeHub, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeCurrency = _xcmFeeResult$destina.currency, destDryRunError = _xcmFeeResult$destina.dryRunError;
           if (!(destFee === undefined)) {
-            _context.n = 8;
+            _context.n = 7;
             break;
           }
-          throw new InvalidParameterError("Cannot get destination xcm fee for currency ".concat(JSON.stringify(currency), " on node ").concat(destination, "."));
-        case 8:
+          throw new InvalidParameterError("Cannot get destination xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on node ").concat(destination, "."));
+        case 7:
           if (!dryRunError) {
-            _context.n = 9;
+            _context.n = 8;
             break;
           }
           throw new DryRunFailedError(dryRunError, 'origin');
-        case 9:
+        case 8:
           hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
           if (!hopDryRunError) {
-            _context.n = 10;
+            _context.n = 9;
             break;
           }
           throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
-        case 10:
+        case 9:
           if (!destDryRunError) {
-            _context.n = 11;
+            _context.n = 10;
             break;
           }
           throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
-        case 11:
+        case 10:
           if (!(normalizeSymbol(asset.symbol) !== normalizeSymbol(destFeeCurrency))) {
-            _context.n = 12;
+            _context.n = 11;
             break;
           }
           throw new UnableToComputeError("The XCM fee could not be calculated because the origin or destination chain does not support DryRun.\n       As a result, fee estimation is only available through PaymentInfo, which provides the cost in the native asset.\n       This limitation restricts support to transfers involving the native asset of the Destination chain only.");
-        case 12:
+        case 11:
           totalFee = calculateTotalXcmFee(xcmFeeResult);
           method = api.getMethod(tx);
           if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
@@ -4543,7 +4517,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           } else {
             feeToSubtract = destFee;
           }
-          return _context.a(2, BigInt(currency.amount) - feeToSubtract > (balance < edBN ? edBN : 0));
+          return _context.a(2, BigInt(currency.amount) - feeToSubtract > (balance < ed ? ed : 0));
       }
     }, _callee);
   }));
@@ -4670,54 +4644,48 @@ var getDestXcmFee = /*#__PURE__*/function () {
                     }
                     return _context.a(2, 0n);
                   case 1:
-                    originAsset = findAsset(origin, currency, destination);
-                    if (originAsset) {
-                      _context.n = 2;
-                      break;
-                    }
-                    throw new InvalidCurrencyError("Currency ".concat(JSON.stringify(currency, replaceBigInt), " not found in ").concat(origin));
-                  case 2:
+                    originAsset = findAssetForNodeOrThrow(origin, currency, destination);
                     if (!originAsset.multiLocation) {
-                      _context.n = 8;
+                      _context.n = 7;
                       break;
                     }
-                    _context.p = 3;
-                    _context.n = 4;
+                    _context.p = 2;
+                    _context.n = 3;
                     return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
                       destination: destination
                     }), {
                       multilocation: originAsset.multiLocation
                     });
-                  case 4:
+                  case 3:
                     return _context.a(2, _context.v);
-                  case 5:
-                    _context.p = 5;
+                  case 4:
+                    _context.p = 4;
                     _t = _context.v;
                     if (!(_t instanceof InvalidCurrencyError)) {
-                      _context.n = 7;
+                      _context.n = 6;
                       break;
                     }
-                    _context.n = 6;
+                    _context.n = 5;
                     return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
                       destination: destination
                     }), {
                       symbol: originAsset.symbol
                     });
-                  case 6:
+                  case 5:
                     return _context.a(2, _context.v);
-                  case 7:
+                  case 6:
                     throw _t;
-                  case 8:
-                    _context.n = 9;
+                  case 7:
+                    _context.n = 8;
                     return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
                       destination: destination
                     }), {
                       symbol: originAsset.symbol
                     });
-                  case 9:
+                  case 8:
                     return _context.a(2, _context.v);
                 }
-              }, _callee, null, [[3, 5]]);
+              }, _callee, null, [[2, 4]]);
             }));
             return function calcPaymentInfoFee() {
               return _ref2.apply(this, arguments);
@@ -5144,7 +5112,7 @@ var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled
   var isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
   var isMultiLocationDestination = _typeof(destination) === 'object';
   if (!isBridge && !isRelayDestination && !isMultiLocationDestination && (asset === null || asset === void 0 ? void 0 : asset.symbol) !== undefined && assetCheckEnabled && !('id' in currency) && !hasSupportForAsset(destination, asset.symbol)) {
-    throw new InvalidCurrencyError("Destination node ".concat(destination, " does not support currency ").concat(JSON.stringify(currency), "."));
+    throw new InvalidCurrencyError("Destination node ".concat(destination, " does not support currency ").concat(JSON.stringify(currency, replaceBigInt), "."));
   }
   if (!isBridge && asset === null && assetCheckEnabled) {
     throwUnsupportedCurrency(currency, origin);
@@ -5186,7 +5154,7 @@ var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge,
     var assets = currency.multiasset.map(function (currency) {
       var asset = findAsset(origin, currency, !isTMultiLocation(destination) ? destination : null);
       if (asset && !asset.multiLocation) {
-        throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(currency), " does not have a multiLocation"));
+        throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(currency, replaceBigInt), " does not have a multiLocation"));
       }
       if (!asset) {
         throw new InvalidCurrencyError("Origin node ".concat(origin, " does not support currency ").concat(JSON.stringify(currency)));
@@ -5954,7 +5922,8 @@ var ParachainNode = /*#__PURE__*/function () {
               input = {
                 api: api,
                 asset: asset,
-                addressSelection: createVersionedBeneficiary({
+                // Refactor this
+                destLocation: createBeneficiary({
                   api: api,
                   scenario: scenario,
                   pallet: 'XTokens',
@@ -5988,7 +5957,8 @@ var ParachainNode = /*#__PURE__*/function () {
                 api: api,
                 asset: asset,
                 recipientAddress: address,
-                paraId: paraId,
+                paraIdTo: paraId,
+                scenario: scenario,
                 origin: this.node,
                 destination: destination,
                 overriddenAsset: overriddenAsset,
@@ -6002,8 +5972,8 @@ var ParachainNode = /*#__PURE__*/function () {
               }
               _options = {
                 api: api,
-                header: this.createVersionedDestination(scenario, version, destination, paraId),
-                addressSelection: createVersionedBeneficiary({
+                destLocation: createDestination(scenario, version, destination, paraId),
+                beneficiaryLocation: createBeneficiary({
                   api: api,
                   scenario: scenario,
                   pallet: 'PolkadotXcm',
@@ -6012,7 +5982,7 @@ var ParachainNode = /*#__PURE__*/function () {
                   paraId: paraId
                 }),
                 address: address,
-                currencySelection: this.createCurrencySpec(asset.amount, scenario, version, asset, overriddenAsset !== undefined),
+                multiAsset: this.createCurrencySpec(asset.amount, scenario, version, asset, overriddenAsset !== undefined),
                 overriddenAsset: overriddenAsset,
                 asset: asset,
                 currency: currency,
@@ -6083,16 +6053,11 @@ var ParachainNode = /*#__PURE__*/function () {
   }, {
     key: "createCurrencySpec",
     value: function createCurrencySpec(amount, scenario, version, _asset, _isOverridenAsset) {
-      return createVersionedMultiAssets(version, amount, {
+      return createMultiAsset(version, amount, {
         parents: scenario === 'ParaToRelay' ? Parents.ONE : Parents.ZERO,
         interior: 'Here'
       });
     }
-  }, {
-    key: "createVersionedDestination",
-    value: function createVersionedDestination$1(scenario, version, destination, paraId) {
-      return createVersionedDestination(scenario, version, destination, paraId);
-    }
   }, {
     key: "getNativeAssetSymbol",
     value: function getNativeAssetSymbol$1() {
@@ -6203,13 +6168,13 @@ var ParachainNode = /*#__PURE__*/function () {
               throw new DryRunFailedError(dryRunResult.origin.failureReason);
             case 5:
               // Pad fee by 50%
-              dryRunFeePadded = BigInt(dryRunResult.origin.fee) * BigInt(3) / BigInt(2);
+              dryRunFeePadded = BigInt(dryRunResult.origin.fee) * 3n / 2n;
               dest = createDestination(scenario, version, destination, paraIdTo);
               call = {
                 module: 'PolkadotXcm',
                 method: 'transfer_assets_using_type_and_then',
                 parameters: {
-                  dest: this.createVersionedDestination(scenario, version, destination, getParaId('AssetHubPolkadot')),
+                  dest: createVersionedDestination(scenario, version, destination, getParaId('AssetHubPolkadot')),
                   assets: addXcmVersionHeader([].concat(_toConsumableArray(!feeAsset ? [createMultiAsset(version, PARA_TO_PARA_FEE_DOT, DOT_MULTILOCATION)] : []), [ethMultiAsset]), version),
                   assets_transfer_type: 'DestinationReserve',
                   remote_fees_id: addXcmVersionHeader((_feeAsset$multiLocati = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati !== void 0 ? _feeAsset$multiLocati : DOT_MULTILOCATION, version),
@@ -6266,7 +6231,7 @@ var ParachainNode = /*#__PURE__*/function () {
               };
               return _context2.a(2, api.callTxMethod(call));
           }
-        }, _callee2, this);
+        }, _callee2);
       }));
       function transferEthAssetViaAH(_x2) {
         return _transferEthAssetViaAH.apply(this, arguments);
@@ -6394,7 +6359,7 @@ var ParachainNode = /*#__PURE__*/function () {
                 module: 'PolkadotXcm',
                 method: 'transfer_assets_using_type_and_then',
                 parameters: {
-                  dest: this.createVersionedDestination(scenario, version, destination, getParaId('AssetHubPolkadot')),
+                  dest: createVersionedDestination(scenario, version, destination, getParaId('AssetHubPolkadot')),
                   assets: addXcmVersionHeader([].concat(_toConsumableArray(!feeAsset ? [createMultiAsset(version, fee, DOT_MULTILOCATION)] : []), [ethMultiAsset]), version),
                   assets_transfer_type: 'DestinationReserve',
                   remote_fees_id: addXcmVersionHeader((_feeAsset$multiLocati2 = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati2 !== void 0 ? _feeAsset$multiLocati2 : DOT_MULTILOCATION, version),
@@ -6479,46 +6444,35 @@ var Acala = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
-var PolkadotXCMTransferImpl = /*#__PURE__*/function () {
-  function PolkadotXCMTransferImpl() {
-    _classCallCheck(this, PolkadotXCMTransferImpl);
-  }
-  return _createClass(PolkadotXCMTransferImpl, null, [{
-    key: "transferPolkadotXCM",
-    value: function transferPolkadotXCM(_ref, method) {
-      var api = _ref.api,
-        header = _ref.header,
-        asset = _ref.asset,
-        addressSelection = _ref.addressSelection,
-        currencySelection = _ref.currencySelection,
-        overriddenAsset = _ref.overriddenAsset,
-        pallet = _ref.pallet,
-        methodOverride = _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;
-      });
-      var call = {
-        module: pallet !== null && pallet !== void 0 ? pallet : 'PolkadotXcm',
-        method: methodOverride !== null && methodOverride !== void 0 ? methodOverride : method,
-        parameters: _objectSpread2({
-          dest: header,
-          beneficiary: addressSelection,
-          assets: resolvedMultiAssets,
-          fee_asset_item: feeAssetIndex
-        }, fees !== undefined ? {
-          weight_limit: fees
-        } : {})
-      };
-      return api.callTxMethod(call);
-    }
-  }]);
-}();
+var transferPolkadotXcm = function transferPolkadotXcm(_ref, method) {
+  var api = _ref.api,
+    destLocation = _ref.destLocation,
+    asset = _ref.asset,
+    beneficiaryLocation = _ref.beneficiaryLocation,
+    multiAsset = _ref.multiAsset,
+    overriddenAsset = _ref.overriddenAsset,
+    pallet = _ref.pallet,
+    version = _ref.version,
+    methodOverride = _ref.method;
+  var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+  var resolvedMultiAssets = maybeOverrideMultiAssets(version, asset.amount, [multiAsset], overriddenAsset);
+  var feeAssetIndex = overriddenAsset === undefined || isTMultiLocation(overriddenAsset) ? DEFAULT_FEE_ASSET : overriddenAsset.findIndex(function (asset) {
+    return asset.isFeeAsset;
+  });
+  var call = {
+    module: pallet !== null && pallet !== void 0 ? pallet : 'PolkadotXcm',
+    method: methodOverride !== null && methodOverride !== void 0 ? methodOverride : method,
+    parameters: _objectSpread2({
+      dest: addXcmVersionHeader(destLocation, version),
+      beneficiary: addXcmVersionHeader(beneficiaryLocation, version),
+      assets: addXcmVersionHeader(resolvedMultiAssets, version),
+      fee_asset_item: feeAssetIndex
+    }, fees !== undefined ? {
+      weight_limit: fees
+    } : {})
+  };
+  return Promise.resolve(api.callTxMethod(call));
+};
 
 var Ajuna = /*#__PURE__*/function (_ParachainNode) {
   function Ajuna() {
@@ -6542,7 +6496,7 @@ var Ajuna = /*#__PURE__*/function (_ParachainNode) {
   }, {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'transfer_assets', 'Unlimited');
     }
   }, {
     key: "canUseXTokens",
@@ -6670,7 +6624,7 @@ var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
       // TESTED https://kusama.subscan.io/xcm_message/kusama-ddc2a48f0d8e0337832d7aae26f6c3053e1f4ffd
       // TESTED https://kusama.subscan.io/xcm_message/kusama-8e423130a4d8b61679af95dbea18a55124f99672
       if (destination === 'AssetHubPolkadot') {
-        return Promise.resolve(getNode('AssetHubPolkadot').handleBridgeTransfer(input, 'Polkadot'));
+        return getNode('AssetHubPolkadot').handleBridgeTransfer(input, 'Polkadot');
       }
       var isSystemNode = !isTMultiLocation(destination) && SYSTEM_NODES_KUSAMA.includes(destination);
       if (scenario === 'ParaToPara' && asset.symbol === 'KSM' && !isForeignAsset(asset) && !isSystemNode) {
@@ -6680,7 +6634,7 @@ var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
         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 method = scenario === 'ParaToPara' && !isSystemNode ? 'limited_reserve_transfer_assets' : 'limited_teleport_assets';
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, method, 'Unlimited'));
+      return transferPolkadotXcm(input, method, 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -7039,7 +6993,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         module: 'PolkadotXcm',
         method: 'transfer_assets_using_type_and_then',
         parameters: {
-          dest: _this.createVersionedDestination(scenario, version, destination, paraIdTo),
+          dest: createVersionedDestination(scenario, version, destination, paraIdTo),
           assets: addXcmVersionHeader([].concat(_toConsumableArray(useDOTAsFeeAsset ? [createMultiAsset(version, PARA_TO_PARA_FEE_DOT, DOT_MULTILOCATION)] : []), [createMultiAsset(version, asset.amount, asset.multiLocation)]), version),
           assets_transfer_type: 'LocalReserve',
           remote_fees_id: addXcmVersionHeader(useDOTAsFeeAsset ? DOT_MULTILOCATION : asset.multiLocation, version),
@@ -7066,8 +7020,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         paraIdTo = input.paraIdTo;
       if (targetChain === 'Kusama' && ((_asset$symbol = asset.symbol) === null || _asset$symbol === void 0 ? void 0 : _asset$symbol.toUpperCase()) === 'KSM' || targetChain === 'Polkadot' && ((_asset$symbol2 = asset.symbol) === null || _asset$symbol2 === void 0 ? void 0 : _asset$symbol2.toUpperCase()) === 'DOT') {
         var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-          header: createBridgePolkadotXcmDest(version, targetChain, destination, paraIdTo),
-          addressSelection: createVersionedBeneficiary({
+          destLocation: createBridgeDestination(targetChain, destination, paraIdTo),
+          beneficiaryLocation: createBeneficiary({
             api: api,
             scenario: scenario,
             pallet: 'PolkadotXcm',
@@ -7075,15 +7029,15 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
             version: version,
             paraId: paraIdTo
           }),
-          currencySelection: createVersionedMultiAssets(version, asset.amount, asset.multiLocation)
+          multiAsset: createMultiAsset(version, asset.amount, asset.multiLocation)
         });
-        return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited');
+        return transferPolkadotXcm(modifiedInput, 'transfer_assets', 'Unlimited');
       } else if (targetChain === 'Polkadot' && ((_asset$symbol3 = asset.symbol) === null || _asset$symbol3 === void 0 ? void 0 : _asset$symbol3.toUpperCase()) === 'KSM' || targetChain === 'Kusama' && ((_asset$symbol4 = asset.symbol) === null || _asset$symbol4 === void 0 ? void 0 : _asset$symbol4.toUpperCase()) === 'DOT') {
         var _modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-          header: createBridgePolkadotXcmDest(version, targetChain, destination, paraIdTo),
-          currencySelection: createVersionedMultiAssets(version, asset.amount, DOT_MULTILOCATION)
+          destLocation: createBridgeDestination(targetChain, destination, paraIdTo),
+          multiAsset: createMultiAsset(version, asset.amount, DOT_MULTILOCATION)
         });
-        return PolkadotXCMTransferImpl.transferPolkadotXCM(_modifiedInput, 'limited_reserve_transfer_assets', 'Unlimited');
+        return transferPolkadotXcm(_modifiedInput, 'limited_reserve_transfer_assets', 'Unlimited');
       }
       throw new InvalidCurrencyError("Polkadot <-> Kusama bridge does not support currency ".concat(asset.symbol));
     }
@@ -7212,8 +7166,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               return _context2.a(2, this.handleEthBridgeNativeTransfer(input));
             case 5:
               modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-                header: createVersionedDestination(scenario, this.version, destination, paraIdTo, ETHEREUM_JUNCTION, Parents.TWO),
-                addressSelection: createVersionedBeneficiary({
+                destLocation: createDestination(scenario, this.version, destination, paraIdTo, ETHEREUM_JUNCTION, Parents.TWO),
+                beneficiaryLocation: createBeneficiary({
                   api: api,
                   scenario: scenario,
                   pallet: 'PolkadotXcm',
@@ -7221,9 +7175,9 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
                   version: this.version,
                   paraId: paraIdTo
                 }),
-                currencySelection: createVersionedMultiAssets(version, asset.amount, asset.multiLocation)
+                multiAsset: createMultiAsset(version, asset.amount, asset.multiLocation)
               });
-              return _context2.a(2, PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited'));
+              return _context2.a(2, transferPolkadotXcm(modifiedInput, 'transfer_assets', 'Unlimited'));
           }
         }, _callee2, this);
       }));
@@ -7252,8 +7206,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         }
       };
       var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
-        header: this.createVersionedDestination(scenario, version, destination, paraId),
-        addressSelection: createVersionedBeneficiary({
+        destLocation: createDestination(scenario, version, destination, paraId),
+        beneficiaryLocation: createBeneficiary({
           api: api,
           scenario: scenario,
           pallet: 'PolkadotXcm',
@@ -7261,9 +7215,9 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
           version: version,
           paraId: paraId
         }),
-        currencySelection: createVersionedMultiAssets(version, asset.amount, customMultiLocation)
+        multiAsset: createMultiAsset(version, asset.amount, customMultiLocation)
       });
-      return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'limited_teleport_assets', 'Unlimited');
+      return transferPolkadotXcm(modifiedInput, 'limited_teleport_assets', 'Unlimited');
     }
   }, {
     key: "patchInput",
@@ -7274,7 +7228,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         version = _input$version === void 0 ? this.version : _input$version;
       if ((destination === 'Hydration' || destination === 'Polimec' || destination === 'Moonbeam' || destination === 'BifrostPolkadot') && asset.symbol === 'DOT') {
         return _objectSpread2(_objectSpread2({}, input), {}, {
-          currencySelection: createVersionedMultiAssets(version, asset.amount, DOT_MULTILOCATION)
+          multiAsset: createMultiAsset(version, asset.amount, DOT_MULTILOCATION)
         });
       }
       return input;
@@ -7290,7 +7244,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "handleExecuteTransfer",
     value: function () {
       var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var api, senderAddress, asset, feeAsset, version, decimals, multiplier, base, scaledMultiplier, MIN_FEE, call, dryRunResult, paddedFee, xcm, weight;
+        var api, senderAddress, asset, feeAsset, version, decimals, multiplier, base, scaledMultiplier, MIN_FEE, checkAmount, call, dryRunResult, paddedFee, xcm, weight;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
@@ -7307,6 +7261,12 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               base = BigInt(Math.pow(10, decimals));
               scaledMultiplier = BigInt(Math.floor(multiplier * Math.pow(10, decimals)));
               MIN_FEE = base * scaledMultiplier / BigInt(Math.pow(10, decimals));
+              checkAmount = function checkAmount(fee) {
+                if (feeAsset && isAssetEqual(asset, feeAsset) && BigInt(asset.amount) <= fee * 2n) {
+                  throw new InvalidParameterError("Asset amount ".concat(asset.amount, " is too low, please increase the amount or use a different fee asset."));
+                }
+              };
+              checkAmount(MIN_FEE);
               call = createExecuteCall(createExecuteXcm(input, MIN_FEE, version), MAX_WEIGHT);
               _context3.n = 2;
               return api.getDryRunCall({
@@ -7324,6 +7284,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               throw new DryRunFailedError(dryRunResult.failureReason);
             case 3:
               paddedFee = dryRunResult.fee * 120n / 100n;
+              checkAmount(paddedFee);
               xcm = createExecuteXcm(input, paddedFee, version);
               _context3.n = 4;
               return api.getXcmWeight(xcm);
@@ -7421,7 +7382,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
             case 11:
               method = this.getMethod(scenario, destination);
               modifiedInput = this.patchInput(input);
-              return _context4.a(2, PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, method, 'Unlimited'));
+              return _context4.a(2, transferPolkadotXcm(modifiedInput, method, 'Unlimited'));
           }
         }, _callee4, this);
       }));
@@ -7452,7 +7413,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
           throw new InvalidCurrencyError('Asset does not have a multiLocation defined');
         }
         var transformedMultiLocation = hasJunction(multiLocation, 'Parachain', 1000) ? transformMultiLocation(multiLocation) : multiLocation;
-        return createVersionedMultiAssets(version, amount, transformedMultiLocation);
+        return createMultiAsset(version, amount, transformedMultiLocation);
       } else {
         return _superPropGet(AssetHubPolkadot, "createCurrencySpec", this, 3)([amount, scenario, version, asset]);
       }
@@ -7503,7 +7464,7 @@ var Astar = /*#__PURE__*/function (_ParachainNode) {
   return _createClass(Astar, [{
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }, {
     key: "transferXTokens",
@@ -7643,8 +7604,8 @@ var BifrostPolkadot = /*#__PURE__*/function (_ParachainNode) {
     value: function transferToAssetHub(input) {
       var _getAssetId;
       var asset = input.asset;
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(_objectSpread2(_objectSpread2({}, input), {}, {
-        currencySelection: createVersionedMultiAssets(this.version, asset.amount, {
+      return transferPolkadotXcm(_objectSpread2(_objectSpread2({}, input), {}, {
+        multiAsset: createMultiAsset(this.version, asset.amount, {
           parents: asset.symbol === 'DOT' ? Parents.ONE : Parents.TWO,
           interior: asset.symbol === 'WETH' ? {
             X2: [ETHEREUM_JUNCTION, {
@@ -7654,7 +7615,7 @@ var BifrostPolkadot = /*#__PURE__*/function (_ParachainNode) {
             }]
           } : 'Here'
         })
-      }), 'transfer_assets', 'Unlimited'));
+      }), 'transfer_assets', 'Unlimited');
     }
   }, {
     key: "transferPolkadotXCM",
@@ -7710,7 +7671,7 @@ var BridgeHubKusama = /*#__PURE__*/function (_ParachainNode) {
         throw new ScenarioNotSupportedError(this.node, scenario, 'Unable to use bridge hub for transfers to other Parachains. Please move your currency to AssetHub to transfer to other Parachains.');
       }
       var method = 'limited_teleport_assets';
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, method, 'Unlimited'));
+      return transferPolkadotXcm(input, method, 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -7737,7 +7698,7 @@ var BridgeHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         throw new ScenarioNotSupportedError(this.node, scenario, 'Unable to use bridge hub for transfers to other Parachains. Please move your currency to AssetHub to transfer to other Parachains.');
       }
       var method = 'limited_teleport_assets';
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, method, 'Unlimited'));
+      return transferPolkadotXcm(input, method, 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -7814,7 +7775,7 @@ var Collectives = /*#__PURE__*/function (_ParachainNode) {
       if (scenario === 'ParaToPara') {
         throw new ScenarioNotSupportedError(this.node, scenario);
       }
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_teleport_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -7824,11 +7785,6 @@ var Collectives = /*#__PURE__*/function (_ParachainNode) {
         includeFee: true
       };
     }
-  }, {
-    key: "createCurrencySpec",
-    value: function createCurrencySpec(amount, scenario, version, asset) {
-      return _superPropGet(Collectives, "createCurrencySpec", this, 3)([amount, scenario, version, asset]);
-    }
   }]);
 }(ParachainNode);
 
@@ -7862,7 +7818,7 @@ var CoretimeKusama = /*#__PURE__*/function (_ParachainNode) {
       // TESTED block hash on Rococo: 0x78ace0f1bf7cac9a42e56143321b617d98327e2750f795efb0abb833025c9082
       var scenario = input.scenario;
       var method = scenario === 'ParaToPara' ? 'limited_reserve_transfer_assets' : 'limited_teleport_assets';
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, method, 'Unlimited'));
+      return transferPolkadotXcm(input, method, 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -7886,7 +7842,7 @@ var CoretimePolkadot = /*#__PURE__*/function (_ParachainNode) {
     value: function transferPolkadotXCM(input) {
       var scenario = input.scenario;
       var method = scenario === 'ParaToPara' ? 'limited_reserve_transfer_assets' : 'limited_teleport_assets';
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, method, 'Unlimited'));
+      return transferPolkadotXcm(input, method, 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -7910,7 +7866,7 @@ var Crab = /*#__PURE__*/function (_ParachainNode) {
     value: function transferPolkadotXCM(input) {
       // TESTED https://kusama.subscan.io/xcm_message/kusama-ce7396ec470ba0c6516a50075046ee65464572dc
       if (input.scenario === 'ParaToPara') {
-        return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'reserve_transfer_assets'));
+        return transferPolkadotXcm(input, 'reserve_transfer_assets');
       }
       throw new ScenarioNotSupportedError(this.node, input.scenario);
     }
@@ -7923,7 +7879,7 @@ var Crab = /*#__PURE__*/function (_ParachainNode) {
     key: "createCurrencySpec",
     value: function createCurrencySpec(amount, scenario, version, _asset) {
       if (scenario === 'ParaToPara') {
-        return createVersionedMultiAssets(version, amount, {
+        return createMultiAsset(version, amount, {
           parents: Parents.ZERO,
           interior: {
             X1: {
@@ -8064,13 +8020,13 @@ var Darwinia = /*#__PURE__*/function (_ParachainNode) {
       if (scenario === 'ParaToPara' && asset.symbol !== this.getNativeAssetSymbol()) {
         throw new ScenarioNotSupportedError(this.node, scenario);
       }
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }, {
     key: "createCurrencySpec",
     value: function createCurrencySpec(amount, scenario, version, _asset) {
       if (scenario === 'ParaToPara') {
-        return createVersionedMultiAssets(version, amount, {
+        return createMultiAsset(version, amount, {
           parents: Parents.ZERO,
           interior: {
             X1: {
@@ -8119,7 +8075,7 @@ var Encointer = /*#__PURE__*/function (_ParachainNode) {
       // NO PARA TO PARA SCENARIOS ON SUBSCAN
       // TESTED https://encointer.subscan.io/xcm_message/kusama-418501e86e947b16c4e4e9040694017e64f9b162
       if (input.scenario === 'ParaToRelay') {
-        return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_teleport_assets', 'Unlimited'));
+        return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
       }
       throw new ScenarioNotSupportedError(this.node, input.scenario);
     }
@@ -8151,7 +8107,7 @@ var Heima = /*#__PURE__*/function (_ParachainNode) {
       if (asset.symbol !== this.getNativeAssetSymbol()) {
         throw new InvalidCurrencyError("Asset ".concat(asset.symbol, " is not supported by node ").concat(this.node, "."));
       }
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }]);
 }(ParachainNode);
@@ -8171,9 +8127,9 @@ var getAssetMultiLocation = function getAssetMultiLocation(asset) {
 };
 var createTransferAssetsTransfer = function createTransferAssetsTransfer(options, version) {
   var asset = options.asset;
-  var currencySelection = addXcmVersionHeader([createMultiAsset(version, asset.amount, getAssetMultiLocation(asset))], version);
-  return PolkadotXCMTransferImpl.transferPolkadotXCM(_objectSpread2(_objectSpread2({}, options), {}, {
-    currencySelection: currencySelection
+  var location = getAssetMultiLocation(asset);
+  return transferPolkadotXcm(_objectSpread2(_objectSpread2({}, options), {}, {
+    multiAsset: createMultiAsset(version, asset.amount, location)
   }), 'transfer_assets', 'Unlimited');
 };
 var createTypeAndThenDest = function createTypeAndThenDest(destination, scenario, version) {
@@ -8274,7 +8230,7 @@ var Polimec = /*#__PURE__*/function (_ParachainNode) {
                 break;
               }
               _call = createTypeAndThenTransfer(input, version);
-              return _context.a(2, Promise.resolve(api.callTxMethod(_call)));
+              return _context.a(2, api.callTxMethod(_call));
             case 1:
               if (!(scenario === 'ParaToPara' && (destination === 'AssetHubPolkadot' || destination === 'Hydration'))) {
                 _context.n = 2;
@@ -8374,7 +8330,7 @@ var Hydration = /*#__PURE__*/function (_ParachainNode) {
         module: 'PolkadotXcm',
         method: 'transfer_assets_using_type_and_then',
         parameters: {
-          dest: this.createVersionedDestination(scenario, version, destination, getParaId('AssetHubPolkadot')),
+          dest: createVersionedDestination(scenario, version, destination, getParaId('AssetHubPolkadot')),
           assets: _defineProperty({}, version, [createMultiAsset(version, asset.amount, DOT_MULTILOCATION)]),
           assets_transfer_type: 'DestinationReserve',
           remote_fees_id: _defineProperty({}, version, {
@@ -8398,7 +8354,7 @@ var Hydration = /*#__PURE__*/function (_ParachainNode) {
       var symbol = asset.symbol.toUpperCase();
       if (symbol === 'DOT') {
         var call = createTypeAndThenTransfer(options, version);
-        return api.callTxMethod(call);
+        return Promise.resolve(api.callTxMethod(call));
       }
       if ((symbol === 'USDC' || symbol === 'USDT') && !hasJunction(asset.multiLocation, 'Parachain', getParaId('AssetHubPolkadot'))) {
         throw new InvalidCurrencyError('The selected asset is not supported for transfer to Polimec');
@@ -8580,7 +8536,7 @@ var KiltSpiritnet = /*#__PURE__*/function (_ParachainNode) {
       if (scenario === 'ParaToPara' && asset.symbol !== this.getNativeAssetSymbol()) {
         throw new ScenarioNotSupportedError(this.node, scenario, 'KiltSpiritnet only supports native asset ParaToPara transfers');
       }
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }, {
     key: "transferRelayToPara",
@@ -8723,9 +8679,9 @@ var Moonbeam = /*#__PURE__*/function (_ParachainNode) {
         return this.transferToEthereum(input);
       }
       var multiLocation = this.getMultiLocation(asset, scenario);
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(_objectSpread2(_objectSpread2({}, input), {}, {
-        currencySelection: createVersionedMultiAssets(version, asset.amount, multiLocation)
-      }), 'transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(_objectSpread2(_objectSpread2({}, input), {}, {
+        multiAsset: createMultiAsset(version, asset.amount, multiLocation)
+      }), 'transfer_assets', 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -8791,9 +8747,9 @@ var Moonriver = /*#__PURE__*/function (_ParachainNode) {
         _input$version = input.version,
         version = _input$version === void 0 ? this.version : _input$version;
       var multiLocation = this.getMultiLocation(asset, scenario);
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(_objectSpread2(_objectSpread2({}, input), {}, {
-        currencySelection: createVersionedMultiAssets(version, asset.amount, multiLocation)
-      }), 'transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(_objectSpread2(_objectSpread2({}, input), {}, {
+        multiAsset: createMultiAsset(version, asset.amount, multiLocation)
+      }), 'transfer_assets', 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -8830,7 +8786,7 @@ var Mythos = /*#__PURE__*/function (_ParachainNode) {
       if (asset.symbol !== nativeSymbol) {
         throw new InvalidCurrencyError("Node ".concat(this.node, " does not support currency ").concat(asset.symbol));
       }
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, destination === 'AssetHubPolkadot' ? 'limited_teleport_assets' : 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, destination === 'AssetHubPolkadot' ? 'limited_teleport_assets' : 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }, {
     key: "transferPolkadotXCM",
@@ -8877,7 +8833,7 @@ var NeuroWeb = /*#__PURE__*/function (_ParachainNode) {
   return _createClass(NeuroWeb, [{
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }]);
 }(ParachainNode);
@@ -8899,7 +8855,7 @@ var Nodle = /*#__PURE__*/function (_ParachainNode) {
       if (asset.symbol !== this.getNativeAssetSymbol()) {
         throw new InvalidCurrencyError("Asset ".concat(asset.symbol, " is not supported by node ").concat(this.node, "."));
       }
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }, {
     key: "transferRelayToPara",
@@ -9007,7 +8963,7 @@ var PeopleKusama = /*#__PURE__*/function (_ParachainNode) {
         throw new ScenarioNotSupportedError(this.node, scenario);
       }
       var method = 'limited_teleport_assets';
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, method, 'Unlimited'));
+      return transferPolkadotXcm(input, method, 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -9033,8 +8989,7 @@ var PeoplePolkadot = /*#__PURE__*/function (_ParachainNode) {
       if (scenario === 'ParaToPara') {
         throw new ScenarioNotSupportedError(this.node, scenario);
       }
-      var method = 'limited_teleport_assets';
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, method, 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_teleport_assets', 'Unlimited');
     }
   }, {
     key: "getRelayToParaOverrides",
@@ -9060,77 +9015,50 @@ var determineDestWeight = function determineDestWeight(destNode) {
       proof_size: 0n
     };
   }
-  throw new NodeNotSupportedError("Node ".concat(destNode, " is not supported"));
+  throw new NodeNotSupportedError("Pallet XTransfer does not support transfering to ".concat(destNode, "."));
 };
 
-var getDestination = function getDestination(_ref) {
-  var recipientAddress = _ref.recipientAddress,
-    paraId = _ref.paraId,
-    api = _ref.api;
-  var isMultiLocation = _typeof(recipientAddress) === 'object';
-  if (isMultiLocation) {
-    return recipientAddress;
-  }
-  var isEthAddress = isAddress(recipientAddress);
-  var addressJunction = isEthAddress ? {
-    AccountKey20: {
-      key: recipientAddress
-    }
-  } : {
-    AccountId32: {
-      id: api.accountToHex(recipientAddress)
-    }
-  };
-  return {
-    parents: Parents.ONE,
-    interior: {
-      X2: [{
-        Parachain: paraId
-      }, addressJunction]
+var transferXTransfer = function transferXTransfer(input) {
+  var api = input.api,
+    destination = input.destination,
+    scenario = input.scenario,
+    asset = input.asset,
+    overriddenAsset = input.overriddenAsset,
+    recipientAddress = input.recipientAddress,
+    pallet = input.pallet,
+    methodOverride = input.method,
+    paraIdTo = input.paraIdTo;
+  assertToIsString(destination, ERR_MULTILOCATION_DEST_NOT_SUPPORTED);
+  // XTransfer pallet does not require version specification
+  // but the XCM syntax matches the V3 format
+  var version = Version.V3;
+  var multiAsset = createMultiAsset(version, asset.amount, {
+    parents: Parents.ZERO,
+    interior: 'Here'
+  });
+  var resolvedMultiAsset = maybeOverrideMultiAsset(version, asset.amount, multiAsset, overriddenAsset);
+  var dest = createBeneficiaryMultiLocation({
+    api: api,
+    scenario: scenario,
+    pallet: 'XTokens',
+    recipientAddress: recipientAddress,
+    version: version,
+    paraId: paraIdTo
+  });
+  var destWeight = determineDestWeight(destination);
+  var method = 'transfer';
+  var call = {
+    module: pallet !== null && pallet !== void 0 ? pallet : 'XTransfer',
+    method: methodOverride !== null && methodOverride !== void 0 ? methodOverride : method,
+    parameters: {
+      asset: resolvedMultiAsset,
+      dest: dest,
+      dest_weight: destWeight
     }
   };
+  return api.callTxMethod(call);
 };
 
-var XTransferTransferImpl = /*#__PURE__*/function () {
-  function XTransferTransferImpl() {
-    _classCallCheck(this, XTransferTransferImpl);
-  }
-  return _createClass(XTransferTransferImpl, null, [{
-    key: "transferXTransfer",
-    value: function transferXTransfer(input) {
-      var api = input.api,
-        destination = input.destination,
-        asset = input.asset,
-        overriddenAsset = input.overriddenAsset,
-        pallet = input.pallet,
-        methodOverride = input.method;
-      var isMultiLocationDestination = _typeof(destination) === 'object';
-      if (isMultiLocationDestination) {
-        throw new InvalidParameterError('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 version = Version.V3;
-      var multiAssets = [createMultiAsset(version, asset.amount, {
-        parents: Parents.ZERO,
-        interior: 'Here'
-      })];
-      var resolvedMultiAssets = maybeOverrideMultiAssets(version, asset.amount, multiAssets, overriddenAsset);
-      var dest = getDestination(input);
-      var method = 'transfer';
-      var destWeight = determineDestWeight(destination);
-      var call = {
-        module: pallet !== null && pallet !== void 0 ? pallet : 'XTransfer',
-        method: methodOverride !== null && methodOverride !== void 0 ? methodOverride : method,
-        parameters: {
-          asset: resolvedMultiAssets[0],
-          dest: dest,
-          dest_weight: destWeight
-        }
-      };
-      return api.callTxMethod(call);
-    }
-  }]);
-}();
-
 var Phala = /*#__PURE__*/function (_ParachainNode) {
   function Phala() {
     _classCallCheck(this, Phala);
@@ -9139,12 +9067,12 @@ var Phala = /*#__PURE__*/function (_ParachainNode) {
   _inherits(Phala, _ParachainNode);
   return _createClass(Phala, [{
     key: "transferXTransfer",
-    value: function transferXTransfer(input) {
+    value: function transferXTransfer$1(input) {
       var asset = input.asset;
       if (asset.symbol !== this.getNativeAssetSymbol()) {
         throw new InvalidCurrencyError("Node ".concat(this.node, " does not support currency ").concat(asset.symbol));
       }
-      return XTransferTransferImpl.transferXTransfer(input);
+      return transferXTransfer(input);
     }
   }, {
     key: "transferLocalNonNativeAsset",
@@ -9204,7 +9132,7 @@ var RobonomicsKusama = /*#__PURE__*/function (_ParachainNode) {
   return _createClass(RobonomicsKusama, [{
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }, {
     key: "transferLocalNonNativeAsset",
@@ -9223,7 +9151,7 @@ var RobonomicsPolkadot = /*#__PURE__*/function (_ParachainNode) {
   return _createClass(RobonomicsPolkadot, [{
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }, {
     key: "transferLocalNonNativeAsset",
@@ -9301,7 +9229,7 @@ var Subsocial = /*#__PURE__*/function (_ParachainNode) {
       if (asset.symbol !== this.getNativeAssetSymbol()) {
         throw new InvalidCurrencyError("Asset ".concat(asset.symbol, " is not supported by node ").concat(this.node, "."));
       }
-      return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(input, 'limited_reserve_transfer_assets', 'Unlimited'));
+      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
     }
   }]);
 }(ParachainNode);
@@ -9580,17 +9508,6 @@ var AssetClaimBuilder = /*#__PURE__*/function () {
   }]);
 }();
 
-var assertToIsString = function assertToIsString(to) {
-  if (isTMultiLocation(to)) {
-    throw new InvalidParameterError('Multi-Location destination is not supported for XCM fee calculation.');
-  }
-};
-var assertAddressIsString = function assertAddressIsString(address) {
-  if (isTMultiLocation(address)) {
-    throw new InvalidParameterError('Multi-Location address is not supported for XCM fee calculation.');
-  }
-};
-
 var BatchTransactionManager = /*#__PURE__*/function () {
   function BatchTransactionManager() {
     _classCallCheck(this, BatchTransactionManager);
@@ -10299,4 +10216,4 @@ var Builder = function Builder(api) {
   return new GeneralBuilder(api, new BatchTransactionManager());
 };
 
-export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiary, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, replaceBigInt, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, addXcmVersionHeader, assertAddressIsString, assertToIsString, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiary, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };