@1delta/margin-fetcher 0.0.114 → 0.0.116

package/dist/abis/oracle/UniV3.d.ts

@@ -1,48 +1,10 @@
 export declare const UniswapV3Abi: readonly [{
-    readonly inputs: readonly [];
-    readonly name: "protocolFees";
-    readonly outputs: readonly [{
-        readonly internalType: "uint128";
-        readonly name: "token0";
-        readonly type: "uint128";
-    }, {
-        readonly internalType: "uint128";
-        readonly name: "token1";
-        readonly type: "uint128";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}, {
     readonly inputs: readonly [];
     readonly name: "slot0";
     readonly outputs: readonly [{
         readonly internalType: "uint160";
         readonly name: "sqrtPriceX96";
         readonly type: "uint160";
-    }, {
-        readonly internalType: "int24";
-        readonly name: "tick";
-        readonly type: "int24";
-    }, {
-        readonly internalType: "uint16";
-        readonly name: "observationIndex";
-        readonly type: "uint16";
-    }, {
-        readonly internalType: "uint16";
-        readonly name: "observationCardinality";
-        readonly type: "uint16";
-    }, {
-        readonly internalType: "uint16";
-        readonly name: "observationCardinalityNext";
-        readonly type: "uint16";
-    }, {
-        readonly internalType: "uint8";
-        readonly name: "feeProtocol";
-        readonly type: "uint8";
-    }, {
-        readonly internalType: "bool";
-        readonly name: "unlocked";
-        readonly type: "bool";
     }];
     readonly stateMutability: "view";
     readonly type: "function";

package/dist/abis/oracle/UniV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UniV3.d.ts","sourceRoot":"","sources":["../../../src/abis/oracle/UniV3.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8Df,CAAA"}
+{"version":3,"file":"UniV3.d.ts","sourceRoot":"","sources":["../../../src/abis/oracle/UniV3.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY;;;;;;;;;;EAcf,CAAA"}

package/dist/index.js

@@ -6240,7 +6240,7 @@ var IrgetterAbi = [
   }
 ];
 
-// ../../node_modules/.pnpm/@1delta+lender-registry@0.0.10/node_modules/@1delta/lender-registry/dist/index.mjs
+// ../../node_modules/.pnpm/@1delta+lender-registry@0.0.11/node_modules/@1delta/lender-registry/dist/index.mjs
 var Lender = /* @__PURE__ */ ((Lender22) => {
   Lender22["AAVE_V3"] = "AAVE_V3";
   Lender22["AAVE_V3_PRIME"] = "AAVE_V3_PRIME";
@@ -6348,6 +6348,7 @@ var Lender = /* @__PURE__ */ ((Lender22) => {
   Lender22["ENCLABS_LST"] = "ENCLABS_LST";
   Lender22["ENCLABS_PT_USD"] = "ENCLABS_PT_USD";
   Lender22["ENCLABS_PT_ETH"] = "ENCLABS_PT_ETH";
+  Lender22["ENCLABS_SONIC_ECO"] = "ENCLABS_SONIC_ECO";
   Lender22["BENQI"] = "BENQI";
   Lender22["BENQI_AVALANCE_ECOSYSTEM"] = "BENQI_AVALANCE_ECOSYSTEM";
   Lender22["KEOM"] = "KEOM";
@@ -6492,8 +6493,9 @@ var VENUS_LENDERS = [
   "ENCLABS",
   "ENCLABS_LST",
   "ENCLABS_PT_USD",
-  "ENCLABS_PT_ETH"
-  /* ENCLABS_PT_ETH */
+  "ENCLABS_PT_ETH",
+  "ENCLABS_SONIC_ECO"
+  /* ENCLABS_SONIC_ECO */
 ];
 var COMPOUND_V2_LENDERS = [
   ...VENUS_LENDERS,
@@ -8272,7 +8274,7 @@ var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
             );
             const totalAToken = liquidity + Number(totalStableDebt) + Number(totalVariableDebt);
             const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
-            const price = prices[oracleKey] ?? 1;
+            const price = prices[oracleKey] ?? 0;
             const totalDepositsUSD = Number(totalAToken) * price;
             const totalDebtUSD = Number(totalVariableDebt) * price;
             resultReserves[asset] = {
@@ -8416,7 +8418,7 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
               decimals
             );
             const liquidity = Number(totalDeposits) - Number(totalDebt) - Number(totalDebtStable);
-            const price = prices[toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)];
+            const price = prices[toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)] ?? 0;
             resultReserves[asset] = {
               poolId: asset,
               underlying: asset,
@@ -8592,7 +8594,7 @@ function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
         );
         const liquidity = Number(totalAToken) - Number(totalVariableDebt);
         const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
-        const price = prices[oracleKey] ?? 1;
+        const price = prices[oracleKey] ?? 0;
         const totalDepositsUSD = Number(totalAToken) * price;
         const totalDebtUSD = Number(totalVariableDebt) * price;
         resultReserves[asset] = {
@@ -8713,7 +8715,7 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
           decimals
         );
         const liquidity = Number(totalDeposits) - Number(totalDebt) - Number(totalDebtStable);
-        const price = prices[toOracleKey(assetMeta?.assetGroup)] ?? toGenericPriceKey(asset, chainId);
+        const price = prices[toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)] ?? 0;
         resultReserves[asset] = {
           poolId: asset,
           underlying: asset,
@@ -8926,7 +8928,7 @@ var getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYie
         const decimals2 = assetMeta?.decimals ?? 18;
         const totals = parseRawAmount(resultsTotals[0], decimals2);
         const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
-        const totalUsd = Number(totals) * (prices[oracleKey] ?? 1);
+        const totalUsd = Number(totals) * (prices[oracleKey] ?? 0);
         result[asset] = {
           poolId: asset,
           underlying: asset,
@@ -21862,24 +21864,6 @@ var ProxyOracleAbi = [
 
 // src/abis/oracle/UniV3.ts
 var UniswapV3Abi = [
-  {
-    inputs: [],
-    name: "protocolFees",
-    outputs: [
-      {
-        internalType: "uint128",
-        name: "token0",
-        type: "uint128"
-      },
-      {
-        internalType: "uint128",
-        name: "token1",
-        type: "uint128"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
   {
     inputs: [],
     name: "slot0",
@@ -21888,36 +21872,6 @@ var UniswapV3Abi = [
         internalType: "uint160",
         name: "sqrtPriceX96",
         type: "uint160"
-      },
-      {
-        internalType: "int24",
-        name: "tick",
-        type: "int24"
-      },
-      {
-        internalType: "uint16",
-        name: "observationIndex",
-        type: "uint16"
-      },
-      {
-        internalType: "uint16",
-        name: "observationCardinality",
-        type: "uint16"
-      },
-      {
-        internalType: "uint16",
-        name: "observationCardinalityNext",
-        type: "uint16"
-      },
-      {
-        internalType: "uint8",
-        name: "feeProtocol",
-        type: "uint8"
-      },
-      {
-        internalType: "bool",
-        name: "unlocked",
-        type: "bool"
       }
     ],
     stateMutability: "view",
@@ -21946,6 +21900,8 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
       aaveForks = aaveForks?.filter((a) => a !== Lender.LORE);
     if (chainId === Chain.BNB_SMART_CHAIN_MAINNET)
       aaveForks = aaveForks?.filter((a) => a !== Lender.AVALON_USDX);
+    if (chainId === Chain.MANTA_PACIFIC_MAINNET)
+      aaveForks = aaveForks?.filter((a) => a !== Lender.ZEROLEND);
     const reservesToQuery = aaveForks?.map((a) => ({
       fork: a,
       assets: getAaveAssets(chainId, a)
@@ -22096,7 +22052,11 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}) => {
     const uniswapData = parseUniswapV2results(uniswapSlice, chainId);
     offset += uniswapCalls.length;
     const uniswapV3Slice = result.slice(offset, offset + uniswapV3Calls.length);
-    const uniswapV3Data = parseUniswapV3results(uniswapV3Slice, chainId);
+    const uniswapV3Data = parseUniswapV3results(
+      uniswapV3Slice,
+      chainId,
+      allPrices
+    );
     offset += uniswapV3Calls.length;
     const api3Slice = result.slice(offset, offset + api3.calls.length);
     const api3Data = parseApi3Results(chainId, api3Slice, api3.names);
@@ -22881,6 +22841,15 @@ var getUniswapV3Calls = (chainId) => {
           params: []
         }
       ];
+    case Chain.BASE:
+      return [
+        //mseth/eth
+        {
+          address: "0x74f72788f4814d7ff3c49b44684aa98eee140c0e",
+          name: "slot0",
+          params: []
+        }
+      ];
     default:
       return [];
   }
@@ -22903,18 +22872,26 @@ function getV3PriceFromSqrt(sqrtPrice, t0d, t1d) {
   );
   return price0to1;
 }
-var parseUniswapV3results = (data, chainId) => {
+var parseUniswapV3results = (data, chainId, prices) => {
   switch (chainId) {
     case Chain.HEMI_NETWORK: {
       let uniswapData = {};
       if (data.length > 0) {
-        const state = data[0];
-        const [sqrtPriceX96, , , , , ,] = state;
+        const sqrtPriceX96 = data[0];
         const price = getV3PriceFromSqrt(sqrtPriceX96, 18, 6);
         uniswapData["Hemi::HEMI"] = price;
       }
       return uniswapData;
     }
+    case Chain.BASE: {
+      let uniswapData = {};
+      if (data.length > 0) {
+        const sqrtPriceX96 = data[0];
+        const price = getV3PriceFromSqrt(sqrtPriceX96, 18, 18);
+        uniswapData["Metronome Synth ETH::msETH"] = prices["ETH"] / price;
+      }
+      return uniswapData;
+    }
     default:
       return {};
   }