@paraspell/sdk-core 8.12.0 → 8.13.0

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { isTMultiLocation, Parents, isRelayChain, NODE_NAMES_DOT_KSM, hasJunction, deepEqual } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
 import { ethers, Contract } from 'ethers';
-import { InvalidCurrencyError, getNativeAssetSymbol, getOtherAssets, isNodeEvm, getRelayChainSymbol, isForeignAsset, findAssetByMultiLocation, isAssetEqual, getAssetId, getAssetsObject, findAsset, isOverrideMultiLocationSpecifier, hasDryRunSupport, isTMultiAsset, isSymbolSpecifier, getNativeAssets, hasSupportForAsset, extractMultiAssetLoc, getExistentialDeposit } from '@paraspell/assets';
+import { InvalidCurrencyError, isForeignAsset, getOtherAssets, isNodeEvm, findAssetByMultiLocation, getNativeAssetSymbol, isAssetEqual, getAssetId, getRelayChainSymbol, hasDryRunSupport, findAsset, getAssetsObject, isOverrideMultiLocationSpecifier, isTMultiAsset, isSymbolSpecifier, getNativeAssets, hasSupportForAsset, extractMultiAssetLoc, getExistentialDeposit } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { getSupportedPalletsDetails, getDefaultPallet } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
@@ -955,25 +955,6 @@ var ScenarioNotSupportedError = /*#__PURE__*/function (_Error) {
   return _createClass(ScenarioNotSupportedError);
 }(/*#__PURE__*/_wrapNativeSuper(Error));
 
