fix: fix ugly lockup bug

[matthiasmatt]

Summary by CodeRabbit

• Bug Fixes
  • Corrected the logic for checking lock maturity in fund withdrawals, ensuring accurate comparisons with block heights.

[coderabbitai[bot]]

Walkthrough

This update introduces a crucial fix in the logic handling the maturity check of locks in a contract. Previously, the comparison was inaccurately set to check if the lock end block was less than the current block height, which has now been corrected to properly assess maturity by ensuring the end block is greater than the current block height.

Changes

File	Change Summary
contracts/.../contract.rs	Corrected maturity check logic in execute_withdraw_funds.

🐇✍️
In the realm of code, a tiny flip,
A < to >, a masterful script.
Now locks unwind as time does tick,
Ensuring funds flow, slick and quick.
A rabbit's cheer for logic fixed! 🎉🐰

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

---

Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>.
  • Generate unit-tests for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit tests for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit tests.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• The JSON schema for the configuration file is available here.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

[codecov[bot]]

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 87.72%. Comparing base (902b788) to head (edc441a). Report is 43 commits behind head on main.

Files with missing lines	Patch %	Lines
contracts/lockup/src/contract.rs	0.00%	1 Missing :warning:

Additional details and impacted files

Files with missing lines	Coverage Δ
contracts/lockup/src/contract.rs	81.36% <0.00%> (-0.06%)	:arrow_down:

... and 40 files with indirect coverage changes

[Unique-Divine]

Clarified the Lock lifecycle and cleaned this up in https://github.com/NibiruChain/cw-nibiru/pull/154

/// Lock Lifecycle States
#[derive(Debug, PartialEq)]
pub enum LockState {
    /// The lock has been created and funds are locked
    FundedPreUnlock,
    /// Unlocking has been initiated, but the lock period hasn't expired
    Unlocking,
    /// The lock period has expired, funds are ready for withdrawal
    Matured,
    /// Funds have been withdrawn, the lock is now inactive
    Withdrawn,
}

impl Lock {
    /// Computes the lifecycle state of the Lock
    pub fn state(&self, current_block: u64) -> LockState {
        if self.funds_withdrawn {
            return LockState::Withdrawn;
        }

        match self.end_block {
            NOT_UNLOCKING_BLOCK_IDENTIFIER => LockState::FundedPreUnlock,
            end_block if current_block >= end_block => LockState::Matured,
            _ => LockState::Unlocking,
        }
    }
}