Browse Source
Merge tag 'modiftyTransactionState' into develop
1.1.1-PACK20191209 # 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/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/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/pom.xml # source/tools/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/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.xmltags/1.1.2^2
huanghaiquan
4 years ago
1 changed files with 129 additions and 129 deletions
Unified View
Diff Options
+ 129
- 129
source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionState.java
View File
| @@ -1,129 +1,129 @@ | |||||
| package com.jd.blockchain.ledger; | |||||
| import com.jd.blockchain.binaryproto.PrimitiveType; | |||||
| import com.jd.blockchain.binaryproto.EnumContract; | |||||
| import com.jd.blockchain.binaryproto.EnumField; | |||||
| import com.jd.blockchain.consts.DataCodes; | |||||
| /** | |||||
| * 交易（事务）执行状态； | |||||
| * | |||||
| * @author huanghaiquan | |||||
| * | |||||
| */ | |||||
| @EnumContract(code = DataCodes.ENUM_TYPE_TRANSACTION_STATE) | |||||
| public enum TransactionState { | |||||
| /** | |||||
| * 成功； | |||||
| */ | |||||
| SUCCESS((byte) 0), | |||||
| /** | |||||
| * 账本错误； | |||||
| */ | |||||
| LEDGER_ERROR((byte) 0x01), | |||||
| /** | |||||
| * 数据账户不存在； | |||||
| */ | |||||
| DATA_ACCOUNT_DOES_NOT_EXIST((byte) 0x02), | |||||
| /** | |||||
| * 用户不存在； | |||||
| */ | |||||
| USER_DOES_NOT_EXIST((byte) 0x03), | |||||
| /** | |||||
| * 合约不存在； | |||||
| */ | |||||
| CONTRACT_DOES_NOT_EXIST((byte) 0x04), | |||||
| /** | |||||
| * 数据写入时版本冲突； | |||||
| */ | |||||
| DATA_VERSION_CONFLICT((byte) 0x05), | |||||
| /** | |||||
| * 参与方不存在； | |||||
| */ | |||||
| PARTICIPANT_DOES_NOT_EXIST((byte) 0x05), | |||||
| /** | |||||
| * 被安全策略拒绝； | |||||
| */ | |||||
| REJECTED_BY_SECURITY_POLICY((byte) 0x10), | |||||
| /** | |||||
| * 由于在错误的账本上执行交易而被丢弃； | |||||
| */ | |||||
| IGNORED_BY_WRONG_LEDGER((byte) 0x40), | |||||
| /** | |||||
| * 由于交易内容的验签失败而丢弃； | |||||
| */ | |||||
| IGNORED_BY_WRONG_CONTENT_SIGNATURE((byte) 0x41), | |||||
| /** | |||||
| * 由于交易内容的验签失败而丢弃； | |||||
| */ | |||||
| IGNORED_BY_CONFLICTING_STATE((byte) 0x42), | |||||
| /** | |||||
| * 由于交易的整体回滚而丢弃； | |||||
| * <p> | |||||
| * | |||||
| * 注： “整体回滚”是指把交易引入的数据更改以及交易记录本身全部都回滚；<br> | |||||
| * “部分回滚”是指把交易引入的数据更改回滚了，但是交易记录本身以及相应的“交易结果({@link TransactionState})”都会提交；<br> | |||||
| */ | |||||
| IGNORED_BY_TX_FULL_ROLLBACK((byte) 0x43), | |||||
| /** | |||||
| * 由于区块的整体回滚而丢弃； | |||||
| * <p> | |||||
| * | |||||
| * 注： “整体回滚”是指把交易引入的数据更改以及交易记录本身全部都回滚；<br> | |||||
| * | |||||
| * “部分回滚”是指把交易引入的数据更改回滚了，但是交易记录本身以及相应的“交易结果({@link TransactionState})”都会提交；<br> | |||||
| */ | |||||
| IGNORED_BY_BLOCK_FULL_ROLLBACK((byte) 0x44), | |||||
| /** | |||||
| * | |||||
| * 共识阶段加入新区块哈希预计算功能, 如果来自其他Peer的新区块哈希值不一致，本批次整体回滚 | |||||
| * | |||||
| */ | |||||
| IGNORED_BY_CONSENSUS_PHASE_PRECOMPUTE_ROLLBACK((byte) 0x45), | |||||
| /** | |||||
| * 系统错误； | |||||
| */ | |||||
| SYSTEM_ERROR((byte) 0x80), | |||||
| /** | |||||
| * 超时； | |||||
| */ | |||||
| TIMEOUT((byte) 0x81), | |||||
| /** | |||||
| * 共识错误； | |||||
| */ | |||||
| CONSENSUS_ERROR((byte) 0x82); | |||||
| @EnumField(type = PrimitiveType.INT8) | |||||
| public final byte CODE; | |||||
| private TransactionState(byte code) { | |||||
| this.CODE = code; | |||||
| } | |||||
| public static TransactionState valueOf(byte code) { | |||||
| for (TransactionState tr : values()) { | |||||
| if (tr.CODE == code) { | |||||
| return tr; | |||||
| } | |||||
| } | |||||
| throw new IllegalArgumentException("Unsupported transaction result code!"); | |||||
| } | |||||
| } | |||||
| package com.jd.blockchain.ledger; | |||||
| import com.jd.blockchain.binaryproto.PrimitiveType; | |||||
| import com.jd.blockchain.binaryproto.EnumContract; | |||||
| import com.jd.blockchain.binaryproto.EnumField; | |||||
| import com.jd.blockchain.consts.DataCodes; | |||||
| /** | |||||
| * 交易（事务）执行状态； | |||||
| * | |||||
| * @author huanghaiquan | |||||
| * | |||||
| */ | |||||
| @EnumContract(code = DataCodes.ENUM_TYPE_TRANSACTION_STATE) | |||||
| public enum TransactionState { | |||||
| /** | |||||
| * 成功； | |||||
| */ | |||||
| SUCCESS((byte) 0), | |||||
| /** | |||||
| * 账本错误； | |||||
| */ | |||||
| LEDGER_ERROR((byte) 0x01), | |||||
| /** | |||||
| * 数据账户不存在； | |||||
| */ | |||||
| DATA_ACCOUNT_DOES_NOT_EXIST((byte) 0x02), | |||||
| /** | |||||
| * 用户不存在； | |||||
| */ | |||||
| USER_DOES_NOT_EXIST((byte) 0x03), | |||||
| /** | |||||
| * 合约不存在； | |||||
| */ | |||||
| CONTRACT_DOES_NOT_EXIST((byte) 0x04), | |||||
| /** | |||||
| * 数据写入时版本冲突； | |||||
| */ | |||||
| DATA_VERSION_CONFLICT((byte) 0x05), | |||||
| /** | |||||
| * 参与方不存在； | |||||
| */ | |||||
| PARTICIPANT_DOES_NOT_EXIST((byte) 0x06), | |||||
| /** | |||||
| * 被安全策略拒绝； | |||||
| */ | |||||
| REJECTED_BY_SECURITY_POLICY((byte) 0x10), | |||||
| /** | |||||
| * 由于在错误的账本上执行交易而被丢弃； | |||||
| */ | |||||
| IGNORED_BY_WRONG_LEDGER((byte) 0x40), | |||||
| /** | |||||
| * 由于交易内容的验签失败而丢弃； | |||||
| */ | |||||
| IGNORED_BY_WRONG_CONTENT_SIGNATURE((byte) 0x41), | |||||
| /** | |||||
| * 由于交易内容的验签失败而丢弃； | |||||
| */ | |||||
| IGNORED_BY_CONFLICTING_STATE((byte) 0x42), | |||||
| /** | |||||
| * 由于交易的整体回滚而丢弃； | |||||
| * <p> | |||||
| * | |||||
| * 注： “整体回滚”是指把交易引入的数据更改以及交易记录本身全部都回滚；<br> | |||||
| * “部分回滚”是指把交易引入的数据更改回滚了，但是交易记录本身以及相应的“交易结果({@link TransactionState})”都会提交；<br> | |||||
| */ | |||||
| IGNORED_BY_TX_FULL_ROLLBACK((byte) 0x43), | |||||
| /** | |||||
| * 由于区块的整体回滚而丢弃； | |||||
| * <p> | |||||
| * | |||||
| * 注： “整体回滚”是指把交易引入的数据更改以及交易记录本身全部都回滚；<br> | |||||
| * | |||||
| * “部分回滚”是指把交易引入的数据更改回滚了，但是交易记录本身以及相应的“交易结果({@link TransactionState})”都会提交；<br> | |||||
| */ | |||||
| IGNORED_BY_BLOCK_FULL_ROLLBACK((byte) 0x44), | |||||
| /** | |||||
| * | |||||
| * 共识阶段加入新区块哈希预计算功能, 如果来自其他Peer的新区块哈希值不一致，本批次整体回滚 | |||||
| * | |||||
| */ | |||||
| IGNORED_BY_CONSENSUS_PHASE_PRECOMPUTE_ROLLBACK((byte) 0x45), | |||||
| /** | |||||
| * 系统错误； | |||||
| */ | |||||
| SYSTEM_ERROR((byte) 0x80), | |||||
| /** | |||||
| * 超时； | |||||
| */ | |||||
| TIMEOUT((byte) 0x81), | |||||
| /** | |||||
| * 共识错误； | |||||
| */ | |||||
| CONSENSUS_ERROR((byte) 0x82); | |||||
| @EnumField(type = PrimitiveType.INT8) | |||||
| public final byte CODE; | |||||
| private TransactionState(byte code) { | |||||
| this.CODE = code; | |||||
| } | |||||
| public static TransactionState valueOf(byte code) { | |||||
| for (TransactionState tr : values()) { | |||||
| if (tr.CODE == code) { | |||||
| return tr; | |||||
| } | |||||
| } | |||||
| throw new IllegalArgumentException("Unsupported transaction result code!"); | |||||
| } | |||||
| } | |||||