diff --git a/api b/api index 60aed81..d5e0c7e 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 60aed81a2ae79870702595979c3158d19fdbb1c7 +Subproject commit d5e0c7e9e427827489c80bcb79ed2ea74a5eff48 diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/Common.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/Common.java index c47a69a..c3382f9 100644 --- a/src/main/java/org/bdware/bdledger/api/grpc/pb/Common.java +++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/Common.java @@ -203,12 +203,22 @@ public final class Common { */ com.google.protobuf.ByteString getBlockHash(); + /** + *
+     * 事务所在的区块产生时的 UNIX 时间戳,单位为秒
+     * 
+ * + * int64 block_timestamp = 2; + * @return The blockTimestamp. + */ + long getBlockTimestamp(); + /** *
      * 事务在区块中的位置 index,当事务处于待确认状态时为`null`
      * 
* - * uint32 index = 2; + * uint32 index = 3; * @return The index. */ int getIndex(); @@ -218,7 +228,7 @@ public final class Common { * 事务的哈希 * * - * bytes hash = 3; + * bytes hash = 4; * @return The hash. */ com.google.protobuf.ByteString getHash(); @@ -228,7 +238,7 @@ public final class Common { * 事务类型 * * - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @return The enum numeric value on the wire for type. */ int getTypeValue(); @@ -237,7 +247,7 @@ public final class Common { * 事务类型 * * - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @return The type. */ org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType(); @@ -247,7 +257,7 @@ public final class Common { * 发送账户地址 * * - * bytes from = 5; + * bytes from = 6; * @return The from. */ com.google.protobuf.ByteString getFrom(); @@ -257,7 +267,7 @@ public final class Common { * 这条事务之前发送者所发送的事务数量 * * - * uint64 nonce = 6; + * uint64 nonce = 7; * @return The nonce. */ long getNonce(); @@ -267,7 +277,7 @@ public final class Common { * 接收账户地址,或者调用的合约地址,或者`null`如为合约创建 * * - * bytes to = 7; + * bytes to = 8; * @return The to. */ com.google.protobuf.ByteString getTo(); @@ -277,7 +287,7 @@ public final class Common { * 数据或合约代码 * * - * bytes data = 8; + * bytes data = 9; * @return The data. */ com.google.protobuf.ByteString getData(); @@ -287,7 +297,7 @@ public final class Common { * ECDSA recovery id * * - * bytes v = 9; + * bytes v = 10; * @return The v. */ com.google.protobuf.ByteString getV(); @@ -297,7 +307,7 @@ public final class Common { * ECDSA signature r * * - * bytes r = 10; + * bytes r = 11; * @return The r. */ com.google.protobuf.ByteString getR(); @@ -307,7 +317,7 @@ public final class Common { * ECDSA signature s * * - * bytes s = 11; + * bytes s = 12; * @return The s. */ com.google.protobuf.ByteString getS(); @@ -373,51 +383,56 @@ public final class Common { } case 16: { + blockTimestamp_ = input.readInt64(); + break; + } + case 24: { + index_ = input.readUInt32(); break; } - case 26: { + case 34: { hash_ = input.readBytes(); break; } - case 32: { + case 40: { int rawValue = input.readEnum(); type_ = rawValue; break; } - case 42: { + case 50: { from_ = input.readBytes(); break; } - case 48: { + case 56: { nonce_ = input.readUInt64(); break; } - case 58: { + case 66: { to_ = input.readBytes(); break; } - case 66: { + case 74: { data_ = input.readBytes(); break; } - case 74: { + case 82: { v_ = input.readBytes(); break; } - case 82: { + case 90: { r_ = input.readBytes(); break; } - case 90: { + case 98: { s_ = input.readBytes(); break; @@ -468,42 +483,56 @@ public final class Common { return blockHash_; } - public static final int INDEX_FIELD_NUMBER = 2; + public static final int BLOCK_TIMESTAMP_FIELD_NUMBER = 2; + private long blockTimestamp_; + /** + *
+     * 事务所在的区块产生时的 UNIX 时间戳,单位为秒
+     * 
+ * + * int64 block_timestamp = 2; + * @return The blockTimestamp. + */ + public long getBlockTimestamp() { + return blockTimestamp_; + } + + public static final int INDEX_FIELD_NUMBER = 3; private int index_; /** *
      * 事务在区块中的位置 index,当事务处于待确认状态时为`null`
      * 
* - * uint32 index = 2; + * uint32 index = 3; * @return The index. */ public int getIndex() { return index_; } - public static final int HASH_FIELD_NUMBER = 3; + public static final int HASH_FIELD_NUMBER = 4; private com.google.protobuf.ByteString hash_; /** *
      * 事务的哈希
      * 
* - * bytes hash = 3; + * bytes hash = 4; * @return The hash. */ public com.google.protobuf.ByteString getHash() { return hash_; } - public static final int TYPE_FIELD_NUMBER = 4; + public static final int TYPE_FIELD_NUMBER = 5; private int type_; /** *
      * 事务类型
      * 
* - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @return The enum numeric value on the wire for type. */ public int getTypeValue() { @@ -514,7 +543,7 @@ public final class Common { * 事务类型 * * - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @return The type. */ public org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType() { @@ -523,98 +552,98 @@ public final class Common { return result == null ? org.bdware.bdledger.api.grpc.pb.Common.TransactionType.UNRECOGNIZED : result; } - public static final int FROM_FIELD_NUMBER = 5; + public static final int FROM_FIELD_NUMBER = 6; private com.google.protobuf.ByteString from_; /** *
      * 发送账户地址
      * 
* - * bytes from = 5; + * bytes from = 6; * @return The from. */ public com.google.protobuf.ByteString getFrom() { return from_; } - public static final int NONCE_FIELD_NUMBER = 6; + public static final int NONCE_FIELD_NUMBER = 7; private long nonce_; /** *
      * 这条事务之前发送者所发送的事务数量
      * 
* - * uint64 nonce = 6; + * uint64 nonce = 7; * @return The nonce. */ public long getNonce() { return nonce_; } - public static final int TO_FIELD_NUMBER = 7; + public static final int TO_FIELD_NUMBER = 8; private com.google.protobuf.ByteString to_; /** *
      * 接收账户地址,或者调用的合约地址,或者`null`如为合约创建
      * 
* - * bytes to = 7; + * bytes to = 8; * @return The to. */ public com.google.protobuf.ByteString getTo() { return to_; } - public static final int DATA_FIELD_NUMBER = 8; + public static final int DATA_FIELD_NUMBER = 9; private com.google.protobuf.ByteString data_; /** *
      * 数据或合约代码
      * 
* - * bytes data = 8; + * bytes data = 9; * @return The data. */ public com.google.protobuf.ByteString getData() { return data_; } - public static final int V_FIELD_NUMBER = 9; + public static final int V_FIELD_NUMBER = 10; private com.google.protobuf.ByteString v_; /** *
      * ECDSA recovery id
      * 
* - * bytes v = 9; + * bytes v = 10; * @return The v. */ public com.google.protobuf.ByteString getV() { return v_; } - public static final int R_FIELD_NUMBER = 10; + public static final int R_FIELD_NUMBER = 11; private com.google.protobuf.ByteString r_; /** *
      * ECDSA signature r
      * 
* - * bytes r = 10; + * bytes r = 11; * @return The r. */ public com.google.protobuf.ByteString getR() { return r_; } - public static final int S_FIELD_NUMBER = 11; + public static final int S_FIELD_NUMBER = 12; private com.google.protobuf.ByteString s_; /** *
      * ECDSA signature s
      * 
* - * bytes s = 11; + * bytes s = 12; * @return The s. */ public com.google.protobuf.ByteString getS() { @@ -638,35 +667,38 @@ public final class Common { if (!blockHash_.isEmpty()) { output.writeBytes(1, blockHash_); } + if (blockTimestamp_ != 0L) { + output.writeInt64(2, blockTimestamp_); + } if (index_ != 0) { - output.writeUInt32(2, index_); + output.writeUInt32(3, index_); } if (!hash_.isEmpty()) { - output.writeBytes(3, hash_); + output.writeBytes(4, hash_); } if (type_ != org.bdware.bdledger.api.grpc.pb.Common.TransactionType.RECORD.getNumber()) { - output.writeEnum(4, type_); + output.writeEnum(5, type_); } if (!from_.isEmpty()) { - output.writeBytes(5, from_); + output.writeBytes(6, from_); } if (nonce_ != 0L) { - output.writeUInt64(6, nonce_); + output.writeUInt64(7, nonce_); } if (!to_.isEmpty()) { - output.writeBytes(7, to_); + output.writeBytes(8, to_); } if (!data_.isEmpty()) { - output.writeBytes(8, data_); + output.writeBytes(9, data_); } if (!v_.isEmpty()) { - output.writeBytes(9, v_); + output.writeBytes(10, v_); } if (!r_.isEmpty()) { - output.writeBytes(10, r_); + output.writeBytes(11, r_); } if (!s_.isEmpty()) { - output.writeBytes(11, s_); + output.writeBytes(12, s_); } unknownFields.writeTo(output); } @@ -681,45 +713,49 @@ public final class Common { size += com.google.protobuf.CodedOutputStream .computeBytesSize(1, blockHash_); } + if (blockTimestamp_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(2, blockTimestamp_); + } if (index_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, index_); + .computeUInt32Size(3, index_); } if (!hash_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, hash_); + .computeBytesSize(4, hash_); } if (type_ != org.bdware.bdledger.api.grpc.pb.Common.TransactionType.RECORD.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(4, type_); + .computeEnumSize(5, type_); } if (!from_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(5, from_); + .computeBytesSize(6, from_); } if (nonce_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(6, nonce_); + .computeUInt64Size(7, nonce_); } if (!to_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(7, to_); + .computeBytesSize(8, to_); } if (!data_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(8, data_); + .computeBytesSize(9, data_); } if (!v_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(9, v_); + .computeBytesSize(10, v_); } if (!r_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(10, r_); + .computeBytesSize(11, r_); } if (!s_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(11, s_); + .computeBytesSize(12, s_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -738,6 +774,8 @@ public final class Common { if (!getBlockHash() .equals(other.getBlockHash())) return false; + if (getBlockTimestamp() + != other.getBlockTimestamp()) return false; if (getIndex() != other.getIndex()) return false; if (!getHash() @@ -770,6 +808,9 @@ public final class Common { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + BLOCK_HASH_FIELD_NUMBER; hash = (53 * hash) + getBlockHash().hashCode(); + hash = (37 * hash) + BLOCK_TIMESTAMP_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getBlockTimestamp()); hash = (37 * hash) + INDEX_FIELD_NUMBER; hash = (53 * hash) + getIndex(); hash = (37 * hash) + HASH_FIELD_NUMBER; @@ -926,6 +967,8 @@ public final class Common { super.clear(); blockHash_ = com.google.protobuf.ByteString.EMPTY; + blockTimestamp_ = 0L; + index_ = 0; hash_ = com.google.protobuf.ByteString.EMPTY; @@ -973,6 +1016,7 @@ public final class Common { public org.bdware.bdledger.api.grpc.pb.Common.Transaction buildPartial() { org.bdware.bdledger.api.grpc.pb.Common.Transaction result = new org.bdware.bdledger.api.grpc.pb.Common.Transaction(this); result.blockHash_ = blockHash_; + result.blockTimestamp_ = blockTimestamp_; result.index_ = index_; result.hash_ = hash_; result.type_ = type_; @@ -1034,6 +1078,9 @@ public final class Common { if (other.getBlockHash() != com.google.protobuf.ByteString.EMPTY) { setBlockHash(other.getBlockHash()); } + if (other.getBlockTimestamp() != 0L) { + setBlockTimestamp(other.getBlockTimestamp()); + } if (other.getIndex() != 0) { setIndex(other.getIndex()); } @@ -1138,13 +1185,55 @@ public final class Common { return this; } + private long blockTimestamp_ ; + /** + *
+       * 事务所在的区块产生时的 UNIX 时间戳,单位为秒
+       * 
+ * + * int64 block_timestamp = 2; + * @return The blockTimestamp. + */ + public long getBlockTimestamp() { + return blockTimestamp_; + } + /** + *
+       * 事务所在的区块产生时的 UNIX 时间戳,单位为秒
+       * 
+ * + * int64 block_timestamp = 2; + * @param value The blockTimestamp to set. + * @return This builder for chaining. + */ + public Builder setBlockTimestamp(long value) { + + blockTimestamp_ = value; + onChanged(); + return this; + } + /** + *
+       * 事务所在的区块产生时的 UNIX 时间戳,单位为秒
+       * 
+ * + * int64 block_timestamp = 2; + * @return This builder for chaining. + */ + public Builder clearBlockTimestamp() { + + blockTimestamp_ = 0L; + onChanged(); + return this; + } + private int index_ ; /** *
        * 事务在区块中的位置 index,当事务处于待确认状态时为`null`
        * 
* - * uint32 index = 2; + * uint32 index = 3; * @return The index. */ public int getIndex() { @@ -1155,7 +1244,7 @@ public final class Common { * 事务在区块中的位置 index,当事务处于待确认状态时为`null` * * - * uint32 index = 2; + * uint32 index = 3; * @param value The index to set. * @return This builder for chaining. */ @@ -1170,7 +1259,7 @@ public final class Common { * 事务在区块中的位置 index,当事务处于待确认状态时为`null` * * - * uint32 index = 2; + * uint32 index = 3; * @return This builder for chaining. */ public Builder clearIndex() { @@ -1186,7 +1275,7 @@ public final class Common { * 事务的哈希 * * - * bytes hash = 3; + * bytes hash = 4; * @return The hash. */ public com.google.protobuf.ByteString getHash() { @@ -1197,7 +1286,7 @@ public final class Common { * 事务的哈希 * * - * bytes hash = 3; + * bytes hash = 4; * @param value The hash to set. * @return This builder for chaining. */ @@ -1215,7 +1304,7 @@ public final class Common { * 事务的哈希 * * - * bytes hash = 3; + * bytes hash = 4; * @return This builder for chaining. */ public Builder clearHash() { @@ -1231,7 +1320,7 @@ public final class Common { * 事务类型 * * - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @return The enum numeric value on the wire for type. */ public int getTypeValue() { @@ -1242,7 +1331,7 @@ public final class Common { * 事务类型 * * - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @param value The enum numeric value on the wire for type to set. * @return This builder for chaining. */ @@ -1256,7 +1345,7 @@ public final class Common { * 事务类型 * * - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @return The type. */ public org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType() { @@ -1269,7 +1358,7 @@ public final class Common { * 事务类型 * * - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @param value The type to set. * @return This builder for chaining. */ @@ -1287,7 +1376,7 @@ public final class Common { * 事务类型 * * - * .bdware.bdledger.api.TransactionType type = 4; + * .bdware.bdledger.api.TransactionType type = 5; * @return This builder for chaining. */ public Builder clearType() { @@ -1303,7 +1392,7 @@ public final class Common { * 发送账户地址 * * - * bytes from = 5; + * bytes from = 6; * @return The from. */ public com.google.protobuf.ByteString getFrom() { @@ -1314,7 +1403,7 @@ public final class Common { * 发送账户地址 * * - * bytes from = 5; + * bytes from = 6; * @param value The from to set. * @return This builder for chaining. */ @@ -1332,7 +1421,7 @@ public final class Common { * 发送账户地址 * * - * bytes from = 5; + * bytes from = 6; * @return This builder for chaining. */ public Builder clearFrom() { @@ -1348,7 +1437,7 @@ public final class Common { * 这条事务之前发送者所发送的事务数量 * * - * uint64 nonce = 6; + * uint64 nonce = 7; * @return The nonce. */ public long getNonce() { @@ -1359,7 +1448,7 @@ public final class Common { * 这条事务之前发送者所发送的事务数量 * * - * uint64 nonce = 6; + * uint64 nonce = 7; * @param value The nonce to set. * @return This builder for chaining. */ @@ -1374,7 +1463,7 @@ public final class Common { * 这条事务之前发送者所发送的事务数量 * * - * uint64 nonce = 6; + * uint64 nonce = 7; * @return This builder for chaining. */ public Builder clearNonce() { @@ -1390,7 +1479,7 @@ public final class Common { * 接收账户地址,或者调用的合约地址,或者`null`如为合约创建 * * - * bytes to = 7; + * bytes to = 8; * @return The to. */ public com.google.protobuf.ByteString getTo() { @@ -1401,7 +1490,7 @@ public final class Common { * 接收账户地址,或者调用的合约地址,或者`null`如为合约创建 * * - * bytes to = 7; + * bytes to = 8; * @param value The to to set. * @return This builder for chaining. */ @@ -1419,7 +1508,7 @@ public final class Common { * 接收账户地址,或者调用的合约地址,或者`null`如为合约创建 * * - * bytes to = 7; + * bytes to = 8; * @return This builder for chaining. */ public Builder clearTo() { @@ -1435,7 +1524,7 @@ public final class Common { * 数据或合约代码 * * - * bytes data = 8; + * bytes data = 9; * @return The data. */ public com.google.protobuf.ByteString getData() { @@ -1446,7 +1535,7 @@ public final class Common { * 数据或合约代码 * * - * bytes data = 8; + * bytes data = 9; * @param value The data to set. * @return This builder for chaining. */ @@ -1464,7 +1553,7 @@ public final class Common { * 数据或合约代码 * * - * bytes data = 8; + * bytes data = 9; * @return This builder for chaining. */ public Builder clearData() { @@ -1480,7 +1569,7 @@ public final class Common { * ECDSA recovery id * * - * bytes v = 9; + * bytes v = 10; * @return The v. */ public com.google.protobuf.ByteString getV() { @@ -1491,7 +1580,7 @@ public final class Common { * ECDSA recovery id * * - * bytes v = 9; + * bytes v = 10; * @param value The v to set. * @return This builder for chaining. */ @@ -1509,7 +1598,7 @@ public final class Common { * ECDSA recovery id * * - * bytes v = 9; + * bytes v = 10; * @return This builder for chaining. */ public Builder clearV() { @@ -1525,7 +1614,7 @@ public final class Common { * ECDSA signature r * * - * bytes r = 10; + * bytes r = 11; * @return The r. */ public com.google.protobuf.ByteString getR() { @@ -1536,7 +1625,7 @@ public final class Common { * ECDSA signature r * * - * bytes r = 10; + * bytes r = 11; * @param value The r to set. * @return This builder for chaining. */ @@ -1554,7 +1643,7 @@ public final class Common { * ECDSA signature r * * - * bytes r = 10; + * bytes r = 11; * @return This builder for chaining. */ public Builder clearR() { @@ -1570,7 +1659,7 @@ public final class Common { * ECDSA signature s * * - * bytes s = 11; + * bytes s = 12; * @return The s. */ public com.google.protobuf.ByteString getS() { @@ -1581,7 +1670,7 @@ public final class Common { * ECDSA signature s * * - * bytes s = 11; + * bytes s = 12; * @param value The s to set. * @return This builder for chaining. */ @@ -1599,7 +1688,7 @@ public final class Common { * ECDSA signature s * * - * bytes s = 11; + * bytes s = 12; * @return This builder for chaining. */ public Builder clearS() { @@ -4960,30 +5049,31 @@ public final class Common { static { java.lang.String[] descriptorData = { "\n bdware/bdledger/api/common.proto\022\023bdwa" + - "re.bdledger.api\"\312\001\n\013Transaction\022\022\n\nblock" + - "_hash\030\001 \001(\014\022\r\n\005index\030\002 \001(\r\022\014\n\004hash\030\003 \001(\014" + - "\0222\n\004type\030\004 \001(\0162$.bdware.bdledger.api.Tra" + - "nsactionType\022\014\n\004from\030\005 \001(\014\022\r\n\005nonce\030\006 \001(" + - "\004\022\n\n\002to\030\007 \001(\014\022\014\n\004data\030\010 \001(\014\022\t\n\001v\030\t \001(\014\022\t" + - "\n\001r\030\n \001(\014\022\t\n\001s\030\013 \001(\014\"\352\001\n\005Block\022\014\n\004hash\030\001" + - " \001(\014\022\025\n\rparent_hashes\030\002 \003(\014\022\021\n\twitnesses" + - "\030\003 \003(\014\022\021\n\ttimestamp\030\004 \001(\003\022\014\n\004size\030\005 \001(\004\022" + - "\031\n\021transaction_count\030\006 \001(\r\022\031\n\021transactio" + - "ns_root\030\007 \001(\014\0226\n\014transactions\030\010 \003(\0132 .bd" + - "ware.bdledger.api.Transaction\022\032\n\022transac" + - "tion_hashes\030\t \003(\014\"\253\002\n\010Contract\022\024\n\014contra" + - "ctName\030\001 \001(\014\022\021\n\trandomNum\030\002 \001(\r\022\021\n\topera" + - "tion\030\003 \001(\014\022\013\n\003arg\030\004 \001(\014\022\014\n\004path\030\005 \001(\014\022\017\n" + - "\007content\030\006 \001(\014\022\016\n\006pubkey\030\007 \001(\014\"\246\001\n\027Contr" + - "actUnitRequestType\022\t\n\005START\020\000\022\010\n\004STOP\020\001\022" + - "\013\n\007EXECUTE\020\002\022\t\n\005REPLY\020\003\022\013\n\007REQUEST\020\004\022\016\n\n" + - "PREPREPARE\020\005\022\013\n\007PREPARE\020\006\022\n\n\006COMMIT\020\007\022\013\n" + - "\007ADDPEER\020\010\022\014\n\010DROPPEER\020\t\022\r\n\tSTATESYNC\020\n*" + - "o\n\017TransactionType\022\n\n\006RECORD\020\000\022\013\n\007MESSAG" + - "E\020\001\022\025\n\021CONTRACT_CREATION\020\002\022\027\n\023CONTRACT_I" + - "NVOCATION\020\003\022\023\n\017CONTRACT_STATUS\020\004BF\n\037org." + - "bdware.bdledger.api.grpc.pbZ#bdware.org/" + - "bdledger/pkg/api/grpc/pbb\006proto3" + "re.bdledger.api\"\343\001\n\013Transaction\022\022\n\nblock" + + "_hash\030\001 \001(\014\022\027\n\017block_timestamp\030\002 \001(\003\022\r\n\005" + + "index\030\003 \001(\r\022\014\n\004hash\030\004 \001(\014\0222\n\004type\030\005 \001(\0162" + + "$.bdware.bdledger.api.TransactionType\022\014\n" + + "\004from\030\006 \001(\014\022\r\n\005nonce\030\007 \001(\004\022\n\n\002to\030\010 \001(\014\022\014" + + "\n\004data\030\t \001(\014\022\t\n\001v\030\n \001(\014\022\t\n\001r\030\013 \001(\014\022\t\n\001s\030" + + "\014 \001(\014\"\352\001\n\005Block\022\014\n\004hash\030\001 \001(\014\022\025\n\rparent_" + + "hashes\030\002 \003(\014\022\021\n\twitnesses\030\003 \003(\014\022\021\n\ttimes" + + "tamp\030\004 \001(\003\022\014\n\004size\030\005 \001(\004\022\031\n\021transaction_" + + "count\030\006 \001(\r\022\031\n\021transactions_root\030\007 \001(\014\0226" + + "\n\014transactions\030\010 \003(\0132 .bdware.bdledger.a" + + "pi.Transaction\022\032\n\022transaction_hashes\030\t \003" + + "(\014\"\253\002\n\010Contract\022\024\n\014contractName\030\001 \001(\014\022\021\n" + + "\trandomNum\030\002 \001(\r\022\021\n\toperation\030\003 \001(\014\022\013\n\003a" + + "rg\030\004 \001(\014\022\014\n\004path\030\005 \001(\014\022\017\n\007content\030\006 \001(\014\022" + + "\016\n\006pubkey\030\007 \001(\014\"\246\001\n\027ContractUnitRequestT" + + "ype\022\t\n\005START\020\000\022\010\n\004STOP\020\001\022\013\n\007EXECUTE\020\002\022\t\n" + + "\005REPLY\020\003\022\013\n\007REQUEST\020\004\022\016\n\nPREPREPARE\020\005\022\013\n" + + "\007PREPARE\020\006\022\n\n\006COMMIT\020\007\022\013\n\007ADDPEER\020\010\022\014\n\010D" + + "ROPPEER\020\t\022\r\n\tSTATESYNC\020\n*o\n\017TransactionT" + + "ype\022\n\n\006RECORD\020\000\022\013\n\007MESSAGE\020\001\022\025\n\021CONTRACT" + + "_CREATION\020\002\022\027\n\023CONTRACT_INVOCATION\020\003\022\023\n\017" + + "CONTRACT_STATUS\020\004BI\n\037org.bdware.bdledger" + + ".api.grpc.pbZ&bdware.org/bdledger/pkg/ap" + + "i/grpc/apipbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -4994,7 +5084,7 @@ public final class Common { internal_static_bdware_bdledger_api_Transaction_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_bdware_bdledger_api_Transaction_descriptor, - new java.lang.String[] { "BlockHash", "Index", "Hash", "Type", "From", "Nonce", "To", "Data", "V", "R", "S", }); + new java.lang.String[] { "BlockHash", "BlockTimestamp", "Index", "Hash", "Type", "From", "Nonce", "To", "Data", "V", "R", "S", }); internal_static_bdware_bdledger_api_Block_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_bdware_bdledger_api_Block_fieldAccessorTable = new diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/ErrorDetails.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/ErrorDetails.java index 57a34e8..59bdfc0 100644 --- a/src/main/java/org/bdware/bdledger/api/grpc/pb/ErrorDetails.java +++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/ErrorDetails.java @@ -1764,9 +1764,9 @@ public final class ErrorDetails { "nt\022M\n\020field_violations\030\001 \003(\01323.bdware.bd" + "ledger.api.InvalidArgument.FieldViolatio" + "n\0324\n\016FieldViolation\022\r\n\005field\030\001 \001(\t\022\023\n\013de" + - "scription\030\002 \001(\tBF\n\037org.bdware.bdledger.a" + - "pi.grpc.pbZ#bdware.org/bdledger/pkg/api/" + - "grpc/pbb\006proto3" + "scription\030\002 \001(\tBI\n\037org.bdware.bdledger.a" + + "pi.grpc.pbZ&bdware.org/bdledger/pkg/api/" + + "grpc/apipbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerGrpc.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerGrpc.java index b47e1ae..8b4ed55 100644 --- a/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerGrpc.java +++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerGrpc.java @@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.27.0)", + value = "by gRPC proto compiler (version 1.30.2)", comments = "Source: bdware/bdledger/api/ledger.proto") public final class LedgerGrpc { diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerOuterClass.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerOuterClass.java index b71d3a3..6d98db8 100644 --- a/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerOuterClass.java +++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerOuterClass.java @@ -3759,8 +3759,9 @@ public final class LedgerOuterClass { "rsResponse\022l\n\017SendTransaction\022+.bdware.b" + "dledger.api.SendTransactionRequest\032,.bdw" + "are.bdledger.api.SendTransactionResponse" + - "BF\n\037org.bdware.bdledger.api.grpc.pbZ#bdw" + - "are.org/bdledger/pkg/api/grpc/pbb\006proto3" + "BI\n\037org.bdware.bdledger.api.grpc.pbZ&bdw" + + "are.org/bdledger/pkg/api/grpc/apipbb\006pro" + + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeGrpc.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeGrpc.java index ad77fb7..ef6edf4 100644 --- a/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeGrpc.java +++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeGrpc.java @@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.27.0)", + value = "by gRPC proto compiler (version 1.30.2)", comments = "Source: bdware/bdledger/api/node.proto") public final class NodeGrpc { diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeOuterClass.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeOuterClass.java index dcd7bb0..09b9e13 100644 --- a/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeOuterClass.java +++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeOuterClass.java @@ -635,9 +635,9 @@ public final class NodeOuterClass { "to\"(\n\025ClientVersionResponse\022\017\n\007version\030\001" + " \001(\t2[\n\004Node\022S\n\rClientVersion\022\026.google.p" + "rotobuf.Empty\032*.bdware.bdledger.api.Clie" + - "ntVersionResponseBF\n\037org.bdware.bdledger" + - ".api.grpc.pbZ#bdware.org/bdledger/pkg/ap" + - "i/grpc/pbb\006proto3" + "ntVersionResponseBI\n\037org.bdware.bdledger" + + ".api.grpc.pbZ&bdware.org/bdledger/pkg/ap" + + "i/grpc/apipbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryGrpc.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryGrpc.java index 1036b59..ae7f2da 100644 --- a/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryGrpc.java +++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryGrpc.java @@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.27.0)", + value = "by gRPC proto compiler (version 1.30.2)", comments = "Source: bdware/bdledger/api/query.proto") public final class QueryGrpc { diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryOuterClass.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryOuterClass.java index 73d8aae..8a01f54 100644 --- a/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryOuterClass.java +++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryOuterClass.java @@ -10841,9 +10841,9 @@ public final class QueryOuterClass { "\032,.bdware.bdledger.api.GetTransactionsRe" + "sponse\022m\n\021CountTransactions\022(.bdware.bdl" + "edger.api.TransactionsRequest\032..bdware.b" + - "dledger.api.CountTransactionsResponseBF\n" + - "\037org.bdware.bdledger.api.grpc.pbZ#bdware" + - ".org/bdledger/pkg/api/grpc/pbb\006proto3" + "dledger.api.CountTransactionsResponseBI\n" + + "\037org.bdware.bdledger.api.grpc.pbZ&bdware" + + ".org/bdledger/pkg/api/grpc/apipbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData,