Merge pull request #377 from HathorNetwork/release-candidate

Author: andreabadesso

db/seeders/20250416132150-add-htr-token.js

@@ -2,6 +2,16 @@
 
 module.exports = {
   up: async (queryInterface) => {
+    // Check if HTR token already exists
+    const [existing] = await queryInterface.sequelize.query(
+      "SELECT id FROM token WHERE id = '00'"
+    );
+
+    if (existing.length > 0) {
+      console.log('HTR token already exists, skipping.');
+      return;
+    }
+
     // Count unique transactions for HTR
     const [results] = await queryInterface.sequelize.query(
       "SELECT COUNT(DISTINCT tx_id) AS count FROM tx_output WHERE token_id = '00'"
@@ -14,6 +24,7 @@ module.exports = {
       name: 'Hathor',
       symbol: 'HTR',
       transactions: htrTxCount,
+      version: 0, // TokenVersion.NATIVE
     }]);
   },
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hathor-wallet-service",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "workspaces": [
     "packages/common",
     "packages/daemon",

packages/daemon/__tests__/services/services.test.ts

@@ -1675,12 +1675,42 @@ describe('checkForMissedEvents', () => {
     );
   });
 
-  it('should throw error when context has no event', async () => {
+  it('should throw error when context has no event and no initialEventId', async () => {
     const context = {};
 
     await expect(checkForMissedEvents(context as any))
       .rejects
-      .toThrow('No event in context when checking for missed events');
+      .toThrow('No event in context and no initialEventId when checking for missed events');
+  });
+
+  it('should use initialEventId when context.event is null', async () => {
+    const mockResponse = {
+      status: 200,
+      data: {
+        events: [],
+        latest_event_id: 25717039,
+      },
+    };
+
+    (axios.get as jest.Mock).mockResolvedValue(mockResponse);
+
+    const context = {
+      event: null,
+      initialEventId: 25717039,
+    };
+
+    const result = await checkForMissedEvents(context as any);
+
+    expect(result.hasNewEvents).toBe(false);
+    expect(axios.get).toHaveBeenCalledWith(
+      expect.stringContaining('/event'),
+      expect.objectContaining({
+        params: {
+          last_ack_event_id: 25717039,
+          size: 1,
+        },
+      }),
+    );
   });
 
   it('should handle API response with non-array events field', async () => {

packages/daemon/src/services/index.ts

@@ -1078,11 +1078,11 @@ export const handleTokenCreated = async (context: Context) => {
  * This is used to detect if we lost an event due to network packet loss
  */
 export const checkForMissedEvents = async (context: Context): Promise<{ hasNewEvents: boolean; events: any[] }> => {
-  if (!context.event) {
-    throw new Error('No event in context when checking for missed events');
-  }
+  const lastAckEventId = context.event?.event.id ?? context.initialEventId;
 
-  const lastAckEventId = context.event.event.id;
+  if (lastAckEventId === null || lastAckEventId === undefined) {
+    throw new Error('No event in context and no initialEventId when checking for missed events');
+  }
   const fullnodeUrl = getFullnodeHttpUrl();
 
   logger.debug(`Checking for missed events after event ID ${lastAckEventId}`);

packages/wallet-service/src/api/tokens.ts

@@ -3,19 +3,15 @@ import 'source-map-support/register';
 import { walletIdProxyHandler } from '@src/commons';
 import {
   getWalletTokens,
-  getTotalSupply,
-  getTotalTransactions,
-  getTokenInformation,
-  getAuthorityUtxo,
 } from '@src/db';
 import {
-  TokenInfo,
-} from '@src/types';
-import { getDbConnection } from '@src/utils';
+  closeDbConnection,
+  getDbConnection,
+} from '@src/utils';
 import { ApiError } from '@src/api/errors';
 import { closeDbAndGetError, warmupMiddleware, txIdJoiValidator } from '@src/api/utils';
+import fullnode from '@src/fullnode';
 import Joi from 'joi';
-import { bigIntUtils, constants } from '@hathor/wallet-lib';
 import middy from '@middy/core';
 import cors from '@middy/http-cors';
 import errorHandler from '@src/api/middlewares/errorHandler';
@@ -49,8 +45,9 @@ const getTokenDetailsParamsSchema = Joi.object({
  * Get token details
  *
  * This lambda is called by API Gateway on GET /wallet/tokens/:token_id/details
+ * It proxies the request to the fullnode's thin_wallet/token API
  */
-export const getTokenDetails = middy(walletIdProxyHandler(async (walletId, event) => {
+export const getTokenDetails = middy(walletIdProxyHandler(async (_walletId, event) => {
   const params = event.pathParameters || {};
 
   const { value, error } = getTokenDetailsParamsSchema.validate(params, {
@@ -68,51 +65,44 @@ export const getTokenDetails = middy(walletIdProxyHandler(async (walletId, event
   }
 
   const tokenId = value.token_id;
-  const tokenInfo: TokenInfo = await getTokenInformation(mysql, tokenId);
 
-  if (tokenId === constants.NATIVE_TOKEN_UID) {
-    const details = [{
-      message: 'Invalid tokenId',
-    }];
-
-    return closeDbAndGetError(mysql, ApiError.INVALID_PAYLOAD, { details });
-  }
-
-  if (!tokenInfo) {
-    const details = [{
-      message: 'Token not found',
-    }];
-
-    return closeDbAndGetError(mysql, ApiError.TOKEN_NOT_FOUND, { details });
-  }
-
-  const [
-    totalSupply,
-    totalTransactions,
-    meltAuthority,
-    mintAuthority,
-  ] = await Promise.all([
-    getTotalSupply(mysql, tokenId),
-    getTotalTransactions(mysql, tokenId),
-    getAuthorityUtxo(mysql, tokenId, Number(constants.TOKEN_MELT_MASK)),
-    getAuthorityUtxo(mysql, tokenId, Number(constants.TOKEN_MINT_MASK)),
-  ]);
-
-  return {
-    statusCode: 200,
-    body: bigIntUtils.JSONBigInt.stringify({
-      success: true,
-      details: {
-        tokenInfo,
-        totalSupply,
-        totalTransactions,
-        authorities: {
-          mint: mintAuthority !== null,
-          melt: meltAuthority !== null,
+  try {
+    const data = await fullnode.getTokenDetails(tokenId);
+
+    if (!data?.success) {
+      return {
+        statusCode: 404,
+        body: JSON.stringify({
+          success: false,
+          error: ApiError.TOKEN_NOT_FOUND,
+          details: [{ message: 'Token not found' }],
+        }),
+      };
+    }
+
+    return {
+      statusCode: 200,
+      body: JSON.stringify({
+        success: true,
+        details: {
+          tokenInfo: {
+            id: tokenId,
+            name: data.name,
+            symbol: data.symbol,
+            version: data.version,
+          },
+          totalSupply: data.total,
+          totalTransactions: data.transactions_count,
+          authorities: {
+            mint: data.can_mint,
+            melt: data.can_melt,
+          },
         },
-      },
-    }),
-  };
+      }),
+    };
+  } finally {
+    await closeDbConnection(mysql);
+  }
 })).use(cors())
   .use(warmupMiddleware())
   .use(errorHandler());

packages/wallet-service/src/fullnode.ts

@@ -118,6 +118,16 @@ export const create = (baseURL = BASE_URL) => {
     return response.data;
   }
 
+  const getTokenDetails = async (tokenId: string) => {
+    const response = await api.get('thin_wallet/token', {
+      data: null,
+      params: { id: tokenId },
+      headers: { 'content-type': 'application/json' },
+    });
+
+    return response.data;
+  }
+
   return {
     api, // exported so we can mock it on the tests
     version,
@@ -129,6 +139,7 @@ export const create = (baseURL = BASE_URL) => {
     getNCState,
     getNCHistory,
     getNCBlueprintInfo,
+    getTokenDetails,
   };
 };