96ca7b5b2d
Upgraded version to 1.2.0-SNAPSHOT;
6 years ago
93d6a87c53
Upgrade to 1.1.0.RELEASE;
6 years ago
03eb3c70ed
修改获取账本基本信息栈溢出异常
6 years ago
baf30547bd
Merge remote-tracking branch 'origin/develop' into feature/1.0.0-contract-check2.0-local
# Conflicts:
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainOperationFactory.java
6 years ago
76d0e4fcd1
Merge remote-tracking branch 'origin/develop' into feature/1.0.0-contract-check2.0-local
# Conflicts:
# source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java
# source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployExeUtil.java
# source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployMojo.java
# source/gateway/src/main/java/com/jd/blockchain/gateway/service/GatewayQueryServiceHandler.java
# source/gateway/src/main/java/com/jd/blockchain/gateway/web/TxProcessingController.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/AbstractContractEventHandle.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/AbtractContractEventSendOperationHandle.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/JVMContractEventSendOperationHandle.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/AbtractContractEventHandle.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractCodeDeployOperationHandle.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingHandle.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java
6 years ago
4b48e9a22b
Initial revision of the code merger
6 years ago
467e7b513b
Merge branch 'developold' into feature/regist_participant
# Conflicts:
# source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataset.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/DefaultOperationHandleRegisteration.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerManagerTest.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionSetTest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitProperties.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ClientOperator.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ConsensusParticipantData.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/Utils.java
# source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/SettingsInit.java
# source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java
6 years ago
ca7cfbbedc
Fixed some errors of test cases;
6 years ago
d66de9beb2
Merge branch 'develop' into feature/authorize
# Conflicts:
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitCommand.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitProperties.java
6 years ago
f7315d3271
Add security init settings to ledger init settings;
6 years ago
cd63d7612b
add regist participant code for feature
6 years ago
3542ca2ec2
Refactored LedgerRepository;
6 years ago
cab12e9083
Passed verification of the testcases for RolePrivilegeDataSet and UserRolesDataSet;
6 years ago
9641c82e93
Fixed compilation error and refactored the API of querying meta info of Ledger;
6 years ago
40d8a8ee20
add the xml parse;
6 years ago
66842c3c85
修正解析SDK返回应答问题
6 years ago
d5bb40541a
Merge branch 'master' into develop
# Conflicts:
# source/base/pom.xml
# source/binary-proto/pom.xml
# source/consensus/consensus-bftsmart/pom.xml
# source/consensus/consensus-framework/pom.xml
# source/consensus/consensus-mq/pom.xml
# source/consensus/pom.xml
# source/contract/contract-framework/pom.xml
# source/contract/contract-jvm/pom.xml
# source/contract/contract-maven-plugin/pom.xml
# source/contract/contract-samples/pom.xml
# source/contract/pom.xml
# source/crypto/crypto-adv/pom.xml
# source/crypto/crypto-classic/pom.xml
# source/crypto/crypto-framework/pom.xml
# source/crypto/crypto-pki/pom.xml
# source/crypto/crypto-sm/pom.xml
# source/crypto/pom.xml
# source/deployment/deployment-gateway/pom.xml
# source/deployment/deployment-peer/pom.xml
# source/deployment/pom.xml
# source/gateway/pom.xml
# source/ledger/ledger-core/pom.xml
# source/ledger/ledger-model/pom.xml
# source/ledger/ledger-rpc/pom.xml
# source/ledger/pom.xml
# source/peer/pom.xml
# source/pom.xml
# source/runtime/pom.xml
# source/runtime/runtime-context/pom.xml
# source/runtime/runtime-modular-booter/pom.xml
# source/runtime/runtime-modular/pom.xml
# source/sdk/pom.xml
# source/sdk/sdk-base/pom.xml
# source/sdk/sdk-client/pom.xml
# source/sdk/sdk-samples/pom.xml
# source/storage/pom.xml
# source/storage/storage-composite/pom.xml
# source/storage/storage-redis/pom.xml
# source/storage/storage-rocksdb/pom.xml
# source/storage/storage-service/pom.xml
# source/test/pom.xml
# source/test/test-consensus-client/pom.xml
# source/test/test-consensus-node/pom.xml
# source/test/test-integration/pom.xml
# source/test/test-ledger-core/pom.xml
# source/tools/pom.xml
# source/tools/tools-capability/pom.xml
# source/tools/tools-initializer-booter/pom.xml
# source/tools/tools-initializer/pom.xml
# source/tools/tools-keygen-booter/pom.xml
# source/tools/tools-keygen/pom.xml
# source/tools/tools-mocker/pom.xml
# source/utils/pom.xml
# source/utils/utils-common/pom.xml
# source/utils/utils-http/pom.xml
# source/utils/utils-serialize/pom.xml
# source/utils/utils-test/pom.xml
# source/utils/utils-web-server/pom.xml
# source/utils/utils-web/pom.xml
6 years ago
1d4d5d2982
upgraded version to 1.0.1.RELEASE;
6 years ago
be4b9cf8e6
Fix Endpoint's Sign and Node's Sign Error !
6 years ago
0d8cc2be3e
Merge branch 'release/1.0.0' into develop
# Conflicts:
# source/sdk/sdk-base/pom.xml
# source/storage/storage-redis/pom.xml
# source/storage/storage-service/pom.xml
6 years ago
2602fb7c96
clean the project；
fixed the bug: get 10+ results by /accounts/.../entries?fromIndex=10&count=10, no results in the seconds page;
delete the modules of stp/state-transfer/crypto-impl;
delete the dependency out the dependencyManagement
6 years ago
e33a21310c
Upgraded version to 1.1.0-SNAPSHOT
6 years ago
859a60d3af
Upgraded version to 1.0.0.RELEASE;
6 years ago
867c0f6911
Add Contract Code Show !
6 years ago
541d1b3c8c
Modify Operation return result resolver !!!
6 years ago
53554a9e03
Completed the cancellation of transaction template and prepared transaction ;
6 years ago
532fec678b
Fix getDataEntry results error!
6 years ago
d60c5d4cb1
Merge branch 'feature/authorize' into develop
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTestAll4Redis.java
6 years ago
7db6392a58
Adding Tool-Mocker module, which can be used for mocker test contract function !!!
6 years ago
5076b5ff7e
Completed marking the data type of the value of KV Entry;
6 years ago
376753b8d2
Modify the information returned by LedgerSetting, And Adjust Log Printing to LOGGER !
6 years ago
8046ea0897
The original version did not meet the needs of the business side, and adopted the JSON mode again.
6 years ago
6c7f5ada36
add new restful interface:
ledgers/{ledgerHash}/accounts/{address}/entries-version
test OK.
6 years ago
3545a75fa1
1. Modify integration test cases;
2. Adding browser to get Settings configuration interface;
3. Repairing BUG of BftSMART Consensus.
6 years ago
8e9f694801
Renamed;
6 years ago
4f60971f66
Refactor ledger model: rename packages;
6 years ago
a6ea1642e7
Renamed CryptoServiceProviders to Crypto for simplification purpose.
6 years ago
d52188ff57
Fixed bugs in test case LedgerBindingConfigTest .
6 years ago
047eecf054
Rename some of the types in crypto framework for more accurate expression.
6 years ago
eb28dc1ad3
Refactoring: change the type of the Algorithm property of class CryptoBytes to type “short”, and modify the relevant code that depends on this property;
6 years ago
215683ea98
Refactored packages in crypto framework;
6 years ago
7780fb64a4
Fixed compilation errors in sdk and ledger-model ;
6 years ago
d7c1e752c8
rebase crypto-spi;
6 years ago
a297d7d5d4
Update to version 0.9.0-SNAPSHOT;
6 years ago
43068a0281
Init the repository with the 0.8.3.RELEASE version of project;
6 years ago
huanghaiquan
shaozhuguang
zhangshuang
zhaoguangwei