WIP

Author: m-Peter

solidity/src/FlowYieldVaultsRequests.sol

@@ -513,13 +513,6 @@ contract FlowYieldVaultsRequests is ReentrancyGuard, Ownable2Step {
         }
     }
 
-    // ============================================
-    // Receive Function
-    // ============================================
-
-    /// @notice Allows contract to receive native $FLOW
-    receive() external payable {}
-
     // ============================================
     // External Functions - Admin
     // ============================================

solidity/test/FlowYieldVaultsRequests.t.sol

@@ -2,8 +2,17 @@
 pragma solidity 0.8.20;
 
 import "forge-std/Test.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "../src/FlowYieldVaultsRequests.sol";
 
+contract MockDAI is ERC20 {
+    constructor() ERC20("Mock DAI", "DAI") {}
+
+    function mint(address to, uint256 amount) external {
+        _mint(to, amount);
+    }
+}
+
 contract FlowYieldVaultsRequestsTestHelper is FlowYieldVaultsRequests {
     constructor(address coaAddress, address wflowAddress) FlowYieldVaultsRequests(coaAddress, wflowAddress) {}
 
@@ -41,11 +50,16 @@ contract FlowYieldVaultsRequestsTest is Test {
     string constant VAULT_ID = "A.0ae53cb6e3f42a79.FlowToken.Vault";
     string constant STRATEGY_ID = "A.045a1763c93006ca.MockStrategies.TracerStrategy";
 
+    MockDAI dai;
+
     function setUp() public {
         vm.deal(user, 100 ether);
         vm.deal(user2, 100 ether);
         c = new FlowYieldVaultsRequestsTestHelper(coa, WFLOW);
         c.testRegisterYieldVaultId(42, user, NATIVE_FLOW);
+
+        dai = new MockDAI();
+        dai.mint(user2, 1 ether);
     }
 
     function _startProcessingBatch(uint256 requestId) internal {
@@ -1451,4 +1465,100 @@ contract FlowYieldVaultsRequestsTest is Test {
         ));
         uint256 closeReq = c.closeYieldVault(100);
     }
+
+    function test_CreateYieldVault_MsgValueValidation() public {
+        vm.startPrank(user);
+
+        vm.expectRevert(FlowYieldVaultsRequests.MsgValueMustEqualAmount.selector);
+        c.createYieldVault{value: 5 ether}(NATIVE_FLOW, 1 ether, VAULT_ID, STRATEGY_ID);
+
+        vm.expectRevert(FlowYieldVaultsRequests.MsgValueMustBeZero.selector);
+        c.createYieldVault{value: 5 ether}(WFLOW, 5 ether, VAULT_ID, STRATEGY_ID);
+
+        vm.stopPrank();
+    }
+
+    function test_CreateYieldVault_RevertTokenNotSupported() public {
+        deal(address(dai), user2, 20 ether);
+        assertEq(dai.balanceOf(user2), 20 ether);
+
+        vm.prank(user2);
+        vm.expectRevert(abi.encodeWithSelector(
+            FlowYieldVaultsRequests.TokenNotSupported.selector,
+            address(dai)
+        ));
+        c.createYieldVault(address(dai), 5 ether, VAULT_ID, STRATEGY_ID);
+    }
+
+    function test_DepositToYieldVault_MsgValueValidation() public {
+        vm.prank(user);
+        vm.expectRevert(FlowYieldVaultsRequests.MsgValueMustEqualAmount.selector);
+        c.depositToYieldVault{value: 5 ether}(42, NATIVE_FLOW, 1 ether);
+
+        c.testRegisterYieldVaultId(101, user, WFLOW);
+        vm.expectRevert(FlowYieldVaultsRequests.MsgValueMustBeZero.selector);
+        c.depositToYieldVault{value: 5 ether}(101, WFLOW, 5 ether);
+    }
+
+    function test_DepositToYieldVault_RevertTokenNotSupported() public {
+        deal(address(dai), user2, 20 ether);
+        assertEq(dai.balanceOf(user2), 20 ether);
+
+        c.testRegisterYieldVaultId(101, user2, address(dai));
+
+        vm.prank(user2);
+        vm.expectRevert(abi.encodeWithSelector(
+            FlowYieldVaultsRequests.TokenNotSupported.selector,
+            address(dai)
+        ));
+        c.depositToYieldVault{value: 5 ether}(101, address(dai), 1 ether);
+    }
+
+    function test_CompleteProcessing_MsgValueValidation() public {
+        vm.prank(user);
+        uint256 req1 = c.createYieldVault{value: 5 ether}(NATIVE_FLOW, 5 ether, VAULT_ID, STRATEGY_ID);
+
+        vm.prank(coa);
+        _startProcessingBatch(req1);
+
+        uint64 sentinelYieldVaultId = c.NO_YIELDVAULT_ID();
+        vm.prank(coa);
+        vm.expectRevert(FlowYieldVaultsRequests.MsgValueMustEqualAmount.selector);
+        c.completeProcessing{value: 3 ether}(req1, false, sentinelYieldVaultId, "Failed");
+
+        c.testRegisterYieldVaultId(101, user2, address(dai));
+        c.setTokenConfig(address(dai), true, 0.5 ether, false);
+
+        vm.startPrank(user2);
+        deal(address(dai), user2, 20 ether);
+        dai.approve(address(c), 5 ether);
+        uint256 req2 = c.depositToYieldVault(101, address(dai), 5 ether);
+        vm.stopPrank();
+
+        vm.prank(coa);
+        _startProcessingBatch(req2);
+
+        vm.prank(coa);
+        vm.expectRevert(FlowYieldVaultsRequests.MsgValueMustBeZero.selector);
+        c.completeProcessing{value: 5 ether}(req2, false, 101, "Failed");
+    }
+
+    // function test_Stray_tokens() public {
+    //     vm.deal(user2, 10 ether);
+    //     assertEq(user2.balance, 10 ether);
+
+    //     deal(address(dai), user2, 20 ether);
+    //     assertEq(dai.balanceOf(user2), 20 ether);
+
+    //     vm.prank(c.owner());
+    //     c.setTokenConfig(address(dai), true, 0.5 ether, false);
+
+    //     vm.startPrank(user2);
+    //     dai.approve(address(c), 5 ether);
+    //     uint256 reqId = c.createYieldVault(address(dai), 5 ether, VAULT_ID, STRATEGY_ID);
+
+    //     assertEq(dai.balanceOf(address(c)), 5 ether);
+
+    //     vm.stopPrank();
+    // }
 }