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 |
liuyuanmu
|
a258a8693f
|
fix DataVersionConflictException bug
|
5 years ago |
zhaoguangwei
|
d5e4262ada
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
zhaoguangwei
|
9d64b9d589
|
optimize the shell to check the exist process;
use: valueObj.getJSONObject("bytes").getString("value");in the ClientResolveUtil.java。
|
5 years ago |
liuyuanmu
|
b3961cdcc5
|
add test for rocketdb URI_PATTER
|
5 years ago |
huanghaiquan
|
d9666729ea
|
Merge commit '2b2831fdd94b24b60038952e3d0042485a4cc238' into develop
|
5 years ago |
huanghaiquan
|
263d1e8b8b
|
Completed test case about compatibility of Merkle DataNode bytes sequence encoding;
|
5 years ago |
huanghaiquan
|
dd9279379d
|
Completed upgradable encoder for Merkle DataNode bytes sequence;
|
5 years ago |
zhaoguangwei
|
2b2831fdd9
|
use revertAccountHeader method in controller;
fix bug: PUBLIC_KEY_SUFFIX = ".pub";
modify the default value,cons_parti.0.consensus.secure=false
|
5 years ago |
liuyuanmu
|
2cedf78bac
|
source/fix rocksdb compile error in windows
|
5 years ago |
huanghaiquan
|
893be96105
|
Refactored Encoding of MerkleTree data node;
|
5 years ago |
huanghaiquan
|
ae5d7d071d
|
Refactored HashFunction;
|
5 years ago |
huanghaiquan
|
f511680da2
|
Fixed compilation errors;
|
5 years ago |
huanghaiquan
|
1e6e125348
|
Upgrade version to 1.2.0-SNAPSHOT;
|
5 years ago |
huanghaiquan
|
5a07802f08
|
Merge branch 'master' into develop
|
5 years ago |
huanghaiquan
|
863085b923
|
Merge branch 'release/1.1.1'
|
5 years ago |
huanghaiquan
|
e0f7145df8
|
Upgrade version to 1.1.1.RELEASE;
|
5 years ago |
huanghaiquan
|
948c82d09a
|
Merge branch 'release/1.1.1' into develop
|
5 years ago |
huanghaiquan
|
e5212ba973
|
Upgrade dependency version of bft-smart;
|
5 years ago |
huanghaiquan
|
edce1888e9
|
Merge branch 'release/1.1.1' into develop
|
5 years ago |
huanghaiquan
|
b9059c9578
|
Merge branch 'feature/API2' into develop
|
5 years ago |
huanghaiquan
|
6421962302
|
Merge commit '9f8020eebe9b6418f6e7bb860201bfe26f30fd6e' into develop
|
5 years ago |
huanghaiquan
|
4c5c61e764
|
Fixed errors of test cases;
|
5 years ago |
huanghaiquan
|
4aedf9c4b5
|
Refactored MerkleAccountSet to prevent calls to Account with Transactional interface;
|
5 years ago |
zhaoguangwei
|
9f8020eebe
|
maven-deploy-plugin skip;
|
5 years ago |
zhaoguangwei
|
f74e267587
|
maven-deploy-plugin skip;
|
5 years ago |
zhaoguangwei
|
e0eec5339d
|
initBlacks() use the "/", not the Files.Separator;
|
5 years ago |