Merge pull request #1078 from bitholla/testnet

Testnet
hollaex · Nov 25, 2021 · 455ba47 · 455ba47
2 parents 6e76950 + 7823f63
commit 455ba47
Show file tree

Hide file tree

Showing 88 changed files with 11,819 additions and 1,816 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,9 @@ test/Wallet/.log
 test/Report
 test/.env
 test/Dev
+test/selenium/Onboarding/.log/*/*
+test/selenium/.env
+
 
 # production
 build

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM node:10.15.3-stretch-slim
+FROM node:10.24.1-buster-slim
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends git python build-essential && \
+    apt-get install -y --no-install-recommends 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/Dockerfile.webtest b/Dockerfile.webtest
@@ -1,7 +1,7 @@
-FROM node:10.15.3-stretch-slim
+FROM node:10.24.1-buster-slim
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends git python build-essential && \
+    apt-get install -y --no-install-recommends curl openssl ca-certificates git python build-essential && \
     rm -rf /var/lib/apt/lists/* && \
     npm config set unsafe-perm true && \
     npm install mocha -g --loglevel=error

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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 const { cloneDeep, pick } = require('lodash');
 const { all } = require('bluebird');
 const { USER_NOT_FOUND } = require('../../messages');

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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 const { errorMessageConverter } = require('../../utils/conversion');
 
 const getAdminDeposits = (req, res) => {

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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 const { loggerTier } = require('../../config/logger');
 const { errorMessageConverter } = require('../../utils/conversion');
 

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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 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('hollaex-tools-lib');
+const toolsLib = require('../../utils/toolsLib');
 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.3"
+  version: "2.2.4"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2

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('hollaex-tools-lib');
+const toolsLib = require('./utils/toolsLib');
 const { checkStatus } = require('./init');
 const { API_HOST, CUSTOM_CSS } = require('./constants');
 

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('hollaex-tools-lib');
+const toolsLib = require('../utils/toolsLib');
 
 const domainMiddleware = (req, res, next) => {
 	logger.verbose(req.uuid, 'origin', req.headers['x-real-origin']);

diff --git a/server/docker-compose.yaml b/server/docker-compose.yaml
@@ -26,6 +26,7 @@ services:
     ports:
       - 10010:10010
       - 10011:10011
+      - 10012:10012
     build:
       context: .
       dockerfile: ./tools/Dockerfile.pm2
@@ -41,7 +42,7 @@ services:
       - ./api:/app/api
       - ./config:/app/config
       - ./db:/app/db
-      - ./plugins.js:/app/plugins.js
+      - ./plugins:/app/plugins
       - ./mail:/app/mail
       - ./ws:/app/ws
       - ./app.js:/app/app.js

diff --git a/server/ecosystem.config.js b/server/ecosystem.config.js
@@ -42,7 +42,7 @@ const ws = {
 const plugins = {
 	// plugins application
 	name      : 'plugins',
-	script    : 'plugins.js',
+	script    : 'plugins/index.js',
 	error_file: '/dev/null',
 	out_file: '/dev/null',
 	watch,

diff --git a/server/init.js b/server/init.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { Network } = require('hollaex-node-lib');
+const Network = require('./utils/nodeLib');
 const { all } = require('bluebird');
 const rp = require('request-promise');
 const { loggerInit } = require('./config/logger');

diff --git a/server/mail/templates/withdrawalRequest.js b/server/mail/templates/withdrawalRequest.js
@@ -11,7 +11,7 @@ const fetchMessage = (email, data, language, domain) => {
 
 const html = (email, data, language, domain) => {
 	const WITHDRAWALREQUEST = require('../strings').getStringObject(language, 'WITHDRAWALREQUEST');
-	const link = `${domain}/confirm-withdraw/${data.transaction_id}`;
+	const link = data.confirmation_link || `${domain}/confirm-withdraw/${data.transaction_id}`;
 	return `
 		<div>
 			<p>
@@ -44,7 +44,7 @@ const html = (email, data, language, domain) => {
 
 const text = (email, data, language, domain) => {
 	const WITHDRAWALREQUEST = require('../strings').getStringObject(language, 'WITHDRAWALREQUEST');
-	const link = `${domain}/confirm-withdraw/${data.transaction_id}`;
+	const link = data.confirmation_link || `${domain}/confirm-withdraw/${data.transaction_id}`;
 	return `
 		${WITHDRAWALREQUEST.GREETING(email)}
 		${WITHDRAWALREQUEST.BODY[1](data.currency, data.amount, data.address)}

diff --git a/server/package.json b/server/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "2.2.3",
+	"version": "2.2.4",
 	"private": false,
 	"description": "HollaEx Kit",
 	"keywords": [
@@ -26,11 +26,10 @@
 		"expect-ct": "0.1.0",
 		"express": "4.16.2",
 		"express-validator": "6.7.0",
+		"file-type": "16.5.2",
 		"flat": "5.0.0",
 		"geoip-lite": "1.4.1",
 		"helmet": "3.12.0",
-		"hollaex-node-lib": "github:bitholla/hollaex-node-lib#2.11",
-		"hollaex-tools-lib": "github:bitholla/hollaex-tools-lib#2.15",
 		"http": "0.0.0",
 		"install": "0.10.4",
 		"json2csv": "4.5.4",
@@ -42,6 +41,7 @@
 		"moment-timezone": "0.5.28",
 		"morgan": "1.9.0",
 		"multer": "1.4.2",
+		"multicoin-address-validator": "0.4.4",
 		"node-cron": "2.0.3",
 		"nodemailer": "6.4.6",
 		"npm": "5.7.1",
@@ -66,6 +66,7 @@
 		"validator": "9.4.1",
 		"winston": "3.2.1",
 		"winston-elasticsearch-apm": "0.0.7",
+		"ws": "7.4.0",
 		"ws-heartbeat": "1.1.0",
 		"yamljs": "0.3.0"
 	},