@paraspell/sdk-pjs 8.3.0 → 8.4.0

package/README.md

@@ -315,7 +315,7 @@ await getBalanceForeign({address, node, currency /*- {id: currencyID} | {symbol:
 await getBalanceNative({address, node, api /* api/ws_url_string optional */})
 
 //Get fee information regarding XCM call
-await getOriginFeeDetails({from, to, currency /*- {id: currencyID} | {symbol: currencySymbol} | {symbol: Native('currencySymbol')} | {symbol: Foreign('currencySymbol')} | {symbol: ForeignAbstract('currencySymbol')} | {multilocation: AssetMultilocationString | AssetMultilocationJson}*/, amount, originAddress, destinationAddress, api /* api/ws_url_string optional */, feeMargin /* 10% by default */})
+await getOriginFeeDetails({from, to, currency /*- {id: currencyID} | {symbol: currencySymbol} | {symbol: Native('currencySymbol')} | {symbol: Foreign('currencySymbol')} | {symbol: ForeignAbstract('currencySymbol')} | {multilocation: AssetMultilocationString | AssetMultilocationJson}*/, amount, originAddress, destinationAddress, ahAddress /* optional parameter when destination is Ethereum and origin is Parachain other than AssetHub*/, api /* api/ws_url_string optional */, feeMargin /* 10% by default */})
 
 //Retrieves the asset balance for a given account on a specified node. (You do not need to specify if it is native or foreign).
 await getAssetBalance({address, node, currency /*- {id: currencyID} | {symbol: currencySymbol} | {symbol: Native('currencySymbol')} | {symbol: Foreign('currencySymbol')} | {symbol: ForeignAbstract('currencySymbol')} | {multilocation: AssetMultilocationString | AssetMultilocationJson}*/, api /* api/ws_url_string optional */});

package/dist/index.cjs

@@ -7,6 +7,8 @@ var api$1 = require('@polkadot/api');
 var types = require('@polkadot/types');
 var utilCrypto = require('@polkadot/util-crypto');
 var util = require('@polkadot/util');
+var ethers = require('ethers');
+var viem = require('viem');
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -16,6 +18,9 @@ function _arrayLikeToArray(r, a) {
 function _arrayWithHoles(r) {
   if (Array.isArray(r)) return r;
 }
+function _arrayWithoutHoles(r) {
+  if (Array.isArray(r)) return _arrayLikeToArray(r);
+}
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
     var i = n[a](c),
@@ -63,6 +68,9 @@ function _defineProperty(e, r, t) {
     writable: true
   }) : e[r] = t, e;
 }
