Merge pull request #2583 from hollaex/beta

Beta

server/api/controllers/admin.js

@@ -942,7 +942,8 @@ const mintAsset = (req, res) => {
 		transaction_id,
 		status,
 		email,
-		fee
+		fee,
+		address
 	} = req.swagger.params.data.value;
 
 	loggerAdmin.info(
@@ -958,7 +959,9 @@ const mintAsset = (req, res) => {
 		'status',
 		status,
 		'fee',
-		fee
+		fee,
+		'address',
+		address
 	);
 
 	toolsLib.user.getUserByKitId(user_id)
@@ -976,6 +979,7 @@ const mintAsset = (req, res) => {
 					transactionId: transaction_id,
 					status,
 					email,
+					address,
 					additionalHeaders: {
 						'x-forwarded-for': req.headers['x-forwarded-for']
 					}
@@ -1089,7 +1093,8 @@ const burnAsset = (req, res) => {
 		transaction_id,
 		status,
 		email,
-		fee
+		fee,
+		address
 	} = req.swagger.params.data.value;
 
 	loggerAdmin.info(
@@ -1105,7 +1110,9 @@ const burnAsset = (req, res) => {
 		'status',
 		status,
 		'fee',
-		fee
+		fee,
+		'address',
+		address
 	);
 
 	toolsLib.user.getUserByKitId(user_id)
@@ -1123,6 +1130,7 @@ const burnAsset = (req, res) => {
 					status,
 					email,
 					fee,
+					address,
 					additionalHeaders: {
 						'x-forwarded-for': req.headers['x-forwarded-for']
 					}

server/api/controllers/order.js

@@ -132,6 +132,11 @@ const getQuickTrade = (req, res) => {
 		});
 };
 
+const executeHedging = async ( symbol, side, size, price ) => {
+	await toolsLib.sleep(1000);
+	toolsLib.broker.reverseTransaction({ symbol, side, size, price });
+}
+
 const orderExecute = (req, res) => {
 	loggerOrders.verbose(
 		req.uuid,
@@ -156,8 +161,8 @@ const orderExecute = (req, res) => {
 
 	toolsLib.order.executeUserOrder(user_id, opts, token)
 		.then((result) => {
-			const { symbol, side, size } = result;
-			toolsLib.broker.reverseTransaction({ symbol, side, size });
+			const { symbol, side, size, price } = result;
+			executeHedging(symbol, side, size, price);
 			return res.json(result);
 		})
 		.catch((err) => {

server/api/controllers/user.js

@@ -138,7 +138,7 @@ const getVerifyUser = (req, res) => {
 				email,
 				message: VERIFICATION_EMAIL_MESSAGE
 			});
-		})
+		});
 	} else {
 		return res.status(400).json({
 			message: PROVIDE_VALID_EMAIL_CODE

server/api/controllers/withdrawal.js

@@ -155,7 +155,7 @@ const performWithdrawal = (req, res) => {
 						withdrawal.amount,
 						{
 							network: withdrawal.network,
-							// fee_markup: withdrawal.fee_markup,
+							fee_markup: withdrawal.fee_markup,
 							additionalHeaders: {
 								'x-forwarded-for': req.headers['x-forwarded-for']
 							}

server/api/swagger/definitions.yaml

@@ -1155,6 +1155,8 @@ definitions:
         format: double
       transaction_id:
         type: string
+      address:
+        type: string
       status:
         type: boolean
       email:

server/api/swagger/swagger.js

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

server/mail/templates/index.js

@@ -320,7 +320,7 @@ const replaceHTMLContent = (type, html = '', email, data, language, domain) => {
 		html = html.replace(/\$\{fee\}/g, data.fee || '0');
 		html = html.replace(/\$\{address\}/g, data.address || '');
 		html = html.replace(/\$\{ip\}/g, data.ip || '');
-		html = html.replace(/\$\{link\}/g, data.confirmation_link || `${domain}/confirm-withdraw/${data.transaction_id}`);
+		html = html.replace(/\$\{link\}/g, data.confirmation_link || `${domain}/confirm-withdraw/${data.transaction_id}?currency=${data.currency}&amount=${data.amount}&address=${data.address}&fee=${data.fee}&network=${data.network}`);
 		if(data.network) {
 			html = html.replace(/\$\{network\}/g, data.network || '');
 		} else {

server/messages.js

@@ -158,7 +158,6 @@ exports.WRONG_PAGE = 'Value "page" must be an integer';
 exports.WRONG_ORDER_BY = 'Value "order_by" cannot include whitespaces';
 exports.WRONG_ORDER = 'Value "order" must be one of: ["asc", "desc"]';
 exports.SAME_PASSWORD = 'New password must be different from previous password';
-exports.VERIFICATION_CODE_USED = 'Verification code already used';
 exports.USERNAME_IS_TAKEN = 'Username is already taken. Select a different username';
 exports.TOKEN_OTP_MUST_BE_ENABLED = 'OTP must be enabled to create a token';
 exports.CODE_NOT_FOUND = 'Code not found';

server/package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.9.2",
+	"version": "2.9.3",
 	"private": false,
 	"description": "HollaEx Kit",
 	"keywords": [
@@ -17,7 +17,7 @@
 		"bignumber.js": "9.1.1",
 		"bluebird": "3.5.3",
 		"body-parser": "1.19.0",
-		"ccxt": "1.92.89",
+		"ccxt": "4.1.96",
 		"chai": "4.2.0",
 		"chai-http": "4.3.0",
 		"cors": "2.8.5",

server/plugins/job.js

@@ -69,11 +69,11 @@ const unstakingCheckRunner = () => {
 
 				try {
 					if(totalAmount > 0) {
-                    	await toolsLib.wallet.transferAssetByKitIds(stakePool.account_id, user.id, stakePool.currency, totalAmount, 'Admin transfer stake', user.email, { category: 'stake' });
+                    	await toolsLib.wallet.transferAssetByKitIds(stakePool.account_id, user.id, stakePool.currency, totalAmount, 'Admin transfer stake', false, { category: 'stake' });
 					}
 
 					if (stakePool.reward_currency !== stakePool.currency && amountAfterSlash > 0) {
-						 await toolsLib.wallet.transferAssetByKitIds(stakePool.account_id, user.id, stakePool.reward_currency, amountAfterSlash, 'Admin transfer stake', user.email, { category: 'stake' });
+						 await toolsLib.wallet.transferAssetByKitIds(stakePool.account_id, user.id, stakePool.reward_currency, amountAfterSlash, 'Admin transfer stake', false, { category: 'stake' });
 					}
 
 				} catch (error) {

server/tools/dbs/checkConfig.js

@@ -60,7 +60,8 @@ Status.findOne()
 				maker_id: 1,
 				quote: 'xht',
 				spread: 0
-			}
+			},
+			coin_customizations: existingKitConfigurations.coin_customizations || {}
 		};
 
 		const secrets = {

server/utils/hollaex-network-lib/index.js

@@ -511,9 +511,9 @@ class HollaExNetwork {
 		if (opts.network) {
 			data.network = opts.network;
 		}
-		// if (opts.fee_markup) {
-		// 	data.fee_markup = opts.fee_markup
-		// }
+		if (opts.fee_markup) {
+			data.fee_markup = opts.fee_markup
+		}
 		const headers = generateHeaders(
 			isPlainObject(opts.additionalHeaders) ? { ...this.headers, ...opts.additionalHeaders } : this.headers,
 			this.apiSecret,

server/utils/hollaex-tools-lib/tools/broker.js

@@ -248,7 +248,8 @@ const calculatePrice = async (side, spread, formula, refresh_interval, brokerId,
 						throw new Error(`${exchangePair[0].toUpperCase()} does not have market symbol ${formattedSymbol}`)
 					}
 
-					marketPrice = ticker.last;
+
+					marketPrice = ticker.last
 					if (refresh_interval)
 						client.setexAsync(userCachekey, refresh_interval, JSON.stringify(tickers));
 				} else {
@@ -434,14 +435,14 @@ const testRebalance = async (data) => {
 };
 
 const reverseTransaction = async (orderData) => {
-	const { symbol, side, size } = orderData;
+	const { symbol, side, size, price } = orderData;
 	const notifyUser = async (data, userId) => {
 		const user = await getUserByKitId(userId);
 		sendEmail(
 			MAILTYPE.ALERT,
 			user.email,
 			{
-				type: 'binance order info',
+				type: 'broker hedging order info',
 				data
 			},
 			user.settings

server/utils/hollaex-tools-lib/tools/stake.js

@@ -113,10 +113,10 @@ const distributeStakingRewards = async (stakers, account_id, currency, reward_cu
 
         try {
             if(totalAmount > 0) {
-                await transferAssetByKitIds(account_id, user.id, currency, totalAmount, 'Admin transfer stake', user.email, { category: 'stake' });
+                await transferAssetByKitIds(account_id, user.id, currency, totalAmount, 'Admin transfer stake', false, { category: 'stake' });
             }
             if (reward_currency !== currency && amountAfterSlash > 0) { 
-                await transferAssetByKitIds(account_id, user.id, reward_currency, amountAfterSlash, 'Admin transfer stake', user.email, { category: 'stake' });
+                await transferAssetByKitIds(account_id, user.id, reward_currency, amountAfterSlash, 'Admin transfer stake', false, { category: 'stake' });
             }
 
         } catch (error) {
@@ -334,8 +334,6 @@ const updateExchangeStakePool = async (id, data, auditInfo) => {
         early_unstake,
         slashing_principle_percentage,
         slashing_earning_percentage,
-        min_amount,
-        max_amount,
         status,
         onboarding,
     } = data;
@@ -352,8 +350,6 @@ const updateExchangeStakePool = async (id, data, auditInfo) => {
         || (duration && duration !== stakePool.duration)
         || (slashing && slashing !== stakePool.slashing)
         || (early_unstake && early_unstake !== stakePool.early_unstake)
-        || (min_amount && min_amount !== stakePool.min_amount)
-        || (max_amount && max_amount !== stakePool.max_amount)
         || (slashing_principle_percentage && slashing_principle_percentage !== stakePool.slashing_principle_percentage)
         || (slashing_earning_percentage && slashing_earning_percentage !== stakePool.slashing_earning_percentage)
     )) {
@@ -541,7 +537,7 @@ const createExchangeStaker = async (stake_id, amount, user_id) => {
         throw new Error(STAKE_POOL_MAX_AMOUNT_ERROR);
     }
 
-    if (new BigNumber(amount).comparedTo(new BigNumber(stakePool.min_amount)) !== 1) {
+    if (new BigNumber(amount).comparedTo(new BigNumber(stakePool.min_amount)) === -1) {
         throw new Error(STAKE_POOL_MIN_AMOUNT_ERROR);
     }
 
@@ -562,7 +558,7 @@ const createExchangeStaker = async (stake_id, amount, user_id) => {
     }
 
 
-    await transferAssetByKitIds(user_id, stakePool.account_id, stakePool.currency, amount, 'User transfer stake', user.email, { category: 'stake' });
+    await transferAssetByKitIds(user_id, stakePool.account_id, stakePool.currency, amount, 'User transfer stake', false, { category: 'stake' });
 
 
     const stakerData = await getModel('staker').create(staker, {