 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
|
5 years ago |
 huanghaiquan
|
8f09b044b4
|
Merge branch 'master' into develop
# Conflicts:
# source/base/pom.xml
# source/binary-proto/pom.xml
# source/consensus/consensus-bftsmart/pom.xml
# source/consensus/consensus-framework/pom.xml
# source/consensus/consensus-mq/pom.xml
# source/consensus/pom.xml
# source/contract/contract-framework/pom.xml
# source/contract/contract-jvm/pom.xml
# source/contract/contract-maven-plugin/pom.xml
# source/contract/contract-samples/pom.xml
# source/contract/pom.xml
# source/crypto/crypto-adv/pom.xml
# source/crypto/crypto-classic/pom.xml
# source/crypto/crypto-framework/pom.xml
# source/crypto/crypto-pki/pom.xml
# source/crypto/crypto-sm/pom.xml
# source/crypto/pom.xml
# source/deployment/deployment-gateway/pom.xml
# source/deployment/deployment-peer/pom.xml
# source/deployment/pom.xml
# source/gateway/pom.xml
# source/ledger/ledger-core/pom.xml
# source/ledger/ledger-model/pom.xml
# source/ledger/ledger-rpc/pom.xml
# source/ledger/pom.xml
# source/peer/pom.xml
# source/pom.xml
# source/runtime/pom.xml
# source/runtime/runtime-context/pom.xml
# source/runtime/runtime-modular-booter/pom.xml
# source/runtime/runtime-modular/pom.xml
# source/sdk/pom.xml
# source/sdk/sdk-base/pom.xml
# source/sdk/sdk-client/pom.xml
# source/sdk/sdk-samples/pom.xml
# source/storage/pom.xml
# source/storage/storage-composite/pom.xml
# source/storage/storage-redis/pom.xml
# source/storage/storage-rocksdb/pom.xml
# source/storage/storage-service/pom.xml
# source/test/pom.xml
# source/test/test-consensus-client/pom.xml
# source/test/test-consensus-node/pom.xml
# source/test/test-integration/pom.xml
# source/test/test-ledger-core/pom.xml
# source/tools/pom.xml
# source/tools/tools-capability/pom.xml
# source/tools/tools-initializer-booter/pom.xml
# source/tools/tools-initializer/pom.xml
# source/tools/tools-keygen-booter/pom.xml
# source/tools/tools-keygen/pom.xml
# source/tools/tools-mocker/pom.xml
# source/utils/pom.xml
# source/utils/utils-common/pom.xml
# source/utils/utils-http/pom.xml
# source/utils/utils-serialize/pom.xml
# source/utils/utils-test/pom.xml
# source/utils/utils-web-server/pom.xml
# source/utils/utils-web/pom.xml
|
5 years ago |
|
huanghaiquan
|
3378c0321b
|
Upgrade version to 1.0.2.RELEASE;
|
5 years ago |
|
huanghaiquan
|
ef6c4049d2
|
Fixed bugs: (1)unsupported no-parameter contract function; (2) doesn't rollback when kv-writting version conflict occurs;
|
5 years ago |
|
huanghaiquan
|
1d4d5d2982
|
upgraded version to 1.0.1.RELEASE;
|
6 years ago |
|
shaozhuguang
|
7ec858a798
|
modify contract's classloader for check load classes!
|
6 years ago |
|
shaozhuguang
|
12feaf39b7
|
modify contract'plugin
|
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 |
|
huanghaiquan
|
e3430f2332
|
temp;
|
6 years ago |
|
huanghaiquan
|
00bb4e5e07
|
Refactored the invoking process of contract code;
|
6 years ago |
|
shaozhuguang
|
cffab08fa9
|
增加合约返回值功能
|
6 years ago |
|
huanghaiquan
|
d7c1e752c8
|
rebase crypto-spi;
|
6 years ago |
|
huanghaiquan
|
a297d7d5d4
|
Update to version 0.9.0-SNAPSHOT;
|
6 years ago |
|
huanghaiquan
|
43068a0281
|
Init the repository with the 0.8.3.RELEASE version of project;
|
6 years ago |
