chore: envio query and rename clients folder

infinitybase · Jan 8, 2025 · 5f4a813 · 5f4a813
1 parent 0b10bf0
commit 5f4a813
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 25 deletions.
diff --git a/packages/worker/src/utils/index.ts → packages/worker/src/clients/index.ts b/packages/worker/src/utils/index.ts → packages/worker/src/clients/index.ts
diff --git a/packages/worker/src/utils/mongoClient.ts → packages/worker/src/clients/mongoClient.ts b/packages/worker/src/utils/mongoClient.ts → packages/worker/src/clients/mongoClient.ts
diff --git a/packages/worker/src/utils/psqlClient.ts → packages/worker/src/clients/psqlClient.ts b/packages/worker/src/utils/psqlClient.ts → packages/worker/src/clients/psqlClient.ts
diff --git a/packages/worker/src/utils/redisClient.ts → packages/worker/src/clients/redisClient.ts b/packages/worker/src/utils/redisClient.ts → packages/worker/src/clients/redisClient.ts
@@ -2,6 +2,14 @@ import IORedis from "ioredis";
 
 const { WORKER_REDIS_HOST, WORKER_REDIS_PORT } = process.env;
 
+const isLocal = WORKER_REDIS_HOST?.includes("127.") ?? false;
+
+export const redisConfig = {
+  host: WORKER_REDIS_HOST,
+  port: 6379,
+  ...(!isLocal ? { tls: { rejectUnauthorized: false } } : {}),
+};
+
 const redisClient = new IORedis({
   host: WORKER_REDIS_HOST,
   port: Number(WORKER_REDIS_PORT),

diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
@@ -6,8 +6,8 @@ import express from "express";
 import BalanceCron from "./queues/predicateBalance/scheduler";
 import AssetCron from "./queues/assetsValue/scheduler";
 import assetQueue from "./queues/assetsValue/queue";
-import { MongoDatabase } from "./utils/mongoClient";
-import { PsqlClient } from "./utils";
+import { MongoDatabase } from "./clients/mongoClient";
+import { PsqlClient } from "./clients";
 
 const {
   WORKER_PORT,

diff --git a/packages/worker/src/queues/assetsValue/queue.ts b/packages/worker/src/queues/assetsValue/queue.ts
@@ -1,8 +1,8 @@
 import Queue from "bull";
-import { CollectionName, MongoDatabase } from "../../utils/mongoClient";
+import { CollectionName, MongoDatabase } from "../../clients/mongoClient";
 import { QUEUE_ASSET } from "./constants";
 import { fetchQuotes } from "./utils";
-import { redisConfig } from "@/utils/redis";
+import { redisConfig } from "@/clients";
 
 const assetQueue = new Queue(QUEUE_ASSET, {
   redis: redisConfig,

diff --git a/packages/worker/src/queues/predicateBalance/queue.ts b/packages/worker/src/queues/predicateBalance/queue.ts
@@ -1,8 +1,8 @@
 import Queue from "bull";
-import { CollectionName, MongoDatabase, type SchemaPredicateBlocks, type SchemaFuelAssets, type SchemaPredicateBalance } from "../../utils/mongoClient";
+import { CollectionName, MongoDatabase, type SchemaPredicateBlocks, type SchemaFuelAssets, type SchemaPredicateBalance } from "../../clients/mongoClient";
 import { type QueueBalance, groupByTransaction, syncPredicateBlock, syncBalance, makeDeposits, syncAssets, QUEUE_BALANCE } from ".";
 import { predicateTransactions } from "./utils/envioQuery";
-import { redisConfig } from "@/utils/redis";
+import { redisConfig } from "@/clients";
 
 
 const balanceQueue = new Queue<QueueBalance>(QUEUE_BALANCE, {

diff --git a/packages/worker/src/queues/predicateBalance/scheduler.ts b/packages/worker/src/queues/predicateBalance/scheduler.ts
@@ -1,4 +1,4 @@
-import { PsqlClient } from "../../utils/psqlClient";
+import { PsqlClient } from "../../clients/psqlClient";
 import balanceQueue from "./queue";
 import cron from "node-cron";
 import { CRON_EXPRESSION, INITIAL_DELAY, QUEUE_BALANCE } from "./constants";
@@ -7,7 +7,7 @@ const fn = async () => {
   try {
     const db = await PsqlClient.connect();
     const predicates = await db.query(
-      `SELECT predicate_address 
+      `SELECT predicate_address
              FROM predicates`
     );
 

diff --git a/packages/worker/src/queues/predicateBalance/utils/envioQuery.ts b/packages/worker/src/queues/predicateBalance/utils/envioQuery.ts
@@ -1,4 +1,5 @@
-import { CollectionName, MongoDatabase, type SchemaPredicateBlocks } from "../../../utils/mongoClient";
+
+import { CollectionName, MongoDatabase, type SchemaPredicateBlocks } from "../../../clients/mongoClient";
 
 export const makeQuery = ({
     from_block,
@@ -13,11 +14,13 @@ export const makeQuery = ({
             from_block,
             inputs: [
                 {
-                    inputType: [0, 2],
                     txStatus: [1],
                     owner: [predicate_address],
-                    recipient: [predicate_address],
                 },
+                {
+                    txStatus: [1],
+                    recipient: [predicate_address],
+                }
             ],
             outputs: [
                 {
@@ -43,7 +46,7 @@ export const predicateTransactions = async (predicate: string) => {
         const last = await predicate_block.findOne({ _id: predicate });
 
         const data = await fetch(
-            "https://fuel-legacy.hypersync.xyz/query",
+            "https://fuel.hypersync.xyz/query",
             makeQuery({ from_block: last?.blockNumber ?? 0, predicate_address: predicate })
         );
         const response = await data.json();

diff --git a/packages/worker/src/queues/predicateBalance/utils/makeDeposits.ts b/packages/worker/src/queues/predicateBalance/utils/makeDeposits.ts
@@ -1,5 +1,5 @@
 import { InputType, bn, OutputType } from "fuels";
-import type { SchemaPredicateBalance } from "../../../utils/mongoClient";
+import type { SchemaPredicateBalance } from "../../../clients/mongoClient";
 import { ETH } from "../constants";
 import type { PredicateBalanceGrouped } from "../types";
 

diff --git a/packages/worker/src/queues/predicateBalance/utils/syncAssets.ts b/packages/worker/src/queues/predicateBalance/utils/syncAssets.ts
@@ -2,7 +2,7 @@ import type { Collection, WithId } from "mongodb";
 import type {
   SchemaPredicateBalance,
   SchemaFuelAssets,
-} from "../../../utils/mongoClient";
+} from "../../../clients/mongoClient";
 
 export async function syncAssets(
   deposits: SchemaPredicateBalance[],

diff --git a/packages/worker/src/queues/predicateBalance/utils/syncBalance.ts b/packages/worker/src/queues/predicateBalance/utils/syncBalance.ts
@@ -3,7 +3,7 @@ import type { Collection, WithId } from "mongodb";
 import type {
   SchemaPredicateBalance,
   SchemaFuelAssets,
-} from "../../../utils/mongoClient";
+} from "../../../clients/mongoClient";
 
 export async function syncBalance(
   deposits: SchemaPredicateBalance[],

diff --git a/packages/worker/src/queues/predicateBalance/utils/syncPredicateBlock.ts b/packages/worker/src/queues/predicateBalance/utils/syncPredicateBlock.ts
@@ -1,5 +1,5 @@
 import type { Collection } from "mongodb";
-import type { SchemaPredicateBlocks } from "../../../utils/mongoClient";
+import type { SchemaPredicateBlocks } from "../../../clients/mongoClient";
 
 export async function syncPredicateBlock(
   block: SchemaPredicateBlocks,

diff --git a/packages/worker/src/utils/redis.ts b/packages/worker/src/utils/redis.ts