@reyaxyz/common 0.276.0 → 0.277.1

package/src/trading-api-types.ts

@@ -41,19 +41,14 @@ type Order = {
   id: string;
   market_id: Decimal | null;
   account_id: Decimal | null;
-  order_base: Decimal | null;
+  executed_base: Decimal | null;
   fee: Decimal | null;
   price: Decimal | null;
-  type: string;
-  processed: boolean;
+  is_match_order: boolean | null;
+  liquidation_type: Decimal | null;
   transaction_hash: string;
-  r_pnl: Decimal | null;
-  price_variation_pnl: Decimal | null;
-  funding_pnl: Decimal | null;
-  average_entry_price: Decimal | null;
   block_timestamp: Decimal | null;
   block_number: Decimal;
-  source: string | null;
   unique_id: bigint | null;
   created_at: Date;
 };
@@ -63,11 +58,8 @@ type Position = {
   account_id: Decimal;
   base: Decimal | null;
   realized_pnl: Decimal | null;
-  realized_pnl_latest_snapshot: Decimal | null;
-  average_entry_price_off_chain_tracker: Decimal | null;
-  funding_value_off_chain_tracker: Decimal | null;
   last_price: Decimal | null;
-  position_data_last_price_data_timestamp: Decimal | null;
+  last_price_timestamp: Decimal | null;
   funding_value: Decimal | null;
   base_multiplier: Decimal | null;
   adl_unwind_price: Decimal | null;
@@ -85,6 +77,13 @@ type ConditionalOrder = {
   is_long: boolean;
   trigger_price: number;
   order_base: Decimal;
+  status: string;
+  creation_timestamp_ms: bigint;
+  last_update_timestamp_ms: bigint;
+  transaction_hash: string | null;
+};
+
+type ConditionalOrderSensitive = ConditionalOrder & {
   exchange_id: bigint;
   inputs: string;
   counterparty_account_id: bigint;
@@ -93,10 +92,6 @@ type ConditionalOrder = {
   signer_address: string;
   nonce: Decimal;
   signature: string;
-  status: string;
-  creation_timestamp_ms: bigint;
-  last_update_timestamp_ms: bigint;
-  transaction_hash: string | null;
 };
 
 type Market = {
@@ -324,12 +319,12 @@ export type TradingApiSource = {
     {
       marketId: string;
     },
-    'order_history'
+    'orders'
   >;
   'wallet/:address/positions': TradingApiListEndpoint<
     Position,
     AddressParam,
-    'position_raw'
+    'position'
   >;
   'wallet/:address/conditionalOrders': TradingApiListEndpoint<
     ConditionalOrder,
@@ -360,7 +355,7 @@ export type TradingApiSource = {
   'wallet/:address/accounts': TradingApiListEndpoint<
     Account,
     AddressParam,
-    'accountProfile'
+    'AccountProfile'
   >;
   'wallet/:address/accounts/tiers': TradingApiListEndpoint<
     {
@@ -525,6 +520,11 @@ export type GenericReplicationMessage<T, model extends ReplicationModel> =
       model: model;
       result: T[];
       operation: 'updateMany';
+    }
+  | {
+      model: model;
+      result: T[];
+      operation: 'createMany';
     };
 
 type account_collateral_balance_entries = {
@@ -558,6 +558,10 @@ type ReplicationMessage =
   | GenericReplicationMessage<
       account_collateral_balance_entries,
       'account_collateral_balance_entries'
+    >
+  | GenericReplicationMessage<
+      ConditionalOrderSensitive,
+      'ConditionalOrdersSensitive'
     >;
 
 export type Replication = {
@@ -566,3 +570,9 @@ export type Replication = {
     { model: K['model'] }
   >;
 };
+
+export type ReplaceDecimals<T, D> = T extends Decimal
+  ? D
+  : T extends (infer U)[]
+    ? ReplaceDecimals<U, D>[]
+    : { [K in keyof T]: ReplaceDecimals<T[K], D> };

package/src/types.ts

@@ -998,22 +998,36 @@ export type TransactionExecutionOutput = {
     executionPrice?: number;
     base?: number;
   };
-  positions?: Omit<
-    Stringified<TradingApiSource['wallet/:address/positions']['response'][0]>,
-    | 'realized_pnl_latest_snapshot'
-    | 'average_entry_price_off_chain_tracker'
-    | 'funding_value_off_chain_tracker'
-  >[];
-  orders?: Omit<
-    Stringified<
-      TradingApiSource['market/:marketId/orders']['response']['data'][0]
-    >,
-    | 'r_pnl'
-    | 'price_variation_pnl'
-    | 'funding_pnl'
-    | 'average_entry_price'
-    | 'created_at'
-  >[];
+  positions?: {
+    market_id: string;
+    account_id: string;
+    base: string | null;
+    realized_pnl: string | null;
+    last_price: string | null;
+    position_data_last_price_data_timestamp: string | null;
+    funding_value: string | null;
+    base_multiplier: string | null;
+    adl_unwind_price: string | null;
+    transaction_hash: string;
+    block_timestamp: string | null;
+    block_number: string;
+    unique_id: string | null;
+  }[];
+  orders?: {
+    id: string;
+    market_id: string | null;
+    account_id: string | null;
+    order_base: string | null;
+    fee: string | null;
+    price: string | null;
+    type: string;
+    processed: boolean;
+    transaction_hash: string;
+    block_timestamp: string | null;
+    block_number: string;
+    source: string | null;
+    unique_id: string | null;
+  }[];
   accounts?: Omit<
     Stringified<TradingApiSource['wallet/:address/accounts']['response'][0]>,
     'status'
@@ -1255,6 +1269,7 @@ interface PositionData {
 }
 
 export interface PassivePerpOrderAndPositionUpdate {
+  id: string;
   marketId: bigint;
   accountId: bigint;
   counterpartyAccountId: bigint;
@@ -1267,6 +1282,9 @@ export interface PassivePerpOrderAndPositionUpdate {
   positionData: PositionData;
   counterpartyPositionData: PositionData;
   blockTimestamp: bigint;
+  blockNumber: string;
+  transactionHash: string;
+  uniqueId: bigint;
 }
 
 export type AssetPair =

package/src/utils/consts.ts

@@ -134,6 +134,9 @@ export const VOLUME_TIER_MAP: Record<number, number> = {
 
 export const SPECIAL_TIER_THRESHOLD = 100;
 
+export const MA_HEALTH_DANGER_THRESHOLD = 95;
+export const MA_HEALTH_WARNING_THRESHOLD = 80;
+
 export const marketAssetPairIdMapper: Record<string, string> = {
   ETHUSDMARK: '1',
   BTCUSDMARK: '2',

package/src/utils/struct.ts

@@ -23,10 +23,10 @@ export const filterBy = <T, K extends keyof T, V>(a: T[], k: K, v: V) =>
 export const findBy = <T, K extends keyof T, V>(a: T[], k: K, v: V) =>
   a.find((a) => a[k] === v);
 
-export const groupBy = <T, K>(items: T[], key: (item: T) => K) => {
+export const groupBy = <T, K>(items: T[], key: (item: T) => K | K) => {
   const groupedItems = new Map<K, T[]>();
   items.forEach((item) => {
-    const keyValue = typeof key === 'function' ? key(item) : item[key];
+    const keyValue = key(item);
     if (!keyValue) return;
     if (!groupedItems.has(keyValue)) {
       groupedItems.set(keyValue, [] as T[]);