@paraspell/sdk-core 10.4.3 → 10.4.4

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, getAssetId } from '@paraspell/assets';
+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';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, createPublicClient, http, getContract } from 'viem';
-import { Parents, isTMultiLocation, isRelayChain, NODE_NAMES_DOT_KSM, hasJunction, deepEqual, isDotKsmBridge } from '@paraspell/sdk-common';
+import { Parents, Version, isTMultiLocation, isRelayChain, 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';
@@ -2017,83 +2017,6 @@ var getParaId = function getParaId(node) {
   return getNodeConfig(node).paraId;
 };
 
-/**
- * The options for the batch builder.
- */
-var BatchMode;
-(function (BatchMode) {
-  /**
-   * Does not commit if one of the calls in the batch fails.
-   */
-  BatchMode["BATCH_ALL"] = "BATCH_ALL";
-  /**
-   * Commits each successful call regardless if a call fails.
-   */
-  BatchMode["BATCH"] = "BATCH";
-})(BatchMode || (BatchMode = {}));
-
-var XTokensError;
-(function (XTokensError) {
-  XTokensError["AssetHasNoReserve"] = "AssetHasNoReserve";
-  XTokensError["NotCrossChainTransfer"] = "NotCrossChainTransfer";
-  XTokensError["InvalidDest"] = "InvalidDest";
-  XTokensError["NotCrossChainTransferableCurrency"] = "NotCrossChainTransferableCurrency";
-  XTokensError["UnweighableMessage"] = "UnweighableMessage";
-  XTokensError["XcmExecutionFailed"] = "XcmExecutionFailed";
-  XTokensError["CannotReanchor"] = "CannotReanchor";
-  XTokensError["InvalidAncestry"] = "InvalidAncestry";
-  XTokensError["InvalidAsset"] = "InvalidAsset";
-  XTokensError["DestinationNotInvertible"] = "DestinationNotInvertible";
-  XTokensError["BadVersion"] = "BadVersion";
-  XTokensError["DistinctReserveForAssetAndFee"] = "DistinctReserveForAssetAndFee";
-  XTokensError["ZeroFee"] = "ZeroFee";
-  XTokensError["ZeroAmount"] = "ZeroAmount";
-  XTokensError["TooManyAssetsBeingSent"] = "TooManyAssetsBeingSent";
-  XTokensError["AssetIndexNonExistent"] = "AssetIndexNonExistent";
-  XTokensError["FeeNotEnough"] = "FeeNotEnough";
-  XTokensError["NotSupportedLocation"] = "NotSupportedLocation";
-  XTokensError["MinXcmFeeNotDefined"] = "MinXcmFeeNotDefined";
-  XTokensError["RateLimited"] = "RateLimited";
-})(XTokensError || (XTokensError = {}));
-var PolkadotXcmError;
-(function (PolkadotXcmError) {
-  PolkadotXcmError["Unreachable"] = "Unreachable";
-  PolkadotXcmError["SendFailure"] = "SendFailure";
-  PolkadotXcmError["Filtered"] = "Filtered";
-  PolkadotXcmError["UnweighableMessage"] = "UnweighableMessage";
-  PolkadotXcmError["DestinationNotInvertible"] = "DestinationNotInvertible";
-  PolkadotXcmError["Empty"] = "Empty";
-  PolkadotXcmError["CannotReanchor"] = "CannotReanchor";
-  PolkadotXcmError["TooManyAssets"] = "TooManyAssets";
-  PolkadotXcmError["InvalidOrigin"] = "InvalidOrigin";
-  PolkadotXcmError["BadVersion"] = "BadVersion";
-  PolkadotXcmError["BadLocation"] = "BadLocation";
-  PolkadotXcmError["NoSubscription"] = "NoSubscription";
-  PolkadotXcmError["AlreadySubscribed"] = "AlreadySubscribed";
-  PolkadotXcmError["CannotCheckOutTeleport"] = "CannotCheckOutTeleport";
-  PolkadotXcmError["LowBalance"] = "LowBalance";
-  PolkadotXcmError["TooManyLocks"] = "TooManyLocks";
-  PolkadotXcmError["AccountNotSovereign"] = "AccountNotSovereign";
-  PolkadotXcmError["FeesNotMet"] = "FeesNotMet";
-  PolkadotXcmError["LockNotFound"] = "LockNotFound";
-  PolkadotXcmError["InUse"] = "InUse";
-  PolkadotXcmError["REMOVED"] = "REMOVED";
-  PolkadotXcmError["InvalidAssetUnknownReserve"] = "InvalidAssetUnknownReserve";
-  PolkadotXcmError["InvalidAssetUnsupportedReserve"] = "InvalidAssetUnsupportedReserve";
-  PolkadotXcmError["TooManyReserves"] = "TooManyReserves";
-  PolkadotXcmError["LocalExecutionIncomplete"] = "LocalExecutionIncomplete";
-})(PolkadotXcmError || (PolkadotXcmError = {}));
-
-/**
- * The XCM version.
- */
-var Version;
-(function (Version) {
-  Version["V3"] = "V3";
-  Version["V4"] = "V4";
-  Version["V5"] = "V5";
-})(Version || (Version = {}));
-
 var createApiInstanceForNode = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node) {
     var wsUrl;
@@ -2111,10 +2034,10 @@ var createApiInstanceForNode = /*#__PURE__*/function () {
 }();
 
 var createX1Payload = function createX1Payload(version, junction) {
-  return version === Version.V4 ? {
-    X1: [junction]
-  } : {
+  return version === Version.V3 ? {
     X1: junction
+  } : {
+    X1: [junction]
   };
 };
 
@@ -2370,6 +2293,73 @@ var computeFeeFromDryRunPjs = function computeFeeFromDryRunPjs(dryRun, node, exe
   return totalDeliveryFees + executionFee;
 };
 
+/**
+ * The options for the batch builder.
+ */
+var BatchMode;
+(function (BatchMode) {
+  /**
+   * Does not commit if one of the calls in the batch fails.
+   */
+  BatchMode["BATCH_ALL"] = "BATCH_ALL";
+  /**
+   * Commits each successful call regardless if a call fails.
+   */
+  BatchMode["BATCH"] = "BATCH";
+})(BatchMode || (BatchMode = {}));
+
+var XTokensError;
+(function (XTokensError) {
+  XTokensError["AssetHasNoReserve"] = "AssetHasNoReserve";
+  XTokensError["NotCrossChainTransfer"] = "NotCrossChainTransfer";
+  XTokensError["InvalidDest"] = "InvalidDest";
+  XTokensError["NotCrossChainTransferableCurrency"] = "NotCrossChainTransferableCurrency";
+  XTokensError["UnweighableMessage"] = "UnweighableMessage";
+  XTokensError["XcmExecutionFailed"] = "XcmExecutionFailed";
+  XTokensError["CannotReanchor"] = "CannotReanchor";
+  XTokensError["InvalidAncestry"] = "InvalidAncestry";
+  XTokensError["InvalidAsset"] = "InvalidAsset";
+  XTokensError["DestinationNotInvertible"] = "DestinationNotInvertible";
+  XTokensError["BadVersion"] = "BadVersion";
+  XTokensError["DistinctReserveForAssetAndFee"] = "DistinctReserveForAssetAndFee";
+  XTokensError["ZeroFee"] = "ZeroFee";
+  XTokensError["ZeroAmount"] = "ZeroAmount";
+  XTokensError["TooManyAssetsBeingSent"] = "TooManyAssetsBeingSent";
+  XTokensError["AssetIndexNonExistent"] = "AssetIndexNonExistent";
+  XTokensError["FeeNotEnough"] = "FeeNotEnough";
+  XTokensError["NotSupportedLocation"] = "NotSupportedLocation";
+  XTokensError["MinXcmFeeNotDefined"] = "MinXcmFeeNotDefined";
+  XTokensError["RateLimited"] = "RateLimited";
+})(XTokensError || (XTokensError = {}));
+var PolkadotXcmError;
+(function (PolkadotXcmError) {
+  PolkadotXcmError["Unreachable"] = "Unreachable";
+  PolkadotXcmError["SendFailure"] = "SendFailure";
+  PolkadotXcmError["Filtered"] = "Filtered";
+  PolkadotXcmError["UnweighableMessage"] = "UnweighableMessage";
+  PolkadotXcmError["DestinationNotInvertible"] = "DestinationNotInvertible";
+  PolkadotXcmError["Empty"] = "Empty";
+  PolkadotXcmError["CannotReanchor"] = "CannotReanchor";
+  PolkadotXcmError["TooManyAssets"] = "TooManyAssets";
+  PolkadotXcmError["InvalidOrigin"] = "InvalidOrigin";
+  PolkadotXcmError["BadVersion"] = "BadVersion";
+  PolkadotXcmError["BadLocation"] = "BadLocation";
+  PolkadotXcmError["NoSubscription"] = "NoSubscription";
+  PolkadotXcmError["AlreadySubscribed"] = "AlreadySubscribed";
+  PolkadotXcmError["CannotCheckOutTeleport"] = "CannotCheckOutTeleport";
+  PolkadotXcmError["LowBalance"] = "LowBalance";
+  PolkadotXcmError["TooManyLocks"] = "TooManyLocks";
+  PolkadotXcmError["AccountNotSovereign"] = "AccountNotSovereign";
+  PolkadotXcmError["FeesNotMet"] = "FeesNotMet";
+  PolkadotXcmError["LockNotFound"] = "LockNotFound";
+  PolkadotXcmError["InUse"] = "InUse";
+  PolkadotXcmError["REMOVED"] = "REMOVED";
+  PolkadotXcmError["InvalidAssetUnknownReserve"] = "InvalidAssetUnknownReserve";
+  PolkadotXcmError["InvalidAssetUnsupportedReserve"] = "InvalidAssetUnsupportedReserve";
+  PolkadotXcmError["TooManyReserves"] = "TooManyReserves";
+  PolkadotXcmError["LocalExecutionIncomplete"] = "LocalExecutionIncomplete";
+})(PolkadotXcmError || (PolkadotXcmError = {}));
+
 var resolveModuleError = function resolveModuleError(node, error) {
   var palletDetails = getSupportedPalletsDetails(node).find(function (p) {
     return p.index === Number(error.index);
@@ -2390,29 +2380,6 @@ var resolveModuleError = function resolveModuleError(node, error) {
   return failureReason;
 };
 
-var generateAddressMultiLocationV4 = function generateAddressMultiLocationV4(api, address) {
-  var isMultiLocation = _typeof(address) === 'object';
-  if (isMultiLocation) {
-    return _defineProperty({}, Version.V4, address);
-  }
-  var isEthAddress = isAddress(address);
-  return addXcmVersionHeader({
-    parents: Parents.ZERO,
-    interior: {
-      X1: [isEthAddress ? {
-        AccountKey20: {
-          key: address
-        }
-      } : {
-        AccountId32: {
-          id: api.accountToHex(address),
-          network: null
-        }
-      }]
-    }
-  }, Version.V4);
-};
-
 var getFees = function getFees(scenario) {
   if (scenario === 'ParaToRelay') {
     return 4600000000;
@@ -2532,7 +2499,7 @@ var constructRelayToParaParameters = function constructRelayToParaParameters(_re
 };
 
 var createMultiAsset = function createMultiAsset(version, amount, multiLocation) {
-  if (version === Version.V4) {
+  if (version === Version.V4 || version === Version.V5) {
     return {
       id: multiLocation,
       fun: {
@@ -3469,13 +3436,14 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
   };
 }();
 
-var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, origin, version, messageId) {
+var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, origin, messageId) {
   var api = _ref.api,
     address = _ref.address,
     asset = _ref.asset,
     scenario = _ref.scenario,
     senderAddress = _ref.senderAddress,
-    ahAddress = _ref.ahAddress;
+    ahAddress = _ref.ahAddress,
+    version = _ref.version;
   if (!isForeignAsset(asset)) {
     throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
   }
@@ -3782,7 +3750,9 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
             ahAddress: ahAddress,
             asset: _objectSpread2(_objectSpread2({}, foundAsset), {}, {
               amount: currency.amount
-            })}, from, Version.V4, messageId);
+            }),
+            version: Version.V4
+          }, from, messageId);
           _context.n = 12;
           return api.objectToHex(customXcm, 'XcmVersionedXcm');
         case 12:
@@ -5631,7 +5601,7 @@ var validateAssetSupport = function validateAssetSupport(_ref, assetCheckEnabled
     destination = _ref.to,
     currency = _ref.currency;
   var isDestAssetHub = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
-  var allowedChainsToAh = ['BifrostPolkadot', 'BifrostKusama', 'Hydration', 'Moonbeam', 'Ajuna', 'Polimec'];
+  var allowedChainsToAh = ['AssetHubPolkadot', 'BifrostPolkadot', 'BifrostKusama', 'Hydration', 'Moonbeam', 'Ajuna', 'Polimec'];
   if (!isRelayChain(origin) && !isBridge && isDestAssetHub && !allowedChainsToAh.includes(origin) && (asset === null || asset === void 0 ? void 0 : asset.symbol) === 'DOT') {
     throw new TransferToAhNotSupported("Node ".concat(origin, " does not support DOT transfer to AssetHub"));
   }
@@ -5710,6 +5680,17 @@ var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge,
   return undefined;
 };
 
+var selectXcmVersion = function selectXcmVersion(forcedVersion, originVersion, destMaxVersion) {
+  if (forcedVersion) {
+    return forcedVersion;
+  }
+  var destVersion = destMaxVersion !== null && destMaxVersion !== void 0 ? destMaxVersion : originVersion;
+  if (originVersion === Version.V4 && destVersion === Version.V3) {
+    return Version.V3;
+  }
+  return originVersion;
+};
+
 var shouldPerformAssetCheck = function shouldPerformAssetCheck(origin, currency) {
   if (isRelayChain(origin)) return true;
   var hasMultiAsset = 'multiasset' in currency;
@@ -5768,7 +5749,7 @@ var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled
 
 var send = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, isLocalTransfer, overriddenAsset, resolvedAsset, originNode, finalAsset;
+    var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, originVersion, destVersion, resolvedVersion, isLocalTransfer, overriddenAsset, resolvedAsset, finalAsset, finalVersion, normalizedAsset;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5783,6 +5764,9 @@ var send = /*#__PURE__*/function () {
           asset = resolveAsset(currency, origin, destination, assetCheckEnabled);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
+          originVersion = isRelayChain(origin) ? Version.V4 : getNode(origin).version;
+          destVersion = !isTMultiLocation(destination) && !isRelayChain(destination) && destination !== 'Ethereum' ? getNode(destination).version : undefined;
+          resolvedVersion = selectXcmVersion(version, originVersion, destVersion);
           if (!isRelayChain(origin)) {
             _context.n = 6;
             break;
@@ -5833,7 +5817,7 @@ var send = /*#__PURE__*/function () {
               amount: 'multiasset' in currency ? 0 : currency.amount
             }),
             paraIdTo: paraIdTo,
-            version: version,
+            version: resolvedVersion,
             pallet: pallet,
             method: method
           }));
@@ -5846,7 +5830,6 @@ var send = /*#__PURE__*/function () {
           resolvedAsset = asset !== null && asset !== void 0 ? asset : {
             symbol: 'symbol' in currency ? currency.symbol : undefined
           };
-          originNode = getNode(origin);
           finalAsset = 'multiasset' in currency ? _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
             amount: 0,
             assetId: '1'
@@ -5854,16 +5837,20 @@ var send = /*#__PURE__*/function () {
           _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
             amount: BigInt(currency.amount) < 1n ? 1n : currency.amount
           });
-          return _context.a(2, originNode.transfer({
+          finalVersion = selectXcmVersion(version, originVersion, destVersion);
+          normalizedAsset = finalAsset.multiLocation ? _objectSpread2(_objectSpread2({}, finalAsset), {}, {
+            multilocation: normalizeMultiLocation(finalAsset.multiLocation, finalVersion)
+          }) : finalAsset;
+          return _context.a(2, getNode(origin).transfer({
             api: api,
-            asset: finalAsset,
+            asset: normalizedAsset,
             currency: currency,
             feeAsset: resolvedFeeAsset,
             address: address,
             to: destination,
             paraIdTo: paraIdTo,
             overriddenAsset: overriddenAsset,
-            version: version,
+            version: finalVersion,
             senderAddress: senderAddress,
             ahAddress: ahAddress,
             pallet: pallet,
@@ -5925,7 +5912,7 @@ var ParachainNode = /*#__PURE__*/function () {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-        var api, asset, currency, feeAsset, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, isRelayDestination, scenario, paraId, versionOrDefault, isLocalTransfer, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input, _options, isEthAsset, isAHPOrigin, isAHPDest, isEthDest;
+        var api, asset, currency, feeAsset, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, isRelayDestination, scenario, paraId, isLocalTransfer, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input, _options, isEthAsset, isAHPOrigin, isAHPDest, isEthDest;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -5939,7 +5926,6 @@ var ParachainNode = /*#__PURE__*/function () {
               }
               throw new InvalidParameterError('Sending assets to Polimec is supported only from AssetHubPolkadot and Hydration');
             case 1:
-              versionOrDefault = version !== null && version !== void 0 ? version : this.version;
               isLocalTransfer = this.node === destination;
               if (!isLocalTransfer) {
                 _context.n = 2;
@@ -5962,14 +5948,14 @@ var ParachainNode = /*#__PURE__*/function () {
                   scenario: scenario,
                   pallet: 'XTokens',
                   recipientAddress: address,
-                  version: versionOrDefault,
+                  version: version,
                   paraId: paraId
                 }),
                 fees: getFees(scenario),
                 origin: this.node,
                 scenario: scenario,
                 paraIdTo: paraId,
-                version: versionOrDefault,
+                version: version,
                 destination: destination,
                 overriddenAsset: overriddenAsset,
                 pallet: pallet,
@@ -6005,17 +5991,17 @@ var ParachainNode = /*#__PURE__*/function () {
               }
               _options = {
                 api: api,
-                header: this.createVersionedDestination(scenario, versionOrDefault, destination, paraId),
+                header: this.createVersionedDestination(scenario, version, destination, paraId),
                 addressSelection: createVersionedBeneficiary({
                   api: api,
                   scenario: scenario,
                   pallet: 'PolkadotXcm',
                   recipientAddress: address,
-                  version: versionOrDefault,
+                  version: version,
                   paraId: paraId
                 }),
                 address: address,
-                currencySelection: this.createCurrencySpec(asset.amount, scenario, versionOrDefault, asset, overriddenAsset !== undefined),
+                currencySelection: this.createCurrencySpec(asset.amount, scenario, version, asset, overriddenAsset !== undefined),
                 overriddenAsset: overriddenAsset,
                 asset: asset,
                 currency: currency,
@@ -6069,8 +6055,7 @@ var ParachainNode = /*#__PURE__*/function () {
   }, {
     key: "transferRelayToPara",
     value: function transferRelayToPara(options) {
-      var _options$version = options.version,
-        version = _options$version === void 0 ? Version.V3 : _options$version,
+      var version = options.version,
         pallet = options.pallet,
         methodOverride = options.method;
       var _this$getRelayToParaO = this.getRelayToParaOverrides(),
@@ -6166,11 +6151,11 @@ var ParachainNode = /*#__PURE__*/function () {
     value: function () {
       var _transferEthAssetViaAH = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(input) {
         var _feeAsset$multiLocati;
-        var api, asset, scenario, _input$version, version, destination, address, senderAddress, feeAsset, paraIdTo, ethMultiAsset, PARA_TO_PARA_FEE_DOT, AH_EXECUTION_FEE_PADDED, dryRunResult, dryRunFeePadded, dest, call;
+        var api, asset, scenario, version, destination, address, senderAddress, feeAsset, paraIdTo, ethMultiAsset, PARA_TO_PARA_FEE_DOT, AH_EXECUTION_FEE_PADDED, dryRunResult, dryRunFeePadded, dest, call;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              api = input.api, asset = input.asset, scenario = input.scenario, _input$version = input.version, version = _input$version === void 0 ? Version.V4 : _input$version, destination = input.destination, address = input.address, senderAddress = input.senderAddress, feeAsset = input.feeAsset, paraIdTo = input.paraIdTo;
+              api = input.api, asset = input.asset, scenario = input.scenario, version = input.version, destination = input.destination, address = input.address, senderAddress = input.senderAddress, feeAsset = input.feeAsset, paraIdTo = input.paraIdTo;
               if (asset.multiLocation) {
                 _context2.n = 1;
                 break;
@@ -6286,7 +6271,6 @@ var ParachainNode = /*#__PURE__*/function () {
           api,
           asset,
           scenario,
-          _input$version2,
           version,
           destination,
           address,
@@ -6310,7 +6294,7 @@ var ParachainNode = /*#__PURE__*/function () {
           while (1) switch (_context3.n) {
             case 0:
               useOnlyDepositInstruction = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : false;
-              api = input.api, asset = input.asset, scenario = input.scenario, _input$version2 = input.version, version = _input$version2 === void 0 ? Version.V4 : _input$version2, destination = input.destination, address = input.address, senderAddress = input.senderAddress, feeAsset = input.feeAsset;
+              api = input.api, asset = input.asset, scenario = input.scenario, version = input.version, destination = input.destination, address = input.address, senderAddress = input.senderAddress, feeAsset = input.feeAsset;
               _context3.n = 1;
               return getBridgeStatus(api.clone());
             case 1:
@@ -6393,7 +6377,7 @@ var ParachainNode = /*#__PURE__*/function () {
               return generateMessageId(api, senderAddress, getParaId(this.node), ethAsset.assetId, address, asset.amount);
             case 11:
               messageId = _context3.v;
-              customXcmOnDest = createCustomXcmOnDest(input, this.node, version, messageId);
+              customXcmOnDest = createCustomXcmOnDest(input, this.node, messageId);
             case 12:
               call = {
                 module: 'PolkadotXcm',
@@ -6423,7 +6407,7 @@ var ParachainNode = /*#__PURE__*/function () {
 var Acala = /*#__PURE__*/function (_ParachainNode) {
   function Acala() {
     _classCallCheck(this, Acala);
-    return _callSuper(this, Acala, ['Acala', 'acala', 'polkadot', Version.V3]);
+    return _callSuper(this, Acala, ['Acala', 'acala', 'polkadot', Version.V4]);
   }
   _inherits(Acala, _ParachainNode);
   return _createClass(Acala, [{
@@ -6591,7 +6575,7 @@ var Ajuna = /*#__PURE__*/function (_ParachainNode) {
 var Altair = /*#__PURE__*/function (_ParachainNode) {
   function Altair() {
     _classCallCheck(this, Altair);
-    return _callSuper(this, Altair, ['Altair', 'altair', 'kusama', Version.V3]);
+    return _callSuper(this, Altair, ['Altair', 'altair', 'kusama', Version.V4]);
   }
   _inherits(Altair, _ParachainNode);
   return _createClass(Altair, [{
@@ -6663,7 +6647,7 @@ var Amplitude = /*#__PURE__*/function (_ParachainNode) {
 var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
   function AssetHubKusama() {
     _classCallCheck(this, AssetHubKusama);
-    return _callSuper(this, AssetHubKusama, ['AssetHubKusama', 'KusamaAssetHub', 'kusama', Version.V3]);
+    return _callSuper(this, AssetHubKusama, ['AssetHubKusama', 'KusamaAssetHub', 'kusama', Version.V4]);
   }
   _inherits(AssetHubKusama, _ParachainNode);
   return _createClass(AssetHubKusama, [{
@@ -6726,8 +6710,7 @@ xcm, maxWeight) {
 
 var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, weight, originExecutionFee, destExecutionFee) {
   var api = input.api,
-    _input$version = input.version,
-    version = _input$version === void 0 ? Version.V4 : _input$version,
+    version = input.version,
     asset = input.asset,
     scenario = input.scenario,
     destination = input.destination,
@@ -6839,25 +6822,44 @@ var createExecuteXcm = function createExecuteXcm(input, executionFee, version) {
     version: version,
     paraId: paraIdTo
   });
-  if (!asset.multiLocation || feeAsset && !feeAsset.multiLocation) {
-    throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
+  if (!isForeignAsset(asset) || !asset.multiLocation || !asset.assetId) {
+    throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is missing multiLocation or assetId"));
+  }
+  if (feeAsset && (!isForeignAsset(feeAsset) || !feeAsset.multiLocation || !feeAsset.assetId)) {
+    throw new InvalidCurrencyError("Fee asset ".concat(JSON.stringify(feeAsset), " is missing multiLocation or assetId"));
   }
   var assetML = transformMultiLocation(asset.multiLocation);
   var feeML = transformMultiLocation((_feeAsset$multiLocati = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati !== void 0 ? _feeAsset$multiLocati : asset.multiLocation);
   var sameFeeAsset = feeAsset && isAssetEqual(asset, feeAsset);
   var amountWithoutFee = BigInt(asset.amount) - executionFee;
-  var xcm = [{
-    WithdrawAsset: [{
+  var assetsToWithdraw = [{
+    assetId: asset.assetId,
+    multiasset: {
       id: assetML,
       fun: {
         Fungible: BigInt(asset.amount)
       }
-    }].concat(_toConsumableArray(!sameFeeAsset && feeAsset !== null && feeAsset !== void 0 && feeAsset.multiLocation ? [{
-      id: transformMultiLocation(feeAsset.multiLocation),
-      fun: {
-        Fungible: executionFee
+    }
+  }];
+  if (!sameFeeAsset && feeAsset !== null && feeAsset !== void 0 && feeAsset.multiLocation) {
+    assetsToWithdraw.push({
+      assetId: feeAsset.assetId,
+      multiasset: {
+        id: feeML,
+        fun: {
+          Fungible: executionFee
+        }
       }
-    }] : []))
+    });
+  }
+  assetsToWithdraw.sort(function (a, b) {
+    return a.assetId > b.assetId ? 1 : -1;
+  });
+  var xcm = [{
+    WithdrawAsset: assetsToWithdraw.map(function (_ref) {
+      var multiasset = _ref.multiasset;
+      return multiasset;
+    })
   }, {
     BuyExecution: {
       fees: {
@@ -7000,13 +7002,12 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
   function AssetHubPolkadot() {
     var _this;
     _classCallCheck(this, AssetHubPolkadot);
-    _this = _callSuper(this, AssetHubPolkadot, ['AssetHubPolkadot', 'PolkadotAssetHub', 'polkadot', Version.V3]);
+    _this = _callSuper(this, AssetHubPolkadot, ['AssetHubPolkadot', 'PolkadotAssetHub', 'polkadot', Version.V4]);
     _this.handleLocalReserveTransfer = function (input) {
       var useDOTAsFeeAsset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var api = input.api,
         scenario = input.scenario,
-        _input$version = input.version,
-        version = _input$version === void 0 ? Version.V4 : _input$version,
+        version = input.version,
         destination = input.destination,
         asset = input.asset,
         paraIdTo = input.paraIdTo;
@@ -7038,42 +7039,46 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
   return _createClass(AssetHubPolkadot, [{
     key: "handleBridgeTransfer",
     value: function handleBridgeTransfer(input, targetChain) {
-      var _input$asset$symbol, _input$asset$symbol2, _input$asset$symbol3, _input$asset$symbol4;
-      if (targetChain === 'Kusama' && ((_input$asset$symbol = input.asset.symbol) === null || _input$asset$symbol === void 0 ? void 0 : _input$asset$symbol.toUpperCase()) === 'KSM' || targetChain === 'Polkadot' && ((_input$asset$symbol2 = input.asset.symbol) === null || _input$asset$symbol2 === void 0 ? void 0 : _input$asset$symbol2.toUpperCase()) === 'DOT') {
-        var overriddenVersion = Version.V4;
-        var customMultiLocation = {
-          parents: Parents.TWO,
-          interior: {
-            X1: [{
-              GlobalConsensus: targetChain
-            }]
-          }
-        };
+      var _asset$symbol, _asset$symbol2, _asset$symbol3, _asset$symbol4;
+      var api = input.api,
+        asset = input.asset,
+        destination = input.destination,
+        scenario = input.scenario,
+        address = input.address,
+        version = input.version,
+        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(overriddenVersion, targetChain, input.destination, input.paraIdTo),
-          addressSelection: generateAddressMultiLocationV4(input.api, input.address),
-          currencySelection: createVersionedMultiAssets(overriddenVersion, input.asset.amount, customMultiLocation)
+          header: createBridgePolkadotXcmDest(version, targetChain, destination, paraIdTo),
+          addressSelection: createVersionedBeneficiary({
+            api: api,
+            scenario: scenario,
+            pallet: 'PolkadotXcm',
+            recipientAddress: address,
+            version: version,
+            paraId: paraIdTo
+          }),
+          currencySelection: createVersionedMultiAssets(version, asset.amount, asset.multiLocation)
         });
         return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited');
-      } else if (targetChain === 'Polkadot' && ((_input$asset$symbol3 = input.asset.symbol) === null || _input$asset$symbol3 === void 0 ? void 0 : _input$asset$symbol3.toUpperCase()) === 'KSM' || targetChain === 'Kusama' && ((_input$asset$symbol4 = input.asset.symbol) === null || _input$asset$symbol4 === void 0 ? void 0 : _input$asset$symbol4.toUpperCase()) === 'DOT') {
-        var _overriddenVersion = Version.V3;
+      } 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(_overriddenVersion, targetChain, input.destination, input.paraIdTo),
-          currencySelection: createVersionedMultiAssets(_overriddenVersion, input.asset.amount, DOT_MULTILOCATION)
+          header: createBridgePolkadotXcmDest(version, targetChain, destination, paraIdTo),
+          currencySelection: createVersionedMultiAssets(version, asset.amount, DOT_MULTILOCATION)
         });
         return PolkadotXCMTransferImpl.transferPolkadotXCM(_modifiedInput, 'limited_reserve_transfer_assets', 'Unlimited');
       }
-      throw new InvalidCurrencyError("Polkadot <-> Kusama bridge does not support currency ".concat(input.asset.symbol));
+      throw new InvalidCurrencyError("Polkadot <-> Kusama bridge does not support currency ".concat(asset.symbol));
     }
   }, {
     key: "handleEthBridgeNativeTransfer",
     value: function () {
       var _handleEthBridgeNativeTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(input) {
-        var api, _input$version2, version, scenario, destination, senderAddress, address, paraIdTo, asset, bridgeStatus, messageId, multiLocation, call;
+        var api, version, scenario, destination, senderAddress, address, paraIdTo, asset, bridgeStatus, messageId, multiLocation, call;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              api = input.api, _input$version2 = input.version, version = _input$version2 === void 0 ? Version.V4 : _input$version2, scenario = input.scenario, destination = input.destination, senderAddress = input.senderAddress, address = input.address, paraIdTo = input.paraIdTo, asset = input.asset;
+              api = input.api, version = input.version, scenario = input.scenario, destination = input.destination, senderAddress = input.senderAddress, address = input.address, paraIdTo = input.paraIdTo, asset = input.asset;
               _context.n = 1;
               return getBridgeStatus(api.clone());
             case 1:
@@ -7156,11 +7161,11 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "handleEthBridgeTransfer",
     value: function () {
       var _handleEthBridgeTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(input) {
-        var api, scenario, destination, paraIdTo, address, asset, bridgeStatus, modifiedInput;
+        var api, scenario, destination, paraIdTo, address, asset, version, bridgeStatus, modifiedInput;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              api = input.api, scenario = input.scenario, destination = input.destination, paraIdTo = input.paraIdTo, address = input.address, asset = input.asset;
+              api = input.api, scenario = input.scenario, destination = input.destination, paraIdTo = input.paraIdTo, address = input.address, asset = input.asset, version = input.version;
               _context2.n = 1;
               return getBridgeStatus(api.clone());
             case 1:
@@ -7199,7 +7204,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
                   version: this.version,
                   paraId: paraIdTo
                 }),
-                currencySelection: createVersionedMultiAssets(Version.V3, asset.amount, asset.multiLocation)
+                currencySelection: createVersionedMultiAssets(version, asset.amount, asset.multiLocation)
               });
               return _context2.a(2, PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited'));
           }
@@ -7218,8 +7223,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         asset = input.asset,
         scenario = input.scenario,
         destination = input.destination,
-        paraIdTo = input.paraIdTo;
-      var version = Version.V3;
+        paraIdTo = input.paraIdTo,
+        version = input.version;
       var paraId = resolveParaId(paraIdTo, destination);
       var customMultiLocation = {
         parents: Parents.ONE,
@@ -7248,8 +7253,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     value: function patchInput(input) {
       var asset = input.asset,
         destination = input.destination,
-        _input$version3 = input.version,
-        version = _input$version3 === void 0 ? this.version : _input$version3;
+        _input$version = input.version,
+        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)
@@ -7268,11 +7273,11 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "handleExecuteTransfer",
     value: function () {
       var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var api, senderAddress, asset, feeAsset, _input$version4, version, decimals, multiplier, base, scaledMultiplier, MIN_FEE, call, dryRunResult, paddedFee, xcm, weight;
+        var api, senderAddress, asset, feeAsset, version, decimals, multiplier, base, scaledMultiplier, MIN_FEE, call, dryRunResult, paddedFee, xcm, weight;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset, _input$version4 = input.version, version = _input$version4 === void 0 ? Version.V4 : _input$version4;
+              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset, version = input.version;
               if (senderAddress) {
                 _context3.n = 1;
                 break;
@@ -7475,7 +7480,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
 var Astar = /*#__PURE__*/function (_ParachainNode) {
   function Astar() {
     _classCallCheck(this, Astar);
-    return _callSuper(this, Astar, ['Astar', 'astar', 'polkadot', Version.V3]);
+    return _callSuper(this, Astar, ['Astar', 'astar', 'polkadot', Version.V4]);
   }
   _inherits(Astar, _ParachainNode);
   return _createClass(Astar, [{
@@ -7528,7 +7533,7 @@ var Astar = /*#__PURE__*/function (_ParachainNode) {
 var Basilisk = /*#__PURE__*/function (_ParachainNode) {
   function Basilisk() {
     _classCallCheck(this, Basilisk);
-    return _callSuper(this, Basilisk, ['Basilisk', 'basilisk', 'kusama', Version.V3]);
+    return _callSuper(this, Basilisk, ['Basilisk', 'basilisk', 'kusama', Version.V4]);
   }
   _inherits(Basilisk, _ParachainNode);
   return _createClass(Basilisk, [{
@@ -7556,7 +7561,7 @@ var Basilisk = /*#__PURE__*/function (_ParachainNode) {
 var BifrostKusama = /*#__PURE__*/function (_ParachainNode) {
   function BifrostKusama() {
     _classCallCheck(this, BifrostKusama);
-    return _callSuper(this, BifrostKusama, ['BifrostKusama', 'bifrost', 'kusama', Version.V3]);
+    return _callSuper(this, BifrostKusama, ['BifrostKusama', 'bifrost', 'kusama', Version.V4]);
   }
   _inherits(BifrostKusama, _ParachainNode);
   return _createClass(BifrostKusama, [{
@@ -7575,7 +7580,7 @@ var BifrostKusama = /*#__PURE__*/function (_ParachainNode) {
 var BifrostPolkadot = /*#__PURE__*/function (_ParachainNode) {
   function BifrostPolkadot() {
     _classCallCheck(this, BifrostPolkadot);
-    return _callSuper(this, BifrostPolkadot, ['BifrostPolkadot', 'bifrost', 'polkadot', Version.V3]);
+    return _callSuper(this, BifrostPolkadot, ['BifrostPolkadot', 'bifrost', 'polkadot', Version.V4]);
   }
   _inherits(BifrostPolkadot, _ParachainNode);
   return _createClass(BifrostPolkadot, [{
@@ -7677,7 +7682,7 @@ var BifrostPolkadot = /*#__PURE__*/function (_ParachainNode) {
 var BridgeHubKusama = /*#__PURE__*/function (_ParachainNode) {
   function BridgeHubKusama() {
     _classCallCheck(this, BridgeHubKusama);
-    return _callSuper(this, BridgeHubKusama, ['BridgeHubKusama', 'kusamaBridgeHub', 'kusama', Version.V3]);
+    return _callSuper(this, BridgeHubKusama, ['BridgeHubKusama', 'kusamaBridgeHub', 'kusama', Version.V4]);
   }
   _inherits(BridgeHubKusama, _ParachainNode);
   return _createClass(BridgeHubKusama, [{
@@ -7704,7 +7709,7 @@ var BridgeHubKusama = /*#__PURE__*/function (_ParachainNode) {
 var BridgeHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
   function BridgeHubPolkadot() {
     _classCallCheck(this, BridgeHubPolkadot);
-    return _callSuper(this, BridgeHubPolkadot, ['BridgeHubPolkadot', 'polkadotBridgeHub', 'polkadot', Version.V3]);
+    return _callSuper(this, BridgeHubPolkadot, ['BridgeHubPolkadot', 'polkadotBridgeHub', 'polkadot', Version.V4]);
   }
   _inherits(BridgeHubPolkadot, _ParachainNode);
   return _createClass(BridgeHubPolkadot, [{
@@ -7731,7 +7736,7 @@ var BridgeHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
 var Centrifuge = /*#__PURE__*/function (_ParachainNode) {
   function Centrifuge() {
     _classCallCheck(this, Centrifuge);
-    return _callSuper(this, Centrifuge, ['Centrifuge', 'centrifuge', 'polkadot', Version.V3]);
+    return _callSuper(this, Centrifuge, ['Centrifuge', 'centrifuge', 'polkadot', Version.V4]);
   }
   _inherits(Centrifuge, _ParachainNode);
   return _createClass(Centrifuge, [{
@@ -7782,7 +7787,7 @@ var Centrifuge = /*#__PURE__*/function (_ParachainNode) {
 var Collectives = /*#__PURE__*/function (_ParachainNode) {
   function Collectives() {
     _classCallCheck(this, Collectives);
-    return _callSuper(this, Collectives, ['Collectives', 'polkadotCollectives', 'polkadot', Version.V3]);
+    return _callSuper(this, Collectives, ['Collectives', 'polkadotCollectives', 'polkadot', Version.V4]);
   }
   _inherits(Collectives, _ParachainNode);
   return _createClass(Collectives, [{
@@ -7831,7 +7836,7 @@ var ComposableFinance = /*#__PURE__*/function (_ParachainNode) {
 var CoretimeKusama = /*#__PURE__*/function (_ParachainNode) {
   function CoretimeKusama() {
     _classCallCheck(this, CoretimeKusama);
-    return _callSuper(this, CoretimeKusama, ['CoretimeKusama', 'kusamaCoretime', 'kusama', Version.V3]);
+    return _callSuper(this, CoretimeKusama, ['CoretimeKusama', 'kusamaCoretime', 'kusama', Version.V4]);
   }
   _inherits(CoretimeKusama, _ParachainNode);
   return _createClass(CoretimeKusama, [{
@@ -7856,7 +7861,7 @@ var CoretimeKusama = /*#__PURE__*/function (_ParachainNode) {
 var CoretimePolkadot = /*#__PURE__*/function (_ParachainNode) {
   function CoretimePolkadot() {
     _classCallCheck(this, CoretimePolkadot);
-    return _callSuper(this, CoretimePolkadot, ['CoretimePolkadot', 'polkadotCoretime', 'polkadot', Version.V3]);
+    return _callSuper(this, CoretimePolkadot, ['CoretimePolkadot', 'polkadotCoretime', 'polkadot', Version.V4]);
   }
   _inherits(CoretimePolkadot, _ParachainNode);
   return _createClass(CoretimePolkadot, [{
@@ -7880,7 +7885,7 @@ var CoretimePolkadot = /*#__PURE__*/function (_ParachainNode) {
 var Crab = /*#__PURE__*/function (_ParachainNode) {
   function Crab() {
     _classCallCheck(this, Crab);
-    return _callSuper(this, Crab, ['Crab', 'crab', 'kusama', Version.V3]);
+    return _callSuper(this, Crab, ['Crab', 'crab', 'kusama', Version.V4]);
   }
   _inherits(Crab, _ParachainNode);
   return _createClass(Crab, [{
@@ -8031,7 +8036,7 @@ var Curio = /*#__PURE__*/function (_ParachainNode) {
 var Darwinia = /*#__PURE__*/function (_ParachainNode) {
   function Darwinia() {
     _classCallCheck(this, Darwinia);
-    return _callSuper(this, Darwinia, ['Darwinia', 'darwinia', 'polkadot', Version.V3]);
+    return _callSuper(this, Darwinia, ['Darwinia', 'darwinia', 'polkadot', Version.V4]);
   }
   _inherits(Darwinia, _ParachainNode);
   return _createClass(Darwinia, [{
@@ -8088,7 +8093,7 @@ var Darwinia = /*#__PURE__*/function (_ParachainNode) {
 var Encointer = /*#__PURE__*/function (_ParachainNode) {
   function Encointer() {
     _classCallCheck(this, Encointer);
-    return _callSuper(this, Encointer, ['Encointer', 'encointer', 'kusama', Version.V3]);
+    return _callSuper(this, Encointer, ['Encointer', 'encointer', 'kusama', Version.V4]);
   }
   _inherits(Encointer, _ParachainNode);
   return _createClass(Encointer, [{
@@ -8115,7 +8120,7 @@ var Encointer = /*#__PURE__*/function (_ParachainNode) {
 var Heima = /*#__PURE__*/function (_ParachainNode) {
   function Heima() {
     _classCallCheck(this, Heima);
-    return _callSuper(this, Heima, ['Heima', 'litentry', 'polkadot', Version.V3]);
+    return _callSuper(this, Heima, ['Heima', 'litentry', 'polkadot', Version.V4]);
   }
   _inherits(Heima, _ParachainNode);
   return _createClass(Heima, [{
@@ -8181,10 +8186,8 @@ var createTypeAndThenTransfer = function createTypeAndThenTransfer(_ref, version
       })]),
       assets_transfer_type: transferType,
       remote_fees_id: _defineProperty({}, version, {
-        Concrete: {
-          parents: scenario === 'ParaToPara' ? Parents.ONE : Parents.ZERO,
-          interior: 'Here'
-        }
+        parents: scenario === 'ParaToPara' ? Parents.ONE : Parents.ZERO,
+        interior: 'Here'
       }),
       fees_transfer_type: transferType,
       custom_xcm_on_dest: createCustomXcmPolimec(api, address, scenario, destination, paraIdTo, version),
@@ -8206,10 +8209,8 @@ var createCustomXcmPolimec = function createCustomXcmPolimec(api, address, scena
         BuyExecution: {
           fees: {
             id: {
-              Concrete: {
-                parents: Parents.ONE,
-                interior: 'Here'
-              }
+              parents: Parents.ONE,
+              interior: 'Here'
             },
             fun: {
               Fungible: GAS_LIMIT
@@ -8239,7 +8240,7 @@ var createCustomXcmPolimec = function createCustomXcmPolimec(api, address, scena
 var Polimec = /*#__PURE__*/function (_ParachainNode) {
   function Polimec() {
     _classCallCheck(this, Polimec);
-    return _callSuper(this, Polimec, ['Polimec', 'polimec', 'polkadot', Version.V3]);
+    return _callSuper(this, Polimec, ['Polimec', 'polimec', 'polkadot', Version.V4]);
   }
   _inherits(Polimec, _ParachainNode);
   return _createClass(Polimec, [{
@@ -8341,7 +8342,7 @@ var createCustomXcmAh = function createCustomXcmAh(_ref, version) {
 var Hydration = /*#__PURE__*/function (_ParachainNode) {
   function Hydration() {
     _classCallCheck(this, Hydration);
-    return _callSuper(this, Hydration, ['Hydration', 'hydradx', 'polkadot', Version.V3]);
+    return _callSuper(this, Hydration, ['Hydration', 'hydradx', 'polkadot', Version.V4]);
   }
   _inherits(Hydration, _ParachainNode);
   return _createClass(Hydration, [{
@@ -8352,22 +8353,19 @@ var Hydration = /*#__PURE__*/function (_ParachainNode) {
         scenario = input.scenario,
         version = input.version,
         destination = input.destination;
-      var versionOrDefault = version !== null && version !== void 0 ? version : Version.V3;
       var call = {
         module: 'PolkadotXcm',
         method: 'transfer_assets_using_type_and_then',
         parameters: {
-          dest: this.createVersionedDestination(scenario, versionOrDefault, destination, getParaId('AssetHubPolkadot')),
-          assets: _defineProperty({}, versionOrDefault, [createMultiAsset(versionOrDefault, asset.amount, DOT_MULTILOCATION)]),
+          dest: this.createVersionedDestination(scenario, version, destination, getParaId('AssetHubPolkadot')),
+          assets: _defineProperty({}, version, [createMultiAsset(version, asset.amount, DOT_MULTILOCATION)]),
           assets_transfer_type: 'DestinationReserve',
-          remote_fees_id: _defineProperty({}, versionOrDefault, {
-            Concrete: {
-              parents: Parents.ONE,
-              interior: 'Here'
-            }
+          remote_fees_id: _defineProperty({}, version, {
+            parents: Parents.ONE,
+            interior: 'Here'
           }),
           fees_transfer_type: 'DestinationReserve',
-          custom_xcm_on_dest: createCustomXcmAh(input, versionOrDefault),
+          custom_xcm_on_dest: createCustomXcmAh(input, version),
           weight_limit: 'Unlimited'
         }
       };
@@ -8530,7 +8528,7 @@ var Interlay = /*#__PURE__*/function (_ParachainNode) {
 var Karura = /*#__PURE__*/function (_ParachainNode) {
   function Karura() {
     _classCallCheck(this, Karura);
-    return _callSuper(this, Karura, ['Karura', 'karura', 'kusama', Version.V3]);
+    return _callSuper(this, Karura, ['Karura', 'karura', 'kusama', Version.V4]);
   }
   _inherits(Karura, _ParachainNode);
   return _createClass(Karura, [{
@@ -8554,7 +8552,7 @@ var Karura = /*#__PURE__*/function (_ParachainNode) {
 var KiltSpiritnet = /*#__PURE__*/function (_ParachainNode) {
   function KiltSpiritnet() {
     _classCallCheck(this, KiltSpiritnet);
-    return _callSuper(this, KiltSpiritnet, ['KiltSpiritnet', 'kilt', 'polkadot', Version.V3]);
+    return _callSuper(this, KiltSpiritnet, ['KiltSpiritnet', 'kilt', 'polkadot', Version.V4]);
   }
   _inherits(KiltSpiritnet, _ParachainNode);
   return _createClass(KiltSpiritnet, [{
@@ -8676,7 +8674,7 @@ Manta.NATIVE_ASSET_ID = 1n;
 var Moonbeam = /*#__PURE__*/function (_ParachainNode) {
   function Moonbeam() {
     _classCallCheck(this, Moonbeam);
-    return _callSuper(this, Moonbeam, ['Moonbeam', 'moonbeam', 'polkadot', Version.V3]);
+    return _callSuper(this, Moonbeam, ['Moonbeam', 'moonbeam', 'polkadot', Version.V4]);
   }
   _inherits(Moonbeam, _ParachainNode);
   return _createClass(Moonbeam, [{
@@ -8748,7 +8746,7 @@ var Moonbeam = /*#__PURE__*/function (_ParachainNode) {
 var Moonriver = /*#__PURE__*/function (_ParachainNode) {
   function Moonriver() {
     _classCallCheck(this, Moonriver);
-    return _callSuper(this, Moonriver, ['Moonriver', 'moonriver', 'kusama', Version.V3]);
+    return _callSuper(this, Moonriver, ['Moonriver', 'moonriver', 'kusama', Version.V4]);
   }
   _inherits(Moonriver, _ParachainNode);
   return _createClass(Moonriver, [{
@@ -8799,7 +8797,7 @@ var Moonriver = /*#__PURE__*/function (_ParachainNode) {
 var Mythos = /*#__PURE__*/function (_ParachainNode) {
   function Mythos() {
     _classCallCheck(this, Mythos);
-    return _callSuper(this, Mythos, ['Mythos', 'mythos', 'polkadot', Version.V3]);
+    return _callSuper(this, Mythos, ['Mythos', 'mythos', 'polkadot', Version.V4]);
   }
   _inherits(Mythos, _ParachainNode);
   return _createClass(Mythos, [{
@@ -8856,7 +8854,7 @@ var Mythos = /*#__PURE__*/function (_ParachainNode) {
 var NeuroWeb = /*#__PURE__*/function (_ParachainNode) {
   function NeuroWeb() {
     _classCallCheck(this, NeuroWeb);
-    return _callSuper(this, NeuroWeb, ['NeuroWeb', 'neuroweb', 'polkadot', Version.V3]);
+    return _callSuper(this, NeuroWeb, ['NeuroWeb', 'neuroweb', 'polkadot', Version.V4]);
   }
   _inherits(NeuroWeb, _ParachainNode);
   return _createClass(NeuroWeb, [{
@@ -8870,7 +8868,7 @@ var NeuroWeb = /*#__PURE__*/function (_ParachainNode) {
 var Nodle = /*#__PURE__*/function (_ParachainNode) {
   function Nodle() {
     _classCallCheck(this, Nodle);
-    return _callSuper(this, Nodle, ['Nodle', 'nodle', 'polkadot', Version.V3]);
+    return _callSuper(this, Nodle, ['Nodle', 'nodle', 'polkadot', Version.V4]);
   }
   _inherits(Nodle, _ParachainNode);
   return _createClass(Nodle, [{
@@ -8897,7 +8895,7 @@ var Nodle = /*#__PURE__*/function (_ParachainNode) {
 var Peaq = /*#__PURE__*/function (_ParachainNode) {
   function Peaq() {
     _classCallCheck(this, Peaq);
-    return _callSuper(this, Peaq, ['Peaq', 'peaq', 'polkadot', Version.V3]);
+    return _callSuper(this, Peaq, ['Peaq', 'peaq', 'polkadot', Version.V4]);
   }
   _inherits(Peaq, _ParachainNode);
   return _createClass(Peaq, [{
@@ -8981,7 +8979,7 @@ var Pendulum = /*#__PURE__*/function (_ParachainNode) {
 var PeopleKusama = /*#__PURE__*/function (_ParachainNode) {
   function PeopleKusama() {
     _classCallCheck(this, PeopleKusama);
-    return _callSuper(this, PeopleKusama, ['PeopleKusama', 'kusamaPeople', 'kusama', Version.V3]);
+    return _callSuper(this, PeopleKusama, ['PeopleKusama', 'kusamaPeople', 'kusama', Version.V4]);
   }
   _inherits(PeopleKusama, _ParachainNode);
   return _createClass(PeopleKusama, [{
@@ -9008,7 +9006,7 @@ var PeopleKusama = /*#__PURE__*/function (_ParachainNode) {
 var PeoplePolkadot = /*#__PURE__*/function (_ParachainNode) {
   function PeoplePolkadot() {
     _classCallCheck(this, PeoplePolkadot);
-    return _callSuper(this, PeoplePolkadot, ['PeoplePolkadot', 'polkadotPeople', 'polkadot', Version.V3]);
+    return _callSuper(this, PeoplePolkadot, ['PeoplePolkadot', 'polkadotPeople', 'polkadot', Version.V4]);
   }
   _inherits(PeoplePolkadot, _ParachainNode);
   return _createClass(PeoplePolkadot, [{
@@ -9161,7 +9159,7 @@ var Phala = /*#__PURE__*/function (_ParachainNode) {
 var Quartz = /*#__PURE__*/function (_ParachainNode) {
   function Quartz() {
     _classCallCheck(this, Quartz);
-    return _callSuper(this, Quartz, ['Quartz', 'quartz', 'kusama', Version.V3]);
+    return _callSuper(this, Quartz, ['Quartz', 'quartz', 'kusama', Version.V4]);
   }
   _inherits(Quartz, _ParachainNode);
   return _createClass(Quartz, [{
@@ -9240,7 +9238,7 @@ var RobonomicsPolkadot = /*#__PURE__*/function (_ParachainNode) {
 var Shiden = /*#__PURE__*/function (_ParachainNode) {
   function Shiden() {
     _classCallCheck(this, Shiden);
-    return _callSuper(this, Shiden, ['Shiden', 'shiden', 'kusama', Version.V3]);
+    return _callSuper(this, Shiden, ['Shiden', 'shiden', 'kusama', Version.V4]);
   }
   _inherits(Shiden, _ParachainNode);
   return _createClass(Shiden, [{
@@ -9294,7 +9292,7 @@ var Subsocial = /*#__PURE__*/function (_ParachainNode) {
 var Unique = /*#__PURE__*/function (_ParachainNode) {
   function Unique() {
     _classCallCheck(this, Unique);
-    return _callSuper(this, Unique, ['Unique', 'unique', 'polkadot', Version.V3]);
+    return _callSuper(this, Unique, ['Unique', 'unique', 'polkadot', Version.V4]);
   }
   _inherits(Unique, _ParachainNode);
   return _createClass(Unique, [{
@@ -9448,7 +9446,7 @@ var buildClaimAssetsInput = function buildClaimAssetsInput(_ref) {
     multiAssets = _ref.multiAssets,
     address = _ref.address,
     _ref$version = _ref.version,
-    version = _ref$version === void 0 ? Version.V3 : _ref$version;
+    version = _ref$version === void 0 ? Version.V4 : _ref$version;
   return {
     assets: _defineProperty({}, version, multiAssets),
     beneficiary: _defineProperty({}, version, buildBeneficiaryInput(api, address))
@@ -10283,4 +10281,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, Version, XTokensError, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiary, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, generateAddressMultiLocationV4, 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, 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 };