@kehtus/proportion-sdk 0.1.0 → 0.1.1

package/src/account.ts

@@ -52,8 +52,6 @@ export class AccountModule {
         { ...contract, functionName: "subscriptionCancelled" },
         { ...contract, functionName: "pendingSubscriptionFee" },
         { ...contract, functionName: "apiWallet" },
-        { ...contract, functionName: "riskEngineWallet" },
-        { ...contract, functionName: "builderRiskEngineWallet" },
         { ...contract, functionName: "checkpointIndex" },
         { ...contract, functionName: "profitableDaysCount" },
         { ...contract, functionName: "totalCheckpoints" },
@@ -70,10 +68,10 @@ export class AccountModule {
       ],
     });
 
-    const checkpointIndex = results[16].result!;
-    const totalCp = results[18].result!;
-    const [profit, requestedAt] = results[22].result!;
-    const rawCheckpoints = results[28].result!;
+    const checkpointIndex = results[14].result!;
+    const totalCp = results[16].result!;
+    const profit = results[20].result! as bigint;
+    const rawCheckpoints = results[26].result!;
     const checkpoints = normalizeCheckpoints(rawCheckpoints, totalCp, checkpointIndex);
 
     return {
@@ -92,20 +90,18 @@ export class AccountModule {
       subscriptionCancelled: results[11].result!,
       pendingSubscriptionFee: results[12].result!,
       apiWallet: results[13].result!,
-      riskEngineWallet: results[14].result!,
-      builderRiskEngineWallet: results[15].result!,
       checkpointIndex,
-      profitableDaysCount: results[17].result!,
+      profitableDaysCount: results[15].result!,
       totalCheckpoints: totalCp,
-      lastCheckpointDay: results[19].result!,
-      closingInitiatedAt: Number(results[20].result!),
-      returnInitiatedAt: Number(results[21].result!),
-      pendingWithdrawal: { profit, requestedAt: Number(requestedAt) },
-      trailingFloor: results[23].result!,
-      dailyFloor: results[24].result!,
-      subscriptionFee: results[25].result!,
-      isSubscriptionActive: results[26].result!,
-      canWithdrawProfit: results[27].result!,
+      lastCheckpointDay: results[17].result!,
+      closingInitiatedAt: Number(results[18].result!),
+      returnInitiatedAt: Number(results[19].result!),
+      pendingWithdrawal: { profit },
+      trailingFloor: results[21].result!,
+      dailyFloor: results[22].result!,
+      subscriptionFee: results[23].result!,
+      isSubscriptionActive: results[24].result!,
+      canWithdrawProfit: results[25].result!,
       checkpoints,
     };
   }
@@ -174,13 +170,13 @@ export class AccountModule {
     return normalizeCheckpoints(all, Number(total), Number(checkpointIndex));
   }
 
-  async getPendingWithdrawal(account: Address): Promise<{ profit: bigint; requestedAt: number }> {
-    const result = await this.publicClient.readContract({
+  async getPendingWithdrawal(account: Address): Promise<{ profit: bigint }> {
+    const profit = await this.publicClient.readContract({
       address: account,
       abi: fundedAccountAbi,
       functionName: "pendingWithdrawal",
-    });
-    return { profit: result[0], requestedAt: Number(result[1]) };
+    }) as bigint;
+    return { profit };
   }
 
   async getAccountConfig(account: Address): Promise<{
@@ -243,14 +239,6 @@ export class AccountModule {
     });
   }
 
-  async cancelStuckWithdrawal(account: Address): Promise<Hash> {
-    return this.write({
-      address: account,
-      abi: fundedAccountAbi,
-      functionName: "cancelStuckWithdrawal",
-    });
-  }
-
   // ── PERMISSIONLESS WRITES ───────────────────────────
 
   async checkpoint(account: Address): Promise<Hash> {
@@ -294,6 +282,14 @@ export class AccountModule {
     });
   }
 
+  async bridgeToEvm(account: Address): Promise<Hash> {
+    return this.write({
+      address: account,
+      abi: fundedAccountAbi,
+      functionName: "bridgeToEvm",
+    });
+  }
+
   async finalizeReturn(account: Address): Promise<Hash> {
     return this.write({
       address: account,
@@ -326,14 +322,4 @@ export class AccountModule {
     });
   }
 
-  // ── RISK ENGINE WRITES ──────────────────────────────
-
-  async setRiskEngineWallet(account: Address, wallet: Address): Promise<Hash> {
-    return this.write({
-      address: account,
-      abi: fundedAccountAbi,
-      functionName: "setRiskEngineWallet",
-      args: [wallet],
-    });
-  }
 }

package/src/constants.ts

@@ -13,8 +13,9 @@ export const hyperEvm = {
 } as const satisfies Chain;
 
 export const ADDRESSES = {
-  MAIN_VAULT: "0x4478888dA8d22E275344C1A24BDEbcf2bfE2dc45",
-  FACTORY: "0xb7cE604a000CCFCe7c7DAfFBaefD26c33C86CE7A",
+  MAIN_VAULT: "0xA89F85eC9350e64295B199ee8011454d891e19B1",
+  FACTORY: "0xE056F0D2A476CCd9A24230C7DB7c9d6AF44a0161",
+  FORWARDER: "0x4fDc2489dE19BECC9FAeA59672F377bf740E4ecF",
   USDC: "0xb88339CB7199b77E23DB6E890353E22632Ba630f",
 } as const;
 
@@ -33,12 +34,12 @@ export const HYPE_FOR_GAS = 1_000_000_000_000_000n; // 0.001 ether
 
 // Decimals
 export const USDC_DECIMALS = 6;
