Merge branch 'master' into build/hardhat-compile

opynfinance · Jun 3, 2021 · c309729 · c309729
2 parents 6b5960c + 6c2d8c9
commit c309729
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/contracts/core/Controller.sol b/contracts/core/Controller.sol
@@ -465,7 +465,10 @@ contract Controller is Initializable, OwnableUpgradeSafe, ReentrancyGuardUpgrade
     function getProceed(address _owner, uint256 _vaultId) external view returns (uint256) {
         (MarginVault.Vault memory vault, uint256 typeVault, ) = getVault(_owner, _vaultId);
 
-        (uint256 netValue, ) = calculator.getExcessCollateral(vault, typeVault);
+        (uint256 netValue, bool isExcess) = calculator.getExcessCollateral(vault, typeVault);
+
+        if (!isExcess) return 0;
+
         return netValue;
     }