fix: add totalBalance

zkLinkProtocol · Oct 23, 2024 · a30f16d · a30f16d
1 parent 81056e8
commit a30f16d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 11 deletions.
diff --git a/src/positions/positions.controller.ts b/src/positions/positions.controller.ts
@@ -80,7 +80,7 @@ export class PositionsController {
   @ApiNotFoundResponse({
     description: '{ "errno": 1, "errmsg": "not found" }',
   })
-  public async getRsethBalance(
+  public async getAllBalance(
     @Param("token", new ParseAddressPipe()) token: string,
     @Query() rsethQueryDto: BalanceQueryDto,
   ): Promise<Partial<BalanceReturnDto>> {
@@ -110,16 +110,17 @@ export class PositionsController {
 
         return { account, balance };
       });
-      console.log(
-        data.reduce((acc, cur) => BigInt(cur.balance) + acc, BigInt(0)),
+      const totalBalance = data.reduce(
+        (acc, cur) => BigInt(cur.balance) + acc,
+        BigInt(0),
       );
       const paging = PaginationUtil.paginate(data, page, limit);
       const list = paging.items;
       const meta = paging.meta;
       return {
         errno: 0,
         errmsg: "no error",
-        data: list,
+        data: { totalBalance: totalBalance.toString(), list },
         meta,
       };
     } catch (err) {

diff --git a/src/positions/positions.dto.ts b/src/positions/positions.dto.ts
@@ -116,15 +116,21 @@ export class BalanceReturnDto {
   @ApiProperty({
     type: Array<{ account: string; balance: string }>,
     description: "user's balance",
-    example: [
-      {
-        balance: "10000000000",
-        account: "0x22723cc5ae5a1b4514ca41f2466e2ade15cf529b",
-      },
-    ],
+    example: {
+      totalBalance: "10000000000",
+      list: [
+        {
+          balance: "10000000000",
+          account: "0x22723cc5ae5a1b4514ca41f2466e2ade15cf529b",
+        },
+      ],
+    },
     required: false,
   })
-  public readonly data?: Array<{ account: string; balance: string }>;
+  public readonly data?: {
+    totalBalance: string;
+    list: Array<{ account: string; balance: string }>;
+  };
 
   @ApiProperty({
     type: PagingMetaDto,

diff --git a/src/positions/positions.service.ts b/src/positions/positions.service.ts
@@ -55,6 +55,25 @@ export class PositionsService {
     block: number;
   }) {
     const { token, block, limit, page } = params;
+    const { _meta } = await fetchGraphQLData<{
+      _meta: {
+        block: {
+          number: number;
+        };
+      };
+    }>(
+      "https://graph.zklink.io/subgraphs/name/rseth-balance",
+      `
+      query QueryBlock {
+        _meta {
+          block {
+            number
+          }
+        }
+      }
+      `,
+    );
+    if (_meta.block.number < block) return [];
     const data = await fetchGraphQLData<{ userPositions: any[] }>(
       "https://graph.zklink.io/subgraphs/name/rseth-balance", // If more tokens need to be supported, please modify the subgraph
       `query MyQuery($token: Bytes = \"${token}\") {