@exponent-labs/exponent-fetcher 0.9.11 → 0.9.13

package/src/utils/ore.ts

@@ -3,12 +3,12 @@ import { web3 } from "@coral-xyz/anchor"
 import { MintLayout } from "@solana/spl-token"
 import Decimal from "decimal.js"
 
-// Steel's Numeric type is a u128 with 12 decimal places of precision
-const NUMERIC_DECIMAL_PLACES = 12
+// Steel's Numeric type is an I80F48 fixed-point number.
+const NUMERIC_SCALE = new Decimal(2).pow(48)
 
 /**
  * Represents a Numeric value from the steel crate
- * Steel's Numeric is a u128 (16 bytes) with 1e12 scaling factor
+ * Steel's Numeric is a signed 128-bit I80F48 value.
  */
 export interface Numeric {
   rawValue: BN // The raw u128 value
@@ -23,7 +23,7 @@ function deserializeNumeric(data: Buffer, offset: number): Numeric {
   const low = new BN(data.slice(offset, offset + 8), "le")
   const high = new BN(data.slice(offset + 8, offset + 16), "le")
   const rawValue = low.add(high.shln(64))
-  const decimalValue = new Decimal(rawValue.toString()).div(new Decimal(10).pow(NUMERIC_DECIMAL_PLACES))
+  const decimalValue = new Decimal(rawValue.toString()).div(NUMERIC_SCALE)
   return { rawValue, decimalValue }
 }
 
@@ -32,19 +32,13 @@ function deserializeNumeric(data: Buffer, offset: number): Numeric {
  * Matches the Rust struct in solana/libraries/ore_cpi/src/state/stake.rs
  */
 export interface Stake {
-  /// The authority of this miner account.
+  /// The authority of this staker account.
   authority: web3.PublicKey
   /// The balance of this stake account.
   balance: BN
-  /// Buffer a (placeholder)
-  bufferA: BN
-  /// Buffer b (placeholder)
-  bufferB: BN
-  /// Buffer c (placeholder)
-  bufferC: BN
-  /// Buffer d (placeholder)
-  bufferD: BN
-  /// The lamport reserve to pay fees for auto-compounding bots.
+  /// The lamport fee to pay for auto-compounding bots.
+  compoundFee: BN
+  /// The lamport reserve to pay auto-compounding fees.
   compoundFeeReserve: BN
   /// The timestamp of last claim.
   lastClaimAt: BN
@@ -58,8 +52,6 @@ export interface Stake {
   rewards: BN
   /// The total amount of ORE this staker has earned over its lifetime.
   lifetimeRewards: BN
-  /// Buffer f (placeholder)
-  bufferF: BN
 }
 
 /**
@@ -67,41 +59,25 @@ export interface Stake {
  * Matches the Rust struct in solana/libraries/ore_cpi/src/state/treasury.rs
  */
 export interface Treasury {
-  /// The amount of SOL collected for buy-bury operations.
-  balance: BN
-  /// Buffer a (placeholder)
-  bufferA: BN
-  /// The amount of ORE in the motherlode rewards pool.
-  motherlode: BN
-  /// The cumulative ORE distributed to miners, divided by the total unclaimed ORE at the time of distribution.
-  minerRewardsFactor: Numeric
   /// The cumulative ORE distributed to stakers, divided by the total stake at the time of distribution.
-  stakeRewardsFactor: Numeric
-  /// Buffer b (placeholder)
-  bufferB: BN
-  /// The current total amount of refined ORE mining rewards.
-  totalRefined: BN
+  rewardsFactor: Numeric
   /// The current total amount of ORE staking deposits.
   totalStaked: BN
-  /// The current total amount of unclaimed ORE mining rewards.
-  totalUnclaimed: BN
 }
 
 /**
  * Deserialize Stake account from Buffer
  * Skips the 8-byte steel discriminator and deserializes the struct fields
  *
- * Account layout (152 bytes total):
+ * Account layout (120 bytes total):
  * - discriminator: 8 bytes
  * - authority: 32 bytes
  * - balance: 8 bytes
- * - buffer_a through buffer_d: 32 bytes (4 x u64)
- * - compound_fee_reserve: 8 bytes
+ * - compound_fee, compound_fee_reserve: 16 bytes (2 x u64)
  * - last_claim_at, last_deposit_at, last_withdraw_at: 24 bytes (3 x i64)
- * - rewards_factor: 16 bytes (u128 Numeric)
+ * - rewards_factor: 16 bytes (I80F48 Numeric)
  * - rewards: 8 bytes
  * - lifetime_rewards: 8 bytes
- * - buffer_f: 8 bytes
  */
 function deserializeStakeAccount(stakeData: Buffer): Stake {
   const DISCRIMINATOR_SIZE = 8
@@ -115,20 +91,8 @@ function deserializeStakeAccount(stakeData: Buffer): Stake {
   const balance = new BN(stakeData.slice(offset, offset + 8), "le")
   offset += 8
 
-  // buffer_a: u64 (8 bytes)
-  const bufferA = new BN(stakeData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // buffer_b: u64 (8 bytes)
-  const bufferB = new BN(stakeData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // buffer_c: u64 (8 bytes)
-  const bufferC = new BN(stakeData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // buffer_d: u64 (8 bytes)
-  const bufferD = new BN(stakeData.slice(offset, offset + 8), "le")
+  // compound_fee: u64 (8 bytes)
+  const compoundFee = new BN(stakeData.slice(offset, offset + 8), "le")
   offset += 8
 
   // compound_fee_reserve: u64 (8 bytes)
@@ -147,7 +111,7 @@ function deserializeStakeAccount(stakeData: Buffer): Stake {
   const lastWithdrawAt = new BN(stakeData.slice(offset, offset + 8), "le")
   offset += 8
 
-  // rewards_factor: Numeric (16 bytes = u128)
+  // rewards_factor: Numeric (16 bytes = I80F48)
   const rewardsFactor = deserializeNumeric(stakeData, offset)
   offset += 16
 
@@ -157,18 +121,11 @@ function deserializeStakeAccount(stakeData: Buffer): Stake {
 
   // lifetime_rewards: u64 (8 bytes)
   const lifetimeRewards = new BN(stakeData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // buffer_f: u64 (8 bytes)
-  const bufferF = new BN(stakeData.slice(offset, offset + 8), "le")
 
   return {
     authority,
     balance,
-    bufferA,
-    bufferB,
-    bufferC,
-    bufferD,
+    compoundFee,
     compoundFeeReserve,
     lastClaimAt,
     lastDepositAt,
@@ -176,7 +133,6 @@ function deserializeStakeAccount(stakeData: Buffer): Stake {
     rewardsFactor,
     rewards,
     lifetimeRewards,
-    bufferF,
   }
 }
 
@@ -184,67 +140,25 @@ function deserializeStakeAccount(stakeData: Buffer): Stake {
  * Deserialize Treasury account from Buffer
  * Skips the 8-byte steel discriminator and deserializes the struct fields
  *
- * Account layout (96 bytes total):
+ * Account layout (32 bytes total):
  * - discriminator: 8 bytes
- * - balance: 8 bytes
- * - buffer_a: 8 bytes
- * - motherlode: 8 bytes
- * - miner_rewards_factor: 16 bytes (u128 Numeric)
- * - stake_rewards_factor: 16 bytes (u128 Numeric)
- * - buffer_b: 8 bytes
- * - total_refined: 8 bytes
+ * - rewards_factor: 16 bytes (I80F48 Numeric)
  * - total_staked: 8 bytes
- * - total_unclaimed: 8 bytes
  */
 function deserializeTreasuryAccount(treasuryData: Buffer): Treasury {
   const DISCRIMINATOR_SIZE = 8
   let offset = DISCRIMINATOR_SIZE
 
-  // balance: u64 (8 bytes)
-  const balance = new BN(treasuryData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // buffer_a: u64 (8 bytes)
-  const bufferA = new BN(treasuryData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // motherlode: u64 (8 bytes)
-  const motherlode = new BN(treasuryData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // miner_rewards_factor: Numeric (16 bytes = u128)
-  const minerRewardsFactor = deserializeNumeric(treasuryData, offset)
-  offset += 16
-
-  // stake_rewards_factor: Numeric (16 bytes = u128)
-  const stakeRewardsFactor = deserializeNumeric(treasuryData, offset)
+  // rewards_factor: Numeric (16 bytes = I80F48)
+  const rewardsFactor = deserializeNumeric(treasuryData, offset)
   offset += 16
 
-  // buffer_b: u64 (8 bytes)
-  const bufferB = new BN(treasuryData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // total_refined: u64 (8 bytes)
-  const totalRefined = new BN(treasuryData.slice(offset, offset + 8), "le")
-  offset += 8
-
   // total_staked: u64 (8 bytes)
   const totalStaked = new BN(treasuryData.slice(offset, offset + 8), "le")
-  offset += 8
-
-  // total_unclaimed: u64 (8 bytes)
-  const totalUnclaimed = new BN(treasuryData.slice(offset, offset + 8), "le")
 
   return {
-    balance,
-    bufferA,
-    motherlode,
-    minerRewardsFactor,
-    stakeRewardsFactor,
-    bufferB,
-    totalRefined,
+    rewardsFactor,
     totalStaked,
-    totalUnclaimed,
   }
 }
 
@@ -254,8 +168,8 @@ function deserializeTreasuryAccount(treasuryData: Buffer): Treasury {
  *
  * Exchange rate formula: (stake.balance + total_rewards) / stORE_supply
  *
- * Where total_rewards is calculated using ORE protocol's Stake::calculate_accrued_rewards:
- * 1. accumulated_rewards = treasury.stake_rewards_factor - stake.rewards_factor
+ * Where total_rewards is calculated using ORE protocol's Stake::update_rewards:
+ * 1. accumulated_rewards = treasury.rewards_factor - stake.rewards_factor
  * 2. personal_rewards = accumulated_rewards * stake.balance
  * 3. total_rewards = stake.rewards + personal_rewards
  *
@@ -265,8 +179,7 @@ function deserializeTreasuryAccount(treasuryData: Buffer): Treasury {
  * the exchange rate. The stake.balance is only updated via ORE program
  * deposit/withdraw instructions.
  *
- * Note: Numeric values are stored as fixed-point numbers with 1e12 precision.
- * When multiplying two Numeric values, the result is divided by 1e12 to maintain scale.
+ * Note: Numeric values are stored as I80F48 fixed-point numbers.
  */
 export function calculateOreExchangeRate(accounts: {
   stakeAccount: Buffer
@@ -291,22 +204,19 @@ export function calculateOreExchangeRate(accounts: {
   // This prevents exchange rate manipulation via direct token transfers
   const stakeBalance = stake.balance.toNumber()
 
-  // Calculate accrued rewards using ORE protocol's calculate_accrued_rewards algorithm
-  // This mirrors the exact logic from Stake::calculate_accrued_rewards() in ore_cpi
-  const treasuryStakeRewardsFactorDecimal = treasury.stakeRewardsFactor.decimalValue
+  // Calculate accrued rewards using ORE protocol's update_rewards algorithm
+  // This mirrors the exact logic from Stake::update_rewards() in ore_cpi
+  const treasuryRewardsFactorDecimal = treasury.rewardsFactor.decimalValue
   const stakeRewardsFactorDecimal = stake.rewardsFactor.decimalValue
 
   let newlyAccruedRewards = 0
-  if (treasuryStakeRewardsFactorDecimal.gt(stakeRewardsFactorDecimal)) {
-    // accumulated_rewards = treasury.stake_rewards_factor - stake.rewards_factor
-    const accumulatedRewards = treasuryStakeRewardsFactorDecimal.minus(stakeRewardsFactorDecimal)
+  if (treasuryRewardsFactorDecimal.gt(stakeRewardsFactorDecimal)) {
+    // accumulated_rewards = treasury.rewards_factor - stake.rewards_factor
+    const accumulatedRewards = treasuryRewardsFactorDecimal.minus(stakeRewardsFactorDecimal)
 
     // personal_rewards = accumulated_rewards * stake.balance
-    // In Rust: accumulated_rewards (as Numeric) * Numeric::from_u64(stake.balance)
-    // The Numeric type uses 1e12 scaling internally. When multiplying two Numerics,
-    // the result is (a * b) / 1e12 to maintain scale. Then to_u64() divides by 1e12.
-    // Since decimalValue already gives us the decimal representation (divided by 1e12),
-    // we just multiply by balance and floor the result.
+    // Since decimalValue already gives us the decoded fixed-point value, we just
+    // multiply by balance and floor the result.
     const personalRewards = accumulatedRewards.mul(new Decimal(stakeBalance))
     newlyAccruedRewards = Math.floor(personalRewards.toNumber())
   }
@@ -318,5 +228,9 @@ export function calculateOreExchangeRate(accounts: {
   const totalBalanceWithRewards = stakeBalance + totalRewards
 
   // Calculate exchange rate: (stake.balance + accrued_rewards) / stORE_supply
+  if (totalBalanceWithRewards === 0) {
+    return 1
+  }
+
   return totalBalanceWithRewards / storeSupply
 }

package/src/utils/solstice.ts

@@ -1,4 +1,5 @@
 import { decodeYieldPoolAndVestingScheduleAccounts } from "@exponent-labs/solstice-idl"
+import { AccountLayout, MintLayout } from "@solana/spl-token"
 
 export function calculateSolsticeRedemptionRate(accounts: { yieldPool: Buffer; vestingSchedule: Buffer }): {
   redemptionRate: number
@@ -49,3 +50,29 @@ export function calculateSolsticeRedemptionRate(accounts: { yieldPool: Buffer; v
     totalVestedAssets: totalVestedAssets.toString(),
   }
 }
+
+/**
+ * Calculates the Solstice GLAM vault stSLX exchange rate using the same account
+ * layout and ratio as the Generic Standard on-chain interface.
+ */
+export function calculateSolsticeGlamVaultExchangeRate(accounts: {
+  stakingVaultSlxAta: Buffer
+  slxMint: Buffer
+  stslxMint: Buffer
+}): number {
+  const stakingVaultSlxAccount = AccountLayout.decode(accounts.stakingVaultSlxAta.subarray(0, AccountLayout.span))
+  const slxMint = MintLayout.decode(accounts.slxMint.subarray(0, MintLayout.span))
+  const stslxMint = MintLayout.decode(accounts.stslxMint.subarray(0, MintLayout.span))
+
+  const stakingVaultSlxBalance = BigInt(stakingVaultSlxAccount.amount.toString())
+  const stslxSupply = BigInt(stslxMint.supply.toString())
+
+  if (stakingVaultSlxBalance === 0n || stslxSupply === 0n) {
+    return 1
+  }
+
+  const numerator = stakingVaultSlxBalance * 10n ** BigInt(stslxMint.decimals)
+  const denominator = stslxSupply * 10n ** BigInt(slxMint.decimals)
+
+  return Number(numerator) / Number(denominator)
+}