[SCR-70] Normalize values across rhomarkets and layerbank

README.md

@@ -56,7 +56,7 @@ Please note the following:
 - A standard function / entry point that inputs a block number and fetches all user level data at that block. (see below)
 - Accepts the standard input defined in `hourly_blocks.csv` (see more details below)
 - All values are in the underlying token amount (no lp or output tokens such as, cTokens, aTokens, uni pools)
-- Token amounts are normalized
+- Token amounts are normalized to the underlying token decimals (not raw values)
 - All strings/addresses are lowercase with no spaces
 
 > Note: **Expect multiple entries per user if the protocol has more than one token asset**
@@ -141,8 +141,8 @@ type OutputDataSchemaRow = {
   token_symbol: string;
 
   // Financial data
-  supply_token: bigint;
-  borrow_token: bigint;
+  supply_token: number;
+  borrow_token: number;
 
   // Metadata
   block_number: number;

adapters/layerbank/src/index.ts

@@ -22,8 +22,8 @@ type OutputDataSchemaRow = {
   market: string;
   token_address: string;
   token_symbol: string;
-  supply_token: bigint;
-  borrow_token: bigint;
+  supply_token: number;
+  borrow_token: number;
   block_number: number;
   timestamp: number;
   protocol: string;
@@ -66,10 +66,10 @@ export const getUserTVLByBlock = async (blocks: BlockData) => {
         timestamp: blocks.blockTimestamp,
         block_number: blocks.blockNumber,
         etl_timestamp: Math.floor(Date.now() / 1000),
-        token_address: marketInfo.underlyingAddress,
+        token_address: marketInfo.underlyingAddress.toLowerCase(),
         token_symbol: marketInfo.underlyingSymbol,
-        user_address: state.account,
-        market: marketInfo.address,
+        user_address: state.account.toLowerCase(),
+        market: marketInfo.address.toLowerCase(),
         supply_token: state.lentAmount,
         borrow_token: state.borrowAmount,
       });

adapters/layerbank/src/sdk/marketDetails.ts

@@ -1,4 +1,4 @@
-import { createPublicClient, extractChain, http, getContract } from "viem";
+import { createPublicClient, extractChain, http, getContract, formatUnits } from "viem";
 import { CHAINS, RPC_URLS, WETH_ADDRESS } from "./config";
 import { scroll } from "viem/chains";
 import coreAbi from "./abi/core.abi";
@@ -7,8 +7,10 @@ import { AccountState } from "./subgraphDetails";
 
 export interface MarketInfo {
   address: string;
+  decimals: number;
   underlyingAddress: string;
   underlyingSymbol: string;
+  underlyingDecimals: number;
   exchangeRateStored: bigint;
 }
 
@@ -71,6 +73,14 @@ export const getMarketInfos = async (
     })) as any,
   });
 
