@moonbeam-network/xcm-builder 4.1.2 → 4.2.1

package/build/index.d.ts

@@ -379,7 +379,8 @@ declare function polkadotXcm$1(): {
         X2AndFeeHere: () => ExtrinsicConfigBuilder;
     };
     transferAssetsUsingTypeAndThen: () => {
-        here: () => ExtrinsicConfigBuilder;
+        here: (parents?: number) => ExtrinsicConfigBuilder;
+        X2: (parents?: number) => ExtrinsicConfigBuilder;
         globalConsensusEthereum: () => ExtrinsicConfigBuilder;
     };
     transferAssetsToEcosystem: () => {

package/build/index.mjs

@@ -1479,6 +1479,7 @@ function eqBalances() {
 }
 
 // src/extrinsic/pallets/polkadotXcm/polkadotXcm.util.ts
+import { Ecosystem } from "@moonbeam-network/xcm-types";
 function getPolkadotXcmExtrinsicArgs({
   assets: assets3,
   destinationAddress,
@@ -1519,6 +1520,23 @@ function getPolkadotXcmExtrinsicArgs({
     "Unlimited"
   ];
 }
+function isKusamaDestination(destination) {
+  return destination.ecosystem === Ecosystem.Kusama || destination.ecosystem === Ecosystem.MoonsamaRelay;
+}
+function isPolkadotDestination(destination) {
+  return destination.ecosystem === Ecosystem.Polkadot || destination.ecosystem === Ecosystem.MoonlamaRelay;
+}
+function getGlobalConsensus(destination) {
+  if (isKusamaDestination(destination)) {
+    return "Kusama";
+  }
+  if (isPolkadotDestination(destination)) {
+    return "Polkadot";
+  }
+  return {
+    ByGenesis: destination.relayGenesisHash
+  };
+}
 function getEcosystemTransferExtrinsicArgs({
   assets: assets3,
   destinationAddress,
@@ -1527,6 +1545,7 @@ function getEcosystemTransferExtrinsicArgs({
   feeIndex = 0
 }) {
   const version = getExtrinsicArgumentVersion(func);
+  const globalConsensus = getGlobalConsensus(destination);
   return [
     // dest
     {
@@ -1534,11 +1553,7 @@ function getEcosystemTransferExtrinsicArgs({
         parents: 2,
         interior: {
           X2: [
-            {
-              GlobalConsensus: {
-                ByGenesis: destination.relayGenesisHash
-              }
-            },
+            { GlobalConsensus: globalConsensus },
             {
               Parachain: destination.parachainId
             }
@@ -2033,7 +2048,7 @@ function polkadotXcm() {
     transferAssetsUsingTypeAndThen: () => {
       const func = "transferAssetsUsingTypeAndThen";
       return {
-        here: () => ({
+        here: (parents = 0) => ({
           build: (params) => new ExtrinsicConfig({
             module: pallet2,
             func,
@@ -2056,7 +2071,7 @@ function polkadotXcm() {
                   [version]: [
                     {
                       id: {
-                        parents: 0,
+                        parents,
                         interior: "Here"
                       },
                       fun: {
@@ -2068,7 +2083,7 @@ function polkadotXcm() {
                 "LocalReserve",
                 {
                   [version]: {
-                    parents: 0,
+                    parents,
                     interior: "Here"
                   }
                 },
@@ -2097,6 +2112,92 @@ function polkadotXcm() {
             }
           })
         }),
+        X2: (parents = 0) => ({
+          build: (params) => new ExtrinsicConfig({
+            module: pallet2,
+            func,
+            getArgs: (extrinsicFunction) => {
+              const version = getExtrinsicArgumentVersion(extrinsicFunction);
+              const isSameAsset = params.asset.isSame(params.fee);
+              const shouldFeeAssetPrecede = shouldFeeAssetPrecedeAsset(params);
+              const asset = {
+                parents: 0,
+                interior: {
+                  X2: [
+                    {
+                      PalletInstance: params.asset.getAssetPalletInstance()
+                    },
+                    {
+                      GeneralIndex: params.asset.getAssetId()
+                    }
+                  ]
+                }
+              };
+              const assetWithAmount = {
+                id: asset,
+                fun: { Fungible: params.asset.amount }
+              };
+              const feeAsset = {
+                parents,
+                interior: "Here"
+              };
+              const feeAssetWithAmount = {
+                id: feeAsset,
+                fun: { Fungible: params.fee.amount }
+              };
+              const assets3 = isSameAsset ? [assetWithAmount] : shouldFeeAssetPrecede ? [feeAssetWithAmount, assetWithAmount] : [assetWithAmount, feeAssetWithAmount];
+              return [
+                // dest
+                {
+                  [version]: {
+                    parents: 1,
+                    interior: {
+                      X1: [
+                        {
+                          Parachain: params.destination.parachainId
+                        }
+                      ]
+                    }
+                  }
+                },
+                // assets
+                {
+                  [version]: assets3
+                },
+                // assetsTransferType
+                "LocalReserve",
+                // remoteFeesId
+                {
+                  [version]: isSameAsset ? asset : feeAsset
+                },
+                // feesTransferType
+                "LocalReserve",
+                // customXcmOnDest
+                {
+                  [version]: [
+                    {
+                      DepositAsset: {
+                        assets: {
+                          Wild: { AllCounted: isSameAsset ? 1 : 2 }
+                        },
+                        beneficiary: {
+                          parents: 0,
+                          interior: {
+                            X1: [
+                              getExtrinsicAccount(params.destinationAddress)
+                            ]
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                // weightLimit
+                "Unlimited"
+              ];
+            }
+          })
+        }),
         // TODO we could pass a parameter globalConsensus in the chain asset if we need a different one
         globalConsensusEthereum: () => ({
           build: (params) => new ExtrinsicConfig({
@@ -2269,9 +2370,9 @@ function polkadotXcm() {
                       interior: {
                         X3: [
                           {
-                            GlobalConsensus: {
-                              ByGenesis: params.destination.relayGenesisHash
-                            }
+                            GlobalConsensus: getGlobalConsensus(
+                              params.destination
+                            )
                           },
                           {
                             Parachain: params.destination.parachainId
@@ -2309,6 +2410,7 @@ function polkadotXcm() {
                 const assetInDestination = params.destination.getChainAsset(
                   params.asset
                 );
+                const globalConsensus = getGlobalConsensus(params.destination);
                 const assets3 = [
                   {
                     id: normalizeConcrete(version, {
@@ -2316,9 +2418,7 @@ function polkadotXcm() {
                       interior: {
                         X3: [
                           {
-                            GlobalConsensus: {
-                              ByGenesis: params.destination.relayGenesisHash
-                            }
+                            GlobalConsensus: globalConsensus
                           },
                           {
                             Parachain: params.destination.parachainId
@@ -2339,9 +2439,7 @@ function polkadotXcm() {
                       interior: {
                         X4: [
                           {
-                            GlobalConsensus: {
-                              ByGenesis: params.destination.relayGenesisHash
-                            }
+                            GlobalConsensus: globalConsensus
                           },
                           {
                             Parachain: params.destination.parachainId
@@ -2761,9 +2859,7 @@ function getUniversalOriginInstruction(source) {
   }
   return {
     UniversalOrigin: {
-      GlobalConsensus: {
-        ByGenesis: source.relayGenesisHash
-      }
+      GlobalConsensus: getGlobalConsensus(source)
     }
   };
 }