@paraspell/sdk-core 8.3.0 → 8.4.0

package/dist/index.cjs

@@ -2719,7 +2719,7 @@ var Darwinia$3 = {
 	relayChainAssetSymbol: "DOT",
 	nativeAssetSymbol: "RING",
 	isEVM: true,
-	supportsDryRunApi: false,
+	supportsDryRunApi: true,
 	nativeAssets: [
 		{
 			symbol: "RING",
@@ -2842,6 +2842,84 @@ var Hydration$3 = {
 			existentialDeposit: "10000",
 			alias: "USDC1"
 		},
+		{
+			assetId: "1000796",
+			symbol: "LDO",
+			decimals: 18,
+			multiLocation: {
+				parents: 2,
+				interior: {
+					X2: [
+						{
+							GlobalConsensus: {
+								Ethereum: {
+									chainId: 1
+								}
+							}
+						},
+						{
+							AccountKey20: {
+								network: null,
+								key: "0x5a98fcbea516cf06857215779fd812ca3bef1b32"
+							}
+						}
+					]
+				}
+			},
+			existentialDeposit: "5102040816326530"
+		},
+		{
+			assetId: "1000795",
+			symbol: "SKY",
+			decimals: 18,
+			multiLocation: {
+				parents: 2,
+				interior: {
+					X2: [
+						{
+							GlobalConsensus: {
+								Ethereum: {
+									chainId: 1
+								}
+							}
+						},
+						{
+							AccountKey20: {
+								network: null,
+								key: "0x56072c95faa701256059aa122697b133aded9279"
+							}
+						}
+					]
+				}
+			},
+			existentialDeposit: "211685012701101000"
+		},
+		{
+			assetId: "1000794",
+			symbol: "LINK",
+			decimals: 18,
+			multiLocation: {
+				parents: 2,
+				interior: {
+					X2: [
+						{
+							GlobalConsensus: {
+								Ethereum: {
+									chainId: 1
+								}
+							}
+						},
+						{
+							AccountKey20: {
+								network: null,
+								key: "0x514910771af9ca656af840dff83e8264ecf986ca"
+							}
+						}
+					]
+				}
+			},
+			existentialDeposit: "436681222707424"
+		},
 		{
 			assetId: "1000625",
 			symbol: "sUSDe",
@@ -2960,6 +3038,32 @@ var Hydration$3 = {
 			existentialDeposit: "9910802775024780",
 			alias: "sUSDS1"
 		},
+		{
+			assetId: "1000809",
+			symbol: "wstETH",
+			decimals: 18,
+			multiLocation: {
+				parents: 2,
+				interior: {
+					X2: [
+						{
+							GlobalConsensus: {
+								Ethereum: {
+									chainId: 1
+								}
+							}
+						},
+						{
+							AccountKey20: {
+								network: null,
+								key: "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0"
+							}
+						}
+					]
+				}
+			},
+			existentialDeposit: "3244646333550"
+		},
 		{
 			assetId: "1000767",
 			symbol: "USDT",
@@ -4001,6 +4105,20 @@ var Hydration$3 = {
 				}
 			},
 			existentialDeposit: "21367521367521400"
+		},
+		{
+			assetId: "3370",
+			symbol: "LAOS",
+			decimals: 18,
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X1: {
+						Parachain: 3370
+					}
+				}
+			},
+			existentialDeposit: "1"
 		}
 	]
 };
@@ -4383,12 +4501,12 @@ var Interlay$3 = {
 };
 var Litentry$3 = {
 	relayChainAssetSymbol: "DOT",
-	nativeAssetSymbol: "LIT",
+	nativeAssetSymbol: "HEI",
 	isEVM: false,
 	supportsDryRunApi: false,
 	nativeAssets: [
 		{
-			symbol: "LIT",
+			symbol: "HEI",
 			decimals: 18,
 			existentialDeposit: "100000000000000000"
 		}
@@ -4543,6 +4661,28 @@ var Moonbeam$3 = {
 			},
 			existentialDeposit: "1"
 		},
+		{
+			assetId: "66249247788835743307843320271452141931",
+			symbol: "xcvBNC",
+			decimals: 12,
+			multiLocation: {
+				parents: 1,
+				interior: {
+					X2: [
+						{
+							Parachain: 2030
+						},
+						{
+							GeneralKey: {
+								length: 2,
+								data: "0x0101000000000000000000000000000000000000000000000000000000000000"
+							}
+						}
+					]
+				}
+			},
+			existentialDeposit: "1"
+		},
 		{
 			assetId: "125699734534028342599692732320197985871",
 			symbol: "xcRING",
@@ -10989,12 +11129,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
 							}
 						}
@@ -11013,12 +11154,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599"
 							}
 						}
@@ -11037,12 +11179,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce"
 							}
 						}
@@ -11061,12 +11204,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x6982508145454ce325ddbe47a25d4ec3d2311933"
 							}
 						}
@@ -11085,12 +11229,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x582d872a1b094fc48f5de31d3b73f2d9be47def1"
 							}
 						}
@@ -11109,12 +11254,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0"
 							}
 						}
@@ -11133,12 +11279,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x18084fba666a33d37592fa2633fd49a74dd93a88"
 							}
 						}
@@ -11157,12 +11304,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
 							}
 						}
@@ -11181,12 +11329,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0xdac17f958d2ee523a2206206994597c13d831ec7"
 							}
 						}
@@ -11205,12 +11354,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x6b175474e89094c44da98b954eedeac495271d0f"
 							}
 						}
