zhangshuang
712e273662
bug modify for regist participant
6 years ago
huanghaiquan
d425e2cb26
Fixed compiling error;
6 years ago
zhangshuang
cd63d7612b
add regist participant code for feature
6 years ago
huanghaiquan
9bc12aa570
Renamed packages of ledger-core;
6 years ago
huanghaiquan
3542ca2ec2
Refactored LedgerRepository;
6 years ago
huanghaiquan
cab12e9083
Passed verification of the testcases for RolePrivilegeDataSet and UserRolesDataSet;
6 years ago
zhaoguangwei
63349a6af8
穿透式检索放置网关controller
6 years ago
zhangshuang
963debbc96
solve miss property problem
6 years ago
shaozhuguang
f36ef575d8
删除临时合约文件
6 years ago
shaozhuguang
d201c568de
修正日志打印的问题
6 years ago
huanghaiquan
009f86dab3
Completed the definition of role privilege, and dealed some naming conflicts;
6 years ago
huanghaiquan
d5bb40541a
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
6 years ago
huanghaiquan
1d4d5d2982
upgraded version to 1.0.1.RELEASE;
6 years ago
shaozhuguang
be4b9cf8e6
Fix Endpoint's Sign and Node's Sign Error !
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
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
a5bb09c00e
Merge branch 'release/1.0.0' into develop
6 years ago
shaozhuguang
40e397da05
Modify contract usage in readme file !
6 years ago
shaozhuguang
f73a2280d9
Delete the public key part involved in the bftsmart file !
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
157f841a7a
Fixed the error caused by missing created-time property in ledger.init file;
6 years ago
huanghaiquan
83a99039ac
Added created-time attribute to transaction;
6 years ago
shaozhuguang
c2ddfa9498
Fix Test case !
6 years ago
shaozhuguang
87b4d5d029
Fix Test case !
6 years ago
huanghaiquan
53554a9e03
Completed the cancellation of transaction template and prepared transaction ;
6 years ago
huanghaiquan
73fe2fe8d4
Refactor ContractReturnValue;
6 years ago
huanghaiquan
0888190efa
Completed the processing of the return value of Contract event send operation;
6 years ago
shaozhuguang
532fec678b
Fix getDataEntry results error!
6 years ago
shaozhuguang
713f847165
Modify the way of Contract's return Result !
6 years ago
shaozhuguang
1c8df1ac9d
modify contract return message !
6 years ago
huanghaiquan
00bb4e5e07
Refactored the invoking process of contract code;
6 years ago
huanghaiquan
89a1a22fe5
Fixed errors of TransactionBatchProcessor's testcase;
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
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
845e7a4537
add IntegrationTest4Contract;
6 years ago
zhaoguangwei
bfb28fc5a5
Merge remote-tracking branch 'remotes/origin/feature/intf-contract' into develop
6 years ago
zhaoguangwei
a472334b7e
IntegrationTest4Contract.java can run OK. for String[];
6 years ago
shaozhuguang
7db6392a58
Adding Tool-Mocker module, which can be used for mocker test contract function !!!
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
5851902fc4
test pass for contract param serialize and deserialize
6 years ago
zhaoguangwei
624e1d8cc3
merge the dev
6 years ago