From c7c981c1cdbc447ea73094a0ef187d459f0400c7 Mon Sep 17 00:00:00 2001
From: kasperpawlowski <kasperpawlowski@gmail.com>
Date: Mon, 8 Jul 2024 11:09:38 +0100
Subject: [PATCH] fix: cantina 196

---
 src/EthereumVaultConnector.sol | 5 +++--
 src/interfaces/IVault.sol      | 5 ++++-
 test/utils/mocks/Vault.sol     | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/EthereumVaultConnector.sol b/src/EthereumVaultConnector.sol
index a532927..9741d55 100644
--- a/src/EthereumVaultConnector.sol
+++ b/src/EthereumVaultConnector.sol
@@ -933,8 +933,9 @@ contract EthereumVaultConnector is Events, Errors, TransientStorage, IEVC {
         else if (numOfControllers > 1) return (false, abi.encodeWithSelector(EVC_ControllerViolation.selector));
 
         bool success;
-        (success, result) =
-            controller.call(abi.encodeCall(IVault.checkAccountStatus, (account, accountCollaterals[account].get())));
+        (success, result) = controller.staticcall(
+            abi.encodeCall(IVault.checkAccountStatus, (account, accountCollaterals[account].get()))
+        );
 
         isValid = success && result.length == 32
             && abi.decode(result, (bytes32)) == bytes32(IVault.checkAccountStatus.selector);
diff --git a/src/interfaces/IVault.sol b/src/interfaces/IVault.sol
index c668000..c1392a6 100644
--- a/src/interfaces/IVault.sol
+++ b/src/interfaces/IVault.sol
@@ -22,7 +22,10 @@ interface IVault {
     /// @param collaterals The array of enabled collateral addresses to be considered for the account status check.
     /// @return magicValue Must return the bytes4 magic value 0xb168c58f (which is a selector of this function) when
     /// account status is valid, or revert otherwise.
-    function checkAccountStatus(address account, address[] calldata collaterals) external returns (bytes4 magicValue);
+    function checkAccountStatus(
+        address account,
+        address[] calldata collaterals
+    ) external view returns (bytes4 magicValue);
 
     /// @notice Checks the status of the vault.
     /// @dev This function must only deliberately revert if the vault status is invalid. If this function reverts due to
diff --git a/test/utils/mocks/Vault.sol b/test/utils/mocks/Vault.sol
index 199e8af..97de25e 100644
--- a/test/utils/mocks/Vault.sol
+++ b/test/utils/mocks/Vault.sol
@@ -91,7 +91,7 @@ contract Vault is IVault, Target {
         }
     }
 
-    function checkAccountStatus(address, address[] memory) external virtual override returns (bytes4 magicValue) {
+    function checkAccountStatus(address, address[] memory) external view virtual override returns (bytes4 magicValue) {
         try evc.getCurrentOnBehalfOfAccount(address(0)) {
             revert("cas/on-behalf-of-account");
         } catch (bytes memory reason) {
@@ -176,7 +176,7 @@ contract VaultMalicious is Vault {
         }
 
         (bool success, bytes memory result) =
-            address(evc).call(abi.encodeWithSelector(evc.batch.selector, new IEVC.BatchItem[](0)));
+            address(evc).staticcall(abi.encodeWithSelector(evc.getLastAccountStatusCheckTimestamp.selector, address(0)));
 
         if (success || bytes4(result) != expectedErrorSelector) {
             return this.checkVaultStatus.selector;
@@ -185,7 +185,7 @@ contract VaultMalicious is Vault {
         revert("malicious vault");
     }
 
-    function checkAccountStatus(address, address[] memory) external override returns (bytes4) {
+    function checkAccountStatus(address, address[] memory) external view override returns (bytes4) {
         try evc.getCurrentOnBehalfOfAccount(address(0)) {
             revert("cas/on-behalf-of-account");
         } catch (bytes memory reason) {
@@ -207,7 +207,7 @@ contract VaultMalicious is Vault {
         }
 
         (bool success, bytes memory result) =
-            address(evc).call(abi.encodeWithSelector(evc.batch.selector, new IEVC.BatchItem[](0)));
+            address(evc).staticcall(abi.encodeWithSelector(evc.getLastAccountStatusCheckTimestamp.selector, address(0)));
 
         if (success || bytes4(result) != expectedErrorSelector) {
             return this.checkAccountStatus.selector;