From 74aab50fcdbbc05611749f79e99f05f71916d847 Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Fri, 29 Nov 2024 14:49:32 -0300 Subject: [PATCH] refactor: return data key value from query result --- .../isolated-pools/subgraph-client/index.ts | 14 +- .../tests/integration/checkEntities.ts | 4 +- .../isolated-pools/tests/integration/pool.ts | 51 +-- .../tests/integration/poolRegistry.ts | 13 +- .../tests/integration/vTokens.ts | 12 +- .../tests/scripts/checkMarkets.ts | 4 +- subgraphs/venus/subgraph-client/index.ts | 6 +- .../tests/integration/comptroller-after.ts | 4 +- .../tests/integration/comptroller-before.ts | 4 +- subgraphs/venus/tests/integration/vTokens.ts | 343 ++++++------------ .../tests/scripts/checkAccountVTokens.ts | 7 +- subgraphs/venus/tests/scripts/checkMarkets.ts | 12 +- 12 files changed, 168 insertions(+), 306 deletions(-) diff --git a/subgraphs/isolated-pools/subgraph-client/index.ts b/subgraphs/isolated-pools/subgraph-client/index.ts index cbd9931c..901adaa2 100644 --- a/subgraphs/isolated-pools/subgraph-client/index.ts +++ b/subgraphs/isolated-pools/subgraph-client/index.ts @@ -38,12 +38,12 @@ class SubgraphClient { if (result.error) { console.error(result.error); } - return result; + return result.data; } async getPools(): Promise { const result = await this.query(PoolsDocument, {}); - return result.data; + return result; } async getPool(id: string) { @@ -58,7 +58,7 @@ class SubgraphClient { async getMarketById(id: string): Promise { const result = await this.query(MarketByIdDocument, { id }); - return result.data; + return result; } async getAccountById(id: string) { @@ -77,7 +77,7 @@ class SubgraphClient { first: string; skip: string; }); - return result.data; + return result; } async getMarketActions() { @@ -109,7 +109,7 @@ class SubgraphClient { first: string; skip: string; }); - return result.data; + return result; } async getAccountVTokensWithBorrowByMarketId( @@ -126,7 +126,7 @@ class SubgraphClient { first: string; skip: string; }); - return result.data; + return result; } async getAccountVTokenByAccountAndMarket({ @@ -139,7 +139,7 @@ class SubgraphClient { const result = await this.query(AccountVTokenByAccountAndMarketDocument, { id: `${marketId}${accountId.replace('0x', '')}`, }); - return result.data || { accountVToken: null }; + return result || { accountVToken: null }; } async getAccountPositions(id: string) { diff --git a/subgraphs/isolated-pools/tests/integration/checkEntities.ts b/subgraphs/isolated-pools/tests/integration/checkEntities.ts index d9646ea2..c8d4140d 100644 --- a/subgraphs/isolated-pools/tests/integration/checkEntities.ts +++ b/subgraphs/isolated-pools/tests/integration/checkEntities.ts @@ -14,9 +14,9 @@ export const checkMarket = async (marketAddress: string) => { const vToken = await ethers.getContractAt('VToken', marketAddress); const comptroller = await ethers.getContractAt('Comptroller', await vToken.comptroller()); const { accountVTokens: accountVTokensSupply } = - await subgraphClient.getAccountVTokensWithSupplyByMarketId(marketAddress.toLowerCase()); + await subgraphClient.getAccountVTokensWithSupplyByMarketId(marketAddress.toLowerCase(), 1); const { accountVTokens: accountVTokensBorrow } = - await subgraphClient.getAccountVTokensWithBorrowByMarketId(marketAddress.toLowerCase()); + await subgraphClient.getAccountVTokensWithBorrowByMarketId(marketAddress.toLowerCase(), 1); const { market } = await subgraphClient.getMarketById(marketAddress.toLowerCase()); expect(market?.supplierCount).to.equal(accountVTokensSupply.length.toString()); expect(market?.borrowerCount).to.equal(accountVTokensBorrow.length.toString()); diff --git a/subgraphs/isolated-pools/tests/integration/pool.ts b/subgraphs/isolated-pools/tests/integration/pool.ts index 82df998c..8261579c 100644 --- a/subgraphs/isolated-pools/tests/integration/pool.ts +++ b/subgraphs/isolated-pools/tests/integration/pool.ts @@ -18,8 +18,7 @@ describe('Pools', function () { it('handles MarketAdded event', async function () { // check markets - const { data: marketsData } = await subgraphClient.getMarkets(); - const { markets } = marketsData!; + const { markets } = await subgraphClient.getMarkets(); expect(markets.length).to.equal(9); @@ -29,8 +28,7 @@ describe('Pools', function () { }); it('handles NewCloseFactor event', async function () { - const { data: dataBeforeUpdate } = await subgraphClient.getPools(); - const { pools: poolsBeforeUpdate } = dataBeforeUpdate!; + const { pools: poolsBeforeUpdate } = await subgraphClient.getPools(); expect(poolsBeforeUpdate[0].closeFactorMantissa).to.equal('50000000000000000'); @@ -40,15 +38,13 @@ describe('Pools', function () { await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); - const { data } = await subgraphClient.getPools(); - const { pools } = data!; + const { pools } = await subgraphClient.getPools(); expect(pools[0].closeFactorMantissa).to.equal('600000000000000000'); }); it('handles NewCollateralFactor event', async function () { - const { data: dataBeforeEvent } = await subgraphClient.getMarkets(); - const { markets: marketsBeforeEvent } = dataBeforeEvent!; + const { markets: marketsBeforeEvent } = await subgraphClient.getMarkets(); const market = marketsBeforeEvent[1]; const poolLens = await ethers.getContract('PoolLens'); const vTokenMetadata = await poolLens.vTokenMetadata(market.id); @@ -80,8 +76,7 @@ describe('Pools', function () { }); it('handles NewLiquidationIncentive event', async function () { - const { data: dataBeforeEvent } = await subgraphClient.getPools(); - const { pools: poolsBeforeEvent } = dataBeforeEvent!; + const { pools: poolsBeforeEvent } = await subgraphClient.getPools(); expect(poolsBeforeEvent[0].liquidationIncentiveMantissa).to.equal('1000000000000000000'); @@ -91,8 +86,7 @@ describe('Pools', function () { await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); - const { data } = await subgraphClient.getPools(); - const { pools } = data!; + const { pools } = await subgraphClient.getPools(); expect(pools[0].liquidationIncentiveMantissa).to.equal('3000000000000000000'); // reset @@ -101,8 +95,7 @@ describe('Pools', function () { it('handles NewPriceOracle event', async function () { const newPriceOracle = '0x0000000000000000000000000000000000000123'; - const { data } = await subgraphClient.getPools(); - const { pools } = data!; + const { pools } = await subgraphClient.getPools(); const priceOracle = await ethers.getContract('ResilientOracle'); @@ -114,22 +107,19 @@ describe('Pools', function () { await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); - const { data: updatedPoolData } = await subgraphClient.getPools(); + const { pools: updatedPools } = await subgraphClient.getPools(); - const { pools: updatedPools } = updatedPoolData!; expect(updatedPools[0].priceOracleAddress).to.equal(newPriceOracle); // Reset oracle address await comptrollerProxy.setPriceOracle(priceOracle.address); }); it('handles ActionPausedMarket event', async function () { - const { data: dataBeforeEvent } = await subgraphClient.getMarketActions(); - const { marketActions: marketActionsBeforeEvent } = dataBeforeEvent!; + const { marketActions: marketActionsBeforeEvent } = await subgraphClient.getMarketActions(); expect(marketActionsBeforeEvent.length).to.be.equal(0); - const { data: marketsData } = await subgraphClient.getMarkets(); - const { markets } = marketsData!; + const { markets } = await subgraphClient.getMarkets(); const market = markets[1]; const comptrollerProxy = await ethers.getContractAt('Comptroller', market.pool.id); @@ -137,8 +127,7 @@ describe('Pools', function () { await tx.wait(1); await waitForSubgraphToBeSynced(4000); - const { data } = await subgraphClient.getMarketActions(); - const { marketActions } = data!; + const { marketActions } = await subgraphClient.getMarketActions(); expect(marketActions.length).to.be.equal(1); marketActions.forEach(ma => { @@ -151,8 +140,7 @@ describe('Pools', function () { }); it('handles NewBorrowCap event', async function () { - const { data } = await subgraphClient.getMarkets(); - const { markets: marketsBeforeUpdate } = data!; + const { markets: marketsBeforeUpdate } = await subgraphClient.getMarkets(); const poolLens = await ethers.getContract('PoolLens'); let vTokenMetadata = await poolLens.vTokenMetadata(marketsBeforeUpdate[0].id); @@ -167,16 +155,14 @@ describe('Pools', function () { await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); - const { data: marketsData } = await subgraphClient.getMarkets(); - const { markets } = marketsData!; + const { markets } = await subgraphClient.getMarkets(); vTokenMetadata = await poolLens.vTokenMetadata(marketsBeforeUpdate[0].id); expect(markets[0].borrowCapMantissa).to.equal(vTokenMetadata.borrowCaps.toString()); }); it('handles NewMinLiquidatableCollateral event', async function () { - const { data: dataBeforeUpdate } = await subgraphClient.getPools(); - const { pools: poolsBeforeUpdate } = dataBeforeUpdate!; + const { pools: poolsBeforeUpdate } = await subgraphClient.getPools(); expect(poolsBeforeUpdate[0].minLiquidatableCollateralMantissa).to.equal( '100000000000000000000', @@ -188,8 +174,7 @@ describe('Pools', function () { await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); - const { data } = await subgraphClient.getPools(); - const { pools } = data!; + const { pools } = await subgraphClient.getPools(); expect(pools[0].minLiquidatableCollateralMantissa).to.equal('200000000000000000000'); // reset @@ -197,8 +182,7 @@ describe('Pools', function () { }); it('handles NewSupplyCap event', async function () { - const { data } = await subgraphClient.getMarkets(); - const { markets: marketsBeforeUpdate } = data!; + const { markets: marketsBeforeUpdate } = await subgraphClient.getMarkets(); const poolLens = await ethers.getContract('PoolLens'); let vTokenMetadata = await poolLens.vTokenMetadata(marketsBeforeUpdate[0].id); @@ -216,8 +200,7 @@ describe('Pools', function () { await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); - const { data: marketsData } = await subgraphClient.getMarkets(); - const { markets } = marketsData!; + const { markets } = await subgraphClient.getMarkets(); vTokenMetadata = await poolLens.vTokenMetadata(marketsBeforeUpdate[0].id); expect(markets[0].supplyCapMantissa).to.equal(vTokenMetadata.supplyCaps.toString()); diff --git a/subgraphs/isolated-pools/tests/integration/poolRegistry.ts b/subgraphs/isolated-pools/tests/integration/poolRegistry.ts index f5ddc6f4..fdfaf3f9 100644 --- a/subgraphs/isolated-pools/tests/integration/poolRegistry.ts +++ b/subgraphs/isolated-pools/tests/integration/poolRegistry.ts @@ -45,8 +45,7 @@ describe('Pool Registry', function () { }); it('indexes pool registry events', async function () { - const { data } = await subgraphClient.getPools(); - const { pools } = data!; + const { pools } = await subgraphClient.getPools(); expect(pools.length).to.equal(2); @@ -67,10 +66,9 @@ describe('Pool Registry', function () { it('updates and returns metadata from the pool', async function () { const pools = await poolLens.getAllPools(poolRegistry.address); - const { data: dataBeforeUpdate } = await subgraphClient.getPool( + const { pool: poolBeforeUpdate } = await subgraphClient.getPool( pools[1].comptroller.toLowerCase(), ); - const { pool: poolBeforeUpdate } = dataBeforeUpdate!; const onChainPool = await poolLens.getPoolByComptroller( poolRegistry.address, poolBeforeUpdate.id, @@ -96,15 +94,14 @@ describe('Pool Registry', function () { it('sets the pool name', async function () { const newName = 'New Pool 1'; - const { data: dataBeforeUpdate } = await subgraphClient.getPools(); - const { pools: poolsBeforeUpdate } = dataBeforeUpdate!; + const { pools: poolsBeforeUpdate } = await subgraphClient.getPools(); + const tx = await poolRegistry.setPoolName(poolsBeforeUpdate[0].id, newName); await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); - const { data } = await subgraphClient.getPools(); + const { pools } = await subgraphClient.getPools(); - const { pools } = data!; const pool = pools[0]; expect(pool.name).to.be.equal(newName); }); diff --git a/subgraphs/isolated-pools/tests/integration/vTokens.ts b/subgraphs/isolated-pools/tests/integration/vTokens.ts index 68bc6b05..c6074df7 100644 --- a/subgraphs/isolated-pools/tests/integration/vTokens.ts +++ b/subgraphs/isolated-pools/tests/integration/vTokens.ts @@ -351,14 +351,14 @@ describe('VToken events', function () { await checkMarket(vBnxToken.address); - const { - data: { account: accountBorrower }, - } = await subgraphClient.getAccountById(borrower1.address.toLowerCase()); + const { account: accountBorrower } = await subgraphClient.getAccountById( + borrower1.address.toLowerCase(), + ); expect(accountBorrower.countLiquidated).to.equal(1); - const { - data: { account: accountLiquidator }, - } = await subgraphClient.getAccountById(liquidator1.address.toLowerCase()); + const { account: accountLiquidator } = await subgraphClient.getAccountById( + liquidator1.address.toLowerCase(), + ); expect(accountLiquidator.countLiquidator).to.equal(1); const vBnxMarket = await checkMarket(vBnxToken.address); diff --git a/subgraphs/isolated-pools/tests/scripts/checkMarkets.ts b/subgraphs/isolated-pools/tests/scripts/checkMarkets.ts index a02c55ba..ec41d206 100644 --- a/subgraphs/isolated-pools/tests/scripts/checkMarkets.ts +++ b/subgraphs/isolated-pools/tests/scripts/checkMarkets.ts @@ -68,9 +68,7 @@ const checkMarkets = async ( provider: providers.MulticallProvider, subgraphClient: ReturnType, ) => { - const { - data: { markets }, - } = await subgraphClient.getMarkets(); + const { markets } = await subgraphClient.getMarkets(); for (const market of markets) { const vTokenContract = new ethers.Contract(market.id, VBep20Abi, provider); diff --git a/subgraphs/venus/subgraph-client/index.ts b/subgraphs/venus/subgraph-client/index.ts index 246edaf2..1e4f75ac 100644 --- a/subgraphs/venus/subgraph-client/index.ts +++ b/subgraphs/venus/subgraph-client/index.ts @@ -31,7 +31,7 @@ class SubgraphClient { if (result.error) { console.error(result.error); } - return result; + return result.data; } async getComptroller(): Promise<{ comptroller: ComptrollersQuery['comptrollers'][number] }> { @@ -78,7 +78,7 @@ class SubgraphClient { skip: skip as unknown as string, marketId, }); - return result.data; + return result; } async getAccountVTokensWithBorrowByMarketId({ @@ -95,7 +95,7 @@ class SubgraphClient { skip: skip as unknown as string, marketId, }); - return result.data; + return result; } async getAccountVTokensByAccountId(accountId: string) { diff --git a/subgraphs/venus/tests/integration/comptroller-after.ts b/subgraphs/venus/tests/integration/comptroller-after.ts index 3070e220..0a56d3d5 100644 --- a/subgraphs/venus/tests/integration/comptroller-after.ts +++ b/subgraphs/venus/tests/integration/comptroller-after.ts @@ -59,9 +59,7 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); for (const market of markets) { - const { - data: { market: unlistedMarket }, - } = await subgraphClient.getMarketById(market.toLowerCase()); + const { market: unlistedMarket } = await subgraphClient.getMarketById(market.toLowerCase()); expect(unlistedMarket.isListed).to.equal(false); } diff --git a/subgraphs/venus/tests/integration/comptroller-before.ts b/subgraphs/venus/tests/integration/comptroller-before.ts index a60aa6a5..aac0095e 100644 --- a/subgraphs/venus/tests/integration/comptroller-before.ts +++ b/subgraphs/venus/tests/integration/comptroller-before.ts @@ -51,9 +51,7 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); for (const [idx, market] of markets.entries()) { - const { - data: { market: listedMarket }, - } = await subgraphClient.getMarketById(market.toLowerCase()); + const { market: listedMarket } = await subgraphClient.getMarketById(market.toLowerCase()); expect(listedMarket.isListed).to.equal(true); expect(listedMarket.collateralFactorMantissa).to.equal('0'); diff --git a/subgraphs/venus/tests/integration/vTokens.ts b/subgraphs/venus/tests/integration/vTokens.ts index d6793979..1b3506d0 100644 --- a/subgraphs/venus/tests/integration/vTokens.ts +++ b/subgraphs/venus/tests/integration/vTokens.ts @@ -14,9 +14,7 @@ const subgraphClient = createSubgraphClient( ); const checkSupply = async (account: string, vToken: Contract) => { - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vToken.address.toLowerCase(), accountId: account, }); @@ -25,16 +23,12 @@ const checkSupply = async (account: string, vToken: Contract) => { expect(accountVToken?.vTokenBalanceMantissa || '0').to.equal(accountContractBalance.toString()); // on market const accrualBlockNumber = await vToken.accrualBlockNumber(); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.accrualBlockNumber.toString()).to.equal(accrualBlockNumber.toString()); }; const checkBorrows = async (account: string, vToken: Contract) => { - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vToken.address.toLowerCase(), accountId: account, }); @@ -47,9 +41,7 @@ const checkBorrows = async (account: string, vToken: Contract) => { expect(accountVToken.account.hasBorrowed).to.equal(true); // on market const accrualBlockNumber = await vToken.accrualBlockNumber(); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.accrualBlockNumber.toString()).to.equal(accrualBlockNumber.toString()); expect(market?.borrowIndex.toString()).to.equal(borrowIndex.toString()); }; @@ -250,9 +242,7 @@ describe('VToken events', function () { for (const account of suppliers) { for (const vToken of [vFdusdToken, vUsdtToken, vDogeToken]) { await checkSupply(account._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('3'); expect(market?.totalSupplyVTokenMantissa).to.equal(await vToken.totalSupply()); const supplyState = await comptroller.venusSupplyState(vToken.address); @@ -271,9 +261,7 @@ describe('VToken events', function () { for (const account of borrowers) { for (const vToken of [vFdusdToken, vDogeToken]) { await checkSupply(account._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('6'); expect(market?.totalSupplyVTokenMantissa).to.equal(await vToken.totalSupply()); @@ -310,15 +298,11 @@ describe('VToken events', function () { for (const account of suppliers) { for (const vToken of [vFdusdToken, vDogeToken]) { await checkSupply(account._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('6'); } await checkSupply(account._address, vUsdtToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vUsdtToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vUsdtToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('3'); } @@ -332,9 +316,7 @@ describe('VToken events', function () { for (const account of borrowers) { for (const vToken of [vFdusdToken, vDogeToken]) { await checkSupply(account._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('6'); } } @@ -352,17 +334,13 @@ describe('VToken events', function () { await checkSupply(supplier2Signer._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('6'); expect(market?.totalSupplyVTokenMantissa).to.equal(await vToken.totalSupply()); const supplyState = await comptroller.venusSupplyState(vToken.address); expect(market?.xvsSupplyStateIndex).to.equal(supplyState.index.toString()); expect(market?.xvsSupplyStateBlock).to.equal(supplyState.block.toString()); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vToken.address.toLowerCase(), accountId: supplier2Signer._address, }); @@ -380,9 +358,7 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); await checkSupply(supplier2Signer._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('5'); const supplyState = await comptroller.venusSupplyState(vToken.address); expect(market?.xvsSupplyStateIndex).to.equal(supplyState.index.toString()); @@ -404,9 +380,7 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); for (const vTokenAddress of [vFdusdToken.address, vUsdtToken.address, vDogeToken.address]) { - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vTokenAddress.toLowerCase(), accountId: borrower1Signer._address, }); @@ -414,9 +388,7 @@ describe('VToken events', function () { } for (const vTokenAddress of [vFdusdToken.address, vUsdtToken.address, vDogeToken.address]) { - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vTokenAddress.toLowerCase(), accountId: borrower2Signer._address, }); @@ -424,9 +396,7 @@ describe('VToken events', function () { } for (const vTokenAddress of [vFdusdToken.address, vUsdtToken.address, vDogeToken.address]) { - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vTokenAddress.toLowerCase(), accountId: borrower3Signer._address, }); @@ -441,28 +411,25 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); - const { - data: { accountVToken: accountVTokenVUsdt }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vUsdtToken.address.toLowerCase(), - accountId: borrower1Signer._address, - }); + const { accountVToken: accountVTokenVUsdt } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vUsdtToken.address.toLowerCase(), + accountId: borrower1Signer._address, + }); expect(accountVTokenVUsdt?.enteredMarket).to.equal(false); - const { - data: { accountVToken: accountVTokenVDoge }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vDogeToken.address.toLowerCase(), - accountId: borrower2Signer._address, - }); + const { accountVToken: accountVTokenVDoge } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vDogeToken.address.toLowerCase(), + accountId: borrower2Signer._address, + }); expect(accountVTokenVDoge?.enteredMarket).to.equal(false); - const { - data: { accountVToken: accountVTokenVFusd }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vFdusdToken.address.toLowerCase(), - accountId: borrower3Signer._address, - }); + const { accountVToken: accountVTokenVFusd } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vFdusdToken.address.toLowerCase(), + accountId: borrower3Signer._address, + }); expect(accountVTokenVFusd?.enteredMarket).to.equal(false); }); @@ -487,9 +454,7 @@ describe('VToken events', function () { await checkBorrows(borrower1Signer._address, vFdusdToken); for (const vToken of [vFdusdToken, vUsdtToken, vDogeToken]) { - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.borrowerCount).to.equal('1'); expect(market?.totalBorrowsMantissa).to.equal((await vToken.totalBorrows()).toString()); @@ -511,9 +476,7 @@ describe('VToken events', function () { await checkBorrows(borrower2Signer._address, vDogeToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vDogeToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vDogeToken.address.toLowerCase()); expect(market?.borrowerCount).to.equal('1'); expect(market?.totalBorrowsMantissa).to.equal((await vDogeToken.totalBorrows()).toString()); const borrowState = await comptroller.venusBorrowState(vDogeToken.address); @@ -529,15 +492,11 @@ describe('VToken events', function () { await checkBorrows(borrower2Signer._address, vDogeToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vDogeToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vDogeToken.address.toLowerCase()); expect(market?.borrowerCount).to.equal('1'); expect(market?.totalBorrowsMantissa).to.equal((await vDogeToken.totalBorrows()).toString()); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vDogeToken.address.toLowerCase(), accountId: borrower2Signer._address, }); @@ -550,9 +509,7 @@ describe('VToken events', function () { const prevBorrowIndex = await vToken.borrowIndex(); const prevTotalBorrows = await vToken.totalBorrows(); const prevCash = await vToken.getCash(); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); await vToken.accrueInterest(); await waitForSubgraphToBeSynced(syncDelay); @@ -581,9 +538,7 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market.reservesMantissa).to.equal(amount); expect(market.borrowRateMantissa).to.be.greaterThanOrEqual(borrowRateMantissaPrev); @@ -604,16 +559,12 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vDogeToken.address.toLowerCase(), accountId: borrower2Signer._address, }); - const { - data: { market }, - } = await subgraphClient.getMarketById(vDogeToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vDogeToken.address.toLowerCase()); const borrowState = await comptroller.venusBorrowState(vDogeToken.address); expect(market?.xvsBorrowStateIndex).to.equal(borrowState.index.toString()); @@ -627,28 +578,27 @@ describe('VToken events', function () { ); expect(accountVToken?.borrowIndex || '0').to.equal(await vDogeToken.borrowIndex()); - const { - data: { account: accountBorrower }, - } = await subgraphClient.getAccountById(borrower2Signer._address); + const { account: accountBorrower } = await subgraphClient.getAccountById( + borrower2Signer._address, + ); expect(accountBorrower.countLiquidated).to.equal(1); - const { - data: { account: accountLiquidator }, - } = await subgraphClient.getAccountById(liquidator1Signer._address); + const { account: accountLiquidator } = await subgraphClient.getAccountById( + liquidator1Signer._address, + ); expect(accountLiquidator.countLiquidator).to.equal(1); // Counts liquidator as borrower - const { - data: { market: marketUpdated }, - } = await subgraphClient.getMarketById(vFdusdToken.address.toLowerCase()); + const { market: marketUpdated } = await subgraphClient.getMarketById( + vFdusdToken.address.toLowerCase(), + ); expect(marketUpdated?.supplierCount).to.equal('6'); - const { data: liquidatorAccountVTokenData } = + const { accountVToken: liquidatorAccountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ accountId: liquidator1Signer._address.toLowerCase(), marketId: vFdusdToken.address.toLowerCase(), }); - const { accountVToken: liquidatorAccountVToken } = liquidatorAccountVTokenData!; expect(liquidatorAccountVToken.vTokenBalanceMantissa).to.be.approximately( ethers.BigNumber.from(await vFdusdToken.balanceOf(liquidator1Signer._address)), @@ -661,12 +611,11 @@ describe('VToken events', function () { }); it('should update the borrower count on the market for full repayment of borrow', async function () { - const { - data: { accountVToken: accountVTokenPrev }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vDogeToken.address.toLowerCase(), - accountId: borrower2Signer._address, - }); + const { accountVToken: accountVTokenPrev } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vDogeToken.address.toLowerCase(), + accountId: borrower2Signer._address, + }); const borrowBalance = await vDogeToken.callStatic.borrowBalanceCurrent( borrower2Signer._address, ); @@ -678,9 +627,7 @@ describe('VToken events', function () { await checkBorrows(borrower2Signer._address, vDogeToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vDogeToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vDogeToken.address.toLowerCase()); expect(await vDogeToken.callStatic.borrowBalanceCurrent(borrower2Signer._address)).to.equal( 0, ); @@ -690,9 +637,7 @@ describe('VToken events', function () { expect(market?.xvsBorrowStateIndex).to.equal(borrowState.index.toString()); expect(market?.xvsBorrowStateBlock).to.equal(borrowState.block.toString()); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vDogeToken.address.toLowerCase(), accountId: borrower2Signer._address, }); @@ -717,28 +662,23 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vToken.address.toLowerCase(), accountId: supplier._address, }); expect(accountVToken.vTokenBalanceMantissa).to.equal(supplierBalance.toString()); - const { - data: { accountVToken: accountVTokenLiquidator }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vToken.address.toLowerCase(), - accountId: liquidator1Signer._address, - }); + const { accountVToken: accountVTokenLiquidator } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vToken.address.toLowerCase(), + accountId: liquidator1Signer._address, + }); expect(accountVTokenLiquidator.vTokenBalanceMantissa).to.equal( liquidatorBalance.add(supplierBalance).toString(), ); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); const supplyState = await comptroller.venusSupplyState(vToken.address); expect(market?.xvsSupplyStateIndex).to.equal(supplyState.index.toString()); @@ -774,9 +714,7 @@ describe('VToken events', function () { for (const account of suppliers) { for (const vToken of [vUsdcToken, vWBnbToken, vEthToken]) { await checkSupply(account._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('3'); expect(market?.totalSupplyVTokenMantissa).to.equal(await vToken.totalSupply()); @@ -796,9 +734,7 @@ describe('VToken events', function () { for (const account of borrowers) { for (const vToken of [vUsdcToken, vEthToken]) { await checkSupply(account._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('6'); expect(market?.totalSupplyVTokenMantissa).to.equal(await vToken.totalSupply()); @@ -832,15 +768,11 @@ describe('VToken events', function () { for (const account of suppliers) { for (const vToken of [vUsdcToken, vEthToken]) { await checkSupply(account._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('6'); } await checkSupply(account._address, vWBnbToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vWBnbToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vWBnbToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('3'); } @@ -854,9 +786,7 @@ describe('VToken events', function () { for (const account of borrowers) { for (const vToken of [vUsdcToken, vEthToken]) { await checkSupply(account._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('6'); } } @@ -871,17 +801,13 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); await checkSupply(supplier2Signer._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('6'); expect(market?.totalSupplyVTokenMantissa).to.equal(await vToken.totalSupply()); const supplyState = await comptroller.venusSupplyState(vToken.address); expect(market?.xvsSupplyStateIndex).to.equal(supplyState.index.toString()); expect(market?.xvsSupplyStateBlock).to.equal(supplyState.block.toString()); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vToken.address.toLowerCase(), accountId: supplier2Signer._address, }); @@ -899,9 +825,7 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); await checkSupply(supplier2Signer._address, vToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.supplierCount).to.equal('5'); } }); @@ -920,9 +844,7 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); for (const vTokenAddress of [vUsdcToken.address, vWBnbToken.address, vEthToken.address]) { - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vTokenAddress.toLowerCase(), accountId: borrower1Signer._address, }); @@ -930,9 +852,7 @@ describe('VToken events', function () { } for (const vTokenAddress of [vUsdcToken.address, vWBnbToken.address, vEthToken.address]) { - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vTokenAddress.toLowerCase(), accountId: borrower2Signer._address, }); @@ -940,9 +860,7 @@ describe('VToken events', function () { } for (const vTokenAddress of [vUsdcToken.address, vWBnbToken.address, vEthToken.address]) { - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vTokenAddress.toLowerCase(), accountId: borrower3Signer._address, }); @@ -957,28 +875,25 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); - const { - data: { accountVToken: accountVTokenVWbnb }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vWBnbToken.address.toLowerCase(), - accountId: borrower1Signer._address, - }); + const { accountVToken: accountVTokenVWbnb } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vWBnbToken.address.toLowerCase(), + accountId: borrower1Signer._address, + }); expect(accountVTokenVWbnb?.enteredMarket).to.equal(false); - const { - data: { accountVToken: accountVTokenVEth }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vEthToken.address.toLowerCase(), - accountId: borrower2Signer._address, - }); + const { accountVToken: accountVTokenVEth } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vEthToken.address.toLowerCase(), + accountId: borrower2Signer._address, + }); expect(accountVTokenVEth?.enteredMarket).to.equal(false); - const { - data: { accountVToken: accountVTokenVUsdc }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vUsdcToken.address.toLowerCase(), - accountId: borrower3Signer._address, - }); + const { accountVToken: accountVTokenVUsdc } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vUsdcToken.address.toLowerCase(), + accountId: borrower3Signer._address, + }); expect(accountVTokenVUsdc?.enteredMarket).to.equal(false); }); @@ -1005,9 +920,7 @@ describe('VToken events', function () { await checkBorrows(borrower1Signer._address, vUsdcToken); for (const vToken of [vUsdcToken, vWBnbToken, vEthToken]) { - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market?.borrowerCount).to.equal('1'); expect(market?.totalBorrowsMantissa).to.equal((await vToken.totalBorrows()).toString()); const borrowState = await comptroller.venusBorrowState(vToken.address); @@ -1028,9 +941,7 @@ describe('VToken events', function () { await checkBorrows(borrower1Signer._address, vEthToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vEthToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vEthToken.address.toLowerCase()); expect(market?.borrowerCount).to.equal('1'); expect(market?.totalBorrowsMantissa).to.equal((await vEthToken.totalBorrows()).toString()); const borrowState = await comptroller.venusBorrowState(vEthToken.address); @@ -1046,18 +957,14 @@ describe('VToken events', function () { await checkBorrows(borrower1Signer._address, vEthToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vEthToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vEthToken.address.toLowerCase()); expect(market?.borrowerCount).to.equal('1'); expect(market?.totalBorrowsMantissa).to.equal((await vEthToken.totalBorrows()).toString()); const borrowState = await comptroller.venusBorrowState(vEthToken.address); expect(market?.xvsBorrowStateIndex).to.equal(borrowState.index.toString()); expect(market?.xvsBorrowStateBlock).to.equal(borrowState.block.toString()); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vEthToken.address.toLowerCase(), accountId: borrower1Signer._address, }); @@ -1070,9 +977,7 @@ describe('VToken events', function () { const prevBorrowIndex = await vToken.borrowIndex(); const prevTotalBorrows = await vToken.totalBorrows(); const prevCash = await vToken.getCash(); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); await vToken.accrueInterest(); await waitForSubgraphToBeSynced(syncDelay); @@ -1098,9 +1003,7 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); expect(market.reservesMantissa).to.equal(amount); expect(market.borrowRateMantissa).to.be.greaterThanOrEqual(borrowRateMantissaPrev); @@ -1118,9 +1021,7 @@ describe('VToken events', function () { .liquidateBorrow(borrower1Signer._address, eth200Usd.toString(), vUsdcToken.address); await waitForSubgraphToBeSynced(syncDelay); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vEthToken.address.toLowerCase(), accountId: borrower1Signer._address, }); @@ -1133,19 +1034,17 @@ describe('VToken events', function () { ); expect(accountVToken?.borrowIndex || '0').to.equal(await vEthToken.borrowIndex()); - const { - data: { account: accountBorrower }, - } = await subgraphClient.getAccountById(borrower1Signer._address); + const { account: accountBorrower } = await subgraphClient.getAccountById( + borrower1Signer._address, + ); expect(accountBorrower.countLiquidated).to.equal(1); - const { - data: { account: accountLiquidator }, - } = await subgraphClient.getAccountById(liquidator1Signer._address); + const { account: accountLiquidator } = await subgraphClient.getAccountById( + liquidator1Signer._address, + ); expect(accountLiquidator.countLiquidator).to.equal(2); - const { - data: { market }, - } = await subgraphClient.getMarketById(vEthToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vEthToken.address.toLowerCase()); const borrowState = await comptroller.venusBorrowState(vEthToken.address); expect(market?.xvsBorrowStateIndex).to.equal(borrowState.index.toString()); expect(market?.xvsBorrowStateBlock).to.equal(borrowState.block.toString()); @@ -1156,12 +1055,11 @@ describe('VToken events', function () { }); it('should update the borrower count on the market for full repayment of borrow', async function () { - const { - data: { accountVToken: accountVTokenPrev }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vEthToken.address.toLowerCase(), - accountId: borrower1Signer._address, - }); + const { accountVToken: accountVTokenPrev } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vEthToken.address.toLowerCase(), + accountId: borrower1Signer._address, + }); const borrowBalance = await vEthToken.callStatic.borrowBalanceCurrent( borrower1Signer._address, ); @@ -1174,9 +1072,7 @@ describe('VToken events', function () { await checkBorrows(borrower1Signer._address, vEthToken); - const { - data: { market }, - } = await subgraphClient.getMarketById(vEthToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vEthToken.address.toLowerCase()); expect( await vEthToken.callStatic.borrowBalanceCurrent(borrower1Signer._address), ).to.be.lessThanOrEqual(10); @@ -1186,9 +1082,7 @@ describe('VToken events', function () { expect(market?.xvsBorrowStateIndex).to.equal(borrowState.index.toString()); expect(market?.xvsBorrowStateBlock).to.equal(borrowState.block.toString()); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vEthToken.address.toLowerCase(), accountId: borrower1Signer._address, }); @@ -1213,29 +1107,24 @@ describe('VToken events', function () { await waitForSubgraphToBeSynced(syncDelay); - const { - data: { market }, - } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); + const { market } = await subgraphClient.getMarketById(vToken.address.toLowerCase()); const supplyState = await comptroller.venusSupplyState(vToken.address); expect(market?.xvsSupplyStateIndex).to.equal(supplyState.index.toString()); expect(market?.xvsSupplyStateBlock).to.equal(supplyState.block.toString()); - const { - data: { accountVToken }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ + const { accountVToken } = await subgraphClient.getAccountVTokenByAccountAndMarket({ marketId: vToken.address.toLowerCase(), accountId: supplier._address, }); expect(accountVToken.vTokenBalanceMantissa).to.equal(supplierBalance.toString()); - const { - data: { accountVToken: accountVTokenLiquidator }, - } = await subgraphClient.getAccountVTokenByAccountAndMarket({ - marketId: vToken.address.toLowerCase(), - accountId: liquidator1Signer._address, - }); + const { accountVToken: accountVTokenLiquidator } = + await subgraphClient.getAccountVTokenByAccountAndMarket({ + marketId: vToken.address.toLowerCase(), + accountId: liquidator1Signer._address, + }); expect(accountVTokenLiquidator.vTokenBalanceMantissa).to.equal( liquidatorBalance.add(supplierBalance).toString(), ); diff --git a/subgraphs/venus/tests/scripts/checkAccountVTokens.ts b/subgraphs/venus/tests/scripts/checkAccountVTokens.ts index 108ccc68..cfb2d6cf 100644 --- a/subgraphs/venus/tests/scripts/checkAccountVTokens.ts +++ b/subgraphs/venus/tests/scripts/checkAccountVTokens.ts @@ -13,9 +13,10 @@ const checkAccountVTokens = async ( let skip = 0; while (skip >= 0) { console.log(`processed ${skip * 25}...`); - const { - data: { accountVTokens }, - } = await subgraphClient.getAccountVTokens({ first: 25, skip: skip * 25 }); + const { accountVTokens } = await subgraphClient.getAccountVTokens({ + first: 25, + skip: skip * 25, + }); for (const accountVToken of accountVTokens) { const vTokenContract = new ethers.Contract(accountVToken.market.id, VBep20Abi.abi, provider); const accountBalance = await vTokenContract.balanceOf(accountVToken.account.id); diff --git a/subgraphs/venus/tests/scripts/checkMarkets.ts b/subgraphs/venus/tests/scripts/checkMarkets.ts index 007d5b3b..f5825363 100644 --- a/subgraphs/venus/tests/scripts/checkMarkets.ts +++ b/subgraphs/venus/tests/scripts/checkMarkets.ts @@ -33,9 +33,7 @@ const checkMarkets = async ( provider: providers.MulticallProvider, subgraphClient: ReturnType, ) => { - const { - data: { markets }, - } = await subgraphClient.getMarkets(); + const { markets } = await subgraphClient.getMarkets(); for (const market of markets) { const vTokenContract = new ethers.Contract(market.id, VBep20Abi, provider); const [comptrollerAddress, underlyingAddress] = await Promise.all([ @@ -175,8 +173,8 @@ const checkMarkets = async ( market.totalSupplyVTokenMantissa, ` incorrect total supply market ${market.symbol} ${ - market.id - } contract ${totalSupply.toString()} subgraph ${market.totalSupplyVTokenMantissa.toString()}`, + market.id + } contract ${totalSupply.toString()} subgraph ${market.totalSupplyVTokenMantissa.toString()}`, ); console.log(`correct supply for ${market.symbol}`); } catch (e) { @@ -193,8 +191,8 @@ const checkMarkets = async ( market.totalBorrowsMantissa.toString(), ` incorrect total borrow on market ${market.symbol} ${ - market.id - } contract ${totalBorrows.toString()} subgraph ${market.totalBorrowsMantissa.toString()}`, + market.id + } contract ${totalBorrows.toString()} subgraph ${market.totalBorrowsMantissa.toString()}`, ); console.log(`correct borrow for ${market.symbol}`); } catch (e) {