96ca7b5b2d
Upgraded version to 1.2.0-SNAPSHOT;
6 years ago
93d6a87c53
Upgrade to 1.1.0.RELEASE;
6 years ago
588ecc545a
Merge remote-tracking branch 'origin/develop' into feature/admin1-local
6 years ago
ab3b35632a
Add log4j2.xml configuration file in integrated test environment
6 years ago
4638569206
add the ledger.init for permission manager;
6 years ago
e1325a3e40
Merge remote-tracking branch 'origin/develop' into feature/admin1-local
6 years ago
00e07f79ec
Refactored ledger core;
6 years ago
a44e6f7743
Merge remote-tracking branch 'origin/develop' into feature/admin1-local
# Conflicts:
# source/deployment/deployment-peer/src/main/resources/scripts/startup.sh
# source/gateway/src/main/java/com/jd/blockchain/gateway/web/BlockBrowserController.java
6 years ago
db2c88c50c
Merge remote-tracking branch 'origin/develop' into feature/1.0.0-contract-check2.0-local
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ContractCodeDeployOperationHandle.java
# source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java
6 years ago
e285cac39b
修改集成测试BUG
6 years ago
24f2f74cc2
Fixed compilation errors;
6 years ago
a5ee1a10d2
Merge commit '0bcc74e15f5639d31c81e08285ade3df7f76bd71' into develop
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DefaultOperationHandleRegisteration.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitProperties.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/IntegrationTest4Bftsmart.java
6 years ago
d1e40a91fa
Completed authorization test case and refactored TransactionBatchProcessor;
6 years ago
299a5b3b52
the second revision of the code merger
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
85021535a6
Added batch authorization API;
6 years ago
d8be1b4666
Completed init security settings by ledger init properties file;
6 years ago
a418cf05fa
Refactored the process of ledger init operation: uniquely processed by TransactionBatchProcessor;
6 years ago
ae3af3ea72
Refactored LedgerDataset: extract readonly interface LedgerDataQuery;
6 years ago
cd56b0812b
Refactored the codes of ledger initialization;
6 years ago
c09f56b936
Merge branch 'develop' into feature/regist_participant
6 years ago
03284140d3
Fixed errors of ledger initialization test cases;
6 years ago
51c6530338
modify participant state update bug
6 years ago
d88feabb77
modify participant state update bug
6 years ago
13d2218f29
modify participant state update interface bug
6 years ago
e37c1fe05e
Configured logback as default logging framework;
6 years ago
3c26584a9f
print bug
6 years ago
13ae4f71a8
add update participant state interface
6 years ago
13bacf9f5a
Completed feature that setting roles in ledger's initialization configuration;
6 years ago
b848e92d0c
delete error pubkey
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
bd59999f83
solve pubkey bug
6 years ago
712e273662
bug modify for regist participant
6 years ago
d425e2cb26
Fixed compiling error;
6 years ago
cd63d7612b
add regist participant code for feature
6 years ago
9bc12aa570
Renamed packages of ledger-core;
6 years ago
3542ca2ec2
Refactored LedgerRepository;
6 years ago
cab12e9083
Passed verification of the testcases for RolePrivilegeDataSet and UserRolesDataSet;
6 years ago
63349a6af8
穿透式检索放置网关controller
6 years ago
963debbc96
solve miss property problem
6 years ago
f36ef575d8
删除临时合约文件
6 years ago
d201c568de
修正日志打印的问题
6 years ago
009f86dab3
Completed the definition of role privilege, and dealed some naming conflicts;
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
huanghaiquan
shaozhuguang
zhaoguangwei
zhangshuang