@moonbeam-network/xcm-builder 3.2.2 → 3.2.4

package/build/index.d.ts

@@ -82,8 +82,9 @@ declare class ContractConfig extends BaseConfig {
 type ContractConfigBuilder = ConfigBuilder<ContractConfig>;
 
 declare function XcmPrecompile(): {
-    transferAssetsToPara20: () => ContractConfigBuilder;
-    transferAssetsToPara32: () => ContractConfigBuilder;
+    transferAssetsToPara20: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
+    transferAssetsToPara32: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
+    transferAssetsToRelay: () => ContractConfigBuilder;
 };
 
 declare function Xtokens(): {

package/build/index.mjs

@@ -756,40 +756,72 @@ var XCM_ABI = [
 var XCM_PRECOMPILE_ADDRESS = "0x000000000000000000000000000000000000081A";
 function XcmPrecompile() {
   return {
-    transferAssetsToPara20: () => ({
-      build: ({ destinationAddress, asset, destination }) => {
+    transferAssetsToPara20: (shouldTransferAssetPrecedeFeeAsset = true) => ({
+      build: ({ destinationAddress, asset, destination, fee }) => {
+        const assets3 = getAssets(
+          asset,
+          fee,
+          shouldTransferAssetPrecedeFeeAsset
+        );
+        return new ContractConfig({
+          address: XCM_PRECOMPILE_ADDRESS,
+          abi: XCM_ABI,
+          args: [destination.parachainId, destinationAddress, assets3, 0],
+          func: "transferAssetsToPara20",
+          module: "Xcm"
+        });
+      }
+    }),
+    transferAssetsToPara32: (shouldTransferAssetPrecedeFeeAsset = false) => ({
+      build: ({ destinationAddress, asset, destination, fee }) => {
+        const assets3 = getAssets(
+          asset,
+          fee,
+          shouldTransferAssetPrecedeFeeAsset
+        );
         return new ContractConfig({
           address: XCM_PRECOMPILE_ADDRESS,
           abi: XCM_ABI,
           args: [
             destination.parachainId,
-            destinationAddress,
-            [[asset.address, asset.amount]],
+            u8aToHex2(decodeAddress2(destinationAddress)),
+            assets3,
             0
           ],
-          func: "transferAssetsToPara20",
+          func: "transferAssetsToPara32",
           module: "Xcm"
         });
       }
     }),
-    transferAssetsToPara32: () => ({
-      build: ({ destinationAddress, asset, destination }) => {
+    transferAssetsToRelay: () => ({
+      build: ({ destinationAddress, asset }) => {
         return new ContractConfig({
           address: XCM_PRECOMPILE_ADDRESS,
           abi: XCM_ABI,
           args: [
-            destination.parachainId,
             u8aToHex2(decodeAddress2(destinationAddress)),
             [[asset.address, asset.amount]],
             0
           ],
-          func: "transferAssetsToPara32",
+          func: "transferAssetsToRelay",
           module: "Xcm"
         });
       }
     })
   };
 }
+function getAssets(asset, feeAsset, shouldTransferAssetPrecedeFeeAsset) {
+  if (feeAsset.isSame(asset)) {
+    return [[asset.address, asset.amount]];
+  }
+  return shouldTransferAssetPrecedeFeeAsset ? [
+    [asset.address, asset.amount],
+    [feeAsset.address, feeAsset.amount]
+  ] : [
+    [feeAsset.address, feeAsset.amount],
+    [asset.address, asset.amount]
+  ];
+}
 
 // src/contract/contracts/Xtokens/Xtokens.ts
 import { formatAssetIdToERC20 } from "@moonbeam-network/xcm-utils";
@@ -3607,7 +3639,7 @@ function Gmp() {
 import { convertAddressTo32Bytes } from "@moonbeam-network/xcm-utils";
 
 // src/mrl/providers/wormhole/wormhole/wormhole.ts
-import { EvmChain, EvmParachain as EvmParachain3, Parachain as Parachain3 } from "@moonbeam-network/xcm-types";
+import { EvmChain, EvmParachain as EvmParachain4, 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";
@@ -3626,22 +3658,20 @@ var WormholeConfig = class _WormholeConfig {
 };
 
 // src/mrl/providers/wormhole/wormhole/wormholeFactory.ts
+import { EvmParachain as EvmParachain3 } 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 ? {
       chains: {
-        Ethereum: {
-          rpc: "https://eth.llamarpc.com"
-        },
-        Moonbeam: {
-          rpc: "https://rpc.api.moonbeam.network"
+        [chain.wh.name]: {
+          rpc: chain.rpc
         }
       }
-    }
+    } : void 0
   );
 }
 
@@ -3706,7 +3736,7 @@ function getPayload({
   destination,
   destinationAddress
 }) {
-  if (!EvmParachain3.isAnyParachain(destination)) {
+  if (!EvmParachain4.isAnyParachain(destination)) {
     throw new Error(
       `Destination ${destination.name} is not a Parachain or EvmParachain`
     );