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 |
huanghaiquan
|
4b7a5ad38e
|
Refactored the type system of ledger;
|
6 years ago |
huanghaiquan
|
de168d053b
|
Added new types;
|
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 |
zhaoguangwei
|
933d152047
|
Merge remote-tracking branch 'origin/develop' into feature/contract-args
|
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 |
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 |
shaozhuguang
|
06a932279c
|
Change String.getBytes() to UTF-8 Encode !
|
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 |
shaozhuguang
|
3b3ea2b64e
|
Fix ParticipantNodes return ID error !
|
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 |
zhaoguangwei
|
5851902fc4
|
test pass for contract param serialize and deserialize
|
6 years ago |
zhaoguangwei
|
624e1d8cc3
|
merge the dev
|
6 years ago |
zhaoguangwei
|
f781f6c3d1
|
parse the params'bytes[]
|
6 years ago |
huanghaiquan
|
fa99325a93
|
Refactored the timestamp generation mechanism of ContractEventSendOperation;
|
6 years ago |
huanghaiquan
|
30f2ff5692
|
Merge commit '1e044787151f42ca8a72890575280bb5d79c25e1' into develop
# Conflicts:
# source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/client/BftsmartConsensusClient.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractEventSendOperationHandle.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractEventSendOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionContent.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionContentBody.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxContentBlob.java
|
6 years ago |
huanghaiquan
|
c9ab265773
|
Merge commit '376753b8d2d2f45a73987238ddf1d31ab4347042' into develop
|
6 years ago |
huanghaiquan
|
e3b9d97f5e
|
Completed configuring crypto service provider in ledger.init file;
|
6 years ago |
huanghaiquan
|
8288e0cad7
|
Completed development of adding crypto provider setting to LedgerAdminAccount;
|
6 years ago |
shaozhuguang
|
376753b8d2
|
Modify the information returned by LedgerSetting, And Adjust Log Printing to LOGGER !
|
6 years ago |
zhanglin33
|
56b99a1615
|
Merge branch 'feature/crypto-spi' into develop
|
6 years ago |
huanghaiquan
|
03e850ba0d
|
Optimized ledger init configuration: add consensus service provider attributes;
|
6 years ago |
huanghaiquan
|
dd021222d7
|
Added crypto-provider attribute to the settings of ledger;
|
6 years ago |
zhaoguangwei
|
642946eece
|
add ContractSerialUtils.java;
|
6 years ago |
zhaoguangwei
|
de75122c6f
|
fix the interface: ledgers/xxx/settings
|
6 years ago |
zhaoguangwei
|
4339649103
|
Merge remote-tracking branch 'origin/develop' into feature/dataAccount-addVersion
|
6 years ago |
zhaoguangwei
|
f57a29a2c3
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/intf-contract
|
6 years ago |
zhaoguangwei
|
c6f693352b
|
to the restful api:/entries-version, check the dataAddress and its version;
|
6 years ago |
zhanglin33
|
d44f97a646
|
Merge commit '173e4ba768cf66291320aabcf07d5f2fee9cce7a' into feature/crypto-spi
# Conflicts:
# source/pom.xml
|
6 years ago |
huanghaiquan
|
173e4ba768
|
Fixed compiling error;
|
6 years ago |
zhaoguangwei
|
8046ea0897
|
The original version did not meet the needs of the business side, and adopted the JSON mode again.
|
6 years ago |
zhaoguangwei
|
535c6c2273
|
test then optimize the contract based interface;
|
6 years ago |
zhaoguangwei
|
ce1fb2b4b0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/intf-contract
|
6 years ago |
zhaoguangwei
|
6c7f5ada36
|
add new restful interface:
ledgers/{ledgerHash}/accounts/{address}/entries-version
test OK.
|
6 years ago |
shaozhuguang
|
8a4fdc3b6a
|
1. Repairing automatic serialization during gateway initialization
|
6 years ago |
shaozhuguang
|
3545a75fa1
|
1. Modify integration test cases;
2. Adding browser to get Settings configuration interface;
3. Repairing BUG of BftSMART Consensus.
|
6 years ago |