@1delta/margin-fetcher 0.0.281 → 0.0.283

package/dist/index.js

@@ -4,7 +4,7 @@ import './chunk-PR4QN5HX.js';
 import { Lender, isAaveType, isCompoundV3, isMultiMarket, isSiloV2Type, isSiloV3Type, isDolomite, isAaveV4Type, isInit, isMorphoType, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isAaveV2Type, isAaveV32Type, isAaveV3Type, isEulerType, isFluid, isGearboxV3, isYLDR, isCompoundV3Type, isLista, isTectonicType, isKineticType, isBenqiType } from '@1delta/lender-registry';
 export { isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR } from '@1delta/lender-registry';
 import lodash from 'lodash';
-import { getEvmChain, getEvmClient, getEvmClientUniversal, multicallRetryUniversal } from '@1delta/providers';
+import { getEvmClient, getEvmChain, getEvmClientUniversal, multicallRetryUniversal } from '@1delta/providers';
 import { MetaMorphoAbi, FluidLendingResolverAbi, FluidVaultResolverAbi, MoolahVaultAbi, MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, DolomiteMarginAbi, GearboxMarketCompressorV310Abi, MorphoBlueAbi, GearboxCreditAccountCompressorV310Abi } from '@1delta/abis';
 export { MorphoLensAbi } from '@1delta/abis';
 import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, getCompoundV3CometAddress as getCompoundV3CometAddress$1, getMorphoAddress, getAaveCollateralTokenAddress, getSiloHalfForUnderlying, InitMarginAddresses, getLstAcceptedInputs } from '@1delta/calldata-sdk';
@@ -11221,7 +11221,7 @@ function earlyRepayPenalty(repayPrincipal, apr, end, nowSecs) {
   const perRepay = ceilDiv(repayPrincipal * aprPerSecond(apr), RATE_SCALE);
   return ceilDiv(perRepay * timeLeft, 2n);
 }
