Skip to content

Wphan/builder codes #1805

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.

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

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
010e8a3
add RevenueShare and RevenueShareEscrow accounts an init ixs
wphan Aug 1, 2025
dfe4330
fix multiple array zc account, and handling different message types i…
wphan Aug 4, 2025
aa88106
decoding error
wphan Aug 5, 2025
6afc60c
recording orders in RevenueShareEscrow workin
wphan Aug 5, 2025
e93bc21
cancel and fill orders
wphan Aug 6, 2025
2e247b5
Merge remote-tracking branch 'origin/master' into wphan/builder_codes
wphan Aug 6, 2025
35486e9
idl
wphan Aug 6, 2025
35350ba
fix sdk build
wphan Aug 6, 2025
f0e06af
fix math
wphan Aug 6, 2025
2ef60ce
update RevenueShareOrder bitflags, store builder_idx instead of pubkey
wphan Aug 7, 2025
57e335d
merge RevenueShareOrders on add
wphan Aug 8, 2025
b2fe670
remove builder accounts from cancel ixs, wip settle impl
wphan Aug 12, 2025
7b688ad
dont fail settlpnl if no builder users provided
wphan Aug 12, 2025
d11de9e
finish settle, rename RevenueShare->Builder, RevenueShareEscrow->Buil…
wphan Aug 13, 2025
464ff9b
add more bankrun tests, clean up
wphan Aug 14, 2025
97ef7f7
Merge branch 'master' into wphan/builder_codes
wphan Aug 14, 2025
8ffb821
clean up, fix tests
wphan Aug 14, 2025
7971ab5
why test fail
wphan Aug 14, 2025
28860b1
add subaccountid to BuilderOrder
wphan Aug 14, 2025
e4aafb0
reduce diff
wphan Aug 14, 2025
fabe2ff
add referrals
wphan Aug 15, 2025
84e7c46
add test can fill settle user with no builderescrow
wphan Aug 15, 2025
29fb679
add referral builder feature flag and referral migration method
wphan Aug 15, 2025
8870bad
fix cargo tests, try fix bankrun test timing issue
wphan Aug 15, 2025
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
175 changes: 175 additions & 0 deletions programs/drift/src/controller/builder.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
use anchor_lang::prelude::*;

use crate::controller::spot_balance;
use crate::math::safe_math::SafeMath;
use crate::math::spot_balance::get_token_amount;
use crate::state::builder::{BuilderEscrowZeroCopyMut, BuilderOrder, BuilderOrderBitFlag};
use crate::state::builder_map::BuilderMap;
use crate::state::events::BuilderSettleRecord;
use crate::state::perp_market_map::PerpMarketMap;
use crate::state::spot_market::SpotBalance;
use crate::state::spot_market_map::SpotMarketMap;
use crate::state::user::MarketType;

