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 |
zhanglin33
|
2848d39bd3
|
ssh-keygen parser has been completed
|
6 years ago |
zhanglin33
|
b9999aa497
|
add ed25519 again
|
6 years ago |
zhanglin33
|
9bfd5faddf
|
add ssh ecdsa and ed25519
|
6 years ago |
zhaoguangwei
|
5851902fc4
|
test pass for contract param serialize and deserialize
|
6 years ago |
zhanglin33
|
6d94f7a3d0
|
Merge commit 'fa99325a93a38be04cd80a1db7c0077d6dbfc374' into feature/crypto-spi
|
6 years ago |
zhanglin33
|
13fca62782
|
finish RSA parsing in ssh-keygen
|
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
|
611e12714a
|
Fixed compilation error;
|
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 |
zhanglin33
|
fa92f40227
|
renew RSA junitTests to save compiling time
|
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 |
zhanglin33
|
0da0219341
|
remove useless imports
|
6 years ago |
zhanglin33
|
4061725dca
|
SM3WITHSM2 and SHA1WITHRSA4096 in pki module have been completed
|
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 |
shaozhuguang
|
aebfc8f3a7
|
Modify GateWay LedgerSetting Response Error Bug!
|
6 years ago |
zhanglin33
|
bf6ff4dfe7
|
SHA1WITHRSA2048 in crypto-pki module has been completed
|
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 |
zhanglin33
|
962e0f200b
|
add SHA1WITHRSA2048 without junitTest
|
6 years ago |
huanghaiquan
|
173e4ba768
|
Fixed compiling error;
|
6 years ago |
zhanglin33
|
6920627ef3
|
add CertParser and its junitTest
|
6 years ago |
zhaoguangwei
|
a67ab58873
|
the first contract test based interface is OK.
|
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 |
zhanglin33
|
7b0cc1cafb
|
add CSRBuilder and its junitTest
|
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 |
zhanglin33
|
66a58d44af
|
add the standard public exponent form in RSAUtils
|
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 |
zhanglin33
|
c6b176f87b
|
Merge commit '170e49c9957ccd9c463149f44f6af0402e124f5e' into feature/crypto-spi
|
6 years ago |
zhaoguangwei
|
19012ae8c4
|
intf-contract dev first edition.
|
6 years ago |
zhanglin33
|
1ea6576aea
|
Merge branch 'feature/crypto-spi' of http://git.jd.com/jd-blockchain/jdchain into feature/crypto-spi
|
6 years ago |
zhanglin33
|
be4f605174
|
add pki
|
6 years ago |
huanghaiquan
|
170e49c995
|
Merge branch 'feature/crypto-spi' into feature/optimize-tx-tree
|
6 years ago |
huanghaiquan
|
54bd864641
|
Fixed bugs of PerformanceTest;
|
6 years ago |
zhaoguangwei
|
1e04478715
|
delete the txOpTime in transactionContent.java, now use it in the ContractEventSendOpTemplate, only for contract related;
|
6 years ago |