Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing withdrawal functionality in stBTC #350

Merged
merged 8 commits into from
Apr 23, 2024
Merged

Fixing withdrawal functionality in stBTC #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49b4be9
Fixing withdrawal functionality in stBTC
dimpar Apr 12, 2024
01ccc4a
Changing access of _feeOnRaw and _feeOnTotal to internal
dimpar Apr 15, 2024
9fb02e1
Merge remote-tracking branch 'origin' into mo-tests
dimpar Apr 15, 2024
97014f7
Accessing 'exitFeeBasisPoints' var directly
dimpar Apr 20, 2024
0e94c58
Adding tests when the entry and exit fees are 0
dimpar Apr 20, 2024
d403a3c
Covering cases when all the assets were allocated to Mezo Portal
dimpar Apr 20, 2024
67c2be5
Replacing shares and assets partial calculation with feeOnRaw and fee…
dimpar Apr 20, 2024
900f487
Merge branch 'main' into mo-tests
nkuba Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions solidity/contracts/lib/ERC4626Fees.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
7 changes: 5 additions & 2 deletions solidity/contracts/stBTC.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading