@imbingox/acex 0.3.0-beta.4 → 0.3.0-beta.6

package/src/adapters/types.ts

@@ -119,9 +119,10 @@ export interface RawPositionUpdate {
 }
 
 export interface RawRiskUpdate {
-  equity?: string;
+  netEquity?: string;
+  riskEquity?: string;
   riskRatio?: string;
-  actualLeverage?: string;
+  riskLeverage?: string;
   initialMargin?: string;
   maintenanceMargin?: string;
   exchangeTs?: number;

package/src/client/context.ts

@@ -108,7 +108,7 @@ export function hasPrivateCredentials(
   venue?: Venue,
 ): boolean {
   if (venue === "juplend") {
-    return Boolean(credentials?.apiKey);
+    return true;
   }
 
   return Boolean(credentials?.apiKey && credentials.secret);

package/src/client/private-subscription-coordinator.ts

@@ -467,7 +467,7 @@ export class PrivateSubscriptionCoordinator {
     account: RegisteredAccountRecord,
   ): Promise<void> {
     const credentials = account.credentials;
-    if (!credentials) {
+    if (!credentials && record.venue !== "juplend") {
       throw new AcexError(
         "CREDENTIALS_MISSING",
         `Account credentials are required for private subscriptions: ${account.accountId}`,
@@ -476,7 +476,7 @@ export class PrivateSubscriptionCoordinator {
 
     const adapter = this.getAdapter(record.venue);
     const stream = adapter.createPrivateStream(
-      credentials,
+      credentials ?? {},
       {
         onAccountSnapshot: (snapshot) => {
           if (!record.accountSubscribed) {

package/src/client/runtime.ts

@@ -106,7 +106,10 @@ export class AcexClientImpl implements AcexClient, ClientContext {
     this.marketAdapters = new Map([[marketAdapter.venue, marketAdapter]]);
     const privateAdapters = [
       new BinancePrivateAdapter(),
-      new JuplendPrivateAdapter(),
+      new JuplendPrivateAdapter(
+        options.account?.juplend?.rpcUrl,
+        options.account?.juplend?.jupApiKey,
+      ),
     ];
     this.privateAdapters = new Map(
       privateAdapters.map((adapter) => [adapter.venue, adapter]),

package/src/managers/account-manager.ts

@@ -589,18 +589,22 @@ export class AccountManagerImpl
     return {
       accountId,
       venue,
-      equity:
-        input.equity === undefined
-          ? previous?.equity
-          : new BigNumber(input.equity),
+      netEquity:
+        input.netEquity === undefined
+          ? previous?.netEquity
+          : new BigNumber(input.netEquity),
+      riskEquity:
+        input.riskEquity === undefined
+          ? previous?.riskEquity
+          : new BigNumber(input.riskEquity),
       riskRatio:
         input.riskRatio === undefined
           ? previous?.riskRatio
           : new BigNumber(input.riskRatio),
-      actualLeverage:
-        input.actualLeverage === undefined
-          ? previous?.actualLeverage
-          : new BigNumber(input.actualLeverage),
+      riskLeverage:
+        input.riskLeverage === undefined
+          ? previous?.riskLeverage
+          : new BigNumber(input.riskLeverage),
       initialMargin:
         input.initialMargin === undefined
           ? previous?.initialMargin

package/src/managers/order-manager.ts

@@ -101,6 +101,13 @@ export class OrderManagerImpl
   async subscribeOrders(input: SubscribeOrdersInput): Promise<void> {
     this.context.assertStarted();
     const account = this.context.getRegisteredAccount(input.accountId);
+    if (account.venue === "juplend") {
+      throw this.createError(
+        "VENUE_NOT_SUPPORTED",
+        `Venue does not support private order subscriptions: ${account.venue}`,
+        { accountId: input.accountId, venue: account.venue },
+      );
+    }
     this.context.ensurePrivateCredentials(input.accountId);
 
     const record = this.getOrCreateRecord(input.accountId, account.venue);
@@ -635,6 +642,7 @@ export class OrderManagerImpl
 
   private createError(
     code:
+      | "VENUE_NOT_SUPPORTED"
       | "ORDER_CANCEL_ALL_FAILED"
       | "ORDER_CANCEL_FAILED"
       | "ORDER_CREATE_FAILED"

package/src/types/account.ts

@@ -91,9 +91,10 @@ export interface PositionSnapshot {
 export interface RiskSnapshot {
   accountId: string;
   venue: Venue;
-  equity?: BigNumber;
+  netEquity?: BigNumber;
+  riskEquity?: BigNumber;
   riskRatio?: BigNumber;
-  actualLeverage?: BigNumber;
+  riskLeverage?: BigNumber;
   initialMargin?: BigNumber;
   maintenanceMargin?: BigNumber;
   exchangeTs?: number;

package/src/types/shared.ts

@@ -41,6 +41,8 @@ export interface AccountRuntimeOptions {
   };
   juplend?: {
     pollIntervalMs?: number;
+    rpcUrl?: string;
+    jupApiKey?: string;
   };
 }
 
@@ -64,14 +66,17 @@ export interface BinanceAccountOptions {
   recvWindow?: number;
 }
 
-export interface JuplendAccountCredentials {
-  apiKey: string;
-}
-
-export interface JuplendAccountOptions {
-  walletAddress: string;
-  positionId?: string;
-}
+export type JuplendAccountOptions =
+  | {
+      walletAddress: string;
+      vaultId?: string;
+      positionId?: string;
+    }
+  | {
+      walletAddress?: string;
+      vaultId: string;
+      positionId: string;
+    };
 
 export interface RegisterCexAccountInput {
   accountId: string;
@@ -83,7 +88,7 @@ export interface RegisterCexAccountInput {
 export interface RegisterJuplendAccountInput {
   accountId: string;
   venue: "juplend";
-  credentials: JuplendAccountCredentials;
+  credentials?: AccountCredentials;
   options: JuplendAccountOptions;
 }