Skip to content

Commit d8b7f25

Browse files
authored
Patch CLI to use most up to date sdk (#29)
* Patch CLI to use most up to date sdk * Bump sdk version
1 parent 0cd6c59 commit d8b7f25

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "phoenix-cli"
3-
version = "0.2.2"
3+
version = "0.2.3"
44
description = "CLI and associated library for interacting with the Phoenix program from the command line"
55
edition = "2021"
66
license = "MIT"
@@ -34,7 +34,7 @@ serde = { version = "1.0", features = ["derive"] }
3434
serde_json = "1.0"
3535
spl-associated-token-account = { version = "1.1.1", features = [ "no-entrypoint" ] }
3636
phoenix-v1 = { version = "0.2.2", features = ["no-entrypoint"] }
37-
phoenix-sdk = "0.3.3"
37+
phoenix-sdk = "0.3.4"
3838
bytemuck = "1.13.0"
3939
reqwest = "0.11.14"
4040
bincode = "1.3.3"

src/lib/helpers/print_helpers.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use solana_sdk::program_pack::Pack;
1212
use solana_sdk::pubkey::Pubkey;
1313

1414
pub fn print_book(sdk: &SDKClient, market: &Pubkey, book: &Ladder) -> anyhow::Result<()> {
15-
let meta = sdk.get_market_metadata(market);
15+
let meta = sdk.get_market_metadata_from_cache(market)?;
1616
let asks = book.asks.iter().filter_map(|lvl| {
1717
Some((
1818
sdk.ticks_to_float_price(market, lvl.price_in_ticks).ok()?,
@@ -120,7 +120,7 @@ pub async fn print_market_details(
120120
let base_pubkey = market_metadata.base_mint;
121121
let quote_pubkey = market_metadata.quote_mint;
122122

123-
let meta = sdk.get_market_metadata(market_pubkey);
123+
let meta = sdk.get_market_metadata_from_cache(market_pubkey)?;
124124

125125
let base_vault = get_vault_address(market_pubkey, &base_pubkey).0;
126126
let quote_vault = get_vault_address(market_pubkey, &quote_pubkey).0;
@@ -219,7 +219,7 @@ pub fn print_trader_state(
219219
pubkey: &Pubkey,
220220
state: &TraderState,
221221
) -> anyhow::Result<()> {
222-
let meta = sdk.get_market_metadata(market_pubkey);
222+
let meta = sdk.get_market_metadata_from_cache(market_pubkey)?;
223223
if state.base_lots_locked == 0
224224
&& state.base_lots_free == 0
225225
&& state.quote_lots_locked == 0
@@ -269,7 +269,7 @@ pub async fn log_market_events(
269269
if !sdk.markets.contains_key(&market_pubkey) {
270270
sdk.add_market(&market_pubkey).await?;
271271
}
272-
let metadata = sdk.get_market_metadata(&market_pubkey);
272+
let metadata = sdk.get_market_metadata_from_cache(&market_pubkey)?;
273273
match event.details {
274274
MarketEventDetails::Fill(fill) => {
275275
let Fill {

src/lib/processor/process_get_market.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ use solana_sdk::pubkey::Pubkey;
55
use std::mem::size_of;
66

77
pub async fn process_get_market(market_pubkey: &Pubkey, sdk: &SDKClient) -> anyhow::Result<()> {
8-
let market_metadata = sdk.get_market_metadata(market_pubkey);
9-
8+
let market_metadata = sdk.get_market_metadata(market_pubkey).await?;
109
let market_account_data = sdk.client.get_account_data(market_pubkey).await?;
1110
let (header_bytes, market_bytes) = market_account_data.split_at(size_of::<MarketHeader>());
1211
let header: &MarketHeader = bytemuck::try_from_bytes(header_bytes)
@@ -19,5 +18,5 @@ pub async fn process_get_market(market_pubkey: &Pubkey, sdk: &SDKClient) -> anyh
1918

2019
let taker_fees = market.get_taker_fee_bps();
2120

22-
print_market_details(sdk, market_pubkey, market_metadata, header, taker_fees).await
21+
print_market_details(sdk, market_pubkey, &market_metadata, header, taker_fees).await
2322
}

src/lib/processor/process_get_open_orders.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub async fn process_get_open_orders(
1616
trader_pubkey: &Pubkey,
1717
sdk: &SDKClient,
1818
) -> anyhow::Result<()> {
19-
let meta = sdk.get_market_metadata(market_pubkey);
19+
let meta = sdk.get_market_metadata(market_pubkey).await?;
2020
// Get market account
2121
let mut market_and_clock = sdk
2222
.client

src/lib/processor/process_mint_tokens_for_market.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub async fn process_mint_tokens_for_market(
1515
quote_amount: u64,
1616
) -> anyhow::Result<()> {
1717
// Get base and quote mints from market metadata
18-
let market_metadata = sdk.get_market_metadata(market_pubkey);
18+
let market_metadata = sdk.get_market_metadata(market_pubkey).await?;
1919
let base_mint = market_metadata.base_mint;
2020
let quote_mint = market_metadata.quote_mint;
2121

0 commit comments

Comments
 (0)