Merge pull request #229 from bitholla/hotfix-1.5.10

Hotfix 1.5.10

Author: abeikverdi

plugins/constants.js

@@ -59,4 +59,6 @@ exports.ERC_TOKENS = [
 	'leo',
 	'xaut',
 	'busd'
-];
+];
+
+exports.VAULT_ENDPOINT = 'https://api.vault.bitholla.com/v1';

plugins/vault/crons/checkWithdrawals.js

@@ -4,7 +4,8 @@ const { Deposit, User, sequelize } = require('../../../db/models');
 const rp = require('request-promise');
 const { each } = require('lodash');
 const { all, delay } = require('bluebird');
-const { VAULT_ENDPOINT, GET_CONFIGURATION, GET_SECRETS } = require('../../../constants');
+const { GET_CONFIGURATION, GET_SECRETS } = require('../../../constants');
+const { VAULT_ENDPOINT } = require('../../constants');
 const mathjs = require('mathjs');
 const { loggerDeposits } = require('../../../config/logger');
 const VAULT_NAME = () => GET_SECRETS().vault.name;
@@ -67,7 +68,7 @@ const checkWithdrawals = () => {
 						qs: {
 							txid
 						},
-						uri: `${VAULT_ENDPOINT}/${VAULT_WALLET(txids[txid][0].currency)}/transactions`,
+						uri: `${VAULT_ENDPOINT}/wallet/${VAULT_WALLET(txids[txid][0].currency)}/transactions`,
 						json: true
 					};
 					return delay(500 * i)

plugins/vault/crons/processWithdrawals.js

@@ -4,8 +4,8 @@ const { Deposit, sequelize, User, Sequelize } = require('../../../db/models');
 const rp = require('request-promise');
 const { each } = require('lodash');
 const { all, delay } = require('bluebird');
-const { VAULT_ENDPOINT, GET_CONFIGURATION, GET_SECRETS } = require('../../../constants');
-const { ERC_TOKENS } = require('../../constants');
+const { GET_CONFIGURATION, GET_SECRETS } = require('../../../constants');
+const { ERC_TOKENS, VAULT_ENDPOINT } = require('../../constants');
 const moment = require('moment');
 const { loggerDeposits } = require('../../../config/logger');
 const mathjs = require('mathjs');
@@ -134,7 +134,7 @@ const processWithdrawals = () => {
 										amount: getAmount(withdrawal.amount, withdrawal.fee)
 									}
 								},
-								uri: `${VAULT_ENDPOINT}/${VAULT_WALLET(withdrawal.currency)}/withdraw/simple`,
+								uri: `${VAULT_ENDPOINT}/wallet/${VAULT_WALLET(withdrawal.currency)}/withdraw/simple`,
 								json: true
 							},
 							dbWithdrawals: [withdrawal]
@@ -167,7 +167,7 @@ const processWithdrawals = () => {
 									};
 								})
 							},
-							uri: `${VAULT_ENDPOINT}/${VAULT_WALLET('btc')}/withdraw/batch`,
+							uri: `${VAULT_ENDPOINT}/wallet/${VAULT_WALLET('btc')}/withdraw/batch`,
 							json: true,
 						},
 						dbWithdrawals: btcWithdrawals
@@ -189,7 +189,7 @@ const processWithdrawals = () => {
 									};
 								})
 							},
-							uri: `${VAULT_ENDPOINT}/${VAULT_WALLET('bch')}/withdraw/batch`,
+							uri: `${VAULT_ENDPOINT}/wallet/${VAULT_WALLET('bch')}/withdraw/batch`,
 							json: true
 						},
 						dbWithdrawals: bchWithdrawals

plugins/vault/helpers.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { VAULT_ENDPOINT, API_HOST, GET_CONFIGURATION, GET_SECRETS } = require('../../constants');
+const { API_HOST, GET_CONFIGURATION, GET_SECRETS } = require('../../constants');
+const { VAULT_ENDPOINT } = require('../constants');
 const rp = require('request-promise');
 const { intersection, union, each } = require('lodash');
 const WEBHOOK_URL = (coin) => `${API_HOST}/v1/deposit/${coin}`;
@@ -151,7 +152,7 @@ const checkWebhook = (wallet, vaultConfig) => {
 			body: {
 				url: WEBHOOK_URL(wallet.currency)
 			},
-			uri: `${VAULT_ENDPOINT}/${wallet.name}/webhook`,
+			uri: `${VAULT_ENDPOINT}/wallet/${wallet.name}/webhook`,
 			json: true
 		};
 		return rp(options);

version

@@ -1 +1 @@
-1.5.9
+1.5.10

web/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hollaex-kit",
-	"version": "1.5.9",
+	"version": "1.5.10",
 	"private": true,
 	"dependencies": {
 		"@material/button": "0.7.0",

web/src/config/constants.js

@@ -520,7 +520,7 @@ export const EXCHANGE_EXPIRY_DAYS = 15;
 export const EXCHANGE_EXPIRY_SECONDS = EXCHANGE_EXPIRY_DAYS * 86400;
 export const SUPPORT_HELP_URL =
 	'https://info.hollaex.com/hc/en-us/requests/new';
-export const REQUEST_VAULT_SUPPORTED_COINS = 'https://api.bitholla.com/v1/vault/coins';
+export const REQUEST_VAULT_SUPPORTED_COINS = 'https://api.vault.bitholla.com/v1/coins';
 export const ADMIN_GUIDE_DOWNLOAD_LINK = 'https://bitholla.s3.ap-northeast-2.amazonaws.com/kit/Admin+panel+manual.pdf';
 
 export const MAX_NUMBER_BANKS = 3;