 huanghaiquan
|
d951e9ae00
|
Upgraded to version 1.1.2.RELEASE;
|
6 years ago |
|
huanghaiquan
|
1e6e125348
|
Upgrade version to 1.2.0-SNAPSHOT;
|
6 years ago |
|
huanghaiquan
|
e0f7145df8
|
Upgrade version to 1.1.1.RELEASE;
|
6 years ago |
 zhaoguangwei
|
41845551b5
|
show exeState in sdk;
|
6 years ago |
 zhangshuang
|
f2d34f56e8
|
solve pre compute null pointer bug
|
6 years ago |
|
huanghaiquan
|
96ca7b5b2d
|
Upgraded version to 1.2.0-SNAPSHOT;
|
6 years ago |
|
huanghaiquan
|
93d6a87c53
|
Upgrade to 1.1.0.RELEASE;
|
6 years ago |
|
zhangshuang
|
7843638f65
|
Merge branch 'develop' into feature/ledger_Bifurcation
# Conflicts:
# source/contract/contract-samples/pom.xml
# source/pom.xml
|
6 years ago |
|
zhangshuang
|
1f9cdb043b
|
modify naming
|
6 years ago |
 shaozhuguang
|
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 |
|
shaozhuguang
|
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 |
|
huanghaiquan
|
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 |
|
huanghaiquan
|
cd56b0812b
|
Refactored the codes of ledger initialization;
|
6 years ago |
|
zhangshuang
|
712e273662
|
bug modify for regist participant
|
6 years ago |
|
zhangshuang
|
cd63d7612b
|
add regist participant code for feature
|
6 years ago |
|
zhangshuang
|
f60c63e20b
|
solve ledger inconsistency problem
|
6 years ago |
|
huanghaiquan
|
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 |
|
huanghaiquan
|
1d4d5d2982
|
upgraded version to 1.0.1.RELEASE;
|
6 years ago |
|
shaozhuguang
|
bd4537bba1
|
modify bftsmart-server's default host to 0.0.0.0
|
6 years ago |
|
huanghaiquan
|
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 |
|
huanghaiquan
|
884ae3d153
|
Merge branch 'test' into release/1.0.0
# Conflicts:
# source/pom.xml
# source/storage/storage-service/src/test/java/test/com/jd/blockchain/storage/service/utils/BufferedKVStorageTest.java
|
6 years ago |
|
huanghaiquan
|
c727a35626
|
Implemented transaction rollback mechanism；
|
6 years ago |
|
shaozhuguang
|
6f13f26917
|
修改BFTSMART服务节点关联网卡启动异常的问题
|
6 years ago |
|
shaozhuguang
|
d1bbc6ec22
|
增加合约验证
|
6 years ago |
|
huanghaiquan
|
a5bb09c00e
|
Merge branch 'release/1.0.0' into develop
|
6 years ago |
|
shaozhuguang
|
f73a2280d9
|
Delete the public key part involved in the bftsmart file ！
|
6 years ago |
|
huanghaiquan
|
e33a21310c
|
Upgraded version to 1.1.0-SNAPSHOT
|
6 years ago |
|
huanghaiquan
|
859a60d3af
|
Upgraded version to 1.0.0.RELEASE;
|
6 years ago |
 zhanglin33
|
d44f97a646
|
Merge commit '173e4ba768cf66291320aabcf07d5f2fee9cce7a' into feature/crypto-spi
# Conflicts:
# source/pom.xml
|
6 years ago |
|
shaozhuguang
|
3545a75fa1
|
1. Modify integration test cases;
2. Adding browser to get Settings configuration interface;
3. Repairing BUG of BftSMART Consensus.
|
6 years ago |
|
zhanglin33
|
a99cf692e9
|
Merge commit '8e9f6948011d6b1bbc6c8e8da2dff4e7aba18fff' into feature/crypto-spi
|
6 years ago |
|
zhanglin33
|
02e82103a3
|
Merge commit '9a6a9e4fd166faa80b4f918bde7dffdfb2ec6796' into feature/crypto-spi
|
6 years ago |
|
huanghaiquan
|
8e9f694801
|
Renamed;
|
6 years ago |
|
huanghaiquan
|
4bc5dbf36e
|
Renamed some base types in binary-proto;
|
6 years ago |
|
huanghaiquan
|
f88ef08fc2
|
Moved ValueType from utils-common project to binary-proto project
|
6 years ago |
|
shaozhuguang
|
6e8130c30a
|
Fix BftsmartMessageService throw Exception...
|
6 years ago |
|
huanghaiquan
|
a6ea1642e7
|
Renamed CryptoServiceProviders to Crypto for simplification purpose.
|
6 years ago |
|
huanghaiquan
|
1f6fd9e604
|
Rename some of the types in crypto framework for more accurate expression.
|
6 years ago |
|
huanghaiquan
|
047eecf054
|
Rename some of the types in crypto framework for more accurate expression.
|
6 years ago |
|
huanghaiquan
|
215683ea98
|
Refactored packages in crypto framework;
|
6 years ago |
|
huanghaiquan
|
f2643f05f7
|
Fixed compilation errors due to refactoring crypto-framework;
|
6 years ago |
|
huanghaiquan
|
d7c1e752c8
|
rebase crypto-spi;
|
6 years ago |
|
huanghaiquan
|
a297d7d5d4
|
Update to version 0.9.0-SNAPSHOT;
|
6 years ago |
|
huanghaiquan
|
43068a0281
|
Init the repository with the 0.8.3.RELEASE version of project;
|
6 years ago |
