Merge pull request #633 from CodingCattwo/dev152

update version of scaffold & save log
WeBankBlockchain · Jul 19, 2021 · 77a05e2 · 77a05e2
2 parents 7d10a4d + 1a8e3a1
commit 77a05e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -90,8 +90,8 @@ List tomcat = [
 ]
 
 List scaffold = [
-    'com.webank.webase:solscaffold:1.0.2-SNAPSHOT',
-    'com.webank:SmartDev-Scaffold:1.0.0-SNAPSHOT',
+    'com.webank.webase:solscaffold:1.0.2',
+    'com.webank:SmartDev-Scaffold:1.0.0.1',
     'com.webank:solc-gradle-plugin:1.0.1'
 ]
 

diff --git a/src/main/java/com/webank/webase/front/contract/ContractService.java b/src/main/java/com/webank/webase/front/contract/ContractService.java
@@ -512,7 +512,7 @@ public void deleteContract(Long contractId, int groupId) {
      * save contract data.
      */
     public Contract saveContract(ReqContractSave contractReq) {
-        log.debug("start saveContract contractReq:{}", JsonUtils.toJSONString(contractReq));
+        log.info("start saveContract contractReq:{}", JsonUtils.toJSONString(contractReq));
         if (contractReq.getContractId() == null) {
             // new
             return newContract(contractReq);

diff --git a/src/main/java/com/webank/webase/front/scaffold/ScaffoldService.java b/src/main/java/com/webank/webase/front/scaffold/ScaffoldService.java
@@ -91,7 +91,7 @@ public RspFile exportProject(ReqProject reqProject) {
             // if contract abi is null, not compile
             // if abi is [](empty list), compile already
             if (contract == null || contract.getContractAbi() == null) {
-                log.error("exportProject contract not exist or not compiled, id:{}", id);
+                log.error("exportProject contract not exist or abi empty, id:{}", id);
                 throw new FrontException(ConstantCode.INVALID_CONTRACT_ID);
             }
             tbContractList.add(contract);

diff --git a/src/main/java/com/webank/webase/front/transaction/TransService.java b/src/main/java/com/webank/webase/front/transaction/TransService.java
@@ -226,6 +226,7 @@ private Object handleTransByFunction(int groupId, Client web3j, String signUserI
             TransactionDecoderService txDecoder = new TransactionDecoderService(cryptoSuite);
             String receiptMsg = txDecoder.decodeReceiptStatus(responseReceipt).getReceiptMessages();
             responseReceipt.setMessage(receiptMsg);
+            CommonUtils.processReceiptHexNumber(responseReceipt);
             response = responseReceipt;
             log.info("***node cost time***: {}",
                     Duration.between(nodeStartTime, Instant.now()).toMillis());
@@ -301,9 +302,9 @@ public static TransactionReceipt execTransaction(Function function,
         log.info("execTransaction start startTime:{}", startTime.toEpochMilli());
         TransactionReceipt transactionReceipt = commonContract.execTransaction(function);
         // cover null message through statusCode
-        // String receiptMsg = FrontUtils.handleReceiptMsg(transactionReceipt);
         String receiptMsg = txDecoder.decodeReceiptStatus(transactionReceipt).getReceiptMessages();
         transactionReceipt.setMessage(receiptMsg);
+        CommonUtils.processReceiptHexNumber(transactionReceipt);
         log.info("execTransaction end  useTime:{}",
                 Duration.between(startTime, Instant.now()).toMillis());
         return transactionReceipt;