@bulletxyz/bullet-sdk 0.31.0-rc.2 → 0.32.0-rc.0

package/dist/types/bullet-wasm/index.d.ts

@@ -11,28 +11,28 @@ export class BulletWasm {
   static dummy(a: number): number;
   static convert_token_id_to_bytes(token_id: string): Uint8Array;
   static convert_rust_decimal_to_json(decimal_str: string): any;
-  static calculate_total_perp_unrealized_pnl(user_account: any, margin_calculation_state: any): string;
-  static calculate_account_equity(user_account: any, conservative: boolean, equity_type: EquityType, margin_calculation_state: any): string;
-  static calculate_account_leverage(user_account: any, margin_calculation_state: any): string;
-  static calculate_available_margin(user_account: any, conservative: boolean, margin_type: MarginType, margin_calculation_state: any): string;
-  static calculate_used_margin(user_account: any, withdrawal: boolean, margin_type: MarginType, margin_calculation_state: any): string;
-  static calculate_used_perp_margin(user_account: any, margin_type: MarginType, margin_calculation_state: any): string;
-  static calculate_used_spot_margin(user_account: any, margin_type: MarginType, margin_calculation_state: any): string;
-  static calculate_withdrawable_amount_of_asset(user_account: any, asset_id: number, margin_calculation_state: any, asset_registry: any): string;
-  static calculate_estimated_liquidation_price(user_account: any, market_id: number, base_asset_id: number, margin_calculation_state: any): string;
-  static calculate_liquidation_risk_percentage(user_account: any, margin_calculation_state: any): string;
-  static calculate_margin_balance(user_account: any, margin_calculation_state: any): string;
-  static calculate_force_cancel_risk_percentage(user_account: any, margin_calculation_state: any): string;
+  static calculate_total_perp_unrealized_pnl(user_account: any, risk_engine: any): string;
+  static calculate_account_equity(user_account: any, conservative: boolean, equity_type: EquityType, risk_engine: any): string;
+  static calculate_account_leverage(user_account: any, risk_engine: any): string;
+  static calculate_available_margin(user_account: any, conservative: boolean, margin_type: MarginType, risk_engine: any): string;
+  static calculate_used_margin(user_account: any, withdrawal: boolean, margin_type: MarginType, risk_engine: any): string;
+  static calculate_used_perp_margin(user_account: any, margin_type: MarginType, risk_engine: any): string;
+  static calculate_used_spot_margin(user_account: any, margin_type: MarginType, risk_engine: any): string;
+  static calculate_withdrawable_amount_of_asset(user_account: any, asset_id: number, risk_engine: any, exchange_info: any): string;
+  static calculate_estimated_liquidation_price(user_account: any, market_id: number, base_asset_id: number, risk_engine: any): string;
+  static calculate_liquidation_risk_percentage(user_account: any, risk_engine: any): string;
+  static calculate_margin_balance(user_account: any, risk_engine: any): string;
+  static calculate_force_cancel_risk_percentage(user_account: any, risk_engine: any): string;
   /**
    * Calculates the maximum amount that can be borrowed for a given asset
    * @param initial_liability_weight The initial liability weight for the market must be passed in separately since the user may not have a spot ledger for this asset yet
    */
-  static calculate_max_borrow_amount(asset_id: number, user_account: any, margin_calculation_state: any): string;
-  static calculate_max_order_size(market_id: number, price: string, side: Side, order_type: OrderType, reduce_only: boolean, user_account: any, margin_calculation_state: any, orderbook: any, n_iterations: number, error_tolerance: string): string;
-  static simulate_used_margin_on_borrow(asset_id: number, borrow_amount: string, user_account: any, margin_type: MarginType, margin_calculation_state: any): any;
-  static simulate_used_margin_on_order(market_id: number, new_order_args: any, user_account: any, margin_calculation_state: any, orderbook: any): any;
-  static simulate_estimated_liquidation_price_on_order(market_id: number, new_order_args: any, base_asset: number, user_account: any, margin_calculation_state: any, orderbook: any): any;
-  static calculate_positions_additional_metadata(user_account: any, margin_calculation_state: any): any;
+  static calculate_max_borrow_amount(asset_id: number, user_account: any, risk_engine: any): string;
+  static calculate_max_order_size(market_id: number, price: string, side: Side, order_type: OrderType, reduce_only: boolean, user_account: any, risk_engine: any, orderbook: any, n_iterations: number, error_tolerance: string): string;
+  static simulate_used_margin_on_borrow(asset_id: number, borrow_amount: string, user_account: any, margin_type: MarginType, risk_engine: any): any;
+  static simulate_used_margin_on_order(market_id: number, new_order_args: any, user_account: any, risk_engine: any, orderbook: any): any;
+  static simulate_estimated_liquidation_price_on_order(market_id: number, new_order_args: any, base_asset: number, user_account: any, risk_engine: any, orderbook: any): any;
+  static calculate_positions_additional_metadata(user_account: any, risk_engine: any): any;
   static calculate_borrow_lend_additional_metadata(borrow_lend_market: any): any;
-  static calculate_account_summary_batch(user_accounts: any, margin_calculation_state: any, use_weighted_equity: boolean): any;
+  static calculate_account_summary_batch(user_accounts: any, risk_engine: any, use_weighted_equity: boolean): any;
 }

