huanghaiquan
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
zhaoguangwei
20c7feccb8
add the ContractCheckMojo for contract-maven-plugin;
6 years ago
zhaoguangwei
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
a5bb09c00e
Merge branch 'release/1.0.0' into develop
6 years ago
shaozhuguang
4edfe964ec
1、Fixed get consensus file error !
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
87b4d5d029
Fix Test case !
6 years ago
shaozhuguang
541d1b3c8c
Modify Operation return result resolver !!!
6 years ago
huanghaiquan
683b9d3ac0
Refactored the processing of bytes values of ContractEventSendOperation;
6 years ago
huanghaiquan
0888190efa
Completed the processing of the return value of Contract event send operation;
6 years ago
huanghaiquan
00dd08abf8
Fixed compilation error;
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
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
huanghaiquan
2fcf1fb18c
Completed test case for contract invoking;
6 years ago
shaozhuguang
713f847165
Modify the way of Contract's return Result !
6 years ago
huanghaiquan
e3430f2332
temp;
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
6148debbd2
Removed unverified features related to the contract system;
6 years ago
shaozhuguang
3e5cdcd534
增加合约返回值功能
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
shaozhuguang
cffab08fa9
增加合约返回值功能
6 years ago
zhaoguangwei
9fa2eb3272
after compile then check the contract, test OK.
6 years ago
zhaoguangwei
7a9d5e5bbf
after compile then check the contract, test OK.
6 years ago
zhaoguangwei
a45da26d54
after compile then check the contract, test OK.
6 years ago
zhaoguangwei
81bc88bcb3
add MavenProject object in plugin's test;
6 years ago
zhaoguangwei
b8dff42d04
reduce the invoke of reflection to improve the performance.
6 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.
6 years ago
zhaoguangwei
624e1d8cc3
merge the dev
6 years ago
zhaoguangwei
f781f6c3d1
parse the params'bytes[]
6 years ago
zhaoguangwei
642946eece
add ContractSerialUtils.java;
6 years ago
zhaoguangwei
a67ab58873
the first contract test based interface is OK.
6 years ago
zhaoguangwei
535c6c2273
test then optimize the contract based interface;
6 years ago
zhaoguangwei
6c7f5ada36
add new restful interface:
ledgers/{ledgerHash}/accounts/{address}/entries-version
test OK.
6 years ago
zhaoguangwei
19012ae8c4
intf-contract dev first edition.
6 years ago
huanghaiquan
91ea158efc
Completed the basic processing of invoking contract with it's interface;
6 years ago
huanghaiquan
9cdda49897
Optimized contract loading.
6 years ago
huanghaiquan
545aec3335
Merged contract-model project into ledger-model project,and removed it.
6 years ago
huanghaiquan
4f60971f66
Refactor ledger model: rename packages;
6 years ago
huanghaiquan
66f81f156e
Merge pull request #6 from cg-zhou/develop
Update contract/README.MD style
6 years ago
周春光
ab71089fa9
Update contract/README.MD style
Update contract/README.MD style for github web view
6 years ago
huanghaiquan
1f6fd9e604
Rename some of the types in crypto framework for more accurate expression.
6 years ago
huanghaiquan
215683ea98
Refactored packages in crypto framework;
6 years ago
huanghaiquan
7780fb64a4
Fixed compilation errors in sdk and ledger-model ;
6 years ago
huanghaiquan
8c46ac4c2b
Remove unused projects;
6 years ago