@paraspell/sdk-core 8.5.2 → 8.5.3

package/dist/index.mjs

@@ -6101,260 +6101,286 @@ var AssetHubPolkadot$3 = {
 			assetId: "1024",
 			symbol: "NCTR",
 			decimals: 18,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 1024
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 1024
+						}
+					]
+				}
+			},
 			existentialDeposit: "100000000"
 		},
 		{
 			assetId: "1337",
 			symbol: "USDC",
 			decimals: 6,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 1337
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 1337
+						}
+					]
+				}
+			},
 			existentialDeposit: "10000"
 		},
 		{
 			assetId: "17",
 			symbol: "WIFD",
 			decimals: 10,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 17
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 17
+						}
+					]
+				}
+			},
 			existentialDeposit: "1"
 		},
 		{
 			assetId: "1984",
 			symbol: "USDt",
 			decimals: 6,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 1984
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 1984
+						}
+					]
+				}
+			},
 			existentialDeposit: "10000"
 		},
 		{
 			assetId: "21",
 			symbol: "WBTC",
 			decimals: 8,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 21
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 21
+						}
+					]
+				}
+			},
 			existentialDeposit: "3000"
 		},
 		{
 			assetId: "22222012",
 			symbol: "DAMN",
 			decimals: 12,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 22222012
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 22222012
+						}
+					]
+				}
+			},
 			existentialDeposit: "1000000000000"
 		},
 		{
 			assetId: "23",
 			symbol: "PINK",
 			decimals: 10,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 23
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 23
+						}
+					]
+				}
+			},
 			existentialDeposit: "1"
 		},
 		{
 			assetId: "30",
 			symbol: "DED",
 			decimals: 10,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 30
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 30
+						}
+					]
+				}
+			},
 			existentialDeposit: "1"
 		},
 		{
 			assetId: "31337",
 			symbol: "WUD",
 			decimals: 10,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 31337
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 31337
+						}
+					]
+				}
+			},
 			existentialDeposit: "10000000"
 		},
 		{
 			assetId: "42069",
 			symbol: "STINK",
 			decimals: 10,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 42069
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 42069
+						}
+					]
+				}
+			},
 			existentialDeposit: "1000000"
 		},
 		{
 			assetId: "50000028",
 			symbol: "LOVA",
 			decimals: 12,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 50000028
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 50000028
+						}
+					]
+				}
+			},
 			existentialDeposit: "1000000000000"
 		},
 		{
 			assetId: "50000069",
 			symbol: "LOTY",
 			decimals: 12,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 50000069
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 50000069
+						}
+					]
+				}
+			},
 			existentialDeposit: "100000000"
 		},
 		{
 			assetId: "555",
 			symbol: "GAME",
 			decimals: 10,
-			xcmInterior: [
-				{
-					Network: "polkadot"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 555
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 555
+						}
+					]
+				}
+			},
 			existentialDeposit: "100000"
 		},
 		{
@@ -10335,80 +10361,88 @@ var AssetHubKusama$3 = {
 			assetId: "16",
 			symbol: "ARIS",
 			decimals: 8,
-			xcmInterior: [
-				{
-					Network: "kusama"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 16
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 16
+						}
+					]
+				}
+			},
 			existentialDeposit: "10000000"
 		},
 		{
 			assetId: "1984",
 			symbol: "USDt",
 			decimals: 6,
-			xcmInterior: [
-				{
-					Network: "kusama"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 1984
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 1984
+						}
+					]
+				}
+			},
 			existentialDeposit: "100"
 		},
 		{
 			assetId: "223",
 			symbol: "BILL",
 			decimals: 8,
-			xcmInterior: [
-				{
-					Network: "kusama"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 223
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 223
+						}
+					]
+				}
+			},
 			existentialDeposit: "10000"
 		},
 		{
 			assetId: "8",
 			symbol: "RMRK",
 			decimals: 10,
-			xcmInterior: [
-				{
-					Network: "kusama"
-				},
-				{
-					Parachain: 1000
-				},
-				{
-					PalletInstance: 50
-				},
-				{
-					GeneralIndex: 8
-				}
-			],
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X3: [
+						{
+							Parachain: 1000
+						},
+						{
+							PalletInstance: 50
+						},
+						{
+							GeneralIndex: 8
+						}
+					]
+				}
+			},
 			existentialDeposit: "10000"
 		},
 		{
@@ -12774,7 +12808,7 @@ var NODES_WITH_RELAY_CHAINS_DOT_KSM = [].concat(NODE_NAMES_DOT_KSM, ['Polkadot',
 var SUPPORTED_PALLETS = ['XTokens', 'OrmlXTokens', 'PolkadotXcm', 'RelayerXcm', 'XTransfer', 'XcmPallet'];
 
 var isForeignAsset = function isForeignAsset(asset) {
-  return _typeof(asset) === 'object' && asset !== null && ('assetId' in asset || 'multiLocation' in asset || 'xcmInterior' in asset) && !('isNative' in asset);
+  return _typeof(asset) === 'object' && asset !== null && ('assetId' in asset || 'multiLocation' in asset) && !('isNative' in asset);
 };
 
 var isSymbolSpecifier = function isSymbolSpecifier(currencySymbolValue) {
@@ -14576,11 +14610,6 @@ var buildMultiLocation = function buildMultiLocation(_ref) {
     }
     if (assetHubAsset.multiLocation) {
       return assetHubAsset.multiLocation;
-    } else if (assetHubAsset.xcmInterior) {
-      return {
-        parents: Parents.ONE,
-        interior: _defineProperty({}, "X".concat(assetHubAsset.xcmInterior.length), assetHubAsset.xcmInterior)
-      };
     }
     throw new InvalidCurrencyError("Asset ".concat(asset.symbol, " has no multiLocation"));
   }
@@ -14604,11 +14633,6 @@ var buildMultiLocation = function buildMultiLocation(_ref) {
   }
   if (asset.multiLocation) {
     return asset.multiLocation;
-  } else if (asset.xcmInterior) {
-    return {
-      parents: Parents.ONE,
-      interior: _defineProperty({}, "X".concat(asset.xcmInterior.length), asset.xcmInterior)
-    };
   } else {
     return createDefaultMultiLocation(asset.assetId);
   }
@@ -14771,18 +14795,21 @@ var generateAddressPayload = function generateAddressPayload(api, scenario, pall
   });
 };
 
-var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version) {
+var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version, messageId) {
   var api = _ref.api,
     address = _ref.address,
     asset = _ref.asset,
     scenario = _ref.scenario,
-    ahAddress = _ref.ahAddress;
+    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)));
@@ -14793,7 +14820,7 @@ var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version) {
         assets: {
           Wild: 'All'
         },
-        beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', ahAddress !== null && ahAddress !== undefined ? ahAddress : '', version, undefined))[0]
+        beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', senderAddress, version, undefined))[0]
       }
     }]
   }, {
@@ -14851,11 +14878,39 @@ var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version) {
             }
           }
         }
