huanghaiquan
|
358445bdb1
|
Fixed a bug of the build scripts: don't terminate the build when error occurs.
|
5 years ago |
huanghaiquan
|
4cd6c4aac9
|
Merge branch 'feature/module-refactor' into develop
# Conflicts:
# project/dependencies/pom.xml
# test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java
|
5 years ago |
huanghaiquan
|
edae44557a
|
Completed the building shell scripts;
|
5 years ago |
huanghaiquan
|
a89bb9de86
|
Fixed compilation errors of test and samples projects;
|
5 years ago |
huanghaiquan
|
c223ef7295
|
Fixed compilation errors of samples;
|
5 years ago |
huanghaiquan
|
8631186704
|
Added dependent submodules;
|
5 years ago |
huanghaiquan
|
6f11b07939
|
Fixed compilation errors;
|
5 years ago |
huanghaiquan
|
6225e45b6c
|
Fixed compilation errors of framework;
|
5 years ago |
huanghaiquan
|
9cb2876590
|
Reactored core modules;
|
5 years ago |
huanghaiquan
|
cf9cb66add
|
Merge branch 'release/1.1.2.RELEASE'
|
5 years ago |
huanghaiquan
|
bf35bb16e5
|
Merge tag '1.1.2.RELEASE' into develop
1.1.2
|
5 years ago |
huanghaiquan
|
ccdab653b8
|
Refactored directories of framework projects;
|
5 years ago |
zhangshuang
|
b35a8b1997
|
Merge branch 'develop' into release/1.1.2.RELEASE
|
5 years ago |
zhangshuang
|
e622a7b247
|
when most of block hash is inconsistent, less than Quorum consistent responses, will return null response
|
5 years ago |
zhaoguangwei
|
01ec5b0961
|
penetration search set the default url:127.0.0.1;
|
5 years ago |
zhaoguangwei
|
da2756d1d1
|
penetration search set the default url:127.0.0.1;
|
5 years ago |
zhaoguangwei
|
80eab59bd8
|
penetration search set the default url:127.0.0.1;
|
5 years ago |
huanghaiquan
|
a1e42cab70
|
Merge commit '30babb99babf6e6d79358aa0965b555e6897a02b' into release/1.1.2.RELEASE
|
5 years ago |
huanghaiquan
|
6f714ee18f
|
Merge branch 'consistence' into release/1.1.2.RELEASE
# Conflicts:
# source/pom.xml
|
5 years ago |
zhaoguangwei
|
30babb99ba
|
delete the Unnecessary content:
<lineEnding>unix</lineEnding>
|
5 years ago |
zhangshuang
|
cb670cf329
|
Merge branch 'develop' into hotfix/JDCHAIN-219-DataVersionConflictException
|
5 years ago |
zhangshuang
|
0255ff9a45
|
solve block rollback
|
5 years ago |
zhaoguangwei
|
2d16188e44
|
add the interface: 6.9 /ledgers/{ledger}/accounts/address/{address}/keys/count/search?keyword={keyword}
6.10 /ledgers/{ledger}/accounts/address/{address}/keys/search?keyword={keyword}&fromIndex={start_index}&count={count}
|
5 years ago |
zhaoguangwei
|
69b013c75b
|
add the interface: 6.8 /ledgers/{ledger}/accounts/{address}/entries-version
|
5 years ago |
zhaoguangwei
|
00a02efc95
|
add the param: jdchain.log
|
5 years ago |
zhaoguangwei
|
cc531006d7
|
add the param: jdchain.log;
|
5 years ago |
huanghaiquan
|
43977bb96a
|
Refactored directories;
|
5 years ago |
zhaoguangwei
|
46c63a021f
|
not use the oss-parent node in the central library publishing. fill some info related in the proifle and distributionManagement node;
|
5 years ago |
zhaoguangwei
|
8cee2ee38e
|
not use the oss-parent node in the central library publishing. fill some info related in the proifle and distributionManagement node;
|
5 years ago |
zhaoguangwei
|
e6604b489f
|
add lineEnding:<lineEnding>unix</lineEnding>
|
5 years ago |
zhaoguangwei
|
d32ac90e78
|
add lineEnding:<lineEnding>unix</lineEnding>
|
5 years ago |
zhangshuang
|
e303674394
|
add integrate test
|
5 years ago |
huanghaiquan
|
a209408047
|
Updated dependencies of data-explorer and manager-explorer;
|
5 years ago |
huanghaiquan
|
d951e9ae00
|
Upgraded to version 1.1.2.RELEASE;
|
5 years ago |
huanghaiquan
|
0b961a2dec
|
Merge tag 'modiftyTransactionState' into develop
1.1.1-PACK20191209
# 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/manager/manager-booter/pom.xml
# source/manager/manager-model/pom.xml
# source/manager/manager-service/pom.xml
# source/manager/manager-web/pom.xml
# source/manager/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/pom.xml
# source/tools/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/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
|
5 years ago |
huanghaiquan
|
90c8af1db5
|
Merge branch 'hotfix/modiftyTransactionState'
|
5 years ago |
huanghaiquan
|
dbf3f05c37
|
Upgraded version to 1.1.1-PACK20191209
|
5 years ago |
huanghaiquan
|
8062f79401
|
Added comment;
|
5 years ago |
zhaoguangwei
|
0b12e8f424
|
modify transaction state, PARTICIPANT_DOES_NOT_EXIST -> 06
|
5 years ago |
zhangshuang
|
5ecaed0c44
|
Merge branch 'develop' into hotfix/JDCHAIN-219-DataVersionConflictException
|
5 years ago |
zhangshuang
|
3765e9edb7
|
Merge branch 'develop' into hotfix/JDCHAIN-219-DataVersionConflictException
# Conflicts:
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionBatchProcessorTest.java
|
5 years ago |
zhangshuang
|
7469f5802d
|
modify block rollback
|
5 years ago |
huanghaiquan
|
7e0fb1bdb4
|
Merge branch 'hotfix/JDCHAIN-223-windows-compile-error' into develop
|
5 years ago |
zhaoguangwei
|
8373af724e
|
add the info in the pom.xml: generate sha-256 check file.
|
5 years ago |
liuyuanmu
|
97200f75ac
|
add test for rocketdb URI_PATTER
|
5 years ago |
liuyuanmu
|
58918bffb4
|
source/fix rocksdb compile error in windows
|
5 years ago |
zhangshuang
|
96bac609ba
|
modify test example by mockito spy
|
5 years ago |
zhangshuang
|
53bb8e6f08
|
solve block rollback exception
|
5 years ago |
zhangshuang
|
21d8f25030
|
add mockito test for block rollback
|
5 years ago |
zhangshuang
|
85ac5d2336
|
solve transaction and block rollback exception!
|
5 years ago |