 shaozhuguang
|
d20f5d9a8f
|
增加安全控制接口
|
5 years ago |
|
shaozhuguang
|
5f0a7ba094
|
增加部分未注册的序列化接口
|
5 years ago |
|
shaozhuguang
|
6d5a5465b8
|
增加部分常量
|
5 years ago |
|
shaozhuguang
|
5d272d3337
|
Merge remote-tracking branch 'origin/develop' into feature/admin1-local
|
5 years ago |
|
shaozhuguang
|
ae87c7a35f
|
修改LedgerAdminInfoData构造方式
|
5 years ago |
|
shaozhuguang
|
c849affc4f
|
修改Gateway对应配置文件路径及LedgerSettings注册
|
5 years ago |
|
shaozhuguang
|
f1cb118dc5
|
修改LedgerAdminInfoData包装类型
|
5 years ago |
|
shaozhuguang
|
03eb3c70ed
|
修改获取账本基本信息栈溢出异常
|
5 years ago |
 huanghaiquan
|
539f9e9a07
|
Fixed bugs that no explicit exception when data contract encoder is not found;
|
5 years ago |
|
huanghaiquan
|
ab0978146e
|
Updated default init configuration template;
|
5 years ago |
|
huanghaiquan
|
e2126851fa
|
Refactor LedgerAdminInfo as a binary serializable Object;
|
5 years ago |
 zhaoguangwei
|
536cfdf443
|
should use: partiConf.getAddress().toBase58()
|
5 years ago |
|
shaozhuguang
|
5e7546e103
|
修改管理工具编译错误
|
5 years ago |
|
shaozhuguang
|
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
|
5 years ago |
|
shaozhuguang
|
05940518a0
|
修改部分异常代码
|
5 years ago |
|
shaozhuguang
|
3deb0effb3
|
修改账本提交异常
|
5 years ago |
 zhangshuang
|
be6d99ae3e
|
solve transactionengineimpl null pointer bug
|
5 years ago |
|
shaozhuguang
|
48e0f09f74
|
增加线程阻塞，处理决定结果为NULL的问题
|
5 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
|
5 years ago |
|
shaozhuguang
|
e285cac39b
|
修改集成测试BUG
|
5 years ago |
|
shaozhuguang
|
31071068c0
|
修改日志打印模块
|
5 years ago |
|
huanghaiquan
|
24f2f74cc2
|
Fixed compilation errors;
|
5 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
|
5 years ago |
|
shaozhuguang
|
9e0a07df22
|
将性能模块移除
|
5 years ago |
|
huanghaiquan
|
d1e40a91fa
|
Completed authorization test case and refactored TransactionBatchProcessor;
|
5 years ago |
|
shaozhuguang
|
040bbabe6b
|
修改fastjson版本为1.2.60
|
5 years ago |
|
shaozhuguang
|
1722db01fd
|
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
|
5 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
|
5 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
|
5 years ago |
|
shaozhuguang
|
e1b4240d51
|
修正合约编译插件BUG
|
5 years ago |
|
zhangshuang
|
0bcc74e15f
|
solve compile problem
|
5 years ago |
|
zhangshuang
|
299a5b3b52
|
the second revision of the code merger
|
5 years ago |
|
zhangshuang
|
4b48e9a22b
|
Initial revision of the code merger
|
5 years ago |
|
huanghaiquan
|
8db11f40a8
|
Fixed the security risk of deserialization;
|
5 years ago |
|
huanghaiquan
|
6954e4eea0
|
temp;
|
5 years ago |
|
huanghaiquan
|
ef901c6518
|
temp;
|
5 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
|
5 years ago |
|
huanghaiquan
|
85021535a6
|
Added batch authorization API;
|
5 years ago |
|
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 |
|
zhangshuang
|
9b7c1f4bc3
|
modify pom file
|
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 |
|
zhangshuang
|
c09f56b936
|
Merge branch 'develop' into feature/regist_participant
|
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 |
