Asset/Asset pools TVL

Author: Sluder

src/jobs/UpdateLiquidityPoolTicks.ts

@@ -60,16 +60,12 @@ export class UpdateLiquidityPoolTicks extends BaseJob {
                 .limit(1)
                 .getOne() ?? undefined;
         });
-if (this._liquidityPoolState.liquidityPool.identifier === 'f5808c2c990d86da54bfc97d89cee6efa20cd8461616359478d96b4c9b65707373c4cec488b16151a64d7102dbae16857c500652b5c513650b8d604e') {
-    logInfo(`ddddd here 1`)
-}
+
         if (! existingTick) {
             if (! this._liquidityPoolState.liquidityPool) {
                 return Promise.reject('Liquidity Pool not found for liquidity pool state');
             }
-if (this._liquidityPoolState.liquidityPool.identifier === 'f5808c2c990d86da54bfc97d89cee6efa20cd8461616359478d96b4c9b65707373c4cec488b16151a64d7102dbae16857c500652b5c513650b8d604e') {
-logInfo(`ddddd here 2`)
-}
+
             const lastTick: LiquidityPoolTick | undefined = await dbService.query((manager: EntityManager) => {
                 return manager.createQueryBuilder(LiquidityPoolTick, 'ticks')
                     .where('resolution = :resolution', { resolution })
@@ -82,9 +78,7 @@ logInfo(`ddddd here 2`)
             });
 
             const open: number = lastTick ? lastTick.close : price;
-if (this._liquidityPoolState.liquidityPool.identifier === 'f5808c2c990d86da54bfc97d89cee6efa20cd8461616359478d96b4c9b65707373c4cec488b16151a64d7102dbae16857c500652b5c513650b8d604e') {
-logInfo(`ddddd here 3 ${Math.abs(lastTick ? this._liquidityPoolState.tvl - lastTick.tvl : this._liquidityPoolState.tvl)}`)
-}
+
             return dbService.transaction((manager: EntityManager) => {
                 return manager.save(
                     LiquidityPoolTick.make(
@@ -100,9 +94,7 @@ logInfo(`ddddd here 3 ${Math.abs(lastTick ? this._liquidityPoolState.tvl - lastT
                     )
                 ).then((tick: LiquidityPoolTick) => {
                     operationWs.broadcast(tick);
-if (this._liquidityPoolState.liquidityPool.identifier === 'f5808c2c990d86da54bfc97d89cee6efa20cd8461616359478d96b4c9b65707373c4cec488b16151a64d7102dbae16857c500652b5c513650b8d604e') {
-logInfo(`ddddd here 3.5 ${tick.time}`)
-}
+
                     eventService.pushEvent({
                         type: 'LiquidityPoolTickCreated',
                         data: tick,
@@ -112,9 +104,7 @@ logInfo(`ddddd here 3.5 ${tick.time}`)
                 }).catch((reason: any) => this.createOrUpdateTick(startOfTick, resolution));
             });
         }
-if (this._liquidityPoolState.liquidityPool.identifier === 'f5808c2c990d86da54bfc97d89cee6efa20cd8461616359478d96b4c9b65707373c4cec488b16151a64d7102dbae16857c500652b5c513650b8d604e') {
-logInfo(`ddddd here 4`)
-}
+
         if (price < existingTick.low) {
             existingTick.low = price;
         }
@@ -131,9 +121,7 @@ logInfo(`ddddd here 4`)
             return manager.save(existingTick)
                 .then((tick: LiquidityPoolTick) => {
                     operationWs.broadcast(tick);
-if (this._liquidityPoolState.liquidityPool.identifier === 'f5808c2c990d86da54bfc97d89cee6efa20cd8461616359478d96b4c9b65707373c4cec488b16151a64d7102dbae16857c500652b5c513650b8d604e') {
-logInfo(`ddddd here 5`)
-}
+
                     eventService.pushEvent({
                         type: 'LiquidityPoolTickUpdated',
                         data: tick,

src/jobs/UpdateLiquidityPoolTvlJob.ts

@@ -1,7 +1,7 @@
 import { BaseJob } from './BaseJob';
 import { LiquidityPoolState } from '../db/entities/LiquidityPoolState';
 import { dbService, queue } from '../indexerServices';
-import { EntityManager } from 'typeorm';
+import { Brackets, EntityManager } from 'typeorm';
 import { LiquidityPool } from '../db/entities/LiquidityPool';
 import { logInfo } from '../logger';
 import { Asset } from '../db/entities/Asset';
@@ -55,14 +55,11 @@ export class UpdateLiquidityPoolTvlJob extends BaseJob {
                     .leftJoinAndSelect('pools.tokenA', 'tokenA')
                     .leftJoinAndSelect('pools.tokenB', 'tokenB')
                     .leftJoinAndSelect('pools.latestState', 'latestState')
-                    .where("pools.dex = :dex", {
-                        dex: liquidityPool.dex,
-                    })
-                    .andWhere('pools.tokenA IS NULL')
-                    .andWhere("pools.tokenB.id = :tokenBId", {
+                    .where('pools.tokenA IS NULL')
+                    .andWhere('pools.tokenB.id = :tokenBId', {
                         tokenBId: token.id,
                     })
-                    .orderBy('pools.createdSlot', 'DESC')
+                    .orderBy('latestState.tvl', 'DESC')
                     .limit(1)
                     .getOne();
             });