Merge pull request #129 from hack-a-chain-software/streaming-fix

mschead · web-flow · commit fe01e9e1ce29 · 2024-12-20T10:44:59.000-03:00
fix: streaming type issues; added balanceId in guards table
diff --git a/indexer/migrations/20241105001040-add-indexes-to-guards.js b/indexer/migrations/20241105001040-add-indexes-to-guards.js
diff --git a/indexer/package.json b/indexer/package.json
@@ -43,6 +43,7 @@
   "devDependencies": {
     "@types/chai": "^4.3.17",
     "@types/cors": "^2.8.17",
+    "@types/eventsource": "^1.1.15",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
     "@types/mocha": "^10.0.7",
@@ -74,4 +75,4 @@
     "migrate:up": "dotenv -e .env npx sequelize-cli db:migrate",
     "migrate:down": "dotenv -e .env npx sequelize-cli db:migrate:undo"
   }
-}
+}
diff --git a/indexer/src/models/guard.ts b/indexer/src/models/guard.ts
@@ -1,12 +1,12 @@
 import { Model, DataTypes, Optional } from "sequelize";
 import { sequelize } from "../config/database";
+import Balance from "./balance";
 
 export interface GuardAttributes {
   id: number;
   publicKey: string;
-  chainId: string;
-  account: string;
   predicate: string;
+  balanceId: number;
 }
 
 interface GuardCreationAttributes extends Optional<GuardAttributes, "id"> {}
@@ -17,9 +17,8 @@ class Guard
 {
   public id!: number;
   public publicKey!: string;
-  public chainId!: string;
-  public account!: string;
   public predicate!: string;
+  public balanceId!: number;
 }
 
 Guard.init(
@@ -35,29 +34,34 @@ Guard.init(
       allowNull: false,
       comment: "The public key associated with the account",
     },
-    chainId: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      comment: "The chain ID associated with the account",
-    },
-    account: {
-      type: DataTypes.STRING,
-      allowNull: false,
-      comment: "The account associated with the public key",
-    },
     predicate: {
       type: DataTypes.STRING,
       allowNull: false,
       comment:
         "The predicate associated with the account, public key and chain",
     },
+    balanceId: {
+      type: DataTypes.INTEGER,
+      allowNull: true,
+      comment: "The ID of the associated balance (e.g., 204).",
+    },
   },
   {
     sequelize,
     modelName: "Guard",
-    tableName: "Guards", // optional, specifies the table name
-    timestamps: true, // automatically adds `createdAt` and `updatedAt` fields
+    tableName: "Guards",
+    indexes: [
+      {
+        name: "guards_publickey_idx",
+        fields: ["publicKey"],
+      },
+    ],
   },
 );
 
+Guard.belongsTo(Balance, {
+  foreignKey: "balanceId",
+  as: "balance",
+});
+
 export default Guard;
diff --git a/indexer/src/services/sync/payload.ts b/indexer/src/services/sync/payload.ts
@@ -5,11 +5,10 @@ import TransactionModel, {
 import Event, { EventAttributes } from "../../models/event";
 import Transfer, { TransferAttributes } from "../../models/transfer";
 import { getNftTransfers, getCoinTransfers } from "./transfers";
-import { Op, QueryTypes, Transaction } from "sequelize";
+import { QueryTypes, Transaction } from "sequelize";
 import Signer from "../../models/signer";
 import Guard, { GuardAttributes } from "../../models/guard";
 import { handleSingleQuery } from "../../kadena-server/utils/raw-query";
-import Balance from "../../models/balance";
 import { sequelize } from "../../config/database";
 
 const TRANSACTION_INDEX = 0;
@@ -199,7 +198,7 @@ export async function processTransaction(
 }
 
 async function saveGuards(balances: BalanceInsertResult[], tx?: Transaction) {
-  const guardPromises: Array<Promise<GuardAttributes | null>> = balances.map(
+  const guardPromises: Array<Promise<any | null>> = balances.map(
     async (balance) => {
       const res = await handleSingleQuery({
         chainId: balance.chainId.toString(),
@@ -210,9 +209,8 @@ async function saveGuards(balances: BalanceInsertResult[], tx?: Transaction) {
 
       const result = JSON.parse(res.result ?? "{}");
       const withKeys = (result.guard.keys ?? []).map((key: any) => ({
+        balanceId: balance.id,
         account: balance.account,
-        chainId: balance.chainId,
-        fungible: balance.module,
         publicKey: key,
         predicate: result.guard.pred,
       }));
@@ -224,9 +222,12 @@ async function saveGuards(balances: BalanceInsertResult[], tx?: Transaction) {
   const guards = await Promise.all(guardPromises);
   const filteredGuards = guards
     .flat()
-    .filter(
-      (g) => g !== null && `k:${g.publicKey}` !== g.account,
-    ) as GuardAttributes[];
+    .filter((g) => g !== null && `k:${g.publicKey}` !== g.account)
+    .map((g) => ({
+      balanceId: g.balanceId,
+      publicKey: g.publicKey,
+      predicate: g.predicate,
+    }));
 
   await Guard.bulkCreate(filteredGuards, {
     transaction: tx,
diff --git a/indexer/src/services/sync/streaming.ts b/indexer/src/services/sync/streaming.ts
@@ -1,6 +1,6 @@
 import { processPayloadKey } from "./payload";
 import { getDecoded, getRequiredEnvString } from "../../utils/helpers";
-import { EventSource } from "eventsource";
+import EventSource from "eventsource";
 import { DispatchInfo } from "../../jobs/publisher-job";
 import { uint64ToInt64 } from "../../utils/int-uint-64";
 import Block, { BlockAttributes } from "../../models/block";
@@ -19,11 +19,11 @@ export async function startStreaming() {
     `${SYNC_BASE_URL}/${SYNC_NETWORK}/block/updates`,
   );
 
-  eventSource.onerror = (error) => {
+  eventSource.onerror = (error: any) => {
     console.error("Connection error:", error);
   };
 
-  eventSource.addEventListener("BlockHeader", (event) => {
+  eventSource.addEventListener("BlockHeader", (event: any) => {
     try {
       const block = JSON.parse(event.data);
       const payload = processPayload(block.payloadWithOutputs);
diff --git a/yarn.lock b/yarn.lock
@@ -4467,6 +4467,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
+"@types/eventsource@^1.1.15":
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/@types/eventsource/-/eventsource-1.1.15.tgz#949383d3482e20557cbecbf3b038368d94b6be27"
+  integrity sha512-XQmGcbnxUNa06HR3VBVkc9+A2Vpi9ZyLJcdS5dwaQQ/4ZMWFO+5c90FnMUpbtMZwB/FChoYHwuVg8TvkECacTA==
+
 "@types/express-serve-static-core@^4.17.30":
   version "4.19.6"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267"
