@steerprotocol/sdk 1.29.3 → 1.30.1

package/src/utils/SubgraphVaultClient.ts

@@ -7,6 +7,7 @@ import {
   SubgraphResponse,
   SubgraphVaultDetails,
   SubgraphVaultDetailsWithLpData,
+  SubgraphVaultPosition,
   VaultFetchOptions,
 } from './subgraph-types';
 
@@ -43,6 +44,14 @@ const FIND_ALL_VAULTS = (batchSize: number = 1000, timestamp?: string) => {
           admin
           executionBundle
         }
+        positions(first: 1, orderBy: timestamp, orderDirection: desc) {
+          id
+          upperTick
+          lowerTick
+          relativeWeight
+        }
+        fees0
+        fees1
         beaconName
         payloadIpfs
         deployer
@@ -78,6 +87,14 @@ const FIND_ALL_VAULTS = (batchSize: number = 1000, timestamp?: string) => {
         admin
         executionBundle
       }
+      positions(first: 1, orderBy: timestamp, orderDirection: desc) {
+        id
+        upperTick
+        lowerTick
+        relativeWeight
+      }
+      fees0
+      fees1
       beaconName
       payloadIpfs
       deployer
@@ -118,6 +135,14 @@ const FIND_ALL_VAULTS_BY_PROTOCOL = (
         totalLPTokensIssued
         createdAt
         feeTier
+        positions(first: 1, orderBy: timestamp, orderDirection: desc) {
+          id
+          upperTick
+          lowerTick
+          relativeWeight
+        }
+        fees0
+        fees1
         strategyToken {
           id
           name
@@ -162,6 +187,14 @@ const FIND_ALL_VAULTS_BY_PROTOCOL = (
         admin
         executionBundle
       }
+      positions(first: 1, orderBy: timestamp, orderDirection: desc) {
+        id
+        upperTick
+        lowerTick
+        relativeWeight
+      }
+      fees0
+      fees1
       beaconName
       payloadIpfs
       deployer
@@ -184,8 +217,10 @@ export class SubgraphVaultClient {
     chainId: number,
     aprMap: Map<string, number>
   ): VaultNode {
-    // Get the chain enum from chainId
     const feeApr = aprMap.get(vault.id) ? aprMap.get(vault.id) : undefined;
+
+    const tickRange = this.computeTickRange(vault.positions ?? []);
+
     return {
       id: vault.id,
       chainId,
@@ -195,8 +230,19 @@ export class SubgraphVaultClient {
       protocolBaseType: this.getProtocolBaseType(vault.beaconName),
       name: vault.name || '',
       feeApr: feeApr ? parseFloat(feeApr.toString()) : undefined,
-      stakingApr: undefined, // Not available in subgraph
-      merklApr: undefined, // Not available in subgraph
+      stakingApr: undefined,
+      merklApr: undefined,
+      positions: (vault.positions ?? []).map((p) => ({
+        id: p.id,
+        upperTick: parseInt(p.upperTick, 10),
+        lowerTick: parseInt(p.lowerTick, 10),
+        relativeWeight: p.relativeWeight,
+      })),
+      tickRange,
+      fees:
+        vault.fees0 !== undefined && vault.fees1 !== undefined
+          ? { fees0: vault.fees0, fees1: vault.fees1 }
+          : undefined,
       pool: {
         id: vault.pool,
         poolAddress: vault.pool,
@@ -209,7 +255,7 @@ export class SubgraphVaultClient {
       token0: {
         id: vault.token0,
         symbol: vault.token0Symbol,
-        name: vault.token0Symbol, // Using symbol as name since name is not available
+        name: vault.token0Symbol,
         decimals: parseInt(vault.token0Decimals),
         address: vault.token0,
         chainId,
@@ -217,7 +263,7 @@ export class SubgraphVaultClient {
       token1: {
         id: vault.token1,
         symbol: vault.token1Symbol,
-        name: vault.token1Symbol, // Using symbol as name since name is not available
+        name: vault.token1Symbol,
         decimals: parseInt(vault.token1Decimals),
         address: vault.token1,
         chainId,
@@ -225,6 +271,31 @@ export class SubgraphVaultClient {
     };
   }
 
+  /**
+   * Compute the tick range across all vault positions.
+   * Returns the minimum lowerTick and maximum upperTick, giving the full
+   * span of liquidity currently deployed by the vault strategy.
+   */
+  private computeTickRange(
+    positions: SubgraphVaultPosition[]
+  ): VaultNode['tickRange'] {
+    if (!positions.length) return undefined;
+
+    let minLowerTick = Infinity;
+    let maxUpperTick = -Infinity;
+
+    for (const pos of positions) {
+      const lower = parseInt(pos.lowerTick, 10);
+      const upper = parseInt(pos.upperTick, 10);
+      if (!isNaN(lower) && lower < minLowerTick) minLowerTick = lower;
+      if (!isNaN(upper) && upper > maxUpperTick) maxUpperTick = upper;
+    }
+
+    if (minLowerTick === Infinity || maxUpperTick === -Infinity) return undefined;
+
+    return { minLowerTick, maxUpperTick };
+  }
+
   /**
    * Get protocol base type from beacon name
    */
@@ -311,6 +382,10 @@ export class SubgraphVaultClient {
         await latestVaultResponse.json();
       let lastTimestamp = latestVaultData?.data?.vaults?.[0]?.createdAt;
 
+      if (!lastTimestamp) {
+        return [];
+      }
+
       let hasMoreData = true;
       while (hasMoreData) {
         const response = await fetch(subgraphUrl, {
@@ -334,6 +409,7 @@ export class SubgraphVaultClient {
 
         if (!vaults.length) {
           hasMoreData = false;
+          continue;
         }
 
         // Filter out duplicates based on vault ID
@@ -343,6 +419,7 @@ export class SubgraphVaultClient {
 
         if (!newVaults.length) {
           hasMoreData = false;
+          continue;
         }
 
         // For now, attach mock LP data to each vault
@@ -353,7 +430,12 @@ export class SubgraphVaultClient {
         }));
 
         allVaults.push(...vaultsWithLpData);
-        lastTimestamp = vaults[vaults.length - 1].createdAt;
+        const lastVaultTimestamp = vaults[vaults.length - 1]?.createdAt;
+        if (!lastVaultTimestamp) {
+          hasMoreData = false;
+          continue;
+        }
+        lastTimestamp = lastVaultTimestamp;
       }
 
       // Filter deprecated vaults if needed

package/src/utils/subgraph-types.ts

@@ -4,6 +4,13 @@ import { Address } from 'viem';
  * Types for Steer subgraph responses
  */
 
+export interface SubgraphVaultPosition {
+  id: string;
+  upperTick: string;
+  lowerTick: string;
+  relativeWeight: string;
+}
+
 export interface SubgraphVaultDetails {
   id: string;
   name: string;
@@ -31,6 +38,9 @@ export interface SubgraphVaultDetails {
     admin: string;
     executionBundle: string;
   };
+  positions: SubgraphVaultPosition[];
+  fees0: string;
+  fees1: string;
   beaconName: string;
   payloadIpfs: string;
   deployer: string;