Skip to content

Commit a1e4f65

Browse files
committed
fix tests
Signed-off-by: Ihor Farion <ihor@umaproject.org>
1 parent 310c571 commit a1e4f65

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

script/mintburn/oft/CreateSponsoredDeposit.s.sol

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ library DebugQuoteSignLib {
3838
p.destinationDex,
3939
p.lzReceiveGasLimit,
4040
p.lzComposeGasLimit,
41+
p.maxOftFeeBps,
4142
p.accountCreationMode,
4243
p.executionMode,
4344
keccak256(p.actionData) // Hash the actionData to keep signature size reasonable
@@ -208,6 +209,7 @@ contract CreateSponsoredDeposit is Script, Config {
208209
destinationDex: HyperCoreLib.CORE_SPOT_DEX_ID,
209210
lzReceiveGasLimit: lzReceiveGasLimit,
210211
lzComposeGasLimit: lzComposeGasLimit,
212+
maxOftFeeBps: 0,
211213
accountCreationMode: 0,
212214
executionMode: 0,
213215
actionData: ""
@@ -271,6 +273,7 @@ contract CreateSponsoredDeposit is Script, Config {
271273

272274
bytes memory composeMsg = ComposeMsgCodec._encode(
273275
quote.signedParams.nonce,
276+
quote.signedParams.amountLD,
274277
quote.signedParams.deadline,
275278
quote.signedParams.maxBpsToSponsor,
276279
quote.unsignedParams.maxUserSlippageBps,

test/evm/foundry/local/ComposeMsgCodec.t.sol

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { ComposeMsgCodec } from "contracts/periphery/mintburn/sponsored-oft/Comp
77
contract ComposeMsgCodecTest is Test {
88
function test_EncodeDecode() public {
99
bytes32 nonce = keccak256("nonce");
10+
uint256 amountLD = 100 ether;
1011
uint256 deadline = 1234567890;
1112
uint256 maxBpsToSponsor = 500;
1213
uint256 maxUserSlippageBps = 100;
@@ -19,6 +20,7 @@ contract ComposeMsgCodecTest is Test {
1920

2021
bytes memory encoded = ComposeMsgCodec._encode(
2122
nonce,
23+
amountLD,
2224
deadline,
2325
maxBpsToSponsor,
2426
maxUserSlippageBps,
@@ -31,6 +33,7 @@ contract ComposeMsgCodecTest is Test {
3133
);
3234

3335
assertEq(ComposeMsgCodec._getNonce(encoded), nonce, "Nonce mismatch");
36+
assertEq(ComposeMsgCodec._getAmountLD(encoded), amountLD, "AmountLD mismatch");
3437
assertEq(ComposeMsgCodec._getDeadline(encoded), deadline, "Deadline mismatch");
3538
assertEq(ComposeMsgCodec._getMaxBpsToSponsor(encoded), maxBpsToSponsor, "MaxBpsToSponsor mismatch");
3639
assertEq(ComposeMsgCodec._getMaxUserSlippageBps(encoded), maxUserSlippageBps, "MaxUserSlippageBps mismatch");
@@ -45,6 +48,7 @@ contract ComposeMsgCodecTest is Test {
4548

4649
function testFuzz_EncodeDecode(
4750
bytes32 nonce,
51+
uint256 amountLD,
4852
uint256 deadline,
4953
uint256 maxBpsToSponsor,
5054
uint256 maxUserSlippageBps,
@@ -57,6 +61,7 @@ contract ComposeMsgCodecTest is Test {
5761
) public {
5862
bytes memory encoded = ComposeMsgCodec._encode(
5963
nonce,
64+
amountLD,
6065
deadline,
6166
maxBpsToSponsor,
6267
maxUserSlippageBps,
@@ -69,6 +74,7 @@ contract ComposeMsgCodecTest is Test {
6974
);
7075

7176
assertEq(ComposeMsgCodec._getNonce(encoded), nonce, "Nonce mismatch");
77+
assertEq(ComposeMsgCodec._getAmountLD(encoded), amountLD, "AmountLD mismatch");
7278
assertEq(ComposeMsgCodec._getDeadline(encoded), deadline, "Deadline mismatch");
7379
assertEq(ComposeMsgCodec._getMaxBpsToSponsor(encoded), maxBpsToSponsor, "MaxBpsToSponsor mismatch");
7480
assertEq(ComposeMsgCodec._getMaxUserSlippageBps(encoded), maxUserSlippageBps, "MaxUserSlippageBps mismatch");
@@ -82,13 +88,13 @@ contract ComposeMsgCodecTest is Test {
8288
}
8389

8490
function test_IsValidComposeMsgBytelength_Boundary() public pure {
85-
// Minimum length is 352 bytes (9 static params + actionData offset + actionData length + 0 bytes actionData)
86-
// 9 * 32 + 32 + 32 = 352 bytes
91+
// Minimum length is 384 bytes (10 static params + actionData offset + actionData length + 0 bytes actionData)
92+
// 10 * 32 + 32 + 32 = 384 bytes
8793

88-
bytes memory data = new bytes(352);
94+
bytes memory data = new bytes(384);
8995
assertTrue(ComposeMsgCodec._isValidComposeMsgBytelength(data));
9096

91-
bytes memory tooShort = new bytes(351);
97+
bytes memory tooShort = new bytes(383);
9298
assertFalse(ComposeMsgCodec._isValidComposeMsgBytelength(tooShort));
9399
}
94100
}

test/evm/foundry/local/SponsoredOFTSrcPeriphery.t.sol

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ contract SponsoredOFTSrcPeripheryTest is Test {
8080
destinationDex: HyperCoreLib.CORE_SPOT_DEX_ID,
8181
lzReceiveGasLimit: 500_000,
8282
lzComposeGasLimit: 500_000,
83+
maxOftFeeBps: 0,
8384
accountCreationMode: uint8(0), // Standard
8485
executionMode: uint8(0), // DirectToCore
8586
actionData: ""
@@ -153,6 +154,7 @@ contract SponsoredOFTSrcPeripheryTest is Test {
153154
// Validate composeMsg encoding (layout from ComposeMsgCodec._encode)
154155
(
155156
bytes32 gotNonce,
157+
uint256 gotAmountLD,
156158
uint256 gotDeadline,
157159
uint256 gotMaxBpsToSponsor,
158160
uint256 gotMaxUserSlippageBps,
@@ -164,10 +166,11 @@ contract SponsoredOFTSrcPeripheryTest is Test {
164166
bytes memory gotActionData
165167
) = abi.decode(
166168
spComposeMsg,
167-
(bytes32, uint256, uint256, uint256, bytes32, bytes32, uint32, uint8, uint8, bytes)
169+
(bytes32, uint256, uint256, uint256, uint256, bytes32, bytes32, uint32, uint8, uint8, bytes)
168170
);
169171

170172
assertEq(gotNonce, nonce, "nonce mismatch");
173+
assertEq(gotAmountLD, SEND_AMOUNT, "amountLD mismatch");
171174
assertEq(gotDeadline, deadline, "deadline mismatch");
172175
assertEq(gotMaxBpsToSponsor, 500, "maxBpsToSponsor mismatch");
173176
assertEq(gotMaxUserSlippageBps, 300, "maxUserSlippageBps mismatch");

0 commit comments

Comments
 (0)