From 784ba1b0dd96f42b2eba3842c686e2d43dc30b09 Mon Sep 17 00:00:00 2001
From: fpChan <fpchen@outlook.com>
Date: Tue, 11 May 2021 23:26:18 +0800
Subject: [PATCH 1/2] chore: update logger info

---
 offchain-modules/src/packages/handlers/ckb.ts | 19 +++++++++++++++----
 .../src/scripts/integration-test/tron.ts      |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/offchain-modules/src/packages/handlers/ckb.ts b/offchain-modules/src/packages/handlers/ckb.ts
index 9ca41ca7..f9c87be0 100644
--- a/offchain-modules/src/packages/handlers/ckb.ts
+++ b/offchain-modules/src/packages/handlers/ckb.ts
@@ -181,7 +181,7 @@ export class CkbHandler {
     const firstInputLock = txPrevious.transaction.outputs[Number(tx.inputs[0].previousOutput.index)].lock;
     const firstInputLockHash = this.ckb.utils.scriptToHash(<CKBComponents.Script>firstInputLock);
 
-    logger.debug(
+    logger.info(
       `CkbHandler isMintTx tx ${tx.hash} sender lock hash is ${firstInputLockHash}. first output type code hash is ${firstOutputTypeCodeHash}.`,
     );
     return firstInputLockHash === committeeLockHash;
@@ -281,9 +281,20 @@ export class CkbHandler {
         const rawTx = await generator.mint(await account.getLockscript(), records);
         const signedTx = this.ckb.signTransaction(this.PRI_KEY)(rawTx);
         const mintTxHash = await this.ckb.rpc.sendTransaction(signedTx);
-        mintRecords.map((r) => {
-          r.mintHash = mintTxHash;
-        });
+        const txStatus = await this.waitUntilCommitted(mintTxHash, 200);
+        if (txStatus.txStatus.status === 'committed') {
+          mintRecords.map((r) => {
+            r.status = 'success';
+            r.mintHash = mintTxHash;
+          });
+        } else {
+          mintRecords.map((r) => {
+            r.mintHash = mintTxHash;
+          });
+          logger.error(
+            `CkbHandler handleMintRecords mint execute failed txStatus:${txStatus.txStatus.status}, mintIds:${mintIds}`,
+          );
+        }
         logger.info(
           `CkbHandler handleMintRecords Mint Transaction has been sent, ckbTxHash ${mintTxHash}, mintIds:${mintIds}`,
         );
diff --git a/offchain-modules/src/scripts/integration-test/tron.ts b/offchain-modules/src/scripts/integration-test/tron.ts
index 80f414ab..7b4fc266 100644
--- a/offchain-modules/src/scripts/integration-test/tron.ts
+++ b/offchain-modules/src/scripts/integration-test/tron.ts
@@ -239,7 +239,7 @@ async function main() {
 
       //await checkEffect(trc20TxHash, 'TVWvkCasxAJUyzPKMQ2Rus1NtmBwrkVyBR', 'trc20');
     } catch (e) {
-      logger.warn(`The tron component integration not pass yet. i:${i} error:${e.toString()}`);
+      logger.warn(`The tron component integration not pass yet. i:${i} error:`, e);
       continue;
     }
     logger.info('The tron component integration test pass!');

From f92c7639539c291958f5660552cfe7beba6375d6 Mon Sep 17 00:00:00 2001
From: fpChan <fpchen@outlook.com>
Date: Tue, 11 May 2021 23:29:00 +0800
Subject: [PATCH 2/2] chore: reset mint sent log

---
 offchain-modules/src/packages/handlers/ckb.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/offchain-modules/src/packages/handlers/ckb.ts b/offchain-modules/src/packages/handlers/ckb.ts
index f9c87be0..4686dff9 100644
--- a/offchain-modules/src/packages/handlers/ckb.ts
+++ b/offchain-modules/src/packages/handlers/ckb.ts
@@ -281,6 +281,9 @@ export class CkbHandler {
         const rawTx = await generator.mint(await account.getLockscript(), records);
         const signedTx = this.ckb.signTransaction(this.PRI_KEY)(rawTx);
         const mintTxHash = await this.ckb.rpc.sendTransaction(signedTx);
+        logger.info(
+          `CkbHandler handleMintRecords Mint Transaction has been sent, ckbTxHash ${mintTxHash}, mintIds:${mintIds}`,
+        );
         const txStatus = await this.waitUntilCommitted(mintTxHash, 200);
         if (txStatus.txStatus.status === 'committed') {
           mintRecords.map((r) => {
@@ -295,9 +298,6 @@ export class CkbHandler {
             `CkbHandler handleMintRecords mint execute failed txStatus:${txStatus.txStatus.status}, mintIds:${mintIds}`,
           );
         }
-        logger.info(
-          `CkbHandler handleMintRecords Mint Transaction has been sent, ckbTxHash ${mintTxHash}, mintIds:${mintIds}`,
-        );
         await this.db.updateCkbMint(mintRecords);
         logger.info('CkbHandler handleMintRecords mint execute completed, mintIds:', mintIds);
       } catch (e) {