change hook filter to bool (#1049)

balancer · Oct 9, 2024 · f613949 · f613949
1 parent 33bac59
commit f613949
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 25 deletions.
diff --git a/.changeset/slimy-dolls-lick.md b/.changeset/slimy-dolls-lick.md
@@ -0,0 +1,5 @@
+---
+'backend': patch
+---
+
+change hook filter to bool
diff --git a/graphql_schema_generated.ts b/graphql_schema_generated.ts
@@ -1026,7 +1026,7 @@ export const schema = gql`
         createTime: GqlPoolTimePeriod
         filterIn: [String!]
         filterNotIn: [String!]
-        hookAddressIn: [String!]
+        hasHook: Boolean
         idIn: [String!]
         idNotIn: [String!]
         minTvl: Float

diff --git a/modules/pool/lib/pool-gql-loader.service.ts b/modules/pool/lib/pool-gql-loader.service.ts
@@ -516,9 +516,11 @@ export class PoolGqlLoaderService {
                       }
                     : {}),
             },
-            hook: {
-                address: { in: where?.hookAddressIn || undefined },
-            },
+            ...(where?.hasHook && where.hasHook
+                ? { hook: { isNot: null } }
+                : where?.hasHook && !where.hasHook
+                ? { hook: { is: null } }
+                : {}),
         };
 
         if (!textSearch) {

diff --git a/modules/pool/pool-debug.test.ts b/modules/pool/pool-debug.test.ts
@@ -17,11 +17,40 @@ describe('pool debugging', () => {
         // await poolService.syncAllPoolsFromSubgraph();
         // await poolService.syncChangedPools();
         // await tokenService.updateTokenPrices(['MAINNET']);
-        await PoolController().reloadPoolsV3('SEPOLIA');
+        // await PoolController().reloadPoolsV3('SEPOLIA');
 
-        const poolAfterNewSync = await poolService.getGqlPool('0x8fc07bcf9b88ace84c7523248dc4a85f638c9536', 'SEPOLIA');
+        const poolsUndefinedArr = await prisma.prismaPool.findMany({
+            where: { chain: 'SEPOLIA', protocolVersion: 3, hook: { address: { in: undefined } } },
+        });
+
+        const poolsWithHooks = await prisma.prismaPool.findMany({
+            where: { chain: 'SEPOLIA', protocolVersion: 3, hook: { isNot: null } },
+        });
+
+        const poolsEmptyArr = await prisma.prismaPool.findMany({
+            where: { chain: 'SEPOLIA', protocolVersion: 3, hook: { address: { in: [''] } } },
+        });
+
+        const poolsWithoutHooks = await prisma.prismaPool.findMany({
+            where: { chain: 'SEPOLIA', protocolVersion: 3, hook: { is: null } },
+        });
+
+        const poolsAll = await prisma.prismaPool.findMany({
+            where: { chain: 'SEPOLIA', protocolVersion: 3 },
+        });
+
+        const allPools = await poolService.getGqlPools({ where: { chainIn: ['SEPOLIA'], protocolVersionIn: [3] } });
+        const allPoolsHooks = await poolService.getGqlPools({
+            where: { chainIn: ['SEPOLIA'], protocolVersionIn: [3], hasHook: true },
+        });
+        const allPoolsNoHooks = await poolService.getGqlPools({
+            where: { chainIn: ['SEPOLIA'], protocolVersionIn: [3], hasHook: false },
+        });
+        console.log(poolsAll.length);
+
+        // const poolAfterNewSync = await poolService.getGqlPool('0x8fc07bcf9b88ace84c7523248dc4a85f638c9536', 'SEPOLIA');
 
-        expect(poolAfterNewSync.dynamicData.isPaused).toBe(true);
+        // expect(poolAfterNewSync.dynamicData.isPaused).toBe(true);
     }, 5000000);
 
     it('sync aprs', async () => {

diff --git a/modules/pool/pool.gql b/modules/pool/pool.gql
@@ -1279,7 +1279,7 @@ input GqlPoolFilter {
     userAddress: String
     protocolVersionIn: [Int!]
     minTvl: Float
-    hookAddressIn: [String!]
+    hasHook: Boolean
 }
 
 type GqlPoolTokenExpanded {

diff --git a/modules/sources/subgraphs/sftmx-subgraph/generated/sftmx-subgraph-types.ts b/modules/sources/subgraphs/sftmx-subgraph/generated/sftmx-subgraph-types.ts
@@ -17,14 +17,8 @@ export type Scalars = {
     BigInt: string;
     Bytes: string;
     Int8: any;
-    Timestamp: any;
 };
 
-export enum Aggregation_Interval {
-    day = 'day',
-    hour = 'hour',
-}
-
 export type BlockChangedFilter = {
     number_gte: Scalars['Int'];
 };
@@ -829,8 +823,6 @@ export type _Block_ = {
     hash?: Maybe<Scalars['Bytes']>;
     /** The block number */
     number: Scalars['Int'];
-    /** The hash of the parent block */
-    parentHash?: Maybe<Scalars['Bytes']>;
     /** Integer representation of the timestamp stored in blocks for the chain */
     timestamp?: Maybe<Scalars['Int']>;
 };

diff --git a/modules/subgraphs/beets-bar-subgraph/generated/beets-bar-subgraph-types.ts b/modules/subgraphs/beets-bar-subgraph/generated/beets-bar-subgraph-types.ts
@@ -17,14 +17,8 @@ export type Scalars = {
     BigInt: string;
     Bytes: string;
     Int8: any;
-    Timestamp: any;
 };
 
-export enum Aggregation_Interval {
-    Day = 'day',
-    Hour = 'hour',
-}
-
 export type Bar = {
     __typename?: 'Bar';
     address: Scalars['Bytes'];
@@ -465,8 +459,6 @@ export type _Block_ = {
     hash?: Maybe<Scalars['Bytes']>;
     /** The block number */
     number: Scalars['Int'];
-    /** The hash of the parent block */
-    parentHash?: Maybe<Scalars['Bytes']>;
     /** Integer representation of the timestamp stored in blocks for the chain */
     timestamp?: Maybe<Scalars['Int']>;
 };

diff --git a/schema.ts b/schema.ts
@@ -679,7 +679,7 @@ export interface GqlPoolFilter {
     createTime?: InputMaybe<GqlPoolTimePeriod>;
     filterIn?: InputMaybe<Array<Scalars['String']>>;
     filterNotIn?: InputMaybe<Array<Scalars['String']>>;
-    hookAddressIn?: InputMaybe<Array<Scalars['String']>>;
+    hasHook?: InputMaybe<Scalars['Boolean']>;
     idIn?: InputMaybe<Array<Scalars['String']>>;
     idNotIn?: InputMaybe<Array<Scalars['String']>>;
     minTvl?: InputMaybe<Scalars['Float']>;