Merge pull request #95 from bcProFoundation/fb-takyoon-merchant-order-api-2

commit new code using merchant order channel

Author: takYoon

merchant-list.json

@@ -2,16 +2,7 @@
     {
         "code": "CA",
         "name": "Community Artists",
-        "walletAddress": "ecash:qp99c749msrx53hk9kn4dqqrwc0vy23prqpz6enzk2",
-        "merchantAddress": "",
-        "email": "",
-        "isElpsAccepted": true
-
-    },
-    {
-        "code": "CABURN",
-        "name": "Community - Burn",
-        "walletAddress": "ecash:qp99c749msrx53hk9kn4dqqrwc0vy23prqpz6enzk2",
+        "walletAddress": "ecash:qq0dnmu3tekw0a9pf0r9mk4q3d4hqwjqeypzdncvzl",
         "merchantAddress": "",
         "email": "",
         "isElpsAccepted": false

packages/bitcore-wallet-service/src/lib/server.ts

@@ -5111,7 +5111,7 @@ export class WalletService {
                 config.conversion.tokenCodeUnit
               } ${stringConvert} ${actualAmountConverted}`;
               bot.sendMessage(
-                config.telegram.channelFailId,
+                config.merchantOrder.channelFailId,
                 failMessage +
                   '\n\n' +
                   this._addExplorerLinkIntoTxIdWithCoin(merchantOrder.txIdFromUser, 'xec', 'View tx on the Explorer'),
@@ -5122,7 +5122,7 @@ export class WalletService {
               const dateStr = new Date().toUTCString();
               const debugMessage = `${dateStr} :: error: ${merchantOrder.error} ${stringConvert} ${actualAmountConverted}`;
               bot.sendMessage(
-                config.telegram.channelDebugId,
+                config.merchantOrder.channelDebugId,
                 debugMessage +
                   '\n\n' +
                   this._addExplorerLinkIntoTxIdWithCoin(merchantOrder.txIdFromUser, 'xec', 'View tx on the Explorer'),
@@ -5454,7 +5454,7 @@ export class WalletService {
         });
         this.storage.merchantOrderQueue.clean(err => {});
       }
-    }, 10000000000);
+    }, 2000);
   }
   async _handleSendSuccesMerchantOrder(
     amountCoinUserSentToServer,
@@ -5465,7 +5465,7 @@ export class WalletService {
   ) {
     if (amountCoinUserSentToServer > 0) {
       bot.sendMessage(
-        config.telegram.channelSuccessId,
+        config.merchantOrder.channelSuccessId,
         merchantOrder.userAddress +
           ' :: Converted ' +
           amountCoinUserSentToServer +
@@ -5489,7 +5489,7 @@ export class WalletService {
       );
     } else {
       bot.sendMessage(
-        config.telegram.channelSuccessId,
+        config.merchantOrder.channelSuccessId,
         merchantOrder.userAddress +
           ' :: ' +
           this._getPaymentTypeString(merchantOrder.paymentType) +