package/dist/types/client.d.ts

@@ -4,7 +4,7 @@ import { Connection } from "./connection";
 import { type Endpoints } from "./constants";
 import { ExchangeConnection } from "./exchange";
 import type { RuntimeCall } from "./rollupTypes";
-import { type Address, type AssetId, type AssetName, type MarkPriceUpdateArgs, type MarketName, type Network, type NewOrderArgs, type OraclePriceUpdateArgs, SpotCollateralTransferDirection, type TokenId, type TpslPair } from "./types";
+import { type Address, type AssetId, type AssetName, type MarkPriceUpdateArgs, type MarketName, type Network, type NewOrderArgs, type OraclePriceUpdateArgs, type SpotCollateralTransferDirection, type TokenId, type TpslPair } from "./types";
 import type { Wallet } from "./wallet";
 export interface TransactionOpts {
     maxPriorityFeeBps: number;

package/dist/types/exchange.d.ts

@@ -3,10 +3,11 @@ import { type EquityType, type MarginType } from "./bullet-wasm";
 import { BaseConnection } from "./connection";
 import { type Endpoints } from "./constants";
 import type { Orderbook } from "./orderbook";
-import type { Address, AssetName, MarketMetadata, MarketName, Network, NewOrderArgs, OrderType, Side } from "./types";
-import { type AccountAddresses, type AssetRegistry, type BorrowLendPools, type ExecutionIds, type GlobalParameters, type MarginConfig, type MarketRegistry, type OraclePrices, type Order, type OrderbookL2, type PerpMarket, type PerpPrices, type SpotMarket, type UsdcInsuranceFund, type UsdcPnlPool, type UserAccount } from "./zod-types/rest";
+import type { Address, AssetId, AssetName, MarketMetadata, MarketName, Network, NewOrderArgs, OrderType, Side } from "./types";
+import { type AccountAddresses, type BorrowLendPool, type ExchangeAssets, type ExchangeInfo, type ExecutionIds, type Order, type OrderbookL2, type PerpMarket, type RiskEngine, type SpotMarket, type UserAccount } from "./zod-types/rest";
 export declare class ExchangeConnection extends BaseConnection {
     private wsManager?;
+    private exchangeInfo?;
     private assetInfoRegistry?;
     private assetInfoRegistryReverse?;
     private marketRegistry?;
@@ -15,12 +16,9 @@ export declare class ExchangeConnection extends BaseConnection {
     static fromEndpoints(endpoints: Endpoints): Promise<ExchangeConnection>;
     static fromNetwork(network: Network): Promise<ExchangeConnection>;
     static fromRestUrl(restUrl: string): Promise<ExchangeConnection>;
-    private initializeRegistries;
-    private initializeAssetRegistry;
-    private initializeMarketRegistry;
+    private initializeExchangeInfo;
     getOrder(orderId: bigint): Promise<Order | null>;
-    getMarketRegistry(): Promise<MarketRegistry | null>;
-    getAssetRegistry(): Promise<AssetRegistry | null>;
+    getExchangeInfo(): Promise<ExchangeInfo | null>;
     private getAssetMapping;
     private getMarketMapping;
     getAssetId(asset: AssetName): number;
@@ -36,135 +34,54 @@ export declare class ExchangeConnection extends BaseConnection {
     getUserAccountAddresses(offset?: number, limit?: number): Promise<AccountAddresses>;
     getUserAccount(address: Address): Promise<UserAccount>;
     getUserAccounts(addresses: Address[]): Promise<Map<string, UserAccount>>;
-    getOraclePrices(): Promise<OraclePrices | null>;
-    getPerpPrices(): Promise<PerpPrices | null>;
-    getUsdcPnlPool(): Promise<UsdcPnlPool | null>;
-    getUsdcInsuranceFund(): Promise<UsdcInsuranceFund | null>;
-    getBorrowLendMarkets(): Promise<BorrowLendPools>;
+    getExchangeAssets(): Promise<ExchangeAssets | null>;
+    getRiskEngine(): Promise<RiskEngine | null>;
     getPerpMarket(market: MarketName): Promise<PerpMarket>;
     getPerpMarkets(markets: MarketName[]): Promise<Map<number, PerpMarket>>;
     getSpotMarket(market: MarketName): Promise<SpotMarket>;
     getSpotMarkets(markets: MarketName[]): Promise<Map<number, SpotMarket>>;
-    getMarginConfig(): Promise<MarginConfig | null>;
     getExecutionIds(): Promise<ExecutionIds | null>;
-    getGlobalParameters(): Promise<GlobalParameters | null>;
     calculateOrderbookMidpoint(orderbook: OrderbookL2): Decimal | undefined;
     calculateEntryPrice(market: MarketName, userAccount: UserAccount): Decimal;
-    calculateTotalPerpUnrealizedPnl(userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateAccountEquity(equityType: EquityType, conservative: boolean, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateAccountLeverage(userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateAvailableMargin(marginType: MarginType, conservative: boolean, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateUsedMargin(withdrawal: boolean, marginType: MarginType, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateUsedPerpMargin(userAccount: UserAccount, marginType: MarginType, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateUsedSpotMargin(userAccount: UserAccount, marginType: MarginType, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateWithdrawableAmountOfAsset(asset: AssetName, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Promise<Decimal>;
-    calculateEstimatedLiquidationPrice(market: MarketName, asset: AssetName, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateLiquidationRiskPercentage(userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateMarginBalance(userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateForceCancelRiskPercentage(userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateMaxBorrowAmount(asset: AssetName, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Decimal;
-    calculateMaxOrderSize(market: MarketName, price: Decimal, side: Side, order_type: OrderType, reduce_only: boolean, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }, orderbook: OrderbookL2, n_iterations?: number, error_tolerance?: Decimal): Decimal;
-    simulateUsedMarginOnBorrow(asset: AssetName, borrowAmount: Decimal, userAccount: UserAccount, marginType: MarginType, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): {
+    calculateTotalPerpUnrealizedPnl(userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateAccountEquity(equityType: EquityType, conservative: boolean, userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateAccountLeverage(userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateAvailableMargin(marginType: MarginType, conservative: boolean, userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateUsedMargin(withdrawal: boolean, marginType: MarginType, userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateUsedPerpMargin(userAccount: UserAccount, marginType: MarginType, riskEngine: RiskEngine): Decimal;
+    calculateUsedSpotMargin(userAccount: UserAccount, marginType: MarginType, riskEngine: RiskEngine): Decimal;
+    calculateWithdrawableAmountOfAsset(asset: AssetName, userAccount: UserAccount, riskEngine: RiskEngine): Promise<Decimal>;
+    calculateEstimatedLiquidationPrice(market: MarketName, asset: AssetName, userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateLiquidationRiskPercentage(userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateMarginBalance(userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateForceCancelRiskPercentage(userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateMaxBorrowAmount(asset: AssetName, userAccount: UserAccount, riskEngine: RiskEngine): Decimal;
+    calculateMaxOrderSize(market: MarketName, price: Decimal, side: Side, order_type: OrderType, reduce_only: boolean, userAccount: UserAccount, riskEngine: RiskEngine, orderbook: OrderbookL2, n_iterations?: number, error_tolerance?: Decimal): Decimal;
+    simulateUsedMarginOnBorrow(asset: AssetName, borrowAmount: Decimal, userAccount: UserAccount, marginType: MarginType, riskEngine: RiskEngine): {
         current: Decimal;
         updated: Decimal;
     };
-    simulateUsedMarginOnOrder(market: MarketName, newOrderArgs: NewOrderArgs, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }, orderbook: OrderbookL2): {
+    simulateUsedMarginOnOrder(market: MarketName, newOrderArgs: NewOrderArgs, userAccount: UserAccount, riskEngine: RiskEngine, orderbook: OrderbookL2): {
         current: Decimal;
         updated: Decimal;
     };
-    simulateEstimatedLiquidationPriceOnOrder(market: MarketName, newOrderArgs: NewOrderArgs, baseAsset: AssetName, userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }, orderbook: OrderbookL2): {
+    simulateEstimatedLiquidationPriceOnOrder(market: MarketName, newOrderArgs: NewOrderArgs, baseAsset: AssetName, userAccount: UserAccount, riskEngine: RiskEngine, orderbook: OrderbookL2): {
         current: Decimal;
         updated: Decimal;
     };
-    calculatePositionsAdditionalMetadata(userAccount: UserAccount, marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }): Map<number, {
+    calculatePositionsAdditionalMetadata(userAccount: UserAccount, riskEngine: RiskEngine): Map<number, {
         projected_funding_payment: Decimal;
         unrealized_pnl: Decimal;
         liquidation_price: Decimal;
         liquidation_risk_percentage: Decimal;
         max_leverage_to_use: number;
     }>;
-    calculateBorrowLendMarketAdditionalMetadata(borrowLendMarkets: BorrowLendPools, asset: AssetName): {
+    calculateBorrowLendPoolAdditionalMetadata(borrowLendPools: Map<AssetId, BorrowLendPool>, asset: AssetName): {
         utilisation_rate: Decimal;
         current_deposit_rate: Decimal;
         current_borrow_rate: Decimal;
     };
-    calculateAccountSummaryBatch(userAccounts: UserAccount[], marginCalculationState: {
-        oracle_prices: OraclePrices;
-        perp_prices: PerpPrices;
-        margin_config: MarginConfig;
-    }, useWeightedEquity?: boolean): {
+    calculateAccountSummaryBatch(userAccounts: UserAccount[], riskEngine: RiskEngine, useWeightedEquity?: boolean): {
         address: string;
         unrealized_pnl: Decimal;
         equity: Decimal;

package/dist/types/types.d.ts

@@ -11,7 +11,7 @@ export type OrderId = bigint;
 export type ClientOrderId = bigint;
 export type MarketKind = "perp" | "spot";
 export type Side = "bid" | "ask";
-export type SpotCollateralTransferDirection = "margin_to_spot" | "spot_to_margin";
+export type SpotCollateralTransferDirection = "spot_to_margin" | "margin_to_spot";
 export type TriggerDirection = "greater_than_or_equal" | "less_than_or_equal";
 export type TriggerPriceCondition = "mark" | "oracle" | "last_trade";
 export type OrderType = "limit" | "post_only" | "fill_or_kill" | "immediate_or_cancel" | "post_only_slide" | "post_only_front";