-export const ACCOUNT_VALUE_DECIMALS = 8;
-export const DECIMALS_MULTIPLIER = 100n; // 6→8 dec
+export const ACCOUNT_VALUE_DECIMALS = 8; // spotBalance, spotSend
+export const DECIMALS_MULTIPLIER = 100n; // 6dec→8dec (used for spotSend conversion)
+// Note: accountValue, HWM, dayStartValue, floors are all 6dec (accountMarginSummary returns 6dec)
 
 // Time (seconds)
 export const SUBSCRIPTION_PERIOD = 30 * 86400;
-export const WITHDRAWAL_TIMEOUT = 7 * 86400;
 export const BRIDGE_DELAY = 30;
 export const CLOSING_TIMEOUT = 3 * 86400;
 export const CHECKPOINT_INTERVAL = 86400;

package/src/indexer.ts

@@ -43,7 +43,7 @@ export class IndexerModule {
 
   private static readonly PAGE_SIZE = 1000;
   private static readonly VAULT_FIELDS = `id address totalDeposits totalWithdrawals totalActivationFees cumulativeActivationFeesToVault totalAllocated totalShares cumulativeProfitShares cumulativeCancelledProfit cumulativeSubscriptionFees cumulativeProtocolFeesRouted cumulativeHypercoreFees cumulativeAccountGains cumulativeAccountLosses cumulativeRescuedFunds totalAccountsActivated totalAccountsActive totalAccountsClosed paused subscriptionFeeMultiplier protocolFeeBps protocolFeeReceiver updatedAt`;
-  private static readonly ACCOUNT_FIELDS = `id owner builder { id address vaultAddress } vaultAddress factoryAddress state accountSize drawdownBps dailyDrawdownEnabled activationFee highWaterMark profitableDaysCount lastCheckpointDay totalCheckpoints subscriptionPaidUntil subscriptionCancelled pendingSubscriptionFee subscriptionFeeMultiplier dayStartValue apiWallet riskEngineWallet builderRiskEngineWallet createdAt activatedAt closingInitiatedAt returnInitiatedAt closedAt returnedAmount breachType breachValue breachFloor closePendingSubFee closePendingProfit lastWithdrawalId updatedAt`;
+  private static readonly ACCOUNT_FIELDS = `id owner builder { id address vaultAddress } vaultAddress factoryAddress state accountSize drawdownBps dailyDrawdownEnabled activationFee highWaterMark profitableDaysCount lastCheckpointDay totalCheckpoints subscriptionPaidUntil subscriptionCancelled pendingSubscriptionFee subscriptionFeeMultiplier dayStartValue apiWallet createdAt activatedAt closingInitiatedAt returnInitiatedAt closedAt returnedAmount breachType breachValue breachFloor closePendingSubFee closePendingProfit lastWithdrawalId updatedAt`;
   private static readonly MAIN_VAULT_CONFIG_FIELDS = `id vaultAddress factoryAddress owner pendingOwner relayer paused protocolFeeReceiver feeMultiplier subscriptionFeeMultiplier dailyDdDiscountBps minBuilderShares builderLeverage protocolFeeBps minAccountSize maxAccountSize minDrawdownBps maxDrawdownBps maxUtilizationBps maxSingleAccountBps hypeForSpot maxCap createdAt updatedAt`;
   private static readonly FACTORY_CONFIG_FIELDS = `id factoryAddress vaultAddress owner pendingOwner createdAt updatedAt`;
   private static readonly CONFIG_CHANGE_FIELDS = `id contractAddress contractType field oldValue newValue blockNumber timestamp txHash`;

package/src/types.ts

@@ -58,7 +58,6 @@ export type IndexerAccountStateLabel =
 export type BreachType =
   | "TRAILING_DRAWDOWN"
   | "DAILY_DRAWDOWN"
-  | "LEVERAGE"
   | "POSITION_LEVERAGE"
   | "UNAUTHORIZED_ASSET"
   | "SUBSCRIPTION_EXPIRED";
@@ -123,15 +122,13 @@ export interface AccountDetails {
   subscriptionCancelled: boolean;
   pendingSubscriptionFee: bigint;
   apiWallet: Address;
-  riskEngineWallet: Address;
-  builderRiskEngineWallet: Address;
   checkpointIndex: number;
   totalCheckpoints: number;
   profitableDaysCount: number;
   lastCheckpointDay: bigint;
   closingInitiatedAt: number;
   returnInitiatedAt: number;
-  pendingWithdrawal: { profit: bigint; requestedAt: number };
+  pendingWithdrawal: { profit: bigint };
   trailingFloor: bigint;
   dailyFloor: bigint;
   subscriptionFee: bigint;
@@ -214,8 +211,6 @@ export interface GqlAccount {
   subscriptionFeeMultiplier: number;
   dayStartValue: string;
   apiWallet: string | null;
-  riskEngineWallet: string | null;
-  builderRiskEngineWallet: string | null;
   createdAt: string;
   activatedAt: string | null;
   closingInitiatedAt: string | null;

package/src/utils.ts

@@ -35,7 +35,7 @@ export function formatUsd(amount: bigint, dec: number = USDC_DECIMALS): string {
   return "$" + num.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
 
-// ── Drawdown ────────────────────────────────────────
+// ── Drawdown (all values in 6dec — matching on-chain HWM/dayStartValue) ──
 
 export function trailingFloor(hwm: bigint, drawdownBps: number): bigint {
   return hwm - (hwm * BigInt(drawdownBps)) / BPS;