baf30547bd
Merge remote-tracking branch 'origin/develop' into feature/1.0.0-contract-check2.0-local
# Conflicts:
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainOperationFactory.java
5 years ago
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
e1b4240d51
修正合约编译插件BUG
5 years ago
467e7b513b
Merge branch 'developold' into feature/regist_participant
# Conflicts:
# source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataset.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/DefaultOperationHandleRegisteration.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerManagerTest.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionSetTest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitProperties.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ClientOperator.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ConsensusParticipantData.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/Utils.java
# source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/SettingsInit.java
# source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java
5 years ago
cd56b0812b
Refactored the codes of ledger initialization;
5 years ago
c09f56b936
Merge branch 'develop' into feature/regist_participant
5 years ago
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
3378c0321b
Upgrade version to 1.0.2.RELEASE;
5 years ago
47ac7af85d
Fixed bugs about contract invoking;
5 years ago
13d2218f29
modify participant state update interface bug
5 years ago
cd63d7612b
add regist participant code for feature
5 years ago
3a37cded20
Modify contract-maven-plugin's verification scheme to be implemented by ASM!
6 years ago
1d4d5d2982
upgraded version to 1.0.1.RELEASE;
6 years ago
7ec858a798
modify contract's classloader for check load classes!
6 years ago
12feaf39b7
modify contract'plugin
6 years ago
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
0722408d37
修改合约处理逻辑为在assembly基础上调用，并增加ReadME.MD文档
6 years ago
d7eb2a2816
增加合约打包异常删除逻辑
6 years ago
c021cf48ca
增加合约打包异常删除逻辑
6 years ago
13478a2129
修改合约打包模块对应的package
6 years ago
f08f6cc9cf
修改合约打包验证功能模块
6 years ago
d1bbc6ec22
增加合约验证
6 years ago
5fadf9bdb8
SDK增加合约校验功能！
6 years ago
34c602991d
Modify Contract Plugin's Check Function!
6 years ago
20c7feccb8
add the ContractCheckMojo for contract-maven-plugin;
6 years ago
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
a5bb09c00e
Merge branch 'release/1.0.0' into develop
6 years ago
4edfe964ec
1、Fixed get consensus file error ！
6 years ago
e33a21310c
Upgraded version to 1.1.0-SNAPSHOT
6 years ago
859a60d3af
Upgraded version to 1.0.0.RELEASE;
6 years ago
87b4d5d029
Fix Test case !
6 years ago
541d1b3c8c
Modify Operation return result resolver !!!
6 years ago
683b9d3ac0
Refactored the processing of bytes values of ContractEventSendOperation;
6 years ago
0888190efa
Completed the processing of the return value of Contract event send operation;
6 years ago
00dd08abf8
Fixed compilation error;
6 years ago
c8aac0aac7
Merge remote-tracking branch 'origin/feature/contract_invocation' into feature/contract_invocation-local
6 years ago
532fec678b
Fix getDataEntry results error!
6 years ago
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
2fcf1fb18c
Completed test case for contract invoking;
6 years ago
713f847165
Modify the way of Contract's return Result !
6 years ago
e3430f2332
temp;
6 years ago
1c8df1ac9d
modify contract return message !
6 years ago
00bb4e5e07
Refactored the invoking process of contract code;
6 years ago
d523334c9f
Refactored the structure of operation results of ledger transaction;
6 years ago
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
6148debbd2
Removed unverified features related to the contract system;
6 years ago
3e5cdcd534
增加合约返回值功能
6 years ago
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
f550c6d518
Refactored the Value structure of BaseAccount;
6 years ago
cffab08fa9
增加合约返回值功能
6 years ago
shaozhuguang
huanghaiquan
zhangshuang
zhaoguangwei