fix: use underlying token decimal for usd formating and lint (#29)

yvesfracari · web-flow · commit d8fc2f23cf96 · 2025-02-19T13:32:27.000-03:00
* fix: use underlying token decimal for usd formating

* fix: lint
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,37 @@
+import globals from 'globals';
+import js from '@eslint/js';
+import * as parser from '@typescript-eslint/parser';
+import ponderConfig from 'eslint-config-ponder';
+import prettierConfig from 'eslint-config-prettier';
+
+// Convert traditional config to flat config format
+const flatPonderConfig = {
+  rules: ponderConfig.rules || {},
+  settings: ponderConfig.settings || {}
+};
+
+export default [
+  {
+    ignores: ['ponder-env.d.ts']
+  },
+  js.configs.recommended,
+  {
+    files: ['**/*.{js,jsx,ts,tsx}'],
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.node
+      },
+      parser,
+      parserOptions: {
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        ecmaFeatures: {
+          jsx: true
+        }
+      }
+    },
+    ...flatPonderConfig,
+    ...prettierConfig
+  }
+];
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "start": "ponder start",
     "db": "ponder db",
     "codegen": "ponder codegen",
-    "lint": "eslint . --ext .ts,.tsx,.js,.jsx",
+    "lint": "eslint .",
     "typecheck": "tsc",
     "format": "prettier --write \"**/*.{ts,tsx,json}\"",
     "format:check": "prettier --check \"**/*.{ts,tsx,json}\""
