@1delta/margin-fetcher 0.0.312 → 0.0.314

package/dist/index.js

@@ -24668,9 +24668,9 @@ var MULTICALL_ADDRESS = {
 // src/utils/multicall.ts
 var { isArray } = lodash;
 var maxRetries = 3;
-var multicallViemAbiArray = async (chainId, abi, calls, getEvmClient16, retry = true, providerId = 0, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false) => {
+var multicallViemAbiArray = async (chainId, abi, calls, getEvmClient17, retry = true, providerId = 0, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false) => {
   try {
-    const provider = getEvmClient16(chainId, providerId);
+    const provider = getEvmClient17(chainId, providerId);
     const abiIsArray = isArray(abi[0]);
     const returnData = await provider.multicall({
       allowFailure,
@@ -24696,7 +24696,7 @@ var multicallViemAbiArray = async (chainId, abi, calls, getEvmClient16, retry =
       chainId,
       abi,
       calls,
-      getEvmClient16,
+      getEvmClient17,
       retry,
       providerId,
       retries,
@@ -24706,13 +24706,13 @@ var multicallViemAbiArray = async (chainId, abi, calls, getEvmClient16, retry =
     );
   }
 };
-var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient16, poolSize, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false) => {
+var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient17, poolSize, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false) => {
   if (poolSize <= 1) {
     return multicallViemAbiArray(
       chainId,
       abi,
       calls,
-      getEvmClient16,
+      getEvmClient17,
       true,
       0,
       retries,
@@ -24735,7 +24735,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient16, poolS
   const results = new Array(contracts.length);
   const runBatch = async (batch, rpcId, attemptsLeft, size) => {
     try {
-      const provider = getEvmClient16(chainId, rpcId);
+      const provider = getEvmClient17(chainId, rpcId);
       const returnData = await provider.multicall({
         allowFailure,
         batchSize: size,
@@ -29362,7 +29362,7 @@ function unflattenLenderData(pools) {
   }
   return result;
 }
-var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient16, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false, concurrency = 1) => {
+var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient17, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false, concurrency = 1) => {
   const queries = organizeUserQueries(queriesRaw);
   const builtCalls = await Promise.all(
     queries.map(async (query3) => {
@@ -29372,7 +29372,7 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient16, allowF
         query3.lender,
         query3.account,
         query3.params,
-        getEvmClient16
+        getEvmClient17
       );
       return callData.map((call) => ({ call, abi: call.abi ?? abi }));
     })
@@ -29382,7 +29382,7 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient16, allowF
     chainId,
     calls.map((call) => call.abi),
     calls.map((call) => call.call),
-    getEvmClient16,
+    getEvmClient17,
     concurrency,
     retries,
     allowFailure,
@@ -38372,15 +38372,15 @@ async function getJson(url) {
     clearTimeout(timer);
   }
 }
-function mapApiDetail(d, chainId, prices, tokenList) {
+function mapApiDetail(d, chainId, prices, tokenList, shareDecimalsByVault) {
   const address = (d.address ?? "").toLowerCase();
   const underlying = (d.asset?.address ?? "").toLowerCase();
   if (!address || !underlying) return null;
   const assetMeta = tokenList[underlying];
-  const decimals = Number(d.decimals ?? d.asset?.decimals ?? 18);
   const assetDecimals = Number(
-    d.asset?.decimals ?? assetMeta?.decimals ?? decimals
+    d.asset?.decimals ?? assetMeta?.decimals ?? 18
   );
+  const decimals = shareDecimalsByVault.get(address) ?? assetDecimals;
   const totalAssetsRaw = String(d.totalAssets ?? "0");
   const totalSupplyRaw = String(d.totalShares ?? "0");
   const convertToAssets = d.exchangeRate != null ? rescaleExchangeRate(d.exchangeRate, decimals) : deriveConvertToAssets(totalAssetsRaw, totalSupplyRaw, decimals);
@@ -38447,7 +38447,7 @@ async function mapWithConcurrency(items, limit, fn) {
   );
   return out;
 }
-async function fetchEulerEarnVaultsFromApi(chainId, prices = {}, tokenList = {}) {
+async function fetchEulerEarnVaultsFromApi(chainId, prices = {}, tokenList = {}, multicallRetry) {
   const list = await getJson(
     `${EULER_DATA_API_BASE2}/earn/vaults?chainId=${chainId}&limit=200`
   );
@@ -38461,10 +38461,16 @@ async function fetchEulerEarnVaultsFromApi(chainId, prices = {}, tokenList = {})
       `${EULER_DATA_API_BASE2}/earn/vaults/${chainId}/${row.address}?include=strategies`
     ).then((d) => d?.data)
   );
+  const vaultAddrs = details.map((d) => d?.address).filter((a) => !!a);
+  const shareDecimalsByVault = await fetchShareDecimals(
+    chainId,
+    vaultAddrs,
+    multicallRetry
+  );
   const out = {};
   for (const d of details) {
     if (!d) continue;
-    const v = mapApiDetail(d, chainId, prices, tokenList);
+    const v = mapApiDetail(d, chainId, prices, tokenList, shareDecimalsByVault);
     if (v) out[v.address] = v;
   }
   return out;
@@ -38476,7 +38482,8 @@ var fetchEulerEarnVaults = async (chainId, prices = {}, tokenList = {}, multical
   const fromApi = await fetchEulerEarnVaultsFromApi(
     chainId,
     prices,
-    tokenList
+    tokenList,
+    multicallRetry
   ).catch(() => void 0);
   if (isNonEmpty(fromApi)) return fromApi;
   const subgraphUrl = getEulerEarnSubgraphUrl(chainId);
@@ -44939,6 +44946,67 @@ 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 = {
@@ -45266,6 +45334,25 @@ var SINGLE_CHAIN_ENTRIES = {
       yieldFetcher: savbtcFetcher,
       yieldKey: "Staked avBTC::savBTC"
     }
+  ],
+  "4663": [
+    {
+      // Spark Savings USDG on Robinhood Chain — Sky/Spark savings token
+      // over USDG. ERC-4626 share price accrues via a `chi()` rate
+      // accumulator; `ssr()` is not readable so APR comes from the
+      // chi-delta fetcher. Standard permissionless 4626 redeem.
+      address: "0xde770c84fe66e063336b31737cfe9790f18c4087",
+      underlying: "0x5fc5360d0400a0fd4f2af552add042d716f1d168",
+      // USDG
+      symbol: "spUSDG",
+      brand: "Spark",
+      decimals: 6,
+      isRebasing: false,
+      isMintable: true,
+      withdrawalMode: "instant",
+      yieldFetcher: sparkSavingsUsdgFetcher,
+      yieldKey: SPARK_SAVINGS_USDG_KEY
+    }
   ]
 };
 var SAVINGS_REGISTRY = (() => {
@@ -47743,7 +47830,7 @@ var readVaultSharePrices = async (chainId, addresses, multicallRetry) => {
 };
 
 // src/vaults/yield/annualize.ts
-var YEAR_SECONDS9 = 365 * 24 * 60 * 60;
+var YEAR_SECONDS10 = 365 * 24 * 60 * 60;
 var SCALE = 10n ** 18n;
 var appendSnapshot = (points, snap, options) => {
   const maxPoints = options?.maxPoints ?? 90;
@@ -47772,7 +47859,7 @@ var computeVaultApr = (points, options) => {
   if (pThen === 0n) return void 0;
   const ratioScaled = BigInt(now.p) * SCALE / pThen;
   const ratio = Number(ratioScaled) / 1e18;
-  const apr = (ratio - 1) * (YEAR_SECONDS9 / windowSeconds);
+  const apr = (ratio - 1) * (YEAR_SECONDS10 / windowSeconds);
   return {
     apr,
     sharePriceNow: now.p,