fix: code

aura-nw · Jul 24, 2024 · 14b9ba9 · 14b9ba9
1 parent af50ce9
commit 14b9ba9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 42 deletions.
diff --git a/src/common/utils/db_connection.ts b/src/common/utils/db_connection.ts
@@ -1,39 +1,8 @@
-import Knex, { Knex as IKnex } from 'knex';
+import Knex from 'knex';
 import knexConfig from '../../../knexfile';
 
 const environment = process.env.NODE_ENV || 'development';
 const cfg = knexConfig[environment];
 const knex = Knex(cfg);
 
 export default knex;
-
-export async function batchUpdate(
-  trx: IKnex.Transaction,
-  tableName: string,
-  records: any,
-  fields: string[]
-) {
-  if (records.length === 0) return;
-  const stringListUpdates = records
-    .map((record: any) => {
-      const values = fields.map((field) => {
-        if (record[field]?.type === 'timestamp') {
-          return `to_timestamp(${record[field].value})`;
-        }
-
-        if (record[field] !== undefined) {
-          return `'${record[field]}'`;
-        }
-        return 'NULL';
-      });
-      return `(${record.id}, ${values.join(', ')})`;
-    })
-    .join(',');
-  const query = `
-      UPDATE ${tableName}
-      SET ${fields.map((field) => `${field} = temp.${field}`).join(', ')}
-      FROM (VALUES ${stringListUpdates}) AS temp(id, ${fields.join(', ')})
-      WHERE temp.id = ${tableName}.id
-    `;
-  await trx.raw(query);
-}
diff --git a/src/services/evm/erc20_handler.ts b/src/services/evm/erc20_handler.ts
@@ -3,7 +3,7 @@ import _, { Dictionary } from 'lodash';
 import Moleculer from 'moleculer';
 import { decodeAbiParameters, keccak256, toHex } from 'viem';
 import config from '../../../config.json' assert { type: 'json' };
-import knex, { batchUpdate } from '../../common/utils/db_connection';
+import knex from '../../common/utils/db_connection';
 import {
   Erc20Activity,
   Erc20Contract,
@@ -130,11 +130,12 @@ export class Erc20Handler {
         this.erc20Contracts[erc20Activity.erc20_contract_address];
       if (
         erc20Contract &&
-        erc20Contract.last_updated_height <= erc20Activity.height
+        erc20Contract.last_updated_height <= erc20Activity.height &&
+        erc20Contract.total_supply !== null
       ) {
         // update total supply
         erc20Contract.total_supply = (
-          BigInt(erc20Contract.total_supply || 0) + BigInt(erc20Activity.amount)
+          BigInt(erc20Contract.total_supply) + BigInt(erc20Activity.amount)
         ).toString();
         // update last updated height
         erc20Contract.last_updated_height = erc20Activity.height;
@@ -168,11 +169,12 @@ export class Erc20Handler {
         this.erc20Contracts[erc20Activity.erc20_contract_address];
       if (
         erc20Contract &&
-        erc20Contract.last_updated_height <= erc20Activity.height
+        erc20Contract.last_updated_height <= erc20Activity.height &&
+        erc20Contract.total_supply !== null
       ) {
         // update total supply
         erc20Contract.total_supply = (
-          BigInt(erc20Contract.total_supply || 0) - BigInt(erc20Activity.amount)
+          BigInt(erc20Contract.total_supply) - BigInt(erc20Activity.amount)
         ).toString();
         // update last updated height
         erc20Contract.last_updated_height = erc20Activity.height;
@@ -342,10 +344,11 @@ export class Erc20Handler {
       erc20Handler.process();
       const updatedErc20Contracts = Object.values(erc20Handler.erc20Contracts);
       if (updatedErc20Contracts.length > 0) {
-        await batchUpdate(trx, Erc20Contract.tableName, updatedErc20Contracts, [
-          'last_updated_height',
-          'total_supply',
-        ]);
+        await Erc20Contract.query()
+          .transacting(trx)
+          .insert(updatedErc20Contracts)
+          .onConflict(['id'])
+          .merge();
       }
       const updatedAccountBalances = Object.values(
         erc20Handler.accountBalances

diff --git a/test/unit/services/evm/erc20_reindex.spec.ts b/test/unit/services/evm/erc20_reindex.spec.ts
@@ -148,7 +148,8 @@ export default class Erc20ReindexTest {
   @Test('test reindex')
   async testReindex() {
     const viemClient = getViemClient();
-    Erc20Handler.erc20ModuleAccount = '0x0000000000000dfd';
+    Erc20Handler.erc20ModuleAccount =
+      'aura16st9fmex8xjdahwzwxldhjm2ssu6utw8rnxlkj';
     jest.spyOn(viemClient, 'getBlockNumber').mockResolvedValue(BigInt(123456));
     // Instantiate Erc20Reindexer with the mock
     const reindexer = new Erc20Reindexer(viemClient, this.broker.logger);