adding query params (#519)

* adding query params * changeset
balancer · Jul 1, 2024 · 798c947 · 798c947
1 parent d5cbaf3
commit 798c947
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 19 deletions.
diff --git a/.changeset/modern-pandas-jump.md b/.changeset/modern-pandas-jump.md
@@ -0,0 +1,5 @@
+---
+'backend': patch
+---
+
+adding chain and user address as query params to vebal queries
diff --git a/modules/vebal/vebal-balance.test.ts b/modules/vebal/vebal-balance.test.ts
@@ -6,7 +6,7 @@ describe('vebal debugging', () => {
         initRequestScopedContext();
         setRequestScopedContextValue('chainId', '1');
         await veBalService.syncVeBalBalances();
-        const holder = await veBalService.getVeBalUserData('0x4ec8459bb6bab83d8987373f6ae47b9a60bd5a6a');
+        const holder = await veBalService.getVeBalUserData('MAINNET', '0x4ec8459bb6bab83d8987373f6ae47b9a60bd5a6a');
         expect(holder.balance).not.toBe('0.0');
         expect(holder.locked).not.toBe('0.0');
         expect(holder.lockedUsd).not.toBe('0.00');

diff --git a/modules/vebal/vebal.gql b/modules/vebal/vebal.gql
@@ -1,8 +1,8 @@
 extend type Query {
-    veBalGetUserBalance: AmountHumanReadable!
-    veBalGetTotalSupply: AmountHumanReadable!
+    veBalGetUserBalance(chain: GqlChain, address: String): AmountHumanReadable!
+    veBalGetTotalSupply(chain: GqlChain): AmountHumanReadable!
     veBalGetVotingList: [GqlVotingPool!]!
-    veBalGetUser: GqlVeBalUserData!
+    veBalGetUser(chain: GqlChain, address: String!): GqlVeBalUserData!
 }
 
 extend type Mutation {

diff --git a/modules/vebal/vebal.resolvers.ts b/modules/vebal/vebal.resolvers.ts
@@ -2,19 +2,40 @@ import { Resolvers } from '../../schema';
 import { getRequiredAccountAddress, isAdminRoute } from '../auth/auth-context';
 import { veBalService } from './vebal.service';
 import { veBalVotingListService } from './vebal-voting-list.service';
+import { headerChain } from '../context/header-chain';
 
 const resolvers: Resolvers = {
     Query: {
-        veBalGetUserBalance: async (parent, {}, context) => {
-            const accountAddress = getRequiredAccountAddress(context);
-            return veBalService.getVeBalUserBalance(accountAddress);
+        veBalGetUserBalance: async (parent, { chain, address }, context) => {
+            const currentChain = headerChain();
+            if (!chain && currentChain) {
+                chain = currentChain;
+            } else if (!chain) {
+                throw new Error('veBalGetUserBalance error: Provide "chains" param');
+            }
+
+            const accountAddress = address || getRequiredAccountAddress(context);
+            return veBalService.getVeBalUserBalance(chain, accountAddress);
         },
-        veBalGetUser: async (parent, {}, context) => {
-            const accountAddress = getRequiredAccountAddress(context);
-            return veBalService.getVeBalUserData(accountAddress);
+        veBalGetUser: async (parent, { chain, address }, context) => {
+            const currentChain = headerChain();
+            if (!chain && currentChain) {
+                chain = currentChain;
+            } else if (!chain) {
+                throw new Error('veBalGetUser error: Provide "chains" param');
+            }
+
+            const accountAddress = address || getRequiredAccountAddress(context);
+            return veBalService.getVeBalUserData(chain, accountAddress);
         },
-        veBalGetTotalSupply: async (parent, {}, context) => {
-            return veBalService.getVeBalTotalSupply();
+        veBalGetTotalSupply: async (parent, { chain }, context) => {
+            const currentChain = headerChain();
+            if (!chain && currentChain) {
+                chain = currentChain;
+            } else if (!chain) {
+                throw new Error('veBalGetTotalSupply error: Provide "chains" param');
+            }
+            return veBalService.getVeBalTotalSupply(chain);
         },
 
         /*

diff --git a/modules/vebal/vebal.service.ts b/modules/vebal/vebal.service.ts
@@ -12,12 +12,13 @@ import { AmountHumanReadable } from '../common/global-types';
 import { GqlVeBalUserData } from '../../schema';
 import { AllNetworkConfigs } from '../network/network-config';
 import VeBalABI from './abi/vebal.json';
+import { Chain } from '@prisma/client';
 
 export class VeBalService {
-    public async getVeBalUserBalance(userAddress: string): Promise<AmountHumanReadable> {
+    public async getVeBalUserBalance(chain: Chain, userAddress: string): Promise<AmountHumanReadable> {
         if (networkContext.data.veBal) {
             const veBalUser = await prisma.prismaVeBalUserBalance.findFirst({
-                where: { chain: networkContext.chain, userAddress: userAddress.toLowerCase() },
+                where: { chain: chain, userAddress: userAddress.toLowerCase() },
             });
             if (veBalUser?.balance) {
                 return veBalUser.balance;
@@ -26,13 +27,13 @@ export class VeBalService {
         return '0.0';
     }
 
-    public async getVeBalUserData(userAddress: string): Promise<GqlVeBalUserData> {
+    public async getVeBalUserData(chain: Chain, userAddress: string): Promise<GqlVeBalUserData> {
         let rank = 1;
         let balance = '0.0';
         let locked = '0.0';
         if (networkContext.data.veBal) {
             const veBalUsers = await prisma.prismaVeBalUserBalance.findMany({
-                where: { chain: networkContext.chain },
+                where: { chain: chain },
             });
 
             const veBalUsersNum = veBalUsers.map((user) => ({
@@ -57,7 +58,7 @@ export class VeBalService {
 
         if (locked !== '0.0') {
             veBalPrice = await prisma.prismaTokenCurrentPrice.findFirstOrThrow({
-                where: { chain: networkContext.chain, tokenAddress: AllNetworkConfigs['1'].data.veBal!.bptAddress },
+                where: { chain: chain, tokenAddress: AllNetworkConfigs['1'].data.veBal!.bptAddress },
             });
         }
 
@@ -69,10 +70,10 @@ export class VeBalService {
         };
     }
 
-    public async getVeBalTotalSupply(): Promise<AmountHumanReadable> {
+    public async getVeBalTotalSupply(chain: Chain): Promise<AmountHumanReadable> {
         if (networkContext.data.veBal) {
             const veBal = await prisma.prismaVeBalTotalSupply.findFirst({
-                where: { chain: networkContext.chain },
+                where: { chain: chain },
             });
             if (veBal?.totalSupply) {
                 return veBal.totalSupply;