@@ -21,11 +21,13 @@
     "viem": "^2.21.3"
   },
   "devDependencies": {
+    "@eslint/js": "^9.20.0",
     "@types/node": "^20.9.0",
-    "eslint": "^8.53.0",
+    "eslint": "^8.57.1",
     "eslint-config-ponder": "^0.8.10",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
+    "globals": "^15.15.0",
     "prettier": "^3.4.2",
     "tsx": "^4.19.2",
     "typescript": "^5.2.2"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/ponder.config.ts b/ponder.config.ts
@@ -7,7 +7,6 @@ import { PTokenAbi } from './abis/PTokenAbi';
 import { BeaconAbi } from './abis/BeaconAbi';
 
 const HOUR = 60 * 60;
-const DAY = HOUR * 24;
 
 type ChainId =
   | typeof baseSepolia.id
diff --git a/scripts/createDelegationScenarios.ts b/scripts/createDelegationScenarios.ts
@@ -1,4 +1,4 @@
-import { parseEther, Address, encodeFunctionData } from 'viem';
+import { Address, encodeFunctionData } from 'viem';
 import dotenv from 'dotenv';
 import { resolve } from 'path';
 import { BaseScenario } from './utils/baseScenario';
diff --git a/scripts/logOracleConfigAndPrice.ts b/scripts/logOracleConfigAndPrice.ts
@@ -77,7 +77,7 @@ class OracleMetricsMonitor {
   async monitorOracleMetrics() {
     console.log('Fetching Oracle metrics...\n');
 
-    for (const [key, pToken] of Object.entries(config.tokens)) {
+    for (const [, pToken] of Object.entries(config.tokens)) {
       console.log(`=== ${pToken.name} Oracle Metrics ===`);
       try {
         const [oracleConfig, price] = await Promise.all([
diff --git a/scripts/logPTokenData.ts b/scripts/logPTokenData.ts
@@ -1,5 +1,5 @@
 import { createPublicClient, http, Address, PublicClient } from 'viem';
-import { base, baseSepolia } from 'viem/chains';
+import { baseSepolia } from 'viem/chains';
 import dotenv from 'dotenv';
 import { PTokenAbi } from '../abis/PTokenAbi';
 import { resolve } from 'path';
@@ -131,7 +131,7 @@ class PTokenMetricsMonitor {
   async monitorAllPTokens() {
     console.log('Fetching pToken metrics...\n');
 
-    for (const [key, pToken] of Object.entries(config.pTokens)) {
+    for (const [, pToken] of Object.entries(config.pTokens)) {
       console.log(`=== ${pToken.name} Metrics ===`);
       try {
         const metrics = await this.getPTokenMetrics(pToken);
diff --git a/scripts/logUserBalances.ts b/scripts/logUserBalances.ts
@@ -92,7 +92,7 @@ class PTokenMetricsMonitor {
   async monitorUserMetrics() {
     console.log(`Fetching metrics for user ${USER_ADDRESS}...\n`);
 
-    for (const [key, pToken] of Object.entries(config.pTokens)) {
+    for (const [, pToken] of Object.entries(config.pTokens)) {
       console.log(`=== ${pToken.name} User Metrics ===`);
       try {
         const metrics = await this.getUserMetrics(pToken);
diff --git a/scripts/pauseAndContinueUSDC.ts b/scripts/pauseAndContinueUSDC.ts
@@ -54,7 +54,7 @@ const setUSDCMintPauseState = async (pauseState: boolean) => {
     });
 
     // Wait for transaction confirmation
-    const receipt = await publicClient.waitForTransactionReceipt({ hash });
+    await publicClient.waitForTransactionReceipt({ hash });
 
     console.log('Transaction successful!');
     console.log('Transaction hash:', hash);
diff --git a/scripts/setBorrowCap.ts b/scripts/setBorrowCap.ts
@@ -76,7 +76,7 @@ const setBorrowCaps = async (
     });
 
     // Wait for transaction confirmation
-    const receipt = await publicClient.waitForTransactionReceipt({ hash });
+    await publicClient.waitForTransactionReceipt({ hash });
 
     console.log('Transaction successful!');
     console.log('Transaction hash:', hash);
diff --git a/scripts/setSupplyCap.ts b/scripts/setSupplyCap.ts
@@ -76,7 +76,7 @@ const setSupplyCaps = async (
     });
 
     // Wait for transaction confirmation
-    const receipt = await publicClient.waitForTransactionReceipt({ hash });
+    await publicClient.waitForTransactionReceipt({ hash });
 
     console.log('Transaction successful!');
     console.log('Transaction hash:', hash);
diff --git a/src/block.ts b/src/block.ts
@@ -1,14 +1,20 @@
 import { ponder } from 'ponder:registry';
-import { aprSnapshot, priceSnapshot, protocol, pToken } from 'ponder:schema';
+import {
+  aprSnapshot,
+  priceSnapshot,
+  protocol,
+  pToken,
+  underlyingToken,
+} from 'ponder:schema';
 import { readMultiplePTokenPricesInfo } from './utils/multicalls';
 import { calculateUsdValueFromAssets } from './utils/calculations';
 import { formatUnits } from 'viem';
 import { eq } from 'ponder';
 
-ponder.on('CurrentPriceUpdate:block', async ({ context, event }) => {
+ponder.on('CurrentPriceUpdate:block', async ({ context }) => {
   // for some reason while using merge to do 1 SQL it return an error.
   // So I will do 2 SQLs to update the current price
-  const [pTokens, protocols] = await Promise.all([
+  const [pTokens, protocols, underlyingTokens] = await Promise.all([
     context.db.sql
       .select()
       .from(pToken)
@@ -17,18 +23,29 @@ ponder.on('CurrentPriceUpdate:block', async ({ context, event }) => {
       .select()
       .from(protocol)
       .where(eq(protocol.chainId, BigInt(context.network.chainId))),
+    context.db.sql
+      .select()
+      .from(underlyingToken)
+      .where(eq(underlyingToken.chainId, BigInt(context.network.chainId))),
   ]);
 
   // Merge the results based on protocolId
   const pTokenWithProtocol = pTokens
     .map(token => {
       const matchingProtocol = protocols.find(p => p.id === token.protocolId);
+      const underlyingToken = underlyingTokens.find(
+        u => u.id === token.underlyingId
+      );
       return {
         pToken: token,
         protocol: matchingProtocol,
+        underlyingToken,
       };
     })
-    .filter(result => result.protocol !== undefined); // Remove any unmatched results to mimic INNER JOIN
+    .filter(
+      result =>
+        result.protocol !== undefined || result.underlyingToken !== undefined
+    ); // Remove any unmatched results to mimic INNER JOIN
 
   const newPricesInfo = await readMultiplePTokenPricesInfo(
     context,
@@ -37,25 +54,29 @@ ponder.on('CurrentPriceUpdate:block', async ({ context, event }) => {
   );
 
   await Promise.all(
-    newPricesInfo.map(newPriceInfo =>
+    newPricesInfo.map((newPriceInfo, index) => {
+      const underlyingTokenDecimals = Number(
+        pTokenWithProtocol[index]?.underlyingToken?.decimals
+      );
+
       context.db
         .update(pToken, { id: newPriceInfo.pTokenId })
-        .set(({ cash, totalBorrows, decimals }) => ({
+        .set(({ cash, totalBorrows }) => ({
           underlyingPriceCurrent: newPriceInfo.price,
           totalSupplyUsdValue: calculateUsdValueFromAssets(
             cash,
             newPriceInfo.price
           ),
           formattedUnderlyingPriceCurrent: formatUnits(
             newPriceInfo.price,
-            36 - Number(decimals)
+            36 - underlyingTokenDecimals
           ),
           totalBorrowsUsdValue: calculateUsdValueFromAssets(
             totalBorrows,
             newPriceInfo.price
           ),
-        }))
-    )
+        }));
+    })
   );
 });
 
diff --git a/src/riskEngine.ts b/src/riskEngine.ts
@@ -129,7 +129,7 @@ ponder.on('RiskEngine:NewMarketConfiguration', async ({ context, event }) => {
   });
 });
 
-ponder.on('RiskEngine:NewCloseFactor', async ({ context, event }) => {
+ponder.on('RiskEngine:NewCloseFactor', async () => {
   // This event should emit the pToken address on the args.
   // when this event is fixed, uncomment the following code
   // const pTokenId = getAddressId(
diff --git a/src/utils/databaseWriteUtils.ts b/src/utils/databaseWriteUtils.ts
@@ -174,6 +174,7 @@ export async function updatePTokenWithRates(
   event: ContractEvent,
   pTokenId: string,
   pTokenUpdater: (
+    // eslint-disable-next-line no-unused-vars
     params: typeof pToken.$inferSelect
   ) => typeof pToken.$inferSelect
 ) {
diff --git a/src/utils/rateModels.ts b/src/utils/rateModels.ts
@@ -2,9 +2,8 @@ import { pToken } from 'ponder:schema';
 import { MathSol } from './math';
 import { parseEther } from 'viem';
 
-const BASE = parseEther('1');
-
 export abstract class InterestRateModel {
+  // eslint-disable-next-line no-unused-vars
   constructor(public pTokenData: typeof pToken.$inferSelect) {}
 
   abstract getUtilization(): bigint;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { parseEther, Address, encodeFunctionData } from 'viem';`
	`1`	`+import { Address, encodeFunctionData } from 'viem';`
`2`	`2`	`import dotenv from 'dotenv';`
`3`	`3`	`import { resolve } from 'path';`
`4`	`4`	`import { BaseScenario } from './utils/baseScenario';`