diff --git a/deploy/deploy-gateway/src/main/resources/docs/code_example.MD b/deploy/deploy-gateway/src/main/resources/docs/code_example.MD
index cdb599ff..2f429d3f 100644
--- a/deploy/deploy-gateway/src/main/resources/docs/code_example.MD
+++ b/deploy/deploy-gateway/src/main/resources/docs/code_example.MD
@@ -3,23 +3,23 @@
com.jd.blockchain
sdk-client
- 1.3.0.RELEASE
+ 1.4.0.RELEASE
com.jd.blockchain
contract-starter
- 1.3.0.RELEASE
+ 1.4.0.RELEASE
com.jd.blockchain
crypto-classic
- 1.3.0.RELEASE
+ 1.4.0.RELEASE
com.jd.blockchain
crypto-sm
- 1.3.0.RELEASE
+ 1.4.0.RELEASE
```
# 2. 数据快速上链
diff --git a/deploy/deploy-peer/src/main/resources/docs/安装部署.MD b/deploy/deploy-peer/src/main/resources/docs/安装部署.MD
index 3157a953..c2eb5e3f 100644
--- a/deploy/deploy-peer/src/main/resources/docs/安装部署.MD
+++ b/deploy/deploy-peer/src/main/resources/docs/安装部署.MD
@@ -1,6 +1,6 @@
# JDChain安装部署指南
-本部署指南基于JDChain1.3.0.RELEASE版本来构建。
+本部署指南基于JDChain1.4.0.RELEASE版本来构建。
## 1. 部署环境
### 1.1 系统部署结构
![部署结构](imgs/structure.png)
diff --git a/samples/contract-samples/pom.xml b/samples/contract-samples/pom.xml
index 955f2fc4..c032e9dd 100644
--- a/samples/contract-samples/pom.xml
+++ b/samples/contract-samples/pom.xml
@@ -6,7 +6,7 @@
com.jd.blockchain
jdchain-samples
- 1.2.1.RELEASE
+ 1.4.0.RELEASE
contract-samples
diff --git a/samples/pom.xml b/samples/pom.xml
index b73ce4e6..fe6c9688 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -11,11 +11,11 @@
com.jd.blockchain
jdchain-samples
- 1.2.1.RELEASE
+ 1.4.0.RELEASE
pom
- 1.3.0.RELEASE
+ 1.4.0.RELEASE
@@ -42,6 +42,21 @@
crypto-framework
${framework.version}
+
+ com.jd.blockchain
+ crypto-classic
+ ${framework.version}
+
+
+ com.jd.blockchain
+ crypto-sm
+ ${framework.version}
+
+
+ com.jd.blockchain
+ crypto-base
+ ${framework.version}
+
diff --git a/samples/sdk-samples/pom.xml b/samples/sdk-samples/pom.xml
index 73cc5064..68645bd2 100644
--- a/samples/sdk-samples/pom.xml
+++ b/samples/sdk-samples/pom.xml
@@ -5,7 +5,7 @@
com.jd.blockchain
jdchain-samples
- 1.2.1.RELEASE
+ 1.4.0.RELEASE
sdk-samples
@@ -23,6 +23,31 @@
contract-samples
${project.version}
+
+ com.jd.blockchain
+ crypto-base
+ 1.4.0.RELEASE
+
+
+ com.jd.blockchain
+ crypto-framework
+ ${framework.version}
+
+
+ com.jd.blockchain
+ crypto-classic
+ ${framework.version}
+
+
+ com.jd.blockchain
+ crypto-sm
+ ${framework.version}
+
+
+ com.jd.blockchain
+ crypto-utils-classic
+ ${framework.version}
+
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ConfigureSecurity.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ConfigureSecurity.java
index d7d2170b..fc1fad1d 100644
--- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ConfigureSecurity.java
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ConfigureSecurity.java
@@ -38,10 +38,7 @@ public class SDKDemo_ConfigureSecurity {
// 注册相关class
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
PrivKey privKey = SDKDemo_Params.privkey1;
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_InsertData.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_InsertData.java
index 59d94201..7a684a0b 100644
--- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_InsertData.java
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_InsertData.java
@@ -64,7 +64,7 @@ public class SDKDemo_InsertData {
// TX 准备就绪;
PreparedTransaction prepTx = txTemp.prepare();
- String txHash = ByteArray.toBase64(prepTx.getHash().toBytes());
+ String txHash = ByteArray.toBase64(prepTx.getTransactionHash().toBytes());
// 使用私钥进行签名;
AsymmetricKeypair keyPair = getSponsorKey();
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Query.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Query.java
index 6d81393d..6f4e9e19 100644
--- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Query.java
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Query.java
@@ -7,7 +7,6 @@ import com.jd.blockchain.ledger.BlockchainKeypair;
import com.jd.blockchain.ledger.TypedKVEntry;
import com.jd.blockchain.ledger.LedgerBlock;
import com.jd.blockchain.ledger.LedgerTransaction;
-import com.jd.blockchain.ledger.Transaction;
import com.jd.blockchain.sdk.BlockchainService;
import com.jd.blockchain.sdk.client.GatewayServiceFactory;
import com.jd.blockchain.utils.net.NetworkAddress;
@@ -61,8 +60,8 @@ public class SDKDemo_Query {
LedgerTransaction[] txList = service.getTransactions(LEDGER_HASH, ledgerNumber, 0, 100);
// 根据交易的 hash 获得交易;注:客户端生成 PrepareTransaction 时得到交易hash;
- HashDigest txHash = txList[0].getTransactionContent().getHash();
- Transaction tx = service.getTransactionByContentHash(LEDGER_HASH, txHash);
+ HashDigest txHash = txList[0].getRequest().getTransactionHash();
+ LedgerTransaction tx = service.getTransactionByContentHash(LEDGER_HASH, txHash);
// 获取数据;
String commerceAccount = "GGhhreGeasdfasfUUfehf9932lkae99ds66jf==";
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java
index 813cce1f..2494c058 100644
--- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java
@@ -44,10 +44,7 @@ public class SDKDemo_RegistParticipant {
service = serviceFactory.getBlockchainService();
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterAccount.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterAccount.java
index 07b84984..3d184070 100644
--- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterAccount.java
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterAccount.java
@@ -20,10 +20,7 @@ public class SDKDemo_RegisterAccount {
}
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
BlockchainKeypair CLIENT_CERT = new BlockchainKeypair(SDKDemo_Params.pubKey0, SDKDemo_Params.privkey0);
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterUser.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterUser.java
index 778e5851..ebbe250a 100644
--- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterUser.java
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterUser.java
@@ -38,10 +38,7 @@ public class SDKDemo_RegisterUser {
// 注册相关class
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
PrivKey privKey = SDKDemo_Params.privkey1;
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java
index 5c2d452f..ef0762c4 100644
--- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java
@@ -40,10 +40,7 @@ public class SDKDemo_Tx_Persistance {
// 注册相关class
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
PrivKey privKey1 = SDKDemo_Params.privkey0;
@@ -87,7 +84,7 @@ public class SDKDemo_Tx_Persistance {
TransactionContent txContent = BinaryProtocol.decode(txContentBytes, TransactionContent.class);
// 对交易内容签名;
- DigitalSignature signature1 = SignatureUtils.sign(txContent, keyPair1);
+ DigitalSignature signature1 = SignatureUtils.sign(keyPair1.getAlgorithm(), txContent, keyPair1);
// 根据交易内容重新准备交易;
PreparedTransaction decodedPrepTx = blockchainService.prepareTransaction(txContent);
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_ConsensusSettings_Update_Demo.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_ConsensusSettings_Update_Demo.java
new file mode 100644
index 00000000..9c0ab330
--- /dev/null
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_ConsensusSettings_Update_Demo.java
@@ -0,0 +1,42 @@
+package com.jd.blockchain.sdk.samples;
+
+import com.jd.blockchain.ledger.PreparedTransaction;
+import com.jd.blockchain.ledger.TransactionResponse;
+import com.jd.blockchain.ledger.TransactionTemplate;
+import com.jd.blockchain.utils.Property;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SDK_ConsensusSettings_Update_Demo extends SDK_Base_Demo {
+
+ public static void main(String[] args) {
+ new SDK_ConsensusSettings_Update_Demo().updateSettings();
+ }
+
+ public void updateSettings() {
+
+ List properties = new ArrayList();
+
+ // 修改bftsmart.conf配置文件中的选项;
+ properties.add(new Property("system.communication.useSenderThread", "false"));
+
+ Property[] propertiesArray = properties.toArray(new Property[properties.size()]);
+
+ TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash);
+
+ txTpl.settings().update(propertiesArray);
+
+ // TX 准备就绪;
+ PreparedTransaction prepTx = txTpl.prepare();
+
+ // 使用私钥进行签名;
+ prepTx.sign(adminKey);
+
+ // 提交交易;
+ TransactionResponse transactionResponse = prepTx.commit();
+
+ System.out.println(transactionResponse.isSuccess());
+
+ }
+}
diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_InsertData_Demo.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_InsertData_Demo.java
index d90b5233..512cb5cd 100644
--- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_InsertData_Demo.java
+++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_InsertData_Demo.java
@@ -48,7 +48,7 @@ public class SDK_InsertData_Demo extends SDK_Base_Demo {
LedgerTransaction[] txList = blockchainService.getTransactions(ledgerHash, ledgerNumber, 0, 100);
// 遍历交易列表
for (LedgerTransaction ledgerTransaction : txList) {
- TransactionContent txContent = ledgerTransaction.getTransactionContent();
+ TransactionContent txContent = ledgerTransaction.getRequest().getTransactionContent();
Operation[] operations = txContent.getOperations();
if (operations != null && operations.length > 0) {
for (Operation operation : operations) {
@@ -101,7 +101,7 @@ public class SDK_InsertData_Demo extends SDK_Base_Demo {
}
//根据交易的 hash 获得交易;注:客户端生成 PrepareTransaction 时得到交易hash;
- HashDigest txHash = txList[0].getTransactionContent().getHash();
+ HashDigest txHash = txList[0].getRequest().getTransactionHash();
// Transaction tx = blockchainService.getTransactionByContentHash(ledgerHash, txHash);
// String[] objKeys = new String[] { "x001", "x002" };
// KVDataEntry[] kvData = blockchainService.getDataEntries(ledgerHash, commerceAccount, objKeys);
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_Contract_Test.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_Contract_Test.java
index 244d8071..ed0eee08 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_Contract_Test.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_Contract_Test.java
@@ -6,6 +6,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import com.jd.blockchain.crypto.base.DefaultCryptoEncoding;
+import com.jd.blockchain.crypto.base.HashDigestBytes;
import org.junit.Before;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -286,7 +288,7 @@ public class SDK_Contract_Test {
// TX 准备就绪;
PreparedTransaction prepTx = txTemp.prepare();
- String txHash = ByteArray.toBase64(prepTx.getHash().toBytes());
+ String txHash = ByteArray.toBase64(prepTx.getTransactionHash().toBytes());
// 使用私钥进行签名;
AsymmetricKeypair keyPair = getSponsorKey();
@@ -297,7 +299,7 @@ public class SDK_Contract_Test {
}
private static HashDigest getLedgerHash() {
- return new HashDigest(Base58Utils.decode(ledgerAddress));
+ return new HashDigestBytes(DefaultCryptoEncoding.decodeAlgorithm(Base58Utils.decode(ledgerAddress)), Base58Utils.decode(ledgerAddress));
}
/**
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java
index 747c835e..7e2d78e3 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java
@@ -10,6 +10,8 @@ package test.com.jd.blockchain.sdk.test;
import static org.junit.Assert.assertEquals;
+import com.jd.blockchain.crypto.base.DefaultCryptoEncoding;
+import com.jd.blockchain.crypto.base.HashDigestBytes;
import org.junit.Before;
import org.junit.Test;
@@ -21,11 +23,8 @@ import com.jd.blockchain.crypto.HashFunction;
import com.jd.blockchain.crypto.SignatureFunction;
import com.jd.blockchain.ledger.BlockchainKeyGenerator;
import com.jd.blockchain.ledger.BlockchainKeypair;
-import com.jd.blockchain.ledger.EndpointRequest;
-import com.jd.blockchain.ledger.NodeRequest;
import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.TransactionContent;
-import com.jd.blockchain.ledger.TransactionContentBody;
import com.jd.blockchain.ledger.TransactionRequest;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionState;
@@ -68,10 +67,7 @@ public class SDK_GateWay_BatchInsertData_Test_ {
service = serviceFactory.getBlockchainService();
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
}
@@ -118,8 +114,7 @@ public class SDK_GateWay_BatchInsertData_Test_ {
}
private HashDigest getLedgerHash() {
- byte[] hashBytes = Base58Utils.decode(ledgerHash);
- return new HashDigest(hashBytes);
+ return new HashDigestBytes(DefaultCryptoEncoding.decodeAlgorithm(Base58Utils.decode(ledgerHash)), Base58Utils.decode(ledgerHash));
}
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java
index 7d343505..114c6de6 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java
@@ -19,11 +19,8 @@ import com.jd.blockchain.crypto.HashFunction;
import com.jd.blockchain.crypto.SignatureFunction;
import com.jd.blockchain.ledger.BlockchainKeyGenerator;
import com.jd.blockchain.ledger.BlockchainKeypair;
-import com.jd.blockchain.ledger.EndpointRequest;
-import com.jd.blockchain.ledger.NodeRequest;
import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.TransactionContent;
-import com.jd.blockchain.ledger.TransactionContentBody;
import com.jd.blockchain.ledger.TransactionRequest;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionState;
@@ -62,10 +59,7 @@ public class SDK_GateWay_DataAccount_Test_ {
service = serviceFactory.getBlockchainService();
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
}
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java
index ed6567e9..5d420d5f 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java
@@ -21,11 +21,8 @@ import com.jd.blockchain.crypto.HashFunction;
import com.jd.blockchain.crypto.SignatureFunction;
import com.jd.blockchain.ledger.BlockchainKeyGenerator;
import com.jd.blockchain.ledger.BlockchainKeypair;
-import com.jd.blockchain.ledger.EndpointRequest;
-import com.jd.blockchain.ledger.NodeRequest;
import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.TransactionContent;
-import com.jd.blockchain.ledger.TransactionContentBody;
import com.jd.blockchain.ledger.TransactionRequest;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionState;
@@ -65,10 +62,7 @@ public class SDK_GateWay_InsertData_Test_ {
service = serviceFactory.getBlockchainService();
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
}
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java
index 634357f5..0b9e6a93 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java
@@ -59,10 +59,7 @@ public class SDK_GateWay_Participant_Regist_Test_ {
service = serviceFactory.getBlockchainService();
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java
index 3d291811..2879c503 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java
@@ -23,16 +23,12 @@ import com.jd.blockchain.ledger.BlockchainIdentity;
import com.jd.blockchain.ledger.BlockchainKeyGenerator;
import com.jd.blockchain.ledger.BlockchainKeypair;
import com.jd.blockchain.ledger.DigitalSignature;
-import com.jd.blockchain.ledger.EndpointRequest;
import com.jd.blockchain.ledger.TypedKVEntry;
import com.jd.blockchain.ledger.LedgerBlock;
import com.jd.blockchain.ledger.LedgerInfo;
import com.jd.blockchain.ledger.LedgerTransaction;
-import com.jd.blockchain.ledger.NodeRequest;
import com.jd.blockchain.ledger.ParticipantNode;
-import com.jd.blockchain.ledger.Transaction;
import com.jd.blockchain.ledger.TransactionContent;
-import com.jd.blockchain.ledger.TransactionContentBody;
import com.jd.blockchain.ledger.TransactionRequest;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionState;
@@ -72,10 +68,7 @@ public class SDK_GateWay_Query_Test_ {
service = serviceFactory.getBlockchainService();
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
}
@@ -119,16 +112,16 @@ public class SDK_GateWay_Query_Test_ {
LedgerTransaction[] txList = service.getTransactions(ledgerHash, ledgerNumber, 0, 100);
for (LedgerTransaction ledgerTransaction : txList) {
- System.out.println("ledgerTransaction.Hash=" + ledgerTransaction.getHash());
+ System.out.println("ledgerTransaction.Hash=" + ledgerTransaction.getTransactionHash());
}
txList = service.getTransactions(ledgerHash, hashDigest, 0, 100);
for (LedgerTransaction ledgerTransaction : txList) {
- System.out.println("ledgerTransaction.Hash=" + ledgerTransaction.getHash());
+ System.out.println("ledgerTransaction.Hash=" + ledgerTransaction.getTransactionHash());
}
- Transaction tx = service.getTransactionByContentHash(ledgerHash, hashDigest);
- DigitalSignature[] signatures = tx.getEndpointSignatures();
+ LedgerTransaction tx = service.getTransactionByContentHash(ledgerHash, hashDigest);
+ DigitalSignature[] signatures = tx.getRequest().getEndpointSignatures();
for (DigitalSignature signature : signatures) {
System.out.println(signature.getDigest().getAlgorithm());
}
diff --git a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java
index d69b0f97..5310624e 100644
--- a/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java
+++ b/samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java
@@ -23,11 +23,8 @@ import com.jd.blockchain.crypto.PubKey;
import com.jd.blockchain.crypto.SignatureFunction;
import com.jd.blockchain.ledger.BlockchainKeyGenerator;
import com.jd.blockchain.ledger.BlockchainKeypair;
-import com.jd.blockchain.ledger.EndpointRequest;
-import com.jd.blockchain.ledger.NodeRequest;
import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.TransactionContent;
-import com.jd.blockchain.ledger.TransactionContentBody;
import com.jd.blockchain.ledger.TransactionRequest;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionState;
@@ -89,10 +86,7 @@ public class SDK_GateWay_User_Test_ {
service = serviceFactory.getBlockchainService();
DataContractRegistry.register(TransactionContent.class);
- DataContractRegistry.register(TransactionContentBody.class);
DataContractRegistry.register(TransactionRequest.class);
- DataContractRegistry.register(NodeRequest.class);
- DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class);
}