pool event types

Author: gmbronco

modules/controllers/pool-events-query-controller.ts

@@ -28,6 +28,7 @@ const parseSwap = (event: SwapEvent): GqlPoolSwapEvent => {
     return {
         __typename: 'GqlPoolSwapEventV3',
         ...event,
+        valueUSD: event.valueUSD || 0,
         sender: event.userAddress,
         timestamp: event.blockTimestamp,
         tokenIn: {

modules/pool/lib/pool-swap.service.ts

@@ -41,12 +41,7 @@ export class PoolSwapService {
             for (const chain of args.where.chainIn) {
                 const balancerSubgraphService = AllNetworkConfigsKeyedOnChain[chain].services.balancerSubgraphService;
 
-                const getterFn =
-                    chain === Chain.FANTOM
-                        ? balancerSubgraphService.getFantomPoolJoinExits.bind(balancerSubgraphService)
-                        : balancerSubgraphService.getPoolJoinExits.bind(balancerSubgraphService);
-
-                const { joinExits } = await getterFn({
+                const { joinExits } = await balancerSubgraphService.getPoolJoinExits({
                     where: { pool_in: args.where?.poolIdIn },
                     first,
                     skip: args.skip,
@@ -81,12 +76,7 @@ export class PoolSwapService {
     ): Promise<GqlPoolJoinExit[]> {
         const balancerSubgraphService = AllNetworkConfigsKeyedOnChain[chain].services.balancerSubgraphService;
 
-        const getterFn =
-            chain === Chain.FANTOM
-                ? balancerSubgraphService.getFantomPoolJoinExits.bind(balancerSubgraphService)
-                : balancerSubgraphService.getPoolJoinExits.bind(balancerSubgraphService);
-
-        const { joinExits } = await getterFn({
+        const { joinExits } = await balancerSubgraphService.getPoolJoinExits({
             where: { pool: poolId, user: userAddress },
             first,
             skip: skip,

modules/sources/enrichers/swaps-usd.ts

@@ -43,22 +43,24 @@ export async function swapsUsd(swaps: SwapEvent[], chain: Chain): Promise<SwapEv
             const payload = {
                 fee: {
                     ...swap.payload.fee,
-                    valueUSD: (tokenOut?.price || 0) * parseFloat(swap.payload.fee.amount),
+                    valueUSD: String((tokenOut?.price || 0) * parseFloat(swap.payload.fee.amount)),
                 },
                 tokenIn: {
                     ...swap.payload.tokenIn,
-                    valueUSD: (tokenIn?.price || 0) * parseFloat(swap.payload.tokenIn.amount),
                 },
                 tokenOut: {
                     ...swap.payload.tokenOut,
-                    valueUSD: (tokenOut?.price || 0) * parseFloat(swap.payload.tokenOut.amount),
                 },
             };
 
+            const valueUSD =
+                (tokenIn?.price || 0) * parseFloat(swap.payload.tokenIn.amount) ||
+                (tokenOut?.price || 0) * parseFloat(swap.payload.tokenOut.amount);
+
             dbEntries.push({
                 ...swap,
                 // Taking all the chances to get the token price
-                valueUSD: payload.tokenIn.valueUSD || payload.tokenOut.valueUSD || 0,
+                valueUSD,
                 payload,
             });
         }