From 4f60971f668050f429c0e2a746084d47d5245ff9 Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Tue, 30 Apr 2019 20:46:28 +0800 Subject: [PATCH] Refactor ledger model: rename packages; --- source/contract/contract-framework/pom.xml | 3 +- .../contract/{ => engine}/ContractCode.java | 4 +- .../contract/{ => engine}/ContractEngine.java | 2 +- .../{ => engine}/ContractServiceProvider.java | 2 +- .../ContractServiceProviders.java | 2 +- .../contract/jvm/JVMContractEngine.java | 4 +- .../jvm/JVMContractServiceProvider.java | 4 +- .../contract/jvm/JavaContractCode.java | 21 ++-- source/contract/contract-maven-plugin/pom.xml | 74 ++++++------- .../jd/blockchain}/ContractDeployExeUtil.java | 43 ++++---- .../com/jd/blockchain/ContractDeployMojo.java | 1 - source/contract/contract-model/pom.xml | 9 +- .../contract/model/LedgerContext.java | 11 -- .../jd/blockchain/gateway/PeerService.java | 4 +- .../service/PeerConnectionManager.java | 4 +- .../gateway/web/TxProcessingController.java | 2 +- .../ledger/core/impl/LedgerQueryService.java | 22 +++- .../core/impl/TransactionBatchProcessor.java | 6 +- .../core/impl/TransactionEngineImpl.java | 4 +- .../ContractEventSendOperationHandle.java | 4 +- .../impl/handles/ContractLedgerContext.java | 33 ++++-- .../ledger/LedgerAdminAccountTest.java | 4 +- .../blockchain/ledger/LedgerEditerTest.java | 4 +- .../ledger/LedgerInitOperationTest.java | 6 +- .../ledger/LedgerInitSettingTest.java | 6 +- .../blockchain/ledger/LedgerManagerTest.java | 6 +- .../jd/blockchain/ledger/LedgerTestUtils.java | 4 +- .../ledger/LedgerTransactionDataTest.java | 8 +- .../blockchain/ledger/TransactionSetTest.java | 2 +- .../com/jd/blockchain/contract}/Contract.java | 2 +- .../contract}/ContractAppLifecycleAwire.java | 2 +- .../blockchain/contract}/ContractEvent.java | 2 +- .../contract}/ContractEventContext.java | 2 +- .../contract}/ContractException.java | 2 +- .../contract}/ContractRuntimeAwire.java | 2 +- .../blockchain/contract}/ErrorCodeEnum.java | 2 +- .../jd/blockchain/contract}/EventHandle.java | 2 +- .../contract}/EventProcessingAwire.java | 2 +- .../jd/blockchain/contract/LedgerContext.java | 11 ++ .../contract}/LocalContractEventContext.java | 2 +- .../ledger/ContractEventSendOperation.java | 6 -- .../blockchain/ledger/TransactionBuilder.java | 4 +- .../ledger/TransactionTemplate.java | 2 +- .../blockchain/ledger/data/EventOperator.java | 11 -- .../service/TransactionBatchProcess.java | 2 +- .../service/TransactionBatchResult.java | 2 +- .../service/TransactionBatchResultHandle.java | 2 +- .../service/TransactionEngine.java | 2 +- .../GatewayIncomingSetting.java | 2 +- .../LedgerIncomingSetting.java | 2 +- .../BlockchainOperationFactory.java | 13 ++- .../transaction}/BlockchainQueryService.java | 2 +- .../data => transaction}/ClientOperator.java | 2 +- .../ConsensusParticipantData.java | 2 +- .../ContractCodeDeployOpTemplate.java | 2 +- .../ContractCodeDeployOperationBuilder.java | 2 +- ...ontractCodeDeployOperationBuilderImpl.java | 2 +- .../transaction/ContractDefinition.java | 5 + .../ContractEventSendOpTemplate.java | 2 +- .../ContractEventSendOperationBuilder.java | 4 +- ...ContractEventSendOperationBuilderImpl.java | 5 +- .../transaction/ContractInvocationProxy.java | 22 ++++ .../ContractInvocationProxyBuilder.java | 6 ++ .../ContractOperator.java | 2 +- .../DataAccountKVSetOpTemplate.java | 2 +- .../DataAccountKVSetOperationBuilder.java | 2 +- .../DataAccountKVSetOperationBuilderImpl.java | 2 +- .../DataAccountOperator.java | 2 +- .../DataAccountRegisterOpTemplate.java | 2 +- .../DataAccountRegisterOperationBuilder.java | 2 +- ...taAccountRegisterOperationBuilderImpl.java | 2 +- .../DigitalSignatureBlob.java | 2 +- .../blockchain/transaction/EventOperator.java | 22 ++++ .../{ledger/data => transaction}/KVData.java | 2 +- .../LedgerInitOpTemplate.java | 2 +- .../LedgerInitOperationBuilder.java | 2 +- .../LedgerInitOperationBuilderImpl.java | 2 +- .../LedgerInitOperator.java | 2 +- .../LedgerInitSettingData.java | 2 +- .../data => transaction}/NewLedgerOpBlob.java | 1 + .../data => transaction}/PreparedTx.java | 2 +- .../PrivilegeSettingOperationBuilder.java | 2 +- .../data => transaction}/PubKeyData.java | 1 + .../SignatureEncoding.java | 2 +- .../TransactionService.java | 2 +- .../data => transaction}/TxBuilder.java | 8 +- .../data => transaction}/TxContentBlob.java | 2 +- .../TxRequestBuilder.java | 2 +- .../TxRequestMessage.java | 2 +- .../TxResponseMessage.java | 2 +- .../data => transaction}/TxTemplate.java | 7 +- .../data => transaction}/UserOperator.java | 2 +- .../UserRegisterOpTemplate.java | 2 +- .../UserRegisterOperationBuilder.java | 2 +- .../UserRegisterOperationBuilderImpl.java | 2 +- .../ContractCodeDeployOpTemplateTest.java | 2 +- .../data/ContractEventSendOpTemplateTest.java | 4 +- .../data/DataAccountKVSetOpTemplateTest.java | 4 +- .../DataAccountRegisterOpTemplateTest.java | 2 +- .../ledger/data/DigitalSignatureBlobTest.java | 2 +- .../jd/blockchain/ledger/data/KVDataTest.java | 5 +- .../ledger/data/TxContentBlobTest.java | 4 +- .../ledger/data/TxRequestMessageTest.java | 8 +- .../ledger/data/TxResponseMessageTest.java | 2 +- .../data/UserRegisterOpTemplateTest.java | 2 +- .../consensus/ConsensusMessageDispatcher.java | 7 +- .../peer/ledger/LedgerConfigurer.java | 2 +- .../peer/web/LedgerQueryController.java | 33 ++++-- .../peer/web/ManagementController.java | 4 +- .../sdk/BlockchainExtendQueryService.java | 2 + .../jd/blockchain/sdk/BlockchainService.java | 2 + .../blockchain/sdk/LedgerAccessContext.java | 3 +- .../blockchain/sdk/ManagementHttpService.java | 3 +- .../BinarySerializeRequestConverter.java | 2 +- .../BinarySerializeResponseConverter.java | 2 +- .../HashDigestsResponseConverter.java | 2 +- .../sdk/proxy/BlockchainServiceProxy.java | 6 +- .../sdk/proxy/HttpBlockchainQueryService.java | 3 +- .../service/ConsensusTransactionService.java | 2 +- .../sdk/service/NodeSigningAppender.java | 6 +- .../service/PeerBlockchainServiceFactory.java | 7 +- .../sdk/service/PeerServiceProxy.java | 4 +- .../com/jd/blockchain/client/Command.java | 100 ------------------ .../com/jd/blockchain/client/PeerClient.java | 75 ------------- .../jd/blockchain/client/PeerClientDemo.java | 35 ------ .../client/GatewayBlockchainServiceProxy.java | 4 +- .../sdk/client/GatewayServiceFactory.java | 8 +- .../sdk/client/HttpConsensusService.java | 2 +- .../contract/samples/AssetContract.java | 4 +- .../contract/samples/AssetContractImpl.java | 6 +- .../sdk/samples/SDKDemo_Contract.java | 18 +--- .../SDK_GateWay_BatchInsertData_Test_.java | 2 +- .../test/SDK_GateWay_DataAccount_Test_.java | 2 +- .../test/SDK_GateWay_InsertData_Test_.java | 2 +- .../sdk/test/SDK_GateWay_Query_Test_.java | 2 +- .../sdk/test/SDK_GateWay_User_Test_.java | 2 +- .../intgr/perf/LedgerPerformanceTest.java | 4 +- .../LedgerInitializeWeb4SingleStepsTest.java | 2 +- .../ledger/LedgerBlockGeneratingTest.java | 4 +- .../service/RemoteTransactionService.java | 2 +- .../web/LedgerInitializeWebController.java | 8 +- 141 files changed, 415 insertions(+), 519 deletions(-) rename source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/{ => engine}/ContractCode.java (58%) rename source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/{ => engine}/ContractEngine.java (92%) rename source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/{ => engine}/ContractServiceProvider.java (79%) rename source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/{ => engine}/ContractServiceProviders.java (96%) rename source/contract/{contract-model/src/main/java/com/jd/blockchain/contract/model => contract-maven-plugin/src/main/java/com/jd/blockchain}/ContractDeployExeUtil.java (85%) delete mode 100644 source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/LedgerContext.java rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/Contract.java (83%) rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/ContractAppLifecycleAwire.java (85%) rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/ContractEvent.java (84%) rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/ContractEventContext.java (95%) rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/ContractException.java (89%) rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/ContractRuntimeAwire.java (81%) rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/ErrorCodeEnum.java (96%) rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/EventHandle.java (84%) rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/EventProcessingAwire.java (95%) create mode 100644 source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/LedgerContext.java rename source/{contract/contract-model/src/main/java/com/jd/blockchain/contract/model => ledger/ledger-model/src/main/java/com/jd/blockchain/contract}/LocalContractEventContext.java (98%) delete mode 100644 source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/EventOperator.java rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger => }/service/TransactionBatchProcess.java (95%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger => }/service/TransactionBatchResult.java (85%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger => }/service/TransactionBatchResultHandle.java (82%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger => }/service/TransactionEngine.java (83%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{manage => setting}/GatewayIncomingSetting.java (86%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{manage => setting}/LedgerIncomingSetting.java (98%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/BlockchainOperationFactory.java (93%) rename source/{sdk/sdk-base/src/main/java/com/jd/blockchain/sdk => ledger/ledger-model/src/main/java/com/jd/blockchain/transaction}/BlockchainQueryService.java (95%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ClientOperator.java (81%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ConsensusParticipantData.java (95%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ContractCodeDeployOpTemplate.java (92%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ContractCodeDeployOperationBuilder.java (87%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ContractCodeDeployOperationBuilderImpl.java (88%) create mode 100644 source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ContractEventSendOpTemplate.java (91%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ContractEventSendOperationBuilder.java (85%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ContractEventSendOperationBuilderImpl.java (76%) create mode 100644 source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxy.java create mode 100644 source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxyBuilder.java rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/ContractOperator.java (76%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/DataAccountKVSetOpTemplate.java (94%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/DataAccountKVSetOperationBuilder.java (93%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/DataAccountKVSetOperationBuilderImpl.java (95%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/DataAccountOperator.java (91%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/DataAccountRegisterOpTemplate.java (91%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/DataAccountRegisterOperationBuilder.java (83%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/DataAccountRegisterOperationBuilderImpl.java (87%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/DigitalSignatureBlob.java (95%) create mode 100644 source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/EventOperator.java rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/KVData.java (93%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/LedgerInitOpTemplate.java (89%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/LedgerInitOperationBuilder.java (85%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/LedgerInitOperationBuilderImpl.java (86%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/LedgerInitOperator.java (77%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/LedgerInitSettingData.java (97%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/NewLedgerOpBlob.java (92%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/PreparedTx.java (98%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/PrivilegeSettingOperationBuilder.java (92%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/PubKeyData.java (88%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/SignatureEncoding.java (92%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/TransactionService.java (81%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/TxBuilder.java (89%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/TxContentBlob.java (93%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/TxRequestBuilder.java (95%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/TxRequestMessage.java (96%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/TxResponseMessage.java (92%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/TxTemplate.java (86%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/UserOperator.java (76%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/UserRegisterOpTemplate.java (89%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/UserRegisterOperationBuilder.java (86%) rename source/ledger/ledger-model/src/main/java/com/jd/blockchain/{ledger/data => transaction}/UserRegisterOperationBuilderImpl.java (85%) delete mode 100644 source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/Command.java delete mode 100644 source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/PeerClient.java delete mode 100644 source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/PeerClientDemo.java diff --git a/source/contract/contract-framework/pom.xml b/source/contract/contract-framework/pom.xml index 9f449374..83d1cf06 100644 --- a/source/contract/contract-framework/pom.xml +++ b/source/contract/contract-framework/pom.xml @@ -12,7 +12,7 @@ com.jd.blockchain - contract-model + ledger-model ${project.version} @@ -27,7 +27,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 true diff --git a/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractCode.java b/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractCode.java similarity index 58% rename from source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractCode.java rename to source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractCode.java index 5590cabb..d75f5b60 100644 --- a/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractCode.java +++ b/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractCode.java @@ -1,6 +1,6 @@ -package com.jd.blockchain.contract; +package com.jd.blockchain.contract.engine; -import com.jd.blockchain.contract.model.ContractEventContext; +import com.jd.blockchain.contract.ContractEventContext; public interface ContractCode { diff --git a/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractEngine.java b/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractEngine.java similarity index 92% rename from source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractEngine.java rename to source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractEngine.java index 09f7b416..e047bcc7 100644 --- a/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractEngine.java +++ b/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractEngine.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract; +package com.jd.blockchain.contract.engine; /** * 合约引擎； diff --git a/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractServiceProvider.java b/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractServiceProvider.java similarity index 79% rename from source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractServiceProvider.java rename to source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractServiceProvider.java index ae8a0d00..753efd2f 100644 --- a/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractServiceProvider.java +++ b/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractServiceProvider.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract; +package com.jd.blockchain.contract.engine; public interface ContractServiceProvider { diff --git a/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractServiceProviders.java b/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractServiceProviders.java similarity index 96% rename from source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractServiceProviders.java rename to source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractServiceProviders.java index f0a6ba37..146dffa6 100644 --- a/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/ContractServiceProviders.java +++ b/source/contract/contract-framework/src/main/java/com/jd/blockchain/contract/engine/ContractServiceProviders.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract; +package com.jd.blockchain.contract.engine; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JVMContractEngine.java b/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JVMContractEngine.java index 6769b618..e07e5215 100644 --- a/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JVMContractEngine.java +++ b/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JVMContractEngine.java @@ -1,7 +1,7 @@ package com.jd.blockchain.contract.jvm; -import com.jd.blockchain.contract.ContractCode; -import com.jd.blockchain.contract.ContractEngine; +import com.jd.blockchain.contract.engine.ContractCode; +import com.jd.blockchain.contract.engine.ContractEngine; import com.jd.blockchain.runtime.Module; import com.jd.blockchain.runtime.RuntimeContext; diff --git a/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JVMContractServiceProvider.java b/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JVMContractServiceProvider.java index 859c25c7..013537bf 100644 --- a/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JVMContractServiceProvider.java +++ b/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JVMContractServiceProvider.java @@ -1,7 +1,7 @@ package com.jd.blockchain.contract.jvm; -import com.jd.blockchain.contract.ContractEngine; -import com.jd.blockchain.contract.ContractServiceProvider; +import com.jd.blockchain.contract.engine.ContractEngine; +import com.jd.blockchain.contract.engine.ContractServiceProvider; public class JVMContractServiceProvider implements ContractServiceProvider { @Override diff --git a/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JavaContractCode.java b/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JavaContractCode.java index 147b6a26..da5d2fb8 100644 --- a/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JavaContractCode.java +++ b/source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JavaContractCode.java @@ -1,22 +1,19 @@ package com.jd.blockchain.contract.jvm; -import com.jd.blockchain.contract.ContractCode; -import com.jd.blockchain.contract.model.ContractEvent; -import com.jd.blockchain.contract.model.ContractEventContext; -import com.jd.blockchain.runtime.Module; -import com.jd.blockchain.utils.BaseConstant; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ReflectionUtils; -import static com.jd.blockchain.utils.BaseConstant.CONTRACT_MAIN_CLASS_KEY; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; +import com.jd.blockchain.contract.ContractEvent; +import com.jd.blockchain.contract.ContractEventContext; +import com.jd.blockchain.contract.engine.ContractCode; +import com.jd.blockchain.runtime.Module; +import com.jd.blockchain.utils.BaseConstant; /** * contract code based jvm diff --git a/source/contract/contract-maven-plugin/pom.xml b/source/contract/contract-maven-plugin/pom.xml index c8c11adb..0a357e52 100644 --- a/source/contract/contract-maven-plugin/pom.xml +++ b/source/contract/contract-maven-plugin/pom.xml @@ -9,32 +9,33 @@ contract-maven-plugin maven-plugin - - ${parent.version} - ${parent.version} - 4.12 - - 0.9.0-SNAPSHOT - junit - junit - test + com.jd.blockchain + ledger-model + ${project.version} com.jd.blockchain - contract-model - ${contract.version} + utils-common + ${project.version} com.jd.blockchain - utils-common - ${utils.version} + sdk-client + ${project.version} + + + + com.jd.blockchain + tools-keygen + ${project.version} + org.apache.maven.plugin-tools @@ -83,29 +84,30 @@ false - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractDeployExeUtil.java b/source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployExeUtil.java similarity index 85% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractDeployExeUtil.java rename to source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployExeUtil.java index 820668e4..a206a854 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractDeployExeUtil.java +++ b/source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployExeUtil.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain; import java.io.File; import java.io.FileInputStream; @@ -160,25 +160,28 @@ public enum ContractDeployExeUtil { return deploy(ledgerHash, contractIdentity, ownerKey, chainCode); } - public boolean exeContract(String ledger,String ownerPubPath, String ownerPrvPath, - String ownerPassword,String event,String contractArgs){ - BlockchainKeypair ownerKey = getKeyPair(ownerPubPath, ownerPrvPath, ownerPassword); - HashDigest ledgerHash = new HashDigest(Base58Utils.decode(ledger)); - - // 定义交易,传输最简单的数字、字符串、提取合约中的地址; - TransactionTemplate txTpl = bcsrv.newTransaction(ledgerHash); - txTpl.contractEvents().send(getContractAddress(),event,contractArgs.getBytes()); - - // 签名； - PreparedTransaction ptx = txTpl.prepare(); - ptx.sign(ownerKey); - - // 提交并等待共识返回； - TransactionResponse txResp = ptx.commit(); - - // 验证结果； - return txResp.isSuccess(); - } + +// 暂不支持从插件执行合约；此外，由于合约参数调用的格式发生变化，故此方法被废弃；by: huanghaiquan at 2019-04-30; + +// public boolean exeContract(String ledger,String ownerPubPath, String ownerPrvPath, +// String ownerPassword,String event,String contractArgs){ +// BlockchainKeypair ownerKey = getKeyPair(ownerPubPath, ownerPrvPath, ownerPassword); +// HashDigest ledgerHash = new HashDigest(Base58Utils.decode(ledger)); +// +// // 定义交易,传输最简单的数字、字符串、提取合约中的地址; +// TransactionTemplate txTpl = bcsrv.newTransaction(ledgerHash); +// txTpl.contractEvents().send(getContractAddress(),event,contractArgs.getBytes()); +// +// // 签名； +// PreparedTransaction ptx = txTpl.prepare(); +// ptx.sign(ownerKey); +// +// // 提交并等待共识返回； +// TransactionResponse txResp = ptx.commit(); +// +// // 验证结果； +// return txResp.isSuccess(); +// } public Bytes getContractAddress() { return contractAddress; diff --git a/source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployMojo.java b/source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployMojo.java index d942c165..80be911f 100644 --- a/source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployMojo.java +++ b/source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployMojo.java @@ -1,6 +1,5 @@ package com.jd.blockchain; -import com.jd.blockchain.contract.model.ContractDeployExeUtil; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.crypto.PrivKey; import com.jd.blockchain.crypto.PubKey; diff --git a/source/contract/contract-model/pom.xml b/source/contract/contract-model/pom.xml index 6a5da9c5..de1c279c 100644 --- a/source/contract/contract-model/pom.xml +++ b/source/contract/contract-model/pom.xml @@ -10,7 +10,7 @@ contract-model - + - - - - - \ No newline at end of file diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/LedgerContext.java b/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/LedgerContext.java deleted file mode 100644 index 5f2fbcbc..00000000 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/LedgerContext.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jd.blockchain.contract.model; - -import com.jd.blockchain.ledger.data.DataAccountOperator; -import com.jd.blockchain.ledger.data.UserOperator; -import com.jd.blockchain.sdk.BlockchainQueryService; - -public interface LedgerContext extends BlockchainQueryService, UserOperator, DataAccountOperator{ - - - -} diff --git a/source/gateway/src/main/java/com/jd/blockchain/gateway/PeerService.java b/source/gateway/src/main/java/com/jd/blockchain/gateway/PeerService.java index 38039582..b3fd6065 100644 --- a/source/gateway/src/main/java/com/jd/blockchain/gateway/PeerService.java +++ b/source/gateway/src/main/java/com/jd/blockchain/gateway/PeerService.java @@ -1,7 +1,7 @@ package com.jd.blockchain.gateway; -import com.jd.blockchain.ledger.data.TransactionService; -import com.jd.blockchain.sdk.BlockchainQueryService; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.TransactionService; public interface PeerService { diff --git a/source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java b/source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java index 443b1208..ba17036b 100644 --- a/source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java +++ b/source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java @@ -7,9 +7,9 @@ import org.springframework.stereotype.Component; import com.jd.blockchain.crypto.AsymmetricKeypair; import com.jd.blockchain.gateway.PeerConnector; import com.jd.blockchain.gateway.PeerService; -import com.jd.blockchain.ledger.data.TransactionService; -import com.jd.blockchain.sdk.BlockchainQueryService; import com.jd.blockchain.sdk.service.PeerBlockchainServiceFactory; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.TransactionService; import com.jd.blockchain.utils.net.NetworkAddress; import java.util.List; diff --git a/source/gateway/src/main/java/com/jd/blockchain/gateway/web/TxProcessingController.java b/source/gateway/src/main/java/com/jd/blockchain/gateway/web/TxProcessingController.java index 02ac7fc6..7209f589 100644 --- a/source/gateway/src/main/java/com/jd/blockchain/gateway/web/TxProcessingController.java +++ b/source/gateway/src/main/java/com/jd/blockchain/gateway/web/TxProcessingController.java @@ -16,7 +16,7 @@ import com.jd.blockchain.ledger.DigitalSignature; import com.jd.blockchain.ledger.TransactionContent; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; -import com.jd.blockchain.ledger.data.TransactionService; +import com.jd.blockchain.transaction.TransactionService; import com.jd.blockchain.utils.BusinessException; import com.jd.blockchain.web.converters.BinaryMessageConverter; diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerQueryService.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerQueryService.java index 4b8cd2c2..27eeefd0 100644 --- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerQueryService.java +++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerQueryService.java @@ -2,9 +2,25 @@ package com.jd.blockchain.ledger.core.impl; import com.jd.blockchain.binaryproto.BinaryEncodingUtils; import com.jd.blockchain.crypto.HashDigest; -import com.jd.blockchain.ledger.*; -import com.jd.blockchain.ledger.core.*; -import com.jd.blockchain.sdk.BlockchainQueryService; +import com.jd.blockchain.ledger.AccountHeader; +import com.jd.blockchain.ledger.BytesValue; +import com.jd.blockchain.ledger.KVDataEntry; +import com.jd.blockchain.ledger.KVDataObject; +import com.jd.blockchain.ledger.LedgerBlock; +import com.jd.blockchain.ledger.LedgerInfo; +import com.jd.blockchain.ledger.LedgerTransaction; +import com.jd.blockchain.ledger.ParticipantNode; +import com.jd.blockchain.ledger.TransactionState; +import com.jd.blockchain.ledger.UserInfo; +import com.jd.blockchain.ledger.core.ContractAccountSet; +import com.jd.blockchain.ledger.core.DataAccount; +import com.jd.blockchain.ledger.core.DataAccountSet; +import com.jd.blockchain.ledger.core.LedgerAdministration; +import com.jd.blockchain.ledger.core.LedgerRepository; +import com.jd.blockchain.ledger.core.LedgerService; +import com.jd.blockchain.ledger.core.TransactionSet; +import com.jd.blockchain.ledger.core.UserAccountSet; +import com.jd.blockchain.transaction.BlockchainQueryService; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.QueryUtil; import com.jd.blockchain.utils.ValueType; diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionBatchProcessor.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionBatchProcessor.java index 1001230f..7a0670b8 100644 --- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionBatchProcessor.java +++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionBatchProcessor.java @@ -20,9 +20,9 @@ import com.jd.blockchain.ledger.core.LedgerService; import com.jd.blockchain.ledger.core.LedgerTransactionContext; import com.jd.blockchain.ledger.core.OperationHandle; import com.jd.blockchain.ledger.core.TransactionRequestContext; -import com.jd.blockchain.ledger.service.TransactionBatchProcess; -import com.jd.blockchain.ledger.service.TransactionBatchResult; -import com.jd.blockchain.ledger.service.TransactionBatchResultHandle; +import com.jd.blockchain.service.TransactionBatchProcess; +import com.jd.blockchain.service.TransactionBatchResult; +import com.jd.blockchain.service.TransactionBatchResultHandle; import com.jd.blockchain.utils.Bytes; public class TransactionBatchProcessor implements TransactionBatchProcess { diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionEngineImpl.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionEngineImpl.java index 73053188..bf2470e4 100644 --- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionEngineImpl.java +++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionEngineImpl.java @@ -11,8 +11,8 @@ import com.jd.blockchain.ledger.core.LedgerDataSet; import com.jd.blockchain.ledger.core.LedgerEditor; import com.jd.blockchain.ledger.core.LedgerRepository; import com.jd.blockchain.ledger.core.LedgerService; -import com.jd.blockchain.ledger.service.TransactionBatchProcess; -import com.jd.blockchain.ledger.service.TransactionEngine; +import com.jd.blockchain.service.TransactionBatchProcess; +import com.jd.blockchain.service.TransactionEngine; public class TransactionEngineImpl implements TransactionEngine { diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractEventSendOperationHandle.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractEventSendOperationHandle.java index 498457af..5c3b67cc 100644 --- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractEventSendOperationHandle.java +++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractEventSendOperationHandle.java @@ -1,7 +1,7 @@ package com.jd.blockchain.ledger.core.impl.handles; -import com.jd.blockchain.contract.ContractServiceProviders; -import com.jd.blockchain.contract.model.LocalContractEventContext; +import com.jd.blockchain.contract.LocalContractEventContext; +import com.jd.blockchain.contract.engine.ContractServiceProviders; import com.jd.blockchain.ledger.ContractEventSendOperation; import com.jd.blockchain.ledger.Operation; import com.jd.blockchain.ledger.core.*; diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java index d8cbb571..acd13e99 100644 --- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java +++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java @@ -4,17 +4,32 @@ import java.util.ArrayList; import java.util.List; import com.alibaba.fastjson.JSON; -import com.jd.blockchain.contract.model.LedgerContext; +import com.jd.blockchain.contract.LedgerContext; import com.jd.blockchain.crypto.HashDigest; -import com.jd.blockchain.ledger.*; +import com.jd.blockchain.ledger.AccountHeader; +import com.jd.blockchain.ledger.BlockchainIdentity; +import com.jd.blockchain.ledger.BytesValue; +import com.jd.blockchain.ledger.BytesValueImpl; +import com.jd.blockchain.ledger.DataAccountKVSetOperation; +import com.jd.blockchain.ledger.DataAccountRegisterOperation; +import com.jd.blockchain.ledger.DataType; +import com.jd.blockchain.ledger.KVDataEntry; +import com.jd.blockchain.ledger.LedgerBlock; +import com.jd.blockchain.ledger.LedgerInfo; +import com.jd.blockchain.ledger.LedgerTransaction; +import com.jd.blockchain.ledger.Operation; +import com.jd.blockchain.ledger.ParticipantNode; +import com.jd.blockchain.ledger.TransactionState; +import com.jd.blockchain.ledger.UserInfo; +import com.jd.blockchain.ledger.UserRegisterOperation; import com.jd.blockchain.ledger.core.impl.OperationHandleContext; -import com.jd.blockchain.ledger.data.DataAccountKVSetOperationBuilder; -import com.jd.blockchain.ledger.data.DataAccountRegisterOperationBuilder; -import com.jd.blockchain.ledger.data.DataAccountRegisterOperationBuilderImpl; -import com.jd.blockchain.ledger.data.KVData; -import com.jd.blockchain.ledger.data.UserRegisterOperationBuilder; -import com.jd.blockchain.ledger.data.UserRegisterOperationBuilderImpl; -import com.jd.blockchain.sdk.BlockchainQueryService; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.DataAccountKVSetOperationBuilder; +import com.jd.blockchain.transaction.DataAccountRegisterOperationBuilder; +import com.jd.blockchain.transaction.DataAccountRegisterOperationBuilderImpl; +import com.jd.blockchain.transaction.KVData; +import com.jd.blockchain.transaction.UserRegisterOperationBuilder; +import com.jd.blockchain.transaction.UserRegisterOperationBuilderImpl; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerAdminAccountTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerAdminAccountTest.java index 54999130..af06d0b1 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerAdminAccountTest.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerAdminAccountTest.java @@ -21,9 +21,9 @@ import com.jd.blockchain.ledger.core.CryptoConfig; import com.jd.blockchain.ledger.core.LedgerAdminAccount; import com.jd.blockchain.ledger.core.LedgerConfiguration; import com.jd.blockchain.ledger.core.LedgerMetadata; -import com.jd.blockchain.ledger.data.ConsensusParticipantData; -import com.jd.blockchain.ledger.data.LedgerInitSettingData; import com.jd.blockchain.storage.service.utils.MemoryKVStorage; +import com.jd.blockchain.transaction.ConsensusParticipantData; +import com.jd.blockchain.transaction.LedgerInitSettingData; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.io.BytesUtils; import com.jd.blockchain.utils.net.NetworkAddress; diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java index 047e4066..621aa6fc 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java @@ -26,9 +26,9 @@ import com.jd.blockchain.ledger.core.LedgerEditor; import com.jd.blockchain.ledger.core.LedgerTransactionContext; import com.jd.blockchain.ledger.core.UserAccount; import com.jd.blockchain.ledger.core.impl.LedgerTransactionalEditor; -import com.jd.blockchain.ledger.data.ConsensusParticipantData; -import com.jd.blockchain.ledger.data.LedgerInitSettingData; import com.jd.blockchain.storage.service.utils.MemoryKVStorage; +import com.jd.blockchain.transaction.ConsensusParticipantData; +import com.jd.blockchain.transaction.LedgerInitSettingData; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.io.BytesUtils; import com.jd.blockchain.utils.net.NetworkAddress; diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitOperationTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitOperationTest.java index a6a56143..81b8e728 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitOperationTest.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitOperationTest.java @@ -19,9 +19,9 @@ import com.jd.blockchain.ledger.LedgerInitOperation; import com.jd.blockchain.ledger.LedgerInitSetting; import com.jd.blockchain.ledger.core.CryptoConfig; import com.jd.blockchain.ledger.core.ParticipantCertData; -import com.jd.blockchain.ledger.data.ConsensusParticipantData; -import com.jd.blockchain.ledger.data.LedgerInitOpTemplate; -import com.jd.blockchain.ledger.data.LedgerInitSettingData; +import com.jd.blockchain.transaction.ConsensusParticipantData; +import com.jd.blockchain.transaction.LedgerInitOpTemplate; +import com.jd.blockchain.transaction.LedgerInitSettingData; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.net.NetworkAddress; diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitSettingTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitSettingTest.java index 8055ff5b..c4e6e5ce 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitSettingTest.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitSettingTest.java @@ -18,9 +18,9 @@ import com.jd.blockchain.ledger.BlockchainKeypair; import com.jd.blockchain.ledger.LedgerInitSetting; import com.jd.blockchain.ledger.core.CryptoConfig; import com.jd.blockchain.ledger.core.ParticipantCertData; -import com.jd.blockchain.ledger.data.ConsensusParticipantData; -import com.jd.blockchain.ledger.data.LedgerInitOpTemplate; -import com.jd.blockchain.ledger.data.LedgerInitSettingData; +import com.jd.blockchain.transaction.ConsensusParticipantData; +import com.jd.blockchain.transaction.LedgerInitOpTemplate; +import com.jd.blockchain.transaction.LedgerInitSettingData; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.net.NetworkAddress; diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerManagerTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerManagerTest.java index 637828f8..9974d5d8 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerManagerTest.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerManagerTest.java @@ -39,10 +39,10 @@ import com.jd.blockchain.ledger.core.LedgerTransactionContext; import com.jd.blockchain.ledger.core.UserAccount; import com.jd.blockchain.ledger.core.UserAccountSet; import com.jd.blockchain.ledger.core.impl.LedgerManager; -import com.jd.blockchain.ledger.data.ConsensusParticipantData; -import com.jd.blockchain.ledger.data.LedgerInitSettingData; -import com.jd.blockchain.ledger.data.TxBuilder; import com.jd.blockchain.storage.service.utils.MemoryKVStorage; +import com.jd.blockchain.transaction.ConsensusParticipantData; +import com.jd.blockchain.transaction.LedgerInitSettingData; +import com.jd.blockchain.transaction.TxBuilder; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.io.BytesUtils; import com.jd.blockchain.utils.net.NetworkAddress; diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTestUtils.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTestUtils.java index 28a01823..d6f6ae43 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTestUtils.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTestUtils.java @@ -15,8 +15,8 @@ import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.core.CryptoConfig; import com.jd.blockchain.ledger.core.impl.TransactionStagedSnapshot; -import com.jd.blockchain.ledger.data.TransactionService; -import com.jd.blockchain.ledger.data.TxTemplate; +import com.jd.blockchain.transaction.TransactionService; +import com.jd.blockchain.transaction.TxTemplate; public class LedgerTestUtils { diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTransactionDataTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTransactionDataTest.java index bfff2a7c..55e13930 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTransactionDataTest.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTransactionDataTest.java @@ -37,10 +37,10 @@ import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionState; import com.jd.blockchain.ledger.core.impl.LedgerTransactionData; import com.jd.blockchain.ledger.core.impl.TransactionStagedSnapshot; -import com.jd.blockchain.ledger.data.BlockchainOperationFactory; -import com.jd.blockchain.ledger.data.DigitalSignatureBlob; -import com.jd.blockchain.ledger.data.TxContentBlob; -import com.jd.blockchain.ledger.data.TxRequestMessage; +import com.jd.blockchain.transaction.BlockchainOperationFactory; +import com.jd.blockchain.transaction.DigitalSignatureBlob; +import com.jd.blockchain.transaction.TxContentBlob; +import com.jd.blockchain.transaction.TxRequestMessage; import com.jd.blockchain.utils.io.ByteArray; /** diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TransactionSetTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TransactionSetTest.java index 6214d090..60b48975 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TransactionSetTest.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TransactionSetTest.java @@ -33,8 +33,8 @@ import com.jd.blockchain.ledger.UserRegisterOperation; import com.jd.blockchain.ledger.core.TransactionSet; import com.jd.blockchain.ledger.core.impl.LedgerTransactionData; import com.jd.blockchain.ledger.core.impl.TransactionStagedSnapshot; -import com.jd.blockchain.ledger.data.TxBuilder; import com.jd.blockchain.storage.service.utils.MemoryKVStorage; +import com.jd.blockchain.transaction.TxBuilder; import com.jd.blockchain.utils.io.BytesUtils; public class TransactionSetTest { diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/Contract.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/Contract.java similarity index 83% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/Contract.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/Contract.java index 3e79827c..e1b7ea4e 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/Contract.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/Contract.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractAppLifecycleAwire.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractAppLifecycleAwire.java similarity index 85% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractAppLifecycleAwire.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractAppLifecycleAwire.java index cb9869c4..c8f4f8a9 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractAppLifecycleAwire.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractAppLifecycleAwire.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; /** * 合约实现此接口可以监听合约应用的生命周期事件； diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractEvent.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractEvent.java similarity index 84% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractEvent.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractEvent.java index 00f24e76..6249945e 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractEvent.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractEvent.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractEventContext.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractEventContext.java similarity index 95% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractEventContext.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractEventContext.java index d2c16761..a24ba26d 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractEventContext.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractEventContext.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.BlockchainIdentity; diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractException.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractException.java similarity index 89% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractException.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractException.java index 0e13d2c5..61ba347a 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractException.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractException.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; public class ContractException extends RuntimeException { diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractRuntimeAwire.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractRuntimeAwire.java similarity index 81% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractRuntimeAwire.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractRuntimeAwire.java index d5627985..eab96a41 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractRuntimeAwire.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractRuntimeAwire.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; /** * 合约实现 {@link ContractRuntimeAwire} 的子接口可以监听运行时的生命周期事件； diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ErrorCodeEnum.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ErrorCodeEnum.java similarity index 96% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ErrorCodeEnum.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ErrorCodeEnum.java index 5e2bcb05..f978cb2f 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ErrorCodeEnum.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ErrorCodeEnum.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; /** * 给每个错误编码，编译快速定位; diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/EventHandle.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/EventHandle.java similarity index 84% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/EventHandle.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/EventHandle.java index 35af3fe0..9b301460 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/EventHandle.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/EventHandle.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/EventProcessingAwire.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/EventProcessingAwire.java similarity index 95% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/EventProcessingAwire.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/EventProcessingAwire.java index 9098dda3..36080be1 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/EventProcessingAwire.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/EventProcessingAwire.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; /** * @author huanghaiquan diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/LedgerContext.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/LedgerContext.java new file mode 100644 index 00000000..196949ab --- /dev/null +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/LedgerContext.java @@ -0,0 +1,11 @@ +package com.jd.blockchain.contract; + +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.DataAccountOperator; +import com.jd.blockchain.transaction.UserOperator; + +public interface LedgerContext extends BlockchainQueryService, UserOperator, DataAccountOperator{ + + + +} diff --git a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/LocalContractEventContext.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/LocalContractEventContext.java similarity index 98% rename from source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/LocalContractEventContext.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/LocalContractEventContext.java index 2b1261b8..7d366d0c 100644 --- a/source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/LocalContractEventContext.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/LocalContractEventContext.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.contract.model; +package com.jd.blockchain.contract; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.BlockchainIdentity; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java index 38c6b90d..301dda65 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java @@ -13,12 +13,6 @@ import com.jd.blockchain.utils.ValueType; @DataContract(code= TypeCodes.TX_OP_CONTRACT_EVENT_SEND) public interface ContractEventSendOperation extends Operation { -// @DataField(order=1, refEnum=true) -// @Override -// default OperationType getType() { -// return OperationType.SEND_CONTRACT_EVENT; -// } - @DataField(order=2, primitiveType=ValueType.BYTES) Bytes getContractAddress(); diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionBuilder.java index 65eca630..26c5cfc5 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionBuilder.java @@ -1,8 +1,8 @@ package com.jd.blockchain.ledger; import com.jd.blockchain.crypto.HashDigest; -import com.jd.blockchain.ledger.data.ClientOperator; -import com.jd.blockchain.ledger.data.LedgerInitOperator; +import com.jd.blockchain.transaction.ClientOperator; +import com.jd.blockchain.transaction.LedgerInitOperator; /** * 区块链交易模板； diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionTemplate.java index afc1eb95..3c5acdcf 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionTemplate.java @@ -1,7 +1,7 @@ package com.jd.blockchain.ledger; import com.jd.blockchain.crypto.HashDigest; -import com.jd.blockchain.ledger.data.ClientOperator; +import com.jd.blockchain.transaction.ClientOperator; /** * 区块链交易模板； diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/EventOperator.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/EventOperator.java deleted file mode 100644 index 551dc06b..00000000 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/EventOperator.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jd.blockchain.ledger.data; - -public interface EventOperator { - - /** - * 部署合约； - * @return - */ - ContractEventSendOperationBuilder contractEvents(); - -} \ No newline at end of file diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchProcess.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchProcess.java similarity index 95% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchProcess.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchProcess.java index 083b5215..9ac5c78e 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchProcess.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchProcess.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.service; +package com.jd.blockchain.service; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchResult.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchResult.java similarity index 85% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchResult.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchResult.java index b1363325..3b7038a5 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchResult.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchResult.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.service; +package com.jd.blockchain.service; import java.util.Iterator; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchResultHandle.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchResultHandle.java similarity index 82% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchResultHandle.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchResultHandle.java index 2af06531..03caed25 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionBatchResultHandle.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionBatchResultHandle.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.service; +package com.jd.blockchain.service; import com.jd.blockchain.ledger.TransactionState; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionEngine.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionEngine.java similarity index 83% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionEngine.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionEngine.java index bfcde37b..aad92209 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/service/TransactionEngine.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/service/TransactionEngine.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.service; +package com.jd.blockchain.service; import com.jd.blockchain.crypto.HashDigest; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/manage/GatewayIncomingSetting.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/setting/GatewayIncomingSetting.java similarity index 86% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/manage/GatewayIncomingSetting.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/setting/GatewayIncomingSetting.java index abd25b4d..d6212fd7 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/manage/GatewayIncomingSetting.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/setting/GatewayIncomingSetting.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.manage; +package com.jd.blockchain.setting; /** * 网关接入设置； diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/manage/LedgerIncomingSetting.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/setting/LedgerIncomingSetting.java similarity index 98% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/manage/LedgerIncomingSetting.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/setting/LedgerIncomingSetting.java index 15dbbf77..0e110f12 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/manage/LedgerIncomingSetting.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/setting/LedgerIncomingSetting.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.manage; +package com.jd.blockchain.setting; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.CryptoSetting; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/BlockchainOperationFactory.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainOperationFactory.java similarity index 93% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/BlockchainOperationFactory.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainOperationFactory.java index 08d9d45a..bd1bfd5b 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/BlockchainOperationFactory.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainOperationFactory.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import java.util.ArrayList; import java.util.Collection; @@ -15,6 +15,10 @@ import com.jd.blockchain.ledger.Operation; import com.jd.blockchain.ledger.UserRegisterOperation; import com.jd.blockchain.utils.Bytes; +/** + * @author huanghaiquan + * + */ public class BlockchainOperationFactory implements ClientOperator, LedgerInitOperator { private static final LedgerInitOperationBuilderImpl LEDGER_INIT_OP_BUILDER = new LedgerInitOperationBuilderImpl(); @@ -27,6 +31,7 @@ public class BlockchainOperationFactory implements ClientOperator, LedgerInitOpe private static final ContractEventSendOperationBuilderImpl CONTRACT_EVENT_SEND_OP_BUILDER = new ContractEventSendOperationBuilderImpl(); + private LedgerInitOperationBuilder ledgerInitOpBuilder = new LedgerInitOperationBuilderFilter(); private UserRegisterOperationBuilder userRegOpBuilder = new UserRegisterOperationBuilderFilter(); @@ -73,6 +78,12 @@ public class BlockchainOperationFactory implements ClientOperator, LedgerInitOpe public ContractEventSendOperationBuilder contractEvents() { return contractEventSendOpBuilder; } + + @Override + public T contract(String address, Class contractIntf) { + // TODO Auto-generated method stub + return null; + } public Collection getOperations() { // TODO: 合并操作列表中可能的重复操作； diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainQueryService.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainQueryService.java similarity index 95% rename from source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainQueryService.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainQueryService.java index 942019a5..3b33a720 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainQueryService.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainQueryService.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.sdk; +package com.jd.blockchain.transaction; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.*; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ClientOperator.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ClientOperator.java similarity index 81% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ClientOperator.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ClientOperator.java index 9fe9ff4f..5e47ef89 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ClientOperator.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ClientOperator.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; /** * 面向客户端的操作； diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ConsensusParticipantData.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ConsensusParticipantData.java similarity index 95% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ConsensusParticipantData.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ConsensusParticipantData.java index e31d6447..b4e64744 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ConsensusParticipantData.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ConsensusParticipantData.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.crypto.PubKey; import com.jd.blockchain.ledger.ParticipantNode; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOpTemplate.java similarity index 92% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOpTemplate.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOpTemplate.java index 704d0cde..4da74638 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOpTemplate.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.ledger.BlockchainIdentity; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOperationBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilder.java similarity index 87% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOperationBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilder.java index ee48739c..ff2c18fb 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOperationBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.ContractCodeDeployOperation; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOperationBuilderImpl.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilderImpl.java similarity index 88% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOperationBuilderImpl.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilderImpl.java index 67921caf..a0c2bba4 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractCodeDeployOperationBuilderImpl.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilderImpl.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.ContractCodeDeployOperation; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java new file mode 100644 index 00000000..cee26713 --- /dev/null +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractDefinition.java @@ -0,0 +1,5 @@ +package com.jd.blockchain.transaction; + +class ContractDefinition { + +} diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOpTemplate.java similarity index 91% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOpTemplate.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOpTemplate.java index 23b15d02..29777b96 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOpTemplate.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.ledger.ContractEventSendOperation; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOperationBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilder.java similarity index 85% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOperationBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilder.java index 1c3f7721..66f1ec22 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOperationBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.ContractEventSendOperation; import com.jd.blockchain.utils.Bytes; @@ -11,6 +11,7 @@ public interface ContractEventSendOperationBuilder { * @param args 事件参数； * @return */ + @Deprecated ContractEventSendOperation send(String address, String event, byte[] args); /** @@ -19,6 +20,7 @@ public interface ContractEventSendOperationBuilder { * @param args 事件参数； * @return */ + @Deprecated ContractEventSendOperation send(Bytes address, String event, byte[] args); } diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOperationBuilderImpl.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java similarity index 76% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOperationBuilderImpl.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java index fdef8106..7c54e4e8 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractEventSendOperationBuilderImpl.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java @@ -1,9 +1,10 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.ContractEventSendOperation; import com.jd.blockchain.utils.Bytes; -public class ContractEventSendOperationBuilderImpl implements ContractEventSendOperationBuilder{ +@Deprecated +class ContractEventSendOperationBuilderImpl implements ContractEventSendOperationBuilder{ @Override diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxy.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxy.java new file mode 100644 index 00000000..c9b97e4d --- /dev/null +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxy.java @@ -0,0 +1,22 @@ +package com.jd.blockchain.transaction; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; + +public class ContractInvocationProxy implements InvocationHandler { + + + private String contractMessage; + + + private ContractEventSendOperationBuilder sendOpBuilder; + + + + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxyBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxyBuilder.java new file mode 100644 index 00000000..2bc6c9ea --- /dev/null +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxyBuilder.java @@ -0,0 +1,6 @@ +package com.jd.blockchain.transaction; + +class ContractInvocationProxyBuilder { + + +} diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractOperator.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractOperator.java similarity index 76% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractOperator.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractOperator.java index dada75c1..cc0f7da4 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/ContractOperator.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractOperator.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; public interface ContractOperator { diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOpTemplate.java similarity index 94% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOpTemplate.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOpTemplate.java index 0fc6d2e3..5a1b48ab 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOpTemplate.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import java.util.LinkedHashMap; import java.util.Map; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOperationBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilder.java similarity index 93% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOperationBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilder.java index 9f0ae566..4e0a903c 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOperationBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.DataAccountKVSetOperation; import com.jd.blockchain.utils.Bytes; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOperationBuilderImpl.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java similarity index 95% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOperationBuilderImpl.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java index 58d94a2c..6d7aff58 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountKVSetOperationBuilderImpl.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.BytesValue; import com.jd.blockchain.ledger.BytesValueImpl; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountOperator.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountOperator.java similarity index 91% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountOperator.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountOperator.java index ff08d6cf..7964e7ef 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountOperator.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountOperator.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.utils.Bytes; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOpTemplate.java similarity index 91% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOpTemplate.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOpTemplate.java index 63ad84d9..ffcbd455 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOpTemplate.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.ledger.BlockchainIdentity; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOperationBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilder.java similarity index 83% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOperationBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilder.java index c6bd23f0..ca248fc4 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOperationBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.DataAccountRegisterOperation; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOperationBuilderImpl.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilderImpl.java similarity index 87% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOperationBuilderImpl.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilderImpl.java index afff51a2..eba6b97d 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DataAccountRegisterOperationBuilderImpl.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilderImpl.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.DataAccountRegisterOperation; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DigitalSignatureBlob.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DigitalSignatureBlob.java similarity index 95% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DigitalSignatureBlob.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DigitalSignatureBlob.java index 18cc78fa..a2125490 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/DigitalSignatureBlob.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DigitalSignatureBlob.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.crypto.PubKey; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/EventOperator.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/EventOperator.java new file mode 100644 index 00000000..687c204d --- /dev/null +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/EventOperator.java @@ -0,0 +1,22 @@ +package com.jd.blockchain.transaction; + +public interface EventOperator { + + /** + * 部署合约； + * + * @return + */ + @Deprecated + ContractEventSendOperationBuilder contractEvents(); + + /** + * 创建调用合约的代理实例； + * + * @param address + * @param contractIntf + * @return + */ + T contract(String address, Class contractIntf); + +} \ No newline at end of file diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/KVData.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/KVData.java similarity index 93% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/KVData.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/KVData.java index 29ed209f..de93fcc8 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/KVData.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/KVData.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.BytesValue; import com.jd.blockchain.ledger.DataAccountKVSetOperation.KVWriteEntry; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOpTemplate.java similarity index 89% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOpTemplate.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOpTemplate.java index ccfdecaa..4259c98c 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOpTemplate.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.ledger.LedgerInitOperation; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperationBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilder.java similarity index 85% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperationBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilder.java index 6b7ff42b..9416d73d 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperationBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.LedgerInitOperation; import com.jd.blockchain.ledger.LedgerInitSetting; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperationBuilderImpl.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilderImpl.java similarity index 86% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperationBuilderImpl.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilderImpl.java index 5cb11dc2..9562ae64 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperationBuilderImpl.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilderImpl.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.LedgerInitOperation; import com.jd.blockchain.ledger.LedgerInitSetting; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperator.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperator.java similarity index 77% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperator.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperator.java index 43ee3fbb..62c4f293 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitOperator.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperator.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; public interface LedgerInitOperator { diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitSettingData.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitSettingData.java similarity index 97% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitSettingData.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitSettingData.java index ae40966b..e4fe8171 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/LedgerInitSettingData.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitSettingData.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.ParticipantNode; import com.jd.blockchain.utils.Bytes; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/NewLedgerOpBlob.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/NewLedgerOpBlob.java similarity index 92% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/NewLedgerOpBlob.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/NewLedgerOpBlob.java index cd68cd30..ee496969 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/NewLedgerOpBlob.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/NewLedgerOpBlob.java @@ -1,3 +1,4 @@ +package com.jd.blockchain.transaction; //package com.jd.blockchain.ledger.data; // //import com.jd.blockchain.ledger.OperationType; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PreparedTx.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PreparedTx.java similarity index 98% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PreparedTx.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PreparedTx.java index 02c74a84..ce5f9920 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PreparedTx.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PreparedTx.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.binaryproto.BinaryEncodingUtils; import com.jd.blockchain.crypto.AsymmetricKeypair; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PrivilegeSettingOperationBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PrivilegeSettingOperationBuilder.java similarity index 92% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PrivilegeSettingOperationBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PrivilegeSettingOperationBuilder.java index f65b3cde..f2cbab74 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PrivilegeSettingOperationBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PrivilegeSettingOperationBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.PrivilegeType; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PubKeyData.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PubKeyData.java similarity index 88% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PubKeyData.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PubKeyData.java index e7350873..a31864e6 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/PubKeyData.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PubKeyData.java @@ -1,3 +1,4 @@ +package com.jd.blockchain.transaction; //package com.jd.blockchain.ledger.data; // //import com.jd.blockchain.ledger.KeyType; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/SignatureEncoding.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/SignatureEncoding.java similarity index 92% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/SignatureEncoding.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/SignatureEncoding.java index 78031fb3..d92c9eb8 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/SignatureEncoding.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/SignatureEncoding.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import org.springframework.util.Base64Utils; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TransactionService.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TransactionService.java similarity index 81% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TransactionService.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TransactionService.java index aa56dbe7..9d9a9ab8 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TransactionService.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TransactionService.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java similarity index 89% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java index 0b6bfa48..2a2c62fd 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.binaryproto.BinaryEncodingUtils; import com.jd.blockchain.binaryproto.DataContractRegistry; @@ -83,5 +83,11 @@ public class TxBuilder implements TransactionBuilder { public ContractEventSendOperationBuilder contractEvents() { return opFactory.contractEvents(); } + + @Override + public T contract(String address, Class contractIntf) { + // TODO Auto-generated method stub + return null; + } } diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxContentBlob.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxContentBlob.java similarity index 93% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxContentBlob.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxContentBlob.java index 5be77cf0..f1cb2993 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxContentBlob.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxContentBlob.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import java.util.ArrayList; import java.util.Collection; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxRequestBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestBuilder.java similarity index 95% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxRequestBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestBuilder.java index 848f1e3d..a26a9a4d 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxRequestBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import java.util.ArrayList; import java.util.List; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxRequestMessage.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestMessage.java similarity index 96% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxRequestMessage.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestMessage.java index 06c29cbf..50037ee4 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxRequestMessage.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestMessage.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import java.util.LinkedHashMap; import java.util.List; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxResponseMessage.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxResponseMessage.java similarity index 92% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxResponseMessage.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxResponseMessage.java index 144a7762..8a912d21 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxResponseMessage.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxResponseMessage.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.TransactionState; import com.jd.blockchain.crypto.HashDigest; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxTemplate.java similarity index 86% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxTemplate.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxTemplate.java index 3f8523bc..f19906db 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/TxTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxTemplate.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.PreparedTransaction; @@ -57,5 +57,10 @@ public class TxTemplate implements TransactionTemplate { public ContractEventSendOperationBuilder contractEvents() { return txBuilder.contractEvents(); } + + @Override + public T contract(String address, Class contractIntf) { + return txBuilder.contract(address, contractIntf); + } } diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserOperator.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserOperator.java similarity index 76% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserOperator.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserOperator.java index 9053b9fb..fdd82668 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserOperator.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserOperator.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; public interface UserOperator { diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOpTemplate.java similarity index 89% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOpTemplate.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOpTemplate.java index f1c9940d..91ea541a 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOpTemplate.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.ledger.BlockchainIdentity; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOperationBuilder.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilder.java similarity index 86% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOperationBuilder.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilder.java index 8977ce3d..76f0e956 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOperationBuilder.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.UserRegisterOperation; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOperationBuilderImpl.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilderImpl.java similarity index 85% rename from source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOperationBuilderImpl.java rename to source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilderImpl.java index ae7301b9..39a84725 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/data/UserRegisterOperationBuilderImpl.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilderImpl.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.ledger.data; +package com.jd.blockchain.transaction; import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.UserRegisterOperation; diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/ContractCodeDeployOpTemplateTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/ContractCodeDeployOpTemplateTest.java index cbdbe67f..bc534897 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/ContractCodeDeployOpTemplateTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/ContractCodeDeployOpTemplateTest.java @@ -24,7 +24,7 @@ import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.BlockchainIdentityData; import com.jd.blockchain.ledger.ContractCodeDeployOperation; import com.jd.blockchain.ledger.Operation; -import com.jd.blockchain.ledger.data.ContractCodeDeployOpTemplate; +import com.jd.blockchain.transaction.ContractCodeDeployOpTemplate; import com.jd.blockchain.utils.io.BytesUtils; /** diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/ContractEventSendOpTemplateTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/ContractEventSendOpTemplateTest.java index ead7b0e5..3f70b8ca 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/ContractEventSendOpTemplateTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/ContractEventSendOpTemplateTest.java @@ -13,8 +13,8 @@ import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.ledger.ContractEventSendOperation; import com.jd.blockchain.ledger.DataAccountKVSetOperation; import com.jd.blockchain.ledger.Operation; -import com.jd.blockchain.ledger.data.ContractEventSendOpTemplate; -import com.jd.blockchain.ledger.data.DataAccountKVSetOpTemplate; +import com.jd.blockchain.transaction.ContractEventSendOpTemplate; +import com.jd.blockchain.transaction.DataAccountKVSetOpTemplate; import com.jd.blockchain.utils.Bytes; import org.junit.Before; diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DataAccountKVSetOpTemplateTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DataAccountKVSetOpTemplateTest.java index 2ad55386..ed7d8c57 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DataAccountKVSetOpTemplateTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DataAccountKVSetOpTemplateTest.java @@ -14,8 +14,8 @@ import com.jd.blockchain.ledger.BytesValueImpl; import com.jd.blockchain.ledger.DataAccountKVSetOperation; import com.jd.blockchain.ledger.DataType; import com.jd.blockchain.ledger.Operation; -import com.jd.blockchain.ledger.data.DataAccountKVSetOpTemplate; -import com.jd.blockchain.ledger.data.KVData; +import com.jd.blockchain.transaction.DataAccountKVSetOpTemplate; +import com.jd.blockchain.transaction.KVData; import com.jd.blockchain.utils.Bytes; import org.junit.Before; diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DataAccountRegisterOpTemplateTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DataAccountRegisterOpTemplateTest.java index 207f5e42..861db193 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DataAccountRegisterOpTemplateTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DataAccountRegisterOpTemplateTest.java @@ -22,7 +22,7 @@ import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.BlockchainIdentityData; import com.jd.blockchain.ledger.DataAccountRegisterOperation; import com.jd.blockchain.ledger.Operation; -import com.jd.blockchain.ledger.data.DataAccountRegisterOpTemplate; +import com.jd.blockchain.transaction.DataAccountRegisterOpTemplate; /** * diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DigitalSignatureBlobTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DigitalSignatureBlobTest.java index ac0bc568..e7a66d8b 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DigitalSignatureBlobTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/DigitalSignatureBlobTest.java @@ -23,7 +23,7 @@ import com.jd.blockchain.crypto.SignatureDigest; import com.jd.blockchain.crypto.SignatureFunction; import com.jd.blockchain.ledger.DigitalSignature; import com.jd.blockchain.ledger.DigitalSignatureBody; -import com.jd.blockchain.ledger.data.DigitalSignatureBlob; +import com.jd.blockchain.transaction.DigitalSignatureBlob; /** * diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/KVDataTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/KVDataTest.java index 1ee20e8a..666d3a0e 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/KVDataTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/KVDataTest.java @@ -13,8 +13,9 @@ import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.ledger.BytesValueImpl; import com.jd.blockchain.ledger.DataAccountKVSetOperation; import com.jd.blockchain.ledger.DataType; -import com.jd.blockchain.ledger.data.DataAccountKVSetOpTemplate; -import com.jd.blockchain.ledger.data.KVData; +import com.jd.blockchain.transaction.DataAccountKVSetOpTemplate; +import com.jd.blockchain.transaction.KVData; + import org.junit.Before; import org.junit.Test; diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxContentBlobTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxContentBlobTest.java index 20f0e8d0..6587db91 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxContentBlobTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxContentBlobTest.java @@ -20,8 +20,8 @@ import com.jd.blockchain.ledger.HashObject; import com.jd.blockchain.ledger.Operation; import com.jd.blockchain.ledger.TransactionContent; import com.jd.blockchain.ledger.TransactionContentBody; -import com.jd.blockchain.ledger.data.BlockchainOperationFactory; -import com.jd.blockchain.ledger.data.TxContentBlob; +import com.jd.blockchain.transaction.BlockchainOperationFactory; +import com.jd.blockchain.transaction.TxContentBlob; import com.jd.blockchain.utils.io.ByteArray; public class TxContentBlobTest { diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxRequestMessageTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxRequestMessageTest.java index 7434ec66..3c653d0e 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxRequestMessageTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxRequestMessageTest.java @@ -33,10 +33,10 @@ import com.jd.blockchain.ledger.NodeRequest; import com.jd.blockchain.ledger.Operation; import com.jd.blockchain.ledger.TransactionContent; import com.jd.blockchain.ledger.TransactionRequest; -import com.jd.blockchain.ledger.data.BlockchainOperationFactory; -import com.jd.blockchain.ledger.data.DigitalSignatureBlob; -import com.jd.blockchain.ledger.data.TxContentBlob; -import com.jd.blockchain.ledger.data.TxRequestMessage; +import com.jd.blockchain.transaction.BlockchainOperationFactory; +import com.jd.blockchain.transaction.DigitalSignatureBlob; +import com.jd.blockchain.transaction.TxContentBlob; +import com.jd.blockchain.transaction.TxRequestMessage; import com.jd.blockchain.utils.io.ByteArray; /** diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxResponseMessageTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxResponseMessageTest.java index 69f0dea0..f34b8eb3 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxResponseMessageTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxResponseMessageTest.java @@ -20,7 +20,7 @@ import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.crypto.HashFunction; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.TransactionState; -import com.jd.blockchain.ledger.data.TxResponseMessage; +import com.jd.blockchain.transaction.TxResponseMessage; /** * diff --git a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/UserRegisterOpTemplateTest.java b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/UserRegisterOpTemplateTest.java index 2d79c03d..36fea9a6 100644 --- a/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/UserRegisterOpTemplateTest.java +++ b/source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/UserRegisterOpTemplateTest.java @@ -22,7 +22,7 @@ import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.BlockchainIdentityData; import com.jd.blockchain.ledger.Operation; import com.jd.blockchain.ledger.UserRegisterOperation; -import com.jd.blockchain.ledger.data.UserRegisterOpTemplate; +import com.jd.blockchain.transaction.UserRegisterOpTemplate; /** * diff --git a/source/peer/src/main/java/com/jd/blockchain/peer/consensus/ConsensusMessageDispatcher.java b/source/peer/src/main/java/com/jd/blockchain/peer/consensus/ConsensusMessageDispatcher.java index 80e48bcc..17d862b1 100644 --- a/source/peer/src/main/java/com/jd/blockchain/peer/consensus/ConsensusMessageDispatcher.java +++ b/source/peer/src/main/java/com/jd/blockchain/peer/consensus/ConsensusMessageDispatcher.java @@ -5,10 +5,9 @@ import com.jd.blockchain.ledger.LedgerBlock; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.TransactionState; -import com.jd.blockchain.ledger.service.TransactionBatchProcess; -import com.jd.blockchain.ledger.service.TransactionBatchResultHandle; -import com.jd.blockchain.ledger.service.TransactionEngine; - +import com.jd.blockchain.service.TransactionBatchProcess; +import com.jd.blockchain.service.TransactionBatchResultHandle; +import com.jd.blockchain.service.TransactionEngine; import com.jd.blockchain.utils.codec.Base58Utils; import com.jd.blockchain.utils.concurrent.AsyncFuture; import com.jd.blockchain.utils.concurrent.CompletableAsyncFuture; diff --git a/source/peer/src/main/java/com/jd/blockchain/peer/ledger/LedgerConfigurer.java b/source/peer/src/main/java/com/jd/blockchain/peer/ledger/LedgerConfigurer.java index 289e16cf..5a2bc247 100644 --- a/source/peer/src/main/java/com/jd/blockchain/peer/ledger/LedgerConfigurer.java +++ b/source/peer/src/main/java/com/jd/blockchain/peer/ledger/LedgerConfigurer.java @@ -7,7 +7,7 @@ import com.jd.blockchain.ledger.core.impl.DefaultOperationHandleRegisteration; import com.jd.blockchain.ledger.core.impl.LedgerManager; import com.jd.blockchain.ledger.core.impl.OperationHandleRegisteration; import com.jd.blockchain.ledger.core.impl.TransactionEngineImpl; -import com.jd.blockchain.ledger.service.TransactionEngine; +import com.jd.blockchain.service.TransactionEngine; @Configuration public class LedgerConfigurer { diff --git a/source/peer/src/main/java/com/jd/blockchain/peer/web/LedgerQueryController.java b/source/peer/src/main/java/com/jd/blockchain/peer/web/LedgerQueryController.java index c061956a..196d5175 100644 --- a/source/peer/src/main/java/com/jd/blockchain/peer/web/LedgerQueryController.java +++ b/source/peer/src/main/java/com/jd/blockchain/peer/web/LedgerQueryController.java @@ -1,16 +1,37 @@ package com.jd.blockchain.peer.web; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + import com.jd.blockchain.binaryproto.BinaryEncodingUtils; import com.jd.blockchain.crypto.HashDigest; -import com.jd.blockchain.ledger.*; -import com.jd.blockchain.ledger.core.*; -import com.jd.blockchain.ledger.core.impl.LedgerQueryService; -import com.jd.blockchain.sdk.BlockchainQueryService; +import com.jd.blockchain.ledger.AccountHeader; +import com.jd.blockchain.ledger.BytesValue; +import com.jd.blockchain.ledger.KVDataEntry; +import com.jd.blockchain.ledger.KVDataObject; +import com.jd.blockchain.ledger.LedgerBlock; +import com.jd.blockchain.ledger.LedgerInfo; +import com.jd.blockchain.ledger.LedgerTransaction; +import com.jd.blockchain.ledger.ParticipantNode; +import com.jd.blockchain.ledger.TransactionState; +import com.jd.blockchain.ledger.UserInfo; +import com.jd.blockchain.ledger.core.ContractAccountSet; +import com.jd.blockchain.ledger.core.DataAccount; +import com.jd.blockchain.ledger.core.DataAccountSet; +import com.jd.blockchain.ledger.core.LedgerAdministration; +import com.jd.blockchain.ledger.core.LedgerRepository; +import com.jd.blockchain.ledger.core.LedgerService; +import com.jd.blockchain.ledger.core.ParticipantCertData; +import com.jd.blockchain.ledger.core.TransactionSet; +import com.jd.blockchain.ledger.core.UserAccountSet; +import com.jd.blockchain.transaction.BlockchainQueryService; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.QueryUtil; import com.jd.blockchain.utils.ValueType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; @RestController @RequestMapping(path = "/") diff --git a/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java b/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java index 0f0c3127..0e8c863e 100644 --- a/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java +++ b/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java @@ -38,11 +38,11 @@ import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.core.LedgerAdminAccount; import com.jd.blockchain.ledger.core.LedgerManage; import com.jd.blockchain.ledger.core.LedgerRepository; -import com.jd.blockchain.manage.GatewayIncomingSetting; -import com.jd.blockchain.manage.LedgerIncomingSetting; import com.jd.blockchain.peer.ConsensusRealm; import com.jd.blockchain.peer.LedgerBindingConfigAware; import com.jd.blockchain.peer.PeerManage; +import com.jd.blockchain.setting.GatewayIncomingSetting; +import com.jd.blockchain.setting.LedgerIncomingSetting; import com.jd.blockchain.storage.service.DbConnection; import com.jd.blockchain.storage.service.DbConnectionFactory; import com.jd.blockchain.tools.initializer.LedgerBindingConfig; diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainExtendQueryService.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainExtendQueryService.java index c05a0ab7..66c8b604 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainExtendQueryService.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainExtendQueryService.java @@ -10,6 +10,8 @@ package com.jd.blockchain.sdk; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.LedgerBlock; +import com.jd.blockchain.transaction.BlockchainQueryService; + import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainService.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainService.java index 13f78855..e24f8a80 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainService.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainService.java @@ -1,5 +1,7 @@ package com.jd.blockchain.sdk; +import com.jd.blockchain.transaction.BlockchainQueryService; + /** * 区块链服务； * diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/LedgerAccessContext.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/LedgerAccessContext.java index a8e8b74f..df1d2689 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/LedgerAccessContext.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/LedgerAccessContext.java @@ -2,7 +2,8 @@ package com.jd.blockchain.sdk; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.CryptoSetting; -import com.jd.blockchain.ledger.data.TransactionService; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.TransactionService; public interface LedgerAccessContext { diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/ManagementHttpService.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/ManagementHttpService.java index 5d35623f..f4bd68be 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/ManagementHttpService.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/ManagementHttpService.java @@ -1,10 +1,9 @@ package com.jd.blockchain.sdk; import com.jd.blockchain.consensus.ClientIdentifications; -import com.jd.blockchain.manage.GatewayIncomingSetting; - import com.jd.blockchain.sdk.converters.BinarySerializeRequestConverter; import com.jd.blockchain.sdk.converters.BinarySerializeResponseConverter; +import com.jd.blockchain.setting.GatewayIncomingSetting; import com.jd.blockchain.utils.http.HttpAction; import com.jd.blockchain.utils.http.HttpMethod; import com.jd.blockchain.utils.http.HttpService; diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/BinarySerializeRequestConverter.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/BinarySerializeRequestConverter.java index 92168134..2c89a42f 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/BinarySerializeRequestConverter.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/BinarySerializeRequestConverter.java @@ -11,7 +11,7 @@ package com.jd.blockchain.sdk.converters; import com.jd.blockchain.binaryproto.BinaryEncodingUtils; import com.jd.blockchain.consensus.ClientIdentifications; import com.jd.blockchain.ledger.TransactionRequest; -import com.jd.blockchain.ledger.data.TxRequestMessage; +import com.jd.blockchain.transaction.TxRequestMessage; import com.jd.blockchain.utils.http.RequestBodyConverter; import java.io.IOException; diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/BinarySerializeResponseConverter.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/BinarySerializeResponseConverter.java index 163bc33e..271c3315 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/BinarySerializeResponseConverter.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/BinarySerializeResponseConverter.java @@ -9,7 +9,7 @@ package com.jd.blockchain.sdk.converters; import com.jd.blockchain.binaryproto.BinaryEncodingUtils; -import com.jd.blockchain.ledger.data.TxResponseMessage; +import com.jd.blockchain.transaction.TxResponseMessage; import com.jd.blockchain.utils.http.HttpServiceContext; import com.jd.blockchain.utils.http.ResponseConverter; import com.jd.blockchain.utils.http.agent.ServiceRequest; diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/HashDigestsResponseConverter.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/HashDigestsResponseConverter.java index ec30787a..f647deb3 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/HashDigestsResponseConverter.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/HashDigestsResponseConverter.java @@ -7,7 +7,7 @@ import com.jd.blockchain.binaryproto.BinaryEncodingUtils; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.crypto.PubKey; import com.jd.blockchain.crypto.SignatureDigest; -import com.jd.blockchain.ledger.data.TxResponseMessage; +import com.jd.blockchain.transaction.TxResponseMessage; import com.jd.blockchain.utils.codec.Base58Utils; import com.jd.blockchain.utils.http.HttpServiceContext; import com.jd.blockchain.utils.http.ResponseConverter; diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/BlockchainServiceProxy.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/BlockchainServiceProxy.java index 081f5be8..da602b9b 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/BlockchainServiceProxy.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/BlockchainServiceProxy.java @@ -2,12 +2,12 @@ package com.jd.blockchain.sdk.proxy; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.*; -import com.jd.blockchain.ledger.data.TransactionService; -import com.jd.blockchain.ledger.data.TxTemplate; import com.jd.blockchain.sdk.BlockchainEventHandle; import com.jd.blockchain.sdk.BlockchainEventListener; -import com.jd.blockchain.sdk.BlockchainQueryService; import com.jd.blockchain.sdk.BlockchainService; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.TransactionService; +import com.jd.blockchain.transaction.TxTemplate; public abstract class BlockchainServiceProxy implements BlockchainService { diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/HttpBlockchainQueryService.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/HttpBlockchainQueryService.java index aa7188c6..19df6c9a 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/HttpBlockchainQueryService.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/HttpBlockchainQueryService.java @@ -3,9 +3,8 @@ package com.jd.blockchain.sdk.proxy; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.*; import com.jd.blockchain.sdk.BlockchainExtendQueryService; -import com.jd.blockchain.sdk.BlockchainQueryService; - import com.jd.blockchain.sdk.converters.HashDigestsResponseConverter; +import com.jd.blockchain.transaction.BlockchainQueryService; import com.jd.blockchain.utils.http.*; import com.jd.blockchain.utils.web.client.WebResponseConverterFactory; import com.jd.blockchain.sdk.converters.HashDigestToStringConverter; diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/ConsensusTransactionService.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/ConsensusTransactionService.java index 9ae5db3b..3fbc3a2d 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/ConsensusTransactionService.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/ConsensusTransactionService.java @@ -4,7 +4,7 @@ import com.jd.blockchain.consensus.ActionMessage; import com.jd.blockchain.consensus.OrderedAction; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; -import com.jd.blockchain.ledger.data.TransactionService; +import com.jd.blockchain.transaction.TransactionService; /** * 带共识的交易服务； diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/NodeSigningAppender.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/NodeSigningAppender.java index 8b4c3aad..ff667de4 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/NodeSigningAppender.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/NodeSigningAppender.java @@ -13,9 +13,9 @@ import com.jd.blockchain.crypto.SignatureFunction; import com.jd.blockchain.ledger.NodeRequest; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; -import com.jd.blockchain.ledger.data.DigitalSignatureBlob; -import com.jd.blockchain.ledger.data.TransactionService; -import com.jd.blockchain.ledger.data.TxRequestMessage; +import com.jd.blockchain.transaction.DigitalSignatureBlob; +import com.jd.blockchain.transaction.TransactionService; +import com.jd.blockchain.transaction.TxRequestMessage; import com.jd.blockchain.utils.concurrent.AsyncFuture; /** diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java index 56f0b12a..c3504185 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java @@ -7,11 +7,12 @@ import com.jd.blockchain.consensus.client.ConsensusClient; import com.jd.blockchain.crypto.AsymmetricKeypair; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.CryptoSetting; -import com.jd.blockchain.ledger.data.TransactionService; -import com.jd.blockchain.manage.GatewayIncomingSetting; -import com.jd.blockchain.manage.LedgerIncomingSetting; import com.jd.blockchain.sdk.*; import com.jd.blockchain.sdk.proxy.HttpBlockchainQueryService; +import com.jd.blockchain.setting.GatewayIncomingSetting; +import com.jd.blockchain.setting.LedgerIncomingSetting; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.TransactionService; import com.jd.blockchain.utils.http.agent.HttpServiceAgent; import com.jd.blockchain.utils.http.agent.ServiceConnection; import com.jd.blockchain.utils.http.agent.ServiceConnectionManager; diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerServiceProxy.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerServiceProxy.java index 4324ea79..535b45f5 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerServiceProxy.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerServiceProxy.java @@ -3,11 +3,11 @@ package com.jd.blockchain.sdk.service; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; -import com.jd.blockchain.ledger.data.TransactionService; import com.jd.blockchain.sdk.BlockchainException; -import com.jd.blockchain.sdk.BlockchainQueryService; import com.jd.blockchain.sdk.LedgerAccessContext; import com.jd.blockchain.sdk.proxy.BlockchainServiceProxy; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.TransactionService; import java.util.HashMap; import java.util.List; diff --git a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/Command.java b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/Command.java deleted file mode 100644 index 8b07376e..00000000 --- a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/Command.java +++ /dev/null @@ -1,100 +0,0 @@ -//package com.jd.blockchain.client; -// -//import java.util.HashMap; -//import java.util.Map; -// -//public class Command { -// -// private PeerClient peerClient; -// -// private Map executors; -// -// public Command(PeerClient peerClient) { -// this.peerClient = peerClient; -// this.executors = new HashMap<>(); -// executors.put("set", new SetCmd()); -// executors.put("get", new GetCmd()); -// executors.put("remove", new RemoveCmd()); -// executors.put("keys", new KeysCmd()); -// executors.put("contain", new ContainCmd()); -// } -// -// public void execute(String cmd) { -// String[] cmdArgs = cmd.split(" "); -// if (cmdArgs.length == 0) { -// System.out.println("Illegal input!!"); -// return; -// } -// -// String command = cmdArgs[0].trim(); -// String[] args = new String[cmdArgs.length - 1]; -// for (int i = 1; i < cmdArgs.length; i++) { -// args[i - 1] = cmdArgs[i].trim(); -// } -// -// CmdExecutor executor = executors.get(command); -// executor.execute(args); -// } -// -// private static interface CmdExecutor { -// -// public void execute(String[] args); -// -// } -// -// private class SetCmd implements CmdExecutor { -// @Override -// public void execute(String[] args) { -// if (args.length < 2) { -// System.out.println("SET command require 2 args!"); -// return; -// } -// String result = peerClient.set(args[0], args[1]); -// System.out.println("ok. --[" + result + "]"); -// } -// } -// -// private class GetCmd implements CmdExecutor { -// @Override -// public void execute(String[] args) { -// if (args.length < 1) { -// System.out.println("GET command require 1 args!"); -// return; -// } -// String result = peerClient.get(args[0]); -// System.out.println("ok. --[" + result + "]"); -// } -// } -// -// private class RemoveCmd implements CmdExecutor { -// @Override -// public void execute(String[] args) { -// if (args.length < 1) { -// System.out.println("REMOVE command require 1 args!"); -// return; -// } -// String result = peerClient.remove(args[0]); -// System.out.println("ok. --[" + result + "]"); -// } -// } -// -// private class KeysCmd implements CmdExecutor { -// @Override -// public void execute(String[] args) { -// String[] result = peerClient.getKeys(); -// System.out.println("ok. --[" + result + "]"); -// } -// } -// -// private class ContainCmd implements CmdExecutor { -// @Override -// public void execute(String[] args) { -// if (args.length < 1) { -// System.out.println("CONTAIN command require 1 args!"); -// return; -// } -// boolean result = peerClient.contain(args[0]); -// System.out.println("ok. --[" + result + "]"); -// } -// } -//} diff --git a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/PeerClient.java b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/PeerClient.java deleted file mode 100644 index bcc762e7..00000000 --- a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/PeerClient.java +++ /dev/null @@ -1,75 +0,0 @@ -//package com.jd.blockchain.client; -// -//import java.io.ByteArrayInputStream; -//import java.io.IOException; -//import java.io.ObjectInputStream; -// -//import com.jd.blockchain.ledger.Operation; -// -//import bftsmart.tom.AsynchServiceProxy; -// -//public class PeerClient { -// -// private AsynchServiceProxy peerProxy; -// -// public PeerClient(int clientId) { -// this.peerProxy = new AsynchServiceProxy(clientId); -// } -// -// public void close(){ -// peerProxy.close(); -// } -// -// public String set(String key, String value){ -// Operation.SetOP setOP = new Operation.SetOP(key, value); -// byte[] reply = peerProxy.invokeOrdered(setOP.toBytes()); -// -// return resolveResult(reply, String.class); -// } -// -// -// public String remove(String key){ -// Operation.RemoveOP removeOP = new Operation.RemoveOP(key); -// byte[] reply = peerProxy.invokeOrdered(removeOP.toBytes()); -// -// return resolveResult(reply, String.class); -// } -// -// public String get(String key){ -// Operation.GetOP getOP = new Operation.GetOP(key); -// byte[] reply = peerProxy.invokeUnordered(getOP.toBytes()); -// -// return resolveResult(reply, String.class); -// } -// -// public String[] getKeys(){ -// Operation.KeysOP keysOP = new Operation.KeysOP(); -// byte[] reply = peerProxy.invokeUnordered(keysOP.toBytes()); -// -// return resolveResult(reply, String[].class); -// } -// -// public boolean contain(String key){ -// Operation.ContainOP containOP = new Operation.ContainOP(key); -// byte[] reply = peerProxy.invokeUnordered(containOP.toBytes()); -// -// return resolveResult(reply, Boolean.class); -// } -// -// @SuppressWarnings("unchecked") -// public static T resolveResult(byte[] bytes, Class resultType){ -// if (bytes == null || bytes.length == 0) { -// return null; -// } -// try { -// ByteArrayInputStream bi = new ByteArrayInputStream(bytes); -// ObjectInputStream in = new ObjectInputStream(bi); -// Object op = in.readObject(); -// return (T) op; -// } catch (ClassNotFoundException e) { -// throw new IllegalStateException(e.getMessage(), e); -// } catch (IOException e) { -// throw new IllegalStateException(e.getMessage(), e); -// } -// } -//} diff --git a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/PeerClientDemo.java b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/PeerClientDemo.java deleted file mode 100644 index cad4ceb0..00000000 --- a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/client/PeerClientDemo.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.jd.blockchain.client; -// -//import java.io.Console; -// -//public class PeerClientDemo { -// -// public static void main(String[] args) { -// int clientId; -// if (args.length == 0) { -//// System.out.println("No client id !!!"); -//// return; -// clientId = 7; -// }else{ -// clientId = Integer.parseInt(args[0]); -// } -// -// PeerClient client = new PeerClient(clientId); -// Command cmd = new Command(client); -// System.out.println("---------------- Client["+clientId+"] started -----------------"); -// -// do { -// System.out.println(">>"); -// Console console = System.console(); -// String op = console.readLine(); -// if ("exit".equalsIgnoreCase(op)) { -// break; -// } -// cmd.execute(op); -// } while (true); -//// -// System.out.println("Client exist!"); -// client.close(); -// } -// -//} diff --git a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayBlockchainServiceProxy.java b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayBlockchainServiceProxy.java index b78dff08..940acbee 100644 --- a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayBlockchainServiceProxy.java +++ b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayBlockchainServiceProxy.java @@ -1,9 +1,9 @@ package com.jd.blockchain.sdk.client; import com.jd.blockchain.crypto.HashDigest; -import com.jd.blockchain.ledger.data.TransactionService; -import com.jd.blockchain.sdk.BlockchainQueryService; import com.jd.blockchain.sdk.proxy.BlockchainServiceProxy; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.TransactionService; public class GatewayBlockchainServiceProxy extends BlockchainServiceProxy { diff --git a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java index ba0d9eaa..0dd20872 100644 --- a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java +++ b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java @@ -12,13 +12,13 @@ import com.jd.blockchain.ledger.DigitalSignature; import com.jd.blockchain.ledger.TransactionContent; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; -import com.jd.blockchain.ledger.data.DigitalSignatureBlob; -import com.jd.blockchain.ledger.data.TransactionService; -import com.jd.blockchain.ledger.data.TxRequestMessage; -import com.jd.blockchain.sdk.BlockchainQueryService; import com.jd.blockchain.sdk.BlockchainService; import com.jd.blockchain.sdk.BlockchainServiceFactory; import com.jd.blockchain.sdk.proxy.HttpBlockchainQueryService; +import com.jd.blockchain.transaction.BlockchainQueryService; +import com.jd.blockchain.transaction.DigitalSignatureBlob; +import com.jd.blockchain.transaction.TransactionService; +import com.jd.blockchain.transaction.TxRequestMessage; import com.jd.blockchain.utils.http.agent.HttpServiceAgent; import com.jd.blockchain.utils.http.agent.ServiceConnection; import com.jd.blockchain.utils.http.agent.ServiceConnectionManager; diff --git a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/HttpConsensusService.java b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/HttpConsensusService.java index 69368504..9485436f 100644 --- a/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/HttpConsensusService.java +++ b/source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/HttpConsensusService.java @@ -2,9 +2,9 @@ package com.jd.blockchain.sdk.client; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; -import com.jd.blockchain.ledger.data.TransactionService; import com.jd.blockchain.sdk.converters.BinarySerializeRequestConverter; import com.jd.blockchain.sdk.converters.BinarySerializeResponseConverter; +import com.jd.blockchain.transaction.TransactionService; import com.jd.blockchain.utils.http.HttpAction; import com.jd.blockchain.utils.http.HttpMethod; import com.jd.blockchain.utils.http.HttpService; diff --git a/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/contract/samples/AssetContract.java b/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/contract/samples/AssetContract.java index 8b343649..a6b91415 100644 --- a/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/contract/samples/AssetContract.java +++ b/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/contract/samples/AssetContract.java @@ -1,7 +1,7 @@ package com.jd.blockchain.contract.samples; -import com.jd.blockchain.contract.model.Contract; -import com.jd.blockchain.contract.model.ContractEvent; +import com.jd.blockchain.contract.Contract; +import com.jd.blockchain.contract.ContractEvent; /** * 示例：一个“资产管理”智能合约； diff --git a/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/contract/samples/AssetContractImpl.java b/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/contract/samples/AssetContractImpl.java index 31e962a0..ab644986 100644 --- a/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/contract/samples/AssetContractImpl.java +++ b/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/contract/samples/AssetContractImpl.java @@ -4,9 +4,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.jd.blockchain.contract.model.ContractException; -import com.jd.blockchain.contract.model.ContractEventContext; -import com.jd.blockchain.contract.model.EventProcessingAwire; +import com.jd.blockchain.contract.ContractEventContext; +import com.jd.blockchain.contract.ContractException; +import com.jd.blockchain.contract.EventProcessingAwire; import com.jd.blockchain.crypto.HashDigest; import com.jd.blockchain.ledger.BlockchainIdentity; import com.jd.blockchain.ledger.KVDataEntry; diff --git a/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Contract.java b/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Contract.java index ef0753bd..f88e1cf9 100644 --- a/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Contract.java +++ b/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Contract.java @@ -1,5 +1,6 @@ package com.jd.blockchain.sdk.samples; +import com.jd.blockchain.contract.samples.AssetContract; import com.jd.blockchain.crypto.AsymmetricKeypair; import com.jd.blockchain.crypto.Crypto; import com.jd.blockchain.crypto.HashDigest; @@ -35,12 +36,6 @@ public class SDKDemo_Contract { new NetworkAddress("192.168.10.11", 8080), new NetworkAddress("192.168.10.12", 8080), new NetworkAddress("192.168.10.13", 8080) }; - // 网关客户端编号； - int gatewayId = 1001; - // 客户端的认证账户； - // String clientAddress = "kkjsafieweqEkadsfaslkdslkae998232jojf=="; - // String privKey = "safefsd32q34vdsvs"; - // 创建服务代理； final String GATEWAY_IP = "127.0.0.1"; final int GATEWAY_PORT = 80; @@ -72,15 +67,10 @@ public class SDKDemo_Contract { // 备注信息； Remark remark = new Remark(); String remarkJSON = JSONSerializeUtils.serializeToJSON(remark); + +// AssetContract assetContract = txTemp.contract("", AssetContract.class); +// txTemp.contractInvocation(assetContract.issue(amount, assetHolderAddress)) - // 合约代码的参数表； - ByteArray[] args = {}; - // 调用合约代码的分配操作； - // txTemp.deployContract().deploy(identity, appByteCodes); - - // todo args暂时无数据，尚未确定填入什么 - txTemp.contractEvents().send(commerceAccount, "trans-asset", null); -// txTemp.invokeContract().send(commerceAccount, "trans-asset", args); // -------------------------------------- // TX 准备就绪； diff --git a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java index c7dae27f..644bf609 100644 --- a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java +++ b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java @@ -30,9 +30,9 @@ import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.TransactionState; import com.jd.blockchain.ledger.TransactionTemplate; -import com.jd.blockchain.ledger.data.TxResponseMessage; import com.jd.blockchain.sdk.BlockchainTransactionService; import com.jd.blockchain.sdk.client.GatewayServiceFactory; +import com.jd.blockchain.transaction.TxResponseMessage; import com.jd.blockchain.utils.codec.Base58Utils; /** diff --git a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java index 4976b92b..7d343505 100644 --- a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java +++ b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java @@ -28,9 +28,9 @@ import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.TransactionState; import com.jd.blockchain.ledger.TransactionTemplate; -import com.jd.blockchain.ledger.data.TxResponseMessage; import com.jd.blockchain.sdk.BlockchainService; import com.jd.blockchain.sdk.client.GatewayServiceFactory; +import com.jd.blockchain.transaction.TxResponseMessage; /** * 插入数据测试 diff --git a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java index ccf6f333..07dba29f 100644 --- a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java +++ b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java @@ -30,9 +30,9 @@ import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.TransactionState; import com.jd.blockchain.ledger.TransactionTemplate; -import com.jd.blockchain.ledger.data.TxResponseMessage; import com.jd.blockchain.sdk.BlockchainTransactionService; import com.jd.blockchain.sdk.client.GatewayServiceFactory; +import com.jd.blockchain.transaction.TxResponseMessage; /** * 插入数据测试 diff --git a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java index 937b4604..a5343eb6 100644 --- a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java +++ b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java @@ -38,9 +38,9 @@ import com.jd.blockchain.ledger.TransactionContentBody; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.TransactionState; -import com.jd.blockchain.ledger.data.TxResponseMessage; import com.jd.blockchain.sdk.BlockchainService; import com.jd.blockchain.sdk.client.GatewayServiceFactory; +import com.jd.blockchain.transaction.TxResponseMessage; import com.jd.blockchain.utils.serialize.json.JSONSerializeUtils; /** diff --git a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java index 382466e9..65cce89b 100644 --- a/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java +++ b/source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java @@ -32,9 +32,9 @@ import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionResponse; import com.jd.blockchain.ledger.TransactionState; import com.jd.blockchain.ledger.TransactionTemplate; -import com.jd.blockchain.ledger.data.TxResponseMessage; import com.jd.blockchain.sdk.BlockchainService; import com.jd.blockchain.sdk.client.GatewayServiceFactory; +import com.jd.blockchain.transaction.TxResponseMessage; /** * 插入数据测试 diff --git a/source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java b/source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java index d2e13f49..ec035f22 100644 --- a/source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java +++ b/source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java @@ -38,8 +38,7 @@ import com.jd.blockchain.ledger.core.LedgerRepository; import com.jd.blockchain.ledger.core.impl.DefaultOperationHandleRegisteration; import com.jd.blockchain.ledger.core.impl.LedgerManager; import com.jd.blockchain.ledger.core.impl.TransactionBatchProcessor; -import com.jd.blockchain.ledger.data.TxBuilder; -import com.jd.blockchain.ledger.service.TransactionBatchResultHandle; +import com.jd.blockchain.service.TransactionBatchResultHandle; import com.jd.blockchain.storage.service.DbConnectionFactory; import com.jd.blockchain.storage.service.impl.redis.JedisConnection; import com.jd.blockchain.storage.service.impl.redis.RedisConnectionFactory; @@ -51,6 +50,7 @@ import com.jd.blockchain.tools.initializer.LedgerInitProperties; import com.jd.blockchain.tools.initializer.Prompter; import com.jd.blockchain.tools.initializer.web.LedgerInitConsensusService; import com.jd.blockchain.tools.keygen.KeyGenCommand; +import com.jd.blockchain.transaction.TxBuilder; import com.jd.blockchain.utils.ArgumentSet; import com.jd.blockchain.utils.ConsoleUtils; import com.jd.blockchain.utils.concurrent.ThreadInvoker.AsyncCallback; diff --git a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4SingleStepsTest.java b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4SingleStepsTest.java index 4c60f314..adac6a1a 100644 --- a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4SingleStepsTest.java +++ b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4SingleStepsTest.java @@ -29,7 +29,6 @@ import com.jd.blockchain.ledger.core.LedgerInitDecision; import com.jd.blockchain.ledger.core.LedgerInitPermission; import com.jd.blockchain.ledger.core.LedgerRepository; import com.jd.blockchain.ledger.core.impl.LedgerManager; -import com.jd.blockchain.ledger.data.TxRequestBuilder; import com.jd.blockchain.storage.service.DbConnection; import com.jd.blockchain.storage.service.impl.composite.CompositeConnectionFactory; import com.jd.blockchain.tools.initializer.DBConnectionConfig; @@ -42,6 +41,7 @@ import com.jd.blockchain.tools.initializer.web.HttpInitConsensServiceFactory; import com.jd.blockchain.tools.initializer.web.LedgerInitConsensusService; import com.jd.blockchain.tools.initializer.web.LedgerInitializeWebController; import com.jd.blockchain.tools.keygen.KeyGenCommand; +import com.jd.blockchain.transaction.TxRequestBuilder; import com.jd.blockchain.utils.concurrent.ThreadInvoker; import com.jd.blockchain.utils.concurrent.ThreadInvoker.AsyncCallback; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/ledger/LedgerBlockGeneratingTest.java b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/ledger/LedgerBlockGeneratingTest.java index 0be0fff4..c350f232 100644 --- a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/ledger/LedgerBlockGeneratingTest.java +++ b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/ledger/LedgerBlockGeneratingTest.java @@ -30,13 +30,13 @@ import com.jd.blockchain.ledger.core.LedgerRepository; import com.jd.blockchain.ledger.core.impl.DefaultOperationHandleRegisteration; import com.jd.blockchain.ledger.core.impl.LedgerManager; import com.jd.blockchain.ledger.core.impl.TransactionBatchProcessor; -import com.jd.blockchain.ledger.data.TxBuilder; -import com.jd.blockchain.ledger.service.TransactionBatchResultHandle; +import com.jd.blockchain.service.TransactionBatchResultHandle; import com.jd.blockchain.tools.initializer.DBConnectionConfig; import com.jd.blockchain.tools.initializer.LedgerInitProperties; import com.jd.blockchain.tools.initializer.Prompter; import com.jd.blockchain.tools.initializer.web.LedgerInitConsensusService; import com.jd.blockchain.tools.keygen.KeyGenCommand; +import com.jd.blockchain.transaction.TxBuilder; import com.jd.blockchain.utils.ConsoleUtils; import com.jd.blockchain.utils.concurrent.ThreadInvoker.AsyncCallback; import com.jd.blockchain.utils.io.FileUtils; diff --git a/source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/RemoteTransactionService.java b/source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/RemoteTransactionService.java index d498dddd..b9364e9c 100644 --- a/source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/RemoteTransactionService.java +++ b/source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/RemoteTransactionService.java @@ -28,7 +28,7 @@ import com.jd.blockchain.ledger.BlockchainKeyGenerator; import com.jd.blockchain.ledger.BlockchainKeypair; import com.jd.blockchain.ledger.TransactionRequest; import com.jd.blockchain.ledger.TransactionRequestBuilder; -import com.jd.blockchain.ledger.data.TxBuilder; +import com.jd.blockchain.transaction.TxBuilder; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.ConsoleUtils; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/LedgerInitializeWebController.java b/source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/LedgerInitializeWebController.java index 1bbf595f..42e1d5d6 100644 --- a/source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/LedgerInitializeWebController.java +++ b/source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/LedgerInitializeWebController.java @@ -45,10 +45,6 @@ import com.jd.blockchain.ledger.core.LedgerInitPermission; import com.jd.blockchain.ledger.core.LedgerInitPermissionData; import com.jd.blockchain.ledger.core.LedgerManage; import com.jd.blockchain.ledger.core.LedgerTransactionContext; -import com.jd.blockchain.ledger.data.DigitalSignatureBlob; -import com.jd.blockchain.ledger.data.LedgerInitSettingData; -import com.jd.blockchain.ledger.data.TxBuilder; -import com.jd.blockchain.ledger.data.TxRequestBuilder; import com.jd.blockchain.storage.service.DbConnection; import com.jd.blockchain.storage.service.DbConnectionFactory; import com.jd.blockchain.tools.initializer.DBConnectionConfig; @@ -57,6 +53,10 @@ import com.jd.blockchain.tools.initializer.LedgerInitException; import com.jd.blockchain.tools.initializer.LedgerInitProcess; import com.jd.blockchain.tools.initializer.LedgerInitProperties; import com.jd.blockchain.tools.initializer.LedgerInitProperties.ConsensusParticipantConfig; +import com.jd.blockchain.transaction.DigitalSignatureBlob; +import com.jd.blockchain.transaction.LedgerInitSettingData; +import com.jd.blockchain.transaction.TxBuilder; +import com.jd.blockchain.transaction.TxRequestBuilder; import com.jd.blockchain.tools.initializer.Prompter; import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.concurrent.InvocationResult;