jdchain

Commit Graph

Author	SHA1	Message	Date
huanghaiquan	d951e9ae00	Upgraded to version 1.1.2.RELEASE;	6 years ago
huanghaiquan	1e6e125348	Upgrade version to 1.2.0-SNAPSHOT;	6 years ago
huanghaiquan	5a07802f08	Merge branch 'master' into develop	6 years ago
huanghaiquan	e0f7145df8	Upgrade version to 1.1.1.RELEASE;	6 years ago
huanghaiquan	a05f4e7895	Fixed all compilation errors;	6 years ago
huanghaiquan	96ca7b5b2d	Upgraded version to 1.2.0-SNAPSHOT;	6 years ago
huanghaiquan	93d6a87c53	Upgrade to 1.1.0.RELEASE;	6 years ago
zhangshuang	7843638f65	Merge branch 'develop' into feature/ledger_Bifurcation # Conflicts: # source/contract/contract-samples/pom.xml # source/pom.xml	6 years ago
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	6 years ago
zhangshuang	f60c63e20b	solve ledger inconsistency problem	6 years ago
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
shaozhuguang	34c602991d	Modify Contract Plugin's Check Function!	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	e33a21310c	Upgraded version to 1.1.0-SNAPSHOT	6 years ago
huanghaiquan	859a60d3af	Upgraded version to 1.0.0.RELEASE;	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
shaozhuguang	713f847165	Modify the way of Contract's return Result !	6 years ago
huanghaiquan	e3430f2332	temp;	6 years ago
huanghaiquan	00bb4e5e07	Refactored the invoking process of contract code;	6 years ago
shaozhuguang	3e5cdcd534	增加合约返回值功能	6 years ago
shaozhuguang	cffab08fa9	增加合约返回值功能	6 years ago

24 Commits (d951e9ae00d910a1b47a11fcf4f84f27a9309a69)