@1delta/margin-fetcher 0.0.314 → 0.0.316

package/dist/index.js

@@ -32839,6 +32839,67 @@ var hastraPrimeFetcher = {
     return { [HASTRA_PRIME_KEY]: Math.max(0, apr) };
   }
 };
+var CHAIN_ID4 = "4663";
+var VAULT2 = "0xde770c84fe66e063336b31737cfe9790f18c4087";
+var SPARK_SAVINGS_USDG_KEY = "SPUSDG";
+var RAY3 = 10n ** 27n;
+var YEAR_SECONDS6 = 365 * 24 * 60 * 60;
+var WINDOW_BLOCKS3 = 400000n;
+var MAX_RPC_TRIES3 = 3;
+var CHI_ABI = [
+  {
+    name: "chi",
+    type: "function",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ type: "uint256" }]
+  }
+];
+var readChiAt = (client, blockNumber) => client.readContract({
+  address: VAULT2,
+  abi: CHI_ABI,
+  functionName: "chi",
+  ...blockNumber !== void 0 ? { blockNumber } : {}
+});
+var computeApr4 = async () => {
+  let lastErr;
+  for (let rpcId = 0; rpcId < MAX_RPC_TRIES3; rpcId++) {
+    try {
+      const client = getEvmClient(CHAIN_ID4, rpcId);
+      const head = await client.getBlockNumber();
+      const pastBlock = head > WINDOW_BLOCKS3 ? head - WINDOW_BLOCKS3 : 0n;
+      const [chiNow, chiThen, headBlock, thenBlock] = await Promise.all([
+        readChiAt(client),
+        readChiAt(client, pastBlock),
+        client.getBlock({ blockNumber: head }),
+        client.getBlock({ blockNumber: pastBlock })
+      ]);
+      if (chiNow < RAY3 || chiThen < RAY3 || chiNow < chiThen) {
+        throw new Error(
+          `non-archival or invalid chi (now=${chiNow}, then=${chiThen})`
+        );
+      }
+      const elapsed = Number(headBlock.timestamp - thenBlock.timestamp);
+      if (elapsed <= 0) throw new Error("non-positive elapsed window");
+      const growth = Number(chiNow - chiThen) / Number(chiThen);
+      const apr = growth * (YEAR_SECONDS6 / elapsed) * 100;
+      if (!Number.isFinite(apr) || apr < 0) throw new Error(`bad apr ${apr}`);
+      return apr;
+    } catch (e) {
+      lastErr = e;
+    }
+  }
+  throw new Error(
+    `spUSDG APR: no Robinhood RPC returned valid historical chi (${String(lastErr)})`
+  );
+};
+var sparkSavingsUsdgFetcher = {
+  label: "SPARK_SAVINGS_USDG",
+  fetch: async () => {
+    const apr = await computeApr4();
+    return { [SPARK_SAVINGS_USDG_KEY]: apr };
+  }
+};
 
 // src/yields/intrinsic/fetchers/lombard.ts
 var LBTC_APY_URL = "https://mainnet.prod.lombard.finance/api/v1/analytics/estimated-apy";
@@ -33035,6 +33096,7 @@ async function fetchIntrinsicYields() {
     psxdcFetcher,
     coreLstFetcher,
     hastraPrimeFetcher,
+    sparkSavingsUsdgFetcher,
     lombardLbtcFetcher,
     lombardLbtcvFetcher,
     accountableFetcher,
@@ -38496,14 +38558,14 @@ var fetchEulerEarnVaults = async (chainId, prices = {}, tokenList = {}, multical
   ).catch(() => void 0);
   return isNonEmpty(fromSubgraph) ? fromSubgraph : fromApi ?? {};
 };
-var CHAIN_ID4 = "1";
+var CHAIN_ID5 = "1";
 var SWBTC = "0x8db2350d78abc13f5673a411d4700bcf87864dde";
 var ONE_E8 = 10n ** 8n;
