From 05388e675f475e67a5f696197b0a2d28f933417b Mon Sep 17 00:00:00 2001 From: Deadshot Ryker Date: Tue, 20 Aug 2024 00:52:41 +0400 Subject: [PATCH] formatted the foxy data --- adapters/zerolend/src/index.ts | 7 +++++-- adapters/zerolend/src/sdk/foxy.ts | 19 ++++++++++++++----- adapters/zerolend/src/sdk/lp.ts | 12 +++++++++--- adapters/zerolend/src/sdk/stake.ts | 9 +++++++-- adapters/zerolend/src/sdk/tvl.ts | 9 +++++++-- adapters/zerolend/src/sdk/types.ts | 28 ++++++++++++++-------------- 6 files changed, 56 insertions(+), 28 deletions(-) diff --git a/adapters/zerolend/src/index.ts b/adapters/zerolend/src/index.ts index 0a7a38ab..0568f79d 100644 --- a/adapters/zerolend/src/index.ts +++ b/adapters/zerolend/src/index.ts @@ -42,14 +42,17 @@ readBlocksFromCSV("hourly_blocks.csv") for (const block of blocks) { try { - const resultTvl = await getUserTVLByBlock(block); - allCsvRows.push(...resultTvl); + const resultTvlFoxy = await getUserTVLFoxyByBlock(block); + allCsvRows.push(...resultTvlFoxy); const resultStake = await getUserStakeByBlock(block); allCsvRows.push(...resultStake); const resultLp = await getUserLPByBlock(block); allCsvRows.push(...resultLp); + + const resultTvlLegacy = await getUserTVLByBlock(block); + allCsvRows.push(...resultTvlLegacy); } catch (error) { console.error(`An error occurred for block ${block}:`, error); } diff --git a/adapters/zerolend/src/sdk/foxy.ts b/adapters/zerolend/src/sdk/foxy.ts index 87a1c5c0..88f4293d 100644 --- a/adapters/zerolend/src/sdk/foxy.ts +++ b/adapters/zerolend/src/sdk/foxy.ts @@ -1,5 +1,9 @@ -import { BlockData, IUserReserve, ILPResponse, OutputDataSchemaRow } from "./types"; - +import { + BlockData, + IUserReserve, + ILPResponse, + OutputDataSchemaRow, +} from "./types"; const queryURL = "https://api.goldsky.com/api/public/project_clsk1wzatdsls01wchl2e4n0y/subgraphs/zerolend-linea-foxy/1.0.0/gn"; @@ -13,6 +17,12 @@ export const getUserTVLFoxyByBlock = async ( let lastAddress = "0x0000000000000000000000000000000000000000"; + const remapFoxy = (addr: string) => + addr == "0x5fbdf89403270a1846f5ae7d113a989f850d1566" + ? "0x000000000000000000000000000000000000foxy" + : addr; + + console.log("working on foxy data"); do { const query = `{ userReserves( @@ -39,8 +49,7 @@ export const getUserTVLFoxyByBlock = async ( headers: { "Content-Type": "application/json" }, }); const batch: ILPResponse = await response.json(); - console.log(batch); - + if (!batch.data || batch.data.userReserves.length == 0) break; batch.data.userReserves.forEach((data: IUserReserve) => { @@ -52,7 +61,7 @@ export const getUserTVLFoxyByBlock = async ( block_number: blocks.blockNumber, timestamp, user_address: data.user.id, - token_address: data.reserve.underlyingAsset, + token_address: remapFoxy(data.reserve.underlyingAsset), token_balance: Number(balance), token_symbol: data.reserve.symbol, usd_price: 0, diff --git a/adapters/zerolend/src/sdk/lp.ts b/adapters/zerolend/src/sdk/lp.ts index 583469d0..b86a2f4e 100644 --- a/adapters/zerolend/src/sdk/lp.ts +++ b/adapters/zerolend/src/sdk/lp.ts @@ -1,4 +1,9 @@ -import { BlockData, IOmniStakingData, IOmniStakingResponse, OutputDataSchemaRow } from "./types"; +import { + BlockData, + IOmniStakingData, + IOmniStakingResponse, + OutputDataSchemaRow, +} from "./types"; const queryURL = "https://api.goldsky.com/api/public/project_clsk1wzatdsls01wchl2e4n0y/subgraphs/zerolend-omnistaking/1.0.2/gn"; @@ -15,6 +20,7 @@ export const getUserLPByBlock = async ( let lastAddress = "0x0000000000000000000000000000000000000000"; + console.log("working on LP stakers data"); do { const query = `{ tokenBalances( @@ -23,8 +29,8 @@ export const getUserLPByBlock = async ( ) { id balance_omni_lp - } - }`; + } + }`; const response = await fetch(queryURL, { method: "POST", diff --git a/adapters/zerolend/src/sdk/stake.ts b/adapters/zerolend/src/sdk/stake.ts index fd82e544..b5dbbae9 100644 --- a/adapters/zerolend/src/sdk/stake.ts +++ b/adapters/zerolend/src/sdk/stake.ts @@ -1,4 +1,9 @@ -import { BlockData, IOmniStakingData, IOmniStakingResponse, OutputDataSchemaRow } from "./types"; +import { + BlockData, + IOmniStakingData, + IOmniStakingResponse, + OutputDataSchemaRow, +} from "./types"; const queryURL = "https://api.goldsky.com/api/public/project_clsk1wzatdsls01wchl2e4n0y/subgraphs/zerolend-omnistaking/1.0.2/gn"; @@ -14,7 +19,7 @@ export const getUserStakeByBlock = async ( const rows: OutputDataSchemaRow[] = []; let lastAddress = "0x0000000000000000000000000000000000000000"; - + console.log("working on ZERO stakers data"); do { const query = `{ tokenBalances( diff --git a/adapters/zerolend/src/sdk/tvl.ts b/adapters/zerolend/src/sdk/tvl.ts index 2c11a90c..6b96e02a 100644 --- a/adapters/zerolend/src/sdk/tvl.ts +++ b/adapters/zerolend/src/sdk/tvl.ts @@ -1,5 +1,9 @@ -import { BlockData, IUserReserve, ILPResponse, OutputDataSchemaRow } from "./types"; - +import { + BlockData, + IUserReserve, + ILPResponse, + OutputDataSchemaRow, +} from "./types"; const queryURL = "https://api.goldsky.com/api/public/project_clsk1wzatdsls01wchl2e4n0y/subgraphs/zerolend-linea/1.0.0/gn"; @@ -13,6 +17,7 @@ export const getUserTVLByBlock = async ( let lastAddress = "0x0000000000000000000000000000000000000000"; + console.log("working on legacy lending pool data"); do { const query = `{ userReserves( diff --git a/adapters/zerolend/src/sdk/types.ts b/adapters/zerolend/src/sdk/types.ts index 65149bb6..1259e705 100644 --- a/adapters/zerolend/src/sdk/types.ts +++ b/adapters/zerolend/src/sdk/types.ts @@ -26,21 +26,21 @@ export interface BlockData { } export interface ILPResponse { - data: { - userReserves: IUserReserve[]; - }; + data: { + userReserves: IUserReserve[]; + }; } export interface IUserReserve { - user: { - id: string; - }; - currentTotalDebt: string; - currentATokenBalance: string; - reserve: { - underlyingAsset: string; - symbol: string; - name: string; - }; - liquidityRate: "0"; + user: { + id: string; + }; + currentTotalDebt: string; + currentATokenBalance: string; + reserve: { + underlyingAsset: string; + symbol: string; + name: string; + }; + liquidityRate: "0"; }