+      }, {
+        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;
 };
@@ -14908,11 +14963,11 @@ var ParachainNode = /*#__PURE__*/function () {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-        var api, asset, address, destination, paraIdTo, overriddenAsset, version, ahAddress, pallet, method, isRelayDestination, scenario, paraId, versionOrDefault, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input;
+        var api, asset, address, destination, paraIdTo, overriddenAsset, version, senderAddress, pallet, method, isRelayDestination, scenario, paraId, versionOrDefault, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              api = options.api, asset = options.asset, address = options.address, destination = options.destination, paraIdTo = options.paraIdTo, overriddenAsset = options.overriddenAsset, version = options.version, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method;
+              api = options.api, asset = options.asset, address = options.address, destination = options.destination, paraIdTo = options.paraIdTo, overriddenAsset = options.overriddenAsset, version = options.version, senderAddress = options.senderAddress, pallet = options.pallet, method = options.method;
               isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
               scenario = isRelayDestination ? 'ParaToRelay' : 'ParaToPara';
               paraId = resolveParaId(paraIdTo, destination);
@@ -14983,7 +15038,7 @@ var ParachainNode = /*#__PURE__*/function () {
                 paraIdTo: paraId,
                 overriddenAsset: overriddenAsset,
                 version: version,
-                ahAddress: ahAddress,
+                senderAddress: senderAddress,
                 pallet: pallet,
                 method: method
               }));
