 zhangshuang
|
be6d99ae3e
|
solve transactionengineimpl null pointer bug
|
6 years ago |
 shaozhuguang
|
48e0f09f74
|
增加线程阻塞，处理决定结果为NULL的问题
|
6 years ago |
|
shaozhuguang
|
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 |
|
shaozhuguang
|
e285cac39b
|
修改集成测试BUG
|
6 years ago |
 huanghaiquan
|
24f2f74cc2
|
Fixed compilation errors;
|
6 years ago |
|
huanghaiquan
|
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 |
|
huanghaiquan
|
d1e40a91fa
|
Completed authorization test case and refactored TransactionBatchProcessor;
|
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 |
|
shaozhuguang
|
e1b4240d51
|
修正合约编译插件BUG
|
6 years ago |
|
zhangshuang
|
0bcc74e15f
|
solve compile problem
|
6 years ago |
|
zhangshuang
|
299a5b3b52
|
the second revision of the code merger
|
6 years ago |
|
zhangshuang
|
4b48e9a22b
|
Initial revision of the code merger
|
6 years ago |
|
huanghaiquan
|
6954e4eea0
|
temp;
|
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
|
85021535a6
|
Added batch authorization API;
|
6 years ago |
|
huanghaiquan
|
d8be1b4666
|
Completed init security settings by ledger init properties file;
|
6 years ago |
|
huanghaiquan
|
a418cf05fa
|
Refactored the process of ledger init operation: uniquely processed by TransactionBatchProcessor;
|
6 years ago |
|
huanghaiquan
|
ae3af3ea72
|
Refactored LedgerDataset: extract readonly interface LedgerDataQuery;
|
6 years ago |
|
huanghaiquan
|
f713fbb397
|
Refactored;
|
6 years ago |
|
huanghaiquan
|
cd56b0812b
|
Refactored the codes of ledger initialization;
|
6 years ago |
|
huanghaiquan
|
bb1437c9ef
|
Fixed errors introduced from code merging;
|
6 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
|
6 years ago |
|
zhangshuang
|
c09f56b936
|
Merge branch 'develop' into feature/regist_participant
|
6 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
|
6 years ago |
|
huanghaiquan
|
3378c0321b
|
Upgrade version to 1.0.2.RELEASE;
|
6 years ago |
|
huanghaiquan
|
ef6c4049d2
|
Fixed bugs: (1)unsupported no-parameter contract function; (2) doesn't rollback when kv-writting version conflict occurs;
|
6 years ago |
|
huanghaiquan
|
47ac7af85d
|
Fixed bugs about contract invoking;
|
6 years ago |
|
zhangshuang
|
d88feabb77
|
modify participant state update bug
|
6 years ago |
|
zhangshuang
|
13d2218f29
|
modify participant state update interface bug
|
6 years ago |
|
huanghaiquan
|
e37c1fe05e
|
Configured logback as default logging framework;
|
6 years ago |
|
huanghaiquan
|
133a7a162a
|
Fixed compilation errors;
|
6 years ago |
|
huanghaiquan
|
9c45e48212
|
Complete the user-roles authorization API of SDK;
|
6 years ago |
|
huanghaiquan
|
642e532641
|
Completed the roles configuration API of SDK;
|
6 years ago |
|
zhangshuang
|
13ae4f71a8
|
add update participant state interface
|
6 years ago |
|
huanghaiquan
|
13bacf9f5a
|
Completed feature that setting roles in ledger's initialization configuration;
|
6 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
|
6 years ago |
|
huanghaiquan
|
f7315d3271
|
Add security init settings to ledger init settings;
|
6 years ago |
|
zhangshuang
|
712e273662
|
bug modify for regist participant
|
6 years ago |
|
huanghaiquan
|
d425e2cb26
|
Fixed compiling error;
|
6 years ago |
|
huanghaiquan
|
0ef87b5108
|
Refactored ;
|
6 years ago |
|
zhangshuang
|
cd63d7612b
|
add regist participant code for feature
|
6 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;
|
6 years ago |
|
huanghaiquan
|
d2885e5a37
|
Renamed test package of ledger-model;
|
6 years ago |
|
huanghaiquan
|
bf1a71c4a2
|
Implemented LedgerSecurityManager;
|
6 years ago |
|
huanghaiquan
|
9bc12aa570
|
Renamed packages of ledger-core;
|
6 years ago |
|
huanghaiquan
|
3542ca2ec2
|
Refactored LedgerRepository;
|
6 years ago |
|
huanghaiquan
|
21772b13b2
|
Renamed;
|
6 years ago |
|
huanghaiquan
|
fd4bd71ac2
|
rename;
|
6 years ago |
|
huanghaiquan
|
cab12e9083
|
Passed verification of the testcases for RolePrivilegeDataSet and UserRolesDataSet;
|
6 years ago |
