Merge pull request #1174 from bitholla/testnet

Testnet
hollaex · Feb 7, 2022 · d1e616a · d1e616a
2 parents 11fce64 + 68eb5fa
commit d1e616a
Show file tree

Hide file tree

Showing 128 changed files with 27,162 additions and 1,484 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -119,7 +119,7 @@ steps:
   - echo "Current version tag is :" && cat .tags
 
 - name: request_hollacloud_to_run_upgrade
-  image: bitholla/devops-tools:drone_hollacloud-201007
+  image: bitholla/devops-tools:drone_hollacloud-220121
   environment:
     HOLLAEX_EMAIL:
       from_secret: hollaex_email
@@ -166,7 +166,7 @@ steps:
   - echo "Current version tag is :" && cat .tags
 
 - name: request_hollacloud_to_run_upgrade
-  image: bitholla/devops-tools:drone_hollacloud-201007
+  image: bitholla/devops-tools:drone_hollacloud-220121
   environment:
     HOLLAEX_EMAIL:
       from_secret: next_email

diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,json}]
+indent_style = tab
+indent_size = 3
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -11,25 +11,21 @@
         "ecmaVersion": 9,
         "sourceType": "module"
     },
+    "plugins": ["unused-imports"],
     "rules": {
-        "indent": [
-            "warn",
-            "tab",
-            {
-                "SwitchCase": 1   
-            }
-        ],
-        "linebreak-style": [
-            "warn",
-            "unix"
-        ],
-        "quotes": [
-            "warn",
-            "single"
-        ],
-        "semi": [
-            "warn",
-            "always"
-        ]
+        "linebreak-style": ["error", "unix"],
+		"quotes": ["error", "single"],
+		"semi": ["error", "always"],
+		"indent": ["error", "tab", { "SwitchCase": 1 }],
+		"arrow-parens": ["error", "always"],
+		"object-curly-spacing": ["error", "always"],
+		"comma-dangle": ["error", "never"],
+		"no-console": 0,
+		"no-unused-vars": "off",
+		"unused-imports/no-unused-imports": "error",
+		"unused-imports/no-unused-vars": [
+			"warn",
+			{ "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" }
+		]
     }
