 huanghaiquan
|
df94696564
|
Merge branch 'release/1.2.0'
# Conflicts:
# deploy/deploy-gateway/pom.xml
# deploy/deploy-peer/pom.xml
# deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
# samples/contract-samples/pom.xml
# samples/sdk-samples/pom.xml
# source/base/pom.xml
# source/binary-proto/pom.xml
# source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryProtocol.java
# source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/PrimitiveType.java
# source/consensus/consensus-bftsmart/pom.xml
# source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/client/BftsmartMessageService.java
# source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java
# source/consensus/consensus-framework/pom.xml
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/ActionMessage.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/ConsensusSecurityException.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/ConsensusService.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/OrderedAction.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/UnorderedAction.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/action/ActionResponseData.java
# 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/pom.xml
# source/crypto/crypto-adv/pom.xml
# source/crypto/crypto-classic/pom.xml
# source/crypto/crypto-framework/pom.xml
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/AddressEncoding.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/AddressVersion.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoKey.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/PrivKey.java
# source/crypto/crypto-pki/pom.xml
# source/crypto/crypto-sm/pom.xml
# source/crypto/pom.xml
# source/deployment/pom.xml
# source/gateway/pom.xml
# source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayConfiguration.java
# source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayServerBooter.java
# source/gateway/src/main/java/com/jd/blockchain/gateway/web/GatewayWebSecurityConfigurer.java
# source/gateway/src/main/java/com/jd/blockchain/gateway/web/TxProcessingController.java
# source/gateway/src/main/resources/gateway.conf
# source/gateway/src/test/java/test/com/jd/blockchain/gateway/data/HashDigestDeserializer.java
# source/gateway/src/test/java/test/com/jd/blockchain/gateway/data/HashDigestSerializer.java
# source/ledger/ledger-core/pom.xml
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccountSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccountSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataset.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerQueryService.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/Node.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/Peer.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionBatchProcessor.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccountSet.java
# source/ledger/ledger-model/pom.xml
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/Contract.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractEvent.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/EventHandle.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockRollbackException.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainEventType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainIdentityData.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeyGenerator.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeypair.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/CodeDeployOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractCodeDeployOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DataAccountKVSetOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DataAccountRegisterOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DataType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DataVersionConflictException.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DigitalSignature.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/EndpointRequest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/HashAlgorithm.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/HashObject.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/Ledger.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/MagicNumber.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/NodeRequest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/OperationArgument.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/PermissionType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/RolesConfigureOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/SignatureInfo.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/StateOpType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/Transaction.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionRequestBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionResponse.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionRollbackException.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserAuthorizeOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserInfoSetOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserRegisterOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/setting/GatewayIncomingSetting.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainOperationFactory.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainQueryService.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxyBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DigitalSignatureBlob.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/NewLedgerOpBlob.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PreparedTx.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PrivilegeSettingOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PubKeyData.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/SecurityOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/SignatureEncoding.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TransactionService.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestMessage.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxResponseMessage.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilderImpl.java
# source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/BytesEncodingTest.java
# source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/OpBlobTest.java
# source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/SizeHeaderMaskTest.java
# source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/TxContentBlobTest.java
# source/ledger/ledger-rpc/pom.xml
# source/ledger/pom.xml
# source/manager/manager-booter/pom.xml
# source/manager/manager-model/pom.xml
# source/manager/manager-service/pom.xml
# source/manager/manager-web/pom.xml
# source/manager/pom.xml
# source/peer/config/hosts.config
# source/peer/config/system.config
# source/peer/pom.xml
# source/peer/src/main/java/com/jd/blockchain/peer/PeerConfiguration.java
# source/peer/src/main/java/com/jd/blockchain/peer/consensus/BlockchainConsensusServiceImpl.java
# source/peer/src/main/java/com/jd/blockchain/peer/consensus/ConsensusViewDefinition.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/LedgerQueryController.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/PeerWebSecurityConfiguration.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/PeerWebServerConfigurer.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/service/ConsensusViewDefinitionTest.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/service/LedgerInitCordinatorTest.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/web/ControllerTestConfiguration.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/web/LedgerInitializingControllerTest.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/web/LedgerInitializingTest.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/web/PeerKeyStorageServiceImpl.java
# 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-base/src/main/java/com/jd/blockchain/sdk/AbstractBlockchainServiceFactory.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainEventHandle.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainEventListener.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainEventMessage.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainEventService.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainService.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainTransactionService.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/ManagementHttpService.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/PrivilegeSetting.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/TxCommiter.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/BlockchainServiceProxy.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/CodeDeployOperationBuilder.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/CodeInvokeOperationBuilder.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/HttpQueryServiceAdapter.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/NodeSigningAppender.java
# source/sdk/sdk-base/src/test/java/test/com/jd/blockchain/sdk/proxy/TxMessageTest.java
# source/sdk/sdk-client/pom.xml
# source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayIncomingInfo.java
# source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java
# source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/HttpConsensusService.java
# source/storage/pom.xml
# source/storage/storage-composite/pom.xml
# source/storage/storage-redis/pom.xml
# source/storage/storage-redis/src/main/java/com/jd/blockchain/storage/service/impl/redis/JedisProperties.java
# source/storage/storage-redis/src/main/java/com/jd/blockchain/storage/service/impl/redis/RedisStorageService.java
# source/storage/storage-redis/src/main/resources/META-INF/spring.factories
# source/storage/storage-rocksdb/pom.xml
# source/storage/storage-rocksdb/src/main/java/com/jd/blockchain/storage/service/impl/rocksdb/RocksDBStorageService.java
# source/storage/storage-service/pom.xml
# source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/VersioningKVStorage.java
# source/test/pom.xml
# source/test/test-consensus-client/pom.xml
# source/test/test-consensus-client/src/main/java/test/perf/com/jd/blockchain/consensus/client/Settings.java
# source/test/test-consensus-client/src/main/java/test/perf/com/jd/blockchain/consensus/client/WebConfiguration.java
# source/test/test-consensus-client/src/main/resources/application.properties
# source/test/test-consensus-node/config/bft-system.config
# source/test/test-consensus-node/pom.xml
# source/test/test-consensus-node/src/main/java/test/perf/com/jd/blockchain/consensus/node/Settings.java
# source/test/test-consensus-node/src/main/java/test/perf/com/jd/blockchain/consensus/node/WebConfiguration.java
# source/test/test-consensus-node/src/main/resources/application.properties
# source/test/test-integration/pom.xml
# source/test/test-ledger/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-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/DecisionRequestBodyConverter.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/DecisionResponseConverter.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/InitServiceExceptionHandler.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/InitWebSecurityConfiguration.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/InitWebServerConfiguration.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/LedgerInitMessageConverter.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/PermissionResponseConverter.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/SignatureDigestRequestBodyConverter.java
# source/tools/tools-initializer/src/main/resources/META-INF/spring.factories
# source/tools/tools-initializer/src/main/resources/application.properties
# source/tools/tools-keygen-booter/pom.xml
# source/tools/tools-keygen/pom.xml
# source/tools/tools-mocker/pom.xml
# source/utils/.gitignore
# source/utils/pom.xml
# source/utils/utils-common/.gitignore
# source/utils/utils-common/pom.xml
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ArrayUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/AttributeMap.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/Attributes.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/BaseConstant.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/BusinessException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/DataEntry.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/Disposable.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/EmptyProperties.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/IllegalDataException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/IteratorWrapper.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/PathUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/PrimitiveUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/PropertiesUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ReadonlyArrayListWrapper.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ServiceFactory.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/codec/Base58Utils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/codec/DataDecodeException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/codec/HexUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/AsyncFuture.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/AsyncFutureListener.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/CompletableAsyncFuture.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/NamedThreadFactory.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/RuntimeExecutionException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/RuntimeInterruptedException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/RuntimeTimeoutException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/SyncFutureAdaptor.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/ThreadUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/console/CommandConsole.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/console/CommondProcessor.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/decompiler/utils/DecompilerUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/DefaultExceptionHandle.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/EventMulticaster.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/ExceptionHandle.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/ExceptionLoggingHandle.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/RethrowExceptionHandler.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/hash/Hashing.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/hash/MurmurHash3.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/id/KeyGenerator.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/id/KeyGeneratorFactory.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/ByteArray.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesBlob.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesChunkReader.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesChunkWriter.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesEncoding.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesReader.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesWriter.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/EmptyInputStream.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/ForwardReadonlyInputStream.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/NumberMask.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/RuntimeIOException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/UnclosableOutputStream.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/net/NetworkAddress.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/net/NetworkException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/AESUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/AuthenticationException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/DESUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/DecryptionException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/Ed25519Utils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/EncryptionException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/KeyGenerationException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/KeyStoreException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/KeyStoreUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/RSAKeyPair.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/RSAUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/RandomUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/RipeMD160Utils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/ShaUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/transfer/AsyncSendable.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/transfer/Sendable.java
# source/utils/utils-common/src/test/java/test/my/utils/io/BytesEncodingTest.java
# source/utils/utils-common/src/test/java/test/my/utils/io/BytesUtilsTest.java
# source/utils/utils-common/src/test/java/test/my/utils/security/AESUtilsTest.java
# source/utils/utils-common/src/test/java/test/my/utils/security/RSAUtilsTest.java
# source/utils/utils-common/src/test/java/test/my/utils/security/RandomUtilsTest.java
# source/utils/utils-common/src/test/java/test/my/utils/security/ShaUtilsTest.java
# source/utils/utils-http/.gitignore
# source/utils/utils-http/pom.xml
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpAction.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpMethod.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpService.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpServiceConsts.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpServiceContext.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpServiceException.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpStatusException.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/PathParam.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/PropertiesConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestBody.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestParam.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestParamFilter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestParamMap.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/ResponseBodyConverterFactory.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/ResponseConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/StringConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ArgDefEntry.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/AuthorizationAlgs.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/AuthorizationHeader.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/AuthorizationHeaderResovler.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/CustomHeader.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/DefaultResponseConverterFactory.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/HttpServiceAgent.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/HttpServiceConnection.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/IllegalHttpServiceDefinitionException.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/LocalHttpDelete.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/NullRequestParamFilter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PathParamDefinition.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PathParamResolver.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PathParamResolvers.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PojoPropertiesConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PropertiesConverterFactory.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestBodyDefinition.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestBodyResolver.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestBodyResolverComposite.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestBodyResolvers.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestHeader.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestParamDefinition.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestParamMapDefinition.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestParamResolver.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestParamResolvers.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestPathTemplate.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestUtils.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceActionContext.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceConnection.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceConnectionManager.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceEndpoint.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceRequest.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/StringConverterFactory.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/TypeAutoAdaptingRequestBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/auth/Securities.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/ByteArrayBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/ByteArrayResponseConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/EmptyBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/InputStreamBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/JsonBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/JsonConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/JsonResponseConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/NullResponseConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/ObjectToStringBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/ObjectToStringConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/StringResponseConverter.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/BaseRequestSetting.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/ContentRequestSetting.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/CustomBooleanConverter.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/DataResponse.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/GetContentException.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/GetContentResponseConverter.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/GetContentResponseConverterWithException.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/HttpRequestCollector.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/HttpRequestInfo.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/HttpServiceAgentTest.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/HttpTestService.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/MultiRequestBodiesWithDefaultConverterTestService.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/OpType.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/RequestContent.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/TestData.java
# source/utils/utils-serialize/pom.xml
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/binary/BinarySerializeUtils.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/ArrayMergeStrategy.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/GenericType.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONBean.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONBeanDeserializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONBeanSerializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONSerializeUtils.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONString.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONStringDeserializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONStringSerializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/RuntimeDeserializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/ToStringSerializer.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/BinarySerializeUtilsTest.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/Car.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/Entity.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/JSONBeanTest.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/JSONSerializeUtilsTest.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/Level.java
# source/utils/utils-test/.gitignore
# source/utils/utils-test/pom.xml
# source/utils/utils-test/src/main/java/com/jd/blockchain/utils/test/JunitAssertMatcher.java
# source/utils/utils-test/src/main/java/com/jd/blockchain/utils/test/ServletRegister.java
# source/utils/utils-test/src/main/java/com/jd/blockchain/utils/test/WebBoot.java
# source/utils/utils-test/src/main/java/com/jd/blockchain/utils/test/WebTest.java
# source/utils/utils-web-server/.gitignore
# source/utils/utils-web-server/pom.xml
# source/utils/utils-web-server/src/main/java/com/jd/blockchain/utils/web/server/ServletSetting.java
# source/utils/utils-web-server/src/main/java/com/jd/blockchain/utils/web/server/WebServer.java
# source/utils/utils-web-server/src/main/java/com/jd/blockchain/utils/web/server/WebServerDemo.java
# source/utils/utils-web-server/src/main/java/com/jd/blockchain/utils/web/server/WebServerException.java
# source/utils/utils-web/.gitignore
# source/utils/utils-web/pom.xml
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/client/WebResponseConverter.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/client/WebResponseConverterFactory.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/client/WebServiceException.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/model/BinaryMessageConverter.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/model/ErrorCode.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/model/JsonWebResponseMessageConverter.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/model/WebResponse.java
|
6 years ago |
 zhaoguangwei
