blockworks-foundation
/
mango-v4
mirror of https://github.com/blockworks-foundation/mango-v4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcs start: use same naming convention as in other ix 

liqee/liqor over account/caller
This commit is contained in:
Christian Kamm 2023-10-30 13:41:19 +01:00
parent a24e43c8a7
commit a81d0918cc
8 changed files with 77 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/settler/src/tcs_start.rs
View File

@ -95,7 +95,7 @@ impl State {
for startable_chunk in startable.chunks(8) {
let mut instructions = vec![];
let mut ix_targets = vec![];
let mut caller_account = mango_client.mango_account().await?;
let mut liqor_account = mango_client.mango_account().await?;
for (pubkey, tcs_id, incentive_token_index) in startable_chunk {
let ix = match self.make_start_ix(pubkey, *tcs_id).await {
Ok(v) => v,
@ -110,14 +110,14 @@ impl State {
};
instructions.push(ix);
ix_targets.push((*pubkey, *tcs_id));
caller_account.ensure_token_position(*incentive_token_index)?;
liqor_account.ensure_token_position(*incentive_token_index)?;
}
// Clear newly created token positions, so the caller account is mostly empty
// Clear newly created token positions, so the liqor account is mostly empty
for token_index in startable_chunk.iter().map(|(_, _, ti)| *ti).unique() {
let mint = mango_client.context.token(token_index).mint_info.mint;
instructions.append(&mut mango_client.token_withdraw_instructions(
&caller_account,
&liqor_account,
mint,
u64::MAX,
false,

6
lib/client/src/client.rs
View File

@ -1355,9 +1355,9 @@ impl MangoClient {
let mut ams = anchor_lang::ToAccountMetas::to_account_metas(
&mango_v4::accounts::TokenConditionalSwapStart {
group: self.group(),
account: *account.0,
caller: self.mango_account_address,
caller_authority: self.owner(),
liqee: *account.0,
liqor: self.mango_account_address,
liqor_authority: self.owner(),
},
None,
);

6
mango_v4.json
View File

@ -5611,7 +5611,7 @@
"isSigner": false
},
{
"name": "account",
"name": "liqee",
"isMut": true,
"isSigner": false,
"relations": [
@ -5619,7 +5619,7 @@
]
},
{
"name": "caller",
"name": "liqor",
"isMut": true,
"isSigner": false,
"relations": [
@ -5627,7 +5627,7 @@
]
},
{
"name": "callerAuthority",
"name": "liqorAuthority",
"isMut": false,
"isSigner": true
}

14
programs/mango-v4/src/accounts_ix/token_conditional_swap_start.rs
View File

@ -12,17 +12,17 @@ pub struct TokenConditionalSwapStart<'info> {
#[account(
mut,
has_one = group,
constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen
constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen
)]
pub account: AccountLoader<'info, MangoAccountFixed>,
pub liqee: AccountLoader<'info, MangoAccountFixed>,
#[account(
mut,
has_one = group,
constraint = caller.load()?.is_operational() @ MangoError::AccountIsFrozen,
constraint = caller.load()?.is_owner_or_delegate(caller_authority.key()),
constraint = caller.key() != account.key(),
constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen,
constraint = liqor.load()?.is_owner_or_delegate(liqor_authority.key()),
constraint = liqor.key() != liqee.key(),
)]
pub caller: AccountLoader<'info, MangoAccountFixed>,
pub caller_authority: Signer<'info>,
pub liqor: AccountLoader<'info, MangoAccountFixed>,
pub liqor_authority: Signer<'info>,
}

58
programs/mango-v4/src/instructions/token_conditional_swap_start.rs
View File

@ -16,21 +16,18 @@ pub fn token_conditional_swap_start(
token_conditional_swap_id: u64,
) -> Result<()> {
let group_pk = &ctx.accounts.group.key();
let account_key = ctx.accounts.account.key();
let caller_key = ctx.accounts.caller.key();
let liqee_key = ctx.accounts.liqee.key();
let liqor_key = ctx.accounts.liqor.key();
let mut account = ctx.accounts.account.load_full_mut()?;
require!(
!account.fixed.being_liquidated(),
MangoError::BeingLiquidated,
);
let mut liqee = ctx.accounts.liqee.load_full_mut()?;
require!(!liqee.fixed.being_liquidated(), MangoError::BeingLiquidated,);
let mut caller = ctx.accounts.caller.load_full_mut()?;
let mut liqor = ctx.accounts.liqor.load_full_mut()?;
let mut account_retriever = ScanningAccountRetriever::new(ctx.remaining_accounts, group_pk)
.context("create account retriever")?;
let tcs = account
let tcs = liqee
.token_conditional_swap_by_index(token_conditional_swap_index)?
.clone();
require!(tcs.is_configured(), MangoError::TokenConditionalSwapNotSet);
@ -47,9 +44,9 @@ pub fn token_conditional_swap_start(
MangoError::TokenConditionalSwapTypeNotStartable
);
let mut health_cache = new_health_cache(&account.borrow(), &account_retriever)
let mut health_cache = new_health_cache(&liqee.borrow(), &account_retriever)
.context("create liqee health cache")?;
let pre_init_health = account.check_health_pre(&health_cache)?;
let pre_init_health = liqee.check_health_pre(&health_cache)?;
let (sell_bank, sell_oracle_price, buy_bank_and_oracle_opt) =
account_retriever.banks_mut_and_oracles(sell_token_index, buy_token_index)?;
@ -73,18 +70,17 @@ pub fn token_conditional_swap_start(
// not accounting the incentive fee perfectly.
let incentive_native = incentive.clamp_to_u64();
let (account_sell_token, account_sell_raw_index) =
account.token_position_mut(sell_token_index)?;
let (caller_sell_token, caller_sell_raw_index, _) =
caller.ensure_token_position(sell_token_index)?;
let (liqee_sell_token, liqee_sell_raw_index) = liqee.token_position_mut(sell_token_index)?;
let (liqor_sell_token, liqor_sell_raw_index, _) =
liqor.ensure_token_position(sell_token_index)?;
sell_bank.deposit(caller_sell_token, incentive, now_ts)?;
sell_bank.deposit(liqor_sell_token, incentive, now_ts)?;
// This withdraw might be a borrow, so can fail due to net borrows or reduce-only
let account_sell_pre_balance = account_sell_token.native(sell_bank);
sell_bank.withdraw_with_fee(account_sell_token, incentive, now_ts)?;
let account_sell_post_balance = account_sell_token.native(sell_bank);
if account_sell_post_balance < 0 {
let liqee_sell_pre_balance = liqee_sell_token.native(sell_bank);
sell_bank.withdraw_with_fee(liqee_sell_token, incentive, now_ts)?;
let liqee_sell_post_balance = liqee_sell_token.native(sell_bank);
if liqee_sell_post_balance < 0 {
require!(
tcs.allow_creating_borrows(),
MangoError::TokenConditionalSwapCantPayIncentive
@ -96,31 +92,29 @@ pub fn token_conditional_swap_start(
sell_bank.check_net_borrows(sell_oracle_price)?;
}
health_cache.adjust_token_balance(
sell_bank,
account_sell_post_balance - account_sell_pre_balance,
)?;
health_cache
.adjust_token_balance(sell_bank, liqee_sell_post_balance - liqee_sell_pre_balance)?;
emit!(TokenBalanceLog {
mango_group: *group_pk,
mango_account: account_key,
mango_account: liqee_key,
token_index: sell_token_index,
indexed_position: account_sell_token.indexed_position.to_bits(),
indexed_position: liqee_sell_token.indexed_position.to_bits(),
deposit_index: sell_bank.deposit_index.to_bits(),
borrow_index: sell_bank.borrow_index.to_bits(),
});
emit!(TokenBalanceLog {
mango_group: *group_pk,
mango_account: caller_key,
mango_account: liqor_key,
token_index: sell_token_index,
indexed_position: caller_sell_token.indexed_position.to_bits(),
indexed_position: liqor_sell_token.indexed_position.to_bits(),
deposit_index: sell_bank.deposit_index.to_bits(),
borrow_index: sell_bank.borrow_index.to_bits(),
});
emit!(TokenConditionalSwapStartLog {
mango_group: *group_pk,
mango_account: account_key,
caller: caller_key,
mango_account: liqee_key,
caller: liqor_key,
token_conditional_swap_id: tcs.id,
incentive_token_index: sell_token_index,
incentive_amount: incentive_native,
@ -129,12 +123,12 @@ pub fn token_conditional_swap_start(
//
// Start the tcs
//
let tcs = account.token_conditional_swap_mut_by_index(token_conditional_swap_index)?;
let tcs = liqee.token_conditional_swap_mut_by_index(token_conditional_swap_index)?;
tcs.start_timestamp = now_ts;
tcs.sold += incentive_native;
assert!(tcs.passed_start(now_ts));
account.check_health_post(&health_cache, pre_init_health)?;
liqee.check_health_post(&health_cache, pre_init_health)?;
Ok(())
}

30
programs/mango-v4/tests/cases/test_token_conditional_swap.rs
View File

@ -740,9 +740,9 @@ async fn test_token_conditional_swap_premium_auction() -> Result<(), TransportEr
let res = send_tx(
solana,
TokenConditionalSwapStartInstruction {
account,
caller: liqor,
caller_owner: owner,
liqee: account,
liqor,
liqor_owner: owner,
index: 0,
},
)
@ -780,9 +780,9 @@ async fn test_token_conditional_swap_premium_auction() -> Result<(), TransportEr
send_tx(
solana,
TokenConditionalSwapStartInstruction {
account,
caller: liqor,
caller_owner: owner,
liqee: account,
liqor,
liqor_owner: owner,
index: 0,
},
)
@ -952,9 +952,9 @@ async fn test_token_conditional_swap_premium_auction() -> Result<(), TransportEr
let res = send_tx(
solana,
TokenConditionalSwapStartInstruction {
account,
caller: liqor,
caller_owner: owner,
liqee: account,
liqor,
liqor_owner: owner,
index: 1,
},
)
@ -973,9 +973,9 @@ async fn test_token_conditional_swap_premium_auction() -> Result<(), TransportEr
send_tx(
solana,
TokenConditionalSwapStartInstruction {
account,
caller: liqor,
caller_owner: owner,
liqee: account,
liqor,
liqor_owner: owner,
index: 1,
},
)
@ -996,9 +996,9 @@ async fn test_token_conditional_swap_premium_auction() -> Result<(), TransportEr
let res = send_tx(
solana,
TokenConditionalSwapStartInstruction {
account,
caller: liqor,
caller_owner: owner,
liqee: account,
liqor,
liqor_owner: owner,
index: 1,
},
)

26
programs/mango-v4/tests/program_test/mango_client.rs
View File

@ -4810,9 +4810,9 @@ impl ClientInstruction for TokenConditionalSwapTriggerInstruction {
#[derive(Clone)]
pub struct TokenConditionalSwapStartInstruction {
pub account: Pubkey,
pub caller: Pubkey,
pub caller_owner: TestKeypair,
pub liqee: Pubkey,
pub liqor: Pubkey,
pub liqor_owner: TestKeypair,
pub index: u8,
}
#[async_trait::async_trait(?Send)]
@ -4825,18 +4825,18 @@ impl ClientInstruction for TokenConditionalSwapStartInstruction {
) -> (Self::Accounts, instruction::Instruction) {
let program_id = mango_v4::id();
let account = account_loader
.load_mango_account(&self.account)
let liqee = account_loader
.load_mango_account(&self.liqee)
.await
.unwrap();
let tcs = account
let tcs = liqee
.token_conditional_swap_by_index(self.index.into())
.unwrap()
.clone();
let sell_mint_info =
get_mint_info_by_token_index(&account_loader, &account, tcs.sell_token_index).await;
get_mint_info_by_token_index(&account_loader, &liqee, tcs.sell_token_index).await;
let instruction = Self::Instruction {
token_conditional_swap_index: self.index,
@ -4845,7 +4845,7 @@ impl ClientInstruction for TokenConditionalSwapStartInstruction {
let health_check_metas = derive_health_check_remaining_account_metas(
&account_loader,
&account,
&liqee,
Some(sell_mint_info.first_bank()),
true,
None,
@ -4853,10 +4853,10 @@ impl ClientInstruction for TokenConditionalSwapStartInstruction {
.await;
let accounts = Self::Accounts {
group: account.fixed.group,
account: self.account,
caller: self.caller,
caller_authority: self.caller_owner.pubkey(),
group: liqee.fixed.group,
liqee: self.liqee,
liqor: self.liqor,
liqor_authority: self.liqor_owner.pubkey(),
};
let mut instruction = make_instruction(program_id, &accounts, &instruction);
@ -4865,6 +4865,6 @@ impl ClientInstruction for TokenConditionalSwapStartInstruction {
}
fn signers(&self) -> Vec<TestKeypair> {
vec![self.caller_owner]
vec![self.liqor_owner]
}
}

12
ts/client/src/mango_v4.ts
View File

@ -5611,7 +5611,7 @@ export type MangoV4 = {
"isSigner": false
},
{
"name": "account",
"name": "liqee",
"isMut": true,
"isSigner": false,
"relations": [
@ -5619,7 +5619,7 @@ export type MangoV4 = {
]
},
{
"name": "caller",
"name": "liqor",
"isMut": true,
"isSigner": false,
"relations": [
@ -5627,7 +5627,7 @@ export type MangoV4 = {
]
},
{
"name": "callerAuthority",
"name": "liqorAuthority",
"isMut": false,
"isSigner": true
}
@ -18823,7 +18823,7 @@ export const IDL: MangoV4 = {
"isSigner": false
},
{
"name": "account",
"name": "liqee",
"isMut": true,
"isSigner": false,
"relations": [
@ -18831,7 +18831,7 @@ export const IDL: MangoV4 = {
]
},
{
"name": "caller",
"name": "liqor",
"isMut": true,
"isSigner": false,
"relations": [
@ -18839,7 +18839,7 @@ export const IDL: MangoV4 = {
]
},
{
"name": "callerAuthority",
"name": "liqorAuthority",
"isMut": false,
"isSigner": true
}