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

margin trade, support multi cpi (#68) 

* margin trade, support multi cpi

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>

* Fix from review

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>

* todo

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
microwavedcola1 2022-06-18 16:43:45 +02:00 committed by GitHub
parent 0f34851c64
commit 4864562ff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
programs/mango-v4/src/instructions/margin_trade.rs
View File

@ -13,8 +13,9 @@ use std::collections::HashMap;
///
/// In addition to these accounts, there must be a sequence of remaining_accounts:
/// 1. health_accounts: accounts needed for health checking
/// 2. target_program_id: the target program account
/// 3. target_accounts: the accounts to pass to the target program
/// 2. per cpi
/// 2.a. target_program_id: the target program account
/// 2.b. target_accounts: the accounts to pass to the target program
///
/// Every vault address listed in 3. must also have the matching bank and oracle appear in 1.
///
@ -59,15 +60,18 @@ pub struct MarginTradeWithdraw {
pub amount: u64,
}
/// - `num_health_accounts` is the number of health accounts that remaining_accounts starts with.
/// - `withdraws` is a list of MarginTradeWithdraw requests.
/// - `cpi_data` is the bytes to call the target_program_id with.
/// - `cpi_datas` is a list of bytes per cpi to call the target_program_id with.
/// - `cpi_account_starts` is a list of index into the remaining accounts per cpi to call the target_program_id with.
pub fn margin_trade<'key, 'accounts, 'remaining, 'info>(
ctx: Context<'key, 'accounts, 'remaining, 'info, MarginTrade<'info>>,
num_health_accounts: usize,
withdraws: Vec<MarginTradeWithdraw>,
cpi_data: Vec<u8>,
cpi_datas: Vec<(u8, Vec<u8>)>,
) -> Result<()> {
require!(!cpi_datas.is_empty(), MangoError::SomeError);
let num_of_cpis = cpi_datas.len();
let num_health_accounts = cpi_datas.get(0).unwrap().0 as usize;
let group = ctx.accounts.group.load()?;
let mut account = ctx.accounts.account.load_mut()?;
require!(account.is_bankrupt == 0, MangoError::IsBankrupt);
@ -109,19 +113,19 @@ pub fn margin_trade<'key, 'accounts, 'remaining, 'info>(
require!(pre_cpi_health >= 0, MangoError::HealthMustBePositive);
msg!("pre_cpi_health {:?}", pre_cpi_health);
let cpi_program_id = *ctx.remaining_accounts[num_health_accounts].key;
require_keys_neq!(cpi_program_id, crate::id(), MangoError::SomeError);
let cpi_ais = &ctx.remaining_accounts[num_health_accounts + 1..];
let mut cpi_ams = cpi_ais
let all_cpi_ais = &ctx.remaining_accounts[num_health_accounts + 1..];
let mut all_cpi_ams = all_cpi_ais
.iter()
.flat_map(|item| item.to_account_metas(None))
.collect::<Vec<_>>();
require!(cpi_ais.len() == cpi_ams.len(), MangoError::SomeError);
require!(
all_cpi_ais.len() == all_cpi_ams.len(),
MangoError::SomeError
);
// Check that each group-owned token account is the vault of one of the allowed banks,
// and track its balance.
let mut used_vaults = cpi_ais
let mut used_vaults = all_cpi_ais
.iter()
.enumerate()
.filter_map(|(i, ai)| {
@ -165,7 +169,7 @@ pub fn margin_trade<'key, 'accounts, 'remaining, 'info>(
// Find banks for used vaults in cpi_ais and collect signer seeds for them.
// Also update withdraw_amount and loan_amount.
let mut bank_signer_data = Vec::with_capacity(used_vaults.len());
for (ai, am) in cpi_ais.iter().zip(cpi_ams.iter_mut()) {
for (ai, am) in all_cpi_ais.iter().zip(all_cpi_ams.iter_mut()) {
if ai.owner != &Mango::id() {
continue;
}
@ -212,7 +216,7 @@ pub fn margin_trade<'key, 'accounts, 'remaining, 'info>(
let approve_ctx = CpiContext::new(
ctx.accounts.token_program.to_account_info(),
token::Approve {
to: cpi_ais[vault_info.vault_cpi_ai_index].clone(),
to: all_cpi_ais[vault_info.vault_cpi_ai_index].clone(),
delegate: health_ais[vault_info.bank_health_ai_index].clone(),
authority: ctx.accounts.group.to_account_info(),
},
@ -241,12 +245,29 @@ pub fn margin_trade<'key, 'accounts, 'remaining, 'info>(
})
.collect::<Vec<_>>();
let signers_ref = signers.iter().map(|v| &v[..]).collect::<Vec<_>>();
let cpi_ix = Instruction {
program_id: cpi_program_id,
data: cpi_data,
accounts: cpi_ams,
};
solana_program::program::invoke_signed(&cpi_ix, &cpi_ais, &signers_ref)?;
for (cpi_index, (cpi_account_start, cpi_data)) in cpi_datas.iter().enumerate() {
let cpi_account_start = *cpi_account_start as usize;
let cpi_program_id = *ctx.remaining_accounts[cpi_account_start].key;
require_keys_neq!(cpi_program_id, crate::id(), MangoError::SomeError);
let all_cpi_ais_end_index = if cpi_index == num_of_cpis - 1 {
all_cpi_ams.len()
} else {
cpi_datas[cpi_index + 1].0 as usize - num_health_accounts
};
let all_cpi_ais_start_index = cpi_account_start - num_health_accounts;
let cpi_ais = &all_cpi_ais[all_cpi_ais_start_index..all_cpi_ais_end_index];
let cpi_ams = &all_cpi_ams[all_cpi_ais_start_index..all_cpi_ais_end_index];
let cpi_ix = Instruction {
program_id: cpi_program_id,
// todo future: optimise out these to_vecs
data: cpi_data.to_vec(),
accounts: cpi_ams.to_vec(),
};
solana_program::program::invoke_signed(&cpi_ix, &cpi_ais, &signers_ref)?;
}
// Revoke delegates for vaults
let group = ctx.accounts.group.load()?;
@ -255,14 +276,14 @@ pub fn margin_trade<'key, 'accounts, 'remaining, 'info>(
if vault_info.withdraw_amount > 0 {
let ix = token::spl_token::instruction::revoke(
&token::spl_token::ID,
&cpi_ais[vault_info.vault_cpi_ai_index].key,
all_cpi_ais[vault_info.vault_cpi_ai_index].key,
&ctx.accounts.group.key(),
&[],
)?;
solana_program::program::invoke_signed(
&ix,
&[
cpi_ais[vault_info.vault_cpi_ai_index].clone(),
all_cpi_ais[vault_info.vault_cpi_ai_index].clone(),
ctx.accounts.group.to_account_info(),
],
&[group_seeds],
@ -273,7 +294,7 @@ pub fn margin_trade<'key, 'accounts, 'remaining, 'info>(
// Track vault changes and apply them to the user's token positions
let mut account = ctx.accounts.account.load_mut()?;
let inactive_tokens =
adjust_for_post_cpi_vault_amounts(health_ais, cpi_ais, &used_vaults, &mut account)?;
adjust_for_post_cpi_vault_amounts(health_ais, all_cpi_ais, &used_vaults, &mut account)?;
// Check post-cpi health
let post_cpi_health =

5
programs/mango-v4/src/lib.rs
View File

@ -120,11 +120,10 @@ pub mod mango_v4 {
pub fn margin_trade<'key, 'accounts, 'remaining, 'info>(
ctx: Context<'key, 'accounts, 'remaining, 'info, MarginTrade<'info>>,
num_health_accounts: usize,
withdraws: Vec<MarginTradeWithdraw>,
cpi_data: Vec<u8>,
cpi_datas: Vec<(u8, Vec<u8>)>,
) -> Result<()> {
instructions::margin_trade(ctx, num_health_accounts, withdraws, cpi_data)
instructions::margin_trade(ctx, withdraws, cpi_datas)
}
///

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

@ -318,12 +318,14 @@ impl<'keypair> ClientInstruction for MarginTradeInstruction<'keypair> {
.await;
let instruction = Self::Instruction {
num_health_accounts: health_check_metas.len(),
withdraws: vec![MarginTradeWithdraw {
index: 1,
amount: self.withdraw_amount,
}],
cpi_data: self.margin_trade_program_ix_cpi_data.clone(),
cpi_datas: vec![(
health_check_metas.len() as u8,
self.margin_trade_program_ix_cpi_data.clone(),
)],
};
let mut instruction = make_instruction(program_id, &accounts, instruction);

5
programs/mango-v4/tests/program_test/mod.rs
View File

@ -108,10 +108,9 @@ impl TestContextBuilder {
program_log: program_log_capture.clone(),
}));
// intentionally set to half the limit, to catch potential problems early
// intentionally set to as tight as possible, to catch potential problems early
// TODO make configurable
// margin trade test just goes above 100000 atm
test.set_compute_max_units(101000);
test.set_compute_max_units(86000);
Self {
test,

2
ts/client/src/client.ts
View File

@ -1129,7 +1129,7 @@ export class MangoClient {
const cpiData = instruction.data;
return await this.program.methods
.marginTrade(new BN(parsedHealthAccounts.length), withdraws, cpiData)
.marginTrade(withdraws, [new BN(parsedHealthAccounts.length), cpiData])
.accounts({
group: group.publicKey,
account: mangoAccount.publicKey,