Skip to content

program: ix to reset old lp fields #2018

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −23
Open

program: ix to reset old lp fields #2018

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
25 changes: 7 additions & 18 deletions programs/drift/src/instructions/keeper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ use crate::state::spot_market_map::{
};
use crate::state::state::State;
use crate::state::user::{
MarginMode, MarketType, OrderStatus, OrderTriggerCondition, OrderType, User, UserStats,
MarginMode, MarketType, OrderTriggerCondition, OrderType, User, UserStats,
};
use crate::state::user_map::{load_user_map, load_user_maps, UserMap, UserStatsMap};
use crate::state::zero_copy::AccountZeroCopyMut;
Expand Down Expand Up @@ -616,27 +616,16 @@ pub fn handle_update_user_stats_referrer_info<'c: 'info, 'info>(
#[access_control(
exchange_not_paused(&ctx.accounts.state)
)]
pub fn handle_update_user_open_orders_count<'info>(ctx: Context<UpdateUserIdle>) -> Result<()> {
pub fn handle_update_user_lp_fields<'info>(ctx: Context<UpdateUserIdle>) -> Result<()> {
let mut user = load_mut!(ctx.accounts.user)?;

let mut open_orders = 0_u8;
let mut open_auctions = 0_u8;

for order in user.orders.iter() {
if order.status == OrderStatus::Open {
open_orders += 1;
}

if order.has_auction() {
open_auctions += 1;
}
for perp_position in user.perp_positions.iter_mut() {
perp_position.lp_shares = 0;
perp_position.last_base_asset_amount_per_lp = 0;
perp_position.last_quote_asset_amount_per_lp = 0;
perp_position.per_lp_base = 0;
}

user.open_orders = open_orders;
user.has_open_order = open_orders > 0;
user.open_auctions = open_auctions;
user.has_open_auction = open_auctions > 0;

Ok(())
}

Expand Down
6 changes: 3 additions & 3 deletions programs/drift/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,9 @@ pub mod drift {
handle_update_user_stats_referrer_info(ctx)
}

// pub fn update_user_open_orders_count(ctx: Context<UpdateUserIdle>) -> Result<()> {
// handle_update_user_open_orders_count(ctx)
// }
pub fn update_update_user_lp_fields(ctx: Context<UpdateUserIdle>) -> Result<()> {
handle_update_user_lp_fields(ctx)
}

pub fn admin_disable_update_perp_bid_ask_twap(
ctx: Context<AdminDisableBidAskTwapUpdate>,
Expand Down
36 changes: 34 additions & 2 deletions sdk/src/idl/drift.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2041,6 +2041,32 @@
],
"args": []
},
{
"name": "updateUpdateUserLpFields",
"accounts": [
{
"name": "state",
"isMut": false,
"isSigner": false
},
{
"name": "authority",
"isMut": false,
"isSigner": true
},
{
"name": "filler",
"isMut": true,
"isSigner": false
},
{
"name": "user",
"isMut": true,
"isSigner": false
}
],
"args": []
},
{
"name": "adminDisableUpdatePerpBidAskTwap",
"accounts": [
Expand Down Expand Up @@ -15434,6 +15460,9 @@
},
{
"name": "AmmImmediateFill"
},
{
"name": "SettleRevPool"
}
]
}
Expand Down Expand Up @@ -19565,5 +19594,8 @@
"name": "MarketIndexNotFoundAmmCache",
"msg": "MarketIndexNotFoundAmmCache"
}
]
}
],
"metadata": {
"address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
}
}
Loading