-var YEAR_SECONDS6 = 365 * 24 * 60 * 60;
+var YEAR_SECONDS7 = 365 * 24 * 60 * 60;
 var WINDOW_SECONDS4 = 7 * 24 * 60 * 60;
 var BLOCK_TIME_SECONDS3 = 12;
-var WINDOW_BLOCKS3 = BigInt(Math.floor(WINDOW_SECONDS4 / BLOCK_TIME_SECONDS3));
-var MAX_RPC_TRIES3 = 5;
+var WINDOW_BLOCKS4 = BigInt(Math.floor(WINDOW_SECONDS4 / BLOCK_TIME_SECONDS3));
+var MAX_RPC_TRIES4 = 5;
 var CONVERT_TO_ASSETS_ABI3 = [
   {
     name: "convertToAssets",
@@ -38520,13 +38582,13 @@ var readRateAt3 = (client, blockNumber) => client.readContract({
   args: [ONE_E8],
   ...blockNumber !== void 0 ? { blockNumber } : {}
 });
-var computeApr4 = async () => {
+var computeApr5 = async () => {
   let lastErr;
-  for (let rpcId = 0; rpcId < MAX_RPC_TRIES3; rpcId++) {
+  for (let rpcId = 0; rpcId < MAX_RPC_TRIES4; rpcId++) {
     try {
-      const client = getEvmClient(CHAIN_ID4, rpcId);
+      const client = getEvmClient(CHAIN_ID5, rpcId);
       const head = await client.getBlockNumber();
-      const pastBlock = head > WINDOW_BLOCKS3 ? head - WINDOW_BLOCKS3 : 0n;
+      const pastBlock = head > WINDOW_BLOCKS4 ? head - WINDOW_BLOCKS4 : 0n;
       const [rateNow, rateThen, headBlock, thenBlock] = await Promise.all([
         readRateAt3(client),
         readRateAt3(client, pastBlock),
@@ -38541,7 +38603,7 @@ var computeApr4 = async () => {
       const elapsed = Number(headBlock.timestamp - thenBlock.timestamp);
       if (elapsed <= 0) throw new Error(`bad elapsed ${elapsed}`);
       const growth = Number(rateNow) / Number(rateThen) - 1;
-      const apr = growth * (YEAR_SECONDS6 / elapsed) * 100;
+      const apr = growth * (YEAR_SECONDS7 / elapsed) * 100;
       if (!Number.isFinite(apr) || apr < 0) throw new Error(`bad apr ${apr}`);
       return apr;
     } catch (e) {
@@ -38556,20 +38618,20 @@ var swBtcFetcher = {
   label: "SWBTC",
   fetch: async () => {
     try {
-      return { SWBTC: await computeApr4() };
+      return { SWBTC: await computeApr5() };
     } catch {
       return { SWBTC: 0 };
     }
   }
 };
-var CHAIN_ID5 = "42220";
+var CHAIN_ID6 = "42220";
 var MANAGER = "0x0239b96d10a434a56cc9e09383077a0490cf9398";
 var ONE_E184 = 10n ** 18n;
-var YEAR_SECONDS7 = 365 * 24 * 60 * 60;
+var YEAR_SECONDS8 = 365 * 24 * 60 * 60;
 var WINDOW_SECONDS5 = 7 * 24 * 60 * 60;
 var BLOCK_TIME_SECONDS4 = 1;
-var WINDOW_BLOCKS4 = BigInt(Math.floor(WINDOW_SECONDS5 / BLOCK_TIME_SECONDS4));
-var MAX_RPC_TRIES4 = 5;
+var WINDOW_BLOCKS5 = BigInt(Math.floor(WINDOW_SECONDS5 / BLOCK_TIME_SECONDS4));
+var MAX_RPC_TRIES5 = 5;
 var TO_CELO_ABI = [
   {
     name: "toCelo",
@@ -38586,13 +38648,13 @@ var readRateAt4 = (client, blockNumber) => client.readContract({
   args: [ONE_E184],
   ...blockNumber !== void 0 ? { blockNumber } : {}
 });
-var computeApr5 = async () => {
+var computeApr6 = async () => {
   let lastErr;
-  for (let rpcId = 0; rpcId < MAX_RPC_TRIES4; rpcId++) {
+  for (let rpcId = 0; rpcId < MAX_RPC_TRIES5; rpcId++) {
     try {
-      const client = getEvmClient(CHAIN_ID5, rpcId);
+      const client = getEvmClient(CHAIN_ID6, rpcId);
       const head = await client.getBlockNumber();
-      const pastBlock = head > WINDOW_BLOCKS4 ? head - WINDOW_BLOCKS4 : 0n;
+      const pastBlock = head > WINDOW_BLOCKS5 ? head - WINDOW_BLOCKS5 : 0n;
       const [rateNow, rateThen, headBlock, thenBlock] = await Promise.all([
         readRateAt4(client),
         readRateAt4(client, pastBlock),
@@ -38607,7 +38669,7 @@ var computeApr5 = async () => {
       const elapsed = Number(headBlock.timestamp - thenBlock.timestamp);
       if (elapsed <= 0) throw new Error("non-positive elapsed window");
       const growth = Number(rateNow - rateThen) / Number(rateThen);
-      const apr = growth * (YEAR_SECONDS7 / elapsed) * 100;
+      const apr = growth * (YEAR_SECONDS8 / elapsed) * 100;
       if (!Number.isFinite(apr) || apr < 0) throw new Error(`bad apr ${apr}`);
       return apr;
     } catch (e) {
@@ -38621,18 +38683,18 @@ var computeApr5 = async () => {
 var stceloFetcher = {
   label: "STCELO",
   fetch: async () => {
-    const apr = await computeApr5();
+    const apr = await computeApr6();
     return { STCELO: apr };
   }
 };
-var CHAIN_ID6 = "1284";
+var CHAIN_ID7 = "1284";
 var STDOT = "0xbc7e02c4178a7df7d3e564323a5c359dc96c4db4";
 var ONE_E185 = 10n ** 18n;
-var YEAR_SECONDS8 = 365 * 24 * 60 * 60;
+var YEAR_SECONDS9 = 365 * 24 * 60 * 60;
 var WINDOW_SECONDS6 = 180 * 24 * 60 * 60;
 var BLOCK_TIME_SECONDS5 = 6;
-var WINDOW_BLOCKS5 = BigInt(Math.floor(WINDOW_SECONDS6 / BLOCK_TIME_SECONDS5));
-var MAX_RPC_TRIES5 = 5;
+var WINDOW_BLOCKS6 = BigInt(Math.floor(WINDOW_SECONDS6 / BLOCK_TIME_SECONDS5));
+var MAX_RPC_TRIES6 = 5;
 var POOLED_BY_SHARES_ABI = [
   {
     name: "getPooledTokenByShares",
@@ -38649,13 +38711,13 @@ var readRateAt5 = (client, blockNumber) => client.readContract({
   args: [ONE_E185],
   ...blockNumber !== void 0 ? { blockNumber } : {}
 });
-var computeApr6 = async () => {
+var computeApr7 = async () => {
   let lastErr;
-  for (let rpcId = 0; rpcId < MAX_RPC_TRIES5; rpcId++) {
+  for (let rpcId = 0; rpcId < MAX_RPC_TRIES6; rpcId++) {
     try {
-      const client = getEvmClient(CHAIN_ID6, rpcId);
+      const client = getEvmClient(CHAIN_ID7, rpcId);
       const head = await client.getBlockNumber();
-      const pastBlock = head > WINDOW_BLOCKS5 ? head - WINDOW_BLOCKS5 : 0n;
+      const pastBlock = head > WINDOW_BLOCKS6 ? head - WINDOW_BLOCKS6 : 0n;
       const [rateNow, rateThen, headBlock, thenBlock] = await Promise.all([
         readRateAt5(client),
         readRateAt5(client, pastBlock),
@@ -38670,7 +38732,7 @@ var computeApr6 = async () => {
       const elapsed = Number(headBlock.timestamp - thenBlock.timestamp);
       if (elapsed <= 0) throw new Error("non-positive elapsed window");
       const growth = Number(rateNow - rateThen) / Number(rateThen);
-      const apr = growth * (YEAR_SECONDS8 / elapsed) * 100;
+      const apr = growth * (YEAR_SECONDS9 / elapsed) * 100;
       if (!Number.isFinite(apr) || apr < 0) throw new Error(`bad apr ${apr}`);
       return apr;
     } catch (e) {
@@ -38684,7 +38746,7 @@ var computeApr6 = async () => {
 var stDotFetcher = {
   label: "STDOT",
   fetch: async () => {
-    const apr = await computeApr6();
+    const apr = await computeApr7();
     return { STDOT: apr };
   }
 };
@@ -44946,67 +45008,6 @@ var readerErc46262 = (entry) => {
 
 // src/vaults/savings/readers/index.ts
 var buildReader2 = (entry) => readerErc46262(entry);
-var CHAIN_ID7 = "4663";
-var VAULT2 = "0xde770c84fe66e063336b31737cfe9790f18c4087";
-var SPARK_SAVINGS_USDG_KEY = "SPUSDG";
-var RAY3 = 10n ** 27n;
-var YEAR_SECONDS9 = 365 * 24 * 60 * 60;
-var WINDOW_BLOCKS6 = 400000n;
-var MAX_RPC_TRIES6 = 3;
-var CHI_ABI = [
-  {
-    name: "chi",
-    type: "function",
-    stateMutability: "view",
-    inputs: [],
-    outputs: [{ type: "uint256" }]
-  }
-];
-var readChiAt = (client, blockNumber) => client.readContract({
-  address: VAULT2,
-  abi: CHI_ABI,
-  functionName: "chi",
-  ...blockNumber !== void 0 ? { blockNumber } : {}
-});
-var computeApr7 = async () => {
-  let lastErr;
-  for (let rpcId = 0; rpcId < MAX_RPC_TRIES6; rpcId++) {
-    try {
-      const client = getEvmClient(CHAIN_ID7, rpcId);
-      const head = await client.getBlockNumber();
-      const pastBlock = head > WINDOW_BLOCKS6 ? head - WINDOW_BLOCKS6 : 0n;
-      const [chiNow, chiThen, headBlock, thenBlock] = await Promise.all([
-        readChiAt(client),
-        readChiAt(client, pastBlock),
-        client.getBlock({ blockNumber: head }),
-        client.getBlock({ blockNumber: pastBlock })
-      ]);
-      if (chiNow < RAY3 || chiThen < RAY3 || chiNow < chiThen) {
-        throw new Error(
-          `non-archival or invalid chi (now=${chiNow}, then=${chiThen})`
-        );
-      }
-      const elapsed = Number(headBlock.timestamp - thenBlock.timestamp);
-      if (elapsed <= 0) throw new Error("non-positive elapsed window");
-      const growth = Number(chiNow - chiThen) / Number(chiThen);
-      const apr = growth * (YEAR_SECONDS9 / elapsed) * 100;
-      if (!Number.isFinite(apr) || apr < 0) throw new Error(`bad apr ${apr}`);
-      return apr;
-    } catch (e) {
-      lastErr = e;
-    }
-  }
-  throw new Error(
-    `spUSDG APR: no Robinhood RPC returned valid historical chi (${String(lastErr)})`
-  );
-};
-var sparkSavingsUsdgFetcher = {
-  label: "SPARK_SAVINGS_USDG",
-  fetch: async () => {
-    const apr = await computeApr7();
-    return { [SPARK_SAVINGS_USDG_KEY]: apr };
-  }
-};
 
 // src/vaults/savings/registry.ts
 var stUsdGroup = {