@@ -15045,37 +15100,54 @@ var ParachainNode = /*#__PURE__*/function () {
     key: "transferToEthereum",
     value: function () {
       var _transferToEthereum = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(input) {
-        var api, asset, scenario, version, destination, ahAddress, versionOrDefault, ethMultiAsset, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, fee, call;
+        var api, asset, scenario, version, destination, address, senderAddress, versionOrDefault, ethMultiAsset, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, fee, ethAsset, messageId, call;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              api = input.api, asset = input.asset, scenario = input.scenario, version = input.version, destination = input.destination, ahAddress = input.ahAddress;
+              api = input.api, asset = input.asset, scenario = input.scenario, version = input.version, destination = input.destination, address = input.address, senderAddress = input.senderAddress;
               if (isForeignAsset(asset)) {
                 _context2.next = 3;
                 break;
               }
               throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
             case 3:
-              if (!(ahAddress === undefined)) {
+              if (!(senderAddress === undefined)) {
                 _context2.next = 5;
                 break;
               }
-              throw new Error('AssetHub address is required for Ethereum transfers');
+              throw new Error('Sender address is required for transfers to Ethereum');
             case 5:
+              if (!isTMultiLocation(address)) {
+                _context2.next = 7;
+                break;
+              }
+              throw new Error('Multi-location address is not supported for Ethereum transfers');
+            case 7:
               versionOrDefault = version !== null && version !== undefined ? version : Version.V4;
               ethMultiAsset = Object.values(createCurrencySpec(asset.amount, versionOrDefault, Parents.TWO, asset.multiLocation))[0][0];
-              _context2.next = 9;
+              _context2.next = 11;
               return api.createApiForNode('AssetHubPolkadot');
-            case 9:
+            case 11:
               ahApi = _context2.sent;
-              _context2.next = 12;
+              _context2.next = 14;
               return getParaEthTransferFees(ahApi);
-            case 12:
+            case 14:
               _yield$getParaEthTran = _context2.sent;
               _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
               bridgeFee = _yield$getParaEthTran2[0];
               executionFee = _yield$getParaEthTran2[1];
               fee = (bridgeFee + executionFee).toString();
+              ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), asset.multiLocation);
+              if (!(!ethAsset || !ethAsset.assetId)) {
+                _context2.next = 22;
+                break;
+              }
+              throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(asset)));
+            case 22:
+              _context2.next = 24;
+              return generateMessageId(api, senderAddress, getParaId(this.node), ethAsset.assetId, address, asset.amount);
+            case 24:
+              messageId = _context2.sent;
               call = {
                 module: 'PolkadotXcm',
                 section: 'transfer_assets_using_type_and_then',
@@ -15088,12 +15160,12 @@ var ParachainNode = /*#__PURE__*/function () {
                     interior: 'Here'
                   }),
                   fees_transfer_type: 'DestinationReserve',
-                  custom_xcm_on_dest: createCustomXcmOnDest(input, versionOrDefault),
+                  custom_xcm_on_dest: createCustomXcmOnDest(input, versionOrDefault, messageId),
                   weight_limit: 'Unlimited'
                 }
               };
               return _context2.abrupt("return", api.callTxMethod(call));
-            case 19:
+            case 27:
             case "end":
               return _context2.stop();
           }
