solve sdk compile problem according to new ledger transaction stuction

samples/pom.xml

@@ -15,7 +15,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<framework.version>1.3.0.RELEASE</framework.version>
+		<framework.version>1.3.1-SNAPSHOT</framework.version>
 	</properties>
 
 	<modules>
@@ -42,6 +42,16 @@
 				<artifactId>crypto-framework</artifactId>
 				<version>${framework.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.jd.blockchain</groupId>
+				<artifactId>crypto-classic</artifactId>
+				<version>${framework.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.jd.blockchain</groupId>
+				<artifactId>crypto-sm</artifactId>
+				<version>${framework.version}</version>
+			</dependency>
 		</dependencies>
 
 	</dependencyManagement>

samples/sdk-samples/pom.xml

@@ -18,6 +18,18 @@
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>ledger-model</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>crypto-classic</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>crypto-framework</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>crypto-sm</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>contract-samples</artifactId>

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;

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();

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==";

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);

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);

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;

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);

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].getTransactionHash();
 //		Transaction tx = blockchainService.getTransactionByContentHash(ledgerHash, txHash);
 //		String[] objKeys = new String[] { "x001", "x002" };
 //		KVDataEntry[] kvData = blockchainService.getDataEntries(ledgerHash, commerceAccount, objKeys);

samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_Contract_Test.java

@@ -286,7 +286,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();

samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_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;
@@ -68,10 +65,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);
     }
 

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);
     }
 

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);
     }
 

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);

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());
 		}

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);
     }