logos-storage/logos-storage-contracts-eth
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-contracts-eth.git synced 2026-01-07 15:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

vault: simplify _getAccount()

Browse Source
This commit is contained in:
Mark Spanbroek 2025-02-04 15:04:19 +01:00
parent bdc721bfaa
commit 16f853b5d8
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contracts/vault/VaultBase.sol
View File

@ -39,29 +39,20 @@ abstract contract VaultBase {
Fund fund, Fund fund,
Recipient recipient Recipient recipient
) internal view returns (Account memory) { ) internal view returns (Account memory) {
Account storage account = _accounts[controller][fund][recipient]; Account memory account = _accounts[controller][fund][recipient];
Lock storage lock = _locks[controller][fund];
Timestamp timestamp = Timestamps.currentTime(); Timestamp timestamp = Timestamps.currentTime();
return _getAccountAt(account, lock, timestamp);
}
function _getAccountAt(
Account memory account,
Lock storage lock,
Timestamp timestamp
) private view returns (Account memory) {
Account memory result = account;
if (account.flow.rate != TokensPerSecond.wrap(0)) { if (account.flow.rate != TokensPerSecond.wrap(0)) {
Lock memory lock = _locks[controller][fund];
Timestamp end = Timestamps.earliest(timestamp, lock.expiry); Timestamp end = Timestamps.earliest(timestamp, lock.expiry);
int128 accumulated = account.flow._totalAt(end); int128 accumulated = account.flow._totalAt(end);
if (accumulated >= 0) { if (accumulated >= 0) {
result.designated += uint128(accumulated); account.designated += uint128(accumulated);
} else { } else {
result.available -= uint128(-accumulated); account.available -= uint128(-accumulated);
} }
} }
result.flow.updated = timestamp; account.flow.updated = timestamp;
return result; return account;
} }
function _getLock( function _getLock(