-async function resolveListaBrokers(chainId, marketKeys) {
+async function resolveListaBrokers(chainId, marketKeys, getClient = getEvmClient) {
   const moolah = morphoPools()?.LISTA_DAO?.[chainId];
   const out = {};
   if (!moolah || marketKeys.length === 0) return out;
@@ -11233,7 +11233,7 @@ async function resolveListaBrokers(chainId, marketKeys) {
   }
   if (missing.length > 0) {
     try {
-      const client = getEvmClient(chainId);
+      const client = getClient(chainId);
       const results = await client.multicall({
         allowFailure: true,
         contracts: missing.map((id) => ({
@@ -11297,15 +11297,15 @@ async function fetchListaFixedTerms(chainId, marketKeys) {
 function getCachedListaFixedTerms(chainId, marketKey) {
   return FIXED_TERMS_CACHE[chainId]?.[toBytes32MarketId(marketKey)];
 }
-async function fetchListaBrokerUserData(chainId, account, marketKeys, nowSecs = Math.floor(Date.now() / 1e3)) {
-  const brokers = await resolveListaBrokers(chainId, marketKeys);
+async function fetchListaBrokerUserData(chainId, account, marketKeys, nowSecs = Math.floor(Date.now() / 1e3), getClient = getEvmClient) {
+  const brokers = await resolveListaBrokers(chainId, marketKeys, getClient);
   const ids = Object.keys(brokers);
   const out = {};
   const cacheKey2 = `${chainId}:${account.toLowerCase()}`;
   BROKER_USER_CACHE[cacheKey2] = out;
   if (ids.length === 0) return out;
   try {
-    const client = getEvmClient(chainId);
+    const client = getClient(chainId);
     const contracts = ids.flatMap((id) => {
       const address = brokers[id];
       return [
@@ -11449,11 +11449,17 @@ var buildMorphoUserCallWithLens = (chainId, account, lender, marketsToQuery) =>
     ]
   }));
 };
-var buildMorphoTypeUserCallWithLens = (chainId, account, lender, marketsToQuery) => {
-  return lender === Lender.MORPHO_BLUE ? buildMorphoUserCallWithLens(chainId, account, lender, marketsToQuery) : buildListaUserCallWithLens(chainId, account, lender, marketsToQuery);
+var buildMorphoTypeUserCallWithLens = (chainId, account, lender, marketsToQuery, getClient) => {
+  return lender === Lender.MORPHO_BLUE ? buildMorphoUserCallWithLens(chainId, account, lender, marketsToQuery) : buildListaUserCallWithLens(chainId, account, lender, marketsToQuery, getClient);
 };
-var buildListaUserCallWithLens = async (chainId, account, lender, marketsToQuery) => {
-  await fetchListaBrokerUserData(chainId, account, marketsToQuery).catch(() => ({}));
+var buildListaUserCallWithLens = async (chainId, account, lender, marketsToQuery, getClient) => {
+  await fetchListaBrokerUserData(
+    chainId,
+    account,
+    marketsToQuery,
+    void 0,
+    getClient
+  ).catch(() => ({}));
   const marketSlices = chunk(marketsToQuery, 100);
   return marketSlices.flatMap((marketsInChunk) => ({
     address: MORPHO_LENS[chainId],
@@ -22379,13 +22385,19 @@ var buildDolomiteUserCall = async (chainId, _lender, account, accountNumbers) =>
 };
 
 // src/lending/user-data/fetch-balances/prepare.ts
-async function buildUserCall(chainId, lender, account, params) {
+async function buildUserCall(chainId, lender, account, params, getClient) {
   if (isAaveV4Type(lender)) return buildAaveV4UserCall(chainId, lender, account);
   if (isAaveV2Type(lender)) return buildAaveV2UserCall(chainId, lender, account);
   if (isAaveV3Type(lender)) return buildAaveV3UserCall(chainId, lender, account);
   if (isInit(lender)) return buildInitUserCall(chainId, lender, account);
   if (isMorphoType(lender))
-    return buildMorphoTypeUserCallWithLens(chainId, account, lender, params);
+    return buildMorphoTypeUserCallWithLens(
+      chainId,
+      account,
+      lender,
+      params,
+      getClient
+    );
   if (isCompoundV3Type(lender))
     return buildCompoundV3UserCall(chainId, lender, account);
   if (isEulerType(lender))
@@ -29432,7 +29444,8 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient16, allowF
         chainId,
         query3.lender,
         query3.account,
-        query3.params
+        query3.params,
+        getEvmClient16
       );
       return callData.map((call) => ({ call, abi: call.abi ?? abi }));
     })
@@ -38356,6 +38369,23 @@ var lombardLbtcFetcher = {
     return { LBTC: Number.isFinite(frac) ? frac * 100 : 0 };
   }
 };
+var LOMBARD_VAULT_APY_URL = "https://mainnet.prod.lombard.finance/api/v1/analytics/vault/apy/history";
+var createLombardVaultFetcher = (wrapper, key) => ({
+  label: `LOMBARD_VAULT:${wrapper}`,
+  fetch: async () => {
+    const url = `${LOMBARD_VAULT_APY_URL}?vault_wrapper=${wrapper}&interval=APY_INTERVAL_1M`;
+    const res = await fetch(url, {
+      headers: { accept: "application/json" }
+    }).then((r) => r.json());
+    const latest = Array.isArray(res?.snapshots) ? res.snapshots[0] : void 0;
+    const frac = Number(latest?.total_apy);
+    return { [key]: Number.isFinite(frac) ? frac * 100 : 0 };
+  }
+});
+var lombardLbtcvFetcher = createLombardVaultFetcher(
+  "VAULT_WRAPPER_BTCE",
+  "LBTCv"
+);
 var CHAIN_ID6 = "1284";
 var STDOT = "0xbc7e02c4178a7df7d3e564323a5c359dc96c4db4";
 var ONE_E185 = 10n ** 18n;
@@ -38988,6 +39018,31 @@ var LST_REGISTRY = {
       withdrawalMode: "queued",
       yieldFetcher: solvBtcPlusFetcher,
       yieldKey: "BTC+"
+    },
+    {
+      // Lombard LBTCv — Veda BoringVault DeFi vault over LBTC ("Bitcoin Earn",
+      // Lombard API wrapper `VAULT_WRAPPER_BTCE`; 8-dec). Share price via the
+      // Veda Accountant `getRate()` (8-dec, ≈1.024 BTC/LBTCv) — the accountant
+      // (`0x2863…3dCE`) is reached through the vault hook's `accountant()`. APY
+      // from the Lombard vault API. Redeems to LBTC (~3-day vault-share queue);
+      // priced via WBTC (≈BTC). Not mintable here (Veda Teller; no builder).
+      address: "0x5401b8620e5fb570064ca9114fd1e135fd77d57c",
+      underlying: "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599",
+      // WBTC (BTC price ref)
+      symbol: "LBTCv",
+      brand: "Lombard",
+      decimals: 8,
+      reader: "vedaAccountant",
+      isErc4626: false,
+      isRebasing: false,
+      isMintable: false,
+      isNativeUnderlying: false,
+      withdrawalMode: "queued",
+      readerExtras: {
+        vedaAccountant: "0x28634d0c5edc67cf2450e74dea49b90a4ff93dce"
+      },
+      yieldFetcher: lombardLbtcvFetcher,
+      yieldKey: "LBTCv"
     }
   ],
   "146": [
@@ -41216,18 +41271,38 @@ var SOLV_POOLS = {
         // cbBTC
         name: "cbBTC"
       }
+    ],
+    // xSolvBTC — the SolvBTC.LST: subscribes with SolvBTC (not WBTC). Verified
+    // via SolvBTCYieldTokenMultiAssetPool.getERC20(sft, slot) == xSolvBTC.
+    "0xd9d920aa40f578ab794426f5c90f6c731d159def": [
+      {
+        poolId: "0xefcca1eb946cdc7b56509489a56b45b75aff74b8bb84dad5b893012157e0df93",
+        currency: "0x7a56e1c57c7475ccf742a1832b028f0456652f97",
+        // SolvBTC
+        name: "SolvBTC"
+      }
     ]
   }
 };
 var LST_DELEGATION = {
-  // Core DAO — stCORE `Earn.mint(validator)`: the validator is mandatory.
+  // Core DAO — the validator is mandatory for both stCORE (`Earn.mint(validator)`)
+  // and SCORE (`deposit(validator)`); dualCORE picks internally (no selection).
   "1116": {
+    // stCORE
     "0xb3a8f0f0da9ffc65318aa39e55079796093029ad": {
       required: true,
       kind: "validator",
       optionKey: "validator",
       default: null,
       source: "endpoint"
+    },
+    // SCORE (StakedCore) — its own staking contract, same Core validator set.
+    "0xa20b3b97df3a02f9185175760300a06b4e0a2c05": {
+      required: true,
+      kind: "validator",
+      optionKey: "validator",
+      default: null,
+      source: "endpoint"
     }
   },
   // Celo — StakedCelo: optional from the integrator's view (the server
@@ -41255,11 +41330,12 @@ var LST_DELEGATION = {
       source: "endpoint"
     },
     "0xd9d920aa40f578ab794426f5c90f6c731d159def": {
-      required: true,
+      required: false,
+      // canonical SolvBTC poolId is auto-filled
       kind: "pool",
       optionKey: "poolId",
-      default: null,
-      source: "offchain"
+      default: "0xefcca1eb946cdc7b56509489a56b45b75aff74b8bb84dad5b893012157e0df93",
+      source: "endpoint"
     },
     "0xcea2daf93617b97504e05affc5bcf9b3922d3034": {
       required: true,
@@ -45617,11 +45693,15 @@ var classifyVault = (input) => {
   return { yieldProfile, denomination };
 };
 var stampVaultClassification = (data, chainId, tokenList = {}) => {
-  const stampBag = (bag, provider) => {
+  const stampBag = (bag, provider, classify = true) => {
     if (!bag) return;
     for (const v of Object.values(bag)) {
       const shareAsset = tokenList[v.address?.toLowerCase?.() ?? ""];
       if (shareAsset) v.shareAsset = shareAsset;
+      const longLogo = v.longToken != null ? tokenList[v.longToken.toLowerCase()]?.logoURI : void 0;
+      const icon = v.shareAsset?.logoURI ?? v.asset?.logoURI ?? longLogo;
+      if (icon) v.logoURI = icon;
+      if (!classify) continue;
       const c = classifyVault({
         provider,
         chainId,
@@ -45654,6 +45734,8 @@ var stampVaultClassification = (data, chainId, tokenList = {}) => {
   stampBag(data.savings, "savings");
   stampBag(data.lagoon, "lagoon");
   stampBag(data.yearn, "yearn");
+  stampBag(data.hypercore, "hypercore", false);
+  stampBag(data.gmx, "gmx", false);
 };
 
 // src/vaults/gmx/registry.ts
@@ -46917,7 +46999,8 @@ function buildVaultLookup(data) {
         denomination: v.denomination,
         sharePriceRaw: v.sharePriceRaw,
         sharePrice: v.sharePrice,
-        sharePriceUSD: v.sharePriceUSD
+        sharePriceUSD: v.sharePriceUSD,
+        logoURI: v.logoURI
       });
     }
   };