Merge pull request #276 from HathorNetwork/dev

Release v1.17.0-alpha

Author: r4mmer

db/migrations/20220721154812-add_total_received.js

@@ -0,0 +1,35 @@
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addIndex(
+      'address_tx_history',
+      ['timestamp'],
+      {
+        name: 'address_tx_history_timestamp_idx',
+        fields: 'timestamp',
+      },
+    );
+
+    await queryInterface.addIndex(
+      'address_balance',
+      ['updated_at'],
+      {
+        name: 'address_balance_updated_at_idx',
+        fields: 'updated_at',
+      },
+    );
+
+    await queryInterface.addColumn('address_balance', 'total_received', {
+      type: Sequelize.BIGINT.UNSIGNED,
+      allowNull: false,
+      defaultValue: 0,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.removeIndex('address_tx_history', 'address_tx_history_timestamp_idx');
+    await queryInterface.removeIndex('address_balance', 'address_balance_updated_at_idx');
+    await queryInterface.removeColumn('address_balance', 'total_received');
+  },
+};

db/models/addressbalance.js

@@ -34,6 +34,10 @@ module.exports = (sequelize, DataTypes) => {
       allowNull: false,
       primaryKey: true,
     },
+    total_received: {
+      type: DataTypes.BIGINT.UNSIGNED,
+      allowNull: false,
+    },
     unlocked_balance: {
       type: DataTypes.BIGINT.UNSIGNED,
       allowNull: false,
@@ -60,12 +64,12 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.INTEGER.UNSIGNED,
       allowNull: false,
     },
-    createdAt: {
+    created_at: {
       type: 'TIMESTAMP',
       allowNull: false,
       defaultValue: DataTypes.literal('CURRENT_TIMESTAMP'),
     },
-    updatedAt: {
+    updated_at: {
       type: 'TIMESTAMP',
       allowNull: false,
       defaultValue: DataTypes.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
@@ -75,6 +79,10 @@ module.exports = (sequelize, DataTypes) => {
     modelName: 'AddressBalance',
     tableName: 'address_balance',
     timestamps: false,
+    indexes: [{
+      name: 'address_balance_updated_at_idx',
+      fields: ['updated_at'],
+    }],
   });
   return AddressBalance;
 };

db/models/addresstxhistory.js

@@ -53,6 +53,9 @@ module.exports = (sequelize, DataTypes) => {
     }, {
       name: 'address_tx_history_tokenid_idx',
       fields: ['token_id'],
+    }, {
+      name: 'address_tx_history_timestamp_idx',
+      fields: ['timestamp'],
     }],
   });
   return AddressTxHistory;

db/models/token.js

@@ -30,12 +30,12 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.STRING(5),
       allowNull: false,
     },