-var DEFAULT_FEE_ASSET = 0;
-var ETH_PARA_ID = 1;
-var ETH_CHAIN_ID = BigInt(ETH_PARA_ID);
-var ETHEREUM_JUNCTION = {
-  GlobalConsensus: {
-    Ethereum: {
-      chainId: ETH_CHAIN_ID
-    }
-  }
-};
-var DOT_MULTILOCATION = {
-  parents: Parents.ONE,
-  interior: 'Here'
-};
-var SYSTEM_NODES_POLKADOT = ['PeoplePolkadot', 'CoretimePolkadot', 'Collectives'];
-var SYSTEM_NODES_KUSAMA = ['PeopleKusama', 'CoretimeKusama'];
-var ASSET_HUB_EXECUTION_FEE = 2200000000n; // 0.22 DOT
- // 30% padding
-
 var AssetHubPolkadot$1 = {
 	name: "AssetHub",
 	info: "PolkadotAssetHub",
@@ -1227,14 +1208,14 @@ var Centrifuge$1 = {
 	info: "centrifuge",
 	paraId: 2031,
 	providers: [
-		{
-			name: "Centrifuge",
-			endpoint: "wss://fullnode.centrifuge.io"
-		},
 		{
 			name: "LuckyFriday",
 			endpoint: "wss://rpc-centrifuge.luckyfriday.io"
 		},
+		{
+			name: "Centrifuge",
+			endpoint: "wss://fullnode.centrifuge.io"
+		},
 		{
 			name: "OnFinality",
 			endpoint: "wss://centrifuge-parachain.api.onfinality.io/public-ws"
@@ -1330,20 +1311,20 @@ var Moonbeam$1 = {
 	paraId: 2004,
 	providers: [
 		{
-			name: "Allnodes",
-			endpoint: "wss://moonbeam-rpc.publicnode.com"
+			name: "IBP1",
+			endpoint: "wss://moonbeam.ibp.network"
 		},
 		{
-			name: "Blast",
-			endpoint: "wss://moonbeam.public.blastapi.io"
+			name: "RadiumBlock",
+			endpoint: "wss://moonbeam.public.curie.radiumblock.co/ws"
 		},
 		{
-			name: "Dwellir",
-			endpoint: "wss://moonbeam-rpc.n.dwellir.com"
+			name: "Allnodes",
+			endpoint: "wss://moonbeam-rpc.publicnode.com"
 		},
 		{
-			name: "IBP1",
-			endpoint: "wss://moonbeam.ibp.network"
+			name: "Blast",
+			endpoint: "wss://moonbeam.public.blastapi.io"
 		},
 		{
 			name: "IBP2",
@@ -1357,10 +1338,6 @@ var Moonbeam$1 = {
 			name: "OnFinality",
 			endpoint: "wss://moonbeam.api.onfinality.io/public-ws"
 		},
-		{
-			name: "RadiumBlock",
-			endpoint: "wss://moonbeam.public.curie.radiumblock.co/ws"
-		},
 		{
 			name: "UnitedBloc",
 			endpoint: "wss://moonbeam.unitedbloc.com"
@@ -2305,57 +2282,24 @@ var getNodeProviders = function getNodeProviders(node) {
   });
 };
 
-/**
- * Retrieves the parachain ID for a specified node.
- *
- * @param node - The node for which to get the paraId.
- * @returns The parachain ID of the node.
- */
-var getParaId = function getParaId(node) {
-  if (node === 'Ethereum') {
-    return ETH_PARA_ID;
-  }
-  return getNodeConfig(node).paraId;
-};
-
-var shuffleArray = function shuffleArray(array) {
-  var copy = _toConsumableArray(array);
-  for (var i = copy.length - 1; i > 0; i--) {
-    var j = Math.floor(Math.random() * (i + 1));
-    var _ref = [copy[j], copy[i]];
-    copy[i] = _ref[0];
-    copy[j] = _ref[1];
+var DEFAULT_FEE_ASSET = 0;
+var ETH_PARA_ID = 1;
+var ETH_CHAIN_ID = BigInt(ETH_PARA_ID);
+var ETHEREUM_JUNCTION = {
+  GlobalConsensus: {
+    Ethereum: {
+      chainId: ETH_CHAIN_ID
+    }
   }
-  return copy;
 };
-
-var shuffleWsProviders = function shuffleWsProviders(node, wsProviders) {
-  var ALLOWED_NODES = ['Hydration', 'Acala'];
-  if (ALLOWED_NODES.includes(node)) {
-    return shuffleArray(wsProviders);
-  }
-  return wsProviders;
+var DOT_MULTILOCATION = {
+  parents: Parents.ONE,
+  interior: 'Here'
 };
-
-var createApiInstanceForNode = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, node) {
-    var wsUrl, resolvedWsUrl;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          wsUrl = getNodeProviders(node);
-          resolvedWsUrl = Array.isArray(wsUrl) ? shuffleWsProviders(node, wsUrl) : wsUrl;
-          return _context.abrupt("return", api.createApiInstance(resolvedWsUrl));
-        case 3:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function createApiInstanceForNode(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+var SYSTEM_NODES_POLKADOT = ['PeoplePolkadot', 'CoretimePolkadot', 'Collectives'];
+var SYSTEM_NODES_KUSAMA = ['PeopleKusama', 'CoretimeKusama'];
+var ASSET_HUB_EXECUTION_FEE = 2200000000n; // 0.22 DOT
+ // 30% padding
 
 var createX1Payload = function createX1Payload(version, junction) {
   return version === Version.V4 ? {
@@ -2518,297 +2462,389 @@ var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, node)
   throw new InvalidCurrencyError("".concat(isDestination ? 'Destination' : 'Origin', " node ").concat(node, " does not support currency ").concat(JSON.stringify(currency), "."));
 };
 
-var createBeneficiaryMultiLocation = function createBeneficiaryMultiLocation(_ref) {
-  var api = _ref.api,
-    scenario = _ref.scenario,
-    pallet = _ref.pallet,
-    recipientAddress = _ref.recipientAddress,
-    version = _ref.version,
-    paraId = _ref.paraId;
-  if (isTMultiLocation(recipientAddress)) {
-    return recipientAddress;
-  }
-  var isEthAddress = ethers.isAddress(recipientAddress);
-  var getAccountPayload = function getAccountPayload(allowNetwork) {
-    if (isEthAddress) {
-      return {
-        AccountKey20: _objectSpread2({
-          key: recipientAddress
-        }, allowNetwork ? {
-          network: 'any'
-        } : {})
-      };
+var buildMultiLocation = function buildMultiLocation(_ref) {
+  var paraIdTo = _ref.paraIdTo,
+    asset = _ref.asset,
+    origin = _ref.origin,
+    destination = _ref.destination;
+  if (!isForeignAsset(asset)) {
+    if (_typeof(destination) === 'object') {
+      return destination;
     }
-    return {
-      AccountId32: _objectSpread2({
-        id: api.accountToHex(recipientAddress)
-      }, allowNetwork ? {
-        network: 'any'
-      } : {})
-    };
-  };
-  if (scenario === 'ParaToRelay') {
-    return {
-      parents: pallet === 'XTokens' ? Parents.ONE : Parents.ZERO,
-      interior: createX1Payload(version, {
-        AccountId32: _objectSpread2({
-          id: api.accountToHex(recipientAddress)
-        }, version === Version.V1 ? {
-          network: 'any'
-        } : {})
-      })
-    };
-  } else if (scenario === 'ParaToPara' && pallet === 'XTokens') {
+    // ParaToRelay scenario
+    if (isRelayChain(destination)) {
+      return DOT_MULTILOCATION;
+    }
+    // If it is a native asset, search by symbol on AssetHub and use the multiLocation from there
+    var assetHubAsset = getOtherAssets(destination).find(function (ahAsset) {
+      var _ahAsset$symbol, _asset$symbol;
+      return ((_ahAsset$symbol = ahAsset.symbol) === null || _ahAsset$symbol === void 0 ? void 0 : _ahAsset$symbol.toLowerCase()) === ((_asset$symbol = asset.symbol) === null || _asset$symbol === void 0 ? void 0 : _asset$symbol.toLowerCase());
+    });
+    if (assetHubAsset === undefined) {
+      throw new InvalidCurrencyError("Asset ".concat(asset.symbol, " not found in AssetHub"));
+    }
+    if (assetHubAsset.multiLocation) {
+      return assetHubAsset.multiLocation;
+    }
+    throw new InvalidCurrencyError("Asset ".concat(asset.symbol, " has no multiLocation"));
+  }
+  var createDefaultMultiLocation = function createDefaultMultiLocation(assetId) {
     return {
       parents: Parents.ONE,
       interior: {
-        X2: [{
-          Parachain: paraId
-        }, getAccountPayload(version === Version.V1 || version === Version.V2)]
+        X3: [{
+          Parachain: paraIdTo
+        }, {
+          PalletInstance: '50'
+        }, {
+          GeneralIndex: BigInt(assetId)
+        }]
       }
     };
-  } else if (scenario === 'ParaToPara' && pallet === 'PolkadotXcm') {
-    return {
-      parents: Parents.ZERO,
-      interior: createX1Payload(version, getAccountPayload(version === Version.V1 || version === Version.V2))
-    };
+  };
+  var isBifrostOrigin = origin === 'BifrostPolkadot' || origin === 'BifrostKusama';
+  if (isBifrostOrigin) {
+    return createDefaultMultiLocation(asset.assetId);
+  }
+  if (asset.multiLocation) {
+    return asset.multiLocation;
   } else {
-    return {
-      parents: Parents.ZERO,
-      interior: createX1Payload(version, getAccountPayload(false))
-    };
+    return createDefaultMultiLocation(asset.assetId);
   }
 };
-
-/**
- * This function transforms a multiLocation by removing the `Parachain` junction
- * if it exists and setting the `parents` to `0`.
- *
- * @param multiLocation - The multiLocation to transform
- * @returns The transformed multiLocation
- */
-var transformMultiLocation = function transformMultiLocation(multiLocation) {
-  var newInterior;
-  if (multiLocation.interior === 'Here') {
-    newInterior = 'Here';
-  } else {
-    var junctions = Object.values(multiLocation.interior).flat().filter(function (junction) {
-      return _typeof(junction) === 'object' && junction !== null;
-    });
-    var filteredJunctions = junctions.filter(function (junction) {
-      return !('Parachain' in junction);
-    });
-    if (filteredJunctions.length === 0) {
-      newInterior = 'Here';
-    } else {
-      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
-    }
+var getModifiedCurrencySelection = function getModifiedCurrencySelection(version, input) {
+  var amount = input.asset.amount,
+    overriddenAsset = input.overriddenAsset;
+  if (overriddenAsset) {
+    return addXcmVersionHeader(maybeOverrideMultiAssets(version, amount, [], overriddenAsset), version);
   }
-  return _objectSpread2(_objectSpread2({}, multiLocation), {}, {
-    parents: Parents.ZERO,
-    interior: newInterior
-  });
+  var multiLocation = buildMultiLocation(input);
+  var multiAsset = createMultiAsset(version, amount, multiLocation);
+  return addXcmVersionHeader(multiAsset, version);
 };
 
-var createVersionedBeneficiary = function createVersionedBeneficiary(options) {
-  var version = options.version;
-  var multiLocation = createBeneficiaryMultiLocation(options);
-  return addXcmVersionHeader(multiLocation, version);
+var getCurrencySelection = function getCurrencySelection(input, useMultiAssets, currencySelection) {
+  var origin = input.origin;
+  var _getNode = getNode(origin),
+    version = _getNode.version;
+  if (useMultiAssets) {
+    return getModifiedCurrencySelection(version, input);
+  }
+  return currencySelection;
 };
 
-var getMultiLocationTokenId = function getMultiLocationTokenId(location, node) {
-  if (location.interior.type === 'Here') {
-    // native token
-    return getNativeAssetSymbol(node);
-  }
-  var foreignAssets = getOtherAssets(node);
-  if (location.interior.type === 'X2') {
-    if (location.interior.value[0].type === 'PalletInstance' && location.interior.value[0].value === 50 && location.interior.value[1].type === 'GeneralIndex') {
-      var _foreignAssets$find$a, _foreignAssets$find;
-      var assetId = location.interior.value[1].value;
-      return (_foreignAssets$find$a = (_foreignAssets$find = foreignAssets.find(function (asset) {
-        return asset.assetId === String(assetId);
-      })) === null || _foreignAssets$find === void 0 ? void 0 : _foreignAssets$find.assetId) !== null && _foreignAssets$find$a !== void 0 ? _foreignAssets$find$a : null;
-    }
+var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, currencySelection, addressSelection, amount, fees, overriddenAsset) {
+  if (isMultiAssetTransfer) {
+    var isOverridenMultiAssets = overriddenAsset && !isTMultiLocation(overriddenAsset);
+    var feeAssetIndex = isOverridenMultiAssets ? overriddenAsset.findIndex(function (asset) {
+      return asset.isFeeAsset;
+    }) : undefined;
+    return _objectSpread2(_objectSpread2(_defineProperty({}, isOverridenMultiAssets ? 'assets' : 'asset', currencySelection), isOverridenMultiAssets && {
+      fee_item: feeAssetIndex
+    }), {}, {
+      dest: addressSelection,
+      dest_weight_limit: fees
+    });
   }
-  return null;
+  return {
+    currency_id: currencySelection,
+    amount: BigInt(amount),
+    dest: addressSelection,
+    dest_weight_limit: fees
+  };
 };
 
-var computeFeeFromDryRun = function computeFeeFromDryRun(dryRun, node, executionFee) {
-  // Extract delivery fees from emitted events
-  var deliveryFees = [];
-  var _iterator = _createForOfIteratorHelper(dryRun.value.emitted_events),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var e = _step.value;
-      var isXcmEvent = e.type === 'XcmPallet' || e.type === 'PolkadotXcm' || e.type === 'CumulusXcm';
-      var isFeesPaid = e.value.type === 'FeesPaid';
-      if (isXcmEvent && isFeesPaid && e.value.value.fees) {
-        var _iterator2 = _createForOfIteratorHelper(e.value.value.fees),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var feeItem = _step2.value;
-            if (feeItem.fun.type === 'NonFungible') continue;
-            var plancks = feeItem.fun.value;
-            var tokenSymbol = getMultiLocationTokenId(feeItem.id, node);
-            if (!tokenSymbol || !plancks) continue;
-            deliveryFees.push({
-              plancks: plancks,
-              tokenSymbol: tokenSymbol
-            });
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
+var XTokensTransferImpl = /*#__PURE__*/function () {
+  function XTokensTransferImpl() {
+    _classCallCheck(this, XTokensTransferImpl);
+  }
+  return _createClass(XTokensTransferImpl, null, [{
+    key: "transferXTokens",
+    value: function transferXTokens(input, currencySelection) {
+      var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'Unlimited';
+      var api = input.api,
+        origin = input.origin,
+        asset = input.asset,
+        addressSelection = input.addressSelection,
+        destination = input.destination,
+        scenario = input.scenario,
+        overriddenAsset = input.overriddenAsset,
+        pallet = input.pallet,
+        method = input.method,
+        _input$useMultiAssetT = input.useMultiAssetTransfer,
+        useMultiAssetTransfer = _input$useMultiAssetT === void 0 ? false : _input$useMultiAssetT;
+      var isMultiLocationDestination = _typeof(destination) === 'object';
+      if (isMultiLocationDestination) {
+        throw new Error('Multilocation destinations are not supported for specific transfer you are trying to create. In special cases such as xTokens or xTransfer pallet try using address multilocation instead (for both destination and address in same multilocation set (eg. X2 - Parachain, Address). For further assistance please open issue in our repository.');
       }
+      var isBifrostOrigin = origin === 'BifrostPolkadot' || origin === 'BifrostKusama';
+      var isAssetHubDest = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
+      var isAstarOrShidenToRelay = scenario === 'ParaToRelay' && (origin === 'Astar' || origin === 'Shiden');
+      var isOverridenMultiAssets = overriddenAsset && !isTMultiLocation(overriddenAsset);
+      var shouldUseMultiasset = useMultiAssetTransfer || isAstarOrShidenToRelay || isAssetHubDest && !isBifrostOrigin || !!isOverridenMultiAssets;
+      var modifiedCurrencySelection = getCurrencySelection(input, shouldUseMultiasset, currencySelection);
+      var section = shouldUseMultiasset ? isOverridenMultiAssets ? 'transfer_multiassets' : 'transfer_multiasset' : 'transfer';
+      var parameters = getXTokensParameters(shouldUseMultiasset, modifiedCurrencySelection, addressSelection, asset.amount, fees, overriddenAsset);
+      var call = {
+        module: pallet !== null && pallet !== void 0 ? pallet : 'XTokens',
+        section: method !== null && method !== void 0 ? method : section,
+        parameters: parameters
+      };
+      return api.callTxMethod(call);
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  var nativeAssetSymbol = getNativeAssetSymbol(node);
-  // Sum the fees that match the feeToken
-  var totalDeliveryFees = deliveryFees.filter(function (df) {
-    return df.tokenSymbol === nativeAssetSymbol;
-  }).reduce(function (acc, df) {
-    return acc + df.plancks;
-  }, 0n);
-  return totalDeliveryFees + executionFee;
-};
+  }]);
+}();
 
-var getMultiLocationTokenIdPjs = function getMultiLocationTokenIdPjs(location, node) {
-  if (location.interior === 'Here') {
-    // native token
-    return getNativeAssetSymbol(node);
+var getBridgeStatus = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(api) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return api.init('BridgeHubPolkadot');
+        case 2:
+          _context.prev = 2;
+          _context.next = 5;
+          return api.getBridgeStatus();
+        case 5:
+          return _context.abrupt("return", _context.sent);
+        case 6:
+          _context.prev = 6;
+          _context.next = 9;
+          return api.disconnect();
+        case 9:
+          return _context.finish(6);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[2,, 6, 10]]);
+  }));
+  return function getBridgeStatus(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var createBeneficiaryMultiLocation = function createBeneficiaryMultiLocation(_ref) {
+  var api = _ref.api,
+    scenario = _ref.scenario,
+    pallet = _ref.pallet,
+    recipientAddress = _ref.recipientAddress,
+    version = _ref.version,
+    paraId = _ref.paraId;
+  if (isTMultiLocation(recipientAddress)) {
+    return recipientAddress;
   }
-  var foreignAssets = getOtherAssets(node);
-  if (Object.keys(location.interior)[0] === 'X2') {
-    var junctions = Object.values(location.interior)[0];
-    if (Object.keys(junctions[0])[0] === 'PalletInstance' && junctions[0].PalletInstance === '50' && Object.keys(junctions[1])[0] === 'GeneralIndex') {
-      var _foreignAssets$find$s, _foreignAssets$find;
-      var assetId = junctions[1].GeneralIndex;
-      return (_foreignAssets$find$s = (_foreignAssets$find = foreignAssets.find(function (asset) {
-        return asset.assetId === String(assetId);
-      })) === null || _foreignAssets$find === void 0 ? void 0 : _foreignAssets$find.symbol) !== null && _foreignAssets$find$s !== void 0 ? _foreignAssets$find$s : null;
+  var isEthAddress = ethers.isAddress(recipientAddress);
+  var getAccountPayload = function getAccountPayload(allowNetwork) {
+    if (isEthAddress) {
+      return {
+        AccountKey20: _objectSpread2({
+          key: recipientAddress
+        }, allowNetwork ? {
+          network: 'any'
+        } : {})
+      };
     }
-  }
-  return null;
-};
-
-var computeFeeFromDryRunPjs = function computeFeeFromDryRunPjs(dryRun, node, executionFee) {
-  // Extract delivery fees from emitted events
-  var deliveryFees = [];
-  var _iterator = _createForOfIteratorHelper(dryRun.Ok.emittedEvents),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var e = _step.value;
-      var isXcmEvent = e.section === 'xcmPallet' || e.section === 'polkadotXcm' || e.section === 'cumulusXcm';
-      var isFeesPaid = e.method === 'FeesPaid';
-      if (isXcmEvent && isFeesPaid && e.data.fees) {
-        var _iterator2 = _createForOfIteratorHelper(e.data.fees),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var feeItem = _step2.value;
-            if (feeItem.fun.NonFungible) continue;
-            var plancks = BigInt(feeItem.fun.Fungible.replace(/,/g, ''));
-            var tokenSymbol = getMultiLocationTokenIdPjs(feeItem.id, node);
-            if (!tokenSymbol || !plancks) continue;
-            deliveryFees.push({
-              plancks: plancks,
-              tokenSymbol: tokenSymbol
-            });
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
+    return {
+      AccountId32: _objectSpread2({
+        id: api.accountToHex(recipientAddress)
+      }, allowNetwork ? {
+        network: 'any'
+      } : {})
+    };
+  };
+  if (scenario === 'ParaToRelay') {
+    return {
+      parents: pallet === 'XTokens' ? Parents.ONE : Parents.ZERO,
+      interior: createX1Payload(version, {
+        AccountId32: _objectSpread2({
+          id: api.accountToHex(recipientAddress)
+        }, version === Version.V1 ? {
+          network: 'any'
+        } : {})
+      })
+    };
+  } else if (scenario === 'ParaToPara' && pallet === 'XTokens') {
+    return {
+      parents: Parents.ONE,
+      interior: {
+        X2: [{
+          Parachain: paraId
+        }, getAccountPayload(version === Version.V1 || version === Version.V2)]
       }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+    };
+  } else if (scenario === 'ParaToPara' && pallet === 'PolkadotXcm') {
+    return {
+      parents: Parents.ZERO,
+      interior: createX1Payload(version, getAccountPayload(version === Version.V1 || version === Version.V2))
+    };
+  } else {
+    return {
+      parents: Parents.ZERO,
+      interior: createX1Payload(version, getAccountPayload(false))
+    };
   }
-  var nativeAssetSymbol = getNativeAssetSymbol(node);
-  // Sum the fees that match the feeToken
-  var totalDeliveryFees = deliveryFees.filter(function (df) {
-    return df.tokenSymbol === nativeAssetSymbol;
-  }).reduce(function (acc, df) {
-    return acc + df.plancks;
-  }, 0n);
-  return totalDeliveryFees + executionFee;
 };
 
-var resolveModuleError = function resolveModuleError(node, error) {
-  var palletDetails = getSupportedPalletsDetails(node).find(function (p) {
-    return p.index === Number(error.index);
+/**
+ * This function transforms a multiLocation by removing the `Parachain` junction
+ * if it exists and setting the `parents` to `0`.
+ *
+ * @param multiLocation - The multiLocation to transform
+ * @returns The transformed multiLocation
+ */
+var transformMultiLocation = function transformMultiLocation(multiLocation) {
+  var newInterior;
+  if (multiLocation.interior === 'Here') {
+    newInterior = 'Here';
+  } else {
+    var junctions = Object.values(multiLocation.interior).flat().filter(function (junction) {
+      return _typeof(junction) === 'object' && junction !== null;
+    });
+    var filteredJunctions = junctions.filter(function (junction) {
+      return !('Parachain' in junction);
+    });
+    if (filteredJunctions.length === 0) {
+      newInterior = 'Here';
+    } else {
+      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
+    }
+  }
+  return _objectSpread2(_objectSpread2({}, multiLocation), {}, {
+    parents: Parents.ZERO,
+    interior: newInterior
   });
-  if (!palletDetails) {
-    throw new Error("Pallet with index ".concat(error.index, " not found"));
+};
+
+var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, origin, version, messageId) {
+  var api = _ref.api,
+    address = _ref.address,
+    asset = _ref.asset,
+    scenario = _ref.scenario,
+    senderAddress = _ref.senderAddress,
+    ahAddress = _ref.ahAddress;
+  if (!isForeignAsset(asset)) {
+    throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
   }
-  // Use only the first byte of the error to get the error index
-  var errorIndex = Number(error.error.slice(0, 4));
-  var name = palletDetails.name;
-  if (name !== 'XTokens' && name !== 'PolkadotXcm' && name !== 'XcmPallet') {
-    throw new Error("Pallet ".concat(name, " is not supported"));
+  if (!asset.multiLocation) {
+    throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
   }
-  var failureReason = name === 'XTokens' ? Object.values(XTokensError)[errorIndex] : Object.values(PolkadotXcmError)[errorIndex];
-  if (!failureReason) {
-    throw new Error("Error index ".concat(errorIndex, " not found in ").concat(name, " pallet"));
+  if (!senderAddress) {
+    throw new InvalidParameterError("Please provide senderAddress");
   }
-  return failureReason;
-};
-
-var generateAddressMultiLocationV4 = function generateAddressMultiLocationV4(api, address) {
-  var isMultiLocation = _typeof(address) === 'object';
-  if (isMultiLocation) {
-    return _defineProperty({}, Version.V4, address);
+  if (isNodeEvm(origin) && !ahAddress) {
+    throw new InvalidParameterError("Please provide ahAddress");
   }
-  var isEthAddress = ethers.isAddress(address);
-  return addXcmVersionHeader({
-    parents: Parents.ZERO,
-    interior: {
-      X1: [isEthAddress ? {
-        AccountKey20: {
-          key: address
+  var ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), asset.multiLocation);
+  if (!ethAsset) {
+    throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(asset)));
+  }
+  var interiorSb = ethAsset.symbol === 'ETH' ? {
+    Here: null
+  } : {
+    X1: [{
+      AccountKey20: {
+        network: null,
+        key: ethAsset.assetId
+      }
+    }]
+  };
+  return _defineProperty({}, version, [{
+    SetAppendix: [{
+      DepositAsset: {
+        assets: {
+          Wild: 'All'
+        },
+        beneficiary: createBeneficiaryMultiLocation({
+          api: api,
+          scenario: scenario,
+          pallet: 'PolkadotXcm',
+          recipientAddress: isNodeEvm(origin) ? ahAddress : senderAddress,
+          version: version
+        })
+      }
+    }]
+  }, {
+    InitiateReserveWithdraw: {
+      assets: {
+        Wild: {
+          AllOf: {
+            id: asset.multiLocation,
+            fun: 'Fungible'
+          }
         }
-      } : {
-        AccountId32: {
-          id: api.accountToHex(address),
-          network: null
+      },
+      reserve: {
+        parents: Parents.TWO,
+        interior: {
+          X1: [ETHEREUM_JUNCTION]
+        }
+      },
+      xcm: [{
+        BuyExecution: {
+          fees: {
+            id: {
+              parents: Parents.ZERO,
+              interior: interiorSb
+            },
+            fun: {
+              Fungible: 1n
+            }
+          },
+          weight_limit: 'Unlimited'
+        }
+      }, {
+        DepositAsset: {
+          assets: {
+            Wild: {
+              AllCounted: 1
+            }
+          },
+          beneficiary: {
+            parents: Parents.ZERO,
+            interior: {
+              X1: [{
+                AccountKey20: {
+                  network: null,
+                  key: address
+                }
+              }]
+            }
+          }
         }
+      }, {
+        SetTopic: messageId
       }]
     }
-  }, Version.V4);
-};
-
-var getFees = function getFees(scenario) {
-  if (scenario === 'ParaToRelay') {
-    return 4600000000;
-  } else if (scenario === 'ParaToPara') {
-    return 399600000000;
-  }
-  throw new Error("Fees for scenario ".concat(scenario, " are not defined."));
+  }, {
+    SetTopic: messageId
+  }]);
 };
 
-/**
- * Retrieves the node instance for a given node.
- *
- * @param node - The node identifier.
- * @returns The node instance
- */
-var getNode = function getNode(node) {
-  var nodeMap = nodes();
-  return nodeMap[node];
-};
+var generateMessageId = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, senderAddress, sourceParaId, tokenAddress, recipientAddress, amount) {
+    var accountNextId, sourceAccountHex, entropy;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return api.getFromRpc('system', 'accountNextIndex', senderAddress);
+        case 2:
+          accountNextId = _context.sent;
+          sourceAccountHex = api.accountToHex(senderAddress);
+          entropy = new Uint8Array([].concat(_toConsumableArray(api.stringToUint8a(sourceParaId.toString())), _toConsumableArray(api.hexToUint8a(sourceAccountHex)), _toConsumableArray(api.stringToUint8a(accountNextId)), _toConsumableArray(api.hexToUint8a(tokenAddress)), _toConsumableArray(api.stringToUint8a(recipientAddress)), _toConsumableArray(api.stringToUint8a(amount.toString()))));
+          return _context.abrupt("return", api.blake2AsHex(entropy));
+        case 6:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function generateMessageId(_x, _x2, _x3, _x4, _x5, _x6) {
+    return _ref.apply(this, arguments);
+  };
+}();
 
 var resolveParaId = function resolveParaId(paraId, destination) {
   if (isTMultiLocation(destination) || isRelayChain(destination) || destination === 'Ethereum') {
@@ -2817,379 +2853,65 @@ var resolveParaId = function resolveParaId(paraId, destination) {
   return paraId !== null && paraId !== void 0 ? paraId : getParaId(destination);
 };
 
-var validateAddress = function validateAddress(address, node) {
-  var isDestination = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var isEvm = isNodeEvm(node);
-  var isEthereumAddress = ethers.isAddress(address);
-  if (isEvm) {
-    if (!isEthereumAddress) {
-      throw new InvalidAddressError("".concat(isDestination ? 'Destination node' : 'Node', " is an EVM chain, but the address provided is not a valid Ethereum address."));
-    }
-  } else {
-    if (isEthereumAddress) {
-      throw new InvalidAddressError("EVM address provided but ".concat(isDestination ? 'destination ' : '', "node is not an EVM chain."));
-    }
-  }
+var supportsXTokens = function supportsXTokens(obj) {
+  return _typeof(obj) === 'object' && obj !== null && 'transferXTokens' in obj;
 };
-
-// Contains important call creation utils (Selection of fees,formating of header and more.. )
-/**
- * Determines the relay chain for a given node.
- *
- * @param node - The node for which to determine the relay chain.
- * @returns 'Kusama' if the node's relay chain symbol is 'KSM'; otherwise, 'Polkadot'.
- */
-var determineRelayChain = function determineRelayChain(node) {
-  return getRelayChainSymbol(node) === 'KSM' ? 'Kusama' : 'Polkadot';
+var supportsXTransfer = function supportsXTransfer(obj) {
+  return _typeof(obj) === 'object' && obj !== null && 'transferXTransfer' in obj;
 };
-
-var buildMultiLocation = function buildMultiLocation(_ref) {
-  var paraIdTo = _ref.paraIdTo,
-    asset = _ref.asset,
-    origin = _ref.origin,
-    destination = _ref.destination;
-  if (!isForeignAsset(asset)) {
-    if (_typeof(destination) === 'object') {
-      return destination;
+var supportsPolkadotXCM = function supportsPolkadotXCM(obj) {
+  return _typeof(obj) === 'object' && obj !== null && 'transferPolkadotXCM' in obj;
+};
+var ParachainNode = /*#__PURE__*/function () {
+  function ParachainNode(node, info, type, version) {
+    _classCallCheck(this, ParachainNode);
+    this._assetCheckEnabled = true;
+    this._info = info;
+    this._type = type;
+    this._node = node;
+    this._version = version;
+  }
+  return _createClass(ParachainNode, [{
+    key: "info",
+    get: function get() {
+      return this._info;
     }
-    // ParaToRelay scenario
-    if (isRelayChain(destination)) {
-      return DOT_MULTILOCATION;
+  }, {
+    key: "type",
+    get: function get() {
+      return this._type;
     }
-    // If it is a native asset, search by symbol on AssetHub and use the multiLocation from there
-    var assetHubAsset = getOtherAssets(destination).find(function (ahAsset) {
-      var _ahAsset$symbol, _asset$symbol;
-      return ((_ahAsset$symbol = ahAsset.symbol) === null || _ahAsset$symbol === void 0 ? void 0 : _ahAsset$symbol.toLowerCase()) === ((_asset$symbol = asset.symbol) === null || _asset$symbol === void 0 ? void 0 : _asset$symbol.toLowerCase());
-    });
-    if (assetHubAsset === undefined) {
-      throw new InvalidCurrencyError("Asset ".concat(asset.symbol, " not found in AssetHub"));
+  }, {
+    key: "node",
+    get: function get() {
+      return this._node;
     }
-    if (assetHubAsset.multiLocation) {
-      return assetHubAsset.multiLocation;
+  }, {
+    key: "version",
+    get: function get() {
+      return this._version;
     }
-    throw new InvalidCurrencyError("Asset ".concat(asset.symbol, " has no multiLocation"));
-  }
-  var createDefaultMultiLocation = function createDefaultMultiLocation(assetId) {
-    return {
-      parents: Parents.ONE,
-      interior: {
-        X3: [{
-          Parachain: paraIdTo
-        }, {
-          PalletInstance: '50'
-        }, {
-          GeneralIndex: BigInt(assetId)
-        }]
-      }
-    };
-  };
-  var isBifrostOrigin = origin === 'BifrostPolkadot' || origin === 'BifrostKusama';
-  if (isBifrostOrigin) {
-    return createDefaultMultiLocation(asset.assetId);
-  }
-  if (asset.multiLocation) {
-    return asset.multiLocation;
-  } else {
-    return createDefaultMultiLocation(asset.assetId);
-  }
-};
-var getModifiedCurrencySelection = function getModifiedCurrencySelection(version, input) {
-  var amount = input.asset.amount,
-    overriddenAsset = input.overriddenAsset;
-  if (overriddenAsset) {
-    return addXcmVersionHeader(maybeOverrideMultiAssets(version, amount, [], overriddenAsset), version);
-  }
-  var multiLocation = buildMultiLocation(input);
-  var multiAsset = createMultiAsset(version, amount, multiLocation);
-  return addXcmVersionHeader(multiAsset, version);
-};
-
-var getCurrencySelection = function getCurrencySelection(input, useMultiAssets, currencySelection) {
-  var origin = input.origin;
-  var _getNode = getNode(origin),
-    version = _getNode.version;
-  if (useMultiAssets) {
-    return getModifiedCurrencySelection(version, input);
-  }
-  return currencySelection;
-};
-
-var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, currencySelection, addressSelection, amount, fees, overriddenAsset) {
-  if (isMultiAssetTransfer) {
-    var isOverridenMultiAssets = overriddenAsset && !isTMultiLocation(overriddenAsset);
-    var feeAssetIndex = isOverridenMultiAssets ? overriddenAsset.findIndex(function (asset) {
-      return asset.isFeeAsset;
-    }) : undefined;
-    return _objectSpread2(_objectSpread2(_defineProperty({}, isOverridenMultiAssets ? 'assets' : 'asset', currencySelection), isOverridenMultiAssets && {
-      fee_item: feeAssetIndex
-    }), {}, {
-      dest: addressSelection,
-      dest_weight_limit: fees
-    });
-  }
-  return {
-    currency_id: currencySelection,
-    amount: BigInt(amount),
-    dest: addressSelection,
-    dest_weight_limit: fees
-  };
-};
-
-var XTokensTransferImpl = /*#__PURE__*/function () {
-  function XTokensTransferImpl() {
-    _classCallCheck(this, XTokensTransferImpl);
-  }
-  return _createClass(XTokensTransferImpl, null, [{
-    key: "transferXTokens",
-    value: function transferXTokens(input, currencySelection) {
-      var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'Unlimited';
-      var api = input.api,
-        origin = input.origin,
-        asset = input.asset,
-        addressSelection = input.addressSelection,
-        destination = input.destination,
-        scenario = input.scenario,
-        overriddenAsset = input.overriddenAsset,
-        pallet = input.pallet,
-        method = input.method,
-        _input$useMultiAssetT = input.useMultiAssetTransfer,
-        useMultiAssetTransfer = _input$useMultiAssetT === void 0 ? false : _input$useMultiAssetT;
-      var isMultiLocationDestination = _typeof(destination) === 'object';
-      if (isMultiLocationDestination) {
-        throw new Error('Multilocation destinations are not supported for specific transfer you are trying to create. In special cases such as xTokens or xTransfer pallet try using address multilocation instead (for both destination and address in same multilocation set (eg. X2 - Parachain, Address). For further assistance please open issue in our repository.');
-      }
-      var isBifrostOrigin = origin === 'BifrostPolkadot' || origin === 'BifrostKusama';
-      var isAssetHubDest = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
-      var isAstarOrShidenToRelay = scenario === 'ParaToRelay' && (origin === 'Astar' || origin === 'Shiden');
-      var isOverridenMultiAssets = overriddenAsset && !isTMultiLocation(overriddenAsset);
-      var shouldUseMultiasset = useMultiAssetTransfer || isAstarOrShidenToRelay || isAssetHubDest && !isBifrostOrigin || !!isOverridenMultiAssets;
-      var modifiedCurrencySelection = getCurrencySelection(input, shouldUseMultiasset, currencySelection);
-      var section = shouldUseMultiasset ? isOverridenMultiAssets ? 'transfer_multiassets' : 'transfer_multiasset' : 'transfer';
-      var parameters = getXTokensParameters(shouldUseMultiasset, modifiedCurrencySelection, addressSelection, asset.amount, fees, overriddenAsset);
-      var call = {
-        module: pallet !== null && pallet !== void 0 ? pallet : 'XTokens',
-        section: method !== null && method !== void 0 ? method : section,
-        parameters: parameters
-      };
-      return api.callTxMethod(call);
+  }, {
+    key: "assetCheckEnabled",
+    get: function get() {
+      return this._assetCheckEnabled;
     }
-  }]);
-}();
-
-var getBridgeStatus = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(api) {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return api.init('BridgeHubPolkadot');
-        case 2:
-          _context.prev = 2;
-          _context.next = 5;
-          return api.getBridgeStatus();
-        case 5:
-          return _context.abrupt("return", _context.sent);
-        case 6:
-          _context.prev = 6;
-          _context.next = 9;
-          return api.disconnect();
-        case 9:
-          return _context.finish(6);
-        case 10:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[2,, 6, 10]]);
-  }));
-  return function getBridgeStatus(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version, messageId) {
-  var api = _ref.api,
-    address = _ref.address,
-    asset = _ref.asset,
-    scenario = _ref.scenario,
-    senderAddress = _ref.senderAddress;
-  if (!isForeignAsset(asset)) {
-    throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
-  }
-  if (!asset.multiLocation) {
-    throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
-  }
-  if (!senderAddress) {
-    throw new InvalidCurrencyError("Please provide senderAddress");
-  }
-  var ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), asset.multiLocation);
-  if (!ethAsset) {
-    throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(asset)));
-  }
-  var interiorSb = ethAsset.symbol === 'ETH' ? {
-    Here: null
-  } : {
-    X1: [{
-      AccountKey20: {
-        network: null,
-        key: ethAsset.assetId
-      }
-    }]
-  };
-  return _defineProperty({}, version, [{
-    SetAppendix: [{
-      DepositAsset: {
-        assets: {
-          Wild: 'All'
-        },
-        beneficiary: createBeneficiaryMultiLocation({
-          api: api,
-          scenario: scenario,
-          pallet: 'PolkadotXcm',
-          recipientAddress: senderAddress,
-          version: version
-        })
-      }
-    }]
   }, {
-    InitiateReserveWithdraw: {
-      assets: {
-        Wild: {
-          AllOf: {
-            id: asset.multiLocation,
-            fun: 'Fungible'
-          }
-        }
-      },
-      reserve: {
-        parents: Parents.TWO,
-        interior: {
-          X1: [ETHEREUM_JUNCTION]
-        }
-      },
-      xcm: [{
-        BuyExecution: {
-          fees: {
-            id: {
-              parents: Parents.ZERO,
-              interior: interiorSb
-            },
-            fun: {
-              Fungible: 1n
-            }
-          },
-          weight_limit: 'Unlimited'
-        }
-      }, {
-        DepositAsset: {
-          assets: {
-            Wild: {
-              AllCounted: 1
-            }
-          },
-          beneficiary: {
-            parents: Parents.ZERO,
-            interior: {
-              X1: [{
-                AccountKey20: {
-                  network: null,
-                  key: address
-                }
-              }]
-            }
-          }
-        }
-      }, {
-        SetTopic: messageId
-      }]
-    }
-  }, {
-    SetTopic: messageId
-  }]);
-};
-
-var generateMessageId = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, senderAddress, sourceParaId, tokenAddress, recipientAddress, amount) {
-    var accountNextId, sourceAccountHex, entropy;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return api.getFromRpc('system', 'accountNextIndex', senderAddress);
-        case 2:
-          accountNextId = _context.sent;
-          sourceAccountHex = api.accountToHex(senderAddress);
-          entropy = new Uint8Array([].concat(_toConsumableArray(api.stringToUint8a(sourceParaId.toString())), _toConsumableArray(api.hexToUint8a(sourceAccountHex)), _toConsumableArray(api.stringToUint8a(accountNextId)), _toConsumableArray(api.hexToUint8a(tokenAddress)), _toConsumableArray(api.stringToUint8a(recipientAddress)), _toConsumableArray(api.stringToUint8a(amount.toString()))));
-          return _context.abrupt("return", api.blake2AsHex(entropy));
-        case 6:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function generateMessageId(_x, _x2, _x3, _x4, _x5, _x6) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var supportsXTokens = function supportsXTokens(obj) {
-  return _typeof(obj) === 'object' && obj !== null && 'transferXTokens' in obj;
-};
-var supportsXTransfer = function supportsXTransfer(obj) {
-  return _typeof(obj) === 'object' && obj !== null && 'transferXTransfer' in obj;
-};
-var supportsPolkadotXCM = function supportsPolkadotXCM(obj) {
-  return _typeof(obj) === 'object' && obj !== null && 'transferPolkadotXCM' in obj;
-};
-var ParachainNode = /*#__PURE__*/function () {
-  function ParachainNode(node, info, type, version) {
-    _classCallCheck(this, ParachainNode);
-    this._assetCheckEnabled = true;
-    this._info = info;
-    this._type = type;
-    this._node = node;
-    this._version = version;
-  }
-  return _createClass(ParachainNode, [{
-    key: "info",
-    get: function get() {
-      return this._info;
-    }
-  }, {
-    key: "type",
-    get: function get() {
-      return this._type;
-    }
-  }, {
-    key: "node",
-    get: function get() {
-      return this._node;
-    }
-  }, {
-    key: "version",
-    get: function get() {
-      return this._version;
-    }
-  }, {
-    key: "assetCheckEnabled",
-    get: function get() {
-      return this._assetCheckEnabled;
-    }
-  }, {
-    key: "canUseXTokens",
-    value: function canUseXTokens(_ref) {
-      var asset = _ref.asset;
-      var isEthAsset = asset.multiLocation && findAssetByMultiLocation(getOtherAssets('Ethereum'), asset.multiLocation);
-      return !isEthAsset;
+    key: "canUseXTokens",
+    value: function canUseXTokens(_ref) {
+      var asset = _ref.asset;
+      var isEthAsset = asset.multiLocation && findAssetByMultiLocation(getOtherAssets('Ethereum'), asset.multiLocation);
+      return !isEthAsset;
     }
   }, {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-        var api, asset, feeAsset, address, destination, paraIdTo, overriddenAsset, version, senderAddress, pallet, method, isRelayDestination, scenario, paraId, versionOrDefault, isLocalTransfer, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input, _options, isEthAsset, isAHPOrigin, isAHPDest, isEthDest;
+        var api, asset, feeAsset, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, isRelayDestination, scenario, paraId, versionOrDefault, isLocalTransfer, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input, _options, isEthAsset, isAHPOrigin, isAHPDest, isEthDest;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              api = options.api, asset = options.asset, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, overriddenAsset = options.overriddenAsset, version = options.version, senderAddress = options.senderAddress, pallet = options.pallet, method = options.method;
+              api = options.api, asset = options.asset, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, overriddenAsset = options.overriddenAsset, version = options.version, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method;
               isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
               scenario = isRelayDestination ? 'ParaToRelay' : 'ParaToPara';
               paraId = resolveParaId(paraIdTo, destination);
@@ -3283,6 +3005,7 @@ var ParachainNode = /*#__PURE__*/function () {
                 paraIdTo: paraId,
                 version: version,
                 senderAddress: senderAddress,
+                ahAddress: ahAddress,
                 pallet: pallet,
                 method: method
               }; // Handle common cases
@@ -3455,17 +3178,17 @@ var ParachainNode = /*#__PURE__*/function () {
               return Builder(api.clone()).from('AssetHubPolkadot').to(destination).currency({
                 symbol: 'DOT',
                 amount: AH_EXECUTION_FEE_PADDED
-              }).address(address).dryRun(senderAddress);
+              }).address(address).senderAddress(senderAddress).dryRun();
             case 12:
               dryRunResult = _context2.sent;
-              if (dryRunResult.success) {
+              if (dryRunResult.origin.success) {
                 _context2.next = 15;
                 break;
               }
-              throw new DryRunFailedError(dryRunResult.failureReason);
+              throw new DryRunFailedError(dryRunResult.origin.failureReason);
             case 15:
               // Pad fee by 50%
-              dryRunFeePadded = BigInt(dryRunResult.fee) * BigInt(3) / BigInt(2);
+              dryRunFeePadded = BigInt(dryRunResult.origin.fee) * BigInt(3) / BigInt(2);
               destWithHeader = createVersionedDestination(scenario, version, destination, paraIdTo);
               _extractVersionFromHe = extractVersionFromHeader(destWithHeader), _extractVersionFromHe2 = _slicedToArray(_extractVersionFromHe, 2), _extractVersionFromHe2[0], dest = _extractVersionFromHe2[1];
               call = {
@@ -3649,7 +3372,7 @@ var ParachainNode = /*#__PURE__*/function () {
                         version: version
                       })
                     }
-                  }], version) : createCustomXcmOnDest(input, version, messageId),
+                  }], version) : createCustomXcmOnDest(input, this.node, version, messageId),
                   weight_limit: 'Unlimited'
                 }
               };
@@ -3956,6 +3679,12 @@ var AssetHubKusama = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
+var createVersionedBeneficiary = function createVersionedBeneficiary(options) {
+  var version = options.version;
+  var multiLocation = createBeneficiaryMultiLocation(options);
+  return addXcmVersionHeader(multiLocation, version);
+};
+
 var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
   var api = input.api,
     _input$version = input.version,
@@ -4055,6 +3784,44 @@ var createExecuteXcm = function createExecuteXcm(input, weight, executionFee) {
   return api.callTxMethod(call);
 };
 
+var generateAddressMultiLocationV4 = function generateAddressMultiLocationV4(api, address) {
+  var isMultiLocation = _typeof(address) === 'object';
+  if (isMultiLocation) {
+    return _defineProperty({}, Version.V4, address);
+  }
+  var isEthAddress = ethers.isAddress(address);
+  return addXcmVersionHeader({
+    parents: Parents.ZERO,
+    interior: {
+      X1: [isEthAddress ? {
+        AccountKey20: {
+          key: address
+        }
+      } : {
+        AccountId32: {
+          id: api.accountToHex(address),
+          network: null
+        }
+      }]
+    }
+  }, Version.V4);
+};
+
+var validateAddress = function validateAddress(address, node) {
+  var isDestination = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var isEvm = isNodeEvm(node);
+  var isEthereumAddress = ethers.isAddress(address);
+  if (isEvm) {
+    if (!isEthereumAddress) {
+      throw new InvalidAddressError("".concat(isDestination ? 'Destination node' : 'Node', " is an EVM chain, but the address provided is not a valid Ethereum address."));
+    }
+  } else {
+    if (isEthereumAddress) {
+      throw new InvalidAddressError("EVM address provided but ".concat(isDestination ? 'destination ' : '', "node is not an EVM chain."));
+    }
+  }
+};
+
 var createCustomXcmToBifrost = function createCustomXcmToBifrost(_ref, version) {
   var api = _ref.api,
     address = _ref.address,
@@ -5810,10 +5577,14 @@ var Moonbeam = /*#__PURE__*/function (_ParachainNode) {
   }, {
     key: "transferPolkadotXCM",
     value: function transferPolkadotXCM(input) {
-      var asset = input.asset,
+      var destination = input.destination,
+        asset = input.asset,
         scenario = input.scenario,
         _input$version = input.version,
         version = _input$version === void 0 ? this.version : _input$version;
+      if (destination === 'Ethereum') {
+        return this.transferToEthereum(input);
+      }
       var multiLocation = this.getMultiLocation(asset, scenario);
       return Promise.resolve(PolkadotXCMTransferImpl.transferPolkadotXCM(_objectSpread2(_objectSpread2({}, input), {}, {
         currencySelection: createVersionedMultiAssets(version, asset.amount, multiLocation)
@@ -6545,7 +6316,618 @@ var nodes = function nodes() {
     Peaq: new Peaq(),
     Polimec: new Polimec()
   };
-};
+};
+
+/**
+ * Retrieves the parachain ID for a specified node.
+ *
+ * @param node - The node for which to get the paraId.
+ * @returns The parachain ID of the node.
+ */
+var getParaId = function getParaId(node) {
+  if (node === 'Ethereum') {
+    return ETH_PARA_ID;
+  }
+  return getNodeConfig(node).paraId;
+};
+
+var shuffleArray = function shuffleArray(array) {
+  var copy = _toConsumableArray(array);
+  for (var i = copy.length - 1; i > 0; i--) {
+    var j = Math.floor(Math.random() * (i + 1));
+    var _ref = [copy[j], copy[i]];
+    copy[i] = _ref[0];
+    copy[j] = _ref[1];
+  }
+  return copy;
+};
+
+var shuffleWsProviders = function shuffleWsProviders(node, wsProviders) {
+  var ALLOWED_NODES = ['Hydration', 'Acala'];
+  if (ALLOWED_NODES.includes(node)) {
+    return shuffleArray(wsProviders);
+  }
+  return wsProviders;
+};
+
+var createApiInstanceForNode = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, node) {
+    var wsUrl, resolvedWsUrl;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          wsUrl = getNodeProviders(node);
+          resolvedWsUrl = Array.isArray(wsUrl) ? shuffleWsProviders(node, wsUrl) : wsUrl;
+          return _context.abrupt("return", api.createApiInstance(resolvedWsUrl));
+        case 3:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function createApiInstanceForNode(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var getMultiLocationTokenId = function getMultiLocationTokenId(location, node) {
+  if (location.interior.type === 'Here') {
+    // native token
+    return getNativeAssetSymbol(node);
+  }
+  var foreignAssets = getOtherAssets(node);
+  if (location.interior.type === 'X2') {
+    if (location.interior.value[0].type === 'PalletInstance' && location.interior.value[0].value === 50 && location.interior.value[1].type === 'GeneralIndex') {
+      var _foreignAssets$find$a, _foreignAssets$find;
+      var assetId = location.interior.value[1].value;
+      return (_foreignAssets$find$a = (_foreignAssets$find = foreignAssets.find(function (asset) {
+        return asset.assetId === String(assetId);
+      })) === null || _foreignAssets$find === void 0 ? void 0 : _foreignAssets$find.assetId) !== null && _foreignAssets$find$a !== void 0 ? _foreignAssets$find$a : null;
+    }
+  }
+  return null;
+};
+
+var computeFeeFromDryRun = function computeFeeFromDryRun(dryRun, node, executionFee) {
+  // Extract delivery fees from emitted events
+  var deliveryFees = [];
+  var _iterator = _createForOfIteratorHelper(dryRun.value.emitted_events),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var e = _step.value;
+      var isXcmEvent = e.type === 'XcmPallet' || e.type === 'PolkadotXcm' || e.type === 'CumulusXcm';
+      var isFeesPaid = e.value.type === 'FeesPaid';
+      if (isXcmEvent && isFeesPaid && e.value.value.fees) {
+        var _iterator2 = _createForOfIteratorHelper(e.value.value.fees),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var feeItem = _step2.value;
+            if (feeItem.fun.type === 'NonFungible') continue;
+            var plancks = feeItem.fun.value;
+            var tokenSymbol = getMultiLocationTokenId(feeItem.id, node);
+            if (!tokenSymbol || !plancks) continue;
+            deliveryFees.push({
+              plancks: plancks,
+              tokenSymbol: tokenSymbol
+            });
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var nativeAssetSymbol = getNativeAssetSymbol(node);
+  // Sum the fees that match the feeToken
+  var totalDeliveryFees = deliveryFees.filter(function (df) {
+    return df.tokenSymbol === nativeAssetSymbol;
+  }).reduce(function (acc, df) {
+    return acc + df.plancks;
+  }, 0n);
+  return totalDeliveryFees + executionFee;
+};
+
+var getMultiLocationTokenIdPjs = function getMultiLocationTokenIdPjs(location, node) {
+  if (location.interior === 'Here') {
+    // native token
+    return getNativeAssetSymbol(node);
+  }
+  var foreignAssets = getOtherAssets(node);
+  if (Object.keys(location.interior)[0] === 'X2') {
+    var junctions = Object.values(location.interior)[0];
+    if (Object.keys(junctions[0])[0] === 'PalletInstance' && junctions[0].PalletInstance === '50' && Object.keys(junctions[1])[0] === 'GeneralIndex') {
+      var _foreignAssets$find$s, _foreignAssets$find;
+      var assetId = junctions[1].GeneralIndex;
+      return (_foreignAssets$find$s = (_foreignAssets$find = foreignAssets.find(function (asset) {
+        return asset.assetId === String(assetId);
+      })) === null || _foreignAssets$find === void 0 ? void 0 : _foreignAssets$find.symbol) !== null && _foreignAssets$find$s !== void 0 ? _foreignAssets$find$s : null;
+    }
+  }
+  return null;
+};
+
+var computeFeeFromDryRunPjs = function computeFeeFromDryRunPjs(dryRun, node, executionFee) {
+  // Extract delivery fees from emitted events
+  var deliveryFees = [];
+  var _iterator = _createForOfIteratorHelper(dryRun.Ok.emittedEvents),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var e = _step.value;
+      var isXcmEvent = e.section === 'xcmPallet' || e.section === 'polkadotXcm' || e.section === 'cumulusXcm';
+      var isFeesPaid = e.method === 'FeesPaid';
+      if (isXcmEvent && isFeesPaid && e.data.fees) {
+        var _iterator2 = _createForOfIteratorHelper(e.data.fees),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var feeItem = _step2.value;
+            if (feeItem.fun.NonFungible) continue;
+            var plancks = BigInt(feeItem.fun.Fungible.replace(/,/g, ''));
+            var tokenSymbol = getMultiLocationTokenIdPjs(feeItem.id, node);
+            if (!tokenSymbol || !plancks) continue;
+            deliveryFees.push({
+              plancks: plancks,
+              tokenSymbol: tokenSymbol
+            });
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var nativeAssetSymbol = getNativeAssetSymbol(node);
+  // Sum the fees that match the feeToken
+  var totalDeliveryFees = deliveryFees.filter(function (df) {
+    return df.tokenSymbol === nativeAssetSymbol;
+  }).reduce(function (acc, df) {
+    return acc + df.plancks;
+  }, 0n);
+  return totalDeliveryFees + executionFee;
+};
+
+var resolveModuleError = function resolveModuleError(node, error) {
+  var palletDetails = getSupportedPalletsDetails(node).find(function (p) {
+    return p.index === Number(error.index);
+  });
+  if (!palletDetails) {
+    throw new Error("Pallet with index ".concat(error.index, " not found"));
+  }
+  // Use only the first byte of the error to get the error index
+  var errorIndex = Number(error.error.slice(0, 4));
+  var name = palletDetails.name;
+  if (name !== 'XTokens' && name !== 'PolkadotXcm' && name !== 'XcmPallet') {
+    throw new Error("Pallet ".concat(name, " is not supported"));
+  }
+  var failureReason = name === 'XTokens' ? Object.values(XTokensError)[errorIndex] : Object.values(PolkadotXcmError)[errorIndex];
+  if (!failureReason) {
+    throw new Error("Error index ".concat(errorIndex, " not found in ").concat(name, " pallet"));
+  }
+  return failureReason;
+};
+
+var getFees = function getFees(scenario) {
+  if (scenario === 'ParaToRelay') {
+    return 4600000000;
+  } else if (scenario === 'ParaToPara') {
+    return 399600000000;
+  }
+  throw new Error("Fees for scenario ".concat(scenario, " are not defined."));
+};
+
+/**
+ * Retrieves the node instance for a given node.
+ *
+ * @param node - The node identifier.
+ * @returns The node instance
+ */
+var getNode = function getNode(node) {
+  var nodeMap = nodes();
+  return nodeMap[node];
+};
+
+// Contains important call creation utils (Selection of fees,formating of header and more.. )
+/**
+ * Determines the relay chain for a given node.
+ *
+ * @param node - The node for which to determine the relay chain.
+ * @returns 'Kusama' if the node's relay chain symbol is 'KSM'; otherwise, 'Polkadot'.
+ */
+var determineRelayChain = function determineRelayChain(node) {
+  return getRelayChainSymbol(node) === 'KSM' ? 'Kusama' : 'Polkadot';
+};
+
+/**
+ * Retrieves the node name corresponding to a specified parachain ID.
+ *
+ * @param paraId - The parachain ID.
+ * @returns The node name if found; otherwise, null.
+ */
+var getTNode = function getTNode(paraId, ecosystem) {
+  var _NODE_NAMES_DOT_KSM$f;
+  if (paraId === 0) {
+    return ecosystem === 'polkadot' ? 'Polkadot' : 'Kusama';
+  }
+  if (paraId === 1) {
+    return 'Ethereum';
+  }
+  return (_NODE_NAMES_DOT_KSM$f = NODE_NAMES_DOT_KSM.find(function (nodeName) {
+    return getNode(nodeName).type === ecosystem && getParaId(nodeName) === paraId;
+  })) !== null && _NODE_NAMES_DOT_KSM$f !== void 0 ? _NODE_NAMES_DOT_KSM$f : null;
+};
+
+var isAssetHub = function isAssetHub(chain) {
+  return chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama';
+};
+var isBridgeHub = function isBridgeHub(chain) {
+  return chain === 'BridgeHubPolkadot' || chain === 'BridgeHubKusama';
+};
+var isPeople = function isPeople(chain) {
+  return chain === 'PeoplePolkadot' || chain === 'PeopleKusama';
+};
+var isSystemPara = function isSystemPara(chain) {
+  return isAssetHub(chain) || isBridgeHub(chain) || isPeople(chain);
+};
+var mul = function mul(v, num) {
+  var den = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1n;
+  return v * num / den;
+};
+var padFee = function padFee(raw, origin, dest, side) {
+  var relayOrigin = isRelayChain(origin);
+  var relayDest = isRelayChain(dest);
+  var sysParaOrigin = isSystemPara(origin);
+  var sysParaDest = isSystemPara(dest);
+  var relayToPara = relayOrigin && !relayDest;
+  var sysParaToPara = sysParaOrigin && !sysParaDest;
+  var paraToPara = !relayOrigin && !sysParaOrigin;
+  if (sysParaToPara) return raw * 40n;
+  if (relayToPara) return side === 'origin' ? mul(raw, 320n, 100n) : mul(raw, 3000n, 100n);
+  if (paraToPara) return mul(raw, 130n, 100n);
+  // apply default 30% padding
+  return mul(raw, 130n, 100n);
+};
+
+var createOriginLocation = function createOriginLocation(origin, destination) {
+  if (isRelayChain(origin)) return DOT_MULTILOCATION;
+  return {
+    parents: isRelayChain(destination) ? Parents.ZERO : Parents.ONE,
+    interior: {
+      X1: [{
+        Parachain: getParaId(origin)
+      }]
+    }
+  };
+};
+var getFeeForDestNode = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
+    var api, forwardedXcms, origin, destination, address, senderAddress, currency, disableFallback, calcPaymentInfoFee, dryRunResult, fee, newForwardedXcms, destParaId;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          api = _ref.api, forwardedXcms = _ref.forwardedXcms, origin = _ref.origin, destination = _ref.destination, address = _ref.address, senderAddress = _ref.senderAddress, currency = _ref.currency, disableFallback = _ref.disableFallback;
+          calcPaymentInfoFee = /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+              var originAsset, currencyInput, tx, rawFee;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    if (!('multiasset' in currency)) {
+                      _context.next = 2;
+                      break;
+                    }
+                    throw new InvalidCurrencyError('Multi-assets are not yet supported for XCM fee calculation.');
+                  case 2:
+                    originAsset = findAsset(origin, currency, destination);
+                    if (originAsset) {
+                      _context.next = 5;
+                      break;
+                    }
+                    throw new InvalidCurrencyError("Currency ".concat(JSON.stringify(currency), " not found in ").concat(origin));
+                  case 5:
+                    currencyInput = originAsset.multiLocation ? {
+                      multilocation: originAsset.multiLocation
+                    } : {
+                      symbol: originAsset.symbol
+                    };
+                    _context.next = 8;
+                    return Builder(api).from(destination).to(origin).address(senderAddress).senderAddress(address).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
+                      amount: currency.amount
+                    })).build();
+                  case 8:
+                    tx = _context.sent;
+                    _context.next = 11;
+                    return api.calculateTransactionFee(tx, address);
+                  case 11:
+                    rawFee = _context.sent;
+                    return _context.abrupt("return", padFee(rawFee, origin, destination, 'destination'));
+                  case 13:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            return function calcPaymentInfoFee() {
+              return _ref3.apply(this, arguments);
+            };
+          }();
+          if (!(!hasDryRunSupport(destination) || !forwardedXcms)) {
+            _context2.next = 7;
+            break;
+          }
+          _context2.next = 5;
+          return calcPaymentInfoFee();
+        case 5:
+          _context2.t0 = _context2.sent;
+          return _context2.abrupt("return", {
+            fee: _context2.t0,
+            feeType: 'paymentInfo'
+          });
+        case 7:
+          _context2.next = 9;
+          return api.getDryRunXcm({
+            originLocation: addXcmVersionHeader(createOriginLocation(origin, destination), Version.V4),
+            xcm: forwardedXcms[1][0],
+            node: destination,
+            origin: origin
+          });
+        case 9:
+          dryRunResult = _context2.sent;
+          if (dryRunResult.success) {
+            _context2.next = 18;
+            break;
+          }
+          if (!disableFallback) {
+            _context2.next = 13;
+            break;
+          }
+          return _context2.abrupt("return", {
+            dryRunError: dryRunResult.failureReason
+          });
+        case 13:
+          _context2.next = 15;
+          return calcPaymentInfoFee();
+        case 15:
+          _context2.t1 = _context2.sent;
+          _context2.t2 = dryRunResult.failureReason;
+          return _context2.abrupt("return", {
+            fee: _context2.t1,
+            feeType: 'paymentInfo',
+            dryRunError: _context2.t2
+          });
+        case 18:
+          fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
+          return _context2.abrupt("return", {
+            fee: fee,
+            feeType: 'dryRun',
+            forwardedXcms: newForwardedXcms,
+            destParaId: destParaId
+          });
+        case 20:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getFeeForDestNode(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var dryRunInternal = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
+    var _findAsset, _intermediateFees$ass, _intermediateFees$bri, _destinationDryRun;
+    var origin, destination, currency, api, tx, senderAddress, asset, originDryRun, initialForwardedXcms, initialDestParaId, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationDryRun, nextChain, hopApi, hopDryRun, newXcms, destParaId;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress;
+          asset = (_findAsset = findAsset(origin, currency, destination)) !== null && _findAsset !== void 0 ? _findAsset : origin === 'AssetHubPolkadot' ? findAsset('Ethereum', currency, null) : null;
+          if (asset) {
+            _context.next = 4;
+            break;
+          }
+          throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(currency), " not found on ").concat(origin));
+        case 4:
+          _context.next = 6;
+          return api.getDryRunCall({
+            tx: tx,
+            node: origin,
+            address: senderAddress
+          });
+        case 6:
+          originDryRun = _context.sent;
+          if (originDryRun.success) {
+            _context.next = 9;
+            break;
+          }
+          return _context.abrupt("return", {
+            origin: originDryRun
+          });
+        case 9:
+          initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
+          currentOrigin = origin;
+          forwardedXcms = initialForwardedXcms;
+          nextParaId = initialDestParaId;
+          intermediateFees = {};
+        case 14:
+          if (!(Array.isArray(forwardedXcms) && forwardedXcms.length && forwardedXcms[1].length && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
+            _context.next = 41;
+            break;
+          }
+          nextChain = getTNode(nextParaId, determineRelayChain(origin) === 'Polkadot' ? 'polkadot' : 'kusama');
+          if (nextChain) {
+            _context.next = 18;
+            break;
+          }
+          throw new Error("Unable to find TNode for paraId ".concat(nextParaId));
+        case 18:
+          hopApi = api.clone();
+          _context.prev = 19;
+          if (hasDryRunSupport(nextChain)) {
+            _context.next = 23;
+            break;
+          }
+          if (nextChain === destination) {
+            destinationDryRun = {
+              success: false,
+              failureReason: "DryRunApi is not available on node ".concat(nextChain)
+            };
+          }
+          return _context.abrupt("break", 41);
+        case 23:
+          _context.next = 25;
+          return hopApi.init(nextChain);
+        case 25:
+          _context.next = 27;
+          return hopApi.getDryRunXcm({
+            originLocation: addXcmVersionHeader(createOriginLocation(currentOrigin, nextChain), Version.V4),
+            xcm: forwardedXcms[1][0],
+            node: nextChain,
+            origin: currentOrigin
+          });
+        case 27:
+          hopDryRun = _context.sent;
+          if (nextChain === destination || isRelayChain(nextChain) && !isRelayChain(destination)) {
+            destinationDryRun = hopDryRun;
+          } else if (nextChain === 'AssetHubPolkadot') {
+            intermediateFees.assetHub = hopDryRun;
+          } else if (nextChain === 'BridgeHubPolkadot') {
+            intermediateFees.bridgeHub = hopDryRun;
+          }
+          if (hopDryRun.success) {
+            _context.next = 31;
+            break;
+          }
+          return _context.abrupt("break", 41);
+        case 31:
+          newXcms = hopDryRun.forwardedXcms, destParaId = hopDryRun.destParaId;
+          forwardedXcms = newXcms;
+          nextParaId = destParaId;
+          currentOrigin = nextChain;
+        case 35:
+          _context.prev = 35;
+          _context.next = 38;
+          return hopApi.disconnect();
+        case 38:
+          return _context.finish(35);
+        case 39:
+          _context.next = 14;
+          break;
+        case 41:
+          return _context.abrupt("return", {
+            origin: originDryRun.success ? _objectSpread2(_objectSpread2({}, originDryRun), {}, {
+              currency: getNativeAssetSymbol(origin)
+            }) : originDryRun,
+            assetHub: (_intermediateFees$ass = intermediateFees.assetHub) !== null && _intermediateFees$ass !== void 0 && _intermediateFees$ass.success ? _objectSpread2(_objectSpread2({}, intermediateFees.assetHub), {}, {
+              currency: getNativeAssetSymbol('AssetHubPolkadot')
+            }) : intermediateFees.assetHub,
+            bridgeHub: (_intermediateFees$bri = intermediateFees.bridgeHub) !== null && _intermediateFees$bri !== void 0 && _intermediateFees$bri.success ? _objectSpread2(_objectSpread2({}, intermediateFees.bridgeHub), {}, {
+              currency: getNativeAssetSymbol('BridgeHubPolkadot')
+            }) : intermediateFees.bridgeHub,
+            destination: (_destinationDryRun = destinationDryRun) !== null && _destinationDryRun !== void 0 && _destinationDryRun.success ? _objectSpread2(_objectSpread2({}, destinationDryRun), {}, {
+              currency: asset.symbol
+            }) : destinationDryRun
+          });
+        case 42:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[19,, 35, 39]]);
+  }));
+  return function dryRunInternal(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var dryRun = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
+    var api, senderAddress, origin;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          api = options.api, senderAddress = options.senderAddress, origin = options.origin;
+          validateAddress(senderAddress, origin, false);
+          _context.next = 4;
+          return api.init(origin);
+        case 4:
+          _context.prev = 4;
+          _context.next = 7;
+          return dryRunInternal(options);
+        case 7:
+          return _context.abrupt("return", _context.sent);
+        case 8:
+          _context.prev = 8;
+          _context.next = 11;
+          return api.disconnect();
+        case 11:
+          return _context.finish(8);
+        case 12:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[4,, 8, 12]]);
+  }));
+  return function dryRun(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var dryRunOrigin = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
+    var api, node, address, result;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          api = options.api, node = options.node, address = options.address;
+          validateAddress(address, node, false);
+          _context.next = 4;
+          return api.init(node);
+        case 4:
+          _context.prev = 4;
+          _context.next = 7;
+          return api.getDryRunCall(options);
+        case 7:
+          result = _context.sent;
+          if (!result.success) {
+            _context.next = 12;
+            break;
+          }
+          return _context.abrupt("return", _objectSpread2(_objectSpread2({}, result), {}, {
+            currency: getNativeAssetSymbol(node)
+          }));
+        case 12:
+          return _context.abrupt("return", result);
+        case 13:
+          _context.prev = 13;
+          _context.next = 16;
+          return api.disconnect();
+        case 16:
+          return _context.finish(13);
+        case 17:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[4,, 13, 17]]);
+  }));
+  return function dryRunOrigin(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
 
 var getParaEthTransferFees = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(ahApi) {
@@ -6905,345 +7287,137 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
             break;
           }
           throw new BridgeHaltedError();
-        case 8:
-          if (!('multiasset' in currency)) {
-            _context.next = 10;
-            break;
-          }
-          throw new Error('Multiassets syntax is not supported for Evm transfers');
-        case 10:
-          if (!('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation))) {
-            _context.next = 12;
-            break;
-          }
-          throw new Error('Override multilocation is not supported for Evm transfers');
-        case 12:
-          foundAsset = findAsset(from, currency, to);
-          if (!(foundAsset === null)) {
-            _context.next = 15;
-            break;
-          }
-          throw new InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
-        case 15:
-          if (!(!isForeignAsset(foundAsset) || !foundAsset.multiLocation)) {
-            _context.next = 17;
-            break;
-          }
-          throw new InvalidCurrencyError('Currency must be a foreign asset with valid multi-location');
-        case 17:
-          ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), foundAsset.multiLocation);
-          if (!(!ethAsset || !ethAsset.assetId)) {
-            _context.next = 20;
-            break;
-          }
-          throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(foundAsset)));
-        case 20:
-          contract = isEthersSigner(signer) ? new Contract(xcmInterfacePrecompile, abi, signer) : getContract({
-            abi: abi,
-            address: xcmInterfacePrecompile,
-            client: {
-              "public": createPublicClient({
-                chain: signer.chain,
-                transport: http()
-              }),
-              wallet: signer
-            }
-          });
-          if (!isEthersSigner(signer)) {
-            _context.next = 27;
-            break;
-          }
-          _context.next = 24;
-          return signer.getAddress();
-        case 24:
-          _context.t0 = _context.sent;
-          _context.next = 28;
-          break;
-        case 27:
-          _context.t0 = (_signer$account = signer.account) === null || _signer$account === void 0 ? void 0 : _signer$account.address;
-        case 28:
-          senderAddress = _context.t0;
-          if (senderAddress) {
-            _context.next = 31;
-            break;
-          }
-          throw new Error('Unable to get sender address');
-        case 31:
-          _context.next = 33;
-          return api.init(from);
-        case 33:
-          _context.next = 35;
-          return generateMessageId(api, senderAddress, getParaId(from), ethAsset.assetId, address, currency.amount);
-        case 35:
-          messageId = _context.sent;
-          customXcm = createCustomXcmOnDest({
-            api: api,
-            address: address,
-            scenario: 'ParaToPara',
-            senderAddress: senderAddress,
-            asset: _objectSpread2(_objectSpread2({}, foundAsset), {}, {
-              amount: currency.amount
-            })}, Version.V4, messageId);
-          _context.next = 39;
-          return api.objectToHex(customXcm, 'XcmVersionedXcm');
-        case 39:
-          customXcmOnDest = _context.sent;
-          _context.next = 42;
-          return api.createApiForNode('AssetHubPolkadot');
-        case 42:
-          assetHubApi = _context.sent;
-          _context.next = 45;
-          return getParaEthTransferFees(assetHubApi);
-        case 45:
-          _yield$getParaEthTran = _context.sent;
-          _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
-          bridgeFee = _yield$getParaEthTran2[0];
-          executionFee = _yield$getParaEthTran2[1];
-          transferFee = (bridgeFee + executionFee).toString(); // Partially inspired by Moonbeam XCM-SDK
-          // https://github.com/moonbeam-foundation/xcm-sdk/blob/ab835c15bf41612604b1c858d956a9f07705ed65/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts#L53
-          createTx = function createTx(func, args) {
-            if (isEthersContract(contract)) {
-              return contract[func].apply(contract, _toConsumableArray(args));
-            }
-            return contract.write[func](args);
-          };
-          numberToHex32 = function numberToHex32(num) {
-            return typeof num !== 'number' || isNaN(num) ? function () {
-              throw new Error('Input must be a valid number');
-            }() : "0x".concat((num >>> 0).toString(16).padStart(8, '0'));
-          }; // Execute the custom XCM message with the precompile
-          _context.next = 54;
-          return createTx(isEthersSigner(signer) ? 'transferAssetsUsingTypeAndThenAddress((uint8,bytes[]),(address,uint256)[],uint8,uint8,uint8,bytes)' : 'transferAssetsUsingTypeAndThenAddress', [
-          // This represents (1,X1(Parachain(1000)))
-          [1, ['0x00' + numberToHex32(getParaId('AssetHubPolkadot')).slice(2)]],
-          // Assets including fee and the ERC20 asset, with fee be the first
-          [[XCDOT, transferFee], [ethAsset.assetId, currency.amount.toString()]],
-          // The TransferType corresponding to asset being sent, 2 represents `DestinationReserve`
-          2,
-          // index for the fee
-          0,
-          // The TransferType corresponding to fee asset
-          2, customXcmOnDest]);
-        case 54:
-          tx = _context.sent;
-          return _context.abrupt("return", _typeof(tx) === 'object' ? tx.hash : tx);
-        case 56:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function transferMoonbeamToEth(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-/**
- * Retrieves the node name corresponding to a specified parachain ID.
- *
- * @param paraId - The parachain ID.
- * @returns The node name if found; otherwise, null.
- */
-var getTNode = function getTNode(paraId, ecosystem) {
-  var _NODE_NAMES_DOT_KSM$f;
-  if (paraId === 0) {
-    return ecosystem === 'polkadot' ? 'Polkadot' : 'Kusama';
-  }
-  if (paraId === 1) {
-    return 'Ethereum';
-  }
-  return (_NODE_NAMES_DOT_KSM$f = NODE_NAMES_DOT_KSM.find(function (nodeName) {
-    return getNode(nodeName).type === ecosystem && getParaId(nodeName) === paraId;
-  })) !== null && _NODE_NAMES_DOT_KSM$f !== void 0 ? _NODE_NAMES_DOT_KSM$f : null;
-};
-
-var isAssetHub = function isAssetHub(chain) {
-  return chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama';
-};
-var isBridgeHub = function isBridgeHub(chain) {
-  return chain === 'BridgeHubPolkadot' || chain === 'BridgeHubKusama';
-};
-var isPeople = function isPeople(chain) {
-  return chain === 'PeoplePolkadot' || chain === 'PeopleKusama';
-};
-var isSystemPara = function isSystemPara(chain) {
-  return isAssetHub(chain) || isBridgeHub(chain) || isPeople(chain);
-};
-var mul = function mul(v, num) {
-  var den = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1n;
-  return v * num / den;
-};
-var padFee = function padFee(raw, origin, dest, side) {
-  var relayOrigin = isRelayChain(origin);
-  var relayDest = isRelayChain(dest);
-  var sysParaOrigin = isSystemPara(origin);
-  var sysParaDest = isSystemPara(dest);
-  var relayToPara = relayOrigin && !relayDest;
-  var sysParaToPara = sysParaOrigin && !sysParaDest;
-  var paraToPara = !relayOrigin && !sysParaOrigin;
-  if (sysParaToPara) return raw * 40n;
-  if (relayToPara) return side === 'origin' ? mul(raw, 320n, 100n) : mul(raw, 3000n, 100n);
-  if (paraToPara) return mul(raw, 130n, 100n);
-  // apply default 30% padding
-  return mul(raw, 130n, 100n);
-};
-
-var createOriginLocation = function createOriginLocation(origin, destination) {
-  if (isRelayChain(origin)) return DOT_MULTILOCATION;
-  return {
-    parents: isRelayChain(destination) ? Parents.ZERO : Parents.ONE,
-    interior: {
-      X1: [{
-        Parachain: getParaId(origin)
-      }]
-    }
-  };
-};
-var getFeeForDestNode = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-    var api, forwardedXcms, origin, destination, address, senderAddress, currency, disableFallback, calcPaymentInfoFee, dryRunResult, fee, newForwardedXcms, destParaId;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          api = _ref.api, forwardedXcms = _ref.forwardedXcms, origin = _ref.origin, destination = _ref.destination, address = _ref.address, senderAddress = _ref.senderAddress, currency = _ref.currency, disableFallback = _ref.disableFallback;
-          calcPaymentInfoFee = /*#__PURE__*/function () {
-            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-              var originAsset, currencyInput, tx, rawFee;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    if (!('multiasset' in currency)) {
-                      _context.next = 2;
-                      break;
-                    }
-                    throw new InvalidCurrencyError('Multi-assets are not yet supported for XCM fee calculation.');
-                  case 2:
-                    originAsset = findAsset(origin, currency, destination);
-                    if (originAsset) {
-                      _context.next = 5;
-                      break;
-                    }
-                    throw new InvalidCurrencyError("Currency ".concat(JSON.stringify(currency), " not found in ").concat(origin));
-                  case 5:
-                    currencyInput = originAsset.multiLocation ? {
-                      multilocation: originAsset.multiLocation
-                    } : {
-                      symbol: originAsset.symbol
-                    };
-                    _context.next = 8;
-                    return Builder(api).from(destination).to(origin).address(senderAddress, address).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
-                      amount: currency.amount
-                    })).build();
-                  case 8:
-                    tx = _context.sent;
-                    _context.next = 11;
-                    return api.calculateTransactionFee(tx, address);
-                  case 11:
-                    rawFee = _context.sent;
-                    return _context.abrupt("return", padFee(rawFee, origin, destination, 'destination'));
-                  case 13:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }));
-            return function calcPaymentInfoFee() {
-              return _ref3.apply(this, arguments);
-            };
-          }();
-          if (!(!hasDryRunSupport(destination) || !forwardedXcms)) {
-            _context2.next = 7;
+        case 8:
+          if (!('multiasset' in currency)) {
+            _context.next = 10;
             break;
           }
-          _context2.next = 5;
-          return calcPaymentInfoFee();
-        case 5:
-          _context2.t0 = _context2.sent;
-          return _context2.abrupt("return", {
-            fee: _context2.t0,
-            feeType: 'paymentInfo'
-          });
-        case 7:
-          _context2.next = 9;
-          return api.getDryRunXcm({
-            originLocation: addXcmVersionHeader(createOriginLocation(origin, destination), Version.V4),
-            xcm: forwardedXcms[1][0],
-            node: destination,
-            origin: origin
-          });
-        case 9:
-          dryRunResult = _context2.sent;
-          if (dryRunResult.success) {
-            _context2.next = 18;
+          throw new Error('Multiassets syntax is not supported for Evm transfers');
+        case 10:
+          if (!('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation))) {
+            _context.next = 12;
             break;
           }
-          if (!disableFallback) {
-            _context2.next = 13;
+          throw new Error('Override multilocation is not supported for Evm transfers');
+        case 12:
+          foundAsset = findAsset(from, currency, to);
+          if (!(foundAsset === null)) {
+            _context.next = 15;
             break;
           }
-          return _context2.abrupt("return", {
-            dryRunError: dryRunResult.failureReason
-          });
-        case 13:
-          _context2.next = 15;
-          return calcPaymentInfoFee();
+          throw new InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
         case 15:
-          _context2.t1 = _context2.sent;
-          _context2.t2 = dryRunResult.failureReason;
-          return _context2.abrupt("return", {
-            fee: _context2.t1,
-            feeType: 'paymentInfo',
-            dryRunError: _context2.t2
-          });
-        case 18:
-          fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
-          return _context2.abrupt("return", {
-            fee: fee,
-            feeType: 'dryRun',
-            forwardedXcms: newForwardedXcms,
-            destParaId: destParaId
-          });
+          if (!(!isForeignAsset(foundAsset) || !foundAsset.multiLocation)) {
+            _context.next = 17;
+            break;
+          }
+          throw new InvalidCurrencyError('Currency must be a foreign asset with valid multi-location');
+        case 17:
+          ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), foundAsset.multiLocation);
+          if (!(!ethAsset || !ethAsset.assetId)) {
+            _context.next = 20;
+            break;
+          }
+          throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(foundAsset)));
         case 20:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function getFeeForDestNode(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var getDryRun = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-    var api, node, address;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          api = options.api, node = options.node, address = options.address;
-          validateAddress(address, node, false);
-          _context.next = 4;
-          return api.init(node);
-        case 4:
-          _context.prev = 4;
-          _context.next = 7;
-          return api.getDryRunCall(options);
-        case 7:
-          return _context.abrupt("return", _context.sent);
-        case 8:
-          _context.prev = 8;
-          _context.next = 11;
-          return api.disconnect();
-        case 11:
-          return _context.finish(8);
-        case 12:
+          contract = isEthersSigner(signer) ? new Contract(xcmInterfacePrecompile, abi, signer) : getContract({
+            abi: abi,
+            address: xcmInterfacePrecompile,
+            client: {
+              "public": createPublicClient({
+                chain: signer.chain,
+                transport: http()
+              }),
+              wallet: signer
+            }
+          });
+          if (!isEthersSigner(signer)) {
+            _context.next = 27;
+            break;
+          }
+          _context.next = 24;
+          return signer.getAddress();
+        case 24:
+          _context.t0 = _context.sent;
+          _context.next = 28;
+          break;
+        case 27:
+          _context.t0 = (_signer$account = signer.account) === null || _signer$account === void 0 ? void 0 : _signer$account.address;
+        case 28:
+          senderAddress = _context.t0;
+          if (senderAddress) {
+            _context.next = 31;
+            break;
+          }
+          throw new Error('Unable to get sender address');
+        case 31:
+          _context.next = 33;
+          return api.init(from);
+        case 33:
+          _context.next = 35;
+          return generateMessageId(api, senderAddress, getParaId(from), ethAsset.assetId, address, currency.amount);
+        case 35:
+          messageId = _context.sent;
+          customXcm = createCustomXcmOnDest({
+            api: api,
+            address: address,
+            scenario: 'ParaToPara',
+            senderAddress: senderAddress,
+            ahAddress: ahAddress,
+            asset: _objectSpread2(_objectSpread2({}, foundAsset), {}, {
+              amount: currency.amount
+            })}, from, Version.V4, messageId);
+          _context.next = 39;
+          return api.objectToHex(customXcm, 'XcmVersionedXcm');
+        case 39:
+          customXcmOnDest = _context.sent;
+          _context.next = 42;
+          return api.createApiForNode('AssetHubPolkadot');
+        case 42:
+          assetHubApi = _context.sent;
+          _context.next = 45;
+          return getParaEthTransferFees(assetHubApi);
+        case 45:
+          _yield$getParaEthTran = _context.sent;
+          _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
+          bridgeFee = _yield$getParaEthTran2[0];
+          executionFee = _yield$getParaEthTran2[1];
+          transferFee = (bridgeFee + executionFee).toString(); // Partially inspired by Moonbeam XCM-SDK
+          // https://github.com/moonbeam-foundation/xcm-sdk/blob/ab835c15bf41612604b1c858d956a9f07705ed65/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts#L53
+          createTx = function createTx(func, args) {
+            if (isEthersContract(contract)) {
+              return contract[func].apply(contract, _toConsumableArray(args));
+            }
+            return contract.write[func](args);
+          };
+          numberToHex32 = function numberToHex32(num) {
+            return typeof num !== 'number' || isNaN(num) ? function () {
+              throw new Error('Input must be a valid number');
+            }() : "0x".concat((num >>> 0).toString(16).padStart(8, '0'));
+          }; // Execute the custom XCM message with the precompile
+          _context.next = 54;
+          return createTx(isEthersSigner(signer) ? 'transferAssetsUsingTypeAndThenAddress((uint8,bytes[]),(address,uint256)[],uint8,uint8,uint8,bytes)' : 'transferAssetsUsingTypeAndThenAddress', [
+          // This represents (1,X1(Parachain(1000)))
+          [1, ['0x00' + numberToHex32(getParaId('AssetHubPolkadot')).slice(2)]],
+          // Assets including fee and the ERC20 asset, with fee be the first
+          [[XCDOT, transferFee], [ethAsset.assetId, currency.amount.toString()]],
+          // The TransferType corresponding to asset being sent, 2 represents `DestinationReserve`
+          2,
+          // index for the fee
+          0,
+          // The TransferType corresponding to fee asset
+          2, customXcmOnDest]);
+        case 54:
+          tx = _context.sent;
+          return _context.abrupt("return", _typeof(tx) === 'object' ? tx.hash : tx);
+        case 56:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[4,, 8, 12]]);
+    }, _callee);
   }));
-  return function getDryRun(_x) {
-    return _ref.apply(this, arguments);
+  return function transferMoonbeamToEth(_x) {
+    return _ref2.apply(this, arguments);
   };
 }();
 
@@ -7268,8 +7442,7 @@ var getFeeForOriginNode = /*#__PURE__*/function () {
           });
         case 6:
           _context.next = 8;
-          return getDryRun({
-            api: api,
+          return api.getDryRunCall({
             tx: tx,
             node: origin,
             address: senderAddress
@@ -7408,7 +7581,7 @@ var getXcmFee = /*#__PURE__*/function () {
           destinationFeeType = 'paymentInfo';
         case 36:
           if (!(Array.isArray(forwardedXcms) && forwardedXcms.length > 0 && forwardedXcms[1].length > 0 && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
-            _context.next = 69;
+            _context.next = 68;
             break;
           }
           nextChain = getTNode(nextParaId, determineRelayChain(origin) === 'Polkadot' ? 'polkadot' : 'kusama');
@@ -7479,7 +7652,7 @@ var getXcmFee = /*#__PURE__*/function () {
           destinationFee = destFallback.fee;
           destinationFeeType = destFallback.feeType; // paymentInfo
         case 57:
-          return _context.abrupt("break", 69);
+          return _context.abrupt("break", 68);
         case 58:
           if (nextChain === destination || isRelayChain(nextChain) && !isRelayChain(destination)) {
             destinationFee = hopResult.fee;
@@ -7502,15 +7675,14 @@ var getXcmFee = /*#__PURE__*/function () {
           currentOrigin = nextChain;
         case 62:
           _context.prev = 62;
-          hopApi.setDisconnectAllowed(true);
-          _context.next = 66;
+          _context.next = 65;
           return hopApi.disconnect();
-        case 66:
+        case 65:
           return _context.finish(62);
-        case 67:
+        case 66:
           _context.next = 36;
           break;
-        case 69:
+        case 68:
           return _context.abrupt("return", _objectSpread2(_objectSpread2({
             origin: _objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
               fee: originFee
@@ -7532,11 +7704,11 @@ var getXcmFee = /*#__PURE__*/function () {
               dryRunError: destinationDryRunError
             })
           }));
-        case 70:
+        case 69:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[17,, 25, 30], [41,, 62, 67]]);
+    }, _callee, null, [[17,, 25, 30], [41,, 62, 66]]);
   }));
   return function getXcmFee(_x) {
     return _ref2.apply(this, arguments);
@@ -7610,7 +7782,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
             symbol: originAsset.symbol
           };
           _context.next = 20;
-          return Builder(destApi).from(destination).to(origin).address(senderAddress, address).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
+          return Builder(destApi).from(destination).to(origin).address(senderAddress).senderAddress(address).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
             amount: currency.amount
           })).build();
         case 20:
@@ -7723,7 +7895,7 @@ var validateDestination = function validateDestination(origin, destination) {
   if (isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(destination) && origin !== destination) {
     throw new IncompatibleNodesError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
   }
-  if (destination === 'Ethereum' && origin !== 'AssetHubPolkadot' && origin !== 'Hydration' && origin !== 'BifrostPolkadot') {
+  if (destination === 'Ethereum' && origin !== 'AssetHubPolkadot' && origin !== 'Hydration' && origin !== 'BifrostPolkadot' && origin !== 'Moonbeam') {
     throw new IncompatibleNodesError('Transfers to Ethereum are only supported from AssetHubPolkadot and Hydration.');
   }
   var isMultiLocationDestination = _typeof(destination) === 'object';
@@ -7849,11 +8021,11 @@ var validateDestinationAddress = function validateDestinationAddress(address, de
 
 var send = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-    var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, isLocalTransfer, overriddenAsset, resolvedAsset, originNode;
+    var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, isLocalTransfer, overriddenAsset, resolvedAsset, originNode;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, pallet = options.pallet, method = options.method;
+          api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method;
           validateCurrency(currency, feeAsset);
           validateDestination(origin, destination);
           validateDestinationAddress(address, destination);
@@ -7940,6 +8112,7 @@ var send = /*#__PURE__*/function () {
             overriddenAsset: overriddenAsset,
             version: version,
             senderAddress: senderAddress,
+            ahAddress: ahAddress,
             pallet: pallet,
             method: method
           }));
@@ -8093,14 +8266,44 @@ var GeneralBuilder = /*#__PURE__*/function () {
         currency: _currency
       }));
     }
