@moonbeam-network/xcm-builder 4.0.1 → 4.1.1

package/build/index.d.ts

@@ -447,6 +447,7 @@ interface FeeConfigBuilderParams {
 interface XcmPaymentFeeProps {
     isAssetReserveChain: boolean;
     shouldTransferAssetPrecedeFeeAsset?: boolean;
+    isEcosystemBridge?: boolean;
     parents?: number;
 }
 interface MoonbeamRuntimeXcmConfigAssetType extends Enum {

package/build/index.mjs

@@ -2735,6 +2735,7 @@ function ExtrinsicBuilder() {
 }
 
 // src/fee/FeeBuilder.utils.ts
+import { EvmParachain as EvmParachain2 } from "@moonbeam-network/xcm-types";
 import { isEthAddress as isEthAddress2 } from "@moonbeam-network/xcm-utils";
 import { u8aToHex as u8aToHex5 } from "@polkadot/util";
 import { decodeAddress as decodeAddress5 } from "@polkadot/util-crypto";
@@ -2754,6 +2755,32 @@ function getWithdrawAssetInstruction(assetTypes) {
     }))
   };
 }
+function getUniversalOriginInstruction(source) {
+  if (!EvmParachain2.isAnyParachain(source)) {
+    throw new Error("Source is not a parachain");
+  }
+  return {
+    UniversalOrigin: {
+      GlobalConsensus: {
+        ByGenesis: source.relayGenesisHash
+      }
+    }
+  };
+}
+function getDescendOriginInstruction(source) {
+  if (!EvmParachain2.isAnyParachain(source)) {
+    throw new Error("Source is not a parachain");
+  }
+  return {
+    DescendOrigin: {
+      X1: [
+        {
+          Parachain: source.parachainId
+        }
+      ]
+    }
+  };
+}
 function getReserveAssetDepositedInstruction(assetTypes) {
   return {
     ReserveAssetDeposited: assetTypes.map((assetType) => ({
@@ -3029,15 +3056,25 @@ function getInstructions({
   isAssetReserveChain,
   assets: assets3,
   versionedFeeAssetId,
-  address
+  address,
+  source,
+  isEcosystemBridge
 }) {
-  return [
+  const instructions = [
     isAssetReserveChain ? getWithdrawAssetInstruction(assets3) : getReserveAssetDepositedInstruction(assets3),
     getClearOriginInstruction(),
     getBuyExecutionInstruction(versionedFeeAssetId),
     getDepositAssetInstruction(address, assets3),
     getSetTopicInstruction()
   ];
+  if (isEcosystemBridge) {
+    return [
+      getUniversalOriginInstruction(source),
+      getDescendOriginInstruction(source),
+      ...instructions
+    ];
+  }
+  return instructions;
 }
 
 // src/fee/xcmPaymentApi/xcmPaymentApi.ts
@@ -3133,7 +3170,9 @@ var createXcmFeeBuilder = ({
         isAssetReserveChain: options.isAssetReserveChain,
         assets: assets3,
         versionedFeeAssetId,
-        address: params.address
+        address: params.address,
+        source: params.source,
+        isEcosystemBridge: options.isEcosystemBridge
       });
       return getFeeForXcmInstructionsAndAsset(
         params.api,
@@ -3410,7 +3449,7 @@ function MonitoringBuilder() {
 
 // src/mrl/providers/wormhole/contract/Batch/Batch.ts
 import {
-  EvmParachain as EvmParachain2
+  EvmParachain as EvmParachain3
 } from "@moonbeam-network/xcm-types";
 import { getMultilocationDerivedAddresses as getMultilocationDerivedAddresses2 } from "@moonbeam-network/xcm-utils";
 import { evmToAddress as evmToAddress3 } from "@polkadot/util-crypto";
@@ -4210,7 +4249,7 @@ function Batch() {
         sourceApi,
         transact
       }) => {
-        if (!EvmParachain2.is(source)) {
+        if (!EvmParachain3.is(source)) {
           throw new Error("Source chain needs to be an EVMParachain");
         }
         if (!sourceApi) {
@@ -4372,20 +4411,20 @@ var WormholeConfig = class _WormholeConfig {
 };
 
 // src/mrl/providers/wormhole/wormhole/wormhole.ts
-import { EvmChain, EvmParachain as EvmParachain4, Parachain as Parachain3 } from "@moonbeam-network/xcm-types";
+import { EvmChain, EvmParachain as EvmParachain5, Parachain as Parachain3 } from "@moonbeam-network/xcm-types";
 import { getMultilocationDerivedAddresses as getMultilocationDerivedAddresses3 } from "@moonbeam-network/xcm-utils";
 import { evmToAddress as evmToAddress4 } from "@polkadot/util-crypto/address";
 import { Wormhole as Wormhole2 } from "@wormhole-foundation/sdk-connect";
 
 // src/mrl/providers/wormhole/wormhole/wormholeFactory.ts
-import { EvmParachain as EvmParachain3 } from "@moonbeam-network/xcm-types";
+import { EvmParachain as EvmParachain4 } from "@moonbeam-network/xcm-types";
 import { Wormhole } from "@wormhole-foundation/sdk-connect";
 import { EvmPlatform } from "@wormhole-foundation/sdk-evm";
 function wormholeFactory(chain) {
   return new Wormhole(
     chain.isTestChain ? "Testnet" : "Mainnet",
     [EvmPlatform],
-    EvmParachain3.isAnyEvmChain(chain) && chain.wh ? {
+    EvmParachain4.isAnyEvmChain(chain) && chain.wh ? {
       chains: {
         [chain.wh.name]: {
           rpc: chain.rpc
@@ -4456,12 +4495,12 @@ function getPayload({
   destination,
   destinationAddress
 }) {
-  if (!EvmParachain4.isAnyParachain(destination)) {
+  if (!EvmParachain5.isAnyParachain(destination)) {
     throw new Error(
       `Destination ${destination.name} is not a Parachain or EvmParachain`
     );
   }
-  const isEvmDestination = EvmParachain4.is(destination);
+  const isEvmDestination = EvmParachain5.is(destination);
   const version = getExtrinsicArgumentVersion(moonApi.tx.polkadotXcm.send);
   const multilocation = moonApi.createType("XcmVersionedLocation", {
     [version]: {