Merge pull request #1467 from bitholla/testnet

Testnet
hollaex · Jun 23, 2022 · 44d4027 · 44d4027
2 parents ece0416 + 8516e50
commit 44d4027
Show file tree

Hide file tree

Showing 88 changed files with 15,878 additions and 17,949 deletions.
diff --git a/server/api/controllers/broker.js b/server/api/controllers/broker.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { loggerBroker } = require('../../config/logger');
-const { INIT_CHANNEL } = require('../../constants')
+const { INIT_CHANNEL } = require('../../constants');
 const { publisher } = require('../../db/pubsub');
 const toolsLib = require('hollaex-tools-lib');
 const { errorMessageConverter } = require('../../utils/conversion');
@@ -47,7 +47,7 @@ const createBrokerPair = (req, res) => {
 		user_id,
 		min_size,
 		max_size,
-		increment_size,
+		increment_size
 	})
 		.then((data) => {
 			publisher.publish(INIT_CHANNEL, JSON.stringify({ type: 'refreshInit' }));
@@ -61,7 +61,7 @@ const createBrokerPair = (req, res) => {
 			);
 			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
-}
+};
 
 function updateBrokerPair(req, res) {
 	loggerBroker.verbose(
@@ -114,7 +114,7 @@ function deleteBrokerPair(req, res) {
 	toolsLib.broker.deleteBrokerPair(req.swagger.params.data.value.id)
 		.then((data) => {
 			publisher.publish(INIT_CHANNEL, JSON.stringify({ type: 'refreshInit' }));
-			return res.json({ message: "Successfully deleted broker pair." });
+			return res.json({ message: 'Successfully deleted broker pair.' });
 		})
 		.catch((err) => {
 			loggerBroker.error(
@@ -168,7 +168,7 @@ const executeBrokerDeal = (req, res) => {
 		side,
 		symbol,
 		price,
-		size,
+		size
 	} = req.swagger.params.data.value;
 
 	const userId = req.auth.sub.id;
@@ -190,7 +190,7 @@ const executeBrokerDeal = (req, res) => {
 			);
 			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
-}
+};
 
 module.exports = {
 	createBrokerPair,

diff --git a/server/api/swagger/swagger.yaml b/server/api/swagger/swagger.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "2.3.5"
+  version: "2.3.6"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2

diff --git a/server/db/migrations/20220331153221-update-email-field-network.js b/server/db/migrations/20220331153221-update-email-field-network.js
diff --git a/server/db/migrations/20220620132835-add-turkish-mail.js b/server/db/migrations/20220620132835-add-turkish-mail.js
@@ -0,0 +1,20 @@
+'use strict';
+const TABLE = 'Statuses';
+const COLUMN = 'email';
+
+const turkish = JSON.stringify(require('../../mail/strings/tr.json'));
+
+module.exports = {
+	async up(queryInterface) {
+		await queryInterface.sequelize.query(
+			`UPDATE public."${TABLE}"
+      SET ${COLUMN} = ${COLUMN} || '${turkish}'
+      `);
+	},
+
+	down: () => {
+		return new Promise((resolve) => {
+			resolve();
+		});
+	}
+};
diff --git a/server/mail/strings/ar.js b/server/mail/strings/ar.js