Skip to content

Commit 4896e15

Browse files
committed
unit tests
1 parent 1aff04e commit 4896e15

File tree

6 files changed

+503
-19
lines changed

6 files changed

+503
-19
lines changed

.gas-snapshot

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,24 @@ DepositERC4626Test:test_depositERC4626_recipientZero() (gas: 36769)
8383
DepositERC4626Test:test_depositERC4626_totalSharesTooLow() (gas: 39187)
8484
DepositERC4626Test:test_depositERC4626_valueZero() (gas: 36815)
8585
DepositERC4626Test:test_depositERC4626_vaultZero() (gas: 36798)
86-
EstimateCallOnceGasConstant:testFuzz_callOnce_gasConstant(uint256,(address,bool,uint256,uint256,uint16,bytes4,bytes,(address,uint256,uint256,uint256))) (runs: 256, μ: 4127, ~: 3876)
87-
EstimateDeactivateInstructionGasConstant:testFuzz_deactivateInstruction_gasConstant(uint256,(bytes32,(address,uint256,uint256,uint256))) (runs: 256, μ: 1960, ~: 1914)
88-
EstimateDepositERC4626GasConstant:testFuzz_depositERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4486, ~: 4434)
86+
EstimateCallOnceGasConstant:testFuzz_callOnce_gasConstant(uint256,(address,bool,uint256,uint256,uint16,bytes4,bytes,(address,uint256,uint256,uint256))) (runs: 256, μ: 4182, ~: 3876)
87+
EstimateDeactivateInstructionGasConstant:testFuzz_deactivateInstruction_gasConstant(uint256,(bytes32,(address,uint256,uint256,uint256))) (runs: 256, μ: 1957, ~: 1941)
88+
EstimateDepositERC4626GasConstant:testFuzz_depositERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4505, ~: 4452)
8989
EstimateRefuelERC20GasConstant:testFuzz_refuelERC20_gasConstant(uint256,uint256,(address,address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3014, ~: 3006)
9090
EstimateRefuelGasConstant:testFuzz_refuel_gasConstant(uint256,uint256,(address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2897, ~: 2835)
91-
EstimateSweepCCTPGasConstant:testFuzz_sweepCCTP_gasConstant(uint256,uint256,(address,uint32,bytes32,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3356, ~: 3333)
92-
EstimateSweepDepositERC4626GasConstant:testFuzz_sweepDepositERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3523, ~: 3516)
93-
EstimateSweepERC20GasConstant:testFuzz_sweepERC20_gasConstant(uint256,uint256,(address,address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3026, ~: 3042)
94-
EstimateSweepGasConstant:testFuzz_sweep_gasConstant(uint256,uint256,(address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2871, ~: 2808)
95-
EstimateSweepUniswapV3GasConstant:testFuzz_sweepUniswapV3_gasConstant(uint256,uint256,(address,address,address,uint24,uint256,uint256,uint256,uint32,uint32,(address,uint256,uint256,uint256))) (runs: 256, μ: 4424, ~: 4398)
96-
EstimateSweepWithdrawERC4626GasConstant:testFuzz_sweepWithdrawERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3297, ~: 3297)
97-
EstimateTransferCCTPGasConstant:testFuzz_transferCCTP_gasConstant(uint256,uint256,(address,uint256,uint32,bytes32,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4224, ~: 4206)
98-
EstimateTransferERC20GasConstant:testFuzz_transferERC20_gasConstant(uint256,uint256,(address,address,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4009, ~: 3969)
99-
EstimateTransferGasConstant:testFuzz_transfer_gasConstant(uint256,uint256,(address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 3766, ~: 3762)
91+
EstimateSweepCCTPGasConstant:testFuzz_sweepCCTP_gasConstant(uint256,uint256,(address,uint32,bytes32,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3341, ~: 3306)
92+
EstimateSweepDepositERC4626GasConstant:testFuzz_sweepDepositERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3537, ~: 3516)
93+
EstimateSweepERC20GasConstant:testFuzz_sweepERC20_gasConstant(uint256,uint256,(address,address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3025, ~: 3042)
94+
EstimateSweepGasConstant:testFuzz_sweep_gasConstant(uint256,uint256,(address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2853, ~: 2808)
95+
EstimateSweepUniswapV3GasConstant:testFuzz_sweepUniswapV3_gasConstant(uint256,uint256,(address,address,address,uint24,uint256,uint256,uint256,uint32,uint32,(address,uint256,uint256,uint256))) (runs: 256, μ: 4427, ~: 4425)
96+
EstimateSweepWithdrawERC4626GasConstant:testFuzz_sweepWithdrawERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 3285, ~: 3288)
97+
EstimateTransferCCTPGasConstant:testFuzz_transferCCTP_gasConstant(uint256,uint256,(address,uint256,uint32,bytes32,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4222, ~: 4215)
98+
EstimateTransferERC20GasConstant:testFuzz_transferERC20_gasConstant(uint256,uint256,(address,address,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 3999, ~: 3942)
99+
EstimateTransferGasConstant:testFuzz_transfer_gasConstant(uint256,uint256,(address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 3774, ~: 3762)
100100
EstimateTransferOnceERC20GasConstant:testFuzz_transferERC20Once_gasConstant(uint256,(address,address,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2575, ~: 2586)
101-
EstimateTransferOnceGasConstant:testFuzz_transferOnce_gasConstant(uint256,(address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2322, ~: 2298)
102-
EstimateUniswapV3ExactInputGasConstant:testFuzz_uniswapV3ExactInput_gasConstant(uint256,uint256,(address,address,address,uint24,uint256,uint256,uint32,uint32,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 5332, ~: 5316)
103-
EstimateWithdrawERC4626GasConstant:testFuzz_withdrawERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4177, ~: 4170)
101+
EstimateTransferOnceGasConstant:testFuzz_transferOnce_gasConstant(uint256,(address,uint256,uint256,(address,uint256,uint256,uint256))) (runs: 256, μ: 2323, ~: 2298)
102+
EstimateUniswapV3ExactInputGasConstant:testFuzz_uniswapV3ExactInput_gasConstant(uint256,uint256,(address,address,address,uint24,uint256,uint256,uint32,uint32,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 5348, ~: 5352)
103+
EstimateWithdrawERC4626GasConstant:testFuzz_withdrawERC4626_gasConstant(uint256,uint256,(address,address,uint256,uint256,(uint256,uint256,uint256,uint256),(address,uint256,uint256,uint256))) (runs: 256, μ: 4226, ~: 4206)
104104
FeeTokenRegistryTest:test_addFeeToken_alreadyRegistered() (gas: 1898)
105105
FeeTokenRegistryTest:test_addFeeToken_happyPath() (gas: 37590)
106106
FeeTokenRegistryTest:test_addFeeToken_roundIdZero() (gas: 12004)
@@ -203,6 +203,15 @@ RefuelTest:test_refuel_targetRevert() (gas: 65323)
203203
RefuelTest:test_refuel_targetZero() (gas: 34369)
204204
RefuelTest:test_refuel_thresholdAboveEndBalance() (gas: 34401)
205205
RefuelTest:test_refuel_thresholdEqualsEndBalance() (gas: 34401)
206+
RequestDepositERC7540Test:test_requestDepositERC7540_assetsZero() (gas: 37450)
207+
RequestDepositERC7540Test:test_requestDepositERC7540_controllerZero() (gas: 37520)
208+
RequestDepositERC7540Test:test_requestDepositERC7540_happyPath() (gas: 124361)
209+
RequestDepositERC7540Test:test_requestDepositERC7540_insufficientBalance() (gas: 48438)
210+
RequestDepositERC7540Test:test_requestDepositERC7540_maxDepositTooLow() (gas: 132596)
211+
RequestDepositERC7540Test:test_requestDepositERC7540_minTotalSharesZero() (gas: 37537)
212+
RequestDepositERC7540Test:test_requestDepositERC7540_recipientZero() (gas: 37485)
213+
RequestDepositERC7540Test:test_requestDepositERC7540_totalSharesTooLow() (gas: 46594)
214+
RequestDepositERC7540Test:test_requestDepositERC7540_vaultZero() (gas: 37433)
206215
SweepCCTPTest:test_sweepCCTP_balanceUnderThreshold() (gas: 34607)
207216
SweepCCTPTest:test_sweepCCTP_destinationMintRecipientZero() (gas: 34903)
208217
SweepCCTPTest:test_sweepCCTP_endBalanceOverThreshold() (gas: 34932)
@@ -230,6 +239,15 @@ SweepERC20Test:test_sweepERC20_happyPath_thresholdEqualsEndBalance() (gas: 80396
230239
SweepERC20Test:test_sweepERC20_targetZero() (gas: 34607)
231240
SweepERC20Test:test_sweepERC20_tokenTransferRevert() (gas: 34653)
232241
SweepERC20Test:test_sweepERC20_tokenZero() (gas: 34572)
242+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_balanceUnderThreshold() (gas: 40182)
243+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_controllerZero() (gas: 35862)
244+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_endBalanceOverThreshold() (gas: 35891)
245+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_happyPath() (gas: 127186)
246+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_maxDepositTooLow() (gas: 130920)
247+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_minTotalSharesZero() (gas: 35908)
248+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_recipientZero() (gas: 35827)
249+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_totalSharesTooLow() (gas: 44859)
250+
SweepRequestDepositERC7540Test:test_sweepRequestDepositERC7540_vaultZero() (gas: 35792)
233251
SweepTest:test_sweep_balanceEqualsEndBalance() (gas: 29978)
234252
SweepTest:test_sweep_balanceUnderThreshold() (gas: 34458)
235253
SweepTest:test_sweep_balanceZero() (gas: 29978)

src/actions/interfaces/IRequestDepositERC7540Action.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {IInterval} from "../schedules/interfaces/IInterval.sol";
55
import {IOtimFee} from "../fee-models/interfaces/IOtimFee.sol";
66

77
bytes32 constant INSTRUCTION_TYPEHASH = keccak256(
8-
"Instruction(uint256 salt,uint256 maxExecutions,address action,RequestDepositERC7540 requestDepositERC7540)RequestDepositERC7540(address vault,uint256 assets,address recipient,address controller,uint256 minTotalShares,Schedule schedule,Fee fee)Fee(address token,uint256 maxBaseFeePerGas,uint256 maxPriorityFeePerGas,uint256 executionFee)Schedule(uint256 startAt,uint256 startBy,uint256 interval,uint256 timeout)"
8+
"Instruction(uint256 salt,uint256 maxExecutions,address action,RequestDepositERC7540 requestDepositERC7540)RequestDepositERC7540(address vault,uint256 assets,address recipient,address controller,uint256 minDeposit,uint256 minTotalShares,Schedule schedule,Fee fee)Fee(address token,uint256 maxBaseFeePerGas,uint256 maxPriorityFeePerGas,uint256 executionFee)Schedule(uint256 startAt,uint256 startBy,uint256 interval,uint256 timeout)"
99
);
1010

1111
bytes32 constant ARGUMENTS_TYPEHASH = keccak256(
12-
"RequestDepositERC7540(address vault,uint256 assets,address recipient,address controller,uint256 minTotalShares,Schedule schedule,Fee fee)Fee(address token,uint256 maxBaseFeePerGas,uint256 maxPriorityFeePerGas,uint256 executionFee)Schedule(uint256 startAt,uint256 startBy,uint256 interval,uint256 timeout)"
12+
"RequestDepositERC7540(address vault,uint256 assets,address recipient,address controller,uint256 minDeposit,uint256 minTotalShares,Schedule schedule,Fee fee)Fee(address token,uint256 maxBaseFeePerGas,uint256 maxPriorityFeePerGas,uint256 executionFee)Schedule(uint256 startAt,uint256 startBy,uint256 interval,uint256 timeout)"
1313
);
1414

1515
/// @title IRequestDepositERC7540Action

src/actions/interfaces/ISweepRequestDepositERC7540Action.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ pragma solidity ^0.8.26;
44
import {IOtimFee} from "../fee-models/interfaces/IOtimFee.sol";
55

66
bytes32 constant INSTRUCTION_TYPEHASH = keccak256(
7-
"Instruction(uint256 salt,uint256 maxExecutions,address action,SweepRequestDepositERC7540 sweepRequestDepositERC7540)Fee(address token,uint256 maxBaseFeePerGas,uint256 maxPriorityFeePerGas,uint256 executionFee)SweepRequestDepositERC7540(address vault,address recipient,address controller,uint256 threshold,uint256 endBalance,Fee fee)"
7+
"Instruction(uint256 salt,uint256 maxExecutions,address action,SweepRequestDepositERC7540 sweepRequestDepositERC7540)Fee(address token,uint256 maxBaseFeePerGas,uint256 maxPriorityFeePerGas,uint256 executionFee)SweepRequestDepositERC7540(address vault,address recipient,address controller,uint256 threshold,uint256 endBalance,uint256 minDeposit,uint256 minTotalShares,Fee fee)"
88
);
99

1010
bytes32 constant ARGUMENTS_TYPEHASH = keccak256(
11-
"SweepRequestDepositERC7540(address vault,address recipient,address controller,uint256 threshold,uint256 endBalance,Fee fee)Fee(address token,uint256 maxBaseFeePerGas,uint256 maxPriorityFeePerGas,uint256 executionFee)"
11+
"SweepRequestDepositERC7540(address vault,address recipient,address controller,uint256 threshold,uint256 endBalance,uint256 minDeposit,uint256 minTotalShares,Fee fee)Fee(address token,uint256 maxBaseFeePerGas,uint256 maxPriorityFeePerGas,uint256 executionFee)"
1212
);
1313

1414
/// @title ISweepRequestDepositERC7540Action

0 commit comments

Comments
 (0)