@reyaxyz/common 0.380.1 → 0.382.0

package/src/types.ts

@@ -1144,7 +1144,7 @@ type SpotPair<T extends string> = T extends `${infer Base}USDMARK`
   : never;
 
 /**
- * Base assets of the RWA perpetual markets (ids 76-94; registration is a separate per-chain release gate). Stork publishes each as a pair of
+ * Base assets of the RWA perpetual markets (ids 76-94 and 96; registration is a separate per-chain release gate). Stork publishes each as a pair of
  * USDC-quoted feeds, so neither is ever divided by USDCUSD.
  */
 export type RwaStorkAsset =
@@ -1166,7 +1166,8 @@ export type RwaStorkAsset =
   | 'INTC'
   | 'HOOD'
   | 'AMD'
-  | 'MSTR';
+  | 'MSTR'
+  | 'SKHY';
 
 /**
  * Stork actual-mark feed. It is each RWA market's on-chain `oracleNodeId`, the

package/src/utils/realized-balance.ts

@@ -226,6 +226,83 @@ export function calculatePositionFundingSinceChange(
   return mulWad(divWad(funding.minus(lastFunding), multiplier), base.negated());
 }
 
+/**
+ * Raw E18 funding on an open position since its session (the contract's
+ * `position.session`) opened, positive received: the funding settled at its
+ * fills since then (positions.session_settled_funding, RET-281) plus
+ * calculatePositionFundingSinceChange. Null while the settled part is unknown
+ * (a session opened before the indexer kept it, not yet backfilled).
+ */
+export function calculatePositionFundingSinceOpen(
+  position: RealizedBalancePosition & {
+    session_settled_funding?: { toString(): string } | null;
+  },
+  trackers: RealizedBalanceTrackers | undefined,
+): BigNumber | null {
+  const settled = position.session_settled_funding;
+  if (settled === null || settled === undefined) return null;
+  return new BigNumber(settled.toString()).plus(
+    calculatePositionFundingSinceChange(position, trackers),
+  );
+}
+
+/** A stored position's fields `nextSessionSettledFunding` reads (raw E18). */
+export type SessionFundingPosition = {
+  base: { toString(): string } | null;
+  funding_value: { toString(): string } | null;
+  base_multiplier: { toString(): string } | null;
+  session: { toString(): string } | null;
+  session_settled_funding?: { toString(): string } | null;
+};
+
+/**
+ * positions.session_settled_funding after a fill (RET-281), as the
+ * perp-execution indexer's upsert computes it (persistPerpExecutionCte.ts):
+ * raw E18 funding settled into the position at its fills since its current
+ * session (the contract's `position.session`) opened, positive received.
+ *
+ * - No stored position, or a new session (opened from flat or flipped): 0.
+ *   The opening fill's settlement belonged to the previous position. A
+ *   stored position from before the `session` column has none to compare:
+ *   there flat before, or the other side, opens one.
+ * - Within a session: plus computeFundingCashflow of the stored position
+ *   against the fill's post-fill funding value, which within a session is
+ *   the value it settled at.
+ * - Unknown (null) stays unknown; a flat position or a zero multiplier
+ *   accrues nothing.
+ */
+export function nextSessionSettledFunding(
+  previous: SessionFundingPosition | undefined,
+  next: Pick<SessionFundingPosition, 'session' | 'funding_value' | 'base'>,
+): string | null {
+  if (!previous) return '0';
+  const base =
+    previous.base === null ? null : new BigNumber(previous.base.toString());
+  if (previous.session !== null && previous.session !== undefined) {
+    if (previous.session.toString() !== String(next.session)) return '0';
+  } else if (
+    base === null ||
+    base.isZero() ||
+    base.gt(0) !== new BigNumber(String(next.base)).gt(0)
+  ) {
+    return '0';
+  }
+  const settled = previous.session_settled_funding;
+  if (settled === null || settled === undefined) return null;
+  const multiplier = new BigNumber(previous.base_multiplier?.toString() ?? 0);
+  if (base === null || base.isZero() || !multiplier.gt(0)) {
+    return settled.toString();
+  }
+  // As the SQL: a stored position without a funding value is unknown.
+  if (previous.funding_value === null) return null;
+  const delta = integer(next.funding_value, 'fill funding').minus(
+    integer(previous.funding_value, 'position funding'),
+  );
+  return new BigNumber(settled.toString())
+    .plus(mulWad(divWad(delta, multiplier), base.negated()))
+    .toFixed();
+}
+
 /**
  * Returns raw E18 PnL aligned to collateral units. The instrument floors EACH
  * market's PnL to quote-token precision before Core aggregates collateral info.