@wireio/stake 0.5.1 → 0.6.0

package/lib/stake.browser.js

@@ -8013,8 +8013,31 @@ class DepositClient {
 }
 
 const INDEX_SCALE = BigInt(1e12);
-BigInt(1e8);
-const BPS$1 = BigInt(1e4);
+const USD_SCALE = BigInt(1e8);
+const BPS = BigInt(1e4);
+function growSupplyOnce$1(value, growthBps) {
+  const g = BigInt(growthBps);
+  return (value * (BPS + g) + BPS / BigInt(2)) / BPS;
+}
+function shrinkSupplyOnce$1(value, growthBps) {
+  const g = BigInt(growthBps);
+  return (value * BPS + (BPS + g) / BigInt(2)) / (BPS + g);
+}
+function priceStepUsd1e8(priceGrowthCents) {
+  if (!priceGrowthCents) return BigInt(0);
+  const CENT_SCALE = USD_SCALE / BigInt(100);
+  return BigInt(priceGrowthCents) * CENT_SCALE;
+}
+function growPriceOnceUsd1e8(value, priceGrowthCents) {
+  const step = priceStepUsd1e8(priceGrowthCents);
+  return value + step;
+}
+function shrinkPriceOnceUsd1e8(value, priceGrowthCents) {
+  const step = priceStepUsd1e8(priceGrowthCents);
+  if (step === BigInt(0)) return value;
+  if (value <= step) return BigInt(0);
+  return value - step;
+}
 function toBigint(x) {
   if (typeof x === "bigint") return x;
   if (typeof x === "number") return BigInt(x);
@@ -8027,14 +8050,6 @@ function tokensToShares(amount, currentIndex) {
   const r = num % currentIndex;
   return r === BigInt(0) ? q : q + BigInt(1);
 }
-function growOnce$1(value, growthBps) {
-  const g = BigInt(growthBps);
-  return (value * (BPS$1 + g) + BPS$1 / BigInt(2)) / BPS$1;
-}
-function shrinkOnce$1(value, growthBps) {
-  const g = BigInt(growthBps);
-  return (value * BPS$1 + (BPS$1 + g) / BigInt(2)) / (BPS$1 + g);
-}
 function buildSolanaTrancheLadder(options) {
   const {
     currentTranche,
@@ -8055,14 +8070,14 @@ function buildSolanaTrancheLadder(options) {
   for (let id = currentTranche + 1; id <= endId; id++) {
     const prevCap = capacity.get(id - 1);
     const prevPrice = price.get(id - 1);
-    capacity.set(id, growOnce$1(prevCap, supplyGrowthBps));
-    price.set(id, growOnce$1(prevPrice, priceGrowthCents));
+    capacity.set(id, growSupplyOnce$1(prevCap, supplyGrowthBps));
+    price.set(id, growPriceOnceUsd1e8(prevPrice, priceGrowthCents));
   }
   for (let id = currentTranche - 1; id >= startId; id--) {
     const nextCap = capacity.get(id + 1);
     const nextPrice = price.get(id + 1);
-    capacity.set(id, shrinkOnce$1(nextCap, supplyGrowthBps));
-    price.set(id, shrinkOnce$1(nextPrice, priceGrowthCents));
+    capacity.set(id, shrinkSupplyOnce$1(nextCap, supplyGrowthBps));
+    price.set(id, shrinkPriceOnceUsd1e8(nextPrice, priceGrowthCents));
   }
   const ladder = [];
   for (let id = startId; id <= endId; id++) {
@@ -8880,7 +8895,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 +8967,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 +9132,51 @@ 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();
+    const epochsPerYear = await this.getEpochsPerYearFromCluster();
+    const apyDecimal = Math.pow(1 + ratePerEpoch, epochsPerYear) - 1;
     const apyPercent = apyDecimal * 100;
     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);
+    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 +9298,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";
@@ -34781,22 +34833,22 @@ const ADDRESSES = {
   WithdrawalVault: "0xC82FAf3Fed135B70A7E797864F504819a98E96c4",
   StakingModule: "0xdd24EffAa4B42f3273E2b44995639119c08daBea",
   YieldOracle: "0x56A27E1d10d4aEc7402dC26693fb7c0Eb66eF802",
-  OutpostManagerAuthority: "0xAEcd2aa6EeFa4Aa7Cb9368728aA89Ca59Aa9ea59",
-  iodata: "0x2c2ab53F6Bc146bd31B459E832Ce0B9Da78712d8",
-  Base58: "0x9F188Ec124c9ad9bF6D195650d8360Fd052F585A",
-  sysio_merkle: "0x6eDA3C4c34421Cd667800C17fe33E48f5698e004",
-  ReceiptNFT: "0xd083051d9bb8353875abCecAB50C6e4FB5e527a8",
-  MockAggregator: "0xFCfc3ddd4CBd9Ad3b3af3A374B8bdA1b66eE6FFF",
-  Pool: "0xee5F11aC9b104c18d2423f266c5E737fC95ebA92",
-  OutpostManager: "0xB1B6ba7FA156652849069aC7ADB281283D235B9f",
-  sysio_write: "0xEfA608136d372349C09a7aA57665C09Fb4a620Ca",
-  EthUsdPriceConsumer: "0x6337A23b61f98b1526faF2848385Abe9cB4cFF21",
-  BAR: "0x9264eAA449da94caF70Fc18522021a94C8DF32Fb",
-  OPPCommon: "0x86A8cA16ce521De3EBdd1C541fAf188795b59FD0",
-  OPP: "0x79e8395Bb5131FB285aCEE5329BB43E66f50F88C",
-  Pretoken: "0x62f98AF2f9C3EF4eF2fA7bc0245BD5a9315E7541",
-  OPPInbound: "0xC85f57Ff069711e0b3472De3963bd2fC2FEfF3e2",
-  Depositor: "0xb0BACAb6f13dd96281300be13a6346461b2f35F3"
+  OutpostManagerAuthority: "0x57A3723B9f3C6022CAe394C859655E59382Fad18",
+  iodata: "0x88896d4fa70C3a7Fb833C80BB5763a4c53A6aCB5",
+  Base58: "0x0E9E6e8A32477F3B086Aaa26db2b928a816Da711",
+  sysio_merkle: "0xf5858B784B080A08063FAe06dB6d91c5BBAA48C7",
+  ReceiptNFT: "0xF1F5e063bFF6E0c09b0ac8020376E16c0be8eA10",
+  EthUsdPriceConsumer: "0xFdb3Ab290179CA85204aD1Ffb8c1c3c42AEB768F",
+  Pool: "0x15DaeB9562c6Dd21558f14CcdDf5C855499B8693",
+  OutpostManager: "0x1aCCc78FCA9e2Ea4dcE849bf072C2248f36435cC",
+  sysio_write: "0x513e472904EE67A8E27ebaF2411f3ed3851F4514",
+  Pretoken: "0xd7CDc79B90336720ecf02eD5A355cB0F7099F079",
+  BAR: "0x4A01414dEA81b1961aE986Bc4E95B30f73770f99",
+  OPPCommon: "0x3747Cc19A351BCBCE92055c419e7d710C4b399aA",
+  OPP: "0xF577FDc80014ef19DF258243e0551c888Da809E4",
+  Depositor: "0xD9Eb2A2d4e9eD7e2257153041B29DCeCDee8BCFe",
+  OPPInbound: "0x232C01f2528A5013af3703bE4B4ce30A793Ee8BD",
+  MockAggregator: "0xFCfc3ddd4CBd9Ad3b3af3A374B8bdA1b66eE6FFF"
 };
 const CONTRACTS = {
   LiqEthAuthority: {
@@ -34980,7 +35032,7 @@ class EthereumContractService {
   }
 }
 
-const BPS = BigInt(1e4);
+BigInt(1e4);
 function formatContractErrors(err) {
   if (err.errorName && err.errorArgs) {
     const errorObj = {
@@ -35050,20 +35102,27 @@ async function sendOPPFinalize(opp, gasLimit) {
     throw err;
   }
 }
-function growOnce(value, growthBps) {
+const BPS_DENOM = BigInt(1e4);
+const USD_ONCHAIN_SCALE = BigInt(1e18);
+const USD_CLIENT_SCALE = BigInt(1e8);
+const USD_SCALE_DOWN = USD_ONCHAIN_SCALE / USD_CLIENT_SCALE;
+function growSupplyOnce(value, growthBps) {
   const g = BigInt(growthBps);
-  return (value * (BPS + g) + BPS / BigInt(2)) / BPS;
+  return value * (BPS_DENOM + g) / BPS_DENOM;
 }
-function shrinkOnce(value, growthBps) {
+function shrinkSupplyOnce(value, growthBps) {
   const g = BigInt(growthBps);
-  return (value * BPS + (BPS + g) / BigInt(2)) / (BPS + g);
+  return value * BPS_DENOM / (BPS_DENOM + g);
 }
-function getTrancheSize(startSupply, supplyGrowthBps, trancheNumber) {
-  let supply = startSupply;
-  for (let i = 0; i < trancheNumber; i++) {
-    supply = (supply * (BPS + BigInt(supplyGrowthBps)) + BPS / BigInt(2)) / BPS;
-  }
-  return supply;
+function growPriceOnceUsd1e18(value, stepUsd1e18) {
+  return value + stepUsd1e18;
+}
+function shrinkPriceOnceUsd1e18(value, stepUsd1e18) {
+  if (value <= stepUsd1e18) return BigInt(0);
+  return value - stepUsd1e18;
+}
+function usd1e18To1e8(raw) {
+  return raw / USD_SCALE_DOWN;
 }
 function buildEthereumTrancheLadder(options) {
   const {
@@ -35071,29 +35130,32 @@ function buildEthereumTrancheLadder(options) {
     initialTrancheSupply,
     currentTrancheSupply,
     currentPriceUsd,
-    supplyGrowthBps,
     priceGrowthCents,
+    supplyGrowthBps,
     windowBefore = 5,
     windowAfter = 5
   } = options;
   const startId = Math.max(0, currentTranche - windowBefore);
   const endId = currentTranche + windowAfter;
-  const currentTrancheSize = getTrancheSize(initialTrancheSupply, supplyGrowthBps, currentTranche);
   const capacity =  new Map();
-  const price =  new Map();
-  capacity.set(currentTranche, currentTrancheSize);
-  price.set(currentTranche, currentPriceUsd);
+  const priceUsd =  new Map();
+  let currentCap = initialTrancheSupply;
+  for (let i = 0; i < currentTranche; i++) {
+    currentCap = growSupplyOnce(currentCap, supplyGrowthBps);
+  }
+  capacity.set(currentTranche, currentCap);
+  priceUsd.set(currentTranche, currentPriceUsd);
   for (let id = currentTranche + 1; id <= endId; id++) {
     const prevCap = capacity.get(id - 1);
-    const prevPrice = price.get(id - 1);
-    capacity.set(id, growOnce(prevCap, supplyGrowthBps));
-    price.set(id, growOnce(prevPrice, priceGrowthCents));
+    const prevPrice = priceUsd.get(id - 1);
+    capacity.set(id, growSupplyOnce(prevCap, supplyGrowthBps));
+    priceUsd.set(id, growPriceOnceUsd1e18(prevPrice, priceGrowthCents));
   }
   for (let id = currentTranche - 1; id >= startId; id--) {
     const nextCap = capacity.get(id + 1);
-    const nextPrice = price.get(id + 1);
-    capacity.set(id, shrinkOnce(nextCap, supplyGrowthBps));
-    price.set(id, shrinkOnce(nextPrice, priceGrowthCents));
+    const nextPrice = priceUsd.get(id + 1);
+    capacity.set(id, shrinkSupplyOnce(nextCap, supplyGrowthBps));
+    priceUsd.set(id, shrinkPriceOnceUsd1e18(nextPrice, priceGrowthCents));
   }
   const ladder = [];
   for (let id = startId; id <= endId; id++) {
@@ -35106,12 +35168,14 @@ function buildEthereumTrancheLadder(options) {
     } else {
       sold = BigInt(0);
     }
+    const remaining = cap - sold;
+    const priceClientScale = usd1e18To1e8(priceUsd.get(id));
     ladder.push({
       id,
       capacity: cap,
       sold,
-      remaining: cap - sold,
-      priceUsd: price.get(id)
+      remaining,
+      priceUsd: priceClientScale
     });
   }
   return ladder;
@@ -35127,7 +35191,7 @@ async function buildEthereumTrancheSnapshot(options) {
     indexBn,
     trancheNumberBn,
     currentTrancheSupply,
-    tranchePriceWadBn,
+    tranchePriceUsdBn,
     totalTrancheSupply,
     initialTrancheSupply,
     supplyGrowthBps,
@@ -35138,15 +35202,23 @@ async function buildEthereumTrancheSnapshot(options) {
   const totalShares = BigInt(totalSharesBn.toString()) / BigInt(1e10);
   const currentIndex = BigInt(indexBn.toString());
   const currentTranche = Number(trancheNumberBn.toString());
-  const currentPriceUsd = BigInt(tranchePriceWadBn.toString()) / BigInt(1e10);
+  const currentPriceUsd1e18 = BigInt(tranchePriceUsdBn.toString());
+  const priceGrowthStepUsd1e18 = BigInt(priceGrowthCents.toString());
+  const priceGrowthCentsNumber = Number(
+    priceGrowthStepUsd1e18 / BigInt(1e16)
+  );
+  const currentTrancheSupplyBig = BigInt(currentTrancheSupply.toString());
+  const totalTrancheSupplyBig = BigInt(totalTrancheSupply.toString());
+  const initialTrancheSupplyBig = BigInt(initialTrancheSupply.toString());
+  const currentPriceUsd = currentPriceUsd1e18 / BigInt(1e10);
   const ladder = buildEthereumTrancheLadder({
     currentTranche,
-    totalTrancheSupply,
-    initialTrancheSupply,
-    currentTrancheSupply,
-    currentPriceUsd,
+    totalTrancheSupply: totalTrancheSupplyBig,
+    initialTrancheSupply: initialTrancheSupplyBig,
+    currentTrancheSupply: currentTrancheSupplyBig,
+    currentPriceUsd: currentPriceUsd1e18,
+    priceGrowthCents: priceGrowthStepUsd1e18,
     supplyGrowthBps,
-    priceGrowthCents,
     windowBefore: ladderWindowBefore,
     windowAfter: ladderWindowAfter
   });
@@ -35157,10 +35229,10 @@ async function buildEthereumTrancheSnapshot(options) {
     currentTranche,
     currentPriceUsd,
     supplyGrowthBps,
-    priceGrowthCents,
-    currentTrancheSupply,
-    initialTrancheSupply,
-    totalPretokensSold: totalTrancheSupply,
+    priceGrowthCents: priceGrowthCentsNumber,
+    totalPretokensSold: totalTrancheSupplyBig,
+    currentTrancheSupply: currentTrancheSupplyBig,
+    initialTrancheSupply: initialTrancheSupplyBig,
     nativePriceUsd: ethPriceUsd,
     nativePriceTimestamp,
     ladder
@@ -35943,7 +36015,7 @@ class EthereumStakingClient {
     try {
       const blockNumber = await this.provider.getBlockNumber();
       const blockTag = { blockTag: blockNumber };
-      const [totalSharesBn, indexBn, trancheNumberBn, trancheSupplyBn, tranchePriceWadBn, totalSupplyBn, supplyGrowthBps, priceGrowthCents, minPriceUsd, maxPriceUsd] = await Promise.all([
+      const [totalSharesBn, indexBn, trancheNumberBn, trancheSupplyBn, tranchePriceUsdBn, totalSupplyBn, supplyGrowthBps, priceGrowthCents, minPriceUsd, maxPriceUsd] = await Promise.all([
         this.contract.Depositor.totalShares(blockTag),
         this.contract.Depositor.index(blockTag),
         this.contract.Pretoken.trancheNumber(blockTag),
@@ -35967,7 +36039,7 @@ class EthereumStakingClient {
         indexBn,
         trancheNumberBn,
         currentTrancheSupply,
-        tranchePriceWadBn,
+        tranchePriceUsdBn,
         totalTrancheSupply,
         initialTrancheSupply,
         supplyGrowthBps,
@@ -35980,7 +36052,6 @@ class EthereumStakingClient {
         ladderWindowAfter: windowAfter
       });
     } catch (err) {
-      console.log(err);
       throw new Error(`Error fetching Ethereum tranche snapshot: ${err?.message || err}`);
     }
   }
@@ -36046,6 +36117,7 @@ class Staker {
     if (!Array.isArray(config)) config = [config];
     config.forEach((cfg) => {
       switch (cfg.network.chainId) {
+        case SolChainID.Devnet:
         case SolChainID.WireTestnet:
           this.clients.set(cfg.network.chainId, new SolanaStakingClient(cfg));
           break;