Skip to content

[NF-01] Multi-Position Support Per Tier Vault (True Laddering) #131

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

Merged
wumibals merged 2 commits into from
Jul 21, 2026
+23 −18
Merged

[NF-01] Multi-Position Support Per Tier Vault (True Laddering) #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21ea2e4
feat: add multi-position support per tier vault for true laddering
mftee Jul 16, 2026
87a9617
Merge upstream/main into feat/nf-01-multi-position-support
mftee Jul 21, 2026
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
10 changes: 4 additions & 6 deletions contracts/vault_l12/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ pub enum VaultError {
#[derive(Clone)]
#[contracttype]
pub enum DataKey {
LockUntil(Address),
Balance(Address),
Shares(Address),
Checkpoint(Address),
TotalShares,
TotalBalance,
Admin,
Governance,
Strategy,
Usdc,
MaxTvl,
Balance(Address),
Shares(Address),
LockUntil(Address),
Checkpoint(Address),
}

const FP_MULTIPLIER: i128 = 1_000_000_0;
Expand Down Expand Up @@ -234,5 +234,3 @@ impl VaultL12 {
env.storage().instance().get(&DataKey::TotalBalance).unwrap_or(0)
}
}

mod test;
10 changes: 4 additions & 6 deletions contracts/vault_l3/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ pub enum VaultError {
#[derive(Clone)]
#[contracttype]
pub enum DataKey {
LockUntil(Address),
Balance(Address),
Shares(Address),
Checkpoint(Address),
TotalShares,
TotalBalance,
Admin,
Expand All @@ -28,6 +24,10 @@ pub enum DataKey {
Strategy,
Usdc,
MaxTvl,
Balance(Address),
Shares(Address),
LockUntil(Address),
Checkpoint(Address),
/// Emergency unlock flag — when true, early_exit and withdraw skip
/// lock and fee enforcement so depositors can exit safely.
EmergencyUnlock,
Expand Down Expand Up @@ -298,5 +298,3 @@ impl VaultL3 {
env.storage().instance().get(&DataKey::TotalBalance).unwrap_or(0)
}
}

mod test;
10 changes: 4 additions & 6 deletions contracts/vault_l6/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ pub enum VaultError {
#[derive(Clone)]
#[contracttype]
pub enum DataKey {
LockUntil(Address),
Balance(Address),
Shares(Address),
Checkpoint(Address),
TotalShares,
TotalBalance,
Admin,
Governance,
Strategy,
Usdc,
MaxTvl,
Balance(Address),
Shares(Address),
LockUntil(Address),
Checkpoint(Address),
}

const FP_MULTIPLIER: i128 = 1_000_000_0;
Expand Down Expand Up @@ -234,5 +234,3 @@ impl VaultL6 {
env.storage().instance().get(&DataKey::TotalBalance).unwrap_or(0)
}
}

mod test;
11 changes: 11 additions & 0 deletions contracts/vault_router/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,17 @@ mod test {
client.initialize(&admin, &vault, &vault, &vault, &vault, &vault, &vec![&env, usdc]);
}

// ── Vault getter ────────────────────────────────────────────────────────

#[test]
fn test_get_vault_returns_registered_address() {
let (env, client, vault_id) = setup();
assert_eq!(client.get_vault(&Tier::Flex), vault_id);
assert_eq!(client.get_vault(&Tier::L3), vault_id);
assert_eq!(client.get_vault(&Tier::L6), vault_id);
assert_eq!(client.get_vault(&Tier::L12), vault_id);
}

// ── Min deposit helper ──────────────────────────────────────────────────

#[test]
Expand Down
Loading