@wireio/stake 0.5.1 → 0.5.2

package/lib/stake.browser.js

@@ -8880,7 +8880,7 @@ class TokenClient {
 
 const commitment = "confirmed";
 const SCALE = new BN("1000000000000");
-class SolanaStakingClient {
+const _SolanaStakingClient = class _SolanaStakingClient {
   constructor(config) {
     this.config = config;
     const adapter = config.provider;
@@ -8952,6 +8952,7 @@ class SolanaStakingClient {
     this.leaderboardClient = new LeaderboardClient(this.anchor);
     this.outpostClient = new OutpostClient(this.anchor);
     this.tokenClient = new TokenClient(this.anchor);
+    this.program = new SolanaProgramService(this.anchor);
   }
   get solPubKey() {
     if (!this.pubKey) throw new Error("pubKey is undefined");
@@ -9116,17 +9117,57 @@ class SolanaStakingClient {
     return this.distributionClient.getUserRecord(this.solPubKey);
   }
   async getSystemAPY() {
-    const avgPayRate = await this.distributionClient.getAverageScaledPayRate(5);
-    if (avgPayRate.isZero()) {
-      return 0;
-    }
-    const SCALE2 = new BN("1000000000000");
-    const EPOCHS_PER_YEAR = 365;
-    const ratePerPeriod = avgPayRate.toNumber() / SCALE2.toNumber();
-    const apyDecimal = ratePerPeriod * EPOCHS_PER_YEAR;
+    const ratePerEpoch = await this.getEpochRateDecimalFromProgram();
+    console.log("epochRateDecimal", ratePerEpoch);
+    const epochsPerYear = await this.getEpochsPerYearFromCluster();
+    console.log("epochsPerYear", epochsPerYear);
+    const apyDecimal = Math.pow(1 + ratePerEpoch, epochsPerYear) - 1;
+    console.log("apyDecimal", apyDecimal);
     const apyPercent = apyDecimal * 100;
+    console.log("apyPercent", apyPercent);
     return apyPercent;
   }
+  async getEpochRateDecimalFromProgram() {
+    const liqSolCoreProgram = this.program.getProgram("liqsolCore");
+    const stakeMetricsPda = deriveStakeMetricsPda();
+    const stakeMetrics = await liqSolCoreProgram.account.stakeMetrics.fetch(stakeMetricsPda);
+    const raw = BigInt(stakeMetrics.solSystemPayRate.toString());
+    const rateDecimal = Number(raw) / Number(PAY_RATE_SCALE_FACTOR);
+    console.log("solSystemPayRate(raw)", raw.toString());
+    console.log("epochRateDecimal(computed)", rateDecimal);
+    return rateDecimal;
+  }
+  async getEpochsPerYearFromCluster() {
+    const now = Date.now();
+    if (this.epochsPerYearCache && now - this.epochsPerYearCache.fetchedAt < _SolanaStakingClient.EPOCHS_PER_YEAR_TTL_MS) {
+      return this.epochsPerYearCache.value;
+    }
+    const connection = this.anchor.connection;
+    const samples = await connection.getRecentPerformanceSamples(
+      60
+    );
+    if (!samples.length) {
+      throw new Error("No performance samples available from cluster");
+    }
+    const totalSlots = samples.reduce((acc, s) => acc + s.numSlots, 0);
+    const totalSecs = samples.reduce((acc, s) => acc + s.samplePeriodSecs, 0);
+    if (totalSecs === 0) {
+      throw new Error(
+        "Cluster returned zero samplePeriodSecs in performance samples"
+      );
+    }
+    const slotsPerSecond = totalSlots / totalSecs;
+    const epochInfo = await connection.getEpochInfo();
+    const slotsPerEpoch = epochInfo.slotsInEpoch;
+    const secondsPerEpoch = slotsPerEpoch / slotsPerSecond;
+    const secondsPerYear = 365 * 24 * 60 * 60;
+    const epochsPerYear = secondsPerYear / secondsPerEpoch;
+    this.epochsPerYearCache = {
+      value: epochsPerYear,
+      fetchedAt: now
+    };
+    return epochsPerYear;
+  }
   async getDepositFee(amountLamports, windowSize = 5) {
     if (amountLamports <= BigInt(0)) {
       return BigInt(0);
@@ -9248,7 +9289,9 @@ class SolanaStakingClient {
       );
     }
   }
-}
+};
+_SolanaStakingClient.EPOCHS_PER_YEAR_TTL_MS = 10 * 60 * 1e3;
+let SolanaStakingClient = _SolanaStakingClient;
 
 var _format$q = "hh-sol-artifact-1";
 var contractName$q = "Accounting";
@@ -36046,7 +36089,7 @@ class Staker {
     if (!Array.isArray(config)) config = [config];
     config.forEach((cfg) => {
       switch (cfg.network.chainId) {
-        case SolChainID.WireTestnet:
+        case SolChainID.Devnet:
           this.clients.set(cfg.network.chainId, new SolanaStakingClient(cfg));
           break;
         case EvmChainID.Hoodi: