From cd1471d1ed11d222db75f8f7c97d38462d117eb0 Mon Sep 17 00:00:00 2001 From: Nex Date: Tue, 27 Nov 2018 19:53:39 +0800 Subject: [PATCH] Update gRPC API --- .../bdchain/api/grpc/AccountingChainProto.java | 6 +++--- src/main/java/bdchain/api/grpc/CommonProto.java | 8 ++++---- .../bdchain/api/grpc/ErrorDetailsProto.java | 6 +++--- .../api/grpc/TransactionLedgerProto.java | 6 +++--- .../java/bdchain/api/grpc/TransactionType.java | 17 +++++++++++++++++ src/main/proto | 2 +- 6 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/main/java/bdchain/api/grpc/AccountingChainProto.java b/src/main/java/bdchain/api/grpc/AccountingChainProto.java index 232733a..ea4a968 100644 --- a/src/main/java/bdchain/api/grpc/AccountingChainProto.java +++ b/src/main/java/bdchain/api/grpc/AccountingChainProto.java @@ -110,9 +110,9 @@ public final class AccountingChainProto { "in.api.Transaction\022t\n!GetTransactionByBl" + "ockHashAndIndex\0225.bdchain.api.GetTransac" + "tionByBlockHashAndIndexRequest\032\030.bdchain" + - ".api.TransactionBD\n\020bdchain.api.grpcB\024Ac" + - "countingChainProtoP\001Z\030bdchain/api/grpc/a" + - "cchainb\006proto3" + ".api.TransactionBH\n\020bdchain.api.grpcB\024Ac" + + "countingChainProtoP\001Z\034bdchain/sdk/api/gr" + + "pc/acchainb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/src/main/java/bdchain/api/grpc/CommonProto.java b/src/main/java/bdchain/api/grpc/CommonProto.java index 65722ff..f08c695 100644 --- a/src/main/java/bdchain/api/grpc/CommonProto.java +++ b/src/main/java/bdchain/api/grpc/CommonProto.java @@ -30,11 +30,11 @@ public final class CommonProto { java.lang.String[] descriptorData = { "\n\030bdchain/api/common.proto\022\013bdchain.api\"" + "(\n\025ClientVersionResponse\022\017\n\007version\030\001 \001(" + - "\t*Z\n\017TransactionType\022\n\n\006RECORD\020\000\022\013\n\007MESS" + + "\t*o\n\017TransactionType\022\n\n\006RECORD\020\000\022\013\n\007MESS" + "AGE\020\001\022\025\n\021CONTRACT_CREATION\020\002\022\027\n\023CONTRACT" + - "_INVOCATION\020\003B:\n\020bdchain.api.grpcB\013Commo" + - "nProtoP\001Z\027bdchain/api/grpc/commonb\006proto" + - "3" + "_INVOCATION\020\003\022\023\n\017CONTRACT_STATUS\020\004B>\n\020bd" + + "chain.api.grpcB\013CommonProtoP\001Z\033bdchain/s" + + "dk/api/grpc/commonb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/src/main/java/bdchain/api/grpc/ErrorDetailsProto.java b/src/main/java/bdchain/api/grpc/ErrorDetailsProto.java index 4461ea2..8f9b8ad 100644 --- a/src/main/java/bdchain/api/grpc/ErrorDetailsProto.java +++ b/src/main/java/bdchain/api/grpc/ErrorDetailsProto.java @@ -37,9 +37,9 @@ public final class ErrorDetailsProto { "in.api\"\216\001\n\017InvalidArgument\022E\n\020field_viol" + "ations\030\001 \003(\0132+.bdchain.api.InvalidArgume" + "nt.FieldViolation\0324\n\016FieldViolation\022\r\n\005f" + - "ield\030\001 \001(\t\022\023\n\013description\030\002 \001(\tBD\n\020bdcha" + - "in.api.grpcB\021ErrorDetailsProtoP\001Z\033bdchai" + - "n/api/grpc/errdetailsb\006proto3" + "ield\030\001 \001(\t\022\023\n\013description\030\002 \001(\tBH\n\020bdcha" + + "in.api.grpcB\021ErrorDetailsProtoP\001Z\037bdchai" + + "n/sdk/api/grpc/errdetailsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/src/main/java/bdchain/api/grpc/TransactionLedgerProto.java b/src/main/java/bdchain/api/grpc/TransactionLedgerProto.java index 2ef9691..d0ebc96 100644 --- a/src/main/java/bdchain/api/grpc/TransactionLedgerProto.java +++ b/src/main/java/bdchain/api/grpc/TransactionLedgerProto.java @@ -73,9 +73,9 @@ public final class TransactionLedgerProto { "mpty\032\037.bdchain.api.GetLedgersResponse\022\\\n" + "\017SendTransaction\022#.bdchain.api.SendTrans" + "actionRequest\032$.bdchain.api.SendTransact" + - "ionResponseBG\n\020bdchain.api.grpcB\026Transac" + - "tionLedgerProtoP\001Z\031bdchain/api/grpc/txle" + - "dgerb\006proto3" + "ionResponseBK\n\020bdchain.api.grpcB\026Transac" + + "tionLedgerProtoP\001Z\035bdchain/sdk/api/grpc/" + + "txledgerb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/src/main/java/bdchain/api/grpc/TransactionType.java b/src/main/java/bdchain/api/grpc/TransactionType.java index e69f4b2..26a698c 100644 --- a/src/main/java/bdchain/api/grpc/TransactionType.java +++ b/src/main/java/bdchain/api/grpc/TransactionType.java @@ -44,6 +44,14 @@ public enum TransactionType * CONTRACT_INVOCATION = 3; */ CONTRACT_INVOCATION(3), + /** + * 
+   * 合约状态
+   *
+ * + * CONTRACT_STATUS = 4; + */ + CONTRACT_STATUS(4), UNRECOGNIZED(-1), ; @@ -79,6 +87,14 @@ public enum TransactionType * CONTRACT_INVOCATION = 3; */ public static final int CONTRACT_INVOCATION_VALUE = 3; + /** + * 
+   * 合约状态
+   *
+ * + * CONTRACT_STATUS = 4; + */ + public static final int CONTRACT_STATUS_VALUE = 4; public final int getNumber() { @@ -103,6 +119,7 @@ public enum TransactionType case 1: return MESSAGE; case 2: return CONTRACT_CREATION; case 3: return CONTRACT_INVOCATION; + case 4: return CONTRACT_STATUS; default: return null; } } diff --git a/src/main/proto b/src/main/proto index 3c7efb0..07f1e05 160000 --- a/src/main/proto +++ b/src/main/proto @@ -1 +1 @@ -Subproject commit 3c7efb095d6392eec9d30b2c706af52541384095 +Subproject commit 07f1e05962d359da4edd9c931cc5d5a37664237d