-}
+}
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:10.24.1-buster-slim
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl openssl ca-certificates git python build-essential && \
+    apt-get install -y curl openssl ca-certificates git python build-essential && \
     rm -rf /var/lib/apt/lists/* && \
     npm config set unsafe-perm true && \
     npm install pm2@3.2.7 sequelize-cli@5.4.0 mocha -g --loglevel=error

diff --git a/server/.eslintrc.json b/server/.eslintrc.json
diff --git a/server/.gitignore b/server/.gitignore
@@ -0,0 +1 @@
+tools/nginx/logs
diff --git a/server/api/controllers/admin.js b/server/api/controllers/admin.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { loggerAdmin } = require('../../config/logger');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { cloneDeep, pick } = require('lodash');
 const { all } = require('bluebird');
 const { USER_NOT_FOUND } = require('../../messages');
@@ -86,7 +86,7 @@ const putAdminKit = (req, res) => {
 	if (data.kit) {
 		if (data.kit.setup_completed) {
 			loggerAdmin.error(req.uuid, 'controllers/admin/putAdminKit', 'Cannot update setup_completed value through this endpoint');
-			return res.status(400).json({ message: 'Cannot update setup_completed value through this endpoint'});
+			return res.status(400).json({ message: 'Cannot update setup_completed value through this endpoint' });
 		}
 	}
 
@@ -890,7 +890,7 @@ const mintAsset = (req, res) => {
 		.then((data) => {
 			loggerAdmin.info(
 				req.uuid,
-				'controllers/admin/mintAsset successful',
+				'controllers/admin/mintAsset successful'
 			);
 			return res.status(201).json(data);
 		})
@@ -959,7 +959,7 @@ const putMint = (req, res) => {
 		.then((data) => {
 			loggerAdmin.info(
 				req.uuid,
-				'controllers/admin/putMint successful',
+				'controllers/admin/putMint successful'
 			);
 			return res.json(data);
 		})
@@ -1031,7 +1031,7 @@ const burnAsset = (req, res) => {
 		.then((data) => {
 			loggerAdmin.info(
 				req.uuid,
-				'controllers/admin/burnAsset successful',
+				'controllers/admin/burnAsset successful'
 			);
 			return res.status(201).json(data);
 		})
@@ -1100,7 +1100,7 @@ const putBurn = (req, res) => {
 		.then((data) => {
 			loggerAdmin.info(
 				req.uuid,
-				'controllers/admin/putBurn successful',
+				'controllers/admin/putBurn successful'
 			);
 			return res.json(data);
 		})

diff --git a/server/api/controllers/deposit.js b/server/api/controllers/deposit.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { loggerDeposits } = require('../../config/logger');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { errorMessageConverter } = require('../../utils/conversion');
 
 const getAdminDeposits = (req, res) => {
@@ -137,5 +137,5 @@ const getUserDeposits = (req, res) => {
 
 module.exports = {
 	getAdminDeposits,
-	getUserDeposits,
+	getUserDeposits
 };
diff --git a/server/api/controllers/notification.js b/server/api/controllers/notification.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { loggerNotification } = require('../../config/logger');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { sendEmail } = require('../../mail');
 const { MAILTYPE } = require('../../mail/strings');
 const { publisher } = require('../../db/pubsub');

diff --git a/server/api/controllers/order.js b/server/api/controllers/order.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { loggerOrders, loggerUser } = require('../../config/logger');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { isPlainObject, isNumber } = require('lodash');
 const { errorMessageConverter } = require('../../utils/conversion');
 const { isUUID } = require('validator');

diff --git a/server/api/controllers/otp.js b/server/api/controllers/otp.js
@@ -2,7 +2,7 @@
 
 const { INVALID_OTP_CODE } = require('../../messages');
 const { loggerOtp } = require('../../config/logger');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { errorMessageConverter } = require('../../utils/conversion');
 
 const requestOtp = (req, res) => {

diff --git a/server/api/controllers/public.js b/server/api/controllers/public.js
@@ -3,7 +3,7 @@
 const packageJson = require('../../package.json');
 const { API_HOST, HOLLAEX_NETWORK_ENDPOINT } = require('../../constants');
 const { loggerPublic } = require('../../config/logger');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { errorMessageConverter } = require('../../utils/conversion');
 
 const getHealth = (req, res) => {

diff --git a/server/api/controllers/tier.js b/server/api/controllers/tier.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { loggerTier } = require('../../config/logger');
 const { errorMessageConverter } = require('../../utils/conversion');
 
@@ -109,7 +109,7 @@ const updateTiersLimits = (req, res) => {
 		.then(() => {
 			loggerTier.info(
 				req.uuid,
-				'controllers/tier/updateTierLimits updated limits',
+				'controllers/tier/updateTierLimits updated limits'
 			);
 			return res.json({ message: 'Success' });
 		})

diff --git a/server/api/controllers/trade.js b/server/api/controllers/trade.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { loggerTrades } = require('../../config/logger');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { errorMessageConverter } = require('../../utils/conversion');
 
 const getUserTrades = (req, res) => {

diff --git a/server/api/controllers/user.js b/server/api/controllers/user.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { isEmail, isUUID } = require('validator');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { sendEmail } = require('../../mail');
 const { MAILTYPE } = require('../../mail/strings');
 const { loggerUser } = require('../../config/logger');

diff --git a/server/api/controllers/withdrawal.js b/server/api/controllers/withdrawal.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { loggerWithdrawals } = require('../../config/logger');
-const toolsLib = require('../../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { all } = require('bluebird');
 const { USER_NOT_FOUND } = require('../../messages');
 const { errorMessageConverter } = require('../../utils/conversion');

diff --git a/server/api/swagger/swagger.yaml b/server/api/swagger/swagger.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "2.2.7"
+  version: "2.2.8"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2
@@ -1543,7 +1543,7 @@ paths:
         - name: symbol
           in: query
           description: Currency symbol
-          required: false
+          required: true
           type: string
       responses:
         200:

diff --git a/server/app.js b/server/app.js
@@ -8,7 +8,7 @@ var YAML = require('yamljs');
 var swaggerDoc = YAML.load('./api/swagger/swagger.yaml');
 const { logEntryRequest, stream, logger } = require('./config/logger');
 const { domainMiddleware, helmetMiddleware } = require('./config/middleware');
-const toolsLib = require('./utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 const { checkStatus } = require('./init');
 const { API_HOST, CUSTOM_CSS } = require('./constants');
 
@@ -52,7 +52,7 @@ checkStatus()
 			Object.entries(swaggerDoc.paths).forEach(([path, pathContent], index) => {
 				Object.keys(pathContent).forEach((method) => {
 					if (method.indexOf('swagger') === -1) {
-						if (pathContent[method].hasOwnProperty('tags')) {
+						if (Object.prototype.hasOwnProperty.call(pathContent[method], 'tags')) {
 							const tags = pathContent[method].tags;
 							const index = tags.findIndex((value) => value === 'Admin' || value === 'Notification');
 							if (index > -1) {

diff --git a/server/config/logger.js b/server/config/logger.js
@@ -38,7 +38,7 @@ const all = format((info) => {
 });
 
 // used for filtering specific logs. currently not used.
-const filterOnly = level => {
+const filterOnly = (level) => {
 	return format((info) => {
 		if (info[LEVEL] === level) {
 			return info;
@@ -49,7 +49,7 @@ const filterOnly = level => {
 
 const generateLoggerConfiguration = (name) => {
 	const transportsConfig = [
-		new transports.Console({ level: LOG_LEVEL} )
+		new transports.Console({ level: LOG_LEVEL } )
 	];
 
 	if (APM_ENABLED) {

diff --git a/server/config/middleware.js b/server/config/middleware.js
@@ -6,7 +6,7 @@ const ALLOWED_DOMAINS = () => toolsLib.getKitSecrets().allowed_domains || (proce
 const helmet = require('helmet');
 const expectCt = require('expect-ct');
 const { apm } = require('./logger');
-const toolsLib = require('../utils/toolsLib');
+const toolsLib = require('hollaex-tools-lib');
 
 const domainMiddleware = (req, res, next) => {
 	logger.verbose(req.uuid, 'origin', req.headers['x-real-origin']);

diff --git a/server/config/redis.js b/server/config/redis.js
@@ -28,24 +28,24 @@ const defaultConfig = {
 const productionConfig = {
 	client: REDIS_PASSWORD
 		? {
-				...redisClientConfig,
-				password: REDIS_PASSWORD,
-				auth: REDIS_PASSWORD
-		  }
+			...redisClientConfig,
+			password: REDIS_PASSWORD,
+			auth: REDIS_PASSWORD
+		}
 		: redisClientConfig,
 	redis: REDIS_PASSWORD
 		? {
-				...redisClientConfig,
-				password: REDIS_PASSWORD,
-				auth: REDIS_PASSWORD
-		  }
+			...redisClientConfig,
+			password: REDIS_PASSWORD,
+			auth: REDIS_PASSWORD
+		}
 		: redisClientConfig,
 	pubsub: PUBSUB_PASSWORD
 		? {
-				...redisPubsubConfig,
-				password: PUBSUB_PASSWORD,
-				auth: PUBSUB_PASSWORD
-		  }
+			...redisPubsubConfig,
+			password: PUBSUB_PASSWORD,
+			auth: PUBSUB_PASSWORD
+		}
 		: redisPubsubConfig
 };
 

diff --git a/server/db/migrations/20170717083259-create-user.js b/server/db/migrations/20170717083259-create-user.js
@@ -104,7 +104,7 @@ module.exports = {
 				is_tech: {
 					type: Sequelize.BOOLEAN,
 					defaultValue: false
-				},
+				}
 			},
 			{
 				timestamps: true,