@@ -17362,21 +17434,19 @@ var sanitizeMultiLocation = function sanitizeMultiLocation(multiLocation) {
   return multiLocation.replace(/"(\d+),(\d+)"/g, '"$1$2"');
 };
 var compareMultiLocations = function compareMultiLocations(input, asset) {
-  var _asset$multiLocation, _asset$xcmInterior;
+  var _asset$multiLocation;
   var sanitizedInput = sanitizeMultiLocation(input);
   var assetMLStr = JSON.stringify((_asset$multiLocation = asset.multiLocation) !== null && _asset$multiLocation !== undefined ? _asset$multiLocation : '');
-  var assetMLInteriorStr = JSON.stringify((_asset$xcmInterior = asset.xcmInterior) !== null && _asset$xcmInterior !== undefined ? _asset$xcmInterior : '');
   var sanitizedAssetMLStr = sanitizeMultiLocation(assetMLStr);
-  var sanitizedAssetMLInteriorStr = sanitizeMultiLocation(assetMLInteriorStr);
   return (
     // Compare sanitized input with sanitized asset values
-    sanitizedInput === sanitizedAssetMLStr || sanitizedInput === sanitizedAssetMLInteriorStr ||
+    sanitizedInput === sanitizedAssetMLStr ||
     // Compare original input with sanitized asset values
-    input === sanitizedAssetMLStr || input === sanitizedAssetMLInteriorStr ||
+    input === sanitizedAssetMLStr ||
     // Compare original input with original asset values
-    input === assetMLStr || input === assetMLInteriorStr ||
+    input === assetMLStr ||
     // Compare sanitized input with original asset values
-    sanitizedInput === assetMLStr || sanitizedInput === assetMLInteriorStr
+    sanitizedInput === assetMLStr
   );
 };
 
