chore: repack and optimize yield params struct

zkBob · Sep 22, 2023 · 4e16314 · 4e16314
1 parent 43cbede
commit 4e16314
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/zkbob/ZkBobCompoundingMixin.sol b/src/zkbob/ZkBobCompoundingMixin.sol
@@ -16,16 +16,16 @@ abstract contract ZkBobCompoundingMixin is ZkBobPool {
     struct YieldParams {
         // ERC4626 vault address (or address(0) if not set)
         address yield;
-        // maximum amount of underlying tokens that can be invested into vault
-        uint256 maxInvestedAmount;
         // expected amount of underlying tokens to be left at the pool after successful rebalance
         uint96 buffer;
+        // operator address (or address(0) if permissionless)
+        address yieldOperator;
         // slippage/rounding protection buffer, small part of accumulated interest that is non-claimable
         uint96 dust;
         // address to receive accumulated interest during the rebalance
         address interestReceiver;
-        // operator address (or address(0) if permissionless)
-        address yieldOperator;
+        // maximum amount of underlying tokens that can be invested into vault
+        uint256 maxInvestedAmount;
     }
 
     YieldParams public yieldParams;

diff --git a/test/interfaces/IZkBobPoolAdmin.sol b/test/interfaces/IZkBobPoolAdmin.sol
@@ -10,16 +10,16 @@ interface IZkBobPoolAdmin {
     struct YieldParams {
         // ERC4626 vault address (or address(0) if not set)
         address yield;
-        // maximum amount of underlying tokens that can be invested into vault
-        uint256 maxInvestedAmount;
         // expected amount of underlying tokens to be left at the pool after successful rebalance
         uint96 buffer;
+        // operator address (or address(0) if permissionless)
+        address yieldOperator;
         // slippage/rounding protection buffer, small part of accumulated interest that is non-claimable
         uint96 dust;
         // address to receive accumulated interest during the rebalance
         address interestReceiver;
-        // operator address (or address(0) if permissionless)
-        address yieldOperator;
+        // maximum amount of underlying tokens that can be invested into vault
+        uint256 maxInvestedAmount;
     }
 
     function denominator() external pure returns (uint256);