@@ -11229,12 +11379,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x5d3d01fd6d2ad1169b17918eb4f153c6616288eb"
 							}
 						}
@@ -11253,12 +11404,13 @@ var Ethereum = {
 						{
 							GlobalConsensus: {
 								Ethereum: {
-									chain_id: 1
+									chainId: 1
 								}
 							}
 						},
 						{
 							AccountKey20: {
+								network: null,
 								key: "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9"
 							}
 						}
@@ -11807,11 +11959,12 @@ exports.PolkadotXcmError = void 0;
 })(exports.PolkadotXcmError || (exports.PolkadotXcmError = {}));
 
 var DEFAULT_FEE_ASSET = 0;
-var ETH_CHAIN_ID = 1n;
+var ETH_PARA_ID = 1;
+var ETH_CHAIN_ID = BigInt(ETH_PARA_ID);
 var ETHEREUM_JUNCTION = {
   GlobalConsensus: {
     Ethereum: {
-      chain_id: ETH_CHAIN_ID
+      chainId: ETH_CHAIN_ID
     }
   }
 };
@@ -13493,6 +13646,9 @@ var getNodeProviders = function getNodeProviders(node) {
  * @returns The parachain ID of the node.
  */
 var getParaId = function getParaId(node) {
+  if (node === 'Ethereum') {
+    return ETH_PARA_ID;
+  }
   return getNodeConfig(node).paraId;
 };
 
@@ -13607,10 +13763,10 @@ var resolveTNodeFromMultiLocation = function resolveTNodeFromMultiLocation(relay
   return node;
 };
 var throwUnsupportedCurrency = function throwUnsupportedCurrency(currency, node) {
-  var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+  var _ref8 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
       isDestination: false
     },
-    isDestination = _ref7.isDestination;
+    isDestination = _ref8.isDestination;
   if ('multilocation' in currency) {
     throw new InvalidCurrencyError("\n      Selected chain doesn't support multilocation you provided. Maybe you meant custom multilocation. If so, you need to use override option. Your selection should look like this: {multilocation: Override(".concat(JSON.stringify(currency.multilocation), ")}."));
   }
@@ -13763,78 +13919,265 @@ var resolveParaId = function resolveParaId(paraId, destination) {
   return paraId !== null && paraId !== undefined ? paraId : getParaId(destination);
 };
 
-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;
+var calculateFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(ahApi) {
+    var DEFAULT_FEE, feeStorageItem, leFeeHex, leFee, transfer_bridge_fee, transfer_assethub_execution_fee;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          DEFAULT_FEE = 2750872500000n;
+          _context.next = 3;
+          return ahApi.getFromStorage('0x5fbc5c7ba58845ad1f1a9a7c5bc12fad');
+        case 3:
+          feeStorageItem = _context.sent;
+          leFeeHex = feeStorageItem.replace('0x', '');
+          _context.next = 7;
+          return ahApi.disconnect();
+        case 7:
+          leFee = BigInt('0x' + leFeeHex.split('').reverse().join(''));
+          transfer_bridge_fee = leFee === 0n ? DEFAULT_FEE : BigInt(leFee.toString());
+          transfer_assethub_execution_fee = 2200000000n;
+          return _context.abrupt("return", (transfer_bridge_fee + transfer_assethub_execution_fee).toString());
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function calculateFee(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var generateAddressPayload = function generateAddressPayload(api, scenario, pallet, recipientAddress, version, nodeId) {
+  var isMultiLocation = _typeof(recipientAddress) === 'object';
+  if (isMultiLocation) {
+    return _defineProperty({}, version, recipientAddress);
   }
-  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(_) {
-      return true;
-    }
-  }, {
-    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;
-        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;
-              isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
-              scenario = isRelayDestination ? 'ParaToRelay' : 'ParaToPara';
-              paraId = resolveParaId(paraIdTo, destination);
-              if (!(destination === 'Polimec' && this.node !== 'AssetHubPolkadot')) {
-                _context.next = 6;
-                break;
-              }
-              throw new Error('Sending assets to Polimec is supported only from AssetHubPolkadot');
-            case 6:
-              versionOrDefault = version !== null && version !== undefined ? version : this.version;
-              if (!(supportsXTokens(this) && this.canUseXTokens(options))) {
-                _context.next = 17;
-                break;
-              }
-              isBifrostOrigin = this.node === 'BifrostPolkadot' || this.node === 'BifrostKusama';
+  var isEthAddress = ethers.ethers.isAddress(recipientAddress);
+  if (scenario === 'ParaToRelay') {
+    return _defineProperty({}, version, {
+      parents: pallet === 'XTokens' ? exports.Parents.ONE : exports.Parents.ZERO,
+      interior: createX1Payload(version, {
+        AccountId32: _objectSpread2(_objectSpread2({}, version === exports.Version.V1 && {
+          network: 'any'
+        }), {}, {
+          id: api.createAccountId(recipientAddress)
+        })
+      })
+    });
+  }
+  if (scenario === 'ParaToPara' && pallet === 'XTokens') {
+    return _defineProperty({}, version, {
+      parents: exports.Parents.ONE,
+      interior: {
+        X2: [{
+          Parachain: nodeId
+        }, isEthAddress ? {
+          AccountKey20: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
+            network: 'any'
+          }), {}, {
+            key: recipientAddress
+          })
+        } : {
+          AccountId32: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
+            network: 'any'
+          }), {}, {
+            id: api.createAccountId(recipientAddress)
+          })
+        }]
+      }
+    });
+  }
+  if (scenario === 'ParaToPara' && pallet === 'PolkadotXcm') {
+    return _defineProperty({}, version, {
+      parents: exports.Parents.ZERO,
+      interior: createX1Payload(version, isEthAddress ? {
+        AccountKey20: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
+          network: 'any'
+        }), {}, {
+          key: recipientAddress
+        })
+      } : {
+        AccountId32: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
+          network: 'any'
+        }), {}, {
+          id: api.createAccountId(recipientAddress)
+        })
+      })
+    });
+  }
+  return _defineProperty({}, version, {
+    parents: exports.Parents.ZERO,
+    interior: createX1Payload(version, isEthAddress ? {
+      AccountKey20: {
+        key: recipientAddress
+      }
+    } : {
+      AccountId32: {
+        id: api.createAccountId(recipientAddress)
+      }
+    })
+  });
+};
+
+var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, version) {
+  var api = _ref.api,
+    address = _ref.address,
+    asset = _ref.asset,
+    scenario = _ref.scenario,
+    ahAddress = _ref.ahAddress;
+  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"));
+  }
+  var ethAsset = findAssetByMultiLocation(getOtherAssets('Ethereum'), asset.multiLocation);
+  if (!ethAsset) {
+    throw new InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(asset)));
+  }
+  return _defineProperty({}, version, [{
+    SetAppendix: [{
+      DepositAsset: {
+        assets: {
+          Wild: 'All'
+        },
+        beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', ahAddress !== null && ahAddress !== undefined ? ahAddress : '', version, undefined))[0]
+      }
+    }]
+  }, {
+    InitiateReserveWithdraw: {
+      assets: {
+        Wild: {
+          AllOf: {
+            id: asset.multiLocation,
+            fun: 'Fungible'
+          }
+        }
+      },
+      reserve: {
+        parents: exports.Parents.TWO,
+        interior: {
+          X1: [ETHEREUM_JUNCTION]
+        }
+      },
+      xcm: [{
+        BuyExecution: {
+          fees: {
+            id: {
+              parents: exports.Parents.ZERO,
+              interior: {
+                X1: [{
+                  AccountKey20: {
+                    network: null,
+                    key: ethAsset.assetId
+                  }
+                }]
+              }
+            },
+            fun: {
+              Fungible: 1n
+            }
+          },
+          weight_limit: 'Unlimited'
+        }
+      }, {
+        DepositAsset: {
+          assets: {
+            Wild: {
+              AllCounted: 1
+            }
+          },
+          beneficiary: {
+            parents: exports.Parents.ZERO,
+            interior: {
+              X1: [{
+                AccountKey20: {
+                  network: null,
+                  key: address
+                }
+              }]
+            }
+          }
+        }
+      }]
+    }
+  }]);
+};
+
+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(_) {
+      return true;
+    }
+  }, {
+    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;
+        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;
+              isRelayDestination = !isTMultiLocation(destination) && isRelayChain(destination);
+              scenario = isRelayDestination ? 'ParaToRelay' : 'ParaToPara';
+              paraId = resolveParaId(paraIdTo, destination);
+              if (!(destination === 'Polimec' && this.node !== 'AssetHubPolkadot')) {
+                _context.next = 6;
+                break;
+              }
+              throw new Error('Sending assets to Polimec is supported only from AssetHubPolkadot');
+            case 6:
+              versionOrDefault = version !== null && version !== undefined ? version : this.version;
+              if (!(supportsXTokens(this) && this.canUseXTokens(options))) {
+                _context.next = 17;
+                break;
+              }
+              isBifrostOrigin = this.node === 'BifrostPolkadot' || this.node === 'BifrostKusama';
               isAssetHubDest = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
               shouldUseMultiasset = isAssetHubDest && !isBifrostOrigin;
               input = {
@@ -13948,6 +14291,65 @@ var ParachainNode = /*#__PURE__*/function () {
     value: function getNativeAssetSymbol$1() {
       return getNativeAssetSymbol(this.node);
     }
+  }, {
+    key: "transferToEthereum",
+    value: function () {
+      var _transferToEthereum = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(input) {
+        var api, asset, scenario, version, destination, ahAddress, versionOrDefault, ethMultiAsset, ahApi, fee, 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;
+              if (isForeignAsset(asset)) {
+                _context2.next = 3;
+                break;
+              }
+              throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
+            case 3:
+              if (!(ahAddress === undefined)) {
+                _context2.next = 5;
+                break;
+              }
+              throw new Error('AssetHub address is required for Ethereum transfers');
+            case 5:
+              versionOrDefault = version !== null && version !== undefined ? version : exports.Version.V4;
+              ethMultiAsset = Object.values(createCurrencySpec(asset.amount, versionOrDefault, exports.Parents.TWO, asset.multiLocation))[0][0];
+              _context2.next = 9;
+              return api.createApiForNode('AssetHubPolkadot');
+            case 9:
+              ahApi = _context2.sent;
+              _context2.next = 12;
+              return calculateFee(ahApi);
+            case 12:
+              fee = _context2.sent;
+              call = {
+                module: 'PolkadotXcm',
+                section: 'transfer_assets_using_type_and_then',
+                parameters: {
+                  dest: this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, getParaId('AssetHubPolkadot')),
+                  assets: _defineProperty({}, versionOrDefault, [Object.values(this.createCurrencySpec(fee, 'ParaToRelay', versionOrDefault))[0][0], ethMultiAsset]),
+                  assets_transfer_type: 'DestinationReserve',
+                  remote_fees_id: _defineProperty({}, versionOrDefault, {
+                    parents: exports.Parents.ONE,
+                    interior: 'Here'
+                  }),
+                  fees_transfer_type: 'DestinationReserve',
+                  custom_xcm_on_dest: createCustomXcmOnDest(input, versionOrDefault),
+                  weight_limit: 'Unlimited'
+                }
+              };
+              return _context2.abrupt("return", api.callTxMethod(call));
+            case 15:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function transferToEthereum(_x2) {
+        return _transferToEthereum.apply(this, arguments);
+      }
+      return transferToEthereum;
+    }()
   }]);
 }();
 
