Merge pull request #54 from smart-transaction/fix/limit-order-test

Modified call objs and check slippage for limit order test
smart-transaction · Jul 24, 2024 · f040202 · f040202
2 parents a3eb022 + 33afc58
commit f040202
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 25 deletions.
diff --git a/test/FlashLiquidityTest.t.sol b/test/FlashLiquidityTest.t.sol
@@ -57,7 +57,7 @@ contract FlashLiquidityTest is Test, FlashLiquidityExampleLib {
         uint256 laminatorSequenceNumber;
 
         vm.startPrank(pusher);
-        laminatorSequenceNumber = userLand(100000000000000000000, 10, 1);
+        laminatorSequenceNumber = userLand(100000000000000000000, 80, 1);
         vm.stopPrank();
 
         // go forward in time

diff --git a/test/examples/LimitOrder.sol b/test/examples/LimitOrder.sol
@@ -1,8 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.6.2 <0.9.0;
-
-import "forge-std/Test.sol";
-import "forge-std/console.sol";
+pragma solidity 0.8.23;
 
 import "../utils/interfaces/ISwapRouter.sol";
 import "../../src/timetravel/CallBreaker.sol";
@@ -82,18 +79,17 @@ contract LimitOrder is SmarterContract {
 
         // The call to `exactInputSingle` executes the swap.
         uint256 amountOut = router.exactInputSingle(params);
-        console.log("WETH", amountOut);
 
         // check whether or not
         CallObject[] memory callObjs = new CallObject[](1);
         callObjs[0] = CallObject({
             amount: 0,
-            addr: address(this),
-            gas: 1000000,
+            addr: address(router),
+            gas: 10000000,
             callvalue: abi.encodeWithSignature("checkSlippage(uint256)", slippagePercent)
         });
 
-        assertFutureCallTo(callObjs[0], 2);
+        assertFutureCallTo(callObjs[0]);
     }
 
     function provideLiquidityToDAIETHPool(uint256 _amount0In, uint256 _amount1In) external {

diff --git a/test/solve-lib/FlashLiquidityExample.sol b/test/solve-lib/FlashLiquidityExample.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity >=0.6.2 <0.9.0;
 
-import "forge-std/Vm.sol";
 import "../../src/lamination/Laminator.sol";
 import "../../src/timetravel/CallBreaker.sol";
 import "../../test/examples/LimitOrder.sol";
@@ -89,8 +88,8 @@ contract FlashLiquidityExampleLib {
 
         callObjs[2] = CallObject({
             amount: 0,
-            addr: address(limitOrder),
-            gas: 1000000,
+            addr: address(swapRouter),
+            gas: 10000000,
             callvalue: abi.encodeWithSignature("checkSlippage(uint256)", maxDeviationPercentage)
         });
 

diff --git a/test/solve-lib/LimitOrderExample.sol b/test/solve-lib/LimitOrderExample.sol
@@ -19,6 +19,7 @@ contract LimitOrderExampleLib {
     LimitOrder public limitOrder;
     Laminator public laminator;
     CallBreaker public callbreaker;
+    uint256 maxSlippage = 10;
     uint256 _tipWei = 33;
 
     function deployerLand(address pusher) public {
@@ -33,6 +34,8 @@ contract LimitOrderExampleLib {
             address(swapRouter), address(callbreaker), address(positionManager), address(aToken), address(bToken)
         );
         pusherLaminated = payable(laminator.computeProxyAddress(pusher));
+        aToken.mint(100e18, pusherLaminated);
+        bToken.mint(100e18, address(callbreaker));
     }
 
     function userLand() public returns (uint256) {
@@ -42,15 +45,20 @@ contract LimitOrderExampleLib {
         // Userland operations
         // Temporarily, this example uses a call to swap but only sets slippage protection in
         // sqrtPriceLimitX96 (not within the call to Uniswaps)
-        CallObject[] memory pusherCallObjs = new CallObject[](2);
+        CallObject[] memory pusherCallObjs = new CallObject[](3);
         pusherCallObjs[0] = CallObject({
+            amount: 0,
+            addr: address(aToken),
+            gas: 1000000,
+            callvalue: abi.encodeWithSignature("approve(address,uint256)", limitOrder, 100e18)
+        });
+        pusherCallObjs[1] = CallObject({
             amount: 0,
             addr: address(limitOrder),
             gas: 1000000,
-            callvalue: abi.encodeWithSignature("swapDAIForWETH(uint256,uint160)", 100, 1)
+            callvalue: abi.encodeWithSignature("swapDAIForWETH(uint256,uint256)", 100, maxSlippage)
         });
-
-        pusherCallObjs[1] = CallObject({amount: _tipWei, addr: address(callbreaker), gas: 10000000, callvalue: ""});
+        pusherCallObjs[2] = CallObject({amount: _tipWei, addr: address(callbreaker), gas: 10000000, callvalue: ""});
 
         return laminator.pushToProxy(abi.encode(pusherCallObjs), 1);
     }
@@ -66,17 +74,18 @@ contract LimitOrderExampleLib {
             callvalue: abi.encodeWithSignature("pull(uint256)", laminatorSequenceNumber)
         });
 
-        ReturnObject[] memory returnObjsFromPull = new ReturnObject[](2);
-        returnObjsFromPull[0] = ReturnObject({returnvalue: ""});
+        ReturnObject[] memory returnObjsFromPull = new ReturnObject[](3);
+        returnObjsFromPull[0] = ReturnObject({returnvalue: abi.encode(true)});
         returnObjsFromPull[1] = ReturnObject({returnvalue: ""});
+        returnObjsFromPull[2] = ReturnObject({returnvalue: ""});
 
         returnObjs[0] = ReturnObject({returnvalue: abi.encode(abi.encode(returnObjsFromPull))});
 
         callObjs[1] = CallObject({
             amount: 0,
-            addr: pusherLaminated,
+            addr: address(swapRouter),
             gas: 10000000,
-            callvalue: abi.encodeWithSignature("checkSlippage(uint256)", laminatorSequenceNumber)
+            callvalue: abi.encodeWithSignature("checkSlippage(uint256)", maxSlippage)
         });
 
         returnObjs[1] = ReturnObject({returnvalue: ""});

diff --git a/test/solve-lib/MEVOracle/PartialFunctionExample.sol b/test/solve-lib/MEVOracle/PartialFunctionExample.sol
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.23;
 
-import "forge-std/Vm.sol";
-import "forge-std/console.sol";
-
 import "src/lamination/Laminator.sol";
 import "src/timetravel/CallBreaker.sol";
 import "src/timetravel/SmarterContract.sol";

diff --git a/test/utils/MockSwapRouter.sol b/test/utils/MockSwapRouter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.13;
+pragma solidity 0.8.23;
 
 import {IWETH, IERC20} from "../utils/interfaces/IWeth.sol";
 import {ISwapRouter} from "../utils/interfaces/ISwapRouter.sol";
@@ -9,7 +9,7 @@ import {ISwapRouter} from "../utils/interfaces/ISwapRouter.sol";
  * @dev not to be used for anything other than local tests
  */
 contract MockSwapRouter is ISwapRouter {
-    uint256 public constant DECIMAL = 18;
+    uint256 public constant DECIMAL = 1e18;
 
     uint256 private _balanceOfWeth;
     uint256 private _balanceOfDai;