refactor: sablier-common crate

[IaroslavMazur]

Depends on #312.

Closes #192

[coderabbitai]

Walkthrough

Workspace updated to include crates/*. A new crate crates/sablier-common is added exposing constants, fee calculation, fee collection, time, and token transfer modules. Shared utilities (constants, safe_collectible_amount, fee charging, time, token transfer) were removed from programs/lockup and programs/merkle_instant and replaced with re-exports or calls into sablier-common. Program Cargo.toml files were updated to depend on the local sablier-common crate instead of the removed or git-based dependencies.

Suggested reviewers

• PaulRBerg
• andreivladbrg

🚥 Pre-merge checks | ✅ 4

✅ Passed checks (4 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title 'refactor: sablier-common crate' directly summarizes the main change: creating and refactoring a shared sablier-common crate.
Description check	✅ Passed	The description mentions dependency #312 and closes #192, which is related to the changeset that extracts common code into a sablier-common crate.
Linked Issues check	✅ Passed	The PR successfully addresses issue #192 by abstracting common LK/MI program code into a sablier-common crate, including time querying [time.rs], safe_collectible_amount helper [fee_collection.rs], and Oracle logic [charge_fee in fee_calculation.rs].
Out of Scope Changes check	✅ Passed	All changes are scoped to abstracting common code into the sablier-common crate and updating dependencies across lockup and merkle_instant programs to use it, directly fulfilling the PR objectives.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

• 📝 Generate docstrings (stacked PR)
• 📝 Generate docstrings (commit on current branch)

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch iaro/sablier-common-crate

Tip

Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs).
Share your feedback on Discord.

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[IaroslavMazur]

@coderabbitai review

[coderabbitai]

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

[coderabbitai]

🧹 Nitpick comments (4)

crates/sablier-common/src/constants.rs (1)

2-2: Consider using an integer literal for clarity.

Using 1e9 as u64 works correctly but the floating-point literal is slightly less idiomatic for a constant that represents an exact integer value.

✨ Suggested improvement

-pub const LAMPORTS_PER_SOL: u64 = 1e9 as u64; // 1 billion lamports in 1 SOL
+pub const LAMPORTS_PER_SOL: u64 = 1_000_000_000; // 1 billion lamports in 1 SOL

Alternatively, consider re-exporting solana_program::native_token::LAMPORTS_PER_SOL if the dependency is already available through anchor-lang.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@crates/sablier-common/src/constants.rs` at line 2, The constant
LAMPORTS_PER_SOL is defined using a float cast ("1e9 as u64"); change it to an
integer literal for clarity and correctness (e.g., use 1_000_000_000u64) or, if
available, re-export the canonical value from
solana_program::native_token::LAMPORTS_PER_SOL instead of redefining it; update
the definition of LAMPORTS_PER_SOL in constants.rs accordingly.

crates/sablier-common/src/fee_collection.rs (1)

19-20: Consider using saturating_add instead of checked_add().unwrap().

While the overflow is extremely unlikely in practice (rent-exempt minimum + 1M lamports), using saturating_add would be more consistent with the defensive approach used on line 23 and avoids any potential panic.

🛡️ Suggested fix

     const SAFE_RENT_BUFFER_LAMPORTS: u64 = 1_000_000; // 0.001 SOL
-    let safe_minimum = rent_exempt_minimum.checked_add(SAFE_RENT_BUFFER_LAMPORTS).unwrap();
+    let safe_minimum = rent_exempt_minimum.saturating_add(SAFE_RENT_BUFFER_LAMPORTS);

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@crates/sablier-common/src/fee_collection.rs` around lines 19 - 20, Replace
the panic-prone addition when computing safe_minimum by using saturating_add
instead of rent_exempt_minimum.checked_add(SAFE_RENT_BUFFER_LAMPORTS).unwrap();
locate the constant SAFE_RENT_BUFFER_LAMPORTS and the variable safe_minimum
calculation and change it to use
rent_exempt_minimum.saturating_add(SAFE_RENT_BUFFER_LAMPORTS) so the code
matches the defensive pattern used elsewhere (e.g., the logic on line 23).

crates/sablier-common/Cargo.toml (1)

10-13: Consider pinning the git dependency to a specific commit or tag.

The chainlink_solana dependency references a branch (solana-2.1) without a pinned revision. This can lead to non-reproducible builds if the branch is updated upstream.

🔧 Suggested fix: Pin to a specific commit

-  chainlink_solana = { git = "https://github.com/smartcontractkit/chainlink-solana", branch = "solana-2.1" }
+  chainlink_solana = { git = "https://github.com/smartcontractkit/chainlink-solana", branch = "solana-2.1", rev = "<commit-hash>" }

Also, minor style nit: consider using consistent syntax for dependencies (both use inline table { version = "..." } or both use string shorthand).

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@crates/sablier-common/Cargo.toml` around lines 10 - 13, The chainlink_solana
git dependency in Cargo.toml currently points at the branch "solana-2.1" which
risks non-reproducible builds; update the chainlink_solana entry to pin to a
specific commit SHA or tag (e.g., replace branch = "solana-2.1" with rev =
"<commit-sha>" or tag = "<tag-name>") so the build is deterministic, and while
editing make the dependency syntax consistent with the other entries (use the
same inline table form or string shorthand for anchor-lang, anchor-spl, and
chainlink_solana) so formatting is uniform.

crates/sablier-common/src/fee_calculation.rs (1)

35-36: Minor: Consider propagating the error instead of unwrapping.

The get_current_time().unwrap() on line 36 will panic if Clock::get() fails. While this is unlikely in a valid Solana runtime, the function already returns 0 for other error conditions, so handling this gracefully might be more consistent.

🛡️ Suggested defensive handling

     // Downcasting is safe as long as the date is before 7 February 2106 at 06:28:16 UTC.
-    let current_timestamp: u32 = get_current_time().unwrap() as u32;
+    let current_timestamp: u32 = match get_current_time() {
+        Ok(t) => t as u32,
+        Err(_) => return 0,
+    };

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@crates/sablier-common/src/fee_calculation.rs` around lines 35 - 36, The
unwrap on get_current_time() (used to build current_timestamp) can panic;
replace it by propagating the error from get_current_time() using the ? operator
(update the enclosing function to return a Result) so current_timestamp is built
like let current_timestamp: u32 = get_current_time()? as u32; if changing the
signature is undesirable, fall back to a non-panicking default such as let
current_timestamp: u32 = get_current_time().unwrap_or(0) as u32; adjust the
function signature or error handling accordingly in fee_calculation.rs where
get_current_time and current_timestamp are used.

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In `@crates/sablier-common/Cargo.toml`:
- Around line 10-13: The chainlink_solana git dependency in Cargo.toml currently
points at the branch "solana-2.1" which risks non-reproducible builds; update
the chainlink_solana entry to pin to a specific commit SHA or tag (e.g., replace
branch = "solana-2.1" with rev = "<commit-sha>" or tag = "<tag-name>") so the
build is deterministic, and while editing make the dependency syntax consistent
with the other entries (use the same inline table form or string shorthand for
anchor-lang, anchor-spl, and chainlink_solana) so formatting is uniform.

In `@crates/sablier-common/src/constants.rs`:
- Line 2: The constant LAMPORTS_PER_SOL is defined using a float cast ("1e9 as
u64"); change it to an integer literal for clarity and correctness (e.g., use
1_000_000_000u64) or, if available, re-export the canonical value from
solana_program::native_token::LAMPORTS_PER_SOL instead of redefining it; update
the definition of LAMPORTS_PER_SOL in constants.rs accordingly.

In `@crates/sablier-common/src/fee_calculation.rs`:
- Around line 35-36: The unwrap on get_current_time() (used to build
current_timestamp) can panic; replace it by propagating the error from
get_current_time() using the ? operator (update the enclosing function to return
a Result) so current_timestamp is built like let current_timestamp: u32 =
get_current_time()? as u32; if changing the signature is undesirable, fall back
to a non-panicking default such as let current_timestamp: u32 =
get_current_time().unwrap_or(0) as u32; adjust the function signature or error
handling accordingly in fee_calculation.rs where get_current_time and
current_timestamp are used.

In `@crates/sablier-common/src/fee_collection.rs`:
- Around line 19-20: Replace the panic-prone addition when computing
safe_minimum by using saturating_add instead of
rent_exempt_minimum.checked_add(SAFE_RENT_BUFFER_LAMPORTS).unwrap(); locate the
constant SAFE_RENT_BUFFER_LAMPORTS and the variable safe_minimum calculation and
change it to use rent_exempt_minimum.saturating_add(SAFE_RENT_BUFFER_LAMPORTS)
so the code matches the defensive pattern used elsewhere (e.g., the logic on
line 23).

---

ℹ️ Review info

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b898691 and 6e45345.

⛔ Files ignored due to path filters (1)

• Cargo.lock is excluded by !**/*.lock

