 huanghaiquan
|
00e07f79ec
|
Refactored ledger core;
|
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 |
|
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
|
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
|
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
|
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
|
cd56b0812b
|
Refactored the codes of ledger initialization;
|
6 years ago |
 zhangshuang
|
13d2218f29
|
modify participant state update interface bug
|
6 years ago |
|
huanghaiquan
|
133a7a162a
|
Fixed compilation errors;
|
6 years ago |
|
huanghaiquan
|
f7315d3271
|
Add security init settings to ledger init settings;
|
6 years ago |
|
huanghaiquan
|
d425e2cb26
|
Fixed compiling error;
|
6 years ago |
|
zhangshuang
|
cd63d7612b
|
add regist participant code for feature
|
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
|
9641c82e93
|
Fixed compilation error and refactored the API of querying meta info of Ledger;
|
6 years ago |
|
huanghaiquan
|
009f86dab3
|
Completed the definition of role privilege, and dealed some naming conflicts;
|
6 years ago |
|
shaozhuguang
|
4f8d4e942e
|
Fix Endpoint's Sign and Node's Sign Error !
|
6 years ago |
|
huanghaiquan
|
f5bc1a2404
|
Merge commit '09d14c30400634ab169d04e0d878722c502cbb10' into feature/contract_invocation
# Conflicts:
# source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java
|
6 years ago |
|
huanghaiquan
|
157f841a7a
|
Fixed the error caused by missing created-time property in ledger.init file;
|
6 years ago |
|
shaozhuguang
|
867c0f6911
|
Add Contract Code Show !
|
6 years ago |
|
shaozhuguang
|
87b4d5d029
|
Fix Test case !
|
6 years ago |
|
shaozhuguang
|
541d1b3c8c
|
Modify Operation return result resolver !!!
|
6 years ago |
|
huanghaiquan
|
53554a9e03
|
Completed the cancellation of transaction template and prepared transaction ;
|
6 years ago |
|
huanghaiquan
|
afb526b635
|
Refactored the args type of ContractEventSendOperation;
|
6 years ago |
|
huanghaiquan
|
0888190efa
|
Completed the processing of the return value of Contract event send operation;
|
6 years ago |
|
huanghaiquan
|
22c4a6e825
|
Merge commit '713f8471650bee6cd2400585e517dc85197e43f0' into feature/contract_invocation
# Conflicts:
# source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JavaContractCode.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/AbtractContractEventHandle.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxy.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxyBuilder.java
# source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/handler/MockerContractExeHandle.java
|
6 years ago |
|
shaozhuguang
|
713f847165
|
Modify the way of Contract's return Result !
|
6 years ago |
|
huanghaiquan
|
e3430f2332
|
temp;
|
6 years ago |
|
shaozhuguang
|
967fda8e78
|
modify contract mocker test return data !
|
6 years ago |
|
shaozhuguang
|
1c8df1ac9d
|
modify contract return message !
|
6 years ago |
|
huanghaiquan
|
00bb4e5e07
|
Refactored the invoking process of contract code;
|
6 years ago |
|
huanghaiquan
|
d523334c9f
|
Refactored the structure of operation results of ledger transaction;
|
6 years ago |
|
huanghaiquan
|
2c4bf3318d
|
Merge branch 'contract-return' into feature/contract_invocation
# Conflicts:
# source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java
# source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JavaContractCode.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionBatchProcessor.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
|
6 years ago |
|
huanghaiquan
|
16d6338e75
|
Disabled test cases that can not fixed currently;
|
6 years ago |
|
shaozhuguang
|
3e5cdcd534
|
增加合约返回值功能
|
6 years ago |
|
huanghaiquan
|
69e026893a
|
Fixed compilation error;
|
6 years ago |
|
shaozhuguang
|
06a932279c
|
Change String.getBytes() to UTF-8 Encode !
|
6 years ago |
|
shaozhuguang
|
7db6392a58
|
Adding Tool-Mocker module, which can be used for mocker test contract function !!!
|
6 years ago |
