Merge pull request #374 from HathorNetwork/master

Author: andreabadesso

.codebuild/build.sh

@@ -23,17 +23,6 @@ deploy_hathor_network_account() {
         exit=true;
     fi;
 
-    # Checks whether there is a file called "rollback_testnet_production", which is used by our other CodeBuild to indicate that this is a testnet-production rollback
-    if [ -f "rollback_testnet_production" ]; then
-        # Gets all env vars with `testnet_` prefix and re-exports them without the prefix
-        for var in "${!testnet_@}"; do
-            export ${var#testnet_}="${!var}"
-        done
-        make deploy-lambdas-testnet;
-        send_slack_message "Rollback performed on testnet-production to: ${GIT_REF_TO_DEPLOY}";
-        exit=true;
-    fi;
-
     if [ "$exit" = true ]; then
     echo "Rollbacks performed successfully. Exiting now.";
     exit 0;
@@ -67,44 +56,6 @@ deploy_hathor_network_account() {
     elif expr "${GIT_REF_TO_DEPLOY}" : "v.*" >/dev/null; then
         echo $GIT_REF_TO_DEPLOY > /tmp/docker_image_tag
 
-        # --- Testnet ---
-        # Gets all env vars with `testnet_` prefix and re-exports them without the prefix
-        for var in "${!testnet_@}"; do
-            export ${var#testnet_}="${!var}"
-        done
-
-        make migrate;
-        make build-daemon;
-        make deploy-lambdas-testnet;
-        # The idea here is that if the lambdas deploy fail, the built image won't be pushed:
-        make push-daemon;
-
-        # Unsets all the testnet env vars so we make sure they don't leak to other deploys
-        for var in "${!testnet_@}"; do
-            unset ${var#testnet_}
-        done
-
-        send_slack_message "New version deployed to testnet-production: ${GIT_REF_TO_DEPLOY}"
-
-        # --- Testnet Hotel ---
-        # Gets all env vars with `testnethotel_` prefix and re-exports them without the prefix
-        for var in "${!testnethotel_@}"; do
-            export ${var#testnethotel_}="${!var}"
-        done
-
-        make migrate;
-        make build-daemon;
-        make deploy-lambdas-testnet-hotel;
-        # The idea here is that if the lambdas deploy fail, the built image won't be pushed:
-        make push-daemon;
-
-        # Unsets all the testnet env vars so we make sure they don't leak to other deploys
-        for var in "${!testnethotel_@}"; do
-            unset ${var#testnethotel_}
-        done
-
-        send_slack_message "New version deployed to testnet-hotel: ${GIT_REF_TO_DEPLOY}"
-
         # --- Testnet India ---
         # Gets all env vars with `testnetindia_` prefix and re-exports them without the prefix
         for var in "${!testnetindia_@}"; do

.codebuild/buildspec.yml

@@ -26,28 +26,6 @@ env:
     dev_PUSH_NOTIFICATION_ENABLED: "true"
     dev_PUSH_ALLOWED_PROVIDERS: "android,ios"
     dev_APPLICATION_NAME: "wallet-service-dev"
-    testnet_DEFAULT_SERVER: "https://wallet-service.private-nodes.testnet.hathor.network/v1a/"
-    testnet_WS_DOMAIN: "ws.wallet-service.testnet.hathor.network"
-    testnet_NETWORK: "testnet"
-    testnet_LOG_LEVEL: "debug"
-    testnet_NFT_AUTO_REVIEW_ENABLED: "true"
-    testnet_EXPLORER_STAGE: "testnet"
-    testnet_EXPLORER_SERVICE_LAMBDA_ENDPOINT: "https://lambda.eu-central-1.amazonaws.com"
-    testnet_WALLET_SERVICE_LAMBDA_ENDPOINT: "https://lambda.eu-central-1.amazonaws.com"
-    testnet_PUSH_NOTIFICATION_ENABLED: "true"
-    testnet_PUSH_ALLOWED_PROVIDERS: "android,ios"
-    testnet_APPLICATION_NAME: "wallet-service-testnet"
-    testnethotel_DEFAULT_SERVER: "https://wallet-service.private-nodes.hotel.testnet.hathor.network/v1a/"
-    testnethotel_WS_DOMAIN: "ws.wallet-service.hotel.testnet.hathor.network"
-    testnethotel_NETWORK: "testnet"
-    testnethotel_LOG_LEVEL: "debug"
-    testnethotel_NFT_AUTO_REVIEW_ENABLED: "true"
-    testnethotel_EXPLORER_STAGE: "hotel"
-    testnethotel_EXPLORER_SERVICE_LAMBDA_ENDPOINT: "https://lambda.eu-central-1.amazonaws.com"
-    testnethotel_WALLET_SERVICE_LAMBDA_ENDPOINT: "https://lambda.eu-central-1.amazonaws.com"
-    testnethotel_PUSH_NOTIFICATION_ENABLED: "true"
-    testnethotel_PUSH_ALLOWED_PROVIDERS: "android,ios"
-    testnethotel_APPLICATION_NAME: "wallet-service-testnet-hotel"
     testnetindia_DEFAULT_SERVER: "https://wallet-service.private-nodes.india.testnet.hathor.network/v1a/"
     testnetindia_WS_DOMAIN: "ws.wallet-service.india.testnet.hathor.network"
     testnetindia_NETWORK: "testnet"
@@ -113,58 +91,6 @@ env:
     dev_ALERT_MANAGER_REGION: "WalletService/dev:ALERT_MANAGER_REGION"
     dev_ALERT_MANAGER_TOPIC: "WalletService/dev:ALERT_MANAGER_TOPIC"
     dev_ALERT_MANAGER_ACCOUNT_ID: "WalletService/dev:ALERT_MANAGER_ACCOUNT_ID"
-    # Testnet secrets
-    testnet_ACCOUNT_ID: "WalletService/testnet:account_id"
-    testnet_AUTH_SECRET: "WalletService/testnet:auth_secret"
-    testnet_AWS_VPC_DEFAULT_SG_ID: "WalletService/testnet:aws_vpc_default_sg_id"
-    testnet_AWS_SUBNET_ID_1: "WalletService/testnet:aws_subnet_id_1"
-    testnet_AWS_SUBNET_ID_2: "WalletService/testnet:aws_subnet_id_2"
-    testnet_AWS_SUBNET_ID_3: "WalletService/testnet:aws_subnet_id_3"
-    testnet_DB_NAME: "WalletService/rds/testnet:dbname"
-    testnet_DB_USER: "WalletService/rds/testnet:username"
-    testnet_DB_PASS: "WalletService/rds/testnet:password"
-    testnet_DB_ENDPOINT: "WalletService/rds/testnet:host"
-    testnet_DB_PORT: "WalletService/rds/testnet:port"
-    testnet_REDIS_URL: "WalletService/redis/testnet:url"
-    testnet_REDIS_PASSWORD: "WalletService/redis/testnet:password"
-    testnet_FIREBASE_PROJECT_ID: "WalletService/testnet:FIREBASE_PROJECT_ID"
-    testnet_FIREBASE_PRIVATE_KEY_ID: "WalletService/testnet:FIREBASE_PRIVATE_KEY_ID"
-    testnet_FIREBASE_PRIVATE_KEY: "WalletService/testnet:FIREBASE_PRIVATE_KEY"
-    testnet_FIREBASE_CLIENT_EMAIL: "WalletService/testnet:FIREBASE_CLIENT_EMAIL"
-    testnet_FIREBASE_CLIENT_ID: "WalletService/testnet:FIREBASE_CLIENT_ID"
-    testnet_FIREBASE_AUTH_URI: "WalletService/testnet:FIREBASE_AUTH_URI"
-    testnet_FIREBASE_TOKEN_URI: "WalletService/testnet:FIREBASE_TOKEN_URI"
-    testnet_FIREBASE_AUTH_PROVIDER_X509_CERT_URL: "WalletService/testnet:FIREBASE_AUTH_PROVIDER_X509_CERT_URL"
-    testnet_FIREBASE_CLIENT_X509_CERT_URL: "WalletService/testnet:FIREBASE_CLIENT_X509_CERT_URL"
-    testnet_ALERT_MANAGER_REGION: "WalletService/testnet:ALERT_MANAGER_REGION"
-    testnet_ALERT_MANAGER_TOPIC: "WalletService/testnet:ALERT_MANAGER_TOPIC"
-    testnet_ALERT_MANAGER_ACCOUNT_ID: "WalletService/testnet:ALERT_MANAGER_ACCOUNT_ID"
-    # Testnet Hotel secrets
-    testnethotel_ACCOUNT_ID: "WalletService/testnet-hotel:account_id"
-    testnethotel_AUTH_SECRET: "WalletService/testnet-hotel:auth_secret"
-    testnethotel_AWS_VPC_DEFAULT_SG_ID: "WalletService/testnet-hotel:aws_vpc_default_sg_id"
-    testnethotel_AWS_SUBNET_ID_1: "WalletService/testnet-hotel:aws_subnet_id_1"
-    testnethotel_AWS_SUBNET_ID_2: "WalletService/testnet-hotel:aws_subnet_id_2"
-    testnethotel_AWS_SUBNET_ID_3: "WalletService/testnet-hotel:aws_subnet_id_3"
-    testnethotel_DB_NAME: "WalletService/rds/testnet-hotel:dbname"
-    testnethotel_DB_USER: "WalletService/rds/testnet-hotel:username"
-    testnethotel_DB_PASS: "WalletService/rds/testnet-hotel:password"
-    testnethotel_DB_ENDPOINT: "WalletService/rds/testnet-hotel:host"
-    testnethotel_DB_PORT: "WalletService/rds/testnet-hotel:port"
-    testnethotel_REDIS_URL: "WalletService/redis/testnet-hotel:url"
-    testnethotel_REDIS_PASSWORD: "WalletService/redis/testnet-hotel:password"
-    testnethotel_FIREBASE_PROJECT_ID: "WalletService/testnet-hotel:FIREBASE_PROJECT_ID"
-    testnethotel_FIREBASE_PRIVATE_KEY_ID: "WalletService/testnet-hotel:FIREBASE_PRIVATE_KEY_ID"
-    testnethotel_FIREBASE_PRIVATE_KEY: "WalletService/testnet-hotel:FIREBASE_PRIVATE_KEY"
-    testnethotel_FIREBASE_CLIENT_EMAIL: "WalletService/testnet-hotel:FIREBASE_CLIENT_EMAIL"
-    testnethotel_FIREBASE_CLIENT_ID: "WalletService/testnet-hotel:FIREBASE_CLIENT_ID"
-    testnethotel_FIREBASE_AUTH_URI: "WalletService/testnet-hotel:FIREBASE_AUTH_URI"
-    testnethotel_FIREBASE_TOKEN_URI: "WalletService/testnet-hotel:FIREBASE_TOKEN_URI"
-    testnethotel_FIREBASE_AUTH_PROVIDER_X509_CERT_URL: "WalletService/testnet-hotel:FIREBASE_AUTH_PROVIDER_X509_CERT_URL"
-    testnethotel_FIREBASE_CLIENT_X509_CERT_URL: "WalletService/testnet-hotel:FIREBASE_CLIENT_X509_CERT_URL"
-    testnethotel_ALERT_MANAGER_REGION: "WalletService/testnet-hotel:ALERT_MANAGER_REGION"
-    testnethotel_ALERT_MANAGER_TOPIC: "WalletService/testnet-hotel:ALERT_MANAGER_TOPIC"
-    testnethotel_ALERT_MANAGER_ACCOUNT_ID: "WalletService/testnet-hotel:ALERT_MANAGER_ACCOUNT_ID"
     # Testnet India secrets
     testnetindia_ACCOUNT_ID: "WalletService/testnet-india:account_id"
     testnetindia_AUTH_SECRET: "WalletService/testnet-india:auth_secret"

Makefile

@@ -18,18 +18,6 @@ build-service:
 push-daemon:
 	bash scripts/push-daemon.sh
 
-.PHONY: deploy-lambdas-nano-testnet
-deploy-lambdas-nano-testnet:
-	AWS_SDK_LOAD_CONFIG=1 yarn workspace wallet-service run serverless deploy --stage nano --region eu-central-1 --aws-profile nano-testnet
-
-.PHONY: deploy-lambdas-nano-testnet-bravo
-deploy-lambdas-nano-testnet-bravo:
-	AWS_SDK_LOAD_CONFIG=1 yarn workspace wallet-service run serverless deploy --stage nano-bravo --region eu-central-1 --aws-profile nano-testnet
-
-.PHONY: deploy-lambdas-nano-testnet-hackaton
-deploy-lambdas-nano-testnet-hackaton:
-	AWS_SDK_LOAD_CONFIG=1 yarn workspace wallet-service run serverless deploy --stage hackaton --region eu-central-1 --aws-profile nano-testnet-hackaton
-
 .PHONY: deploy-lambdas-ekvilibro-testnet
 deploy-lambdas-ekvilibro-testnet:
 	AWS_SDK_LOAD_CONFIG=1 yarn workspace wallet-service run serverless deploy --stage ekvilibro --region eu-central-1 --aws-profile ekvilibro
@@ -42,14 +30,6 @@ deploy-lambdas-ekvilibro-mainnet:
 deploy-lambdas-dev-testnet:
 	AWS_SDK_LOAD_CONFIG=1 yarn workspace wallet-service run serverless deploy --stage dev-testnet --region eu-central-1
 
-.PHONY: deploy-lambdas-testnet
-deploy-lambdas-testnet:
-	AWS_SDK_LOAD_CONFIG=1 yarn workspace wallet-service run serverless deploy --stage testnet --region eu-central-1
-
-.PHONY: deploy-lambdas-testnet-hotel
-deploy-lambdas-testnet-hotel:
-	AWS_SDK_LOAD_CONFIG=1 yarn workspace wallet-service run serverless deploy --stage hotel --region eu-central-1
-
 .PHONY: deploy-lambdas-testnet-india
 deploy-lambdas-testnet-india:
 	AWS_SDK_LOAD_CONFIG=1 yarn workspace wallet-service run serverless deploy --stage india --region eu-central-1

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.0",
+  "version": "1.12.0",
   "workspaces": [
     "packages/common",
     "packages/daemon",

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,
   };
 };