/// Runs through the user's BuilderEscrow account and sweeps any accrued fees to the corresponding
/// builders and referrer.
pub fn sweep_completed_builder_fees_for_market<'a>(
market_index: u16,
builder_escrow: &mut BuilderEscrowZeroCopyMut,
perp_market_map: &PerpMarketMap<'a>,
spot_market_map: &SpotMarketMap<'a>,
builder_map: BuilderMap<'a>,
now_ts: i64,
) -> crate::error::DriftResult<()> {
let perp_market = &mut perp_market_map.get_ref_mut(&market_index)?;
let quote_spot_market = &mut spot_market_map.get_quote_spot_market_mut()?;

spot_balance::update_spot_market_cumulative_interest(quote_spot_market, None, now_ts)?;

let orders_len = builder_escrow.orders_len();
for i in 0..orders_len {
let (
is_completed,
is_referral_order,
order_market_type,
order_market_index,
fees_accrued,
builder_idx,
) = {
let ord_ro = match builder_escrow.get_order(i) {
Ok(o) => o,
Err(_) => {
continue;
}
};
(
ord_ro.is_completed(),
ord_ro.is_referral_order(),
ord_ro.market_type,
ord_ro.market_index,
ord_ro.fees_accrued,
ord_ro.builder_idx,
)
};

if is_referral_order {
if fees_accrued == 0 {
continue;
}
} else if !(is_completed
&& order_market_type == MarketType::Perp
&& order_market_index == market_index
&& fees_accrued > 0)
{
continue;
}

let pnl_pool_token_amount = get_token_amount(
perp_market.pnl_pool.scaled_balance,
quote_spot_market,
perp_market.pnl_pool.balance_type(),
)?;

// TODO: should we add buffer on pnl pool?
if pnl_pool_token_amount < fees_accrued as u128 {
msg!(
"market {} PNL pool has insufficient balance to sweep fees for builder",
market_index
);
break;
}

if is_referral_order {
let referrer_authority = if let Some(referrer_authority) = builder_escrow.get_referrer()
{
referrer_authority
} else {
continue;
};

let referrer_user = builder_map.get_user_ref_mut(&referrer_authority);
let referrer_builder = builder_map.get_builder_account_mut(&referrer_authority);

if referrer_user.is_ok() && referrer_builder.is_ok() {
let mut referrer_user = referrer_user.unwrap();
let mut referrer_builder = referrer_builder.unwrap();

spot_balance::transfer_spot_balances(
fees_accrued as i128,
quote_spot_market,
&mut perp_market.pnl_pool,
referrer_user.get_quote_spot_position_mut(),
)?;

referrer_builder.total_referrer_rewards = referrer_builder
.total_referrer_rewards
.safe_add(fees_accrued as u64)?;

emit!(BuilderSettleRecord {
ts: now_ts,
builder: None,
referrer: Some(referrer_authority),
fee_settled: fees_accrued as u64,
market_index: order_market_index,
market_type: order_market_type,
builder_total_referrer_rewards: referrer_builder.total_referrer_rewards,
builder_total_builder_rewards: referrer_builder.total_builder_rewards,
builder_sub_account_id: referrer_user.sub_account_id,
});

// zero out the order
if let Ok(builder_order) = builder_escrow.get_order_mut(i) {
builder_order.fees_accrued = 0;
}
}
} else {
let builder_authority = match builder_escrow
.get_approved_builder_mut(builder_idx)
.map(|builder| builder.authority)
{
Ok(auth) => auth,
Err(_) => {
continue;
}
};

let builder_user = builder_map.get_user_ref_mut(&builder_authority);
let builder = builder_map.get_builder_account_mut(&builder_authority);

if builder_user.is_ok() && builder.is_ok() {
let mut builder_user = builder_user.unwrap();
let mut builder_revenue_share = builder.unwrap();

spot_balance::transfer_spot_balances(
fees_accrued as i128,
quote_spot_market,
&mut perp_market.pnl_pool,
builder_user.get_quote_spot_position_mut(),
)?;

builder_revenue_share.total_builder_rewards = builder_revenue_share
.total_builder_rewards
.safe_add(fees_accrued as u64)?;

emit!(BuilderSettleRecord {
ts: now_ts,
builder: Some(builder_authority),
referrer: None,
fee_settled: fees_accrued as u64,
market_index: order_market_index,
market_type: order_market_type,
builder_total_referrer_rewards: builder_revenue_share.total_referrer_rewards,
builder_total_builder_rewards: builder_revenue_share.total_builder_rewards,
builder_sub_account_id: builder_user.sub_account_id,
});

// remove order
if let Ok(builder_order) = builder_escrow.get_order_mut(i) {
*builder_order = BuilderOrder::default();
}
}
}
}

Ok(())
}
4 changes: 4 additions & 0 deletions programs/drift/src/controller/liquidation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,8 @@ pub fn liquidate_perp(
maker_existing_quote_entry_amount: maker_existing_quote_entry_amount,
maker_existing_base_asset_amount: maker_existing_base_asset_amount,
trigger_price: None,
builder_idx: None,
builder_fee: None,
};
emit!(fill_record);

Expand Down Expand Up @@ -1083,6 +1085,7 @@ pub fn liquidate_perp_with_fill(
clock,
order_params,
PlaceOrderOptions::default().explanation(OrderActionExplanation::Liquidation),
&mut None,
)?;

drop(user);
Expand All @@ -1103,6 +1106,7 @@ pub fn liquidate_perp_with_fill(
None,
clock,
FillMode::Liquidation,
&mut None,
)?;

let mut user = load_mut!(user_loader)?;
Expand Down
1 change: 1 addition & 0 deletions programs/drift/src/controller/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub mod amm;
pub mod builder;
pub mod funding;
pub mod insurance;
pub mod liquidation;
Expand Down
Loading
Loading