96ca7b5b2d
Upgraded version to 1.2.0-SNAPSHOT;
6 years ago
93d6a87c53
Upgrade to 1.1.0.RELEASE;
6 years ago
582926477d
Merge branch 'feature/ledger_Bifurcation' into develop
6 years ago
a91da3d5a1
Change Peer startup shell !
6 years ago
7843638f65
Merge branch 'develop' into feature/ledger_Bifurcation
# Conflicts:
# source/contract/contract-samples/pom.xml
# source/pom.xml
6 years ago
00e07f79ec
Refactored ledger core;
6 years ago
f0d4ef694a
Adding Partial Serialization Interface
6 years ago
87dd1b63cb
delete the register of TransactionPermission/LedgerPermission/RolesPolicy, because it's enum type.
6 years ago
290af1b9b7
增加序列化注册接口
6 years ago
5f0a7ba094
增加部分未注册的序列化接口
6 years ago
c849affc4f
修改Gateway对应配置文件路径及LedgerSettings注册
6 years ago
db2c88c50c
Merge remote-tracking branch 'origin/develop' into feature/1.0.0-contract-check2.0-local
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ContractCodeDeployOperationHandle.java
# source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java
6 years ago
e285cac39b
修改集成测试BUG
6 years ago
31071068c0
修改日志打印模块
6 years ago
a5ee1a10d2
Merge commit '0bcc74e15f5639d31c81e08285ade3df7f76bd71' into develop
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DefaultOperationHandleRegisteration.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitProperties.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/IntegrationTest4Bftsmart.java
6 years ago
d1e40a91fa
Completed authorization test case and refactored TransactionBatchProcessor;
6 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
6 years ago
ae3af3ea72
Refactored LedgerDataset: extract readonly interface LedgerDataQuery;
6 years ago
13d2218f29
modify participant state update interface bug
6 years ago
133a7a162a
Fixed compilation errors;
6 years ago
d66de9beb2
Merge branch 'develop' into feature/authorize
# Conflicts:
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitCommand.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitProperties.java
6 years ago
cd63d7612b
add regist participant code for feature
6 years ago
9bc12aa570
Renamed packages of ledger-core;
6 years ago
3542ca2ec2
Refactored LedgerRepository;
6 years ago
21772b13b2
Renamed;
6 years ago
cab12e9083
Passed verification of the testcases for RolePrivilegeDataSet and UserRolesDataSet;
6 years ago
c4ac70efa8
Fixed the bug that : the global standard time zone was not set and time parsing error occurred while running on a different time zone setting server.
6 years ago
9641c82e93
Fixed compilation error and refactored the API of querying meta info of Ledger;
6 years ago
f60c63e20b
solve ledger inconsistency problem
6 years ago
d201c568de
修正日志打印的问题
6 years ago
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
1d4d5d2982
upgraded version to 1.0.1.RELEASE;
6 years ago
be4b9cf8e6
Fix Endpoint's Sign and Node's Sign Error !
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
884ae3d153
Merge branch 'test' into release/1.0.0
# Conflicts:
# source/pom.xml
# source/storage/storage-service/src/test/java/test/com/jd/blockchain/storage/service/utils/BufferedKVStorageTest.java
6 years ago
436022dda6
Set the default log level of console to error;
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
e33a21310c
Upgraded version to 1.1.0-SNAPSHOT
6 years ago
859a60d3af
Upgraded version to 1.0.0.RELEASE;
6 years ago
867c0f6911
Add Contract Code Show !
6 years ago
1c8df1ac9d
modify contract return message !
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
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
7db6392a58
Adding Tool-Mocker module, which can be used for mocker test contract function !!!
6 years ago
611e12714a
Fixed compilation error;
6 years ago
c9ab265773
Merge commit '376753b8d2d2f45a73987238ddf1d31ab4347042' into develop
6 years ago
8288e0cad7
Completed development of adding crypto provider setting to LedgerAdminAccount;
6 years ago
huanghaiquan
zhangshuang
shaozhuguang
zhaoguangwei