Sync code into dev (#336)

* Revert "Release 2.0.0 rc3" * Revert "Revert "Release 2.0.0 rc3"" * make receipt error more friendly and format code * update version in file release_node.txt * update version in filerelease_node.txt (#318) * update .travis.yml * add guomi TableTest test class * remove useless file * update .gitignore * remove useless test * move guomi TableTest * remove password parameter for some method for P12Manager * add create(ECKeyPair keyPair) for GenCredential * fix codacy * rename CRUDSerivce to CRUDService * add indexed parameters for event. * fix codacy * update travis ci * fix conficts * fix conficts * fix conficts * fix ut * update ChangeLog and web3sdk version.
FISCO-BCOS · Jul 8, 2019 · 70eb396 · 70eb396
1 parent cde2427
commit 70eb396
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,10 +27,10 @@ before_install:
   - gradle wrapper
 
 script: |
-  curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/release-2.0.0-rc3/tools/build_chain.sh && chmod u+x build_chain.sh
-  bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/ci/download_bin.sh) -b release-2.0.0-rc3
+  curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/release-2.0.0/tools/build_chain.sh && chmod u+x build_chain.sh
+  bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/ci/download_bin.sh) -b release-2.0.0
   echo "127.0.0.1:4 agency1 1,2,3" > ipconf
-  ./build_chain.sh -e bin/fisco-bcos -f ipconf -p 30300,20200,8545 -v 2.0.0-rc3
+  ./build_chain.sh -e bin/fisco-bcos -f ipconf -p 30300,20200,8545 -v 2.0.0
   ./nodes/127.0.0.1/start_all.sh
   ./nodes/127.0.0.1/fisco-bcos -v
   cp nodes/127.0.0.1/sdk/* src/integration-test/resources/

diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,15 @@
-### v2.0.0-rc3
+### v2.0.4
+
+(2019-07-04)
+
+增加
+1. 添加交易解析工具
+
+* Compatibility
+
+1. 兼容rc1，rc2, rc3, v2.0.0的节点
+
+### v2.0.3
 
 (2019-05-28)
 

diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v2.0.0-rc3
+v2.0.4
diff --git a/src/main/java/org/fisco/bcos/web3j/tx/txdecode/TransactionDecoder.java b/src/main/java/org/fisco/bcos/web3j/tx/txdecode/TransactionDecoder.java
@@ -64,6 +64,11 @@ private String addHexPrefixToString(String s) {
     public String decodeInputReturnJson(String input)
             throws JsonProcessingException, TransactionException, BaseException {
 
+        input = addHexPrefixToString(input);
+
+        // select abi
+        AbiDefinition abiFunc = selectAbiDefinition(input);
+
         // decode input
         InputAndOutputResult inputAndOutputResult = decodeInputReturnObject(input);
         // format result to json

diff --git a/src/test/java/org/fisco/bcos/channel/test/guomi/GMTableTestClient.java b/src/test/java/org/fisco/bcos/channel/test/guomi/GMTableTestClient.java
@@ -278,7 +278,7 @@ public static void main(String[] args) throws Exception {
         try {
             web3j = Web3j.build(channelEthereumService, service.getGroupId());
         } catch (Exception e) {
-            System.out.println("\nPlease provide groupID in the first paramters");
+            System.out.println("\nPlease provide groupID in the first parameters");
             System.exit(0);
         }
 

diff --git a/src/test/java/org/fisco/bcos/web3j/tx/txdecode/TransactionDecoderTest.java b/src/test/java/org/fisco/bcos/web3j/tx/txdecode/TransactionDecoderTest.java
@@ -937,7 +937,7 @@ public void testEventDArray() throws BaseException, IOException {
         assertThat(
                 transEntitytoType0(mapResult1.get(decodeMethodSign(abiDefinition)).get(0)),
                 is(eventDataParams1));
-        // System.out.println("111 => " + decode.decodeEventReturnJson(logList1));
+        System.out.println("111 => " + decode.decodeEventReturnJson(logList1));
         assertThat(
                 decode.decodeEventReturnJson(logList1),
                 is(
@@ -954,7 +954,7 @@ public void testEventDArray() throws BaseException, IOException {
         assertThat(
                 transEntitytoType0(mapResult2.get(decodeMethodSign(abiDefinition)).get(1)),
                 is(eventDataParams2));
-        // System.out.println("222 => " + decode.decodeEventReturnJson(logList2));
+        System.out.println("222 => " + decode.decodeEventReturnJson(logList2));
         assertThat(
                 decode.decodeEventReturnJson(logList2),
                 is(
@@ -975,7 +975,7 @@ public void testEventDArray() throws BaseException, IOException {
         assertThat(
                 transEntitytoType0(mapResult3.get(decodeMethodSign(abiDefinition)).get(2)),
                 is(eventDataParams3));
-        // System.out.println("333 => " + decode.decodeEventReturnJson(logList3));
+        System.out.println("333 => " + decode.decodeEventReturnJson(logList3));
         assertThat(
                 decode.decodeEventReturnJson(logList3),
                 is(
@@ -1098,7 +1098,7 @@ public void testEventSArray() throws BaseException, IOException {
         assertThat(
                 transEntitytoType0(mapResult1.get(decodeMethodSign(abiDefinition)).get(0)),
                 is(eventDataParams1));
-        // System.out.println("111 => " + decode.decodeEventReturnJson(logList1));
+        System.out.println("111 => " + decode.decodeEventReturnJson(logList1));
         assertThat(
                 decode.decodeEventReturnJson(logList1),
                 is(
@@ -1115,7 +1115,7 @@ public void testEventSArray() throws BaseException, IOException {
         assertThat(
                 transEntitytoType0(mapResult2.get(decodeMethodSign(abiDefinition)).get(1)),
                 is(eventDataParams2));
-        // System.out.println("222 => " + decode.decodeEventReturnJson(logList2));
+        System.out.println("222 => " + decode.decodeEventReturnJson(logList2));
         assertThat(
                 decode.decodeEventReturnJson(logList2),
                 is(