|
6fbd6edc00
|
1.1.4.RELEASE, sdk-tx-submit and parse the Main-Class;
|
6 years ago |
|
huanghaiquan
|
2abf5e7549
|
upgraded version to 1.1.4-SNAPSHOT;
|
6 years ago |
|
zhaoguangwei
|
7a2ad01c46
|
pom.xml, 1.1.2 -> 1.1.3;
|
6 years ago |
|
zhaoguangwei
|
58a19e473b
|
all: LF;
|
6 years ago |
|
huanghaiquan
|
43977bb96a
|
Refactored directories;
|
6 years ago |
|
huanghaiquan
|
d951e9ae00
|
Upgraded to version 1.1.2.RELEASE;
|
6 years ago |
|
huanghaiquan
|
ae5d7d071d
|
Refactored HashFunction;
|
6 years ago |
|
huanghaiquan
|
1e6e125348
|
Upgrade version to 1.2.0-SNAPSHOT;
|
6 years ago |
|
huanghaiquan
|
e0f7145df8
|
Upgrade version to 1.1.1.RELEASE;
|
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 |
|
huanghaiquan
|
cd56b0812b
|
Refactored the codes of ledger initialization;
|
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 |
 zhanglin33
|
74bc253099
|
replace .getBytes() with BytesUtils.toBytes(), again
|
6 years ago |
|
huanghaiquan
|
e3b9d97f5e
|
Completed configuring crypto service provider in ledger.init file;
|
7 years ago |
|
huanghaiquan
|
8288e0cad7
|
Completed development of adding crypto provider setting to LedgerAdminAccount;
|
7 years ago |
|
huanghaiquan
|
dd021222d7
|
Added crypto-provider attribute to the settings of ledger;
|
7 years ago |
|
huanghaiquan
|
173e4ba768
|
Fixed compiling error;
|
7 years ago |
 shaozhuguang
