@moonbeam-network/xcm-builder 1.0.0-dev.270 → 1.0.0-dev.271

package/build/index.mjs

@@ -3841,7 +3841,6 @@ import {
   Parachain as Parachain2
 } from "@moonbeam-network/xcm-types";
 import { getMultilocationDerivedAddresses } from "@moonbeam-network/xcm-utils";
-import { moonriver } from "viem/chains";
 var BUY_EXECUTION_FEE = 100000000000000000n;
 var CROSS_CHAIN_FEE = 100000000000000000n;
 function polkadotXcm2() {
@@ -3906,16 +3905,6 @@ function polkadotXcm2() {
           transact
         });
         const transactionsToSend = sendOnlyRemoteExecution ? [send] : [...assetTransferTxs, send];
-        console.log("send", send.toHuman());
-        console.log(
-          "assetTransferTxs",
-          assetTransferTxs.map((tx) => tx.toHuman())
-        );
-        console.log("transact", transact);
-        console.log(
-          "transactionsToSend",
-          transactionsToSend.map((tx) => tx.toHuman())
-        );
         return new ExtrinsicConfig({
           module: "utility",
           func: "batchAll",
@@ -3939,12 +3928,9 @@ function buildSendExtrinsic({
   return sourceApi.tx.polkadotXcm.send(
     {
       [version]: normalizeX1(version, {
-        parents: 2,
+        parents: 1,
         interior: {
-          X2: [
-            { GlobalConsensus: "Polkadot" },
-            { Parachain: moonChain.parachainId }
-          ]
+          X1: { Parachain: moonChain.parachainId }
         }
       })
     },
@@ -4032,31 +4018,9 @@ function getAssetTransferTxs({
   sourceAddress,
   sourceApi
 }) {
-  const { transferAssets } = sourceApi.tx.polkadotXcm;
+  const { transfer, transferMulticurrencies } = sourceApi.tx.xTokens;
   const transferBuilder = ExtrinsicBuilder().xTokens().transfer();
-  const polkadotXcmBuilder = ExtrinsicBuilder().polkadotXcm().transferAssetsToEcosystem().X4();
   const transferMulticurrenciesBuilder = ExtrinsicBuilder().xTokens().transferMultiCurrencies();
-  const testMoonriver = source.name === moonriver.name;
-  console.log("testMoonriver", testMoonriver);
-  if (testMoonriver) {
-    const transferAssetsTx = transferAssets(
-      ...polkadotXcmBuilder.build({
-        asset,
-        destination: moonChain,
-        destinationAddress: computedOriginAccount,
-        destinationApi: moonApi,
-        fee: AssetAmount.fromChainAsset(source.getChainAsset(moonAsset), {
-          amount: CROSS_CHAIN_FEE + BUY_EXECUTION_FEE
-        }),
-        source,
-        sourceAddress,
-        sourceApi
-      }).getArgs(transferAssets)
-    );
-    console.log("transferAssetsTx", transferAssetsTx.toHuman());
-    return [transferAssetsTx];
-  }
-  const { transfer, transferMulticurrencies } = sourceApi.tx.xTokens;
   if (asset.isSame(fee)) {
     const assetTransferTx = transfer(
       ...transferBuilder.build({
@@ -4898,12 +4862,7 @@ function wormhole() {
             from: whSourceAddress,
             to: whDestinationAddress,
             protocol: isAutomatic ? "AutomaticTokenBridge" /* AutomaticTokenBridge */ : "TokenBridge" /* TokenBridge */,
-            payload: isDestinationMoonChain || isDestinationEvmChain ? void 0 : getPayload({
-              destination,
-              destinationAddress,
-              moonApi,
-              moonChain
-            })
+            payload: isDestinationMoonChain || isDestinationEvmChain ? void 0 : getPayload({ destination, destinationAddress, moonApi })
           },
           func: "tokenTransfer"
         });
@@ -4914,67 +4873,16 @@ function wormhole() {
 function getPayload({
   moonApi,
   destination,
-  destinationAddress,
-  moonChain
-}) {
-  const multilocation = getMultilocation({
-    destination,
-    destinationAddress,
-    moonApi,
-    moonChain
-  });
-  console.log("multilocation", multilocation.toHuman());
-  const action = moonApi.createType("XcmRoutingUserAction", {
-    destination: multilocation
-  });
-  const versioned = moonApi.createType("VersionedUserAction", {
-    V1: action
-  });
-  return versioned.toU8a();
-}
-function getMultilocation({
-  moonApi,
-  destination,
-  destinationAddress,
-  moonChain
+  destinationAddress
 }) {
   if (!EvmParachain5.isAnyParachain(destination)) {
     throw new Error(
       `Destination ${destination.name} is not a Parachain or EvmParachain`
     );
   }
-  const version = getExtrinsicArgumentVersion(moonApi.tx.polkadotXcm.send);
-  const isDifferentEcosystem = destination.ecosystem !== moonChain.ecosystem;
   const isEvmDestination = EvmParachain5.is(destination);
-  console.log("destination", destination);
-  console.log("isEvmDestination", isEvmDestination);
-  console.log("destinationAddress", destinationAddress);
-  console.log(
-    "evmToAddress(destinationAddress)",
-    evmToAddress4(destinationAddress)
-  );
-  if (isDifferentEcosystem) {
-    return moonApi.createType("XcmVersionedLocation", {
-      [version]: {
-        parents: 2,
-        interior: {
-          X3: [
-            {
-              GlobalConsensus: getGlobalConsensus(destination)
-            },
-            {
-              Parachain: destination.parachainId
-            },
-            // wrong
-            getExtrinsicAccount(
-              isEvmDestination ? evmToAddress4(destinationAddress) : destinationAddress
-            )
-          ]
-        }
-      }
-    });
-  }
-  return moonApi.createType("XcmVersionedLocation", {
+  const version = getExtrinsicArgumentVersion(moonApi.tx.polkadotXcm.send);
+  const multilocation = moonApi.createType("XcmVersionedLocation", {
     [version]: {
       parents: 1,
       interior: {
@@ -4989,6 +4897,13 @@ function getMultilocation({
       }
     }
   });
+  const action = moonApi.createType("XcmRoutingUserAction", {
+    destination: multilocation
+  });
+  const versioned = moonApi.createType("VersionedUserAction", {
+    V1: action
+  });
+  return versioned.toU8a();
 }
 
 // src/mrl/providers/wormhole/contract/TokenBridge/TokenBridgeAbi.ts