[feat&fix][*][v0.1.2] downgrade fastjson to 1.2.83_noneautotype and…

… add `txHash` to `CrossChainReceipt` (#17) * [feat][*][0.1.4]: add txHash to CrossChainMessage * [feat][*][0.1.4]: update version to 0.1.2 * [fix][common][v0.1.2] downgrade fastjson to `1.2.83_noneautotype`
AntChainOpenLabs · Oct 7, 2023 · 35dd03f · 35dd03f
1 parent 8f7362d
commit 35dd03f
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 22 deletions.
diff --git a/antchain-bridge-commons/pom.xml b/antchain-bridge-commons/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.antchain.bridge</groupId>
     <artifactId>antchain-bridge-commons</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>2.0.21</version>
+            <version>1.2.83_noneautotype</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>

diff --git a/...commons/src/main/java/com/alipay/antchain/bridge/commons/core/base/CrossChainMessage.java b/...commons/src/main/java/com/alipay/antchain/bridge/commons/core/base/CrossChainMessage.java
@@ -55,6 +55,8 @@ public static class ProvableLedgerData {
         private byte[] ledgerData;
 
         private byte[] proof;
+
+        private byte[] txHash;
     }
 
     public static CrossChainMessage createCrossChainMessage(
@@ -64,7 +66,8 @@ public static CrossChainMessage createCrossChainMessage(
             byte[] blockHash,
             byte[] message,
             byte[] ledgerData,
-            byte[] proof
+            byte[] proof,
+            byte[] txHash
     ) {
         CrossChainMessage msg = new CrossChainMessage();
         msg.setType(type);
@@ -75,6 +78,7 @@ public static CrossChainMessage createCrossChainMessage(
         provableLedgerData.setBlockHash(blockHash);
         provableLedgerData.setHeight(height);
         provableLedgerData.setTimestamp(timestamp);
+        provableLedgerData.setTxHash(txHash);
         msg.setProvableData(provableLedgerData);
 
         return msg;

diff --git a/antchain-bridge-plugin-lib/pom.xml b/antchain-bridge-plugin-lib/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.antchain.bridge</groupId>
     <artifactId>antchain-bridge-plugin-lib</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/antchain-bridge-plugin-manager/pom.xml b/antchain-bridge-plugin-manager/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.antchain.bridge</groupId>
     <artifactId>antchain-bridge-plugin-manager</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-plugin-lib</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-spi</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
         </dependency>
 
         <dependency>

diff --git a/antchain-bridge-spi/pom.xml b/antchain-bridge-spi/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.antchain.bridge</groupId>
     <artifactId>antchain-bridge-spi</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-commons</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/pluginset/demo-testchain/offchain-plugin/pom.xml b/pluginset/demo-testchain/offchain-plugin/pom.xml
@@ -27,12 +27,12 @@
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-plugin-lib</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-spi</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/...plugin/src/main/java/com/alipay/antchain/bridge/plugins/demo/testchain/MockDataUtils.java b/...plugin/src/main/java/com/alipay/antchain/bridge/plugins/demo/testchain/MockDataUtils.java
@@ -50,7 +50,8 @@ public static CrossChainMessage generateCCMsg(Long height, byte[] ledgerData, by
                 DigestUtil.sha256(height.toString()),
                 generateAM().encode(),
                 ledgerData,
-                proof
+                proof,
+                DigestUtil.sha256(height.toString())
         );
     }
 }
diff --git a/.../src/main/java/com/alipay/antchain/bridge/plugins/demo/testchain/TestChainBBCService.java b/.../src/main/java/com/alipay/antchain/bridge/plugins/demo/testchain/TestChainBBCService.java
@@ -169,7 +169,8 @@ public List<CrossChainMessage> readCrossChainMessagesByHeight(long l) {
                         // put the ledger data inside, just for SPV or other attestations
                         testChainReceipt.toBytes(),
                         // this time we need no proof data. it's ok to set it with empty bytes
-                        "pretend that we have merkle proof or some stuff".getBytes()
+                        "pretend that we have merkle proof or some stuff".getBytes(),
+                        testChainReceipt.getTxhash().getBytes()
                 )
         ).collect(Collectors.toList());
     }

diff --git a/pluginset/demo-testchain/plugin-loader/pom.xml b/pluginset/demo-testchain/plugin-loader/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-plugin-manager</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
         </dependency>
 
         <!-- Logging -->

diff --git a/pluginset/eos/offchain-plugin/pom.xml b/pluginset/eos/offchain-plugin/pom.xml
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-plugin-lib</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-spi</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/...s/offchain-plugin/src/main/java/com/alipay/antchain/bridge/plugins/eos/EosBBCService.java b/...s/offchain-plugin/src/main/java/com/alipay/antchain/bridge/plugins/eos/EosBBCService.java
@@ -440,7 +440,8 @@ public List<CrossChainMessage> readCrossChainMessagesByHeight(long height) {
                                             // this time we need no verify. it's ok to set it with empty bytes
                                             new byte[]{},
                                             // this time we need no proof data. it's ok to set it with empty bytes
-                                            new byte[]{}
+                                            new byte[]{},
+                                            HexUtil.decodeHex(eosTxActions.getTxId())
                                     )
                             )
                     );

diff --git a/pluginset/eos/onchain-plugin/README.md b/pluginset/eos/onchain-plugin/README.md
@@ -14,7 +14,6 @@
 - Demo合约：这是一个Demo合约，实现了简单的消息接收、发送；
 
 下面的图片介绍了合约之间的关系，主要他们之间的调用权限，在部署时添加这个权限。
-
 <img src="https://antchainbridge.oss-cn-shanghai.aliyuncs.com/antchainbridge/document/picture/eos-contracts-arch.jpeg" style="zoom:50%;" />
 
 ## 部署AM合约

diff --git a/pluginset/ethereum/offchain-plugin/pom.xml b/pluginset/ethereum/offchain-plugin/pom.xml
@@ -27,12 +27,12 @@
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-plugin-lib</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.antchain.bridge</groupId>
             <artifactId>antchain-bridge-spi</artifactId>
-            <version>0.1.1</version>
+            <version>0.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/...-plugin/src/main/java/com/alipay/antchain/bridge/plugins/ethereum/EthereumBBCService.java b/...-plugin/src/main/java/com/alipay/antchain/bridge/plugins/ethereum/EthereumBBCService.java
@@ -232,7 +232,8 @@ public List<CrossChainMessage> readCrossChainMessagesByHeight(long height) {
                                 // todo: put ledger data, for SPV or other attestations
                                 "this time we need no verify. it's ok to set it with empty bytes".getBytes(),
                                 // todo: put proof data
-                                "this time we need no proof data. it's ok to set it with empty bytes".getBytes()
+                                "this time we need no proof data. it's ok to set it with empty bytes".getBytes(),
+                                HexUtil.decodeHex(logObject.getTransactionHash())
                         )
                 ).collect(Collectors.toList()));
             }

diff --git a/scripts/print.sh b/scripts/print.sh
@@ -6,7 +6,7 @@ WHITE='\033[1;37m'
 NC='\033[0m'
 LIGHT_GRAY='\033[0;37m'
 
-SDK_VERSION='0.1.1'
+SDK_VERSION='0.1.2'
 
 function print_blue() {
   printf "${BLUE}%s${NC}\n" "$1"