@@ -17385,10 +17455,6 @@ var findAssetByMultiLocation = function findAssetByMultiLocation(foreignAssets,
     return foreignAssets.find(function (asset) {
       return compareMultiLocations(multiLocation, asset);
     });
-  } else if (Array.isArray(multiLocation)) {
-    return foreignAssets.find(function (asset) {
-      return _deepEqual(asset.xcmInterior, multiLocation);
-    });
   } else {
     return foreignAssets.find(function (asset) {
       return _deepEqual(asset.multiLocation, multiLocation);
@@ -17399,7 +17465,7 @@ var findAssetByMultiLocation = function findAssetByMultiLocation(foreignAssets,
 var filterEthCompatibleAssets = function filterEthCompatibleAssets(assets) {
   var ethAssets = getOtherAssets('Ethereum');
   return assets.filter(function (asset) {
-    var assetMultiLoc = asset.multiLocation || asset.xcmInterior;
+    var assetMultiLoc = asset.multiLocation;
     if (!assetMultiLoc) return false;
     return Boolean(findAssetByMultiLocation(ethAssets, assetMultiLoc));
   });
@@ -17454,18 +17520,6 @@ var getAssetMultiLocation = function getAssetMultiLocation(node, currency) {
   if (asset.multiLocation) {
     return asset.multiLocation;
   }
-  if (asset.xcmInterior) {
-    var _asset$xcmInterior$sl = asset.xcmInterior.slice(-2),
-      _asset$xcmInterior$sl2 = _slicedToArray(_asset$xcmInterior$sl, 2),
-      secondLast = _asset$xcmInterior$sl2[0],
-      last = _asset$xcmInterior$sl2[1];
-    return {
-      parents: Parents.ZERO,
-      interior: {
-        X2: [secondLast, last]
-      }
-    };
-  }
   return null;
 };
 
@@ -19139,9 +19193,9 @@ var GeneralBuilder = /*#__PURE__*/function () {
      */
   }, {
     key: "address",
-    value: function address(_address, ahAddress) {
+    value: function address(_address, senderAddress) {
       this._address = _address;
-      this._ahAddress = ahAddress;
+      this._senderAddress = senderAddress;
       return this;
     }
     /**
@@ -19180,7 +19234,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
         destination: this._to,
         paraIdTo: this._paraIdTo,
         version: this._version,
-        ahAddress: this._ahAddress,
+        senderAddress: this._senderAddress,
         pallet: this._pallet,
         method: this._method
       };
@@ -19325,16 +19379,16 @@ var Builder = function Builder(api) {
 var getOriginFeeDetailsInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _getExistentialDeposi;
-    var api, account, accountDestination, ahAccount, currency, origin, destination, _ref$feeMarginPercent, feeMarginPercentage, tx, xcmFee, xcmFeeWithMargin, nativeBalance, existentialDeposit, sufficientForXCM;
+    var api, account, accountDestination, currency, origin, destination, _ref$feeMarginPercent, feeMarginPercentage, tx, xcmFee, xcmFeeWithMargin, nativeBalance, existentialDeposit, sufficientForXCM;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = _ref.api, account = _ref.account, accountDestination = _ref.accountDestination, ahAccount = _ref.ahAccount, currency = _ref.currency, origin = _ref.origin, destination = _ref.destination, _ref$feeMarginPercent = _ref.feeMarginPercentage, feeMarginPercentage = _ref$feeMarginPercent === undefined ? 10 : _ref$feeMarginPercent;
+          api = _ref.api, account = _ref.account, accountDestination = _ref.accountDestination, currency = _ref.currency, origin = _ref.origin, destination = _ref.destination, _ref$feeMarginPercent = _ref.feeMarginPercentage, feeMarginPercentage = _ref$feeMarginPercent === undefined ? 10 : _ref$feeMarginPercent;
           _context.next = 3;
           return api.init(origin);
         case 3:
           _context.next = 5;
-          return Builder(api).from(origin).to(destination).currency(currency).address(accountDestination, ahAccount).build();
+          return Builder(api).from(origin).to(destination).currency(currency).address(accountDestination, account).build();
         case 5:
           tx = _context.sent;
           _context.next = 8;
@@ -19755,6 +19809,75 @@ var getSupportedAssets = function getSupportedAssets(origin, destination) {
   return supportedAssets;
 };
 
+var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var api, node, address, currency, ed, edBN, balance, originalAmount, fee, amountWithoutFee;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          api = _ref.api, node = _ref.node, address = _ref.address, currency = _ref.currency;
+          validateAddress(address, node);
+          ed = getExistentialDeposit(node, currency);
+          if (!(ed === null)) {
+            _context.next = 5;
+            break;
+          }
+          throw new Error("Cannot get existential deposit for currency ".concat(JSON.stringify(currency)));
+        case 5:
+          edBN = BigInt(ed);
+          _context.next = 8;
+          return getAssetBalanceInternal({
+            address: address,
+            node: node,
+            api: api,
+            currency: currency
+          });
+        case 8:
+          balance = _context.sent;
+          originalAmount = BigInt(currency.amount);
+          fee = originalAmount / BigInt(100);
+          amountWithoutFee = originalAmount - fee;
+          return _context.abrupt("return", balance + amountWithoutFee - edBN > 0);
+        case 13:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function verifyEdOnDestinationInternal(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var verifyEdOnDestination = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
+    var api;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          api = options.api;
+          _context.prev = 1;
+          _context.next = 4;
+          return verifyEdOnDestinationInternal(options);
+        case 4:
+          return _context.abrupt("return", _context.sent);
+        case 5:
+          _context.prev = 5;
+          _context.next = 8;
+          return api.disconnect();
+        case 8:
+          return _context.finish(5);
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1,, 5, 9]]);
+  }));
+  return function verifyEdOnDestination(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var isPrimitive = function isPrimitive(obj) {
   return obj !== Object(obj);
 };
@@ -20215,47 +20338,42 @@ var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge,
 
 var send = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-    var api, origin, currency, address, destination, paraIdTo, version, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, overriddenAsset, resolvedAsset, originNode;
+    var api, origin, currency, address, destination, paraIdTo, version, senderAddress, pallet, method, isBridge, assetCheckEnabled, asset, overriddenAsset, resolvedAsset, originNode;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          api = options.api, origin = options.origin, currency = options.currency, address = options.address, destination = options.destination, paraIdTo = options.paraIdTo, version = options.version, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method;
+          api = options.api, origin = options.origin, currency = options.currency, address = options.address, destination = options.destination, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, pallet = options.pallet, method = options.method;
           validateCurrency(currency);
           validateDestination(origin, destination);
           validateDestinationAddress(address, destination);
-          if (!(ahAddress && ethers.isAddress(ahAddress))) {
-            _context.next = 6;
-            break;
-          }
-          throw new Error('AssetHub address needs to be in Substrate format');
-        case 6:
+          if (senderAddress) validateAddress(senderAddress, origin, false);
           if (!(isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(destination))) {
-            _context.next = 8;
+            _context.next = 7;
             break;
           }
           throw new Error('Relay chain to relay chain transfers are not supported.');
-        case 8:
+        case 7:
           isBridge = isBridgeTransfer(origin, destination);
           assetCheckEnabled = determineAssetCheckEnabled(origin, currency, isBridge);
           validateAssetSpecifiers(assetCheckEnabled, currency);
           asset = resolveAsset(currency, origin, destination, assetCheckEnabled);
           validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
           if (!isRelayChain(origin)) {
-            _context.next = 19;
+            _context.next = 18;
             break;
           }
           if (!(destination === 'Ethereum')) {
-            _context.next = 16;
+            _context.next = 15;
             break;
           }
           throw new Error('Transfers from relay chain to Ethereum are not supported.');
-        case 16:
+        case 15:
           if (asset) {
-            _context.next = 18;
+            _context.next = 17;
             break;
           }
           throw new Error('Asset is required for relay chain to relay chain transfers.');
-        case 18:
+        case 17:
           return _context.abrupt("return", transferRelayToPara({
             api: api,
             origin: origin,
@@ -20269,11 +20387,11 @@ var send = /*#__PURE__*/function () {
             pallet: pallet,
             method: method
           }));
-        case 19:
+        case 18:
           overriddenAsset = resolveOverriddenAsset(options, isBridge, assetCheckEnabled);
-          _context.next = 22;
+          _context.next = 21;
           return api.init(origin);
-        case 22:
+        case 21:
           // In case asset check is disabled, we create asset object from currency symbol
           resolvedAsset = asset !== null && asset !== undefined ? asset : {
             symbol: 'symbol' in currency ? currency.symbol : undefined
@@ -20289,11 +20407,11 @@ var send = /*#__PURE__*/function () {
             paraIdTo: paraIdTo,
             overriddenAsset: overriddenAsset,
             version: version,
-            ahAddress: ahAddress,
+            senderAddress: senderAddress,
             pallet: pallet,
             method: method
           }));
-        case 25:
+        case 24:
         case "end":
           return _context.stop();
       }
@@ -20368,7 +20486,7 @@ var getDestinationMultilocation = function getDestinationMultilocation(api, addr
   return [1, paraId ? ["0x0000000".concat(paraId.toString(16)), acc] : [acc]];
 };
 
-var abi = [
+var abi$1 = [
 	{
 		inputs: [
 			{
@@ -20489,8 +20607,8 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
           }
           throw new Error('Override multilocation is not supported for Evm transfers');
         case 5:
-          contract = isEthersSigner(signer) ? new Contract(CONTRACT_ADDRESS, abi, signer) : getContract({
-            abi: abi,
+          contract = isEthersSigner(signer) ? new Contract(CONTRACT_ADDRESS, abi$1, signer) : getContract({
+            abi: abi$1,
             address: CONTRACT_ADDRESS,
             client: {
               "public": createPublicClient({
@@ -20568,6 +20686,72 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
   };
 }();
 
+var abi = [
+	{
+		inputs: [
+			{
+				components: [
+					{
+						internalType: "uint8",
+						name: "parents",
+						type: "uint8"
+					},
+					{
+						internalType: "bytes[]",
+						name: "interior",
+						type: "bytes[]"
+					}
+				],
+				internalType: "struct XCM.Location",
+				name: "dest",
+				type: "tuple"
+			},
+			{
+				components: [
+					{
+						internalType: "address",
+						name: "asset",
+						type: "address"
+					},
+					{
+						internalType: "uint256",
+						name: "amount",
+						type: "uint256"
+					}
+				],
+				internalType: "struct XCM.AssetAddressInfo[]",
+				name: "assets",
+				type: "tuple[]"
+			},
+			{
+				internalType: "enum XCM.TransferType",
+				name: "assetsTransferType",
+				type: "uint8"
+			},
+			{
+				internalType: "uint8",
+				name: "remoteFeesIdIndex",
+				type: "uint8"
+			},
+			{
+				internalType: "enum XCM.TransferType",
+				name: "feesTransferType",
+				type: "uint8"
+			},
+			{
+				internalType: "bytes",
+				name: "customXcmOnDest",
+				type: "bytes"
+			}
+		],
+		name: "transferAssetsUsingTypeAndThenAddress",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	}
+];
+
 var getParaEthTransferFees = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(ahApi) {
     var DEFAULT_FEE, feeStorageItem, leFeeHex, bytes, reversedHex, validReversedHex, leFee, transferBridgeFee, transferAssethubExecutionFee, finalBridgeFee, finalAssethubExecutionFee;
@@ -20576,7 +20760,7 @@ var getParaEthTransferFees = /*#__PURE__*/function () {
         case 0:
           DEFAULT_FEE = 2750872500000n;
           _context.next = 3;
-          return ahApi.getFromStorage('0x5fbc5c7ba58845ad1f1a9a7c5bc12fad');
+          return ahApi.getFromRpc('state', 'getStorage', '0x5fbc5c7ba58845ad1f1a9a7c5bc12fad');
         case 3:
           feeStorageItem = _context.sent;
           leFeeHex = feeStorageItem.replace('0x', '');
@@ -20603,4 +20787,158 @@ var getParaEthTransferFees = /*#__PURE__*/function () {
   };
 }();
 
-export { BatchMode, Builder, DuplicateAssetError, DuplicateAssetIdError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, Foreign, ForeignAbstract, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidCurrencyError, NODES_WITH_RELAY_CHAINS, NODES_WITH_RELAY_CHAINS_DOT_KSM, NODE_NAMES, NODE_NAMES_DOT_KSM, Native, NoXCMSupportImplementedError, NodeNotSupportedError, Override, Parents, PolkadotXcmError, SUPPORTED_PALLETS, ScenarioNotSupportedError, Version, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createX1Payload, _deepEqual as deepEqual, determineRelayChain, findAssetById, findAssetByMultiLocation, findAssetBySymbol, findBestMatches, generateAddressMultiLocationV4, generateAddressPayload, getAllAssetsSymbols, getAssetBalance, getAssetBalanceInternal, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssetMultiLocation, getAssets, getAssetsObject, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getDefaultPallet, getDryRun, getExistentialDeposit, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNativeAssetSymbol, getNativeAssets, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOtherAssets, getParaEthTransferFees, getParaId, getRelayChainSymbol, getSupportedAssets, getSupportedPallets, getSupportedPalletsDetails, getTNode, getTransferInfo, getTransferableAmount, hasSupportForAsset, isForeignAsset, isNodeEvm, isOverrideMultiLocationSpecifier, isRelayChain, isSymbolSpecifier, normalizeSymbol, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferRelayToPara, validateAddress };
+// https://github.com/moonbeam-foundation/moonbeam/blob/b2b1bde7ced13aad4bd2928effc415c521fd48cb/runtime/moonbeam/src/precompiles.rs#L281
+var xcmInterfacePrecompile = '0x000000000000000000000000000000000000081A';
+var XCDOT = '0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080';
+var transferMoonbeamToEth = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var _signer$account;
+    var api, from, to, signer, address, ahAddress, currency, foundAsset, ethAsset, contract, senderAddress, messageId, customXcm, customXcmOnDest, assetHubApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, transferFee, createTx, numberToHex32, tx;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          api = _ref.api, from = _ref.from, to = _ref.to, signer = _ref.signer, address = _ref.address, ahAddress = _ref.ahAddress, currency = _ref.currency;
+          if (ahAddress) {
+            _context.next = 3;
+            break;
+          }
+          throw new Error('AssetHub address is required');
+        case 3:
+          if (!('multiasset' in currency)) {
+            _context.next = 5;
+            break;
+          }
+          throw new Error('Multiassets syntax is not supported for Evm transfers');
+        case 5:
+          if (!('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation))) {
+            _context.next = 7;
+            break;
+          }
+          throw new Error('Override multilocation is not supported for Evm transfers');
+        case 7:
+          foundAsset = getAssetBySymbolOrId(from, currency, to);
+          if (!(foundAsset === null)) {
+            _context.next = 10;
+            break;
+          }
+          throw new InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
+        case 10:
+          if (!(!isForeignAsset(foundAsset) || !foundAsset.multiLocation)) {
+            _context.next = 12;
+            break;
+          }
+          throw new InvalidCurrencyError('Currency must be a foreign asset with valid multi-location');
+        case 12:
+          ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), foundAsset.multiLocation);
+          if (!(!ethAsset || !ethAsset.assetId)) {
+            _context.next = 15;
+            break;
+          }
+          throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(foundAsset)));
+        case 15:
+          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 = 22;
+            break;
+          }
+          _context.next = 19;
+          return signer.getAddress();
+        case 19:
+          _context.t0 = _context.sent;
+          _context.next = 23;
+          break;
+        case 22:
+          _context.t0 = (_signer$account = signer.account) === null || _signer$account === undefined ? undefined : _signer$account.address;
+        case 23:
+          senderAddress = _context.t0;
+          if (senderAddress) {
+            _context.next = 26;
+            break;
+          }
+          throw new Error('Unable to get sender address');
+        case 26:
+          _context.next = 28;
+          return api.init(from);
+        case 28:
+          _context.next = 30;
+          return generateMessageId(api, senderAddress, getParaId(from), ethAsset.assetId, address, currency.amount);
+        case 30:
+          messageId = _context.sent;
+          customXcm = createCustomXcmOnDest({
+            api: api,
+            destination: to,
+            address: address,
+            scenario: 'ParaToPara',
+            senderAddress: senderAddress,
+            asset: _objectSpread2(_objectSpread2({}, foundAsset), {}, {
+              amount: currency.amount
+            }),
+            header: {},
+            currencySelection: {},
+            addressSelection: {}
+          }, Version.V4, messageId);
+          _context.next = 34;
+          return api.objectToHex(customXcm, 'XcmVersionedXcm');
+        case 34:
+          customXcmOnDest = _context.sent;
+          _context.next = 37;
+          return api.createApiForNode('AssetHubPolkadot');
+        case 37:
+          assetHubApi = _context.sent;
+          _context.next = 40;
+          return getParaEthTransferFees(assetHubApi);
+        case 40:
+          _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 = 49;
+          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 49:
+          tx = _context.sent;
+          return _context.abrupt("return", _typeof(tx) === 'object' ? tx.hash : tx);
+        case 51:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function transferMoonbeamToEth(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+export { BatchMode, Builder, DuplicateAssetError, DuplicateAssetIdError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, Foreign, ForeignAbstract, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidCurrencyError, NODES_WITH_RELAY_CHAINS, NODES_WITH_RELAY_CHAINS_DOT_KSM, NODE_NAMES, NODE_NAMES_DOT_KSM, Native, NoXCMSupportImplementedError, NodeNotSupportedError, Override, Parents, PolkadotXcmError, SUPPORTED_PALLETS, ScenarioNotSupportedError, Version, XTokensError, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, createApiInstanceForNode, createX1Payload, _deepEqual as deepEqual, determineRelayChain, findAssetById, findAssetByMultiLocation, findAssetBySymbol, findBestMatches, generateAddressMultiLocationV4, generateAddressPayload, getAllAssetsSymbols, getAssetBalance, getAssetBalanceInternal, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssetMultiLocation, getAssets, getAssetsObject, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getDefaultPallet, getDryRun, getExistentialDeposit, getFees, getMaxForeignTransferableAmount, getMaxNativeTransferableAmount, getNativeAssetSymbol, getNativeAssets, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOtherAssets, getParaEthTransferFees, getParaId, getRelayChainSymbol, getSupportedAssets, getSupportedPallets, getSupportedPalletsDetails, getTNode, getTransferInfo, getTransferableAmount, hasSupportForAsset, isEthersContract, isEthersSigner, isForeignAsset, isNodeEvm, isOverrideMultiLocationSpecifier, isRelayChain, isSymbolSpecifier, normalizeSymbol, resolveModuleError, resolveParaId, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, validateAddress, verifyEdOnDestination };