|
8a4fdc3b6a
|
1. Repairing automatic serialization during gateway initialization
|
7 years ago |
|
shaozhuguang
|
3545a75fa1
|
1. Modify integration test cases;
2. Adding browser to get Settings configuration interface;
3. Repairing BUG of BftSMART Consensus.
|
7 years ago |
|
huanghaiquan
|
4bc5dbf36e
|
Renamed some base types in binary-proto;
|
7 years ago |
|
huanghaiquan
|
f88ef08fc2
|
Moved ValueType from utils-common project to binary-proto project
|
7 years ago |
|
huanghaiquan
|
a6ea1642e7
|
Renamed CryptoServiceProviders to Crypto for simplification purpose.
|
7 years ago |
|
huanghaiquan
|
a69c7d56af
|
Fixed bugs in test case LedgerInitSettingTest;
|
7 years ago |
|
huanghaiquan
|
d52188ff57
|
Fixed bugs in test case LedgerBindingConfigTest .
|
7 years ago |
|
huanghaiquan
|
6de0d8afc9
|
Fixed all compilation errors due to refactoring crypto framework;
|
7 years ago |
|
huanghaiquan
|
047eecf054
|
Rename some of the types in crypto framework for more accurate expression.
|
7 years ago |
|
huanghaiquan
|
eb28dc1ad3
|
Refactoring: change the type of the Algorithm property of class CryptoBytes to type “short”, and modify the relevant code that depends on this property;
|
7 years ago |
|
huanghaiquan
|
215683ea98
|
Refactored packages in crypto framework;
|
7 years ago |
|
huanghaiquan
|
f58c94b445
|
Fixed compilation errors due to merging develop branch;
|
7 years ago |
|
huanghaiquan
|
1ebe607a59
|
Merge branch 'develop' into feature/crypto-spi
* develop:
Modify license files, readme files, and other configurations
change configure files and shell files
change configure files
Fix bugs in test case;
# Conflicts:
# README.md
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoAlgorithm.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/AsymmtricCryptographyImpl.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/HashCryptographyImpl.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/asymmetric/JNIED25519SignatureFunction.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/hash/JNIRIPEMD160HashFunction.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/hash/JNISHA256HashFunction.java
# source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/asymmetric/AsymmtricCryptographyImplTest.java
# source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/hash/HashCryptographyImplTest.java
# source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIED25519UtilsTest.java
# source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIMBSHA256UtilsTest.java
# source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIRIPEMD160UtilsTest.java
# source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNISHA256UtilsTest.java
|
7 years ago |
|
huanghaiquan
|
f2643f05f7
|
Fixed compilation errors due to refactoring crypto-framework;
|
7 years ago |
|
huanghaiquan
|
7780fb64a4
|
Fixed compilation errors in sdk and ledger-model ;
|
7 years ago |
|
zhanglin33
|
e8d277ba97
|
finish SPI junittest, and modify the retrievePubKey method
|
7 years ago |
|
zhanglin33
|
b83e59ad5f
|
providing junit test for symmetric encryption functions, including AESEncryptionFunction and SM4EncryptionFunction.
|
7 years ago |
|
zhanglin33
|
d240ba058f
|
providing junit test for hash functions, including RIPEMD160HashFunction, SHA256HashFunction and SM3HashFunction.
|
7 years ago |
|
huanghaiquan
|
1db8e21811
|
Merge branch 'master' into develop
* master:
Fix bugs in test case;
# Conflicts:
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/asymmetric/JNIED25519SignatureFunction.java
|
7 years ago |
|
huanghaiquan
|
682add6ed2
|
Fix bugs in test case;
|
7 years ago |
|
huanghaiquan
|
d7c1e752c8
|
rebase crypto-spi;
|
7 years ago |
|
huanghaiquan
|
a297d7d5d4
|
Update to version 0.9.0-SNAPSHOT;
|
7 years ago |
|
huanghaiquan
|
43068a0281
|
Init the repository with the 0.8.3.RELEASE version of project;
|
7 years ago |
