@moonbeam-network/xcm-builder 1.0.0-dev.281 → 1.0.0-dev.282

package/build/index.d.ts

@@ -511,6 +511,7 @@ interface BridgeFeeConfigBuilderParams {
     balance?: AssetAmount;
     destination: AnyChain;
     source: AnyChain;
+    bridgeChainFee: AssetAmount;
 }
 interface XcmPaymentFeeProps {
     isAssetReserveChain: boolean;
@@ -607,6 +608,7 @@ interface SnowbridgeFunctionArgs {
     destinationParaId: number;
     amount: bigint;
     bridgeFeeAmount: bigint;
+    bridgeChainFee: bigint;
     requiresApproval: boolean;
 }
 interface SnowbridgeConfigConstructorParams {
@@ -1739,6 +1741,7 @@ type MrlExecuteConfigBuilder = ConfigBuilder<ContractConfig, MrlExecuteBuilderPa
 interface MrlBuilderParams extends BuilderParams<AnyChain> {
     isAutomatic: boolean;
     protocolFee?: AssetAmount;
+    bridgeChainFee?: AssetAmount;
     moonApi: ApiPromise;
     moonAsset: ChainAsset;
     bridgeChain: AnyParachain;

package/build/index.mjs

@@ -3912,7 +3912,7 @@ function gateway() {
   return {
     quoteSendTokenFee() {
       return {
-        build: ({ asset, destination, source }) => {
+        build: ({ asset, destination, source, bridgeChainFee }) => {
           if (!asset.address) {
             throw new Error(`Asset ${asset.key} has no address`);
           }
@@ -3932,8 +3932,7 @@ function gateway() {
             args: [
               asset.address,
               destination.parachainId,
-              10000000000000n
-              // TODO mjm get from config? if not possible, we could default this, as it doesn't affect when sending to relay chain
+              bridgeChainFee.amount
             ],
             func: "quoteSendTokenFee",
             module: "Gateway"
@@ -4720,27 +4719,49 @@ function Gateway() {
   return {
     sendToken: () => ({
       provider,
-      build: ({ asset, destinationAddress, protocolFee, destination }) => callSendToken(asset, protocolFee, destination, destinationAddress)
+      build: ({
+        asset,
+        destinationAddress,
+        protocolFee,
+        destination,
+        bridgeChainFee
+      }) => callSendToken(
+        asset,
+        protocolFee,
+        destination,
+        destinationAddress,
+        bridgeChainFee
+      )
     }),
     approveAndSendToken: () => ({
       provider,
-      build: ({ asset, destinationAddress, protocolFee, destination }) => {
+      build: ({
+        asset,
+        destinationAddress,
+        protocolFee,
+        destination,
+        bridgeChainFee
+      }) => {
         const requiresApproval = protocolFee && !protocolFee.isSame(asset);
         return callSendToken(
           asset,
           protocolFee,
           destination,
           destinationAddress,
+          bridgeChainFee,
           requiresApproval
         );
       }
     })
   };
 }
-function callSendToken(asset, protocolFee, destination, destinationAddress, requiresApproval = false) {
+function callSendToken(asset, protocolFee, destination, destinationAddress, bridgeChainFee, requiresApproval = false) {
   if (!protocolFee) {
     throw new Error("Protocol fee is required for Gateway module");
   }
+  if (!bridgeChainFee) {
+    throw new Error("Bridge chain fee is required for Gateway module");
+  }
   if (!EvmParachain4.isAnyParachain(destination)) {
     throw new Error(
       "Destination must be a Parachain or EvmParachain for sending token with Gateway module"
@@ -4753,6 +4774,7 @@ function callSendToken(asset, protocolFee, destination, destinationAddress, requ
       destinationParaId: destination.parachainId,
       amount: asset.amount,
       bridgeFeeAmount: protocolFee.amount,
+      bridgeChainFee: bridgeChainFee.amount,
       requiresApproval
     },
     func: "sendToken"
@@ -4797,12 +4819,22 @@ function polkadotXcm2() {
         // TODO mjm rename ? nativeEth?
         canonicalEth: () => ({
           provider,
-          build: ({ asset, destination, destinationAddress, protocolFee }) => {
+          build: ({
+            asset,
+            destination,
+            destinationAddress,
+            bridgeChainFee
+          }) => {
             if (!EvmChain2.is(destination)) {
               throw new Error(
                 "Destination must be an EVM chain for globalConsensus function"
               );
             }
+            if (!bridgeChainFee) {
+              throw new Error(
+                "Bridge chain fee is required for the polkadotXcm.canonicalEth function"
+              );
+            }
             return new ExtrinsicConfig({
               module: pallet7,
               func,
@@ -4821,8 +4853,7 @@ function polkadotXcm2() {
                         parents: 1,
                         interior: "Here"
                       },
-                      fun: { Fungible: protocolFee?.amount }
-                      // TODO mjm
+                      fun: { Fungible: bridgeChainFee.amount }
                     },
                     {
                       id: {