@@ -14102,8 +14504,8 @@ var BifrostPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
     }
     // Handles DOT, WETH transfers to AssetHubPolkadot
   }, {
-    key: "transferPolkadotXCM",
-    value: function transferPolkadotXCM(input) {
+    key: "transferToAssetHub",
+    value: function transferToAssetHub(input) {
       var _getAssetId;
       var overriddenAsset = input.overriddenAsset,
         asset = input.asset;
@@ -14117,11 +14519,21 @@ var BifrostPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
         } : undefined)
       }), 'transfer_assets', 'Unlimited'));
     }
+  }, {
+    key: "transferPolkadotXCM",
+    value: function transferPolkadotXCM(input) {
+      var destination = input.destination;
+      if (destination === 'Ethereum') {
+        return this.transferToEthereum(input);
+      }
+      return this.transferToAssetHub(input);
+    }
   }, {
     key: "canUseXTokens",
     value: function canUseXTokens(_ref) {
       var asset = _ref.asset,
         destination = _ref.destination;
+      if (destination === 'Ethereum') return false;
       return asset.symbol !== 'WETH' && asset.symbol !== 'DOT' || destination !== 'AssetHubPolkadot';
     }
   }]);
@@ -14177,57 +14589,14 @@ var ComposableFinance$1 = /*#__PURE__*/function (_ParachainNode) {
         throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
       }
       return XTokensTransferImpl.transferXTokens(input, BigInt(asset.assetId));
