Merge branch 'main' into bitcoin-depositor-min-deposit-update

thesis · Apr 23, 2024 · d8f71df · d8f71df
2 parents 237cb60 + 9902f4c
commit d8f71df
Show file tree

Hide file tree

Showing 3 changed files with 670 additions and 202 deletions.
diff --git a/solidity/contracts/lib/ERC4626Fees.sol b/solidity/contracts/lib/ERC4626Fees.sol
@@ -103,7 +103,7 @@ abstract contract ERC4626Fees is ERC4626Upgradeable {
     function _feeOnRaw(
         uint256 assets,
         uint256 feeBasisPoints
-    ) private pure returns (uint256) {
+    ) internal pure returns (uint256) {
         return
             assets.mulDiv(
                 feeBasisPoints,
@@ -117,7 +117,7 @@ abstract contract ERC4626Fees is ERC4626Upgradeable {
     function _feeOnTotal(
         uint256 assets,
         uint256 feeBasisPoints
-    ) private pure returns (uint256) {
+    ) internal pure returns (uint256) {
         return
             assets.mulDiv(
                 feeBasisPoints,

diff --git a/solidity/contracts/stBTC.sol b/solidity/contracts/stBTC.sol
@@ -253,8 +253,11 @@ contract stBTC is ERC4626Fees, PausableOwnable {
         address owner
     ) public override whenNotPaused returns (uint256) {
         uint256 currentAssetsBalance = IERC20(asset()).balanceOf(address(this));
-        if (assets > currentAssetsBalance) {
-            dispatcher.withdraw(assets - currentAssetsBalance);
+        // If there is not enough assets in stBTC to cover user withdrawals and
+        // withdrawal fees then pull the assets from the dispatcher.
+        uint256 assetsWithFees = assets + _feeOnRaw(assets, exitFeeBasisPoints);
+        if (assetsWithFees > currentAssetsBalance) {
+            dispatcher.withdraw(assetsWithFees - currentAssetsBalance);
         }
 
         return super.withdraw(assets, receiver, owner);