diff --git a/source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java b/source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java index e3e2506c..80eaa4f7 100644 --- a/source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java +++ b/source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java @@ -121,12 +121,12 @@ public interface DataCodes { public static final int ACCOUNT_HEADER = 0x710; - public static final int USER = 0x800; + public static final int USER_ACCOUNT_HEADER = 0x800; public static final int DATA = 0x900; // contract related; - public static final int CONTRACT = 0xA00; + public static final int CONTRACT_ACCOUNT_HEADER = 0xA00; // ...0xA19 public static final int HASH = 0xB00; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractInfo.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractInfo.java index cb1da5c4..9ee1a75b 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractInfo.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractInfo.java @@ -5,7 +5,7 @@ import com.jd.blockchain.binaryproto.DataField; import com.jd.blockchain.binaryproto.PrimitiveType; import com.jd.blockchain.consts.DataCodes; -@DataContract(code= DataCodes.CONTRACT) +@DataContract(code= DataCodes.CONTRACT_ACCOUNT_HEADER) public interface ContractInfo extends AccountHeader { @DataField(order=4, primitiveType= PrimitiveType.BYTES) diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserInfo.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserInfo.java index 48759b9f..3ad9ed85 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserInfo.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserInfo.java @@ -4,7 +4,7 @@ import com.jd.blockchain.binaryproto.DataContract; import com.jd.blockchain.consts.DataCodes; import com.jd.blockchain.crypto.PubKey; -@DataContract(code= DataCodes.USER) +@DataContract(code= DataCodes.USER_ACCOUNT_HEADER) public interface UserInfo extends AccountHeader { PubKey getDataPubKey();