chore: installed shared dependencies on root project, using peerDependencies

andreabadesso · andreabadesso · commit d73011edb672 · 2024-03-31T20:01:12.000-03:00
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -2,9 +2,9 @@
   "name": "@wallet-service/common",
   "packageManager": "yarn@4.1.0",
   "peerDependencies": {
-    "@aws-sdk/client-lambda": "3.465.0",
-    "@hathor/wallet-lib": "1.4.1",
-    "winston": "3.7.2"
+    "@aws-sdk/client-lambda": "3.540.0",
+    "@hathor/wallet-lib": "0.39.0",
+    "winston": "^3.13.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.30"
diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
@@ -29,3 +29,33 @@ export interface Transaction {
   // eslint-disable-next-line camelcase
   token_symbol?: string;
 }
+
+export interface TxInput {
+  // eslint-disable-next-line camelcase
+  tx_id: string;
+  index: number;
+  value: number;
+  // eslint-disable-next-line camelcase
+  token_data: number;
+  script: string;
+  token: string;
+  decoded: DecodedOutput;
+}
+
+export interface TxOutput {
+  value: number;
+  script: string;
+  token: string;
+  decoded: DecodedOutput;
+  // eslint-disable-next-line camelcase
+  spent_by: string | null;
+  // eslint-disable-next-line camelcase
+  token_data: number;
+  locked?: boolean;
+}
+
+export interface DecodedOutput {
+  type: string;
+  address: string;
+  timelock: number | null;
+}
diff --git a/packages/common/src/utils/index.utils.ts b/packages/common/src/utils/index.utils.ts
@@ -7,7 +7,7 @@
 export const assertEnvVariablesExistence = (envVariables: string[]): void => {
   const missingList = [];
   for (const envVariable of envVariables) {
-    if (!(envVariable in process.env) || process.env[envVariable].length === 0) {
+    if (!(envVariable in process.env) || process.env[envVariable]?.length === 0) {
       missingList.push(envVariable);
     }
   }
diff --git a/packages/common/src/utils/nft.utils.ts b/packages/common/src/utils/nft.utils.ts
@@ -8,7 +8,7 @@
 import { LambdaClient, InvokeCommand, InvokeCommandOutput } from '@aws-sdk/client-lambda';
 import { addAlert } from './alerting.utils';
 import { Transaction, Severity } from '../types';
-import hathorLib from '@hathor/wallet-lib';
+import { Network, constants, CreateTokenTransaction, helpersUtils } from '@hathor/wallet-lib';
 import createDefaultLogger from '../logger';
 
 /**
@@ -25,7 +25,7 @@ export class NftUtils {
    * @param {string} network
    * @returns {boolean}
    */
-  static shouldInvokeNftHandlerForTx(tx: Transaction, network: string): boolean {
+  static shouldInvokeNftHandlerForTx(tx: Transaction, network: Network): boolean {
     return isNftAutoReviewEnabled() && this.isTransactionNFTCreation(tx, network);
   }
 
@@ -36,13 +36,13 @@ export class NftUtils {
    *
    * TODO: change tx type to HistoryTransaction
    */
-  static isTransactionNFTCreation(tx: any, network: string): boolean {
+  static isTransactionNFTCreation(tx: any, network: Network): boolean {
   /*
    * To fully check if a transaction is a NFT creation, we need to instantiate a new Transaction object in the lib.
    * So first we do some very fast checks to filter the bulk of the requests for NFTs with minimum processing.
    */
     if (
-      tx.version !== hathorLib.constants.CREATE_TOKEN_TX_VERSION // Must be a token creation tx
+      tx.version !== constants.CREATE_TOKEN_TX_VERSION // Must be a token creation tx
     || !tx.token_name // Must have a token name
     || !tx.token_symbol // Must have a token symbol
     ) {
@@ -52,11 +52,11 @@ export class NftUtils {
     // Continue with a deeper validation
     const logger = createDefaultLogger();
     let isNftCreationTx: boolean;
-    let libTx: hathorLib.CreateTokenTransaction;
+    let libTx: CreateTokenTransaction;
 
     // Transaction parsing failures should be alerted
     try {
-      libTx = hathorLib.helpersUtils.createTxFromHistoryObject(tx) as hathorLib.CreateTokenTransaction;
+      libTx = helpersUtils.createTxFromHistoryObject(tx) as CreateTokenTransaction;
     } catch (ex) {
       logger.error('[ALERT] Error when parsing transaction on isTransactionNFTCreation', {
         transaction: tx,
@@ -69,7 +69,7 @@ export class NftUtils {
 
     // Validate the token: the validateNft will throw if the transaction is not a NFT Creation
     try {
-      libTx.validateNft(new hathorLib.Network(network));
+      libTx.validateNft(network);
       isNftCreationTx = true;
     } catch (ex) {
       isNftCreationTx = false;
@@ -124,15 +124,16 @@ export class NftUtils {
   /**
    * Identifies if the metadata for a NFT needs updating and, if it does, update it.
    * @param {string} nftUid
+   * @param {number} maxRetries
    * @returns {Promise<void>} No data is returned after a successful update or skip
    */
-  static async createOrUpdateNftMetadata(nftUid: string): Promise<void> {
+  static async createOrUpdateNftMetadata(nftUid: string, maxRetries: number): Promise<void> {
     // The explorer service automatically merges the metadata content if it already exists.
     const newMetadata = {
       id: nftUid,
       nft: true,
     };
-    await NftUtils._updateMetadata(nftUid, newMetadata);
+    await NftUtils._updateMetadata(nftUid, newMetadata, maxRetries);
   }
 
   /**
diff --git a/packages/daemon/package.json b/packages/daemon/package.json
@@ -32,20 +32,25 @@
     "@types/mysql": "^2.15.21",
     "@types/node": "^17.0.45",
     "@types/ws": "^8.5.5",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-jest": "^27.4.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^27.9.0",
     "jest": "^29.6.4",
     "sequelize-cli": "^6.6.1",
     "ts-jest": "^29.1.1",
     "tslib": "^2.1.0",
     "typescript": "^4.9.5"
   },
-  "dependencies": {
-    "@aws-sdk/client-lambda": "^3.474.0",
-    "@aws-sdk/client-sqs": "^3.474.0",
+  "peerDependencies": {
+    "@aws-sdk/client-lambda": "3.540.0",
+    "@aws-sdk/client-sqs": "3.540.0",
     "@hathor/wallet-lib": "0.39.0",
+    "winston": "^3.13.0"
+  },
+  "dependencies": {
     "@wallet-service/common": "workspace:^",
     "assert": "^2.1.0",
     "aws-sdk": "^2.1454.0",
@@ -55,11 +60,7 @@
     "mysql2": "^3.5.2",
     "sequelize": "^6.33.0",
     "websocket": "^1.0.33",
-    "winston": "^3.3.3",
     "ws": "^8.13.0",
     "xstate": "^4.38.2"
-  },
-  "resolutions": {
-    "@hathor/wallet-lib": "0.39.0"
   }
 }
diff --git a/packages/daemon/src/db/index.ts b/packages/daemon/src/db/index.ts
@@ -1048,7 +1048,6 @@ export const generateAddresses = async (mysql: MysqlConnection, xpubkey: string,
   let lastUsedAddressIndex = -1;
   do {
     const { NETWORK } = getConfig();
-    console.debug('WALLET UTILS: ', walletUtils);
     const addrMap = walletUtils.getAddresses(derivedXpub, highestCheckedIndex + 1, maxGap, NETWORK);
     allAddresses.push(...Object.keys(addrMap));
 
diff --git a/packages/daemon/src/services/index.ts b/packages/daemon/src/services/index.ts
@@ -7,6 +7,7 @@
 
 // @ts-ignore
 import hathorLib from '@hathor/wallet-lib';
+import { isNftAutoReviewEnabled } from '@wallet-service/common/src/utils/nft.utils';
 import axios from 'axios';
 import { get } from 'lodash';
 import {
@@ -72,6 +73,8 @@ export const METADATA_DIFF_EVENT_TYPES = {
   TX_FIRST_BLOCK: 'TX_FIRST_BLOCK',
 };
 
+isNftAutoReviewEnabled();
+
 export const metadataDiff = async (_context: Context, event: Event) => {
   const mysql = await getDbConnection();
 
diff --git a/packages/wallet-service/package.json b/packages/wallet-service/package.json
@@ -39,15 +39,15 @@
     "@types/aws-lambda": "^8.10.95",
     "@types/jest": "^27.0.24",
     "@types/node": "^18.0.4",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^3.3.0",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
     "bitcore-lib": "8.25.10",
     "dotenv": "^10.0.0",
-    "eslint": "^8.50.0",
-    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint": "^8.57.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.23.3",
-    "eslint-plugin-jest": "^23.13.2",
+    "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-module-resolver": "^0.16.0",
     "fork-ts-checker-webpack-plugin": "^9.0.0",
     "jest": "^29.7.0",
@@ -70,9 +70,9 @@
     "webpack-node-externals": "^3.0.0"
   },
   "peerDependencies": {
-    "@aws-sdk/client-apigatewaymanagementapi": "3.465.0",
-    "@aws-sdk/client-lambda": "3.465.0",
-    "@aws-sdk/client-sqs": "3.465.0",
-    "winston": "^3.7.2"
+    "@aws-sdk/client-apigatewaymanagementapi": "3.540.0",
+    "@aws-sdk/client-lambda": "3.540.0",
+    "@aws-sdk/client-sqs": "3.540.0",
+    "winston": "^3.13.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`export const assertEnvVariablesExistence = (envVariables: string[]): void => {`
`8`	`8`	`const missingList = [];`
`9`	`9`	`for (const envVariable of envVariables) {`
`10`		`- if (!(envVariable in process.env) \|\| process.env[envVariable].length === 0) {`
	`10`	`+ if (!(envVariable in process.env) \|\| process.env[envVariable]?.length === 0) {`
`11`	`11`	`missingList.push(envVariable);`
`12`	`12`	`}`
`13`	`13`	`}`