+    /**
+     * Sets the recipient address.
+     *
+     * @param address - The destination address.
+     * @returns An instance of Builder
+     */
   }, {
     key: "address",
-    value: function address(_address, senderAddress) {
+    value: function address(_address) {
       return new GeneralBuilder(this.api, this.batchManager, _objectSpread2(_objectSpread2({}, this._options), {}, {
         address: _address
-      }, senderAddress ? {
-        senderAddress: senderAddress
-      } : {}));
+      }));
+    }
+    /**
+     * Sets the sender address.
+     *
+     * @param address - The sender address.
+     * @returns
+     */
+  }, {
+    key: "senderAddress",
+    value: function senderAddress(address) {
+      return new GeneralBuilder(this.api, this.batchManager, _objectSpread2(_objectSpread2({}, this._options), {}, {
+        senderAddress: address
+      }));
+    }
+    /**
+     * Sets the asset hub address. This is used for transfers that go through the Asset Hub and originate from an EVM chain.
+     *
+     * @param address - The address to be used.
+     * @returns An instance of Builder
+     */
+  }, {
+    key: "ahAddress",
+    value: function ahAddress(address) {
+      return new GeneralBuilder(this.api, this.batchManager, _objectSpread2(_objectSpread2({}, this._options), {}, {
+        ahAddress: address
+      }));
     }
     /**
      * Sets the XCM version to be used for the transfer.
@@ -8226,33 +8429,53 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "dryRun",
     value: function () {
-      var _dryRun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(senderAddress) {
-        var tx;
+      var _dryRun2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this$_options2, to, address, senderAddress, tx;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              this.api.setDisconnectAllowed(false);
+              _this$_options2 = this._options, to = _this$_options2.to, address = _this$_options2.address, senderAddress = _this$_options2.senderAddress;
               _context3.next = 3;
               return this.build();
             case 3:
               tx = _context3.sent;
-              this.api.setDisconnectAllowed(true);
-              return _context3.abrupt("return", getDryRun({
+              if (!isTMultiLocation(to)) {
+                _context3.next = 6;
+                break;
+              }
+              throw new InvalidParameterError('Multi-Location destination is not supported for XCM fee calculation.');
+            case 6:
+              if (!isTMultiLocation(address)) {
+                _context3.next = 8;
+                break;
+              }
+              throw new InvalidParameterError('Multi-Location address is not supported for XCM fee calculation.');
+            case 8:
+              if (!(to === 'Ethereum')) {
+                _context3.next = 10;
+                break;
+              }
+              throw new InvalidParameterError('Ethereum destination is not yet supported for XCM fee calculation.');
+            case 10:
+              return _context3.abrupt("return", dryRun({
                 api: this.api,
                 tx: tx,
                 address: senderAddress,
-                node: this._options.from
+                origin: this._options.from,
+                destination: to,
+                currency: this._options.currency,
+                senderAddress: this._options.senderAddress
               }));
-            case 6:
+            case 11:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
-      function dryRun(_x2) {
-        return _dryRun.apply(this, arguments);
+      function dryRun$1() {
+        return _dryRun2.apply(this, arguments);
       }
-      return dryRun;
+      return dryRun$1;
     }()
     /**
      * Estimates the XCM fee for the transfer using paymentInfo function.
@@ -8263,11 +8486,11 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getXcmFeeEstimate",
     value: (function () {
       var _getXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this$_options2, from, to, address, senderAddress, tx;
+        var _this$_options3, from, to, address, senderAddress, tx;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _this$_options2 = this._options, from = _this$_options2.from, to = _this$_options2.to, address = _this$_options2.address, senderAddress = _this$_options2.senderAddress;
+              _this$_options3 = this._options, from = _this$_options3.from, to = _this$_options3.to, address = _this$_options3.address, senderAddress = _this$_options3.senderAddress;
               if (!isTMultiLocation(to)) {
                 _context4.next = 3;
                 break;
@@ -8292,7 +8515,9 @@ var GeneralBuilder = /*#__PURE__*/function () {
             case 10:
               tx = _context4.sent;
               this.api.setDisconnectAllowed(true);
-              return _context4.abrupt("return", getXcmFeeEstimate({
+              _context4.prev = 12;
+              _context4.next = 15;
+              return getXcmFeeEstimate({
                 api: this.api,
                 tx: tx,
                 origin: from,
@@ -8300,12 +8525,20 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 address: address,
                 senderAddress: senderAddress,
                 currency: this._options.currency
-              }));
-            case 13:
+              });
+            case 15:
+              return _context4.abrupt("return", _context4.sent);
+            case 16:
+              _context4.prev = 16;
+              _context4.next = 19;
+              return this.api.disconnect();
+            case 19:
+              return _context4.finish(16);
+            case 20:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this);
+        }, _callee4, this, [[12,, 16, 20]]);
       }));
       function getXcmFeeEstimate$1() {
         return _getXcmFeeEstimate2.apply(this, arguments);
@@ -8324,7 +8557,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
       var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _ref,
           disableFallback,
-          _this$_options3,
+          _this$_options4,
           from,
           to,
           address,
@@ -8337,7 +8570,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
               _ref = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {
                 disableFallback: false
               }, disableFallback = _ref.disableFallback;
-              _this$_options3 = this._options, from = _this$_options3.from, to = _this$_options3.to, address = _this$_options3.address, senderAddress = _this$_options3.senderAddress;
+              _this$_options4 = this._options, from = _this$_options4.from, to = _this$_options4.to, address = _this$_options4.address, senderAddress = _this$_options4.senderAddress;
               if (!isTMultiLocation(to)) {
                 _context5.next = 4;
                 break;
@@ -8360,8 +8593,9 @@ var GeneralBuilder = /*#__PURE__*/function () {
               return this.build();
             case 10:
               tx = _context5.sent;
-              this.api.setDisconnectAllowed(false);
-              return _context5.abrupt("return", getXcmFee({
+              _context5.prev = 11;
+              _context5.next = 14;
+              return getXcmFee({
                 api: this.api,
                 tx: tx,
                 origin: from,
@@ -8370,12 +8604,20 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 address: address,
                 currency: this._options.currency,
                 disableFallback: disableFallback
-              }));
-            case 13:
+              });
+            case 14:
+              return _context5.abrupt("return", _context5.sent);
+            case 15:
+              _context5.prev = 15;
+              _context5.next = 18;
+              return this.api.disconnect();
+            case 18:
+              return _context5.finish(15);
+            case 19:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this);
+        }, _callee5, this, [[11,, 15, 19]]);
       }));
       function getXcmFee$1() {
         return _getXcmFee2.apply(this, arguments);
@@ -8776,7 +9018,7 @@ var getOriginFeeDetailsInternal = /*#__PURE__*/function () {
           return api.init(origin);
         case 3:
           _context.next = 5;
-          return Builder(api).from(origin).to(destination).currency(currency).address(accountDestination, account).build();
+          return Builder(api).from(origin).to(destination).currency(currency).address(accountDestination).senderAddress(account).build();
         case 5:
           tx = _context.sent;
           _context.next = 8;
@@ -9171,4 +9413,4 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
   };
 }();
 
-export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, Version, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, determineRelayChain, generateAddressMultiLocationV4, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getDryRun, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getXcmFee, getXcmFeeEstimate, isEthersContract, isEthersSigner, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };
+export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, Version, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, determineRelayChain, dryRun, dryRunOrigin, generateAddressMultiLocationV4, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getXcmFee, getXcmFeeEstimate, isEthersContract, isEthersSigner, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, transformMultiLocation, validateAddress, verifyEdOnDestination };