@bulletxyz/bullet-sdk 0.29.0-rc.1 → 0.31.0-rc.0

package/dist/types/browser.d.ts

@@ -10,3 +10,4 @@ export * from "./constants";
 export * from "./error";
 export { Wallet } from "./wallet";
 export { Connection } from "./connection";
+export { BulletWasm } from "./bullet-wasm";

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

@@ -6,6 +6,7 @@ type OrderType = "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "Po
 type Side = "Bid" | "Ask";
 export class BulletWasm {
   free(): void;
+  [Symbol.dispose](): void;
   constructor();
   static dummy(a: number): number;
   static convert_token_id_to_bytes(token_id: string): Uint8Array;
@@ -15,9 +16,12 @@ export class BulletWasm {
   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;
   /**
    * Calculates the maximum amount that can be borrowed for a given asset

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 CreatePositionTpslArgs, type MarkPriceUpdateArgs, type MarketName, type Network, type NewOrderArgs, type OraclePriceUpdateArgs, type TokenId } from "./types";
+import { type Address, type AssetId, type AssetName, type MarkPriceUpdateArgs, type MarketName, type Network, type NewOrderArgs, type OraclePriceUpdateArgs, type TokenId, type TpslPair } from "./types";
 import type { Wallet } from "./wallet";
 export interface TransactionOpts {
     maxPriorityFeeBps: number;
@@ -43,6 +43,15 @@ export declare class Client {
     getNonce(): Promise<import("@sovereign-sdk/web3").Dedup>;
     getTokenBalance(tokenId: string): Promise<bigint>;
     getUserAccount(): Promise<{
+        account_variant: {
+            Master: number[];
+        } | {
+            Sub: null;
+        } | {
+            Vault: null;
+        } | {
+            ProtocolVault: null;
+        };
         address: string;
         usdc_ledger: {
             ledger: {
@@ -69,26 +78,7 @@ export declare class Client {
                 filled_size: Decimal;
                 average_filled_price: Decimal;
                 owner: string;
-                pending_tpsl: {
-                    tp: {
-                        tpsl_order_id: bigint;
-                        order_price: Decimal;
-                        trigger_price: Decimal;
-                        trigger_direction: "GreaterThanOrEqual" | "LessThanOrEqual";
-                        price_condition: "Mark" | "Oracle" | "LastTrade";
-                        dynamic_size: boolean;
-                        order_type: "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
-                    } | null;
-                    sl: {
-                        tpsl_order_id: bigint;
-                        order_price: Decimal;
-                        trigger_price: Decimal;
-                        trigger_direction: "GreaterThanOrEqual" | "LessThanOrEqual";
-                        price_condition: "Mark" | "Oracle" | "LastTrade";
-                        dynamic_size: boolean;
-                        order_type: "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
-                    } | null;
-                };
+                reserved_pending_tpsl_pair_ids: string | null;
             }>;
             position: {
                 size: Decimal;
@@ -100,19 +90,19 @@ export declare class Client {
                 funding_payments_on_position: Decimal;
             };
             user_selected_max_leverage: number;
-            tpsls: Map<bigint, {
+            trigger_orders: Map<bigint, {
                 size: Decimal | null;
-                tpsl_order_id: bigint;
                 order_price: Decimal;
                 trigger_price: Decimal;
-                trigger_direction: "GreaterThanOrEqual" | "LessThanOrEqual";
                 price_condition: "Mark" | "Oracle" | "LastTrade";
                 order_type: "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
                 side: "Bid" | "Ask";
                 market_id: number;
                 owner: string;
+                trigger_order_id: bigint;
+                trigger_direction: "GreaterThanOrEqual" | "LessThanOrEqual";
                 last_update_timestamp: bigint;
-                linked_tpsl_order_id: bigint | null;
+                linked_trigger_order_id: bigint | null;
             }>;
         }>;
         spot_ledgers: Map<number, {
@@ -121,70 +111,72 @@ export declare class Client {
                 market_id: number;
                 order_id: bigint;
                 client_order_id: bigint | null;
-                price: Decimal;
-                remaining_size: Decimal;
-                reduce_only: boolean;
-                filled_size: Decimal;
                 average_filled_price: Decimal;
                 owner: string;
-                pending_tpsl: {
-                    tp: {
-                        tpsl_order_id: bigint;
-                        order_price: Decimal;
-                        trigger_price: Decimal;
-                        trigger_direction: "GreaterThanOrEqual" | "LessThanOrEqual";
-                        price_condition: "Mark" | "Oracle" | "LastTrade";
-                        dynamic_size: boolean;
-                        order_type: "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
-                    } | null;
-                    sl: {
-                        tpsl_order_id: bigint;
-                        order_price: Decimal;
-                        trigger_price: Decimal;
-                        trigger_direction: "GreaterThanOrEqual" | "LessThanOrEqual";
-                        price_condition: "Mark" | "Oracle" | "LastTrade";
-                        dynamic_size: boolean;
-                        order_type: "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
-                    } | null;
-                };
+                quote_asset_id: number;
+                base_asset_id: number;
+                quote_lots: Decimal;
+                remaining_base_lots: Decimal;
+                filled_base_lots: Decimal;
             }>;
-            tpsls: Map<bigint, {
+            trigger_orders: Map<bigint, {
                 size: Decimal | null;
-                tpsl_order_id: bigint;
                 order_price: Decimal;
                 trigger_price: Decimal;
-                trigger_direction: "GreaterThanOrEqual" | "LessThanOrEqual";
                 price_condition: "Mark" | "Oracle" | "LastTrade";
                 order_type: "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
                 side: "Bid" | "Ask";
                 market_id: number;
                 owner: string;
+                trigger_order_id: bigint;
+                trigger_direction: "GreaterThanOrEqual" | "LessThanOrEqual";
                 last_update_timestamp: bigint;
-                linked_tpsl_order_id: bigint | null;
+                linked_trigger_order_id: bigint | null;
             }>;
         }>;
         fee_tiers: Map<number, "Tier0" | "Tier1" | "Tier2" | "Tier3" | "Tier4">;
+        pending_tpsl_pairs: Map<string, {
+            tpsl_pair: {
+                tp: {
+                    order_price: Decimal;
+                    trigger_price: Decimal;
+                    price_condition: "Mark" | "Oracle" | "LastTrade";
+                    order_type: "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
+                } | null;
+                sl: {
+                    order_price: Decimal;
+                    trigger_price: Decimal;
+                    price_condition: "Mark" | "Oracle" | "LastTrade";
+                    order_type: "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
+                } | null;
+            };
+            dynamic_size: boolean;
+        }>;
+        spot_collateral: Map<number, Decimal>;
     }>;
-    submitTransactionSync(runtimeCall: RuntimeCall): void;
     submitTransaction(runtimeCall: RuntimeCall): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     transfer(to: Address, amount: bigint, tokenId: TokenId): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     mint(to: Address, amount: bigint, tokenId: TokenId): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     deposit(asset: AssetName, amount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     withdraw(asset: AssetName, amount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    borrowSpot(asset: AssetName, amount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    placeOrders(market: MarketName, newOrders: NewOrderArgs[], replace?: boolean, useSyncTxSending?: boolean): Promise<void | TransactionResult<Transaction<RuntimeCall>>>;
-    createPerpPositionTpsl(market: MarketName, tpslOrders: CreatePositionTpslArgs): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    amendOrders(market: MarketName, options: AmendOrderOptions[]): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    cancelTpsls(market: MarketName, tpslOrderIds: bigint[]): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    cancelOrders(market: MarketName, options: CancelOrderOptions[]): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    borrowSpot(asset: AssetName, amount: Decimal, subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    depositSpotCollateral(asset: AssetName, amount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    withdrawSpotCollateral(asset: AssetName, amount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    transferSpotCollateral(direction: "MarginToSpot" | "SpotToMargin", asset: AssetName, amount: Decimal, subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    placeOrders(market: MarketName, newOrders: NewOrderArgs[], replace?: boolean, subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    createPerpPositionTpsl(market: MarketName, tpslPair: TpslPair, size?: Decimal, subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    amendOrders(market: MarketName, options: AmendOrderOptions[], subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    cancelTriggerOrders(market: MarketName, triggerOrderIds: bigint[], subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    cancelOrders(market: MarketName, options: CancelOrderOptions[], subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     adminCancelOrders(address: Address, market: MarketName, orderId: string): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    adminCancelTpsls(address: Address, market: MarketName, tpslOrderId: string): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    cancelAllOrders(market: MarketName): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    adminCancelTriggerOrder(address: Address, market: MarketName, triggerOrderId: string): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    cancelAllOrders(market: MarketName, subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     updateOraclePrices(pricesToUpdate: OraclePriceUpdateArgs[], publishTimestamp?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     updateMarkPrices(pricesToUpdate: MarkPriceUpdateArgs[], publishTimestamp?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     updateMaxLeverageForMarket(market: MarketName, maxLeverage: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     updatePremiumIndexes(markets: MarketName[]): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    processTpslBufferForMarket(market: MarketName): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    executePerpActiveTriggerOrders(market: MarketName): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    executeSpotActiveTriggerOrders(market: MarketName): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     updateFunding(markets: MarketName[]): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     applyFunding(addresses: Address[]): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     forceCancelOrders(address: Address): Promise<TransactionResult<Transaction<RuntimeCall>>>;
@@ -192,8 +184,8 @@ export declare class Client {
     liquidatePerpPositions(address: Address, positions?: {
         market: MarketName;
         size: Decimal;
-    }[]): Promise<TransactionResult<Transaction<RuntimeCall>>>;
-    liquidateSpotLiability(address: Address, liabilityAssetId: AssetName, collateralAssetId: AssetName, liabilityAmount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    }[], subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    liquidateSpotLiability(address: Address, liabilityAssetId: AssetName, collateralAssetId: AssetName, liabilityAmount: Decimal, subAccountIndex?: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     depositToUsdcPnlPool(amount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     depositToInsuranceFund(amount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     initAssetMetadata(asset_id: number, assetName: string, tokenId: TokenId | null, decimals: number, withdrawFee: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
@@ -203,5 +195,7 @@ export declare class Client {
     initBorrowLendPool(assetId: number, optimalUtilisationRate: Decimal, minBorrowRate: Decimal, maxBorrowRate: Decimal, optimalBorrowRate: Decimal, assetWeight: Decimal, initialLiabilityWeight: Decimal, maintenanceLiabilityWeight: Decimal, depositLimit: Decimal, borrowLimit: Decimal, liquidationTotalRewardRatio: Decimal, protocolRewardRatio: Decimal, liabilityLiquidationLimitRatio: Decimal, interestFeeTenthBps: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     updateBorrowLendPool(asset: AssetName, optimalUtilisationRate: Decimal | null, minBorrowRate: Decimal | null, maxBorrowRate: Decimal | null, optimalBorrowRate: Decimal | null, assetWeight: Decimal | null, initialLiabilityWeight: Decimal | null, maintenanceLiabilityWeight: Decimal | null, depositLimit: Decimal | null, borrowLimit: Decimal | null, liquidationRewardRatio: Decimal | null, liabilityLiquidationLimitRatio: Decimal | null): Promise<TransactionResult<Transaction<RuntimeCall>>>;
     updateLeverageTable(market: MarketName, leverageTable: Record<string, number>): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    createSubAccount(index: number): Promise<TransactionResult<Transaction<RuntimeCall>>>;
+    transferSubAccount(subAccountIndex: number, toSubAccount: boolean, asset: AssetName, amount: Decimal): Promise<TransactionResult<Transaction<RuntimeCall>>>;
 }
 export {};

package/dist/types/exchange.d.ts

@@ -4,7 +4,7 @@ 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 GlobalParameters, type MarginConfig, type MarketRegistry, type OraclePrices, type Order, type OrderbookL2, type PerpMarket, type PerpPrices, type SpotMarket, type Tpsl, type TpslOrderIdsToExecute, type UsdcInsuranceFund, type UsdcPnlPool, type UserAccount } from "./zod-types/rest";
+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";
 export declare class ExchangeConnection extends BaseConnection {
     private wsManager?;
     private assetInfoRegistry?;
@@ -19,7 +19,6 @@ export declare class ExchangeConnection extends BaseConnection {
     private initializeAssetRegistry;
     private initializeMarketRegistry;
     getOrder(orderId: bigint): Promise<Order | null>;
-    getTpslOrder(tpslOrderId: bigint): Promise<Tpsl | null>;
     getMarketRegistry(): Promise<MarketRegistry | null>;
     getAssetRegistry(): Promise<AssetRegistry | null>;
     private getAssetMapping;
@@ -47,7 +46,7 @@ export declare class ExchangeConnection extends BaseConnection {
     getSpotMarket(market: MarketName): Promise<SpotMarket>;
     getSpotMarkets(markets: MarketName[]): Promise<Map<number, SpotMarket>>;
     getMarginConfig(): Promise<MarginConfig | null>;
-    getTpslOrderIdsToExecute(market: MarketName): Promise<TpslOrderIdsToExecute | null>;
+    getExecutionIds(): Promise<ExecutionIds | null>;
     getGlobalParameters(): Promise<GlobalParameters | null>;
     calculateOrderbookMidpoint(orderbook: OrderbookL2): Decimal | undefined;
     calculateEntryPrice(market: MarketName, userAccount: UserAccount): Decimal;
@@ -76,6 +75,16 @@ export declare class ExchangeConnection extends BaseConnection {
         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;
@@ -91,6 +100,11 @@ export declare class ExchangeConnection extends BaseConnection {
         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;
@@ -157,6 +171,7 @@ export declare class ExchangeConnection extends BaseConnection {
         available_initial_margin: Decimal;
         available_maintenance_margin: Decimal;
         leverage: Decimal;
+        account_variant?: string | undefined;
     }[];
     private getWebSocketManager;
     subscribeOrderbook(market: MarketName): AsyncIterable<Orderbook>;

package/dist/types/index.d.ts

@@ -11,3 +11,4 @@ export * from "./constants";
 export * from "./wallet/nodeWallet";
 export * from "./error";
 export { Connection } from "./connection";
+export { BulletWasm } from "./bullet-wasm";

package/dist/types/rollupTypes.d.ts

@@ -6,6 +6,37 @@ type ExactlyOne<T, Keys extends keyof T = keyof T> = {
         [P in Exclude<Keys, K>]?: never;
     };
 }[Keys];
+type TpslOrder = {
+    order_price: number;
+    trigger_price: number;
+    price_condition: string;
+    order_type: string;
+};
+type TpslPair = {
+    tp: TpslOrder | null;
+    sl: TpslOrder | null;
+};
+type PendingTpslPair = {
+    tpsl_pair: TpslPair;
+    dynamic_size: boolean;
+};
+type NewOrderArgs = {
+    price: number;
+    size: number;
+    side: string;
+    order_type: string;
+    reduce_only: boolean;
+    client_order_id: string | null;
+    pending_tpsl_pair: PendingTpslPair | null;
+};
+type CancelOrderArgs = {
+    order_id: string | null;
+    client_order_id: string | null;
+};
+type AmendOrderArgs = {
+    cancel: CancelOrderArgs;
+    place: NewOrderArgs;
+};
 type BankCallMessage = {
     transfer: {
         to: Address;
@@ -84,18 +115,6 @@ type InterchainGasPaymasterCallMessage = {
         beneficiary?: string;
     };
 };
-type TriggerOrderArgs = {
-    order_price: number;
-    trigger_price: number;
-    trigger_direction: string;
-    price_condition: string;
-    order_type: string;
-};
-type PendingTriggerOrderArgs = {
-    pending_tp: TriggerOrderArgs | null;
-    pending_sl: TriggerOrderArgs | null;
-    dynamic_size: boolean;
-};
 type ExchangeCallMessage = {
     set_value: number;
     deposit: {
@@ -115,110 +134,69 @@ type ExchangeCallMessage = {
             asset_id: AssetId;
             amount: number;
         };
+        sub_account_index: number | null;
     };
     place_perp_orders: {
         market_id: MarketId;
-        args: {
-            price: number;
-            size: number;
-            side: string;
-            order_type: string;
-            reduce_only: boolean;
-            client_order_id: string | null;
-            tpsl: PendingTriggerOrderArgs | null;
-        }[];
+        args: NewOrderArgs[];
         replace: boolean;
+        sub_account_index: number | null;
     };
     place_spot_orders: {
         market_id: MarketId;
-        args: {
-            price: number;
-            size: number;
-            side: string;
-            order_type: string;
-            reduce_only: boolean;
-            client_order_id: string | null;
-            tpsl: PendingTriggerOrderArgs | null;
-        }[];
+        args: NewOrderArgs[];
         replace: boolean;
+        sub_account_index: number | null;
     };
     create_perp_position_tpsl: {
         market_id: MarketId;
-        args: {
-            tp: TriggerOrderArgs | null;
-            sl: TriggerOrderArgs | null;
-            size: number | null;
-        };
+        tpsl_pair: TpslPair;
+        size: number | null;
+        sub_account_index: number | null;
     };
     amend_perp_orders: {
         market_id: MarketId;
-        args: {
-            cancel: {
-                order_id: string | null;
-                client_order_id: string | null;
-            };
-            place: {
-                price: number;
-                size: number;
-                side: string;
-                order_type: string;
-                reduce_only: boolean;
-                client_order_id: string | null;
-                tpsl: PendingTriggerOrderArgs | null;
-            };
-        }[];
+        args: AmendOrderArgs[];
+        sub_account_index: number | null;
     };
     amend_spot_orders: {
         market_id: MarketId;
-        args: {
-            cancel: {
-                order_id: string | null;
-                client_order_id: string | null;
-            };
-            place: {
-                price: number;
-                size: number;
-                side: string;
-                order_type: string;
-                reduce_only: boolean;
-                client_order_id: string | null;
-                tpsl: PendingTriggerOrderArgs | null;
-            };
-        }[];
+        args: AmendOrderArgs[];
+        sub_account_index: number | null;
     };
-    cancel_perp_tpsls: {
+    cancel_perp_trigger_orders: {
         market_id: MarketId;
-        tpsl_order_ids: string[];
+        trigger_order_ids: string[];
+        sub_account_index: number | null;
     };
-    cancel_spot_tpsls: {
+    cancel_spot_trigger_orders: {
         market_id: MarketId;
-        tpsl_order_ids: string[];
+        trigger_order_ids: string[];
+        sub_account_index: number | null;
     };
     cancel_perp_orders: {
         market_id: MarketId;
-        args: {
-            order_id: string | null;
-            client_order_id: string | null;
-        }[];
+        args: CancelOrderArgs[];
+        sub_account_index: number | null;
     };
     cancel_spot_orders: {
         market_id: MarketId;
-        args: {
-            order_id: string | null;
-            client_order_id: string | null;
-        }[];
+        args: CancelOrderArgs[];
+        sub_account_index: number | null;
     };
     admin_cancel_orders: {
         args: [Address, MarketId, string][];
     };
-    admin_cancel_tpsls: {
+    admin_cancel_trigger_orders: {
         args: [Address, MarketId, string][];
     };
     cancel_all_perp_orders: {
         market_id: MarketId;
+        sub_account_index: number | null;
     };
     cancel_all_spot_orders: {
         market_id: MarketId;
+        sub_account_index: number | null;
     };
     update_oracle_prices: {
         prices_to_update: {
@@ -242,10 +220,10 @@ type ExchangeCallMessage = {
     update_premium_indexes: {
         market_ids: MarketId[];
     };
-    process_perp_tpsl_buffer: {
+    execute_perp_active_trigger_orders: {
         market_id: MarketId;
     };
-    process_spot_tpsl_buffer: {
+    execute_spot_active_trigger_orders: {
         market_id: MarketId;
     };
     update_funding: {
@@ -266,12 +244,14 @@ type ExchangeCallMessage = {
             market_id: MarketId;
             size: number;
         }[] | null;
+        sub_account_index: number | null;
     };
     liquidate_spot_liability: {
         liquidatee_address: Address;
         liability_asset_id: AssetId;
         collateral_asset_id: AssetId;
         liability_amount: number;
+        sub_account_index: number | null;
     };
     deposit_to_usdc_pnl_pool: {
         usdc_amount: number;
@@ -377,6 +357,37 @@ type ExchangeCallMessage = {
         market_id: MarketId;
         args: Record<string, number>;
     };
+    deposit_spot_collateral: {
+        args: {
+            asset_id: AssetId;
+            amount: number;
+        };
+    };
+    withdraw_spot_collateral: {
+        args: {
+            asset_id: AssetId;
+            amount: number;
+        };
+    };
+    transfer_spot_collateral: {
+        direction: "MarginToSpot" | "SpotToMargin";
+        args: {
+            asset_id: AssetId;
+            amount: number;
+        };
+        sub_account_index: number | null;
+    };
+    create_sub_account: {
+        index: number;
+    };
+    transfer_sub_account: {
+        sub_account_index: number;
+        to_sub_account: boolean;
+        asset_operation_args: {
+            asset_id: AssetId;
+            amount: number;
+        };
+    };
 };
 export type RuntimeCall = ExactlyOne<{
     exchange: ExactlyOne<ExchangeCallMessage>;

package/dist/types/types.d.ts

@@ -12,7 +12,7 @@ export type ClientOrderId = bigint;
 export type MarketKind = "Perp" | "Spot";
 export type Side = "Bid" | "Ask";
 export type TriggerDirection = "GreaterThanOrEqual" | "LessThanOrEqual";
-export type TpslPriceCondition = "Mark" | "Oracle" | "LastTrade";
+export type TriggerPriceCondition = "Mark" | "Oracle" | "LastTrade";
 export type OrderType = "Limit" | "PostOnly" | "FillOrKill" | "ImmediateOrCancel" | "PostOnlySlide" | "PostOnlyFront";
 export type MarginType = "Initial" | "Maintenance";
 export type EquityType = "Unweighted" | "WeightedInitial" | "WeightedMaintenance";
@@ -31,7 +31,14 @@ export type NewOrderArgs = {
     orderType: OrderType;
     reduceOnly: boolean;
     clientOrderId?: ClientOrderId;
-    tpsl?: PendingTriggerOrderArgs;
+    pendingTpslPair?: PendingTpslPair;
+};
+export type AmendOrderArgs = {
+    cancel: {
+        order_id: string | null;
+        client_order_id: string | null;
+    };
+    place: NewOrderArgs;
 };
 export type OraclePriceUpdateArgs = {
     asset: AssetName;
@@ -42,22 +49,19 @@ export type MarkPriceUpdateArgs = {
     medianCexPrice: Decimal;
     diffEma: Decimal;
 };
-export type TriggerOrderArgs = {
+export type Tpsl = {
     orderPrice: Decimal;
     triggerPrice: Decimal;
-    triggerDirection: TriggerDirection;
-    priceCondition: TpslPriceCondition;
+    priceCondition: TriggerPriceCondition;
     orderType: OrderType;
 };
-export type PendingTriggerOrderArgs = {
-    pendingTp?: TriggerOrderArgs;
-    pendingSl?: TriggerOrderArgs;
-    dynamicSize: boolean;
+export type TpslPair = {
+    tp?: Tpsl;
+    sl?: Tpsl;
 };
-export type CreatePositionTpslArgs = {
-    tp?: TriggerOrderArgs;
-    sl?: TriggerOrderArgs;
-    size?: Decimal;
+export type PendingTpslPair = {
+    tpslPair: TpslPair;
+    dynamicSize: boolean;
 };
 export type MarketMetadata = {
     id: number;
@@ -70,6 +74,17 @@ export declare class BulletError extends Error {
     code: string;
     shortMessage: string;
     verboseMessage: string;
-    constructor(code: string, shortMessage: string, verboseMessage: string, originalError?: Error | undefined);
-    static fromModuleError(error: unknown): Error;
+    httpStatus?: number;
+    responseData?: any;
+    constructor(code: string, shortMessage: string, verboseMessage: string, originalError?: Error | undefined, httpStatus?: number, responseData?: any);
+    static fromModuleError(error: unknown): BulletError;
+    toJSON(): {
+        name: string;
+        code: string;
+        message: string;
+        shortMessage: string;
+        verboseMessage: string;
+        httpStatus: number | undefined;
+        responseData: any;
+    };
 }

package/dist/types/zod-types/index.d.ts

@@ -1,6 +1,7 @@
 import Decimal from "decimal.js";
 import { z } from "zod";
 export declare const I64Schema: z.ZodBigInt;
+export declare const U8Schema: z.ZodNumber;
 export declare const U16Schema: z.ZodNumber;
 export declare const U32Schema: z.ZodNumber;
 export declare const U64Schema: z.ZodBigInt;
@@ -10,8 +11,9 @@ export declare const Base58Address: z.ZodString;
 export declare const AssetId: z.ZodNumber;
 export declare const MarketId: z.ZodNumber;
 export declare const OrderId: z.ZodBigInt;
+export declare const TradeId: z.ZodBigInt;
 export declare const ClientOrderId: z.ZodBigInt;
-export declare const TpslOrderId: z.ZodBigInt;
+export declare const TriggerOrderId: z.ZodBigInt;
 export declare const Amount: z.ZodBigInt;
 export declare const UnixTimestampMillis: z.ZodBigInt;
 type MapKeySchema = z.ZodString | z.ZodNumber | z.ZodUnknown | z.ZodBigInt;