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
|
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
|
89a1a22fe5
|
Fixed errors of TransactionBatchProcessor's testcase;
|
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 |
huanghaiquan
|
6148debbd2
|
Removed unverified features related to the contract system;
|
6 years ago |
huanghaiquan
|
4b7a5ad38e
|
Refactored the type system of ledger;
|
6 years ago |
huanghaiquan
|
de168d053b
|
Added new types;
|
6 years ago |
shaozhuguang
|
e2f9e342df
|
Merge remote-tracking branch 'origin/develop' into develop-local
# Conflicts:
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
|
6 years ago |
shaozhuguang
|
3e5cdcd534
|
增加合约返回值功能
|
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 |
shaozhuguang
|
cffab08fa9
|
增加合约返回值功能
|
6 years ago |
zhaoguangwei
|
7db884d96f
|
replace tx with txOpTime in ContractEventSendOpTemplate.java; and test OK;
|
6 years ago |
zhanglin33
|
0b30340eb2
|
Merge commit '933d152047999eaf5e86d16514e477ac758a941b' into feature/crypto-spi
|
6 years ago |
zhaoguangwei
|
933d152047
|
Merge remote-tracking branch 'origin/develop' into feature/contract-args
|
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 |
shaozhuguang
|
7d1c7c5969
|
Change String.getBytes() to UTF-8 Encode !
|
6 years ago |
zhanglin33
|
e832bae1d7
|
Merge commit '845e7a4537adee26cbf870096a0f22ec7b7c9e77' into feature/crypto-spi
|
6 years ago |
zhanglin33
|
74bc253099
|
replace .getBytes() with BytesUtils.toBytes(), again
|
6 years ago |
zhaoguangwei
|
845e7a4537
|
add IntegrationTest4Contract;
|
6 years ago |
zhaoguangwei
|
5c3c12109c
|
clean the unnecessary test
|
6 years ago |
zhaoguangwei
|
28933c5627
|
clean
|
6 years ago |
zhaoguangwei
|
bfb28fc5a5
|
Merge remote-tracking branch 'remotes/origin/feature/intf-contract' into develop
|
6 years ago |
zhaoguangwei
|
52ad61c4e6
|
IntegrationTest4Contract.java can run OK. for String[];
|
6 years ago |
zhaoguangwei
|
a472334b7e
|
IntegrationTest4Contract.java can run OK. for String[];
|
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 |
zhanglin33
|
9b1629ca12
|
replace .getBytes() with BytesUtils.toBytes()
|
6 years ago |
huanghaiquan
|
5076b5ff7e
|
Completed marking the data type of the value of KV Entry;
|
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.
|
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 |
zhanglin33
|
a1a7cf9615
|
remove invalid imports and a main function
|
6 years ago |
shaozhuguang
|
3b3ea2b64e
|
Fix ParticipantNodes return ID error !
|
6 years ago |
zhaoguangwei
|
48c3ac9187
|
update the contract.jar;
|
6 years ago |
zhaoguangwei
|
5eb467b8d5
|
test pass for contract param serialize and deserialize. then clean;
|
6 years ago |
zhaoguangwei
|
57f5679ff8
|
test pass for contract param serialize and deserialize. then clean;
|
6 years ago |