Merge pull request #252 from HathorNetwork/release-candidate

Release 1.8.2

Author: r4mmer

.eslintrc.yml

@@ -17,6 +17,18 @@ rules:
   '@typescript-eslint/no-explicit-any': off
   '@typescript-eslint/no-unused-vars': off
 overrides:
+  - files:
+      - 'packages/common/**/*.ts'
+    parserOptions:
+      project: './packages/common/tsconfig.json'
+  - files:
+      - 'packages/daemon/**/*.ts'
+    parserOptions:
+      project: './packages/daemon/tsconfig.json'
+  - files:
+      - 'packages/wallet-service/**/*.ts'
+    parserOptions:
+      project: './packages/wallet-service/tsconfig.json'
   - files:
       - 'src/**/*.ts'
     excludedFiles:

flake.lock

@@ -12,32 +12,40 @@
       overlays.default = final: prev:
         let
           packages = self.packages.${final.system};
-          inherit (packages) node-packages;
+          inherit (packages) nodePackages;
         in
         {
           nodejs = final.nodejs_20;
           nodePackages = prev.nodePackages;
           yarn = (import unstableNixPkgs { system = final.system; }).yarn-berry;
         };
     in
-    flake-utils.lib.eachDefaultSystem (system: {
-      devShell =
-        let pkgs = import nixpkgs {
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
           inherit system;
-
           overlays = [
             devshell.overlays.default
             overlays.default
           ];
         };
-        in
-        pkgs.devshell.mkShell {
+      in
+      {
+        devShell = pkgs.devshell.mkShell {
           packages = with pkgs; [
             nixpkgs-fmt
             nodejs_20
             yarn
             docker-compose
           ];
+          devshell = {
+            startup = {
+              setup.text = ''
+                export PATH="$PWD/node_modules/.bin:$PWD/packages/daemon/node_modules/.bin:$PWD/packages/wallet-service/node_modules/.bin:$PATH"
+              '';
+            };
+          };
         };
-    });
+      }
+    );
 }

flake.nix

@@ -1,6 +1,6 @@
 {
   "name": "hathor-wallet-service",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "workspaces": [
     "packages/common",
     "packages/daemon",
@@ -26,14 +26,15 @@
     "eslint-plugin-jest": "^27.9.0",
     "mysql2": "^3.9.3",
     "sequelize": "^6.37.2",
-    "sequelize-cli": "^6.6.2"
+    "sequelize-cli": "^6.6.2",
+    "typescript": "^5.8.2"
   },
   "packageManager": "yarn@4.1.0",
   "dependencies": {
     "@aws-sdk/client-apigatewaymanagementapi": "3.540.0",
     "@aws-sdk/client-lambda": "3.540.0",
     "@aws-sdk/client-sqs": "3.540.0",
-    "@hathor/wallet-lib": "1.14.1",
+    "@hathor/wallet-lib": "1.15.0",
     "@wallet-service/common": "1.5.0",
     "bip32": "^4.0.0",
     "bitcoinjs-lib": "^6.1.5",

package.json

@@ -8,7 +8,7 @@
     "test": "jest --runInBand --collectCoverage --detectOpenHandles --forceExit"
   },
   "peerDependencies": {
-    "@hathor/wallet-lib": "1.14.1"
+    "@hathor/wallet-lib": "1.15.0"
   },
   "dependencies": {
     "@aws-sdk/client-lambda": "3.540.0",

packages/common/package.json

@@ -46,7 +46,7 @@
     "typescript": "4.9.5"
   },
   "peerDependencies": {
-    "@hathor/wallet-lib": "1.14.1",
+    "@hathor/wallet-lib": "1.15.0",
     "@wallet-service/common": "1.5.0"
   },
   "dependencies": {

packages/daemon/package.json

@@ -40,7 +40,7 @@
     "winston": "3.13.0"
   },
   "peerDependencies": {
-    "@hathor/wallet-lib": "1.14.1",
+    "@hathor/wallet-lib": "1.15.0",
     "@wallet-service/common": "1.5.0"
   },
   "devDependencies": {

packages/wallet-service/package.json

@@ -21,6 +21,7 @@ import { closeDbConnection, getDbConnection } from '@src/utils';
 import { walletIdProxyHandler } from '@src/commons';
 import middy from '@middy/core';
 import cors from '@middy/http-cors';
+import errorHandler from '@src/api/middlewares/errorHandler';
 
 const mysql = getDbConnection();
 
@@ -104,7 +105,8 @@ export const checkMine: APIGatewayProxyHandler = middy(walletIdProxyHandler(asyn
       addresses: addressBelongMap,
     }),
   };
-})).use(cors());
+})).use(cors())
+  .use(errorHandler());
 
 /*
  * Get the addresses of a wallet, allowing an index filter
@@ -169,4 +171,5 @@ export const get: APIGatewayProxyHandler = middy(
     return response;
   }),
 ).use(cors())
-  .use(warmupMiddleware());
+  .use(warmupMiddleware())
+  .use(errorHandler());

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

@@ -31,6 +31,7 @@ import cors from '@middy/http-cors';
 import createDefaultLogger from '@src/logger';
 import { Logger } from 'winston';
 import config from '@src/config';
+import errorHandler from '@src/api/middlewares/errorHandler';
 
 const EXPIRATION_TIME_IN_SECONDS = 1800;
 
@@ -153,7 +154,8 @@ export const tokenHandler: APIGatewayProxyHandler = middy(async (event) => {
     statusCode: 200,
     body: JSON.stringify({ success: true, token }),
   };
-}).use(cors());
+}).use(cors())
+  .use(errorHandler());
 
 /**
  * Generates a aws policy document to allow/deny access to the resource

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

@@ -22,6 +22,7 @@ import {
 import middy from '@middy/core';
 import cors from '@middy/http-cors';
 import Joi from 'joi';
+import errorHandler from '@src/api/middlewares/errorHandler';
 
 const mysql = getDbConnection();
 
@@ -81,4 +82,5 @@ export const get: APIGatewayProxyHandler = middy(walletIdProxyHandler(async (wal
     body: JSON.stringify({ success: true, balances }),
   };
 })).use(cors())
-  .use(warmupMiddleware());
+  .use(warmupMiddleware())
+  .use(errorHandler());