-    }
-  }]);
-}(ParachainNode);
-
-var createEthereumTokenLocation = function createEthereumTokenLocation(currencyId) {
-  return {
-    parents: exports.Parents.TWO,
-    interior: {
-      X2: [ETHEREUM_JUNCTION, {
-        AccountKey20: {
-          key: currencyId
-        }
-      }]
-    }
-  };
-};
-
-var calculateFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(api) {
-    var DEFAULT_FEE, ahApi, feeStorageItem, leFeeHex, leFee, transfer_bridge_fee, transfer_assethub_execution_fee;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          DEFAULT_FEE = 2750872500000n;
-          _context.next = 3;
-          return api.createApiForNode('AssetHubPolkadot');
-        case 3:
-          ahApi = _context.sent;
-          _context.next = 6;
-          return ahApi.getFromStorage('0x5fbc5c7ba58845ad1f1a9a7c5bc12fad');
-        case 6:
-          feeStorageItem = _context.sent;
-          leFeeHex = feeStorageItem.replace('0x', '');
-          leFee = BigInt('0x' + leFeeHex.split('').reverse().join(''));
-          transfer_bridge_fee = leFee === 0n ? DEFAULT_FEE : BigInt(leFee.toString());
-          transfer_assethub_execution_fee = 2200000000n;
-          return _context.abrupt("return", (transfer_bridge_fee + transfer_assethub_execution_fee).toString());
-        case 12:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function calculateFee(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var createCustomXcmAh = function createCustomXcmAh(_ref2, version) {
-  var api = _ref2.api,
-    scenario = _ref2.scenario,
-    address = _ref2.address;
+    }
+  }]);
+}(ParachainNode);
+
+var createCustomXcmAh = function createCustomXcmAh(_ref, version) {
+  var api = _ref.api,
+    scenario = _ref.scenario,
+    address = _ref.address;
   return _defineProperty({}, version, [{
     DepositAsset: {
       assets: {
@@ -14239,84 +14608,6 @@ var createCustomXcmAh = function createCustomXcmAh(_ref2, version) {
     }
   }]);
 };
-var createCustomXcmOnDest = function createCustomXcmOnDest(_ref4, version) {
-  var _asset$assetId;
-  var api = _ref4.api,
-    address = _ref4.address,
-    asset = _ref4.asset,
-    scenario = _ref4.scenario,
-    ahAddress = _ref4.ahAddress;
-  if (!isForeignAsset(asset)) {
-    throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
-  }
-  return _defineProperty({}, version, [{
-    SetAppendix: [{
-      DepositAsset: {
-        assets: {
-          Wild: 'All'
-        },
-        beneficiary: Object.values(generateAddressPayload(api, scenario, 'PolkadotXcm', ahAddress !== null && ahAddress !== undefined ? ahAddress : '', version, undefined))[0]
-      }
-    }]
-  }, {
-    InitiateReserveWithdraw: {
-      assets: {
-        Wild: {
-          AllOf: {
-            id: createEthereumTokenLocation((_asset$assetId = asset.assetId) !== null && _asset$assetId !== undefined ? _asset$assetId : ''),
-            fun: 'Fungible'
-          }
-        }
-      },
-      reserve: {
-        parents: exports.Parents.TWO,
-        interior: {
-          X1: [ETHEREUM_JUNCTION]
-        }
-      },
-      xcm: [{
-        BuyExecution: {
-          fees: {
-            id: {
-              parents: exports.Parents.ZERO,
-              interior: {
-                X1: [{
-                  AccountKey20: {
-                    network: null,
-                    key: asset.assetId
-                  }
-                }]
-              }
-            },
-            fun: {
-              Fungible: 1n
-            }
-          },
-          weight_limit: 'Unlimited'
-        }
-      }, {
-        DepositAsset: {
-          assets: {
-            Wild: {
-              AllCounted: 1
-            }
-          },
-          beneficiary: {
-            parents: exports.Parents.ZERO,
-            interior: {
-              X1: [{
-                AccountKey20: {
-                  network: null,
-                  key: address
-                }
-              }]
-            }
-          }
-        }
-      }]
-    }
-  }]);
-};
 var Hydration$1 = /*#__PURE__*/function (_ParachainNode) {
   function Hydration() {
     _classCallCheck(this, Hydration);
@@ -14324,74 +14615,6 @@ var Hydration$1 = /*#__PURE__*/function (_ParachainNode) {
   }
   _inherits(Hydration, _ParachainNode);
   return _createClass(Hydration, [{
-    key: "transferToEthereum",
-    value: function () {
-      var _transferToEthereum = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(input) {
-        var _asset$symbol, _asset$assetId2;
-        var api, address, asset, scenario, version, destination, ahAddress, versionOrDefault, ethMultiAsset, fee, call;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              api = input.api, address = input.address, asset = input.asset, scenario = input.scenario, version = input.version, destination = input.destination, ahAddress = input.ahAddress;
-              if (ethers.ethers.isAddress(address)) {
-                _context2.next = 3;
-                break;
-              }
-              throw new Error('Only Ethereum addresses are supported for Ethereum transfers');
-            case 3:
-              if (!(((_asset$symbol = asset.symbol) === null || _asset$symbol === undefined ? undefined : _asset$symbol.toUpperCase()) !== 'WETH')) {
-                _context2.next = 5;
-                break;
-              }
-              throw new InvalidCurrencyError("Currency ".concat(asset.symbol, " is not supported for Ethereum transfers from Hydration"));
-            case 5:
-              if (isForeignAsset(asset)) {
-                _context2.next = 7;
-                break;
-              }
-              throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
-            case 7:
-              if (!(ahAddress === undefined)) {
-                _context2.next = 9;
-                break;
-              }
-              throw new Error('AssetHub address is required for Ethereum transfers');
-            case 9:
-              versionOrDefault = version !== null && version !== undefined ? version : exports.Version.V4;
-              ethMultiAsset = Object.values(createCurrencySpec(asset.amount, versionOrDefault, exports.Parents.TWO, createEthereumTokenLocation((_asset$assetId2 = asset.assetId) !== null && _asset$assetId2 !== undefined ? _asset$assetId2 : '')))[0][0];
-              _context2.next = 13;
-              return calculateFee(api);
-            case 13:
-              fee = _context2.sent;
-              call = {
-                module: 'PolkadotXcm',
-                section: 'transfer_assets_using_type_and_then',
-                parameters: {
-                  dest: this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, getParaId('AssetHubPolkadot')),
-                  assets: _defineProperty({}, versionOrDefault, [Object.values(this.createCurrencySpec(fee, 'ParaToRelay', versionOrDefault))[0][0], ethMultiAsset]),
-                  assets_transfer_type: 'DestinationReserve',
-                  remote_fees_id: _defineProperty({}, versionOrDefault, {
-                    parents: exports.Parents.ONE,
-                    interior: 'Here'
-                  }),
-                  fees_transfer_type: 'DestinationReserve',
-                  custom_xcm_on_dest: createCustomXcmOnDest(input, versionOrDefault),
-                  weight_limit: 'Unlimited'
-                }
-              };
-              return _context2.abrupt("return", api.callTxMethod(call));
-            case 16:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function transferToEthereum(_x2) {
-        return _transferToEthereum.apply(this, arguments);
-      }
-      return transferToEthereum;
-    }()
-  }, {
     key: "transferToAssetHub",
     value: function transferToAssetHub(input) {
       var api = input.api,
@@ -14420,30 +14643,30 @@ var Hydration$1 = /*#__PURE__*/function (_ParachainNode) {
       };
       return api.callTxMethod(call);
     }
-    // Handles WETH Ethereum transfers
+    // Handles transfers to Ethereum
   }, {
     key: "transferPolkadotXCM",
     value: function () {
-      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(input) {
+      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(input) {
         var destination;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
               destination = input.destination;
               if (!(destination === 'Ethereum')) {
-                _context3.next = 3;
+                _context.next = 3;
                 break;
               }
-              return _context3.abrupt("return", this.transferToEthereum(input));
+              return _context.abrupt("return", this.transferToEthereum(input));
             case 3:
-              return _context3.abrupt("return", this.transferToAssetHub(input));
+              return _context.abrupt("return", this.transferToAssetHub(input));
             case 4:
             case "end":
-              return _context3.stop();
+              return _context.stop();
           }
-        }, _callee3, this);
+        }, _callee, this);
       }));
-      function transferPolkadotXCM(_x3) {
+      function transferPolkadotXCM(_x) {
         return _transferPolkadotXCM.apply(this, arguments);
       }
       return transferPolkadotXCM;
@@ -14462,9 +14685,9 @@ var Hydration$1 = /*#__PURE__*/function (_ParachainNode) {
     }
   }, {
     key: "canUseXTokens",
-    value: function canUseXTokens(_ref6) {
-      var destination = _ref6.destination,
-        asset = _ref6.asset;
+    value: function canUseXTokens(_ref3) {
+      var destination = _ref3.destination,
+        asset = _ref3.asset;
       return destination !== 'Ethereum' && !(destination === 'AssetHubPolkadot' && asset.symbol === 'DOT');
     }
   }]);
@@ -14924,78 +15147,6 @@ var generateAddressMultiLocationV4 = function generateAddressMultiLocationV4(api
   });
 };
 
