Merge pull request #3476 from hollaex/beta

Beta

Author: abeikverdi

server/api/controllers/admin.js

@@ -160,6 +160,9 @@ const getUsersAdmin = (req, res) => {
 		phone_number,
 		kyc,
 		bank,
+		bank_key,
+		bank_value,
+		activated,
 		id_number
 
 	} = req.swagger.params;
@@ -200,6 +203,9 @@ const getUsersAdmin = (req, res) => {
 		phone_number: phone_number.value,
 		kyc: kyc.value,
 		bank: bank.value,
+		bank_key: bank_key.value,
+		bank_value: bank_value.value,
+		activated: activated.value,
 		id_number: id_number.value,
 		additionalHeaders: {
 			'x-forwarded-for': req.headers['x-forwarded-for']
@@ -3391,6 +3397,9 @@ const downloadUsersCsv = (req, res) => {
 		phone_number,
 		kyc,
 		bank,
+		bank_key,
+		bank_value,
+		activated,
 		id_number
 
 	} = req.swagger.params;
@@ -3432,6 +3441,9 @@ const downloadUsersCsv = (req, res) => {
 		phone_number: phone_number.value,
 		kyc: kyc.value,
 		bank: bank.value,
+		bank_key: bank_key.value,
+		bank_value: bank_value.value,
+		activated: activated.value,
 		id_number: id_number.value,
 		additionalHeaders: {
 			'x-forwarded-for': req.headers['x-forwarded-for']

server/api/controllers/notification.js

@@ -48,6 +48,35 @@ const handleCurrencyDeposit = (req, res) => {
 		fee_coin
 	} = req.swagger.params.data.value;
 
+
+	loggerNotification.verbose(
+		'controller/notification/handleCurrencyDeposit data',
+		'currency',
+		currency,
+		'user_id',
+		user_id,
+		'amount',
+		amount,
+		'txid',
+		txid,
+		'address',
+		address,
+		'is_confirmed',
+		is_confirmed,
+		'rejected',
+		rejected,
+		'created_at',
+		created_at,
+		'network',
+		network,
+		'fee',
+		fee,
+		'description',
+		description,
+		'fee_coin',
+		fee_coin
+	);
+
 	toolsLib.security.verifyNetworkHmacToken(req)
 		.then(() => {
 			if (!toolsLib.subscribedToCoin(currency)) {

server/api/controllers/tier.js

@@ -67,20 +67,18 @@ const updatePairFees = (req, res) => {
 		req.auth
 	);
 
-	const { pair, fees } = req.swagger.params.data.value;
+	const { fees } = req.swagger.params.data.value;
 
 	loggerTier.info(
 		req.uuid,
 		'controllers/tier/updatePairFees pair',
-		pair
 	);
 	const auditInfo = { userEmail: req?.auth?.sub?.email, sessionId: req?.session_id, apiPath: req?.swagger?.apiPath, method: req?.swagger?.operationPath?.[2] };
-	toolsLib.tier.updatePairFees(pair, fees, auditInfo)
+	toolsLib.tier.updatePairFees(fees, auditInfo)
 		.then(() => {
 			loggerTier.info(
 				req.uuid,
 				'controllers/tier/updatePairFees updated fees pair',
-				pair
 			);
 			return res.json({ message: 'Success' });
 		})

server/api/swagger/admin.yaml

@@ -1089,6 +1089,18 @@ paths:
           name: bank
           required: false
           type: integer
+        - in: query
+          name: bank_key
+          required: false
+          type: string
+        - in: query
+          name: bank_value
+          required: false
+          type: string
+        - in: query
+          name: activated
+          required: false
+          type: boolean
         - in: query
           name: format
           description: Specify data format
@@ -4980,6 +4992,18 @@ paths:
           name: bank
           required: false
           type: integer
+        - in: query
+          name: bank_key
+          required: false
+          type: string
+        - in: query
+          name: bank_value
+          required: false
+          type: string
+        - in: query
+          name: activated
+          required: false
+          type: boolean
         - in: query
           name: format
           description: Specify data format

server/api/swagger/definitions.yaml

@@ -1105,24 +1105,12 @@ definitions:
   PairFeesPut:
     type: object
     required:
-      - pair
       - fees
     properties:
       pair:
         description: pair
       fees:
         type: object
-        minProperties: 1
-        additionalProperties:
-          type: object
-          minProperties: 1
-          properties:
-            maker:
-              type: number
-              format: double
-            taker:
-              type: number
-              format: double
   OraclePriceResponse:
     type: object
     additionalProperties:

server/api/swagger/swagger.js

@@ -4,7 +4,7 @@ const definition = {
 	swagger: '2.0',
 	info: {
 		title: 'HollaEx Kit',
-		version: '2.15.6'
+		version: '2.15.7'
 	},
 	host: 'api.hollaex.com',
 	basePath: '/v2',

server/db/migrations/20250615123279-modify-markup-fees.js

@@ -32,7 +32,7 @@ module.exports = {
 
 		const statusModel = models[TABLE];
 		const status = await statusModel.findOne({});
-		if (status?.activation_code) { 
+		if (status?.activation_code) {
 			const exchange = await checkActivation(status.name,
 				status.url,
 				status.activation_code,
@@ -41,13 +41,13 @@ module.exports = {
 
 			for (const [symbol, customization] of Object.entries(status?.kit?.coin_customizations || [])) {
 				// Skip if already has fee_markups or no fee_markup defined
-				if (customization.fee_markup == null) continue;
+				if (customization?.fee_markup == null) continue;
 
 				// Find the matching coin by symbol
-				const coin = exchange.coins.find((c) => c.symbol === symbol);
-				if (!coin || !coin.network) continue;
+				const coin = exchange?.coins?.find((c) => c.symbol === symbol);
+				if (!coin || !coin?.network) continue;
 
-				const networks = coin.network.split(',').map((n) => n.trim().toLowerCase());
+				const networks = coin?.network?.split(',')?.map((n) => n?.trim()?.toLowerCase()) || [];
 				customization.fee_markups = {};
 
 				networks.forEach((network) => {
@@ -57,8 +57,8 @@ module.exports = {
 							symbol: symbol
 						},
 						withdrawal: {
-							value: customization?.fee_markups?.[network]?.withdrawal_fee_markup || customization.fee_markup || 0,
-							symbol: coin.withdrawal_fees[network].symbol
+							value: customization?.fee_markups?.[network]?.withdrawal_fee_markup || customization?.fee_markup || 0,
+							symbol: coin?.withdrawal_fees?.[network]?.symbol
 						}
 					};
 				});

server/docker-compose-prod.yaml

@@ -3,7 +3,7 @@ version: '3'
 name: "local"
 services:
   hollaex-kit-redis:
-    image: redis:7.2.0-alpine
+    image: redis:8.0.2-alpine
     restart: unless-stopped
     depends_on:
       - hollaex-kit-db

server/docker-compose.yaml

@@ -2,7 +2,7 @@
 version: '3'
 services:
   hollaex-kit-redis:
-    image: redis:7.2.0-alpine
+    image: redis:8.0.2-alpine
     depends_on:
       - hollaex-kit-db
     networks:

server/init.js

@@ -23,7 +23,6 @@ const {
 } = require('./constants');
 const { isNumber, difference } = require('lodash');
 const yaml = require('js-yaml');
-const toolsLib = require('hollaex-tools-lib');
 const fs = require('fs');
 
 let nodeLib;
@@ -33,17 +32,20 @@ const getNodeLib = () => nodeLib;
 subscriber.on('message', async (channel, message) => {
 	if (channel === INIT_CHANNEL) {
 		const { type } = JSON.parse(message);
+		const delay = (ms) => {
+			return new Promise((resolve) => setTimeout(resolve, ms));
+		};
 		switch (type) {
 			case 'refreshInit':
-				await toolsLib.sleep((Math.floor(Math.random() * 5) + 1) * 1000);
+				await delay((Math.floor(Math.random() * 5) + 1) * 1000);
 				checkStatus();
 				publisher.publish(
 					WS_HUB_CHANNEL,
 					JSON.stringify({ action: 'restart' })
 				);
 				break;
 			case 'refreshApi':
-				await toolsLib.sleep((Math.floor(Math.random() * 5) + 1) * 1000);
+				await delay((Math.floor(Math.random() * 5) + 1) * 1000);
 				checkStatus();
 				break;
 			default:
@@ -160,6 +162,35 @@ const checkStatus = () => {
 				}
 			}
 
+			let hasUpdate = false;
+			for (const [symbol, customization] of Object.entries(status?.kit?.coin_customizations || [])) {
+				if (customization?.fee_markup == null) continue;
+
+				const coin = exchange?.coins?.find((c) => c.symbol === symbol);
+				if (!coin || !coin?.network) continue;
+
+				const networks = coin?.network?.split(',')?.map((n) => n?.trim()?.toLowerCase()) || [];
+
+				for(const network of networks) {
+					if (!customization?.fee_markups?.[network]?.withdrawal?.symbol) continue;
+					if (!coin?.withdrawal_fees?.[network]?.symbol) continue;
+
+					
+					if (customization?.fee_markups?.[network]?.withdrawal?.symbol != coin?.withdrawal_fees?.[network]?.symbol) {
+						hasUpdate = true;
+						customization.fee_markups[network].withdrawal.symbol = coin?.withdrawal_fees?.[network]?.symbol;
+						customization.fee_markups[network].withdrawal.value = 0;
+					}
+				}
+			}
+
+			if (hasUpdate) {
+				Status.update(
+					{ kit: status.kit },
+					{ where: { id: status.id } }
+				);
+			}
+
 			for (let pair of exchange.pairs) {
 				exchangePairs.push(pair.name);
 				configuration.pairs[pair.name] = pair;