📒 Files selected for processing (19)

• Cargo.toml
• crates/sablier-common/Cargo.toml
• crates/sablier-common/src/constants.rs
• crates/sablier-common/src/fee_calculation.rs
• crates/sablier-common/src/fee_collection.rs
• crates/sablier-common/src/lib.rs
• crates/sablier-common/src/time.rs
• crates/sablier-common/src/token_transfer.rs
• programs/lockup/Cargo.toml
• programs/lockup/src/instructions/collect_fees.rs
• programs/lockup/src/utils/constants.rs
• programs/lockup/src/utils/mod.rs
• programs/merkle_instant/Cargo.toml
• programs/merkle_instant/src/instructions/collect_fees.rs
• programs/merkle_instant/src/utils/constants.rs
• programs/merkle_instant/src/utils/fee_calculation.rs
• programs/merkle_instant/src/utils/mod.rs
• programs/merkle_instant/src/utils/time.rs
• programs/merkle_instant/src/utils/transfer_helper.rs

💤 Files with no reviewable changes (3)

• programs/merkle_instant/src/utils/time.rs
• programs/merkle_instant/src/utils/transfer_helper.rs
• programs/merkle_instant/src/utils/fee_calculation.rs

[andreivladbrg]

@IaroslavMazur aren’t there more parts that could be added to a common crate?

