Skip to content

refactor: use SDK-native types for CLI parsing, centralize client initialization & output helpers #13

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
suhailkakar wants to merge 6 commits into
base: main
Choose a base branch
from
Open

refactor: use SDK-native types for CLI parsing, centralize client initialization & output helpers #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b240235
refactor: replace String fields with typed Address/B256/U256, remove …
suhailkakar Feb 24, 2026
a2dd7c1
refactor: create SDK clients once per invocation instead of per-subco…
suhailkakar Feb 24, 2026
fc1999a
refactor: harden clob dispatch, deduplicate output helpers, standardi…
suhailkakar Feb 25, 2026
2acd070
run formatter
suhailkakar Feb 25, 2026
7431398
refactor: extract ascending helper, tighten visibility, exhaust data.…
suhailkakar Feb 25, 2026
313860a
refactor clob client
suhailkakar Feb 25, 2026
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
Prev Previous commit
Next Next commit
refactor: create SDK clients once per invocation instead of per-subco… 
…mmand
  • Loading branch information
@suhailkakar
suhailkakar committed Feb 24, 2026
commit a2dd7c18b8e879afb4e2025621842f154234024f
76 changes: 16 additions & 60 deletions src/commands/clob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,15 +557,15 @@ pub async fn execute(
}

async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()> {
let client = clob::Client::default();

match command {
ClobCommand::Ok => {
let client = clob::Client::default();
let result = client.ok().await?;
print_ok(&result, output)?;
}

ClobCommand::Price { token_id, side } => {
let client = clob::Client::default();
let request = PriceRequest::builder()
.token_id(parse_token_id(&token_id)?)
.side(Side::from(side))
Expand All @@ -575,7 +575,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::BatchPrices { token_ids, side } => {
let client = clob::Client::default();
let requests: Vec<_> = parse_token_ids(&token_ids)?
.into_iter()
.map(|id| {
Expand All @@ -590,7 +589,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::Midpoint { token_id } => {
let client = clob::Client::default();
let request = MidpointRequest::builder()
.token_id(parse_token_id(&token_id)?)
.build();
Expand All @@ -599,7 +597,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::Midpoints { token_ids } => {
let client = clob::Client::default();
let requests: Vec<_> = parse_token_ids(&token_ids)?
.into_iter()
.map(|id| MidpointRequest::builder().token_id(id).build())
Expand All @@ -609,7 +606,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::Spread { token_id, side } => {
let client = clob::Client::default();
let request = SpreadRequest::builder()
.token_id(parse_token_id(&token_id)?)
.maybe_side(side.map(Side::from))
Expand All @@ -619,7 +615,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::Spreads { token_ids } => {
let client = clob::Client::default();
let requests: Vec<_> = parse_token_ids(&token_ids)?
.into_iter()
.map(|id| SpreadRequest::builder().token_id(id).build())
Expand All @@ -629,7 +624,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::Book { token_id } => {
let client = clob::Client::default();
let request = OrderBookSummaryRequest::builder()
.token_id(parse_token_id(&token_id)?)
.build();
Expand All @@ -638,7 +632,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::Books { token_ids } => {
let client = clob::Client::default();
let requests: Vec<_> = parse_token_ids(&token_ids)?
.into_iter()
.map(|id| OrderBookSummaryRequest::builder().token_id(id).build())
Expand All @@ -648,7 +641,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::LastTrade { token_id } => {
let client = clob::Client::default();
let request = LastTradePriceRequest::builder()
.token_id(parse_token_id(&token_id)?)
.build();
Expand All @@ -657,7 +649,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::LastTrades { token_ids } => {
let client = clob::Client::default();
let requests: Vec<_> = parse_token_ids(&token_ids)?
.into_iter()
.map(|id| LastTradePriceRequest::builder().token_id(id).build())
Expand All @@ -667,49 +658,41 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::Market { condition_id } => {
let client = clob::Client::default();
let result = client.market(&condition_id).await?;
print_clob_market(&result, output)?;
}

ClobCommand::Markets { cursor } => {
let client = clob::Client::default();
let result = client.markets(cursor).await?;
print_clob_markets(&result, output)?;
}

ClobCommand::SamplingMarkets { cursor } => {
let client = clob::Client::default();
let result = client.sampling_markets(cursor).await?;
print_clob_markets(&result, output)?;
}

ClobCommand::SimplifiedMarkets { cursor } => {
let client = clob::Client::default();
let result = client.simplified_markets(cursor).await?;
print_simplified_markets(&result, output)?;
}

ClobCommand::SamplingSimpMarkets { cursor } => {
let client = clob::Client::default();
let result = client.sampling_simplified_markets(cursor).await?;
print_simplified_markets(&result, output)?;
}

ClobCommand::TickSize { token_id } => {
let client = clob::Client::default();
let result = client.tick_size(parse_token_id(&token_id)?).await?;
print_tick_size(&result, output)?;
}

ClobCommand::FeeRate { token_id } => {
let client = clob::Client::default();
let result = client.fee_rate_bps(parse_token_id(&token_id)?).await?;
print_fee_rate(&result, output)?;
}

ClobCommand::NegRisk { token_id } => {
let client = clob::Client::default();
let result = client.neg_risk(parse_token_id(&token_id)?).await?;
print_neg_risk(&result, output)?;
}
Expand All @@ -719,7 +702,6 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
interval,
fidelity,
} => {
let client = clob::Client::default();
let request = PriceHistoryRequest::builder()
.market(parse_token_id(&token_id)?)
.time_range(TimeRange::from_interval(Interval::from(interval)))
Expand All @@ -730,13 +712,11 @@ async fn execute_read(command: ClobCommand, output: &OutputFormat) -> Result<()>
}

ClobCommand::Time => {
let client = clob::Client::default();
let result = client.server_time().await?;
print_server_time(result, output)?;
}

ClobCommand::Geoblock => {
let client = clob::Client::default();
let result = client.check_geoblock().await?;
print_geoblock(&result, output)?;
}
Expand All @@ -753,13 +733,15 @@ async fn execute_trade(
private_key: Option<&str>,
signature_type: Option<&str>,
) -> Result<()> {
let signer = auth::resolve_signer(private_key)?;
let client = auth::authenticate_with_signer(&signer, signature_type).await?;

match command {
ClobCommand::Orders {
market,
asset,
cursor,
} => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let request = OrdersRequest::builder()
.maybe_market(market)
.maybe_asset_id(asset)
Expand All @@ -769,7 +751,6 @@ async fn execute_trade(
}

ClobCommand::Order { order_id } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.order(&order_id).await?;
print_order_detail(&result, output)?;
}
Expand All @@ -782,9 +763,6 @@ async fn execute_trade(
order_type,
post_only,
} => {
let signer = auth::resolve_signer(private_key)?;
let client = auth::authenticate_with_signer(&signer, signature_type).await?;

let price_dec =
Decimal::from_str(&price).map_err(|_| anyhow::anyhow!("Invalid price: {price}"))?;
let size_dec =
Expand Down Expand Up @@ -812,9 +790,6 @@ async fn execute_trade(
sizes,
order_type,
} => {
let signer = auth::resolve_signer(private_key)?;
let client = auth::authenticate_with_signer(&signer, signature_type).await?;

let token_ids = parse_token_ids(&tokens)?;
let price_strs: Vec<&str> = prices.split(',').map(str::trim).collect();
let size_strs: Vec<&str> = sizes.split(',').map(str::trim).collect();
Expand Down Expand Up @@ -859,9 +834,6 @@ async fn execute_trade(
amount,
order_type,
} => {
let signer = auth::resolve_signer(private_key)?;
let client = auth::authenticate_with_signer(&signer, signature_type).await?;

let amount_dec = Decimal::from_str(&amount)
.map_err(|_| anyhow::anyhow!("Invalid amount: {amount}"))?;
let sdk_side = Side::from(side);
Expand All @@ -885,26 +857,22 @@ async fn execute_trade(
}

ClobCommand::Cancel { order_id } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.cancel_order(&order_id).await?;
print_cancel_result(&result, output)?;
}

ClobCommand::CancelOrders { order_ids } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let ids: Vec<&str> = order_ids.split(',').map(str::trim).collect();
let result = client.cancel_orders(&ids).await?;
print_cancel_result(&result, output)?;
}

ClobCommand::CancelAll => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.cancel_all_orders().await?;
print_cancel_result(&result, output)?;
}

ClobCommand::CancelMarket { market, asset } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let request = CancelMarketOrderRequest::builder()
.maybe_market(market)
.maybe_asset_id(asset)
Expand All @@ -918,7 +886,6 @@ async fn execute_trade(
asset,
cursor,
} => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let request = TradesRequest::builder()
.maybe_market(market)
.maybe_asset_id(asset)
Expand All @@ -929,7 +896,6 @@ async fn execute_trade(

ClobCommand::Balance { asset_type, token } => {
let is_collateral = matches!(asset_type, CliAssetType::Collateral);
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let request = BalanceAllowanceRequest::builder()
.asset_type(AssetType::from(asset_type))
.maybe_token_id(token)
Expand All @@ -939,7 +905,6 @@ async fn execute_trade(
}

ClobCommand::UpdateBalance { asset_type, token } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let request = BalanceAllowanceRequest::builder()
.asset_type(AssetType::from(asset_type))
.maybe_token_id(token)
Expand All @@ -954,13 +919,11 @@ async fn execute_trade(
}

ClobCommand::Notifications => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.notifications().await?;
print_notifications(&result, output)?;
}

ClobCommand::DeleteNotifications { ids } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let notification_ids: Vec<String> =
ids.split(',').map(|s| s.trim().to_string()).collect();
let request = DeleteNotificationsRequest::builder()
Expand All @@ -987,25 +950,24 @@ async fn execute_rewards(
private_key: Option<&str>,
signature_type: Option<&str>,
) -> Result<()> {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;

match command {
ClobCommand::Rewards { date, cursor } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client
.earnings_for_user_for_day(parse_date(&date)?, cursor)
.await?;
print_rewards(&result, output)?;
}

ClobCommand::Earnings { date } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client
.total_earnings_for_user_for_day(parse_date(&date)?)
.await?;
print_earnings(&result, output)?;
}

ClobCommand::EarningsMarkets { date, cursor } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let request = UserRewardsEarningRequest::builder()
.date(parse_date(&date)?)
.build();
Expand All @@ -1016,13 +978,11 @@ async fn execute_rewards(
}

ClobCommand::RewardPercentages => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.reward_percentages().await?;
print_reward_percentages(&result, output)?;
}

ClobCommand::CurrentRewards { cursor } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.current_rewards(cursor).await?;
print_current_rewards(&result, output)?;
}
Expand All @@ -1031,19 +991,16 @@ async fn execute_rewards(
condition_id,
cursor,
} => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.raw_rewards_for_market(&condition_id, cursor).await?;
print_market_reward(&result, output)?;
}

ClobCommand::OrderScoring { order_id } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.is_order_scoring(&order_id).await?;
print_order_scoring(&result, output)?;
}

ClobCommand::OrdersScoring { order_ids } => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let ids: Vec<&str> = order_ids.split(',').map(str::trim).collect();
let result = client.are_orders_scoring(&ids).await?;
print_orders_scoring(&result, output)?;
Expand All @@ -1061,28 +1018,27 @@ async fn execute_account(
private_key: Option<&str>,
signature_type: Option<&str>,
) -> Result<()> {
if matches!(command, ClobCommand::CreateApiKey) {
let signer = auth::resolve_signer(private_key)?;
let client = clob::Client::default();
let result = client.create_or_derive_api_key(&signer, None).await?;
return print_create_api_key(&result, output);
}

let client = auth::authenticated_clob_client(private_key, signature_type).await?;

match command {
ClobCommand::ApiKeys => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.api_keys().await?;
print_api_keys(&result, output)?;
}

ClobCommand::DeleteApiKey => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.delete_api_key().await?;
print_delete_api_key(&result, output)?;
}

ClobCommand::CreateApiKey => {
let signer = auth::resolve_signer(private_key)?;
let client = clob::Client::default();
let result = client.create_or_derive_api_key(&signer, None).await?;
print_create_api_key(&result, output)?;
}

ClobCommand::AccountStatus => {
let client = auth::authenticated_clob_client(private_key, signature_type).await?;
let result = client.closed_only_mode().await?;
print_account_status(&result, output)?;
}
Expand Down
Loading
Loading