fix: price change, tests

Author: rin-st

README.md

@@ -198,6 +198,19 @@ For this challenge we will not focus on the Lending aspect as much as the other
 
 🎉 Excellent! Re-deploy your contract with `yarn deploy --reset`. We want to do a fresh deploy of all the contracts so that they each have correct constructor parameters. Now try out your methods from the front end and see if you need to make any changes.
 
+<Tabs>
+<Tab label="Hardhat">
+
+> 🧪 Run the tests for this checkpoint: `yarn test --grep "Collateral Operations"`
+
+</Tab>
+<Tab label="Foundry">
+
+> 🧪 Run the tests for this checkpoint: `yarn test --match-test "test_Collateral_"`
+
+</Tab>
+</Tabs>
+
 💰 Don't forget to give yourself some ETH from the faucet!
 
 ![faucet](https://github.com/user-attachments/assets/e8b8ac20-19fa-45d4-bc5a-8049ac04487e)
@@ -337,6 +350,19 @@ For this challenge we will not focus on the Lending aspect as much as the other
 
 🔄 Run `yarn deploy --reset` so you can play with borrowing and repaying on the front end. You can adjust the price of CORN by pressing the + and - buttons under CORN price in the top right corner. See how your open position's collateral value shifts as the price moves.
 
+<Tabs>
+<Tab label="Hardhat">
+
+> 🧪 Run the tests for this checkpoint: `yarn test --grep "Borrowing Operations|Repayment Operations"`
+
+</Tab>
+<Tab label="Foundry">
+
+> 🧪 Run the tests for this checkpoint: `yarn test --match-test "test_(Borrowing|Repayment)_"`
+
+</Tab>
+</Tabs>
+
 <details><summary>Solution Code</summary>
 
 ```solidity
@@ -451,6 +477,19 @@ For this challenge we will not focus on the Lending aspect as much as the other
 
 🔄 You know the drill. Run `yarn deploy --reset` so you can try liquidating on the front end. It may be useful to open a private browser tab and go to `localhost:3000` so you can simulate multiple accounts. You can also borrow and then switch wallets and use the swap button in the CORN wallet (on the right side of the screen) to acquire some CORN. Now adjust the price using the price controls in the CORN price module and liquidate the borrower.
 
+<Tabs>
+<Tab label="Hardhat">
+
+> 🧪 Run the tests for this checkpoint: `yarn test --grep "Liquidation"`
+
+</Tab>
+<Tab label="Foundry">
+
+> 🧪 Run the tests for this checkpoint: `yarn test --match-test "test_Liquidation_"`
+
+</Tab>
+</Tabs>
+
 🫴 Notice how the borrower still has their borrowed CORN after they get liquidated. They get to keep their CORN since the liquidator paid their CORN debt back to the protocol on their behalf.
 
 ---
@@ -466,6 +505,19 @@ For this challenge we will not focus on the Lending aspect as much as the other
 
 🔙 Throwback to the `withdrawCollateral` function. What happens when a borrower withdraws collateral exceeding the safe position ratio? You should add a `_validatePosition` check to make sure that never happens. You should add it after the `s_userCollateral` mapping is updated so that it is checking the final state instead of the current state. Skip the check if they don't have any borrowed CORN.
 
+<Tabs>
+<Tab label="Hardhat">
+
+> 🧪 Run the tests for this checkpoint: `yarn test --grep "should prevent withdrawing collateral if it makes the position liquidatable"`
+
+</Tab>
+<Tab label="Foundry">
+
+> 🧪 Run the tests for this checkpoint: `yarn test --match-test "test_Withdraw_"`
+
+</Tab>
+</Tabs>
+
 🎉 Great work! Your contract has all the necessary functionality to help people get CORN loans.
 
 🍨 Now you get to see something real special. Run `yarn deploy --reset` as you usually do. Then run:

extension/.ai/CHALLENGE.yaml

@@ -135,7 +135,7 @@ checkpoints:
         foundry: "packages/foundry/contracts/Lending.sol"
       test:
         hardhat: "yarn test --grep 'Collateral Operations'"
-        foundry: "yarn test --match-test 'Checkpoint1'"
+        foundry: "yarn test --match-test 'test_Collateral_'"
       hints:
         - "For `addCollateral`: it's just `s_userCollateral[msg.sender] += msg.value` after the validation check."
         - |
@@ -253,7 +253,7 @@ checkpoints:
         foundry: "packages/foundry/contracts/Lending.sol"
       test:
         hardhat: "yarn test --grep 'Collateral Operations'"
-        foundry: "yarn test --match-test 'Checkpoint1'"
+        foundry: "yarn test --match-test 'test_Collateral_'"
       hints:
         - "`calculateCollateralValue` is a one-liner: `return (s_userCollateral[user] * i_cornDEX.currentPrice()) / 1e18;`"
         - |
@@ -397,7 +397,7 @@ checkpoints:
         foundry: "packages/foundry/contracts/Lending.sol"
       test:
         hardhat: "yarn test --grep 'Borrowing Operations|Repayment Operations|Collateral Operations'"
-        foundry: "yarn test --match-test 'Checkpoint3'"
+        foundry: "yarn test --match-test 'test_(Borrowing|Repayment|Withdraw)_'"
       hints:
         - "For `borrowCorn`: update mapping first, validate, then transfer. The order matters — `_validatePosition` checks the new state."
         - |
@@ -536,7 +536,7 @@ checkpoints:
         foundry: "packages/foundry/contracts/Lending.sol"
       test:
         hardhat: "yarn test --grep 'Liquidation'"
-        foundry: "yarn test --match-test 'Checkpoint4'"
+        foundry: "yarn test --match-test 'test_Liquidation_'"
       hints:
         - "Check `isLiquidatable(user)` first. Then verify `i_corn.balanceOf(msg.sender) >= userDebt`. Use `transferFrom` to pull the CORN from the liquidator."
         - |

extension/README.md.args.mjs

@@ -168,6 +168,8 @@ For this challenge we will not focus on the Lending aspect as much as the other
 
 🎉 Excellent! Re-deploy your contract with \`yarn deploy --reset\`. We want to do a fresh deploy of all the contracts so that they each have correct constructor parameters. Now try out your methods from the front end and see if you need to make any changes.
 
+> 🧪 Run the tests for this checkpoint: \`${solidityFramework === "hardhat" ? `yarn test --grep "Collateral Operations"` : `yarn test --match-test "test_Collateral_"`}\`
+
 💰 Don't forget to give yourself some ETH from the faucet!
 
 ![faucet](https://github.com/user-attachments/assets/e8b8ac20-19fa-45d4-bc5a-8049ac04487e)
@@ -296,6 +298,8 @@ ${solidityFramework === "hardhat" ? `> 💡 Since we added all those complex hel
 
 🔄 Run \`yarn deploy --reset\` so you can play with borrowing and repaying on the front end. You can adjust the price of CORN by pressing the + and - buttons under CORN price in the top right corner. See how your open position's collateral value shifts as the price moves.
 
+> 🧪 Run the tests for this checkpoint: \`${solidityFramework === "hardhat" ? `yarn test --grep "Borrowing Operations|Repayment Operations"` : `yarn test --match-test "test_(Borrowing|Repayment)_"`}\`
+
 <details><summary>Solution Code</summary>
 
 \`\`\`solidity
@@ -409,6 +413,8 @@ ${solidityFramework === "hardhat" ? `> 💡 Since we added all those complex hel
 
 🔄 You know the drill. Run \`yarn deploy --reset\` so you can try liquidating on the front end. It may be useful to open a private browser tab and go to \`localhost:3000\` so you can simulate multiple accounts. You can also borrow and then switch wallets and use the swap button in the CORN wallet (on the right side of the screen) to acquire some CORN. Now adjust the price using the price controls in the CORN price module and liquidate the borrower.
 
+> 🧪 Run the tests for this checkpoint: \`${solidityFramework === "hardhat" ? `yarn test --grep "Liquidation"` : `yarn test --match-test "test_Liquidation_"`}\`
+
 🫴 Notice how the borrower still has their borrowed CORN after they get liquidated. They get to keep their CORN since the liquidator paid their CORN debt back to the protocol on their behalf.
 
 ---
@@ -424,6 +430,8 @@ ${solidityFramework === "hardhat" ? `> 💡 Since we added all those complex hel
 
 🔙 Throwback to the \`withdrawCollateral\` function. What happens when a borrower withdraws collateral exceeding the safe position ratio? You should add a \`_validatePosition\` check to make sure that never happens. You should add it after the \`s_userCollateral\` mapping is updated so that it is checking the final state instead of the current state. Skip the check if they don't have any borrowed CORN.
 
+> 🧪 Run the tests for this checkpoint: \`${solidityFramework === "hardhat" ? `yarn test --grep "should prevent withdrawing collateral if it makes the position liquidatable"` : `yarn test --match-test "test_Withdraw_"`}\`
+
 🎉 Great work! Your contract has all the necessary functionality to help people get CORN loans.
 
 🍨 Now you get to see something real special. Run \`yarn deploy --reset\` as you usually do. Then run:

extension/packages/foundry/script/DeployLending.s.sol

@@ -26,7 +26,9 @@ contract DeployLending is ScaffoldETHDeploy {
             corn.mintTo(deployer, 1_000_000 ether);
 
             // Give ETH and CORN to MovePrice contract for price manipulation testing
-            vm.deal(address(movePrice), 5000 ether);
+            // (vm.deal is a cheatcode and doesn't broadcast to the live node, so use a real transfer)
+            (bool sent,) = address(movePrice).call{value: 5000 ether}("");
+            require(sent, "Failed to fund MovePrice");
             corn.mintTo(address(movePrice), 5_000_000 ether);
 
             // Mint CORN to lending contract for borrowers

extension/packages/foundry/test/Lending.t.sol

@@ -48,22 +48,22 @@ contract LendingTest is Test {
     }
 
     // ============================================================
-    // Checkpoint 1: Collateral Operations
+    // Collateral Operations
     // ============================================================
 
-    function test_Checkpoint1_AllowAddingCollateral() public {
+    function test_Collateral_AllowAddingCollateral() public {
         vm.prank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
         assertEq(lending.s_userCollateral(user1), COLLATERAL_AMOUNT);
     }
 
-    function test_Checkpoint1_RequireNonZeroValue() public {
+    function test_Collateral_RequireNonZeroValue() public {
         vm.prank(user1);
         vm.expectRevert(abi.encodeWithSelector(bytes4(keccak256("Lending__InvalidAmount()"))));
         lending.addCollateral{ value: 0 }();
     }
 
-    function test_Checkpoint1_EmitCollateralAddedEvent() public {
+    function test_Collateral_EmitCollateralAddedEvent() public {
         vm.prank(user1);
         vm.recordLogs();
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
@@ -78,7 +78,7 @@ contract LendingTest is Test {
         assertTrue(found, "CollateralAdded event should be emitted");
     }
 
-    function test_Checkpoint1_AllowWithdrawingWhenNoDebt() public {
+    function test_Collateral_AllowWithdrawingWhenNoDebt() public {
         vm.startPrank(user1);
         uint256 balanceInitial = user1.balance;
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
@@ -93,7 +93,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint1_PreventWithdrawingMoreThanDeposited() public {
+    function test_Collateral_PreventWithdrawingMoreThanDeposited() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
 
@@ -102,7 +102,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint1_PreventWithdrawingZero() public {
+    function test_Collateral_PreventWithdrawingZero() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
 
@@ -111,7 +111,11 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint3_PreventWithdrawIfMakesLiquidatable() public {
+    // ============================================================
+    // Withdraw Protection
+    // ============================================================
+
+    function test_Withdraw_PreventIfMakesLiquidatable() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
         lending.borrowCorn(BORROW_AMOUNT);
@@ -122,10 +126,10 @@ contract LendingTest is Test {
     }
 
     // ============================================================
-    // Checkpoint 3: Borrowing Operations
+    // Borrowing Operations
     // ============================================================
 
-    function test_Checkpoint3_AllowWhenSufficientlyCollateralized() public {
+    function test_Borrowing_AllowWhenSufficientlyCollateralized() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
 
@@ -136,7 +140,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint3_PreventWhenInsufficientlyCollateralized() public {
+    function test_Borrowing_PreventWhenInsufficientlyCollateralized() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
 
@@ -146,7 +150,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint3_PreventZeroBorrowAmount() public {
+    function test_Borrowing_PreventZeroBorrowAmount() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
 
@@ -155,7 +159,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint3_EmitAssetBorrowedEvent() public {
+    function test_Borrowing_EmitAssetBorrowedEvent() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
 
@@ -174,10 +178,10 @@ contract LendingTest is Test {
     }
 
     // ============================================================
-    // Checkpoint 3: Repayment Operations
+    // Repayment Operations
     // ============================================================
 
-    function test_Checkpoint3_AllowRepayingFullAmount() public {
+    function test_Repayment_AllowRepayingFullAmount() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
         lending.borrowCorn(BORROW_AMOUNT);
@@ -188,7 +192,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint3_AllowPartialRepayment() public {
+    function test_Repayment_AllowPartialRepayment() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
         lending.borrowCorn(BORROW_AMOUNT);
@@ -199,7 +203,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint3_PreventRepayingMoreThanBorrowed() public {
+    function test_Repayment_PreventRepayingMoreThanBorrowed() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
         lending.borrowCorn(BORROW_AMOUNT);
@@ -210,7 +214,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint3_PreventZeroRepayment() public {
+    function test_Repayment_PreventZeroRepayment() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
         lending.borrowCorn(BORROW_AMOUNT);
@@ -220,7 +224,7 @@ contract LendingTest is Test {
         vm.stopPrank();
     }
 
-    function test_Checkpoint3_EmitAssetRepaidEvent() public {
+    function test_Repayment_EmitAssetRepaidEvent() public {
         vm.startPrank(user1);
         lending.addCollateral{ value: COLLATERAL_AMOUNT }();
         lending.borrowCorn(BORROW_AMOUNT);
@@ -241,7 +245,7 @@ contract LendingTest is Test {
     }
 
     // ============================================================
-    // Checkpoint 4: Liquidation
+    // Liquidation
     // ============================================================
 
     function _setupLiquidation() internal {
@@ -256,7 +260,7 @@ contract LendingTest is Test {
         cornToken.approve(address(lending), BORROW_AMOUNT);
     }
 
-    function test_Checkpoint4_AllowWhenPositionUnsafe() public {
+    function test_Liquidation_AllowWhenPositionUnsafe() public {
         _setupLiquidation();
 
         // Drop price of ETH by swapping a large amount
@@ -275,7 +279,7 @@ contract LendingTest is Test {
         assertTrue(afterBalance > beforeBalance);
     }
 
-    function test_Checkpoint4_PreventOnSafePositions() public {
+    function test_Liquidation_PreventOnSafePositions() public {
         _setupLiquidation();
 
         assertFalse(lending.isLiquidatable(user1));
@@ -285,7 +289,7 @@ contract LendingTest is Test {
         lending.liquidate(user1);
     }
 
-    function test_Checkpoint4_RequireEnoughCorn() public {
+    function test_Liquidation_RequireEnoughCorn() public {
         _setupLiquidation();
 
         // Drop price
@@ -304,7 +308,7 @@ contract LendingTest is Test {
         lending.liquidate(user1);
     }
 
-    function test_Checkpoint4_EmitEvent() public {
+    function test_Liquidation_EmitEvent() public {
         _setupLiquidation();
 
         // Drop price
@@ -326,5 +330,5 @@ contract LendingTest is Test {
         assertTrue(found, "Liquidation event should be emitted");
     }
 
-    receive() external payable {}
+    receive() external payable { }
 }