Merge pull request #871 from bitholla/testnet

Testnet
hollaex · Jul 8, 2021 · bd41035 · bd41035
2 parents 3d95fc5 + ff34d1c
commit bd41035
Show file tree

Hide file tree

Showing 47 changed files with 379 additions and 373 deletions.
diff --git a/server/api/controllers/admin.js b/server/api/controllers/admin.js
@@ -717,7 +717,8 @@ const mintAsset = (req, res) => {
 		description,
 		transaction_id,
 		status,
-		email
+		email,
+		fee
 	} = req.swagger.params.data.value;
 
 	loggerAdmin.info(
@@ -731,7 +732,9 @@ const mintAsset = (req, res) => {
 		'transaction_id',
 		transaction_id,
 		'status',
-		status
+		status,
+		'fee',
+		fee
 	);
 
 	toolsLib.user.getUserByKitId(user_id)
@@ -744,6 +747,7 @@ const mintAsset = (req, res) => {
 				currency,
 				amount,
 				{
+					fee,
 					description,
 					transactionId: transaction_id,
 					status,
@@ -848,7 +852,8 @@ const burnAsset = (req, res) => {
 		description,
 		transaction_id,
 		status,
-		email
+		email,
+		fee
 	} = req.swagger.params.data.value;
 
 	loggerAdmin.info(
@@ -862,7 +867,9 @@ const burnAsset = (req, res) => {
 		'transaction_id',
 		transaction_id,
 		'status',
-		status
+		status,
+		'fee',
+		fee
 	);
 
 	toolsLib.user.getUserByKitId(user_id)
@@ -878,7 +885,8 @@ const burnAsset = (req, res) => {
 					description,
 					transactionId: transaction_id,
 					status,
-					email
+					email,
+					fee
 				}
 			);
 		})

diff --git a/server/api/controllers/notification.js b/server/api/controllers/notification.js
@@ -33,7 +33,7 @@ const handleCurrencyDeposit = (req, res) => {
 	loggerNotification.verbose('controller/notification/handleCurrencyDeposit ip domain', ip, domain);
 
 	const currency = req.swagger.params.currency.value;
-	const { user_id, amount, txid, address, is_confirmed, rejected, created_at, network } = req.swagger.params.data.value;
+	const { user_id, amount, txid, address, is_confirmed, rejected, created_at, network, fee, description } = req.swagger.params.data.value;
 
 	toolsLib.security.verifyNetworkHmacToken(req)
 		.then(() => {
@@ -64,7 +64,9 @@ const handleCurrencyDeposit = (req, res) => {
 					status: is_confirmed ? 'COMPLETED' : 'PENDING',
 					address,
 					transaction_id: txid,
-					network
+					network,
+					fee,
+					description
 				};
 
 				if (is_confirmed) {
@@ -111,7 +113,7 @@ const handleCurrencyWithdrawal = (req, res) => {
 	loggerNotification.verbose('controller/notification/handleCurrencyWithdrawal ip domain', ip, domain);
 
 	const currency = req.swagger.params.currency.value;
-	const { user_id, amount, txid, address, is_confirmed, fee, rejected, created_at, network } = req.swagger.params.data.value;
+	const { user_id, amount, txid, address, is_confirmed, fee, rejected, created_at, network, description } = req.swagger.params.data.value;
 
 	toolsLib.security.verifyNetworkHmacToken(req)
 		.then(() => {
@@ -143,7 +145,8 @@ const handleCurrencyWithdrawal = (req, res) => {
 					address,
 					fee,
 					transaction_id: txid,
-					network
+					network,
+					description
 				};
 
 				publisher.publish(EVENTS_CHANNEL, JSON.stringify({

diff --git a/server/api/controllers/user.js b/server/api/controllers/user.js
@@ -154,6 +154,9 @@ const getVerifyUser = (req, res) => {
 		email = email.toLowerCase();
 		promiseQuery = toolsLib.user.getVerificationCodeByUserEmail(email)
 			.then((verificationCode) => {
+				if (verificationCode.verified) {
+					throw new Error(USER_EMAIL_IS_VERIFIED);
+				}
 				if (resendEmail) {
 					sendEmail(
 						MAILTYPE.SIGNUP,
@@ -703,12 +706,16 @@ const userCheckTransaction = (req, res) => {
 		'controllers/user/userCheckTransaction auth',
 		req.auth
 	);
-	const transactionId = req.swagger.params.transaction_id.value;
-	const address = req.swagger.params.address.value;
-	const currency = req.swagger.params.currency.value;
-	const isTestnet = req.swagger.params.is_testnet.value;
 
-	toolsLib.wallet.checkTransaction(currency, transactionId, address, isTestnet)
+	const {
+		currency,
+		transaction_id,
+		address,
+		network,
+		is_testnet
+	} = req.swagger.params;
+
+	toolsLib.wallet.checkTransaction(currency.value, transaction_id.value, address.value, network.value, is_testnet.value)
 		.then((transaction) => {
 			return res.json({ message: 'Success', transaction });
 		})

diff --git a/server/api/swagger/swagger.yaml b/server/api/swagger/swagger.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "2.1.12"
+  version: "2.1.13"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2
@@ -2400,6 +2400,11 @@ paths:
           description: crypto address receiving the deposit
           required: true
           type: string
+        - in: query
+          name: network
+          description: Blockchain network of transaction
+          required: true
+          type: string
         - in: query
           name: is_testnet
           description: specify whether or not transaction was on tesntet
@@ -4442,6 +4447,10 @@ definitions:
         format: date-time
       network:
         type: string
+      fee:
+        type: number
+      description:
+        type: string
   ExternalWithdrawalRequest:
     type: object
     required:
@@ -4469,6 +4478,8 @@ definitions:
         format: date-time
       network:
         type: string
+      description:
+        type: string
   OrderbooksResponse:
     type: object
     description: Top 10 orderbooks, where key is the symbol(currency) and the values is an object with the top 10 bids and ask.
@@ -4654,6 +4665,9 @@ definitions:
         type: boolean
       email:
         type: boolean
+      fee:
+        type: number
+        format: double
   MintBurnUpdate:
     type: object
     required:

diff --git a/server/init.js b/server/init.js
@@ -154,6 +154,7 @@ const checkStatus = () => {
 			configuration.kit.info = {
 				name: exchange.name,
 				active: exchange.active,
+				exchange_id: exchange.id,
 				url: exchange.url,
 				is_trial: exchange.is_trial,
 				created_at: exchange.created_at,

diff --git a/server/mail/strings/ar.js b/server/mail/strings/ar.js
@@ -106,7 +106,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -166,7 +168,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };

diff --git a/server/mail/strings/de.js b/server/mail/strings/de.js
@@ -107,7 +107,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -167,7 +169,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };

diff --git a/server/mail/strings/en.js b/server/mail/strings/en.js
@@ -108,7 +108,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -168,7 +170,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };

diff --git a/server/mail/strings/es.js b/server/mail/strings/es.js
@@ -107,7 +107,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -167,7 +169,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };

diff --git a/server/mail/strings/fa.js b/server/mail/strings/fa.js
@@ -109,7 +109,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -170,7 +172,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };

diff --git a/server/mail/strings/fr.js b/server/mail/strings/fr.js
@@ -107,7 +107,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -167,7 +169,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };

diff --git a/server/mail/strings/id.js b/server/mail/strings/id.js
@@ -107,7 +107,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -167,7 +169,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };

diff --git a/server/mail/strings/ja.js b/server/mail/strings/ja.js
@@ -103,7 +103,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -163,7 +165,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };

diff --git a/server/mail/strings/ko.js b/server/mail/strings/ko.js
@@ -104,7 +104,9 @@ const DEPOSIT = {
 		3: (address) => COMMON.ADDRESS(address),
 		4: (txid) => COMMON.TXID(txid),
 		5: (network) => `Network: ${network}`,
-		6: COMMON.EXPLORER
+		6: (fee) => COMMON.FEE(fee),
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -164,7 +166,8 @@ const WITHDRAWAL = {
 		4: (address) => COMMON.ADDRESS(address),
 		5: (txid) => COMMON.TXID(txid),
 		6: (network) => `Network: ${network}`,
-		7: COMMON.EXPLORER
+		7: (description) => `Description: ${description}`,
+		8: COMMON.EXPLORER
 	},
 	CLOSING: COMMON.CLOSING
 };