+function _iterableToArray(r) {
+  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
+}
 function _iterableToArrayLimit(r, l) {
   var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (null != t) {
@@ -90,6 +98,9 @@ function _iterableToArrayLimit(r, l) {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function ownKeys(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -415,6 +426,9 @@ function _regeneratorRuntime() {
 function _slicedToArray(r, e) {
   return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
 }
+function _toConsumableArray(r) {
+  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+}
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -468,6 +482,9 @@ var createContext = function createContext(executionUrl, config) {
 var isEthersSigner = function isEthersSigner(signer) {
   return _typeof(signer) === 'object' && signer !== null && 'provider' in signer;
 };
+var isEthersContract = function isEthersContract(contract) {
+  return !('abi' in contract);
+};
 
 /**
  * Transfers an Ethereum asset to a Polkadot account.
@@ -1456,6 +1473,318 @@ var assets = /*#__PURE__*/Object.freeze({
   isNodeEvm: sdkCore.isNodeEvm
 });
 
+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"
+	}
+];
+
+// 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, BRIDGE_LOCATION, ERC20_TOKEN_LOCATION, ERC20_TOKEN_LOCATION_REANCHORED, customXcm, apiPjs, assetHubApi, assetHubApiPjs, xcmHash, sender, _yield$Promise$all, _yield$Promise$all2, parachainId, accountNextId, entropy, messageId, xcmOnDest, customXcmOnDest, transferFee, createTx, 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 (!('multiasset' in currency)) {
+            _context.next = 3;
+            break;
+          }
+          throw new Error('Multiassets syntax is not supported for Evm transfers');
+        case 3:
+          if (!('multilocation' in currency && sdkCore.isOverrideMultiLocationSpecifier(currency.multilocation))) {
+            _context.next = 5;
+            break;
+          }
+          throw new Error('Override multilocation is not supported for Evm transfers');
+        case 5:
+          foundAsset = sdkCore.getAssetBySymbolOrId(from, currency, to);
+          if (!(foundAsset === null)) {
+            _context.next = 8;
+            break;
+          }
+          throw new sdkCore.InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
+        case 8:
+          if (!(!sdkCore.isForeignAsset(foundAsset) || !foundAsset.multiLocation)) {
+            _context.next = 10;
+            break;
+          }
+          throw new sdkCore.InvalidCurrencyError('Currency must be a foreign asset with valid multi-location');
+        case 10:
+          ethAsset = sdkCore.findAssetByMultiLocation(sdkCore.getOtherAssets('Ethereum'), foundAsset.multiLocation);
+          if (ethAsset) {
+            _context.next = 13;
+            break;
+          }
+          throw new sdkCore.InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(foundAsset)));
+        case 13:
+          contract = isEthersSigner(signer) ? new ethers.Contract(xcmInterfacePrecompile, abi, signer) : viem.getContract({
+            abi: abi,
+            address: xcmInterfacePrecompile,
+            client: {
+              "public": viem.createPublicClient({
+                chain: signer.chain,
+                transport: viem.http()
+              }),
+              wallet: signer
+            }
+          });
+          BRIDGE_LOCATION = {
+            parents: 2,
+            interior: {
+              X1: [sdkCore.ETHEREUM_JUNCTION]
+            }
+          };
+          ERC20_TOKEN_LOCATION = {
+            parents: 2,
+            interior: {
+              X2: [{
+                GlobalConsensus: {
+                  Ethereum: {
+                    chain_id: sdkCore.ETH_CHAIN_ID
+                  }
+                }
+              }, {
+                AccountKey20: {
+                  key: foundAsset.assetId
+                }
+              }]
+            }
+          };
+          ERC20_TOKEN_LOCATION_REANCHORED = {
+            parents: 0,
+            interior: {
+              X1: [{
+                AccountKey20: {
+                  key: foundAsset.assetId
+                }
+              }]
+            }
+          };
+          customXcm = [{
+            setAppendix: [{
+              depositAsset: {
+                assets: {
+                  Wild: 'All'
+                },
+                beneficiary: {
+                  parents: 0,
+                  interior: {
+                    x1: [{
+                      AccountId32: {
+                        id: util.u8aToHex(utilCrypto.decodeAddress(ahAddress))
+                      }
+                    }]
+                  }
+                }
+              }
+            }]
+          }, {
+            initiateReserveWithdraw: {
+              assets: {
+                Wild: {
+                  AllOf: {
+                    id: ERC20_TOKEN_LOCATION,
+                    fun: 'Fungible'
+                  }
+                }
+              },
+              reserve: BRIDGE_LOCATION,
+              xcm: [{
+                buyExecution: {
+                  fees: {
+                    id: ERC20_TOKEN_LOCATION_REANCHORED,
+                    // CAUTION: Must use reanchored locations.
+                    fun: {
+                      Fungible: '1' // Offering 1 unit as fee, but it is returned to the destination address.
+                    }
+                  },
+                  weight_limit: 'Unlimited'
+                }
+              }, {
+                depositAsset: {
+                  assets: {
+                    Wild: {
+                      AllCounted: 1
+                    }
+                  },
+                  beneficiary: {
+                    parents: 0,
+                    interior: {
+                      x1: [{
+                        AccountKey20: {
+                          key: address
+                        }
+                      }]
+                    }
+                  }
+                }
+              }, {
+                setTopic: '0x0000000000000000000000000000000000000000000000000000000000000000'
+              }]
+            }
+          }, {
+            setTopic: '0x0000000000000000000000000000000000000000000000000000000000000000'
+          }];
+          _context.next = 20;
+          return api.init(from);
+        case 20:
+          apiPjs = api.getApi();
+          _context.next = 23;
+          return api.createApiForNode('AssetHubPolkadot');
+        case 23:
+          assetHubApi = _context.sent;
+          assetHubApiPjs = assetHubApi.getApi(); // Generate an unique messageId and set into `setTopic` for remote track
+          xcmHash = assetHubApiPjs.createType('Xcm', customXcm);
+          if (!isEthersSigner(signer)) {
+            _context.next = 32;
+            break;
+          }
+          _context.next = 29;
+          return signer.getAddress();
+        case 29:
+          _context.t0 = _context.sent;
+          _context.next = 33;
+          break;
+        case 32:
+          _context.t0 = (_signer$account = signer.account) === null || _signer$account === undefined ? undefined : _signer$account.address;
+        case 33:
+          sender = _context.t0;
+          _context.next = 36;
+          return Promise.all([apiPjs.query.parachainInfo.parachainId(), apiPjs.rpc.system.accountNextIndex(sender)]);
+        case 36:
+          _yield$Promise$all = _context.sent;
+          _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+          parachainId = _yield$Promise$all2[0];
+          accountNextId = _yield$Promise$all2[1];
+          entropy = new Uint8Array([].concat(_toConsumableArray(parachainId.toU8a()), _toConsumableArray(accountNextId.toU8a()), _toConsumableArray(xcmHash.toU8a())));
+          messageId = utilCrypto.blake2AsHex(entropy);
+          if (!(customXcm.length == 2)) {
+            _context.next = 47;
+            break;
+          }
+          customXcm[0].initiateReserveWithdraw.xcm[2].setTopic = messageId;
+          customXcm[1].setTopic = messageId;
+          _context.next = 53;
+          break;
+        case 47:
+          if (!(customXcm.length == 3)) {
+            _context.next = 52;
+            break;
+          }
+          customXcm[1].initiateReserveWithdraw.xcm[2].setTopic = messageId;
+          customXcm[2].setTopic = messageId;
+          _context.next = 53;
+          break;
+        case 52:
+          throw new Error('invalid xcm');
+        case 53:
+          xcmOnDest = assetHubApiPjs.createType('XcmVersionedXcm', {
+            V4: customXcm
+          });
+          customXcmOnDest = xcmOnDest.toHex();
+          _context.next = 57;
+          return sdkCore.calculateFee(assetHubApi);
+        case 57:
+          transferFee = _context.sent;
+          // 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);
+          }; // Execute the custom XCM message with the precompile
+          _context.next = 61;
+          return createTx(isEthersSigner(signer) ? 'transferAssetsUsingTypeAndThenAddress((uint8,bytes[]),(address,uint256)[],uint8,uint8,uint8,bytes)' : 'transferAssetsUsingTypeAndThenAddress', [
+          // This represents (1,X1(Parachain(1000)))
+          [1, ['0x00' + util.numberToHex(sdkCore.getParaId('AssetHubPolkadot'), 32).slice(2)]],
+          // Assets including fee and the ERC20 asset, with fee be the first
+          [[XCDOT, transferFee], [ethAsset.assetId, currency.amount]],
+          // 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 61:
+          tx = _context.sent;
+          return _context.abrupt("return", _typeof(tx) === 'object' ? tx.hash : tx);
+        case 63:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function transferMoonbeamToEth(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
 /**
  * Builder class for constructing transfers from Ethereum to Polkadot.
  */
@@ -1504,8 +1833,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
      */
   }, {
     key: "address",
-    value: function address(_address) {
+    value: function address(_address, ahAddress) {
       this._options.address = _address;
+      this._options.ahAddress = ahAddress;
       return this;
     }
     /**
@@ -1551,22 +1881,35 @@ var EvmBuilderClass = /*#__PURE__*/function () {
               _context.next = 2;
               break;
             case 9:
+              sdkCore.validateAddress(this._options.address, this._options.to);
+              if (!(this._options.from === 'Moonbeam' && this._options.to === 'Ethereum')) {
+                _context.next = 12;
+                break;
+              }
+              return _context.abrupt("return", transferMoonbeamToEth(this._options));
+            case 12:
               if (!(this._options.from === 'Moonbeam' || this._options.from === 'Moonriver')) {
-                _context.next = 13;
+                _context.next = 16;
                 break;
               }
-              _context.next = 12;
+              _context.next = 15;
               return sdkCore.transferMoonbeamEvm(this._options);
-            case 12:
+            case 15:
               return _context.abrupt("return", _context.sent);
-            case 13:
-              _context.next = 15;
+            case 16:
+              if (!(this._options.from === 'Ethereum')) {
+                _context.next = 22;
+                break;
+              }
+              _context.next = 19;
               return transferEthToPolkadot$1(this._options);
-            case 15:
+            case 19:
               _yield$transferEthToP = _context.sent;
               response = _yield$transferEthToP.response;
               return _context.abrupt("return", response.hash);
-            case 18:
+            case 22:
+              throw new Error('Scenario not supported');
+            case 23:
             case "end":
               return _context.stop();
           }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _paraspell_sdk_core from '@paraspell/sdk-core';
-import { TApiOrUrl, TEvmBuilderOptions, Foreign, ForeignAbstract, Native, Override, getAllAssetsSymbols, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssets, getAssetsObject, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTNode, hasSupportForAsset, isNodeEvm, TOptionalEvmBuilderOptions, IPolkadotApi, TNodeDotKsmWithRelayChains, TCurrencyInputWithAmount, GeneralBuilder as GeneralBuilder$1, IFinalBuilderWithOptions as IFinalBuilderWithOptions$1 } from '@paraspell/sdk-core';
+import { TApiOrUrl, TEvmBuilderOptions, Foreign, ForeignAbstract, Native, Override, getAllAssetsSymbols, getAssetBySymbolOrId, getAssetDecimals, getAssetId, getAssets, getAssetsObject, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTNode, hasSupportForAsset, isNodeEvm, TOptionalEvmBuilderOptions, IPolkadotApi, TNodeWithRelayChains, TCurrencyInputWithAmount, GeneralBuilder as GeneralBuilder$1, IFinalBuilderWithOptions as IFinalBuilderWithOptions$1, TNodeDotKsmWithRelayChains } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import * as _snowbridge_api_dist_toPolkadot_v2 from '@snowbridge/api/dist/toPolkadot_v2';
 import * as ethers from 'ethers';
@@ -157,7 +157,7 @@ declare class EvmBuilderClass<TApi, TRes> {
      * @param node - The Polkadot node to which the transfer will be made.
      * @returns An instance of EvmBuilder
      */
-    to(node: TNodeDotKsmWithRelayChains): this;
+    to(node: TNodeWithRelayChains): this;
     /**
      * Specifies the currency to transfer.
      *
@@ -171,7 +171,7 @@ declare class EvmBuilderClass<TApi, TRes> {
      * @param address - The Polkadot address to receive the transfer.
      * @returns An instance of EvmBuilder
      */
-    address(address: string): this;
+    address(address: string, ahAddress?: string): this;
     /**
      * Specifies the signer for the Ethereum transaction.
      *

package/dist/index.mjs

@@ -1,11 +1,13 @@
-import { getParaId, isForeignAsset, InvalidCurrencyError, getAssetBySymbolOrId, isOverrideMultiLocationSpecifier, BatchMode, createApiInstanceForNode as createApiInstanceForNode$1, getNode, computeFeeFromDryRunPjs, resolveModuleError, getAssetsObject, send as send$1, getDryRun as getDryRun$1, getBalanceNative as getBalanceNative$1, getBalanceForeign as getBalanceForeign$1, getTransferInfo as getTransferInfo$1, getAssetBalance as getAssetBalance$1, claimAssets as claimAssets$1, getOriginFeeDetails as getOriginFeeDetails$1, getMaxNativeTransferableAmount as getMaxNativeTransferableAmount$1, getMaxForeignTransferableAmount as getMaxForeignTransferableAmount$1, getTransferableAmount as getTransferableAmount$1, Foreign, ForeignAbstract, Native, Override, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTNode, hasSupportForAsset, isNodeEvm, transferMoonbeamEvm, Builder as Builder$1, GeneralBuilder as GeneralBuilder$1 } from '@paraspell/sdk-core';
+import { getParaId, isForeignAsset, InvalidCurrencyError, getAssetBySymbolOrId, isOverrideMultiLocationSpecifier, BatchMode, createApiInstanceForNode as createApiInstanceForNode$1, getNode, computeFeeFromDryRunPjs, resolveModuleError, getAssetsObject, send as send$1, getDryRun as getDryRun$1, getBalanceNative as getBalanceNative$1, getBalanceForeign as getBalanceForeign$1, getTransferInfo as getTransferInfo$1, getAssetBalance as getAssetBalance$1, claimAssets as claimAssets$1, getOriginFeeDetails as getOriginFeeDetails$1, getMaxNativeTransferableAmount as getMaxNativeTransferableAmount$1, getMaxForeignTransferableAmount as getMaxForeignTransferableAmount$1, getTransferableAmount as getTransferableAmount$1, Foreign, ForeignAbstract, Native, Override, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTNode, hasSupportForAsset, isNodeEvm, calculateFee, ETH_CHAIN_ID, findAssetByMultiLocation, ETHEREUM_JUNCTION, transferMoonbeamEvm, validateAddress, Builder as Builder$1, GeneralBuilder as GeneralBuilder$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { Context, toPolkadotV2, assetsV2, environment } from '@snowbridge/api';
 import { WETH9__factory } from '@snowbridge/contract-types';
 import { WsProvider, ApiPromise } from '@polkadot/api';
 import { u32 } from '@polkadot/types';
-import { decodeAddress } from '@polkadot/util-crypto';
-import { u8aToHex } from '@polkadot/util';
+import { decodeAddress, blake2AsHex } from '@polkadot/util-crypto';
+import { u8aToHex, numberToHex } from '@polkadot/util';
+import { Contract } from 'ethers';
+import { getContract, createPublicClient, http } from 'viem';
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -15,6 +17,9 @@ function _arrayLikeToArray(r, a) {
 function _arrayWithHoles(r) {
   if (Array.isArray(r)) return r;
 }
+function _arrayWithoutHoles(r) {
+  if (Array.isArray(r)) return _arrayLikeToArray(r);
+}
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
     var i = n[a](c),
@@ -62,6 +67,9 @@ function _defineProperty(e, r, t) {
     writable: true
   }) : e[r] = t, e;
 }
+function _iterableToArray(r) {
+  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
+}
 function _iterableToArrayLimit(r, l) {
   var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (null != t) {
@@ -89,6 +97,9 @@ function _iterableToArrayLimit(r, l) {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function ownKeys(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -414,6 +425,9 @@ function _regeneratorRuntime() {
 function _slicedToArray(r, e) {
   return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
 }
+function _toConsumableArray(r) {
+  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+}
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -467,6 +481,9 @@ var createContext = function createContext(executionUrl, config) {
 var isEthersSigner = function isEthersSigner(signer) {
   return _typeof(signer) === 'object' && signer !== null && 'provider' in signer;
 };
+var isEthersContract = function isEthersContract(contract) {
+  return !('abi' in contract);
+};
 
 /**
  * Transfers an Ethereum asset to a Polkadot account.
@@ -1455,6 +1472,318 @@ var assets = /*#__PURE__*/Object.freeze({
   isNodeEvm: isNodeEvm
 });
 
+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"
+	}
+];
+
+// 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, BRIDGE_LOCATION, ERC20_TOKEN_LOCATION, ERC20_TOKEN_LOCATION_REANCHORED, customXcm, apiPjs, assetHubApi, assetHubApiPjs, xcmHash, sender, _yield$Promise$all, _yield$Promise$all2, parachainId, accountNextId, entropy, messageId, xcmOnDest, customXcmOnDest, transferFee, createTx, 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 (!('multiasset' in currency)) {
+            _context.next = 3;
+            break;
+          }
+          throw new Error('Multiassets syntax is not supported for Evm transfers');
+        case 3:
+          if (!('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation))) {
+            _context.next = 5;
+            break;
+          }
+          throw new Error('Override multilocation is not supported for Evm transfers');
+        case 5:
+          foundAsset = getAssetBySymbolOrId(from, currency, to);
+          if (!(foundAsset === null)) {
+            _context.next = 8;
+            break;
+          }
+          throw new InvalidCurrencyError("Origin node ".concat(from, " does not support currency ").concat(JSON.stringify(currency), "."));
+        case 8:
+          if (!(!isForeignAsset(foundAsset) || !foundAsset.multiLocation)) {
+            _context.next = 10;
+            break;
+          }
+          throw new InvalidCurrencyError('Currency must be a foreign asset with valid multi-location');
+        case 10:
+          ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), foundAsset.multiLocation);
+          if (ethAsset) {
+            _context.next = 13;
+            break;
+          }
+          throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(foundAsset)));
+        case 13:
+          contract = isEthersSigner(signer) ? new Contract(xcmInterfacePrecompile, abi, signer) : getContract({
+            abi: abi,
+            address: xcmInterfacePrecompile,
+            client: {
+              "public": createPublicClient({
+                chain: signer.chain,
+                transport: http()
+              }),
+              wallet: signer
+            }
+          });
+          BRIDGE_LOCATION = {
+            parents: 2,
+            interior: {
+              X1: [ETHEREUM_JUNCTION]
+            }
+          };
+          ERC20_TOKEN_LOCATION = {
+            parents: 2,
+            interior: {
+              X2: [{
+                GlobalConsensus: {
+                  Ethereum: {
+                    chain_id: ETH_CHAIN_ID
+                  }
+                }
+              }, {
+                AccountKey20: {
+                  key: foundAsset.assetId
+                }
+              }]
+            }
+          };
+          ERC20_TOKEN_LOCATION_REANCHORED = {
+            parents: 0,
+            interior: {
+              X1: [{
+                AccountKey20: {
+                  key: foundAsset.assetId
+                }
+              }]
+            }
+          };
+          customXcm = [{
+            setAppendix: [{
+              depositAsset: {
+                assets: {
+                  Wild: 'All'
+                },
+                beneficiary: {
+                  parents: 0,
+                  interior: {
+                    x1: [{
+                      AccountId32: {
+                        id: u8aToHex(decodeAddress(ahAddress))
+                      }
+                    }]
+                  }
+                }
+              }
+            }]
+          }, {
+            initiateReserveWithdraw: {
+              assets: {
+                Wild: {
+                  AllOf: {
+                    id: ERC20_TOKEN_LOCATION,
+                    fun: 'Fungible'
+                  }
+                }
+              },
+              reserve: BRIDGE_LOCATION,
+              xcm: [{
+                buyExecution: {
+                  fees: {
+                    id: ERC20_TOKEN_LOCATION_REANCHORED,
+                    // CAUTION: Must use reanchored locations.
+                    fun: {
+                      Fungible: '1' // Offering 1 unit as fee, but it is returned to the destination address.
+                    }
+                  },
+                  weight_limit: 'Unlimited'
+                }
+              }, {
+                depositAsset: {
+                  assets: {
+                    Wild: {
+                      AllCounted: 1
+                    }
+                  },
+                  beneficiary: {
+                    parents: 0,
+                    interior: {
+                      x1: [{
+                        AccountKey20: {
+                          key: address
+                        }
+                      }]
+                    }
+                  }
+                }
+              }, {
+                setTopic: '0x0000000000000000000000000000000000000000000000000000000000000000'
+              }]
+            }
+          }, {
+            setTopic: '0x0000000000000000000000000000000000000000000000000000000000000000'
+          }];
+          _context.next = 20;
+          return api.init(from);
+        case 20:
+          apiPjs = api.getApi();
+          _context.next = 23;
+          return api.createApiForNode('AssetHubPolkadot');
+        case 23:
+          assetHubApi = _context.sent;
+          assetHubApiPjs = assetHubApi.getApi(); // Generate an unique messageId and set into `setTopic` for remote track
+          xcmHash = assetHubApiPjs.createType('Xcm', customXcm);
+          if (!isEthersSigner(signer)) {
+            _context.next = 32;
+            break;
+          }
+          _context.next = 29;
+          return signer.getAddress();
+        case 29:
+          _context.t0 = _context.sent;
+          _context.next = 33;
+          break;
+        case 32:
+          _context.t0 = (_signer$account = signer.account) === null || _signer$account === undefined ? undefined : _signer$account.address;
+        case 33:
+          sender = _context.t0;
+          _context.next = 36;
+          return Promise.all([apiPjs.query.parachainInfo.parachainId(), apiPjs.rpc.system.accountNextIndex(sender)]);
+        case 36:
+          _yield$Promise$all = _context.sent;
+          _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+          parachainId = _yield$Promise$all2[0];
+          accountNextId = _yield$Promise$all2[1];
+          entropy = new Uint8Array([].concat(_toConsumableArray(parachainId.toU8a()), _toConsumableArray(accountNextId.toU8a()), _toConsumableArray(xcmHash.toU8a())));
+          messageId = blake2AsHex(entropy);
+          if (!(customXcm.length == 2)) {
+            _context.next = 47;
+            break;
+          }
+          customXcm[0].initiateReserveWithdraw.xcm[2].setTopic = messageId;
+          customXcm[1].setTopic = messageId;
+          _context.next = 53;
+          break;
+        case 47:
+          if (!(customXcm.length == 3)) {
+            _context.next = 52;
+            break;
+          }
+          customXcm[1].initiateReserveWithdraw.xcm[2].setTopic = messageId;
+          customXcm[2].setTopic = messageId;
+          _context.next = 53;
+          break;
+        case 52:
+          throw new Error('invalid xcm');
+        case 53:
+          xcmOnDest = assetHubApiPjs.createType('XcmVersionedXcm', {
+            V4: customXcm
+          });
+          customXcmOnDest = xcmOnDest.toHex();
+          _context.next = 57;
+          return calculateFee(assetHubApi);
+        case 57:
+          transferFee = _context.sent;
+          // 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);
+          }; // Execute the custom XCM message with the precompile
+          _context.next = 61;
+          return createTx(isEthersSigner(signer) ? 'transferAssetsUsingTypeAndThenAddress((uint8,bytes[]),(address,uint256)[],uint8,uint8,uint8,bytes)' : 'transferAssetsUsingTypeAndThenAddress', [
+          // This represents (1,X1(Parachain(1000)))
+          [1, ['0x00' + numberToHex(getParaId('AssetHubPolkadot'), 32).slice(2)]],
+          // Assets including fee and the ERC20 asset, with fee be the first
+          [[XCDOT, transferFee], [ethAsset.assetId, currency.amount]],
+          // 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 61:
+          tx = _context.sent;
+          return _context.abrupt("return", _typeof(tx) === 'object' ? tx.hash : tx);
+        case 63:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function transferMoonbeamToEth(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
 /**
  * Builder class for constructing transfers from Ethereum to Polkadot.
  */
@@ -1503,8 +1832,9 @@ var EvmBuilderClass = /*#__PURE__*/function () {
      */
   }, {
     key: "address",
-    value: function address(_address) {
+    value: function address(_address, ahAddress) {
       this._options.address = _address;
+      this._options.ahAddress = ahAddress;
       return this;
     }
     /**
@@ -1550,22 +1880,35 @@ var EvmBuilderClass = /*#__PURE__*/function () {
               _context.next = 2;
               break;
             case 9:
+              validateAddress(this._options.address, this._options.to);
+              if (!(this._options.from === 'Moonbeam' && this._options.to === 'Ethereum')) {
+                _context.next = 12;
+                break;
+              }
+              return _context.abrupt("return", transferMoonbeamToEth(this._options));
+            case 12:
               if (!(this._options.from === 'Moonbeam' || this._options.from === 'Moonriver')) {
-                _context.next = 13;
+                _context.next = 16;
                 break;
               }
-              _context.next = 12;
+              _context.next = 15;
               return transferMoonbeamEvm(this._options);
-            case 12:
+            case 15:
               return _context.abrupt("return", _context.sent);
-            case 13:
-              _context.next = 15;
+            case 16:
+              if (!(this._options.from === 'Ethereum')) {
+                _context.next = 22;
+                break;
+              }
+              _context.next = 19;
               return transferEthToPolkadot$1(this._options);
-            case 15:
+            case 19:
               _yield$transferEthToP = _context.sent;
               response = _yield$transferEthToP.response;
               return _context.abrupt("return", response.hash);
-            case 18:
+            case 22:
+              throw new Error('Scenario not supported');
+            case 23:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-pjs",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "Polkadot.js based SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "@snowbridge/contract-types": "^0.1.32",
     "ethers": "^6.13.5",
     "viem": "^2.22.22",
-    "@paraspell/sdk-core": "8.3.0"
+    "@paraspell/sdk-core": "8.4.0"
   },
   "peerDependencies": {
     "@polkadot/api": ">= 15.0 < 16",