fix: nullify fee when no receiver

symbioticfi · Feb 24, 2025 · cf61075 · cf61075
1 parent 762081c
commit cf61075
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/out/VaultImplementation.sol/VaultImplementation.json b/out/VaultImplementation.sol/VaultImplementation.json
diff --git a/src/contracts/vault/v1.1/VaultImplementation.sol b/src/contracts/vault/v1.1/VaultImplementation.sol
@@ -259,7 +259,7 @@ contract VaultImplementation is VaultStorage, AccessControlUpgradeable, Reentran
         if (token != collateral) {
             revert UnsupportedToken();
         }
-        return value.mulDiv(flashFeeRate, FLASH_FEE_BASE);
+        return flashFeeReceiver == address(0) ? 0 : value.mulDiv(flashFeeRate, FLASH_FEE_BASE);
     }
 
     /**
@@ -412,7 +412,7 @@ contract VaultImplementation is VaultStorage, AccessControlUpgradeable, Reentran
             revert InvalidReturnAmount();
         }
 
-        if (flashFeeReceiver != address(0)) {
+        if (fee > 0) {
             IERC20(collateral_).safeTransfer(flashFeeReceiver, fee);
         }
 

diff --git a/test/vault/v1.1/Vault.t.sol b/test/vault/v1.1/Vault.t.sol
@@ -3148,6 +3148,12 @@ contract VaultTest is Test {
         _grantFlashFeeReceiverSetRole(alice, alice);
         _setFlashFeeReceiver(alice, flashFeeReceiver);
         assertEq(vault.flashFeeReceiver(), flashFeeReceiver);
+
+        if (flashFeeReceiver != address(0)) {
+            assertEq(vault.flashFee(address(collateral), 100 ether), vault.flashFeeRate().mulDiv(100 ether, 10 ** 9));
+        } else {
+            assertEq(vault.flashFee(address(collateral), 100 ether), 0);
+        }
     }
 
     function test_SetFlashFeeReceiverRevertAlreadySet(
@@ -3822,7 +3828,7 @@ contract VaultTest is Test {
                         depositLimit: 0,
                         epochDurationSetEpochsDelay: 3,
                         flashFeeRate: 0,
-                        flashFeeReceiver: address(0),
+                        flashFeeReceiver: alice,
                         defaultAdminRoleHolder: alice,
                         depositWhitelistSetRoleHolder: alice,
                         depositorWhitelistRoleHolder: alice,