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

Rust client: Fix remaining accounts perp oracles

This commit is contained in:
Christian Kamm 2022-09-21 12:04:54 +02:00
parent ecbd4028f7
commit d86b3dd757
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/client.rs
View File

@ -341,6 +341,10 @@ impl MangoClient {
.active_perp_positions() .active_perp_positions()
.chain(account.active_perp_positions()) .chain(account.active_perp_positions())
.map(|&pa| self.context.perp_market_address(pa.market_index)); .map(|&pa| self.context.perp_market_address(pa.market_index));
let perp_oracles = liqee
.active_perp_positions()
.chain(account.active_perp_positions())
.map(|&pa| self.context.perp(pa.market_index).market.oracle);
Ok(banks Ok(banks
.iter() .iter()
@ -351,6 +355,7 @@ impl MangoClient {
}) })
.chain(oracles.into_iter().map(to_readonly_account_meta)) .chain(oracles.into_iter().map(to_readonly_account_meta))
.chain(perp_markets.map(to_readonly_account_meta)) .chain(perp_markets.map(to_readonly_account_meta))
.chain(perp_oracles.map(to_readonly_account_meta))
.chain(serum_oos.map(to_readonly_account_meta)) .chain(serum_oos.map(to_readonly_account_meta))
.collect()) .collect())
} }

34
client/src/context.rs
View File

@ -78,6 +78,10 @@ impl MangoGroupContext {
self.tokens.get(&token_index).unwrap() self.tokens.get(&token_index).unwrap()
} }
pub fn perp(&self, perp_market_index: PerpMarketIndex) -> &PerpMarketContext {
self.perp_markets.get(&perp_market_index).unwrap()
}
pub fn token_by_mint(&self, mint: &Pubkey) -> anyhow::Result<&TokenContext> { pub fn token_by_mint(&self, mint: &Pubkey) -> anyhow::Result<&TokenContext> {
self.tokens self.tokens
.iter() .iter()
@ -86,7 +90,7 @@ impl MangoGroupContext {
} }
pub fn perp_market_address(&self, perp_market_index: PerpMarketIndex) -> Pubkey { pub fn perp_market_address(&self, perp_market_index: PerpMarketIndex) -> Pubkey {
self.perp_markets.get(&perp_market_index).unwrap().address self.perp(perp_market_index).address
} }
pub fn new_from_rpc( pub fn new_from_rpc(
@ -237,6 +241,15 @@ impl MangoGroupContext {
let perp_markets = account let perp_markets = account
.active_perp_positions() .active_perp_positions()
.map(|&pa| self.perp_market_address(pa.market_index)); .map(|&pa| self.perp_market_address(pa.market_index));
let perp_oracles = account
.active_perp_positions()
.map(|&pa| self.perp(pa.market_index).market.oracle);
let to_account_meta = |pubkey| AccountMeta {
pubkey,
is_writable: false,
is_signer: false,
};
Ok(banks Ok(banks
.iter() .iter()
@ -245,21 +258,10 @@ impl MangoGroupContext {
is_writable: writable_banks, is_writable: writable_banks,
is_signer: false, is_signer: false,
}) })
.chain(oracles.iter().map(|&pubkey| AccountMeta { .chain(oracles.into_iter().map(to_account_meta))
pubkey, .chain(perp_markets.map(to_account_meta))
is_writable: false, .chain(perp_oracles.map(to_account_meta))
is_signer: false, .chain(serum_oos.map(to_account_meta))
}))
.chain(perp_markets.map(|pubkey| AccountMeta {
pubkey,
is_writable: false,
is_signer: false,
}))
.chain(serum_oos.map(|pubkey| AccountMeta {
pubkey,
is_writable: false,
is_signer: false,
}))
.collect()) .collect())
} }
} }