Skip to content

refactor: use shared require_treasury/get_fee_bps helpers at all call… #412

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
chonilius merged 1 commit into from
Sep 27, 2026
Merged

refactor: use shared require_treasury/get_fee_bps helpers at all call… #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 5 additions & 17 deletions contracts/escrow/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,11 @@ impl EscrowContract {
EscrowStatus::Funded => {}
}

let fee_bps: u32 = env
.storage()
.instance()
.get(&DataKey::FeeBps)
let fee_bps: u32 = mergefi_common::get_fee_bps::<DataKey>(&env)
.ok_or(Error::NotInitialized)?;
let payouts = mergefi_common::compute_split(&env, escrow.amount, fee_bps, &recipients)
.map_err(|_| Error::InvalidSplit)?;
let treasury: Address = env.storage().instance().get(&DataKey::Treasury).unwrap();
let treasury: Address = mergefi_common::require_treasury::<DataKey>(&env).unwrap();
let token_client = token::Client::new(&env, &escrow.token);
let contract_address = env.current_contract_address();

Expand Down Expand Up @@ -667,17 +664,11 @@ impl EscrowContract {
}

pub fn get_treasury(env: Env) -> Result<Address, Error> {
env.storage()
.instance()
.get(&DataKey::Treasury)
.ok_or(Error::NotInitialized)
mergefi_common::require_treasury::<DataKey>(&env).ok_or(Error::NotInitialized)
}

pub fn get_fee_bps(env: Env) -> Result<u32, Error> {
env.storage()
.instance()
.get(&DataKey::FeeBps)
.ok_or(Error::NotInitialized)
mergefi_common::get_fee_bps::<DataKey>(&env).ok_or(Error::NotInitialized)
}

pub fn set_treasury(env: Env, new_treasury: Address) -> Result<(), Error> {
Expand Down Expand Up @@ -715,10 +706,7 @@ impl EscrowContract {
pub fn set_fee_bps(env: Env, new_fee_bps: u32) -> Result<(), Error> {
require_admin(&env)?.require_auth();

let current_fee: u32 = env
.storage()
.instance()
.get(&DataKey::FeeBps)
let current_fee: u32 = mergefi_common::get_fee_bps::<DataKey>(&env)
.ok_or(Error::NotInitialized)?;

mergefi_common::validate_fee_change(current_fee, new_fee_bps)
Expand Down
17 changes: 4 additions & 13 deletions contracts/maintenance-pool/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,12 @@ impl MaintenancePoolContract {
return Err(Error::InsufficientBalance);
}

let fee_bps: u32 = env
.storage()
.instance()
.get(&DataKey::FeeBps)
let fee_bps: u32 = mergefi_common::get_fee_bps::<DataKey>(&env)
.ok_or(Error::NotInitialized)?;
let fee = amount * (fee_bps as i128) / BPS_DENOMINATOR;
let payout = amount - fee;

let treasury: Address = env.storage().instance().get(&DataKey::Treasury).unwrap();
let treasury: Address = mergefi_common::require_treasury::<DataKey>(&env).unwrap();
let token_client = token::Client::new(&env, &pool.token);
let contract_address = env.current_contract_address();

Expand Down Expand Up @@ -429,10 +426,7 @@ impl MaintenancePoolContract {
}

pub fn get_treasury(env: Env) -> Result<Address, Error> {
env.storage()
.instance()
.get(&DataKey::Treasury)
.ok_or(Error::NotInitialized)
mergefi_common::require_treasury::<DataKey>(&env).ok_or(Error::NotInitialized)
}

pub fn get_oracle(env: Env) -> Result<Address, Error> {
Expand All @@ -443,10 +437,7 @@ impl MaintenancePoolContract {
}

pub fn get_fee_bps(env: Env) -> Result<u32, Error> {
env.storage()
.instance()
.get(&DataKey::FeeBps)
.ok_or(Error::NotInitialized)
mergefi_common::get_fee_bps::<DataKey>(&env).ok_or(Error::NotInitialized)
}

pub fn get_version(env: Env) -> u32 {
Expand Down
22 changes: 5 additions & 17 deletions contracts/milestones/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,11 @@ impl MilestonesContract {
.get(issue_id)
.ok_or(Error::IssueNotAllocated)?;

let fee_bps: u32 = env
.storage()
.instance()
.get(&DataKey::FeeBps)
let fee_bps: u32 = mergefi_common::get_fee_bps::<DataKey>(&env)
.ok_or(Error::NotInitialized)?;
let payouts = mergefi_common::compute_split(&env, amount, fee_bps, &recipients)
.map_err(|_| Error::InvalidSplit)?;
let treasury: Address = env.storage().instance().get(&DataKey::Treasury).unwrap();
let treasury: Address = mergefi_common::require_treasury::<DataKey>(&env).unwrap();
let token_client = token::Client::new(&env, &milestone.token);
let contract_address = env.current_contract_address();

Expand Down Expand Up @@ -643,10 +640,7 @@ impl MilestonesContract {
}

pub fn get_treasury(env: Env) -> Result<Address, Error> {
env.storage()
.instance()
.get(&DataKey::Treasury)
.ok_or(Error::NotInitialized)
mergefi_common::require_treasury::<DataKey>(&env).ok_or(Error::NotInitialized)
}

pub fn get_oracle(env: Env) -> Result<Address, Error> {
Expand Down Expand Up @@ -758,10 +752,7 @@ impl MilestonesContract {
}

pub fn get_fee_bps(env: Env) -> Result<u32, Error> {
env.storage()
.instance()
.get(&DataKey::FeeBps)
.ok_or(Error::NotInitialized)
mergefi_common::get_fee_bps::<DataKey>(&env).ok_or(Error::NotInitialized)
}

pub fn get_max_sponsors(env: Env) -> Result<u32, Error> {
Expand All @@ -781,10 +772,7 @@ impl MilestonesContract {
pub fn set_fee_bps(env: Env, new_fee_bps: u32) -> Result<(), Error> {
require_admin(&env)?.require_auth();

let current_fee: u32 = env
.storage()
.instance()
.get(&DataKey::FeeBps)
let current_fee: u32 = mergefi_common::get_fee_bps::<DataKey>(&env)
.ok_or(Error::NotInitialized)?;

mergefi_common::validate_fee_change(current_fee, new_fee_bps)
Expand Down
Loading