[IaroslavMazur]

@IaroslavMazur aren’t there more parts that could be added to a common crate?

Managed to extract the charge_claim_fee functionality, as well, in c61a074.

Do you have anything else in mind?

[coderabbitai]

🧹 Nitpick comments (1)

crates/sablier-common/src/fee_collection.rs (1)

42-43: Consider using saturating_add instead of checked_add().unwrap().

While overflow is practically impossible here (rent-exempt minimum + 0.001 SOL buffer), using saturating_add would be more defensive and eliminate the panic path entirely.

Suggested change

     const SAFE_RENT_BUFFER_LAMPORTS: u64 = 1_000_000; // 0.001 SOL
-    let safe_minimum = rent_exempt_minimum.checked_add(SAFE_RENT_BUFFER_LAMPORTS).unwrap();
+    let safe_minimum = rent_exempt_minimum.saturating_add(SAFE_RENT_BUFFER_LAMPORTS);

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@crates/sablier-common/src/fee_collection.rs` around lines 42 - 43, Replace
the panic-prone checked_add().unwrap() usage when computing safe_minimum with a
saturating_add to avoid potential overflow panics; specifically, change the
expression that sets safe_minimum (which currently uses
rent_exempt_minimum.checked_add(SAFE_RENT_BUFFER_LAMPORTS).unwrap()) to use
rent_exempt_minimum.saturating_add(SAFE_RENT_BUFFER_LAMPORTS), keeping the
constant SAFE_RENT_BUFFER_LAMPORTS and variable name safe_minimum unchanged.

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In `@crates/sablier-common/src/fee_collection.rs`:
- Around line 42-43: Replace the panic-prone checked_add().unwrap() usage when
computing safe_minimum with a saturating_add to avoid potential overflow panics;
specifically, change the expression that sets safe_minimum (which currently uses
rent_exempt_minimum.checked_add(SAFE_RENT_BUFFER_LAMPORTS).unwrap()) to use
rent_exempt_minimum.saturating_add(SAFE_RENT_BUFFER_LAMPORTS), keeping the
constant SAFE_RENT_BUFFER_LAMPORTS and variable name safe_minimum unchanged.

---

ℹ️ Review info

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 6e45345 and c61a074.

📒 Files selected for processing (3)

• crates/sablier-common/src/fee_collection.rs
• programs/lockup/src/instructions/withdraw.rs
• programs/merkle_instant/src/instructions/claim.rs