huanghaiquan
|
d8be1b4666
|
Completed init security settings by ledger init properties file;
|
5 years ago |
huanghaiquan
|
a418cf05fa
|
Refactored the process of ledger init operation: uniquely processed by TransactionBatchProcessor;
|
5 years ago |
huanghaiquan
|
ae3af3ea72
|
Refactored LedgerDataset: extract readonly interface LedgerDataQuery;
|
5 years ago |
huanghaiquan
|
f713fbb397
|
Refactored;
|
5 years ago |
huanghaiquan
|
cd56b0812b
|
Refactored the codes of ledger initialization;
|
5 years ago |
huanghaiquan
|
bb1437c9ef
|
Fixed errors introduced from code merging;
|
5 years ago |
huanghaiquan
|
a41662da0d
|
Merge branch 'develop' into feature/authorize
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/DataAccountKVSetOperationHandle.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/TransactionBatchProcessorTest.java
# source/test/test-integration/src/test/resources/ledger_init_test.init
# source/tools/tools-initializer/src/test/resources/ledger-binding.conf
|
5 years ago |
huanghaiquan
|
03284140d3
|
Fixed errors of ledger initialization test cases;
|
5 years ago |
huanghaiquan
|
9cdb13c628
|
Fixed errors of ledger binding test cases;
|
5 years ago |
huanghaiquan
|
dc44c373fd
|
Merge commit '81c52e4750fb636479ff7732f69fede2586ae918' into develop
|
5 years ago |
huanghaiquan
|
8f09b044b4
|
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
|
5 years ago |
huanghaiquan
|
3378c0321b
|
Upgrade version to 1.0.2.RELEASE;
|
5 years ago |
huanghaiquan
|
ef6c4049d2
|
Fixed bugs: (1)unsupported no-parameter contract function; (2) doesn't rollback when kv-writting version conflict occurs;
|
5 years ago |
huanghaiquan
|
47ac7af85d
|
Fixed bugs about contract invoking;
|
5 years ago |
huanghaiquan
|
e37c1fe05e
|
Configured logback as default logging framework;
|
5 years ago |
huanghaiquan
|
133a7a162a
|
Fixed compilation errors;
|
5 years ago |
huanghaiquan
|
9c45e48212
|
Complete the user-roles authorization API of SDK;
|
5 years ago |
huanghaiquan
|
642e532641
|
Completed the roles configuration API of SDK;
|
5 years ago |
huanghaiquan
|
13bacf9f5a
|
Completed feature that setting roles in ledger's initialization configuration;
|
5 years ago |
zhanglin33
|
81c52e4750
|
replace invoked curves api in both ecdsa and sm2, and modify junit tests in crypto-pki
|
5 years ago |
huanghaiquan
|
ca7cfbbedc
|
Fixed some errors of test cases;
|
5 years ago |
huanghaiquan
|
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
|
5 years ago |
huanghaiquan
|
f7315d3271
|
Add security init settings to ledger init settings;
|
5 years ago |
huanghaiquan
|
d425e2cb26
|
Fixed compiling error;
|
5 years ago |
huanghaiquan
|
b478519d5c
|
Merge commit '0266ba1fbc1efe83f67538715ab8206c9cec5e69' into develop
# Conflicts:
# source/utils/utils-http/pom.xml
|
5 years ago |
huanghaiquan
|
767fb10498
|
Merge branch 'master' into develop
|
5 years ago |
huanghaiquan
|
8142c6aaac
|
Update readme;
|
5 years ago |
huanghaiquan
|
f32514274f
|
Merge commit '266f8e81adcc7a89b3a4871f1ae41ed576cf6ba5' into develop
# Conflicts:
# README.md
# source/tools/tools-initializer/src/test/java/test/com/jd/blockchain/tools/initializer/LedgerInitPropertiesTest.java
|
5 years ago |
huanghaiquan
|
4a17340506
|
Merge branch 'master' into develop
# Conflicts:
# source/tools/tools-initializer/src/test/java/test/com/jd/blockchain/tools/initializer/LedgerInitPropertiesTest.java
|
5 years ago |
huanghaiquan
|
2d9af2231e
|
Updated readme;
|
5 years ago |
huanghaiquan
|
8c682d2a65
|
Merge branch 'bugf'
# Conflicts:
# .travis.yml
# README.md
|
5 years ago |
huanghaiquan
|
f30f5b3f8f
|
Merge branch 'release/1.0.1'
# Conflicts:
# README.md
|
5 years ago |
huanghaiquan
|
82c2233fed
|
Upgraded readme;
|
5 years ago |
huanghaiquan
|
0ef87b5108
|
Refactored ;
|
5 years ago |
huanghaiquan
|
1081229733
|
Fixed the bug that: when the LedgerPrivilege or TransactionPrivilege property of Privileges is not configured, this property is null after deserialization recover this Privileges instance;
|
5 years ago |
huanghaiquan
|
d2885e5a37
|
Renamed test package of ledger-model;
|
5 years ago |
huanghaiquan
|
bf1a71c4a2
|
Implemented LedgerSecurityManager;
|
5 years ago |
huanghaiquan
|
9bc12aa570
|
Renamed packages of ledger-core;
|
5 years ago |
huanghaiquan
|
3542ca2ec2
|
Refactored LedgerRepository;
|
5 years ago |
huanghaiquan
|
21772b13b2
|
Renamed;
|
5 years ago |
huanghaiquan
|
fd4bd71ac2
|
rename;
|
5 years ago |
huanghaiquan
|
cab12e9083
|
Passed verification of the testcases for RolePrivilegeDataSet and UserRolesDataSet;
|
5 years ago |
huanghaiquan
|
7bc81950f2
|
Completed user-role authorization model;
|
5 years ago |
huanghaiquan
|
89bd2d87af
|
Completed dataset definitions about roles and user-roles assignment;
|
5 years ago |
huanghaiquan
|
104ef612ec
|
Merge commit '963debbc9637ac704994e1cf8ab98b4f8bfcfad8' into develop
|
5 years ago |
zhangshuang
|
963debbc96
|
solve miss property problem
|
5 years ago |
shaozhuguang
|
ffd5b71e47
|
屏蔽ump编译
|
5 years ago |
shaozhuguang
|
ce1e79b88d
|
增加部分注释
|
5 years ago |
huanghaiquan
|
c4ac70efa8
|
Fixed the bug that : the global standard time zone was not set and time parsing error occurred while running on a different time zone setting server.
|
5 years ago |
huanghaiquan
|
9641c82e93
|
Fixed compilation error and refactored the API of querying meta info of Ledger;
|
5 years ago |