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

First batch of fixes for k-internal review 2 #24

Merged
merged 11 commits into from
Jun 13, 2024
Merged

First batch of fixes for k-internal review 2 #24

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b0f8889
remove cachedBalanceTracker
haythemsellami Jun 12, 2024
43f60e6
remove duplicate params
haythemsellami Jun 12, 2024
f591ebf
minor gas opt; remove account status check
haythemsellami Jun 12, 2024
b29462b
more fixes
haythemsellami Jun 12, 2024
ec792d7
clean
haythemsellami Jun 12, 2024
f3c2cf5
Merge branch 'main' into k-review2
haythemsellami Jun 12, 2024
6b7636e
refactor setHooksConfig()
haythemsellami Jun 12, 2024
b38c925
feat: pack hooks config in uint256
haythemsellami Jun 13, 2024
f5c5bd1
uncomment asserts
haythemsellami Jun 13, 2024
e43cff0
refactor
haythemsellami Jun 13, 2024
c048e42
revert on duplicate initial strategies
haythemsellami Jun 13, 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
Next Next commit
remove cachedBalanceTracker
  • Loading branch information
@haythemsellami
haythemsellami committed Jun 12, 2024
commit b0f88899f1dc189c0f7997bfac25e5f863c05bcd
12 changes: 4 additions & 8 deletions src/BalanceForwarder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,11 @@ abstract contract BalanceForwarder is IBalanceForwarder {
}

function _enableBalanceForwarder(address _sender, uint256 _senderBalance) internal {
address cachedBalanceTracker = address(balanceTracker);

if (cachedBalanceTracker == address(0)) revert NotSupported();
if (address(balanceTracker) == address(0)) revert NotSupported();
if (isBalanceForwarderEnabled[_sender]) revert AlreadyEnabled();

isBalanceForwarderEnabled[_sender] = true;
IBalanceTracker(cachedBalanceTracker).balanceTrackerHook(_sender, _senderBalance, false);
balanceTracker.balanceTrackerHook(_sender, _senderBalance, false);

emit EnableBalanceForwarder(_sender);
}
Expand All @@ -63,13 +61,11 @@ abstract contract BalanceForwarder is IBalanceForwarder {
/// @dev Only the authenticated account can disable balance forwarding for itself
/// @dev Should call the IBalanceTracker hook with the account's balance of 0
function _disableBalanceForwarder(address _sender) internal {
address cachedBalanceTracker = address(balanceTracker);

if (cachedBalanceTracker == address(0)) revert NotSupported();
if (address(balanceTracker) == address(0)) revert NotSupported();
if (!isBalanceForwarderEnabled[_sender]) revert AlreadyDisabled();

isBalanceForwarderEnabled[_sender] = false;
IBalanceTracker(cachedBalanceTracker).balanceTrackerHook(_sender, 0, false);
balanceTracker.balanceTrackerHook(_sender, 0, false);

emit DisableBalanceForwarder(_sender);
}
Expand Down