-var generateAddressPayload = function generateAddressPayload(api, scenario, pallet, recipientAddress, version, nodeId) {
-  var isMultiLocation = _typeof(recipientAddress) === 'object';
-  if (isMultiLocation) {
-    return _defineProperty({}, version, recipientAddress);
-  }
-  var isEthAddress = ethers.ethers.isAddress(recipientAddress);
-  if (scenario === 'ParaToRelay') {
-    return _defineProperty({}, version, {
-      parents: pallet === 'XTokens' ? exports.Parents.ONE : exports.Parents.ZERO,
-      interior: createX1Payload(version, {
-        AccountId32: _objectSpread2(_objectSpread2({}, version === exports.Version.V1 && {
-          network: 'any'
-        }), {}, {
-          id: api.createAccountId(recipientAddress)
-        })
-      })
-    });
-  }
-  if (scenario === 'ParaToPara' && pallet === 'XTokens') {
-    return _defineProperty({}, version, {
-      parents: exports.Parents.ONE,
-      interior: {
-        X2: [{
-          Parachain: nodeId
-        }, isEthAddress ? {
-          AccountKey20: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
-            network: 'any'
-          }), {}, {
-            key: recipientAddress
-          })
-        } : {
-          AccountId32: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
-            network: 'any'
-          }), {}, {
-            id: api.createAccountId(recipientAddress)
-          })
-        }]
-      }
-    });
-  }
-  if (scenario === 'ParaToPara' && pallet === 'PolkadotXcm') {
-    return _defineProperty({}, version, {
-      parents: exports.Parents.ZERO,
-      interior: createX1Payload(version, isEthAddress ? {
-        AccountKey20: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
-          network: 'any'
-        }), {}, {
-          key: recipientAddress
-        })
-      } : {
-        AccountId32: _objectSpread2(_objectSpread2({}, (version === exports.Version.V1 || version === exports.Version.V2) && {
-          network: 'any'
-        }), {}, {
-          id: api.createAccountId(recipientAddress)
-        })
-      })
-    });
-  }
-  return _defineProperty({}, version, {
-    parents: exports.Parents.ZERO,
-    interior: createX1Payload(version, isEthAddress ? {
-      AccountKey20: {
-        key: recipientAddress
-      }
-    } : {
-      AccountId32: {
-        id: api.createAccountId(recipientAddress)
-      }
-    })
-  });
-};
-
 var createCustomXcmToBifrost = function createCustomXcmToBifrost(_ref, version) {
   var api = _ref.api,
     address = _ref.address,
@@ -15015,26 +15166,27 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
     _classCallCheck(this, AssetHubPolkadot);
     _this = _callSuper(this, AssetHubPolkadot, ['AssetHubPolkadot', 'PolkadotAssetHub', 'polkadot', exports.Version.V3]);
     _this.handleBifrostEthTransfer = function (input) {
-      var _asset$assetId;
       var api = input.api,
         scenario = input.scenario,
         version = input.version,
         destination = input.destination,
         asset = input.asset;
       if (!isForeignAsset(asset)) {
-        throw new InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no assetId"));
+        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"));
       }
       var versionOrDefault = version !== null && version !== undefined ? version : _this.version;
-      var ethereumTokenLocation = createEthereumTokenLocation((_asset$assetId = asset.assetId) !== null && _asset$assetId !== undefined ? _asset$assetId : '');
       var call = {
         module: 'PolkadotXcm',
         section: 'transfer_assets_using_type_and_then',
         parameters: {
           dest: _this.createPolkadotXcmHeader(scenario, versionOrDefault, destination, getParaId('BifrostPolkadot')),
-          assets: _defineProperty({}, versionOrDefault, [Object.values(createCurrencySpec(asset.amount, versionOrDefault, exports.Parents.TWO, ethereumTokenLocation))[0][0]]),
+          assets: _defineProperty({}, versionOrDefault, [Object.values(createCurrencySpec(asset.amount, versionOrDefault, exports.Parents.TWO, asset.multiLocation))[0][0]]),
           assets_transfer_type: 'LocalReserve',
           remote_fees_id: _defineProperty({}, versionOrDefault, {
-            Concrete: ethereumTokenLocation
+            Concrete: asset.multiLocation
           }),
           fees_transfer_type: 'LocalReserve',
           custom_xcm_on_dest: createCustomXcmToBifrost(input, versionOrDefault),
@@ -15069,7 +15221,6 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
   }, {
     key: "handleEthBridgeTransfer",
     value: function handleEthBridgeTransfer(input) {
-      var _ethAsset$assetId;
       var api = input.api,
         scenario = input.scenario,
         destination = input.destination,
@@ -15079,26 +15230,16 @@ var AssetHubPolkadot$1 = /*#__PURE__*/function (_ParachainNode) {
       if (!ethers.ethers.isAddress(address)) {
         throw new Error('Only Ethereum addresses are supported for Ethereum transfers');
       }
-      var ethAssets = getOtherAssets('Ethereum');
-      var ethAsset = ethAssets.find(function (asset) {
-        return asset.symbol === asset.symbol;
-      });
-      if (!ethAsset) {
-        throw new InvalidCurrencyError("Currency ".concat(asset.symbol, " is not supported for Ethereum transfers"));
+      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"));
       }
       var modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
         header: createPolkadotXcmHeader(scenario, this.version, destination, paraIdTo, ETHEREUM_JUNCTION, exports.Parents.TWO),
         addressSelection: generateAddressPayload(api, scenario, 'PolkadotXcm', address, this.version, paraIdTo),
-        currencySelection: createCurrencySpec(input.asset.amount, exports.Version.V3, exports.Parents.TWO, {
-          parents: exports.Parents.TWO,
-          interior: {
-            X2: [ETHEREUM_JUNCTION, {
-              AccountKey20: {
-                key: (_ethAsset$assetId = ethAsset.assetId) !== null && _ethAsset$assetId !== undefined ? _ethAsset$assetId : ''
-              }
-            }]
-          }
-        })
+        currencySelection: createCurrencySpec(input.asset.amount, exports.Version.V3, exports.Parents.TWO, asset.multiLocation)
       });
       return PolkadotXCMTransferImpl.transferPolkadotXCM(modifiedInput, 'transfer_assets', 'Unlimited');
     }
@@ -16466,25 +16607,29 @@ var findAssetById = function findAssetById(assets, assetId) {
 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 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 ||
+    // Compare original input with sanitized asset values
+    input === sanitizedAssetMLStr || input === sanitizedAssetMLInteriorStr ||
+    // Compare original input with original asset values
+    input === assetMLStr || input === assetMLInteriorStr ||
+    // Compare sanitized input with original asset values
+    sanitizedInput === assetMLStr || sanitizedInput === assetMLInteriorStr
+  );
+};
+
 var findAssetByMultiLocation = function findAssetByMultiLocation(foreignAssets, multiLocation) {
   if (typeof multiLocation === 'string') {
-    var sanitizedInput = sanitizeMultiLocation(multiLocation);
     return foreignAssets.find(function (asset) {
-      var _asset$multiLocation, _asset$xcmInterior;
-      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 inputNoCommas with assetNoCommas
-        sanitizedInput === sanitizedAssetMLStr || sanitizedInput === sanitizedAssetMLInteriorStr ||
-        // Compare inputOriginal with assetNoCommas
-        multiLocation === sanitizedAssetMLStr || multiLocation === sanitizedAssetMLInteriorStr ||
-        // Compare inputOriginal with assetOriginal
-        multiLocation === assetMLStr || multiLocation === assetMLInteriorStr ||
-        // Compare inputNoCommas with assetOriginal
-        sanitizedInput === assetMLStr || sanitizedInput === assetMLInteriorStr
-      );
+      return compareMultiLocations(multiLocation, asset);
     });
   } else if (Array.isArray(multiLocation)) {
     return foreignAssets.find(function (asset) {
@@ -16497,6 +16642,15 @@ 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;
+    if (!assetMultiLoc) return false;
+    return Boolean(findAssetByMultiLocation(ethAssets, assetMultiLoc));
+  });
+};
+
 var getAssetBySymbolOrId = function getAssetBySymbolOrId(node, currency, destination) {
   if ('multilocation' in currency && isOverrideMultiLocationSpecifier(currency.multilocation) || 'multiasset' in currency) {
     return null;
@@ -16504,21 +16658,37 @@ var getAssetBySymbolOrId = function getAssetBySymbolOrId(node, currency, destina
   var _getAssetsObject = getAssetsObject(node),
     otherAssets = _getAssetsObject.otherAssets,
     nativeAssets = _getAssetsObject.nativeAssets;
-  var resolvedOtherAssets = destination === 'Ethereum' ? getOtherAssets('Ethereum') : otherAssets;
+  var isEthereumDestination = destination === 'Ethereum';
+  var getEthereumAssets = function getEthereumAssets() {
+    return getOtherAssets('Ethereum');
+  };
+  var getFilteredEthereumAssets = function getFilteredEthereumAssets() {
+    return filterEthCompatibleAssets(otherAssets);
+  };
   var asset;
   if ('symbol' in currency) {
-    asset = findAssetBySymbol(node, destination, otherAssets, nativeAssets, currency.symbol);
+    // If destination is Ethereum first try to find Ethereum compatible assets
+    // If not found, search Ethereum assets directly
+    if (isEthereumDestination) {
+      var _findAssetBySymbol;
+      asset = (_findAssetBySymbol = findAssetBySymbol(node, destination, getFilteredEthereumAssets(), nativeAssets, currency.symbol)) !== null && _findAssetBySymbol !== undefined ? _findAssetBySymbol : findAssetBySymbol(node, destination, getEthereumAssets(), nativeAssets, currency.symbol);
+    } else {
+      asset = findAssetBySymbol(node, destination, otherAssets, nativeAssets, currency.symbol);
+    }
   } else if ('multilocation' in currency && !isOverrideMultiLocationSpecifier(currency.multilocation)) {
-    asset = findAssetByMultiLocation(resolvedOtherAssets, currency.multilocation);
+    var resolvedAssets = isEthereumDestination ? getEthereumAssets() : otherAssets;
+    asset = findAssetByMultiLocation(resolvedAssets, currency.multilocation);
   } else if ('id' in currency) {
-    asset = findAssetById(resolvedOtherAssets, currency.id);
+    if (isEthereumDestination) {
+      var _findAssetById;
+      asset = (_findAssetById = findAssetById(getFilteredEthereumAssets(), currency.id)) !== null && _findAssetById !== undefined ? _findAssetById : findAssetById(getEthereumAssets(), currency.id);
+    } else {
+      asset = findAssetById(otherAssets, currency.id);
+    }
   } else {
     throw new Error('Invalid currency input');
   }
-  if (asset) {
-    return asset;
-  }
-  return null;
+  return asset !== null && asset !== undefined ? asset : null;
 };
 
 var getAssetMultiLocation = function getAssetMultiLocation(node, currency) {
@@ -16718,6 +16888,9 @@ var getTNode = function getTNode(paraId, ecosystem) {
   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 !== undefined ? _NODE_NAMES_DOT_KSM$f : null;
@@ -18397,16 +18570,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, currency, origin, destination, _ref$feeMarginPercent, feeMarginPercentage, tx, xcmFee, xcmFeeWithMargin, nativeBalance, existentialDeposit, sufficientForXCM;
+    var api, account, accountDestination, ahAccount, 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, 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, ahAccount = _ref.ahAccount, 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).build();
+          return Builder(api).from(origin).to(destination).currency(currency).address(accountDestination, ahAccount).build();
         case 5:
           tx = _context.sent;
           _context.next = 8;
@@ -18795,7 +18968,10 @@ var getSupportedAssets = function getSupportedAssets(origin, destination) {
   var originAssets = getAssets(origin);
   var destinationAssets = getAssets(destination);
   if (destination === 'Ethereum' || origin === 'Ethereum') {
-    return getOtherAssets('Ethereum');
+    var otherAssets = getOtherAssets(origin);
+    var ethereumCompatibleAssets = filterEthCompatibleAssets(otherAssets);
+    var ethereumAssets = getOtherAssets('Ethereum');
+    return [].concat(_toConsumableArray(ethereumCompatibleAssets), _toConsumableArray(ethereumAssets));
   }
   if (origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama' || origin === 'AssetHubKusama' && destination === 'AssetHubPolkadot') {
     var polkadotAsset = getAssetBySymbolOrId('Polkadot', {
@@ -19137,7 +19313,7 @@ var validateDestination = function validateDestination(origin, destination) {
   if (isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(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') {
+  if (destination === 'Ethereum' && origin !== 'AssetHubPolkadot' && origin !== 'Hydration' && origin !== 'BifrostPolkadot') {
     throw new IncompatibleNodesError('Transfers to Ethereum are only supported from AssetHubPolkadot and Hydration.');
   }
   var isMultiLocationDestination = _typeof(destination) === 'object';
@@ -19272,33 +19448,39 @@ var send = /*#__PURE__*/function () {
           validateCurrency(currency);
           validateDestination(origin, destination);
           validateDestinationAddress(address, destination);
-          if (!(isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(destination))) {
+          if (!(ahAddress && ethers.ethers.isAddress(ahAddress))) {
             _context.next = 6;
             break;
           }
-          throw new Error('Relay chain to relay chain transfers are not supported.');
+          throw new Error('AssetHub address needs to be in Substrate format');
         case 6:
+          if (!(isRelayChain(origin) && !isTMultiLocation(destination) && isRelayChain(destination))) {
+            _context.next = 8;
+            break;
+          }
+          throw new Error('Relay chain to relay chain transfers are not supported.');
+        case 8:
           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 = 17;
+            _context.next = 19;
             break;
           }
           if (!(destination === 'Ethereum')) {
-            _context.next = 14;
+            _context.next = 16;
             break;
           }
           throw new Error('Transfers from relay chain to Ethereum are not supported.');
-        case 14:
+        case 16:
           if (asset) {
-            _context.next = 16;
+            _context.next = 18;
             break;
           }
           throw new Error('Asset is required for relay chain to relay chain transfers.');
-        case 16:
+        case 18:
           return _context.abrupt("return", transferRelayToPara({
             api: api,
             origin: origin,
@@ -19312,11 +19494,11 @@ var send = /*#__PURE__*/function () {
             pallet: pallet,
             method: method
           }));
-        case 17:
+        case 19:
           overriddenAsset = resolveOverriddenAsset(options, isBridge, assetCheckEnabled);
-          _context.next = 20;
+          _context.next = 22;
           return api.init(origin);
-        case 20:
+        case 22:
           // 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
@@ -19336,7 +19518,7 @@ var send = /*#__PURE__*/function () {
             pallet: pallet,
             method: method
           }));
-        case 23:
+        case 25:
         case "end":
           return _context.stop();
       }
@@ -19614,6 +19796,8 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
 exports.Builder = Builder;
 exports.DuplicateAssetError = DuplicateAssetError;
 exports.DuplicateAssetIdError = DuplicateAssetIdError;
+exports.ETHEREUM_JUNCTION = ETHEREUM_JUNCTION;
+exports.ETH_CHAIN_ID = ETH_CHAIN_ID;
 exports.Foreign = Foreign;
 exports.ForeignAbstract = ForeignAbstract;
 exports.GeneralBuilder = GeneralBuilder;
@@ -19630,6 +19814,7 @@ exports.NodeNotSupportedError = NodeNotSupportedError;
 exports.Override = Override;
 exports.SUPPORTED_PALLETS = SUPPORTED_PALLETS;
 exports.ScenarioNotSupportedError = ScenarioNotSupportedError;
+exports.calculateFee = calculateFee;
 exports.claimAssets = claimAssets;
 exports.computeFeeFromDryRun = computeFeeFromDryRun;
 exports.computeFeeFromDryRunPjs = computeFeeFromDryRunPjs;
@@ -19690,3 +19875,4 @@ exports.resolveParaId = resolveParaId;
 exports.send = send;
 exports.transferMoonbeamEvm = transferMoonbeamEvm;
 exports.transferRelayToPara = transferRelayToPara;
+exports.validateAddress = validateAddress;