logos-messaging/logos-messaging-rlnv2-contract
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-rlnv2-contract.git synced 2026-01-07 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

extract membership expiration calculation to internal function

Browse Source
This commit is contained in:
Sergei Tikhomirov 2024-10-01 19:07:42 +02:00
parent 79f694c79f
commit deb7371650
No known key found for this signature in database
GPG Key ID: 6A1F8ED9D6538027
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Membership.sol
View File

@ -321,14 +321,28 @@ abstract contract MembershipUpgradeable is Initializable {
/// @param _gracePeriodStartTimestamp timestamp in which the grace period starts
/// @param _gracePeriodDuration duration of the grace period
function _isExpired(uint256 _gracePeriodStartTimestamp, uint32 _gracePeriodDuration) internal view returns (bool) {
return block.timestamp > _gracePeriodStartTimestamp + uint256(_gracePeriodDuration);
return block.timestamp >= _membershipExpirationTimestamp(_gracePeriodStartTimestamp, _gracePeriodDuration);
}
/// @notice Returns the timestamp on which a membership can be considered expired (i.e. when its grace period ends)
/// @param _idCommitment the idCommitment of the membership
function membershipExpirationTimestamp(uint256 _idCommitment) public view returns (uint256) {
MembershipInfo memory membership = memberships[_idCommitment];
return membership.gracePeriodStartTimestamp + uint256(membership.gracePeriodDuration) + 1;
return _membershipExpirationTimestamp(membership.gracePeriodStartTimestamp, membership.gracePeriodDuration);
}
/// @dev Determine when the grace period ends
/// @param _gracePeriodStartTimestamp timestamp in which the grace period starts
/// @param _gracePeriodDuration duration of the grace period
function _membershipExpirationTimestamp(
uint256 _gracePeriodStartTimestamp,
uint32 _gracePeriodDuration
)
internal
pure
returns (uint256)
{
return _gracePeriodStartTimestamp + uint256(_gracePeriodDuration) + 1;
}
/// @dev Withdraw any available deposit balance in tokens after a membership is erased.