huanghaiquan
|
96ca7b5b2d
|
Upgraded version to 1.2.0-SNAPSHOT;
|
6 years ago |
huanghaiquan
|
93d6a87c53
|
Upgrade to 1.1.0.RELEASE;
|
6 years ago |
zhangshuang
|
7843638f65
|
Merge branch 'develop' into feature/ledger_Bifurcation
# Conflicts:
# source/contract/contract-samples/pom.xml
# source/pom.xml
|
6 years ago |
shaozhuguang
|
922fe54490
|
Adding SDK usage examples
|
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 |
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 |
zhangshuang
|
299a5b3b52
|
the second revision of the code merger
|
6 years ago |
zhangshuang
|
4b48e9a22b
|
Initial revision of the code merger
|
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
|
cd56b0812b
|
Refactored the codes of ledger initialization;
|
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
|
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
|
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 |
zhangshuang
|
cd63d7612b
|
add regist participant code for feature
|
6 years ago |
zhangshuang
|
f60c63e20b
|
solve ledger inconsistency problem
|
6 years ago |
shaozhuguang
|
d201c568de
|
修正日志打印的问题
|
6 years ago |
shaozhuguang
|
66842c3c85
|
修正解析SDK返回应答问题
|
6 years ago |
huanghaiquan
|
8bfadfeab5
|
Improved examples of contracts;
|
6 years ago |
shaozhuguang
|
4a7f5aab3d
|
增加启动参数,设置使用的Console,并支持自动退出
|
6 years ago |
shaozhuguang
|
7ec858a798
|
modify contract's classloader for check load classes!
|
6 years ago |
huanghaiquan
|
e33a21310c
|
Upgraded version to 1.1.0-SNAPSHOT
|
6 years ago |
huanghaiquan
|
859a60d3af
|
Upgraded version to 1.0.0.RELEASE;
|
6 years ago |
shaozhuguang
|
9f4a441201
|
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
|
73fe2fe8d4
|
Refactor ContractReturnValue;
|
6 years ago |
huanghaiquan
|
0888190efa
|
Completed the processing of the return value of Contract event send operation;
|
6 years ago |
shaozhuguang
|
c8aac0aac7
|
Merge remote-tracking branch 'origin/feature/contract_invocation' into feature/contract_invocation-local
|
6 years ago |
shaozhuguang
|
532fec678b
|
Fix getDataEntry results error!
|
6 years ago |
huanghaiquan
|
e3430f2332
|
temp;
|
6 years ago |
huanghaiquan
|
00bb4e5e07
|
Refactored the invoking process of contract code;
|
6 years ago |
huanghaiquan
|
6148debbd2
|
Removed unverified features related to the contract system;
|
6 years ago |
huanghaiquan
|
69e026893a
|
Fixed compilation error;
|
6 years ago |
huanghaiquan
|
d60c5d4cb1
|
Merge branch 'feature/authorize' into develop
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.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/IntegrationTestAll4Redis.java
|
6 years ago |
huanghaiquan
|
f550c6d518
|
Refactored the Value structure of BaseAccount;
|
6 years ago |
zhaoguangwei
|
81bc88bcb3
|
add MavenProject object in plugin's test;
|
6 years ago |
zhaoguangwei
|
5c3c12109c
|
clean the unnecessary test
|
6 years ago |
zhaoguangwei
|
52ad61c4e6
|
IntegrationTest4Contract.java can run OK. for String[];
|
6 years ago |
zhaoguangwei
|
28a6d81f0c
|
IntegrationTest4Contract.java can run OK.
|
6 years ago |
zhaoguangwei
|
b8dff42d04
|
reduce the invoke of reflection to improve the performance.
|
6 years ago |
zhaoguangwei
|
7a073f64f1
|
According to Haiquan's suggestion to modify the codes for improving the performance. must admit: these proposals are very valuable.
|
7 years ago |
zhaoguangwei
|
38c54c18aa
|
The judgment of annotations to contract parameters is removed. Now you don't have to fill in parameter annotations in the interface. The primitive data types are automatically mapped in the background.
|
7 years ago |