+  const underlyingDecimalResults = await publicClient.multicall({
+    contracts: underlyings.map((m) => ({
+      address: (m as any).address,
+      abi: (m as any).abi,
+      functionName: "decimals",
+    })) as any,
+  });
+
   const exchangeRateResults = await publicClient.multicall({
     contracts: markets.map((m) => ({
       address: m.address,
@@ -80,6 +90,14 @@ export const getMarketInfos = async (
     blockNumber,
   });
 
+  const decimalResults = await publicClient.multicall({
+    contracts: markets.map((m) => ({
+      address: m.address,
+      abi: m.abi,
+      functionName: "decimals",
+    })) as any,
+  });
+
   const marketInfos: MarketInfo[] = [];
 
   for (let i = 0; i < markets.length; i++) {
@@ -88,8 +106,10 @@ export const getMarketInfos = async (
 
     marketInfos.push({
       address: marketAddress,
+      decimals: (decimalResults[i].result as number) || 0,
       underlyingAddress,
       underlyingSymbol: underlyingSymbolResults[i].result as any,
+      underlyingDecimals: underlyingDecimalResults[i].result as any,
       exchangeRateStored: BigInt(
         exchangeRateResults[i].status === "success"
           ? (exchangeRateResults[i].result as any)
@@ -110,7 +130,13 @@ export const updateBorrowBalances = async (
   );
   const marketsByUnderlying: any = {};
   for (let marketInfo of marketInfos) {
-    marketsByUnderlying[marketInfo.underlyingAddress] = marketInfo.address;
+    marketsByUnderlying[marketInfo.underlyingAddress] = {
+      address: marketInfo.address,
+      exchangeRate: marketInfo.exchangeRateStored,
+      decimals: marketInfo.decimals,
+      tokenAddress: marketInfo.underlyingAddress,
+      tokenSymbol: marketInfo.underlyingSymbol,
+    };
   }
 
   const publicClient = createPublicClient({
@@ -131,7 +157,7 @@ export const updateBorrowBalances = async (
       contracts: subStates
         .map((m) => [
           {
-            address: marketsByUnderlying[m.token],
+            address: marketsByUnderlying[m.token].address,
             abi: ltokenAbi,
             functionName: "borrowBalanceOf",
             args: [m.account],
@@ -142,8 +168,11 @@ export const updateBorrowBalances = async (
     });
 
     for (var j = 0; j < subStates.length; j++) {
-      subStates[j].borrowAmount = BigInt(
-        borrowBalanceResults[j].result?.toString() ?? 0
+      subStates[j].borrowAmount = Number(
+        formatUnits(
+          (borrowBalanceResults[j]?.result as bigint) || 0n,
+          marketsByUnderlying[subStates[j].token].underlyingDecimals
+        )
       );
     }
   }

adapters/layerbank/src/sdk/subgraphDetails.ts

@@ -1,4 +1,4 @@
-import { Account, createPublicClient, extractChain, http } from "viem";
+import { formatUnits, createPublicClient, extractChain, http } from "viem";
 import { scroll } from "viem/chains";
 import {
   CHAINS,
@@ -17,8 +17,8 @@ export interface AccountState {
   id: string;
   account: string;
   token: string;
-  lentAmount: bigint;
-  borrowAmount: bigint;
+  lentAmount: number;
+  borrowAmount: number;
 }
 
 export const getAccountStatesForAddressByPoolAtBlock = async (
@@ -94,8 +94,8 @@ export const getAccountStatesForAddressByPoolAtBlock = async (
               ? WETH_ADDRESS[CHAINS.SCROLL].toLowerCase()
               : m.token
           ].toLowerCase(),
-        lentAmount: BigInt(m.supplied),
-        borrowAmount: BigInt(m.borrowed),
+        lentAmount: m.supplied,
+        borrowAmount: m.borrowed,
       }));
 
     // Push the filtered and mapped states into the states array
@@ -120,8 +120,13 @@ export const getAccountStatesForAddressByPoolAtBlock = async (
 
       return {
         ...state,
-        lentAmount:
-          (state.lentAmount * marketInfo.exchangeRateStored) / BigInt(1e18),
+        lentAmount: Number(
+          formatUnits(
+            ((BigInt(state.lentAmount) || 0n) * marketInfo.exchangeRateStored) /
+              10n ** 18n,
+            marketInfo.underlyingDecimals
+          )
+        )
       };
     })
     .filter((x) => x !== undefined) as AccountState[];

adapters/rhomarkets/src/sdk/index.ts

@@ -22,8 +22,8 @@ type OutputDataSchemaRow = {
   market: string;
   token_address: string;
   token_symbol: string;
-  supply_token: bigint;
-  borrow_token: bigint;
+  supply_token: number;
+  borrow_token: number;
   block_number: number;
   timestamp: number;
   protocol: string;
@@ -132,10 +132,10 @@ export const getUserTVLByBlock = async (blocks: BlockData) => {
       timestamp: blocks.blockTimestamp,
       block_number: blocks.blockNumber,
       etl_timestamp: Math.floor(Date.now() / 1000),
-      token_address: marketInfo.tokenAddress,
+      token_address: marketInfo.tokenAddress.toLowerCase(),
       token_symbol: marketInfo.tokenSymbol,
-      user_address: item.user_address,
-      market: item.market,
+      user_address: item.user_address.toLowerCase(),
+      market: item.market.toLowerCase(),
       supply_token: item.supply_token,
       borrow_token: item.borrow_token,
     };