bug fix

lavanet · Aug 29, 2024 · bccf911 · bccf911
1 parent 3c7646a
commit bccf911
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -106,4 +106,7 @@ query_endpoints_full_tests_staging:
 	cd tests/query_endpoints && make query_endpoints_full_tests_staging
 
 query_endpoints_full_tests_testnet:
-	cd tests/query_endpoints && make query_endpoints_full_tests_testnet
+	cd tests/query_endpoints && make query_endpoints_full_tests_testnet
+
+query_endpoints_full_tests_mainnet:
+	cd tests/query_endpoints && make query_endpoints_full_tests_mainnet
diff --git a/src/query/handlers/index/indexProvidersActiveHandler.ts b/src/query/handlers/index/indexProvidersActiveHandler.ts
@@ -131,7 +131,7 @@ class IndexProvidersActiveData extends RequestHandlerBase<IndexProvidersActiveRe
     }
 
     protected async getActiveProviderAddresses(): Promise<string[]> {
-        const data = await QueryGetJsinfoReadDbInstance()
+        const data1 = QueryGetJsinfoReadDbInstance()
             .select({
                 provider: JsinfoSchema.providerStakes.provider,
             })
@@ -154,10 +154,15 @@ class IndexProvidersActiveData extends RequestHandlerBase<IndexProvidersActiveRe
             .having(
                 and(
                     gt(sql<number>`MAX(${JsinfoProviderAgrSchema.aggDailyRelayPayments.dateday})`, sql`NOW() - INTERVAL '30 day'`),
-                    gt(sql<number>`COALESCE(SUM(${JsinfoProviderAgrSchema.aggDailyRelayPayments.relaySum}), 0)`, 100)
+                    gt(sql<number>`COALESCE(SUM(${JsinfoProviderAgrSchema.aggDailyRelayPayments.relaySum}), 0)`, 1)
                 )
             )
 
+        console.log("data1.toSQL()", data1.toSQL())
+
+        const data = await data1;
+        console.log("getActiveProviderAddresses", data)
+
         return data.map(item => item.provider).filter((provider): provider is string => provider !== null);
     }
 
@@ -193,13 +198,15 @@ class IndexProvidersActiveData extends RequestHandlerBase<IndexProvidersActiveRe
 
         let activeProviders = await this.getActiveProviderAddresses();
 
-        const res = await QueryGetJsinfoReadDbInstance()
+        const res1 = QueryGetJsinfoReadDbInstance()
             .select({
                 count: sql<number>`COUNT(DISTINCT ${JsinfoSchema.providerStakes.provider})`,
             })
             .from(JsinfoSchema.providerStakes)
-            .where(inArray(JsinfoSchema.providers.address, activeProviders))
+            .where(inArray(JsinfoSchema.providerStakes.provider, activeProviders))
 
+        console.log("res1", res1.toSQL())
+        const res = await res1;
         return res[0].count || 0;
     }