improve

Snowfork · Dec 7, 2024 · 7378735 · 7378735
1 parent 7b28a11
commit 7378735
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/contracts/src/v2/Calls.sol b/contracts/src/v2/Calls.sol
@@ -114,10 +114,10 @@ library CallsV2 {
 
         Payload memory payload = Payload({
             origin: origin,
-            value: uint128(msg.value),
             assets: preparedAssets,
             xcm: xcm,
             claimer: claimer,
+            value: uint128(msg.value) - executionFee - relayerFee,
             executionFee: executionFee,
             relayerFee: relayerFee
         });

diff --git a/contracts/src/v2/Types.sol b/contracts/src/v2/Types.sol
@@ -31,12 +31,16 @@ library CommandKind {
 }
 
 struct Payload {
+    // sender of the message
     address origin;
-    uint128 value;
     Asset[] assets;
     bytes xcm;
     bytes claimer;
+    // ether value
+    uint128 value;
+    // additional ether value for execution fees
     uint128 executionFee;
+    // additional ether value for relayer fees
     uint128 relayerFee;
 }
 

diff --git a/contracts/test/GatewayV2.t.sol b/contracts/test/GatewayV2.t.sol
@@ -271,10 +271,10 @@ contract GatewayV2Test is Test {
             1,
             Payload({
                 origin: user1,
-                value: 1 ether,
                 assets: outputAssets,
                 xcm: "",
                 claimer: "",
+                value: 0.5 ether,
                 executionFee: 0.1 ether,
                 relayerFee: 0.4 ether
             })