-    createdAt: {
+    created_at: {
       type: 'TIMESTAMP',
       allowNull: false,
       defaultValue: DataTypes.literal('CURRENT_TIMESTAMP'),
     },
-    updatedAt: {
+    updated_at: {
       type: 'TIMESTAMP',
       allowNull: false,
       defaultValue: DataTypes.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),

db/models/transaction.js

@@ -48,12 +48,12 @@ module.exports = (sequelize, DataTypes) => {
       allowNull: true,
       defaultValue: null,
     },
-    createdAt: {
+    created_at: {
       type: 'TIMESTAMP',
       allowNull: false,
       defaultValue: sequelize.literal('CURRENT_TIMESTAMP'),
     },
-    updatedAt: {
+    updated_at: {
       type: 'TIMESTAMP',
       allowNull: false,
       defaultValue: sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "hathor-wallet-service",
-  "version": "1.16.0-alpha",
+  "version": "1.17.0-alpha",
   "description": "",
   "scripts": {
     "postinstall": "npm dedupe",

package.json

@@ -28,6 +28,8 @@ import {
 } from '@src/utils';
 import middy from '@middy/core';
 import cors from '@middy/http-cors';
+import createDefaultLogger from '@src/logger';
+import { Logger } from 'winston';
 
 const EXPIRATION_TIME_IN_SECONDS = 1800;
 
@@ -155,7 +157,7 @@ export const tokenHandler: APIGatewayProxyHandler = middy(async (event) => {
 /**
  * Generates a aws policy document to allow/deny access to the resource
  */
-const _generatePolicy = (principalId: string, effect: string, resource: string) => {
+const _generatePolicy = (principalId: string, effect: string, resource: string, logger: Logger) => {
   const resourcePrefix = `${resource.split('/').slice(0, 2).join('/')}/*`;
   const policyDocument: PolicyDocument = {
     Version: '2012-10-17',
@@ -182,12 +184,12 @@ const _generatePolicy = (principalId: string, effect: string, resource: string)
   authResponse.context = context;
 
   // XXX: to get the resulting policy on the logs, since we can't check the cached policy
-  // eslint-disable-next-line
-  console.info('Generated policy:', authResponse);
+  logger.info('Generated policy:', authResponse);
   return authResponse;
 };
 
 export const bearerAuthorizer: APIGatewayTokenAuthorizerHandler = middy(async (event) => {
+  const logger = createDefaultLogger();
   const { authorizationToken } = event;
   if (!authorizationToken) {
     throw new Error('Unauthorized'); // returns a 401
@@ -210,8 +212,7 @@ export const bearerAuthorizer: APIGatewayTokenAuthorizerHandler = middy(async (e
     } else if (e.name === 'TokenExpiredError') {
       throw new Error('Unauthorized');
     } else {
-      // eslint-disable-next-line
-      console.log('Error on bearerAuthorizer: ', e);
+      logger.warn('Error on bearerAuthorizer: ', e);
       throw e;
     }
   }
@@ -227,8 +228,8 @@ export const bearerAuthorizer: APIGatewayTokenAuthorizerHandler = middy(async (e
   const verified = verifySignature(signature, timestamp, address, walletId);
 
   if (verified && Math.floor(Date.now() / 1000) <= expirationTs) {
-    return _generatePolicy(walletId, 'Allow', event.methodArn);
+    return _generatePolicy(walletId, 'Allow', event.methodArn, logger);
   }
 
-  return _generatePolicy(walletId, 'Deny', event.methodArn);
+  return _generatePolicy(walletId, 'Deny', event.methodArn, logger);
 }).use(cors());

src/api/auth.ts

@@ -37,6 +37,7 @@ import { walletIdProxyHandler } from '@src/commons';
 import middy from '@middy/core';
 import cors from '@middy/http-cors';
 import Joi from 'joi';
+import createDefaultLogger from '@src/logger';
 
 const mysql = getDbConnection();
 
@@ -250,6 +251,7 @@ export const changeAuthXpub: APIGatewayProxyHandler = middy(async (event) => {
  * This lambda is called by API Gateway on POST /wallet
  */
 export const load: APIGatewayProxyHandler = middy(async (event) => {
+  const logger = createDefaultLogger();
   const eventBody = (function parseBody(body) {
     try {
       return JSON.parse(body);
@@ -349,8 +351,7 @@ export const load: APIGatewayProxyHandler = middy(async (event) => {
      */
     await invokeLoadWalletAsync(xpubkeyStr, maxGap);
   } catch (e) {
-    // eslint-disable-next-line
-    console.error('Error on lambda wallet invoke', e);
+    logger.error('Error on lambda wallet invoke', e);
 
     const newRetryCount = wallet.retryCount ? wallet.retryCount + 1 : 1;
     // update wallet status to 'error'
@@ -388,6 +389,7 @@ interface LoadResult {
  * This lambda is called async by another lambda, the one reponsible for the load wallet API
  */
 export const loadWallet: Handler<LoadEvent, LoadResult> = async (event) => {
+  const logger = createDefaultLogger();
   // Can't use a middleware on this event, so we should just check the source (added by the warmup plugin) as
   // our default middleware does
   if (event.source === 'serverless-plugin-warmup') {
@@ -428,8 +430,7 @@ export const loadWallet: Handler<LoadEvent, LoadResult> = async (event) => {
       xpubkey,
     };
   } catch (e) {
-    // eslint-disable-next-line
-    console.error('Erroed on loadWalletAsync: ', e);
+    logger.error('Erroed on loadWalletAsync: ', e);
 
     const wallet = await getWallet(mysql, walletId);
     const newRetryCount = wallet.retryCount ? wallet.retryCount + 1 : 1;

src/api/wallet.ts

@@ -267,7 +267,7 @@ export const getWalletBalances = async (
 /**
  * Updates the wallet-lib constants if needed.
  *
- * @returns A promise that resolves when the wallet-lib constants have been set.
+ * @returns {Promise<void>} A promise that resolves when the wallet-lib constants have been set.
  */
 export const maybeRefreshWalletConstants = async (mysql: ServerlessMysql): Promise<void> => {
   const lastVersionData: FullNodeVersionData = await getVersionData(mysql);
@@ -573,13 +573,13 @@ export const walletIdProxyHandler = (handler: WalletProxyHandler): APIGatewayPro
   }
 );
 
-export const prepareOutputs = (outputs: TxOutput[], txId: string): TxOutputWithIndex[] => {
+export const prepareOutputs = (outputs: TxOutput[], txId: string, logger: Logger): TxOutputWithIndex[] => {
   const preparedOutputs: [number, TxOutputWithIndex[]] = outputs.reduce(
     ([currIndex, newOutputs]: [number, TxOutputWithIndex[]], output: TxOutput): [number, TxOutputWithIndex[]] => {
       if (!output.decoded
           || output.decoded.type === null
           || output.decoded.type === undefined) {
-        console.warn(`Ignoring tx output with index ${currIndex} from tx ${txId} as script couldn't be decoded.`);
+        logger.warn(`Ignoring tx output with index ${currIndex} from tx ${txId} as script couldn't be decoded.`);
         return [currIndex + 1, newOutputs];
       }