chore: fix BlockTimeSchedulerLib test & run prettier

smart-transaction · Dec 20, 2024 · 3513b0d · 3513b0d
1 parent d836d3e
commit 3513b0d
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 87 deletions.
diff --git a/src/interfaces/IFlashLoan.sol b/src/interfaces/IFlashLoan.sol
@@ -2,7 +2,5 @@
 pragma solidity 0.8.26;
 
 interface IFlashLoan {
-    function flashLoan(address receiver, uint256 amountA, uint256 amountB, bytes memory data)
-        external
-        returns (bool);
+    function flashLoan(address receiver, uint256 amountA, uint256 amountB, bytes memory data) external returns (bool);
 }
diff --git a/src/timetravel/CallBreaker.sol b/src/timetravel/CallBreaker.sol
@@ -85,10 +85,8 @@ contract CallBreaker is CallBreakerStorage {
         FlashLoanData calldata flashLoanData
     ) external payable onlyPortalClosed {
         _setupExecutionData(callObjs, returnsBytes, associatedData);
-        bytes memory data = abi.encode(callObjs); 
-        IFlashLoan(flashLoanData.provider).flashLoan(
-            address(this), flashLoanData.amountA, flashLoanData.amountB, data
-        );
+        bytes memory data = abi.encode(callObjs);
+        IFlashLoan(flashLoanData.provider).flashLoan(address(this), flashLoanData.amountA, flashLoanData.amountB, data);
     }
 
     /**

diff --git a/test/BlockTimeScheduler.t.sol b/test/BlockTimeScheduler.t.sol
@@ -23,13 +23,9 @@ contract BlockTimeSchedulerTest is Test, BlockTimeSchedulerLib {
 
         // start deployer calls
         vm.startPrank(deployer);
-        (address pusherLaminated, address _blockTimeScheduler) = deployerLand(pusher);
+        deployerLand(pusher);
         vm.stopPrank();
 
-        BlockTimeScheduler blockTimeScheduler = BlockTimeScheduler(_blockTimeScheduler);
-        vm.prank(pusher);
-        blockTimeScheduler.transferOwnership(pusherLaminated);
-
         // Label operations in the run function.
         vm.label(pusher, "pusher");
         vm.label(address(this), "deployer");

diff --git a/test/NoopTurnerTest.t.sol b/test/NoopTurnerTest.t.sol
@@ -40,8 +40,6 @@ contract NoopTurnerTest is Test {
         hintdices[0] = AdditionalData({key: keccak256(abi.encode(callObjs[0])), value: abi.encode(0)});
 
         vm.prank(address(0xdeadbeef), address(0xdeadbeef));
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 }
diff --git a/test/SmarterContract.t.sol b/test/SmarterContract.t.sol
@@ -143,9 +143,7 @@ contract SmarterContractTest is Test {
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
         vm.prank(address(0xdeadbeef), address(0xdeadbeef));
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 
     function testFail_FrontrunBlocker() external {
@@ -192,9 +190,7 @@ contract SmarterContractTest is Test {
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
         vm.prank(address(0xdeadbeef), address(0xdeadbeef));
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 
     function testBackrunBlocker() external {
@@ -241,9 +237,7 @@ contract SmarterContractTest is Test {
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
         vm.prank(address(0xdeadbeef), address(0xdeadbeef));
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 
     function testFail_BackrunBlocker() external {
@@ -290,9 +284,7 @@ contract SmarterContractTest is Test {
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
         vm.prank(address(0xdeadbeef), address(0xdeadbeef));
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 
     function testAssertFutureCallTo() external {
@@ -344,9 +336,7 @@ contract SmarterContractTest is Test {
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
         vm.prank(address(0xdeadbeef), address(0xdeadbeef));
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
 
         callbreakerHarness.setPortalOpen(callObjs, returnObjs);
 
@@ -404,9 +394,7 @@ contract SmarterContractTest is Test {
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
         vm.prank(address(0xdeadbeef), address(0xdeadbeef));
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
 
         uint256 callLength = 3;
         uint256 executeIndex = 2;
@@ -477,9 +465,7 @@ contract SmarterContractTest is Test {
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
         vm.prank(address(0xdeadbeef), address(0xdeadbeef));
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
 
         uint256 callLength = 3;
         uint256 executeIndex = 2;

diff --git a/test/solve-lib/BlockTime/BlockTimeSchedulerLib.sol b/test/solve-lib/BlockTime/BlockTimeSchedulerLib.sol
@@ -21,15 +21,15 @@ contract BlockTimeSchedulerLib {
     uint256 constant tipWei = 33;
     bytes32 public constant SELECTOR = keccak256(abi.encode("BLOCKTIME.UPDATE_TIME"));
 
-    function deployerLand(address pusher) public returns (address, address) {
+    function deployerLand(address pusher) public {
         // Initializing contracts
         callBreaker = new CallBreaker();
         laminator = new Laminator(address(callBreaker));
-        blockTime = new BlockTime(timeTokenName, timeTokenSymbol);
-        blockTimeScheduler = new BlockTimeScheduler(address(callBreaker), address(blockTime), pusher);
+        blockTime = new BlockTime();
+        blockTimeScheduler = new BlockTimeScheduler(address(callBreaker), address(blockTime));
         blockTime.grantRole(blockTime.SCHEDULER_ROLE(), address(blockTimeScheduler));
         pusherLaminated = payable(laminator.computeProxyAddress(pusher));
-        return (address(pusherLaminated), address(blockTimeScheduler));
+        blockTimeScheduler.grantRole(blockTimeScheduler.TIME_SOLVER(), address(pusherLaminated));
     }
 
     function userLand() public returns (uint256) {
@@ -66,11 +66,12 @@ contract BlockTimeSchedulerLib {
         SolverData[] memory dataValues = new SolverData[](1);
         dataValues[0] = data;
 
-        return laminator.pushToProxy(abi.encode(pusherCallObjs), 1, SELECTOR, dataValues);
+        return laminator.pushToProxy(pusherCallObjs, 1, SELECTOR, dataValues);
     }
 
     function solverLand(uint256 laminatorSequenceNumber, address filler, address pusher) public {
-        BlockTimeScheduler.BlockTimeData memory data = _getUpdateTimeData(filler, pusher);
+        (bytes memory chroniclesData, bytes memory meanTimeData, bytes memory receiversData, bytes memory amountsData) =
+            _getUpdateTimeData(filler, pusher);
 
         CallObject[] memory callObjs = new CallObject[](1);
         ReturnObject[] memory returnObjs = new ReturnObject[](1);
@@ -89,37 +90,40 @@ contract BlockTimeSchedulerLib {
 
         returnObjs[0] = ReturnObject({returnvalue: abi.encode(abi.encode(returnObjsFromPull))});
 
-        AdditionalData[] memory associatedData = new AdditionalData[](3);
+        AdditionalData[] memory associatedData = new AdditionalData[](6);
         associatedData[0] =
             AdditionalData({key: keccak256(abi.encodePacked("tipYourBartender")), value: abi.encodePacked(filler)});
         associatedData[1] =
             AdditionalData({key: keccak256(abi.encodePacked("pullIndex")), value: abi.encode(laminatorSequenceNumber)});
-        associatedData[2] = AdditionalData({key: keccak256(abi.encodePacked("MoveTimeData")), value: abi.encode(data)});
+        associatedData[2] = AdditionalData({key: keccak256(abi.encodePacked("Chronicles")), value: chroniclesData});
+        associatedData[3] = AdditionalData({key: keccak256(abi.encodePacked("CurrentMeanTime")), value: meanTimeData});
+        associatedData[4] = AdditionalData({key: keccak256(abi.encodePacked("Recievers")), value: receiversData});
+        associatedData[5] = AdditionalData({key: keccak256(abi.encodePacked("Amounts")), value: amountsData});
 
-        AdditionalData[] memory hintdices = new AdditionalData[](1);
-        hintdices[0] = AdditionalData({key: keccak256(abi.encode(callObjs[0])), value: abi.encode(0)});
-
-        callBreaker.executeAndVerify(
-            abi.encode(callObjs), abi.encode(returnObjs), abi.encode(associatedData), abi.encode(hintdices)
-        );
+        callBreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 
     function _getUpdateTimeData(address receiver, address pusher)
         private
         view
-        returns (BlockTimeScheduler.BlockTimeData memory)
+        returns (
+            bytes memory chroniclesData,
+            bytes memory meanTimeData,
+            bytes memory receiversData,
+            bytes memory amountsData
+        )
     {
         IBlockTime.Chronicle[] memory chronicles = new IBlockTime.Chronicle[](1);
-        chronicles[0] = IBlockTime.Chronicle(100, pusher, bytes32(0));
+        chronicles[0] = IBlockTime.Chronicle(100, pusher, bytes(""));
         address[] memory receivers = new address[](1);
         uint256[] memory amounts = new uint256[](1);
 
         receivers[0] = receiver;
         amounts[0] = 1e18;
 
-        BlockTimeScheduler.BatchMintData memory batchMintData = BlockTimeScheduler.BatchMintData(receivers, amounts);
-        BlockTimeScheduler.BlockTimeData memory data =
-            BlockTimeScheduler.BlockTimeData(chronicles, block.timestamp, batchMintData);
-        return data;
+        chroniclesData = abi.encode(chronicles);
+        meanTimeData = abi.encode(block.timestamp);
+        receiversData = abi.encode(receivers);
+        amountsData = abi.encode(amounts);
     }
 }
diff --git a/test/solve-lib/CronCounterLib.sol b/test/solve-lib/CronCounterLib.sol
@@ -107,8 +107,6 @@ contract CronCounterLib {
             associatedData[1].value = abi.encode(laminatorSequenceNumber + 1);
         }
 
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 }
diff --git a/test/solve-lib/DeFi/FlashLiquidityLib.sol b/test/solve-lib/DeFi/FlashLiquidityLib.sol
@@ -140,8 +140,6 @@ contract FlashLiquidityLib {
         hintdices[3] = AdditionalData({key: keccak256(abi.encode(callObjs[3])), value: abi.encode(3)});
         hintdices[4] = AdditionalData({key: keccak256(abi.encode(callObjs[4])), value: abi.encode(4)});
 
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 }
diff --git a/test/solve-lib/DeFi/FlashLoanLib.sol b/test/solve-lib/DeFi/FlashLoanLib.sol
@@ -137,13 +137,8 @@ contract FlashLoanLib {
             AdditionalData({key: keccak256(abi.encodePacked("tipYourBartender")), value: abi.encodePacked(filler)});
         associatedData[1] =
             AdditionalData({key: keccak256(abi.encodePacked("pullIndex")), value: abi.encode(laminatorSequenceNumber)});
-
-        callbreaker.executeAndVerify(
-            callObjs,
-            returnObjs,
-            associatedData,
-            generateFlashLoanData(address(flashLoan))
-        );
+
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData, generateFlashLoanData(address(flashLoan)));
     }
 
     function generateFlashLoanData(address _flashLoan) public pure returns (FlashLoanData memory) {

diff --git a/test/solve-lib/DeFi/SelfCheckoutLib.sol b/test/solve-lib/DeFi/SelfCheckoutLib.sol
@@ -124,8 +124,6 @@ contract SelfCheckoutLib {
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
         hintdices[2] = AdditionalData({key: keccak256(abi.encode(callObjs[2])), value: abi.encode(2)});
 
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 }
diff --git a/test/solve-lib/DeFi/SlippageProtectionLib.sol b/test/solve-lib/DeFi/SlippageProtectionLib.sol
@@ -95,8 +95,6 @@ contract SlippageProtectionLib {
         hintdices[0] = AdditionalData({key: keccak256(abi.encode(callObjs[0])), value: abi.encode(0)});
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 }
diff --git a/test/solve-lib/FlashPillLib.sol b/test/solve-lib/FlashPillLib.sol
@@ -63,8 +63,6 @@ contract FlashPillLib {
         AdditionalData[] memory hintdices = new AdditionalData[](1);
         hintdices[0] = AdditionalData({key: keccak256(abi.encode(callObjs[0])), value: abi.encode(0)});
 
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 }
diff --git a/test/solve-lib/MEVTimeOracle/KITNDisburmentSchedulerLib.sol b/test/solve-lib/MEVTimeOracle/KITNDisburmentSchedulerLib.sol
@@ -117,9 +117,7 @@ contract KITNDisburmentSchedulerLib {
         hintdices[0] = AdditionalData({key: keccak256(abi.encode(callObjs[0])), value: abi.encode(0)});
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 
     function _getDisbursalData(address receiver) private pure returns (KITNDisburmentScheduler.DisbursalData memory) {

diff --git a/test/solve-lib/MEVTimeOracle/MEVTimeComputeLib.sol b/test/solve-lib/MEVTimeOracle/MEVTimeComputeLib.sol
@@ -82,8 +82,6 @@ contract MEVTimeComputeLib {
         hintdices[0] = AdditionalData({key: keccak256(abi.encode(callObjs[0])), value: abi.encode(0)});
         hintdices[1] = AdditionalData({key: keccak256(abi.encode(callObjs[1])), value: abi.encode(1)});
 
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 }
diff --git a/test/solve-lib/PnPLib.sol b/test/solve-lib/PnPLib.sol
@@ -78,8 +78,6 @@ contract PnPLib {
         AdditionalData[] memory hintdices = new AdditionalData[](1);
         hintdices[0] = AdditionalData({key: keccak256(abi.encode(callObjs[0])), value: abi.encode(0)});
 
-        callbreaker.executeAndVerify(
-            callObjs, returnObjs, associatedData
-        );
+        callbreaker.executeAndVerify(callObjs, returnObjs, associatedData);
     }
 }