diff --git a/api b/api
index d5e0c7e..0845a71 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit d5e0c7e9e427827489c80bcb79ed2ea74a5eff48
+Subproject commit 0845a71abad8aee67f858f491c715e4a24106865
diff --git a/src/main/java/org/bdware/bdledger/api/grpc/Client.java b/src/main/java/org/bdware/bdledger/api/grpc/Client.java
index d67ecd5..15a6797 100644
--- a/src/main/java/org/bdware/bdledger/api/grpc/Client.java
+++ b/src/main/java/org/bdware/bdledger/api/grpc/Client.java
@@ -1,19 +1,20 @@
 package org.bdware.bdledger.api.grpc;
 
-import io.grpc.Metadata;
-import io.grpc.stub.MetadataUtils;
-import org.bdware.bdledger.api.grpc.pb.*;
-import org.bdware.bdledger.api.grpc.pb.Common.TransactionType;
-import org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.*;
-import org.bdware.bdledger.api.grpc.pb.NodeOuterClass.*;
-import org.bdware.bdledger.api.grpc.pb.QueryOuterClass.*;
-import org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Empty;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
+import io.grpc.Metadata;
 import io.grpc.StatusRuntimeException;
+import io.grpc.stub.MetadataUtils;
+import org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType;
+import org.bdware.bdledger.api.grpc.pb.LedgerGrpc;
+import org.bdware.bdledger.api.grpc.pb.LedgerProto.*;
+import org.bdware.bdledger.api.grpc.pb.NodeGrpc;
+import org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse;
+import org.bdware.bdledger.api.grpc.pb.QueryGrpc;
+import org.bdware.bdledger.api.grpc.pb.QueryProto.*;
 
 import java.time.ZonedDateTime;
 import java.util.concurrent.TimeUnit;
@@ -103,7 +104,7 @@ public class Client {
     info("*** clientVersion");
 
     try {
-      return nodeFutureStub.clientVersion(Empty.getDefaultInstance());
+      return nodeFutureStub.clientVersion (Empty.getDefaultInstance());
     } catch (StatusRuntimeException e) {
       warning("RPC failed: {0}", e.getStatus());
       return null;
@@ -258,7 +259,7 @@ public class Client {
    * href="#">返回哈希所指定的区块</a>
    * （非阻塞）
    */
-  public ListenableFuture<QueryOuterClass.GetBlockByHashResponse> getBlockByHash(
+  public ListenableFuture<GetBlockByHashResponse> getBlockByHash(
       String ledger, String hash, boolean fullTransactions) {
 
     info(
@@ -430,7 +431,7 @@ public class Client {
     }
   }
 
-  private BlocksRequest blocksRequest(String ledger, long startTimestamp, long endTimestamp, BlocksRequest.IncludeTransactions includeTransactions) {
+  private BlocksRequest blocksRequest(String ledger, long startTimestamp, long endTimestamp, IncludeTransactions includeTransactions) {
 
     BlocksRequest.Builder reqBuilder =
         BlocksRequest.newBuilder().setLedger(ledger);
@@ -441,7 +442,7 @@ public class Client {
       reqBuilder.setEndTimestamp(endTimestamp);
     }
     if (includeTransactions == null) {
-      includeTransactions = BlocksRequest.IncludeTransactions.NONE;
+      includeTransactions = IncludeTransactions.NONE;
     }
     reqBuilder.setIncludeTransactions(includeTransactions);
 
diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/Common.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/CommonProto.java
similarity index 84%
rename from src/main/java/org/bdware/bdledger/api/grpc/pb/Common.java
rename to src/main/java/org/bdware/bdledger/api/grpc/pb/CommonProto.java
index c3382f9..127311e 100644
--- a/src/main/java/org/bdware/bdledger/api/grpc/pb/Common.java
+++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/CommonProto.java
@@ -3,8 +3,8 @@
 
 package org.bdware.bdledger.api.grpc.pb;
 
-public final class Common {
-  private Common() {}
+public final class CommonProto {
+  private CommonProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -163,7 +163,7 @@ public final class Common {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.Common.getDescriptor().getEnumTypes().get(0);
+      return org.bdware.bdledger.api.grpc.pb.CommonProto.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final TransactionType[] VALUES = values();
@@ -250,7 +250,7 @@ public final class Common {
      * <code>.bdware.bdledger.api.TransactionType type = 5;</code>
      * @return The type.
      */
-    org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType getType();
 
     /**
      * <pre>
@@ -458,15 +458,15 @@ public final class Common {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Transaction_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Transaction_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Transaction_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Transaction_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction.class, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.class, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder.class);
     }
 
     public static final int BLOCK_HASH_FIELD_NUMBER = 1;
@@ -546,10 +546,10 @@ public final class Common {
      * <code>.bdware.bdledger.api.TransactionType type = 5;</code>
      * @return The type.
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType() {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType getType() {
       @SuppressWarnings("deprecation")
-      org.bdware.bdledger.api.grpc.pb.Common.TransactionType result = org.bdware.bdledger.api.grpc.pb.Common.TransactionType.valueOf(type_);
-      return result == null ? org.bdware.bdledger.api.grpc.pb.Common.TransactionType.UNRECOGNIZED : result;
+      org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType result = org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.valueOf(type_);
+      return result == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.UNRECOGNIZED : result;
     }
 
     public static final int FROM_FIELD_NUMBER = 6;
@@ -676,7 +676,7 @@ public final class Common {
       if (!hash_.isEmpty()) {
         output.writeBytes(4, hash_);
       }
-      if (type_ != org.bdware.bdledger.api.grpc.pb.Common.TransactionType.RECORD.getNumber()) {
+      if (type_ != org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.RECORD.getNumber()) {
         output.writeEnum(5, type_);
       }
       if (!from_.isEmpty()) {
@@ -725,7 +725,7 @@ public final class Common {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(4, hash_);
       }
-      if (type_ != org.bdware.bdledger.api.grpc.pb.Common.TransactionType.RECORD.getNumber()) {
+      if (type_ != org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.RECORD.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(5, type_);
       }
@@ -767,10 +767,10 @@ public final class Common {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.Common.Transaction)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.Common.Transaction other = (org.bdware.bdledger.api.grpc.pb.Common.Transaction) obj;
+      org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction other = (org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction) obj;
 
       if (!getBlockHash()
           .equals(other.getBlockHash())) return false;
@@ -837,69 +837,69 @@ public final class Common {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -912,7 +912,7 @@ public final class Common {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.Common.Transaction prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -933,21 +933,21 @@ public final class Common {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.Transaction)
-        org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Transaction_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Transaction_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Transaction_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Transaction_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.Common.Transaction.class, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.class, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.Common.Transaction.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -995,17 +995,17 @@ public final class Common {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Transaction_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Transaction_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction build() {
-        org.bdware.bdledger.api.grpc.pb.Common.Transaction result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction build() {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1013,8 +1013,8 @@ public final class Common {
       }
 
       @java.lang.Override
-      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);
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction result = new org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction(this);
         result.blockHash_ = blockHash_;
         result.blockTimestamp_ = blockTimestamp_;
         result.index_ = index_;
@@ -1065,16 +1065,16 @@ public final class Common {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.Common.Transaction) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.Common.Transaction)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.Common.Transaction other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance()) return this;
         if (other.getBlockHash() != com.google.protobuf.ByteString.EMPTY) {
           setBlockHash(other.getBlockHash());
         }
@@ -1126,11 +1126,11 @@ public final class Common {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.Common.Transaction parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.Common.Transaction) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1348,10 +1348,10 @@ public final class Common {
        * <code>.bdware.bdledger.api.TransactionType type = 5;</code>
        * @return The type.
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType getType() {
         @SuppressWarnings("deprecation")
-        org.bdware.bdledger.api.grpc.pb.Common.TransactionType result = org.bdware.bdledger.api.grpc.pb.Common.TransactionType.valueOf(type_);
-        return result == null ? org.bdware.bdledger.api.grpc.pb.Common.TransactionType.UNRECOGNIZED : result;
+        org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType result = org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.valueOf(type_);
+        return result == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.UNRECOGNIZED : result;
       }
       /**
        * <pre>
@@ -1362,7 +1362,7 @@ public final class Common {
        * @param value The type to set.
        * @return This builder for chaining.
        */
-      public Builder setType(org.bdware.bdledger.api.grpc.pb.Common.TransactionType value) {
+      public Builder setType(org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1714,12 +1714,12 @@ public final class Common {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.Transaction)
-    private static final org.bdware.bdledger.api.grpc.pb.Common.Transaction DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.Common.Transaction();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.Common.Transaction getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1744,7 +1744,7 @@ public final class Common {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.Common.Transaction getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1764,12 +1764,32 @@ public final class Common {
      */
     com.google.protobuf.ByteString getHash();
 
+    /**
+     * <pre>
+     * 产块者账户地址
+     * </pre>
+     *
+     * <code>bytes creator = 2;</code>
+     * @return The creator.
+     */
+    com.google.protobuf.ByteString getCreator();
+
+    /**
+     * <pre>
+     * 这个区块之前产块者产生的区块数量
+     * </pre>
+     *
+     * <code>uint64 nonce = 3;</code>
+     * @return The nonce.
+     */
+    long getNonce();
+
     /**
      * <pre>
      * 父区块的哈希
      * </pre>
      *
-     * <code>repeated bytes parent_hashes = 2;</code>
+     * <code>repeated bytes parent_hashes = 4;</code>
      * @return A list containing the parentHashes.
      */
     java.util.List<com.google.protobuf.ByteString> getParentHashesList();
@@ -1778,7 +1798,7 @@ public final class Common {
      * 父区块的哈希
      * </pre>
      *
-     * <code>repeated bytes parent_hashes = 2;</code>
+     * <code>repeated bytes parent_hashes = 4;</code>
      * @return The count of parentHashes.
      */
     int getParentHashesCount();
@@ -1787,7 +1807,7 @@ public final class Common {
      * 父区块的哈希
      * </pre>
      *
-     * <code>repeated bytes parent_hashes = 2;</code>
+     * <code>repeated bytes parent_hashes = 4;</code>
      * @param index The index of the element to return.
      * @return The parentHashes at the given index.
      */
@@ -1798,7 +1818,7 @@ public final class Common {
      * 见证者账户地址
      * </pre>
      *
-     * <code>repeated bytes witnesses = 3;</code>
+     * <code>repeated bytes witnesses = 5;</code>
      * @return A list containing the witnesses.
      */
     java.util.List<com.google.protobuf.ByteString> getWitnessesList();
@@ -1807,7 +1827,7 @@ public final class Common {
      * 见证者账户地址
      * </pre>
      *
-     * <code>repeated bytes witnesses = 3;</code>
+     * <code>repeated bytes witnesses = 5;</code>
      * @return The count of witnesses.
      */
     int getWitnessesCount();
@@ -1816,7 +1836,7 @@ public final class Common {
      * 见证者账户地址
      * </pre>
      *
-     * <code>repeated bytes witnesses = 3;</code>
+     * <code>repeated bytes witnesses = 5;</code>
      * @param index The index of the element to return.
      * @return The witnesses at the given index.
      */
@@ -1827,7 +1847,7 @@ public final class Common {
      * 区块产生时的 UNIX 时间戳，单位为秒
      * </pre>
      *
-     * <code>int64 timestamp = 4;</code>
+     * <code>int64 timestamp = 6;</code>
      * @return The timestamp.
      */
     long getTimestamp();
@@ -1837,7 +1857,7 @@ public final class Common {
      * 区块大小的字节数
      * </pre>
      *
-     * <code>uint64 size = 5;</code>
+     * <code>uint64 size = 7;</code>
      * @return The size.
      */
     long getSize();
@@ -1847,7 +1867,7 @@ public final class Common {
      * 区块包含的事务数量
      * </pre>
      *
-     * <code>uint32 transaction_count = 6;</code>
+     * <code>uint32 transaction_count = 8;</code>
      * @return The transactionCount.
      */
     int getTransactionCount();
@@ -1857,7 +1877,7 @@ public final class Common {
      * 区块的事务默克尔树根
      * </pre>
      *
-     * <code>bytes transactions_root = 7;</code>
+     * <code>bytes transactions_root = 9;</code>
      * @return The transactionsRoot.
      */
     com.google.protobuf.ByteString getTransactionsRoot();
@@ -1867,24 +1887,24 @@ public final class Common {
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
-    java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> 
+    java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> 
         getTransactionsList();
     /**
      * <pre>
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransactions(int index);
+    org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransactions(int index);
     /**
      * <pre>
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
     int getTransactionsCount();
     /**
@@ -1892,18 +1912,18 @@ public final class Common {
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
-    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
         getTransactionsOrBuilderList();
     /**
      * <pre>
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionsOrBuilder(
+    org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionsOrBuilder(
         int index);
 
     /**
@@ -1911,7 +1931,7 @@ public final class Common {
      * 20字节的交易哈希的数组，或为空
      * </pre>
      *
-     * <code>repeated bytes transaction_hashes = 9;</code>
+     * <code>repeated bytes transaction_hashes = 11;</code>
      * @return A list containing the transactionHashes.
      */
     java.util.List<com.google.protobuf.ByteString> getTransactionHashesList();
@@ -1920,7 +1940,7 @@ public final class Common {
      * 20字节的交易哈希的数组，或为空
      * </pre>
      *
-     * <code>repeated bytes transaction_hashes = 9;</code>
+     * <code>repeated bytes transaction_hashes = 11;</code>
      * @return The count of transactionHashes.
      */
     int getTransactionHashesCount();
@@ -1929,7 +1949,7 @@ public final class Common {
      * 20字节的交易哈希的数组，或为空
      * </pre>
      *
-     * <code>repeated bytes transaction_hashes = 9;</code>
+     * <code>repeated bytes transaction_hashes = 11;</code>
      * @param index The index of the element to return.
      * @return The transactionHashes at the given index.
      */
@@ -1949,6 +1969,7 @@ public final class Common {
     }
     private Block() {
       hash_ = com.google.protobuf.ByteString.EMPTY;
+      creator_ = com.google.protobuf.ByteString.EMPTY;
       parentHashes_ = java.util.Collections.emptyList();
       witnesses_ = java.util.Collections.emptyList();
       transactionsRoot_ = com.google.protobuf.ByteString.EMPTY;
@@ -1993,6 +2014,16 @@ public final class Common {
               break;
             }
             case 18: {
+
+              creator_ = input.readBytes();
+              break;
+            }
+            case 24: {
+
+              nonce_ = input.readUInt64();
+              break;
+            }
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 parentHashes_ = new java.util.ArrayList<com.google.protobuf.ByteString>();
                 mutable_bitField0_ |= 0x00000001;
@@ -2000,7 +2031,7 @@ public final class Common {
               parentHashes_.add(input.readBytes());
               break;
             }
-            case 26: {
+            case 42: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 witnesses_ = new java.util.ArrayList<com.google.protobuf.ByteString>();
                 mutable_bitField0_ |= 0x00000002;
@@ -2008,36 +2039,36 @@ public final class Common {
               witnesses_.add(input.readBytes());
               break;
             }
-            case 32: {
+            case 48: {
 
               timestamp_ = input.readInt64();
               break;
             }
-            case 40: {
+            case 56: {
 
               size_ = input.readUInt64();
               break;
             }
-            case 48: {
+            case 64: {
 
               transactionCount_ = input.readUInt32();
               break;
             }
-            case 58: {
+            case 74: {
 
               transactionsRoot_ = input.readBytes();
               break;
             }
-            case 66: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                transactions_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.Common.Transaction>();
+                transactions_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction>();
                 mutable_bitField0_ |= 0x00000004;
               }
               transactions_.add(
-                  input.readMessage(org.bdware.bdledger.api.grpc.pb.Common.Transaction.parser(), extensionRegistry));
+                  input.readMessage(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.parser(), extensionRegistry));
               break;
             }
-            case 74: {
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 transactionHashes_ = new java.util.ArrayList<com.google.protobuf.ByteString>();
                 mutable_bitField0_ |= 0x00000008;
@@ -2078,15 +2109,15 @@ public final class Common {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Block_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Block_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Block_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Block_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.Common.Block.class, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Block.class, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder.class);
     }
 
     public static final int HASH_FIELD_NUMBER = 1;
@@ -2103,14 +2134,42 @@ public final class Common {
       return hash_;
     }
 
-    public static final int PARENT_HASHES_FIELD_NUMBER = 2;
+    public static final int CREATOR_FIELD_NUMBER = 2;
+    private com.google.protobuf.ByteString creator_;
+    /**
+     * <pre>
+     * 产块者账户地址
+     * </pre>
+     *
+     * <code>bytes creator = 2;</code>
+     * @return The creator.
+     */
+    public com.google.protobuf.ByteString getCreator() {
+      return creator_;
+    }
+
+    public static final int NONCE_FIELD_NUMBER = 3;
+    private long nonce_;
+    /**
+     * <pre>
+     * 这个区块之前产块者产生的区块数量
+     * </pre>
+     *
+     * <code>uint64 nonce = 3;</code>
+     * @return The nonce.
+     */
+    public long getNonce() {
+      return nonce_;
+    }
+
+    public static final int PARENT_HASHES_FIELD_NUMBER = 4;
     private java.util.List<com.google.protobuf.ByteString> parentHashes_;
     /**
      * <pre>
      * 父区块的哈希
      * </pre>
      *
-     * <code>repeated bytes parent_hashes = 2;</code>
+     * <code>repeated bytes parent_hashes = 4;</code>
      * @return A list containing the parentHashes.
      */
     public java.util.List<com.google.protobuf.ByteString>
@@ -2122,7 +2181,7 @@ public final class Common {
      * 父区块的哈希
      * </pre>
      *
-     * <code>repeated bytes parent_hashes = 2;</code>
+     * <code>repeated bytes parent_hashes = 4;</code>
      * @return The count of parentHashes.
      */
     public int getParentHashesCount() {
@@ -2133,7 +2192,7 @@ public final class Common {
      * 父区块的哈希
      * </pre>
      *
-     * <code>repeated bytes parent_hashes = 2;</code>
+     * <code>repeated bytes parent_hashes = 4;</code>
      * @param index The index of the element to return.
      * @return The parentHashes at the given index.
      */
@@ -2141,14 +2200,14 @@ public final class Common {
       return parentHashes_.get(index);
     }
 
-    public static final int WITNESSES_FIELD_NUMBER = 3;
+    public static final int WITNESSES_FIELD_NUMBER = 5;
     private java.util.List<com.google.protobuf.ByteString> witnesses_;
     /**
      * <pre>
      * 见证者账户地址
      * </pre>
      *
-     * <code>repeated bytes witnesses = 3;</code>
+     * <code>repeated bytes witnesses = 5;</code>
      * @return A list containing the witnesses.
      */
     public java.util.List<com.google.protobuf.ByteString>
@@ -2160,7 +2219,7 @@ public final class Common {
      * 见证者账户地址
      * </pre>
      *
-     * <code>repeated bytes witnesses = 3;</code>
+     * <code>repeated bytes witnesses = 5;</code>
      * @return The count of witnesses.
      */
     public int getWitnessesCount() {
@@ -2171,7 +2230,7 @@ public final class Common {
      * 见证者账户地址
      * </pre>
      *
-     * <code>repeated bytes witnesses = 3;</code>
+     * <code>repeated bytes witnesses = 5;</code>
      * @param index The index of the element to return.
      * @return The witnesses at the given index.
      */
@@ -2179,72 +2238,72 @@ public final class Common {
       return witnesses_.get(index);
     }
 
-    public static final int TIMESTAMP_FIELD_NUMBER = 4;
+    public static final int TIMESTAMP_FIELD_NUMBER = 6;
     private long timestamp_;
     /**
      * <pre>
      * 区块产生时的 UNIX 时间戳，单位为秒
      * </pre>
      *
-     * <code>int64 timestamp = 4;</code>
+     * <code>int64 timestamp = 6;</code>
      * @return The timestamp.
      */
     public long getTimestamp() {
       return timestamp_;
     }
 
-    public static final int SIZE_FIELD_NUMBER = 5;
+    public static final int SIZE_FIELD_NUMBER = 7;
     private long size_;
     /**
      * <pre>
      * 区块大小的字节数
      * </pre>
      *
-     * <code>uint64 size = 5;</code>
+     * <code>uint64 size = 7;</code>
      * @return The size.
      */
     public long getSize() {
       return size_;
     }
 
-    public static final int TRANSACTION_COUNT_FIELD_NUMBER = 6;
+    public static final int TRANSACTION_COUNT_FIELD_NUMBER = 8;
     private int transactionCount_;
     /**
      * <pre>
      * 区块包含的事务数量
      * </pre>
      *
-     * <code>uint32 transaction_count = 6;</code>
+     * <code>uint32 transaction_count = 8;</code>
      * @return The transactionCount.
      */
     public int getTransactionCount() {
       return transactionCount_;
     }
 
-    public static final int TRANSACTIONS_ROOT_FIELD_NUMBER = 7;
+    public static final int TRANSACTIONS_ROOT_FIELD_NUMBER = 9;
     private com.google.protobuf.ByteString transactionsRoot_;
     /**
      * <pre>
      * 区块的事务默克尔树根
      * </pre>
      *
-     * <code>bytes transactions_root = 7;</code>
+     * <code>bytes transactions_root = 9;</code>
      * @return The transactionsRoot.
      */
     public com.google.protobuf.ByteString getTransactionsRoot() {
       return transactionsRoot_;
     }
 
-    public static final int TRANSACTIONS_FIELD_NUMBER = 8;
-    private java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> transactions_;
+    public static final int TRANSACTIONS_FIELD_NUMBER = 10;
+    private java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> transactions_;
     /**
      * <pre>
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
-    public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> getTransactionsList() {
+    public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> getTransactionsList() {
       return transactions_;
     }
     /**
@@ -2252,9 +2311,9 @@ public final class Common {
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
-    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
         getTransactionsOrBuilderList() {
       return transactions_;
     }
@@ -2263,7 +2322,7 @@ public final class Common {
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
     public int getTransactionsCount() {
       return transactions_.size();
@@ -2273,9 +2332,9 @@ public final class Common {
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransactions(int index) {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransactions(int index) {
       return transactions_.get(index);
     }
     /**
@@ -2283,21 +2342,21 @@ public final class Common {
      * 事务对象的数组，或为空
      * </pre>
      *
-     * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+     * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionsOrBuilder(
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionsOrBuilder(
         int index) {
       return transactions_.get(index);
     }
 
-    public static final int TRANSACTION_HASHES_FIELD_NUMBER = 9;
+    public static final int TRANSACTION_HASHES_FIELD_NUMBER = 11;
     private java.util.List<com.google.protobuf.ByteString> transactionHashes_;
     /**
      * <pre>
      * 20字节的交易哈希的数组，或为空
      * </pre>
      *
-     * <code>repeated bytes transaction_hashes = 9;</code>
+     * <code>repeated bytes transaction_hashes = 11;</code>
      * @return A list containing the transactionHashes.
      */
     public java.util.List<com.google.protobuf.ByteString>
@@ -2309,7 +2368,7 @@ public final class Common {
      * 20字节的交易哈希的数组，或为空
      * </pre>
      *
-     * <code>repeated bytes transaction_hashes = 9;</code>
+     * <code>repeated bytes transaction_hashes = 11;</code>
      * @return The count of transactionHashes.
      */
     public int getTransactionHashesCount() {
@@ -2320,7 +2379,7 @@ public final class Common {
      * 20字节的交易哈希的数组，或为空
      * </pre>
      *
-     * <code>repeated bytes transaction_hashes = 9;</code>
+     * <code>repeated bytes transaction_hashes = 11;</code>
      * @param index The index of the element to return.
      * @return The transactionHashes at the given index.
      */
@@ -2345,29 +2404,35 @@ public final class Common {
       if (!hash_.isEmpty()) {
         output.writeBytes(1, hash_);
       }
+      if (!creator_.isEmpty()) {
+        output.writeBytes(2, creator_);
+      }
+      if (nonce_ != 0L) {
+        output.writeUInt64(3, nonce_);
+      }
       for (int i = 0; i < parentHashes_.size(); i++) {
-        output.writeBytes(2, parentHashes_.get(i));
+        output.writeBytes(4, parentHashes_.get(i));
       }
       for (int i = 0; i < witnesses_.size(); i++) {
-        output.writeBytes(3, witnesses_.get(i));
+        output.writeBytes(5, witnesses_.get(i));
       }
       if (timestamp_ != 0L) {
-        output.writeInt64(4, timestamp_);
+        output.writeInt64(6, timestamp_);
       }
       if (size_ != 0L) {
-        output.writeUInt64(5, size_);
+        output.writeUInt64(7, size_);
       }
       if (transactionCount_ != 0) {
-        output.writeUInt32(6, transactionCount_);
+        output.writeUInt32(8, transactionCount_);
       }
       if (!transactionsRoot_.isEmpty()) {
-        output.writeBytes(7, transactionsRoot_);
+        output.writeBytes(9, transactionsRoot_);
       }
       for (int i = 0; i < transactions_.size(); i++) {
-        output.writeMessage(8, transactions_.get(i));
+        output.writeMessage(10, transactions_.get(i));
       }
       for (int i = 0; i < transactionHashes_.size(); i++) {
-        output.writeBytes(9, transactionHashes_.get(i));
+        output.writeBytes(11, transactionHashes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -2382,6 +2447,14 @@ public final class Common {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(1, hash_);
       }
+      if (!creator_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(2, creator_);
+      }
+      if (nonce_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(3, nonce_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < parentHashes_.size(); i++) {
@@ -2402,23 +2475,23 @@ public final class Common {
       }
       if (timestamp_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(4, timestamp_);
+          .computeInt64Size(6, timestamp_);
       }
       if (size_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, size_);
+          .computeUInt64Size(7, size_);
       }
       if (transactionCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, transactionCount_);
+          .computeUInt32Size(8, transactionCount_);
       }
       if (!transactionsRoot_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(7, transactionsRoot_);
+          .computeBytesSize(9, transactionsRoot_);
       }
       for (int i = 0; i < transactions_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, transactions_.get(i));
+          .computeMessageSize(10, transactions_.get(i));
       }
       {
         int dataSize = 0;
@@ -2439,13 +2512,17 @@ public final class Common {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.Common.Block)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.CommonProto.Block)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.Common.Block other = (org.bdware.bdledger.api.grpc.pb.Common.Block) obj;
+      org.bdware.bdledger.api.grpc.pb.CommonProto.Block other = (org.bdware.bdledger.api.grpc.pb.CommonProto.Block) obj;
 
       if (!getHash()
           .equals(other.getHash())) return false;
+      if (!getCreator()
+          .equals(other.getCreator())) return false;
+      if (getNonce()
+          != other.getNonce()) return false;
       if (!getParentHashesList()
           .equals(other.getParentHashesList())) return false;
       if (!getWitnessesList()
@@ -2475,6 +2552,11 @@ public final class Common {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + HASH_FIELD_NUMBER;
       hash = (53 * hash) + getHash().hashCode();
+      hash = (37 * hash) + CREATOR_FIELD_NUMBER;
+      hash = (53 * hash) + getCreator().hashCode();
+      hash = (37 * hash) + NONCE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getNonce());
       if (getParentHashesCount() > 0) {
         hash = (37 * hash) + PARENT_HASHES_FIELD_NUMBER;
         hash = (53 * hash) + getParentHashesList().hashCode();
@@ -2506,69 +2588,69 @@ public final class Common {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2581,7 +2663,7 @@ public final class Common {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.Common.Block prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.CommonProto.Block prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2602,21 +2684,21 @@ public final class Common {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.Block)
-        org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Block_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Block_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Block_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Block_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.Common.Block.class, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.CommonProto.Block.class, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.Common.Block.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.CommonProto.Block.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2637,6 +2719,10 @@ public final class Common {
         super.clear();
         hash_ = com.google.protobuf.ByteString.EMPTY;
 
+        creator_ = com.google.protobuf.ByteString.EMPTY;
+
+        nonce_ = 0L;
+
         parentHashes_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
         witnesses_ = java.util.Collections.emptyList();
@@ -2663,17 +2749,17 @@ public final class Common {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Block_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Block_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.Common.Block getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.Common.Block.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.Block.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.Common.Block build() {
-        org.bdware.bdledger.api.grpc.pb.Common.Block result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block build() {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Block result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2681,10 +2767,12 @@ public final class Common {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.Common.Block buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.Common.Block result = new org.bdware.bdledger.api.grpc.pb.Common.Block(this);
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Block result = new org.bdware.bdledger.api.grpc.pb.CommonProto.Block(this);
         int from_bitField0_ = bitField0_;
         result.hash_ = hash_;
+        result.creator_ = creator_;
+        result.nonce_ = nonce_;
         if (((bitField0_ & 0x00000001) != 0)) {
           parentHashes_ = java.util.Collections.unmodifiableList(parentHashes_);
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -2751,19 +2839,25 @@ public final class Common {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.Common.Block) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.Common.Block)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.CommonProto.Block) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.CommonProto.Block)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.Common.Block other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.Common.Block.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.CommonProto.Block other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.CommonProto.Block.getDefaultInstance()) return this;
         if (other.getHash() != com.google.protobuf.ByteString.EMPTY) {
           setHash(other.getHash());
         }
+        if (other.getCreator() != com.google.protobuf.ByteString.EMPTY) {
+          setCreator(other.getCreator());
+        }
+        if (other.getNonce() != 0L) {
+          setNonce(other.getNonce());
+        }
         if (!other.parentHashes_.isEmpty()) {
           if (parentHashes_.isEmpty()) {
             parentHashes_ = other.parentHashes_;
@@ -2847,11 +2941,11 @@ public final class Common {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.Common.Block parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Block parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.Common.Block) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.CommonProto.Block) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2907,6 +3001,93 @@ public final class Common {
         return this;
       }
 
+      private com.google.protobuf.ByteString creator_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <pre>
+       * 产块者账户地址
+       * </pre>
+       *
+       * <code>bytes creator = 2;</code>
+       * @return The creator.
+       */
+      public com.google.protobuf.ByteString getCreator() {
+        return creator_;
+      }
+      /**
+       * <pre>
+       * 产块者账户地址
+       * </pre>
+       *
+       * <code>bytes creator = 2;</code>
+       * @param value The creator to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCreator(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        creator_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 产块者账户地址
+       * </pre>
+       *
+       * <code>bytes creator = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCreator() {
+        
+        creator_ = getDefaultInstance().getCreator();
+        onChanged();
+        return this;
+      }
+
+      private long nonce_ ;
+      /**
+       * <pre>
+       * 这个区块之前产块者产生的区块数量
+       * </pre>
+       *
+       * <code>uint64 nonce = 3;</code>
+       * @return The nonce.
+       */
+      public long getNonce() {
+        return nonce_;
+      }
+      /**
+       * <pre>
+       * 这个区块之前产块者产生的区块数量
+       * </pre>
+       *
+       * <code>uint64 nonce = 3;</code>
+       * @param value The nonce to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNonce(long value) {
+        
+        nonce_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 这个区块之前产块者产生的区块数量
+       * </pre>
+       *
+       * <code>uint64 nonce = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNonce() {
+        
+        nonce_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<com.google.protobuf.ByteString> parentHashes_ = java.util.Collections.emptyList();
       private void ensureParentHashesIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -2919,7 +3100,7 @@ public final class Common {
        * 父区块的哈希
        * </pre>
        *
-       * <code>repeated bytes parent_hashes = 2;</code>
+       * <code>repeated bytes parent_hashes = 4;</code>
        * @return A list containing the parentHashes.
        */
       public java.util.List<com.google.protobuf.ByteString>
@@ -2932,7 +3113,7 @@ public final class Common {
        * 父区块的哈希
        * </pre>
        *
-       * <code>repeated bytes parent_hashes = 2;</code>
+       * <code>repeated bytes parent_hashes = 4;</code>
        * @return The count of parentHashes.
        */
       public int getParentHashesCount() {
@@ -2943,7 +3124,7 @@ public final class Common {
        * 父区块的哈希
        * </pre>
        *
-       * <code>repeated bytes parent_hashes = 2;</code>
+       * <code>repeated bytes parent_hashes = 4;</code>
        * @param index The index of the element to return.
        * @return The parentHashes at the given index.
        */
@@ -2955,7 +3136,7 @@ public final class Common {
        * 父区块的哈希
        * </pre>
        *
-       * <code>repeated bytes parent_hashes = 2;</code>
+       * <code>repeated bytes parent_hashes = 4;</code>
        * @param index The index to set the value at.
        * @param value The parentHashes to set.
        * @return This builder for chaining.
@@ -2975,7 +3156,7 @@ public final class Common {
        * 父区块的哈希
        * </pre>
        *
-       * <code>repeated bytes parent_hashes = 2;</code>
+       * <code>repeated bytes parent_hashes = 4;</code>
        * @param value The parentHashes to add.
        * @return This builder for chaining.
        */
@@ -2993,7 +3174,7 @@ public final class Common {
        * 父区块的哈希
        * </pre>
        *
-       * <code>repeated bytes parent_hashes = 2;</code>
+       * <code>repeated bytes parent_hashes = 4;</code>
        * @param values The parentHashes to add.
        * @return This builder for chaining.
        */
@@ -3010,7 +3191,7 @@ public final class Common {
        * 父区块的哈希
        * </pre>
        *
-       * <code>repeated bytes parent_hashes = 2;</code>
+       * <code>repeated bytes parent_hashes = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentHashes() {
@@ -3032,7 +3213,7 @@ public final class Common {
        * 见证者账户地址
        * </pre>
        *
-       * <code>repeated bytes witnesses = 3;</code>
+       * <code>repeated bytes witnesses = 5;</code>
        * @return A list containing the witnesses.
        */
       public java.util.List<com.google.protobuf.ByteString>
@@ -3045,7 +3226,7 @@ public final class Common {
        * 见证者账户地址
        * </pre>
        *
-       * <code>repeated bytes witnesses = 3;</code>
+       * <code>repeated bytes witnesses = 5;</code>
        * @return The count of witnesses.
        */
       public int getWitnessesCount() {
@@ -3056,7 +3237,7 @@ public final class Common {
        * 见证者账户地址
        * </pre>
        *
-       * <code>repeated bytes witnesses = 3;</code>
+       * <code>repeated bytes witnesses = 5;</code>
        * @param index The index of the element to return.
        * @return The witnesses at the given index.
        */
@@ -3068,7 +3249,7 @@ public final class Common {
        * 见证者账户地址
        * </pre>
        *
-       * <code>repeated bytes witnesses = 3;</code>
+       * <code>repeated bytes witnesses = 5;</code>
        * @param index The index to set the value at.
        * @param value The witnesses to set.
        * @return This builder for chaining.
@@ -3088,7 +3269,7 @@ public final class Common {
        * 见证者账户地址
        * </pre>
        *
-       * <code>repeated bytes witnesses = 3;</code>
+       * <code>repeated bytes witnesses = 5;</code>
        * @param value The witnesses to add.
        * @return This builder for chaining.
        */
@@ -3106,7 +3287,7 @@ public final class Common {
        * 见证者账户地址
        * </pre>
        *
-       * <code>repeated bytes witnesses = 3;</code>
+       * <code>repeated bytes witnesses = 5;</code>
        * @param values The witnesses to add.
        * @return This builder for chaining.
        */
@@ -3123,7 +3304,7 @@ public final class Common {
        * 见证者账户地址
        * </pre>
        *
-       * <code>repeated bytes witnesses = 3;</code>
+       * <code>repeated bytes witnesses = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearWitnesses() {
@@ -3139,7 +3320,7 @@ public final class Common {
        * 区块产生时的 UNIX 时间戳，单位为秒
        * </pre>
        *
-       * <code>int64 timestamp = 4;</code>
+       * <code>int64 timestamp = 6;</code>
        * @return The timestamp.
        */
       public long getTimestamp() {
@@ -3150,7 +3331,7 @@ public final class Common {
        * 区块产生时的 UNIX 时间戳，单位为秒
        * </pre>
        *
-       * <code>int64 timestamp = 4;</code>
+       * <code>int64 timestamp = 6;</code>
        * @param value The timestamp to set.
        * @return This builder for chaining.
        */
@@ -3165,7 +3346,7 @@ public final class Common {
        * 区块产生时的 UNIX 时间戳，单位为秒
        * </pre>
        *
-       * <code>int64 timestamp = 4;</code>
+       * <code>int64 timestamp = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearTimestamp() {
@@ -3181,7 +3362,7 @@ public final class Common {
        * 区块大小的字节数
        * </pre>
        *
-       * <code>uint64 size = 5;</code>
+       * <code>uint64 size = 7;</code>
        * @return The size.
        */
       public long getSize() {
@@ -3192,7 +3373,7 @@ public final class Common {
        * 区块大小的字节数
        * </pre>
        *
-       * <code>uint64 size = 5;</code>
+       * <code>uint64 size = 7;</code>
        * @param value The size to set.
        * @return This builder for chaining.
        */
@@ -3207,7 +3388,7 @@ public final class Common {
        * 区块大小的字节数
        * </pre>
        *
-       * <code>uint64 size = 5;</code>
+       * <code>uint64 size = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearSize() {
@@ -3223,7 +3404,7 @@ public final class Common {
        * 区块包含的事务数量
        * </pre>
        *
-       * <code>uint32 transaction_count = 6;</code>
+       * <code>uint32 transaction_count = 8;</code>
        * @return The transactionCount.
        */
       public int getTransactionCount() {
@@ -3234,7 +3415,7 @@ public final class Common {
        * 区块包含的事务数量
        * </pre>
        *
-       * <code>uint32 transaction_count = 6;</code>
+       * <code>uint32 transaction_count = 8;</code>
        * @param value The transactionCount to set.
        * @return This builder for chaining.
        */
@@ -3249,7 +3430,7 @@ public final class Common {
        * 区块包含的事务数量
        * </pre>
        *
-       * <code>uint32 transaction_count = 6;</code>
+       * <code>uint32 transaction_count = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearTransactionCount() {
@@ -3265,7 +3446,7 @@ public final class Common {
        * 区块的事务默克尔树根
        * </pre>
        *
-       * <code>bytes transactions_root = 7;</code>
+       * <code>bytes transactions_root = 9;</code>
        * @return The transactionsRoot.
        */
       public com.google.protobuf.ByteString getTransactionsRoot() {
@@ -3276,7 +3457,7 @@ public final class Common {
        * 区块的事务默克尔树根
        * </pre>
        *
-       * <code>bytes transactions_root = 7;</code>
+       * <code>bytes transactions_root = 9;</code>
        * @param value The transactionsRoot to set.
        * @return This builder for chaining.
        */
@@ -3294,7 +3475,7 @@ public final class Common {
        * 区块的事务默克尔树根
        * </pre>
        *
-       * <code>bytes transactions_root = 7;</code>
+       * <code>bytes transactions_root = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearTransactionsRoot() {
@@ -3304,26 +3485,26 @@ public final class Common {
         return this;
       }
 
-      private java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> transactions_ =
+      private java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> transactions_ =
         java.util.Collections.emptyList();
       private void ensureTransactionsIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          transactions_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.Common.Transaction>(transactions_);
+          transactions_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction>(transactions_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> transactionsBuilder_;
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> transactionsBuilder_;
 
       /**
        * <pre>
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> getTransactionsList() {
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> getTransactionsList() {
         if (transactionsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(transactions_);
         } else {
@@ -3335,7 +3516,7 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public int getTransactionsCount() {
         if (transactionsBuilder_ == null) {
@@ -3349,9 +3530,9 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransactions(int index) {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransactions(int index) {
         if (transactionsBuilder_ == null) {
           return transactions_.get(index);
         } else {
@@ -3363,10 +3544,10 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public Builder setTransactions(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3384,10 +3565,10 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public Builder setTransactions(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder builderForValue) {
         if (transactionsBuilder_ == null) {
           ensureTransactionsIsMutable();
           transactions_.set(index, builderForValue.build());
@@ -3402,9 +3583,9 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public Builder addTransactions(org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+      public Builder addTransactions(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3422,10 +3603,10 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public Builder addTransactions(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3443,10 +3624,10 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public Builder addTransactions(
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder builderForValue) {
         if (transactionsBuilder_ == null) {
           ensureTransactionsIsMutable();
           transactions_.add(builderForValue.build());
@@ -3461,10 +3642,10 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public Builder addTransactions(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder builderForValue) {
         if (transactionsBuilder_ == null) {
           ensureTransactionsIsMutable();
           transactions_.add(index, builderForValue.build());
@@ -3479,10 +3660,10 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public Builder addAllTransactions(
-          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.Common.Transaction> values) {
+          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> values) {
         if (transactionsBuilder_ == null) {
           ensureTransactionsIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -3498,7 +3679,7 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public Builder clearTransactions() {
         if (transactionsBuilder_ == null) {
@@ -3515,7 +3696,7 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
       public Builder removeTransactions(int index) {
         if (transactionsBuilder_ == null) {
@@ -3532,9 +3713,9 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder getTransactionsBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder getTransactionsBuilder(
           int index) {
         return getTransactionsFieldBuilder().getBuilder(index);
       }
@@ -3543,9 +3724,9 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionsOrBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionsOrBuilder(
           int index) {
         if (transactionsBuilder_ == null) {
           return transactions_.get(index);  } else {
@@ -3557,9 +3738,9 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
            getTransactionsOrBuilderList() {
         if (transactionsBuilder_ != null) {
           return transactionsBuilder_.getMessageOrBuilderList();
@@ -3572,41 +3753,41 @@ public final class Common {
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder addTransactionsBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder addTransactionsBuilder() {
         return getTransactionsFieldBuilder().addBuilder(
-            org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance());
+            org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance());
       }
       /**
        * <pre>
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder addTransactionsBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder addTransactionsBuilder(
           int index) {
         return getTransactionsFieldBuilder().addBuilder(
-            index, org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance());
+            index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance());
       }
       /**
        * <pre>
        * 事务对象的数组，或为空
        * </pre>
        *
-       * <code>repeated .bdware.bdledger.api.Transaction transactions = 8;</code>
+       * <code>repeated .bdware.bdledger.api.Transaction transactions = 10;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder> 
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder> 
            getTransactionsBuilderList() {
         return getTransactionsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
           getTransactionsFieldBuilder() {
         if (transactionsBuilder_ == null) {
           transactionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder>(
                   transactions_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
@@ -3628,7 +3809,7 @@ public final class Common {
        * 20字节的交易哈希的数组，或为空
        * </pre>
        *
-       * <code>repeated bytes transaction_hashes = 9;</code>
+       * <code>repeated bytes transaction_hashes = 11;</code>
        * @return A list containing the transactionHashes.
        */
       public java.util.List<com.google.protobuf.ByteString>
@@ -3641,7 +3822,7 @@ public final class Common {
        * 20字节的交易哈希的数组，或为空
        * </pre>
        *
-       * <code>repeated bytes transaction_hashes = 9;</code>
+       * <code>repeated bytes transaction_hashes = 11;</code>
        * @return The count of transactionHashes.
        */
       public int getTransactionHashesCount() {
@@ -3652,7 +3833,7 @@ public final class Common {
        * 20字节的交易哈希的数组，或为空
        * </pre>
        *
-       * <code>repeated bytes transaction_hashes = 9;</code>
+       * <code>repeated bytes transaction_hashes = 11;</code>
        * @param index The index of the element to return.
        * @return The transactionHashes at the given index.
        */
@@ -3664,7 +3845,7 @@ public final class Common {
        * 20字节的交易哈希的数组，或为空
        * </pre>
        *
-       * <code>repeated bytes transaction_hashes = 9;</code>
+       * <code>repeated bytes transaction_hashes = 11;</code>
        * @param index The index to set the value at.
        * @param value The transactionHashes to set.
        * @return This builder for chaining.
@@ -3684,7 +3865,7 @@ public final class Common {
        * 20字节的交易哈希的数组，或为空
        * </pre>
        *
-       * <code>repeated bytes transaction_hashes = 9;</code>
+       * <code>repeated bytes transaction_hashes = 11;</code>
        * @param value The transactionHashes to add.
        * @return This builder for chaining.
        */
@@ -3702,7 +3883,7 @@ public final class Common {
        * 20字节的交易哈希的数组，或为空
        * </pre>
        *
-       * <code>repeated bytes transaction_hashes = 9;</code>
+       * <code>repeated bytes transaction_hashes = 11;</code>
        * @param values The transactionHashes to add.
        * @return This builder for chaining.
        */
@@ -3719,7 +3900,7 @@ public final class Common {
        * 20字节的交易哈希的数组，或为空
        * </pre>
        *
-       * <code>repeated bytes transaction_hashes = 9;</code>
+       * <code>repeated bytes transaction_hashes = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearTransactionHashes() {
@@ -3745,12 +3926,12 @@ public final class Common {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.Block)
-    private static final org.bdware.bdledger.api.grpc.pb.Common.Block DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.CommonProto.Block DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.Common.Block();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.CommonProto.Block();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.Common.Block getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Block getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3775,7 +3956,7 @@ public final class Common {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.Common.Block getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Block getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3962,15 +4143,15 @@ public final class Common {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Contract_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Contract_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Contract_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Contract_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.Common.Contract.class, org.bdware.bdledger.api.grpc.pb.Common.Contract.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Contract.class, org.bdware.bdledger.api.grpc.pb.CommonProto.Contract.Builder.class);
     }
 
     /**
@@ -4132,7 +4313,7 @@ public final class Common {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.Common.Contract.getDescriptor().getEnumTypes().get(0);
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.Contract.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final ContractUnitRequestType[] VALUES = values();
@@ -4338,10 +4519,10 @@ public final class Common {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.Common.Contract)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.CommonProto.Contract)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.Common.Contract other = (org.bdware.bdledger.api.grpc.pb.Common.Contract) obj;
+      org.bdware.bdledger.api.grpc.pb.CommonProto.Contract other = (org.bdware.bdledger.api.grpc.pb.CommonProto.Contract) obj;
 
       if (!getContractName()
           .equals(other.getContractName())) return false;
@@ -4387,69 +4568,69 @@ public final class Common {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4462,7 +4643,7 @@ public final class Common {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.Common.Contract prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.CommonProto.Contract prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4483,21 +4664,21 @@ public final class Common {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.Contract)
-        org.bdware.bdledger.api.grpc.pb.Common.ContractOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.ContractOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Contract_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Contract_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Contract_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Contract_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.Common.Contract.class, org.bdware.bdledger.api.grpc.pb.Common.Contract.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.CommonProto.Contract.class, org.bdware.bdledger.api.grpc.pb.CommonProto.Contract.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.Common.Contract.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.CommonProto.Contract.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -4535,17 +4716,17 @@ public final class Common {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.Common.internal_static_bdware_bdledger_api_Contract_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.internal_static_bdware_bdledger_api_Contract_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.Common.Contract getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.Common.Contract.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Contract getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.CommonProto.Contract.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.Common.Contract build() {
-        org.bdware.bdledger.api.grpc.pb.Common.Contract result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Contract build() {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Contract result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4553,8 +4734,8 @@ public final class Common {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.Common.Contract buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.Common.Contract result = new org.bdware.bdledger.api.grpc.pb.Common.Contract(this);
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Contract buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Contract result = new org.bdware.bdledger.api.grpc.pb.CommonProto.Contract(this);
         result.contractName_ = contractName_;
         result.randomNum_ = randomNum_;
         result.operation_ = operation_;
@@ -4600,16 +4781,16 @@ public final class Common {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.Common.Contract) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.Common.Contract)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.CommonProto.Contract) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.CommonProto.Contract)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.Common.Contract other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.Common.Contract.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.CommonProto.Contract other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.CommonProto.Contract.getDefaultInstance()) return this;
         if (other.getContractName() != com.google.protobuf.ByteString.EMPTY) {
           setContractName(other.getContractName());
         }
@@ -4646,11 +4827,11 @@ public final class Common {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.Common.Contract parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.CommonProto.Contract parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.Common.Contract) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.CommonProto.Contract) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4988,12 +5169,12 @@ public final class Common {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.Contract)
-    private static final org.bdware.bdledger.api.grpc.pb.Common.Contract DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.CommonProto.Contract DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.Common.Contract();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.CommonProto.Contract();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.Common.Contract getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.CommonProto.Contract getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5018,7 +5199,7 @@ public final class Common {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.Common.Contract getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Contract getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5055,25 +5236,26 @@ public final class Common {
       "$.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"
+      "\014 \001(\014\"\212\002\n\005Block\022\014\n\004hash\030\001 \001(\014\022\017\n\007creator" +
+      "\030\002 \001(\014\022\r\n\005nonce\030\003 \001(\004\022\025\n\rparent_hashes\030\004" +
+      " \003(\014\022\021\n\twitnesses\030\005 \003(\014\022\021\n\ttimestamp\030\006 \001" +
+      "(\003\022\014\n\004size\030\007 \001(\004\022\031\n\021transaction_count\030\010 " +
+      "\001(\r\022\031\n\021transactions_root\030\t \001(\014\0226\n\014transa" +
+      "ctions\030\n \003(\0132 .bdware.bdledger.api.Trans" +
+      "action\022\032\n\022transaction_hashes\030\013 \003(\014\"\253\002\n\010C" +
+      "ontract\022\024\n\014contractName\030\001 \001(\014\022\021\n\trandomN" +
+      "um\030\002 \001(\r\022\021\n\toperation\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\006pubke" +
+      "y\030\007 \001(\014\"\246\001\n\027ContractUnitRequestType\022\t\n\005S" +
+      "TART\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\010DROPPEER\020" +
+      "\t\022\r\n\tSTATESYNC\020\n*o\n\017TransactionType\022\n\n\006R" +
+      "ECORD\020\000\022\013\n\007MESSAGE\020\001\022\025\n\021CONTRACT_CREATIO" +
+      "N\020\002\022\027\n\023CONTRACT_INVOCATION\020\003\022\023\n\017CONTRACT" +
+      "_STATUS\020\004BY\n\037org.bdware.bdledger.api.grp" +
+      "c.pbB\013CommonProtoZ)bdware.org/bdledger/p" +
+      "kg/api/grpc/pb;apipbb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -5090,7 +5272,7 @@ public final class Common {
     internal_static_bdware_bdledger_api_Block_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_Block_descriptor,
-        new java.lang.String[] { "Hash", "ParentHashes", "Witnesses", "Timestamp", "Size", "TransactionCount", "TransactionsRoot", "Transactions", "TransactionHashes", });
+        new java.lang.String[] { "Hash", "Creator", "Nonce", "ParentHashes", "Witnesses", "Timestamp", "Size", "TransactionCount", "TransactionsRoot", "Transactions", "TransactionHashes", });
     internal_static_bdware_bdledger_api_Contract_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_bdware_bdledger_api_Contract_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/ErrorDetailsProto.java
similarity index 83%
rename from src/main/java/org/bdware/bdledger/api/grpc/pb/ErrorDetails.java
rename to src/main/java/org/bdware/bdledger/api/grpc/pb/ErrorDetailsProto.java
index 59bdfc0..a0bbc51 100644
--- a/src/main/java/org/bdware/bdledger/api/grpc/pb/ErrorDetails.java
+++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/ErrorDetailsProto.java
@@ -3,8 +3,8 @@
 
 package org.bdware.bdledger.api.grpc.pb;
 
-public final class ErrorDetails {
-  private ErrorDetails() {}
+public final class ErrorDetailsProto {
+  private ErrorDetailsProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -25,7 +25,7 @@ public final class ErrorDetails {
      *
      * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
      */
-    java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation> 
+    java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation> 
         getFieldViolationsList();
     /**
      * <pre>
@@ -34,7 +34,7 @@ public final class ErrorDetails {
      *
      * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation getFieldViolations(int index);
+    org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation getFieldViolations(int index);
     /**
      * <pre>
      * Describes all violations in a client request.
@@ -50,7 +50,7 @@ public final class ErrorDetails {
      *
      * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
      */
-    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder> 
+    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder> 
         getFieldViolationsOrBuilderList();
     /**
      * <pre>
@@ -59,7 +59,7 @@ public final class ErrorDetails {
      *
      * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder getFieldViolationsOrBuilder(
+    org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder getFieldViolationsOrBuilder(
         int index);
   }
   /**
@@ -118,11 +118,11 @@ public final class ErrorDetails {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                fieldViolations_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation>();
+                fieldViolations_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation>();
                 mutable_bitField0_ |= 0x00000001;
               }
               fieldViolations_.add(
-                  input.readMessage(org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.parser(), extensionRegistry));
+                  input.readMessage(org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.parser(), extensionRegistry));
               break;
             }
             default: {
@@ -149,15 +149,15 @@ public final class ErrorDetails {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.class, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.class, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.Builder.class);
     }
 
     public interface FieldViolationOrBuilder extends
@@ -292,15 +292,15 @@ public final class ErrorDetails {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.class, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.class, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder.class);
       }
 
       public static final int FIELD_FIELD_NUMBER = 1;
@@ -440,10 +440,10 @@ public final class ErrorDetails {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation)) {
+        if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation)) {
           return super.equals(obj);
         }
-        org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation other = (org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation) obj;
+        org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation other = (org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation) obj;
 
         if (!getField()
             .equals(other.getField())) return false;
@@ -469,69 +469,69 @@ public final class ErrorDetails {
         return hash;
       }
 
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(
           java.nio.ByteBuffer data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(
           java.nio.ByteBuffer data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(
           com.google.protobuf.ByteString data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(byte[] data)
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(
           byte[] data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(java.io.InputStream input)
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseDelimitedFrom(java.io.InputStream input)
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseDelimitedFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseDelimitedFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -544,7 +544,7 @@ public final class ErrorDetails {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation prototype) {
+      public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -569,21 +569,21 @@ public final class ErrorDetails {
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
           // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.InvalidArgument.FieldViolation)
-          org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder {
+          org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_descriptor;
+          return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_descriptor;
         }
 
         @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_fieldAccessorTable
+          return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.class, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder.class);
+                  org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.class, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder.class);
         }
 
-        // Construct using org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.newBuilder()
+        // Construct using org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -611,17 +611,17 @@ public final class ErrorDetails {
         @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_descriptor;
+          return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_FieldViolation_descriptor;
         }
 
         @java.lang.Override
-        public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation getDefaultInstanceForType() {
-          return org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.getDefaultInstance();
+        public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation getDefaultInstanceForType() {
+          return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.getDefaultInstance();
         }
 
         @java.lang.Override
-        public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation build() {
-          org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation result = buildPartial();
+        public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation build() {
+          org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -629,8 +629,8 @@ public final class ErrorDetails {
         }
 
         @java.lang.Override
-        public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation buildPartial() {
-          org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation result = new org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation(this);
+        public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation buildPartial() {
+          org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation result = new org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation(this);
           result.field_ = field_;
           result.description_ = description_;
           onBuilt();
@@ -671,16 +671,16 @@ public final class ErrorDetails {
         }
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation) {
-            return mergeFrom((org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation)other);
+          if (other instanceof org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation) {
+            return mergeFrom((org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation other) {
-          if (other == org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation other) {
+          if (other == org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.getDefaultInstance()) return this;
           if (!other.getField().isEmpty()) {
             field_ = other.field_;
             onChanged();
@@ -704,11 +704,11 @@ public final class ErrorDetails {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation parsedMessage = null;
+          org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation) e.getUnfinishedMessage();
+            parsedMessage = (org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -936,12 +936,12 @@ public final class ErrorDetails {
       }
 
       // @@protoc_insertion_point(class_scope:bdware.bdledger.api.InvalidArgument.FieldViolation)
-      private static final org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation DEFAULT_INSTANCE;
+      private static final org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation();
+        DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation();
       }
 
-      public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation getDefaultInstance() {
+      public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
@@ -966,14 +966,14 @@ public final class ErrorDetails {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation getDefaultInstanceForType() {
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
     }
 
     public static final int FIELD_VIOLATIONS_FIELD_NUMBER = 1;
-    private java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation> fieldViolations_;
+    private java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation> fieldViolations_;
     /**
      * <pre>
      * Describes all violations in a client request.
@@ -981,7 +981,7 @@ public final class ErrorDetails {
      *
      * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
      */
-    public java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation> getFieldViolationsList() {
+    public java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation> getFieldViolationsList() {
       return fieldViolations_;
     }
     /**
@@ -991,7 +991,7 @@ public final class ErrorDetails {
      *
      * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
      */
-    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder> 
+    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder> 
         getFieldViolationsOrBuilderList() {
       return fieldViolations_;
     }
@@ -1012,7 +1012,7 @@ public final class ErrorDetails {
      *
      * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation getFieldViolations(int index) {
+    public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation getFieldViolations(int index) {
       return fieldViolations_.get(index);
     }
     /**
@@ -1022,7 +1022,7 @@ public final class ErrorDetails {
      *
      * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder getFieldViolationsOrBuilder(
+    public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder getFieldViolationsOrBuilder(
         int index) {
       return fieldViolations_.get(index);
     }
@@ -1067,10 +1067,10 @@ public final class ErrorDetails {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument other = (org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument) obj;
+      org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument other = (org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument) obj;
 
       if (!getFieldViolationsList()
           .equals(other.getFieldViolationsList())) return false;
@@ -1094,69 +1094,69 @@ public final class ErrorDetails {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1169,7 +1169,7 @@ public final class ErrorDetails {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1197,21 +1197,21 @@ public final class ErrorDetails {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.InvalidArgument)
-        org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgumentOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgumentOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.class, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.class, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1242,17 +1242,17 @@ public final class ErrorDetails {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.ErrorDetails.internal_static_bdware_bdledger_api_InvalidArgument_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.internal_static_bdware_bdledger_api_InvalidArgument_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument build() {
-        org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument build() {
+        org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1260,8 +1260,8 @@ public final class ErrorDetails {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument result = new org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument(this);
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument result = new org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument(this);
         int from_bitField0_ = bitField0_;
         if (fieldViolationsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -1310,16 +1310,16 @@ public final class ErrorDetails {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.getDefaultInstance()) return this;
         if (fieldViolationsBuilder_ == null) {
           if (!other.fieldViolations_.isEmpty()) {
             if (fieldViolations_.isEmpty()) {
@@ -1361,11 +1361,11 @@ public final class ErrorDetails {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1376,17 +1376,17 @@ public final class ErrorDetails {
       }
       private int bitField0_;
 
-      private java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation> fieldViolations_ =
+      private java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation> fieldViolations_ =
         java.util.Collections.emptyList();
       private void ensureFieldViolationsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          fieldViolations_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation>(fieldViolations_);
+          fieldViolations_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation>(fieldViolations_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder> fieldViolationsBuilder_;
+          org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder> fieldViolationsBuilder_;
 
       /**
        * <pre>
@@ -1395,7 +1395,7 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation> getFieldViolationsList() {
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation> getFieldViolationsList() {
         if (fieldViolationsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(fieldViolations_);
         } else {
@@ -1423,7 +1423,7 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation getFieldViolations(int index) {
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation getFieldViolations(int index) {
         if (fieldViolationsBuilder_ == null) {
           return fieldViolations_.get(index);
         } else {
@@ -1438,7 +1438,7 @@ public final class ErrorDetails {
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
       public Builder setFieldViolations(
-          int index, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation value) {
+          int index, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation value) {
         if (fieldViolationsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1459,7 +1459,7 @@ public final class ErrorDetails {
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
       public Builder setFieldViolations(
-          int index, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder builderForValue) {
         if (fieldViolationsBuilder_ == null) {
           ensureFieldViolationsIsMutable();
           fieldViolations_.set(index, builderForValue.build());
@@ -1476,7 +1476,7 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public Builder addFieldViolations(org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation value) {
+      public Builder addFieldViolations(org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation value) {
         if (fieldViolationsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1497,7 +1497,7 @@ public final class ErrorDetails {
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
       public Builder addFieldViolations(
-          int index, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation value) {
+          int index, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation value) {
         if (fieldViolationsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1518,7 +1518,7 @@ public final class ErrorDetails {
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
       public Builder addFieldViolations(
-          org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder builderForValue) {
         if (fieldViolationsBuilder_ == null) {
           ensureFieldViolationsIsMutable();
           fieldViolations_.add(builderForValue.build());
@@ -1536,7 +1536,7 @@ public final class ErrorDetails {
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
       public Builder addFieldViolations(
-          int index, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder builderForValue) {
         if (fieldViolationsBuilder_ == null) {
           ensureFieldViolationsIsMutable();
           fieldViolations_.add(index, builderForValue.build());
@@ -1554,7 +1554,7 @@ public final class ErrorDetails {
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
       public Builder addAllFieldViolations(
-          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation> values) {
+          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation> values) {
         if (fieldViolationsBuilder_ == null) {
           ensureFieldViolationsIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -1606,7 +1606,7 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder getFieldViolationsBuilder(
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder getFieldViolationsBuilder(
           int index) {
         return getFieldViolationsFieldBuilder().getBuilder(index);
       }
@@ -1617,7 +1617,7 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder getFieldViolationsOrBuilder(
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder getFieldViolationsOrBuilder(
           int index) {
         if (fieldViolationsBuilder_ == null) {
           return fieldViolations_.get(index);  } else {
@@ -1631,7 +1631,7 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder> 
+      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder> 
            getFieldViolationsOrBuilderList() {
         if (fieldViolationsBuilder_ != null) {
           return fieldViolationsBuilder_.getMessageOrBuilderList();
@@ -1646,9 +1646,9 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder addFieldViolationsBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder addFieldViolationsBuilder() {
         return getFieldViolationsFieldBuilder().addBuilder(
-            org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.getDefaultInstance());
+            org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.getDefaultInstance());
       }
       /**
        * <pre>
@@ -1657,10 +1657,10 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder addFieldViolationsBuilder(
+      public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder addFieldViolationsBuilder(
           int index) {
         return getFieldViolationsFieldBuilder().addBuilder(
-            index, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.getDefaultInstance());
+            index, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.getDefaultInstance());
       }
       /**
        * <pre>
@@ -1669,16 +1669,16 @@ public final class ErrorDetails {
        *
        * <code>repeated .bdware.bdledger.api.InvalidArgument.FieldViolation field_violations = 1;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder> 
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder> 
            getFieldViolationsBuilderList() {
         return getFieldViolationsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder> 
           getFieldViolationsFieldBuilder() {
         if (fieldViolationsBuilder_ == null) {
           fieldViolationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolation.Builder, org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument.FieldViolationOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolation.Builder, org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument.FieldViolationOrBuilder>(
                   fieldViolations_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -1704,12 +1704,12 @@ public final class ErrorDetails {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.InvalidArgument)
-    private static final org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1734,7 +1734,7 @@ public final class ErrorDetails {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.ErrorDetails.InvalidArgument getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.ErrorDetailsProto.InvalidArgument getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -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(\tBI\n\037org.bdware.bdledger.a" +
-      "pi.grpc.pbZ&bdware.org/bdledger/pkg/api/" +
-      "grpc/apipbb\006proto3"
+      "scription\030\002 \001(\tB_\n\037org.bdware.bdledger.a" +
+      "pi.grpc.pbB\021ErrorDetailsProtoZ)bdware.or" +
+      "g/bdledger/pkg/api/grpc/pb;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 8b4ed55..c2fb4c5 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.30.2)",
+    value = "by gRPC proto compiler (version 1.32.1)",
     comments = "Source: bdware/bdledger/api/ledger.proto")
 public final class LedgerGrpc {
 
@@ -27,29 +27,29 @@ public final class LedgerGrpc {
   public static final String SERVICE_NAME = "bdware.bdledger.api.Ledger";
 
   // Static method descriptors that strictly reflect the proto.
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest,
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse> getCreateLedgerMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest,
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse> getCreateLedgerMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "CreateLedger",
-      requestType = org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest,
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse> getCreateLedgerMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse> getCreateLedgerMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest,
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse> getCreateLedgerMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest, org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse> getCreateLedgerMethod;
     if ((getCreateLedgerMethod = LedgerGrpc.getCreateLedgerMethod) == null) {
       synchronized (LedgerGrpc.class) {
         if ((getCreateLedgerMethod = LedgerGrpc.getCreateLedgerMethod) == null) {
           LedgerGrpc.getCreateLedgerMethod = getCreateLedgerMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest, org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CreateLedger"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.getDefaultInstance()))
               .setSchemaDescriptor(new LedgerMethodDescriptorSupplier("CreateLedger"))
               .build();
         }
@@ -59,28 +59,28 @@ public final class LedgerGrpc {
   }
 
   private static volatile io.grpc.MethodDescriptor<com.google.protobuf.Empty,
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse> getGetLedgersMethod;
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse> getGetLedgersMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "GetLedgers",
       requestType = com.google.protobuf.Empty.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<com.google.protobuf.Empty,
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse> getGetLedgersMethod() {
-    io.grpc.MethodDescriptor<com.google.protobuf.Empty, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse> getGetLedgersMethod;
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse> getGetLedgersMethod() {
+    io.grpc.MethodDescriptor<com.google.protobuf.Empty, org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse> getGetLedgersMethod;
     if ((getGetLedgersMethod = LedgerGrpc.getGetLedgersMethod) == null) {
       synchronized (LedgerGrpc.class) {
         if ((getGetLedgersMethod = LedgerGrpc.getGetLedgersMethod) == null) {
           LedgerGrpc.getGetLedgersMethod = getGetLedgersMethod =
-              io.grpc.MethodDescriptor.<com.google.protobuf.Empty, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse>newBuilder()
+              io.grpc.MethodDescriptor.<com.google.protobuf.Empty, org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetLedgers"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
                   com.google.protobuf.Empty.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.getDefaultInstance()))
               .setSchemaDescriptor(new LedgerMethodDescriptorSupplier("GetLedgers"))
               .build();
         }
@@ -89,29 +89,29 @@ public final class LedgerGrpc {
     return getGetLedgersMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest,
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse> getSendTransactionMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest,
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse> getSendTransactionMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "SendTransaction",
-      requestType = org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest,
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse> getSendTransactionMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse> getSendTransactionMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest,
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse> getSendTransactionMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse> getSendTransactionMethod;
     if ((getSendTransactionMethod = LedgerGrpc.getSendTransactionMethod) == null) {
       synchronized (LedgerGrpc.class) {
         if ((getSendTransactionMethod = LedgerGrpc.getSendTransactionMethod) == null) {
           LedgerGrpc.getSendTransactionMethod = getSendTransactionMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SendTransaction"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.getDefaultInstance()))
               .setSchemaDescriptor(new LedgerMethodDescriptorSupplier("SendTransaction"))
               .build();
         }
@@ -175,8 +175,8 @@ public final class LedgerGrpc {
      * 创建一个新账本
      * </pre>
      */
-    public void createLedger(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse> responseObserver) {
+    public void createLedger(org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getCreateLedgerMethod(), responseObserver);
     }
 
@@ -188,7 +188,7 @@ public final class LedgerGrpc {
      * </pre>
      */
     public void getLedgers(com.google.protobuf.Empty request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse> responseObserver) {
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getGetLedgersMethod(), responseObserver);
     }
 
@@ -199,8 +199,8 @@ public final class LedgerGrpc {
      * 发送一个新事务
      * </pre>
      */
-    public void sendTransaction(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse> responseObserver) {
+    public void sendTransaction(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getSendTransactionMethod(), responseObserver);
     }
 
@@ -210,22 +210,22 @@ public final class LedgerGrpc {
             getCreateLedgerMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest,
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse>(
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest,
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse>(
                   this, METHODID_CREATE_LEDGER)))
           .addMethod(
             getGetLedgersMethod(),
             asyncUnaryCall(
               new MethodHandlers<
                 com.google.protobuf.Empty,
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse>(
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse>(
                   this, METHODID_GET_LEDGERS)))
           .addMethod(
             getSendTransactionMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest,
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse>(
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest,
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse>(
                   this, METHODID_SEND_TRANSACTION)))
           .build();
     }
@@ -252,8 +252,8 @@ public final class LedgerGrpc {
      * 创建一个新账本
      * </pre>
      */
-    public void createLedger(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse> responseObserver) {
+    public void createLedger(org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getCreateLedgerMethod(), getCallOptions()), request, responseObserver);
     }
@@ -266,7 +266,7 @@ public final class LedgerGrpc {
      * </pre>
      */
     public void getLedgers(com.google.protobuf.Empty request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse> responseObserver) {
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getGetLedgersMethod(), getCallOptions()), request, responseObserver);
     }
@@ -278,8 +278,8 @@ public final class LedgerGrpc {
      * 发送一个新事务
      * </pre>
      */
-    public void sendTransaction(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse> responseObserver) {
+    public void sendTransaction(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getSendTransactionMethod(), getCallOptions()), request, responseObserver);
     }
@@ -306,7 +306,7 @@ public final class LedgerGrpc {
      * 创建一个新账本
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse createLedger(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse createLedger(org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest request) {
       return blockingUnaryCall(
           getChannel(), getCreateLedgerMethod(), getCallOptions(), request);
     }
@@ -318,7 +318,7 @@ public final class LedgerGrpc {
      * 查询所有帐本列表
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse getLedgers(com.google.protobuf.Empty request) {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse getLedgers(com.google.protobuf.Empty request) {
       return blockingUnaryCall(
           getChannel(), getGetLedgersMethod(), getCallOptions(), request);
     }
@@ -330,7 +330,7 @@ public final class LedgerGrpc {
      * 发送一个新事务
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse sendTransaction(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse sendTransaction(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest request) {
       return blockingUnaryCall(
           getChannel(), getSendTransactionMethod(), getCallOptions(), request);
     }
@@ -357,8 +357,8 @@ public final class LedgerGrpc {
      * 创建一个新账本
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse> createLedger(
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse> createLedger(
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getCreateLedgerMethod(), getCallOptions()), request);
     }
@@ -370,7 +370,7 @@ public final class LedgerGrpc {
      * 查询所有帐本列表
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse> getLedgers(
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse> getLedgers(
         com.google.protobuf.Empty request) {
       return futureUnaryCall(
           getChannel().newCall(getGetLedgersMethod(), getCallOptions()), request);
@@ -383,8 +383,8 @@ public final class LedgerGrpc {
      * 发送一个新事务
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse> sendTransaction(
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse> sendTransaction(
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getSendTransactionMethod(), getCallOptions()), request);
     }
@@ -412,16 +412,16 @@ public final class LedgerGrpc {
     public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
       switch (methodId) {
         case METHODID_CREATE_LEDGER:
-          serviceImpl.createLedger((org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse>) responseObserver);
+          serviceImpl.createLedger((org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse>) responseObserver);
           break;
         case METHODID_GET_LEDGERS:
           serviceImpl.getLedgers((com.google.protobuf.Empty) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse>) responseObserver);
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse>) responseObserver);
           break;
         case METHODID_SEND_TRANSACTION:
-          serviceImpl.sendTransaction((org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse>) responseObserver);
+          serviceImpl.sendTransaction((org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse>) responseObserver);
           break;
         default:
           throw new AssertionError();
@@ -445,7 +445,7 @@ public final class LedgerGrpc {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.getDescriptor();
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.getDescriptor();
     }
 
     @java.lang.Override
diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerOuterClass.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerProto.java
similarity index 78%
rename from src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerOuterClass.java
rename to src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerProto.java
index 6d98db8..f402a12 100644
--- a/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerOuterClass.java
+++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/LedgerProto.java
@@ -3,8 +3,8 @@
 
 package org.bdware.bdledger.api.grpc.pb;
 
-public final class LedgerOuterClass {
-  private LedgerOuterClass() {}
+public final class LedgerProto {
+  private LedgerProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -103,15 +103,15 @@ public final class LedgerOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerRequest_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerRequest_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.Builder.class);
     }
 
     public static final int NAME_FIELD_NUMBER = 1;
@@ -189,10 +189,10 @@ public final class LedgerOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest other = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest) obj;
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest other = (org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest) obj;
 
       if (!getName()
           .equals(other.getName())) return false;
@@ -214,69 +214,69 @@ public final class LedgerOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -289,7 +289,7 @@ public final class LedgerOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -310,21 +310,21 @@ public final class LedgerOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.CreateLedgerRequest)
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequestOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerRequest_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -350,17 +350,17 @@ public final class LedgerOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerRequest_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest build() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest build() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -368,8 +368,8 @@ public final class LedgerOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest result = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest(this);
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest result = new org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest(this);
         result.name_ = name_;
         onBuilt();
         return result;
@@ -409,16 +409,16 @@ public final class LedgerOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest.getDefaultInstance()) return this;
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
           onChanged();
@@ -438,11 +438,11 @@ public final class LedgerOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -544,12 +544,12 @@ public final class LedgerOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.CreateLedgerRequest)
-    private static final org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -574,7 +574,7 @@ public final class LedgerOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerRequest getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -661,15 +661,15 @@ public final class LedgerOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.Builder.class);
     }
 
     public static final int OK_FIELD_NUMBER = 1;
@@ -722,10 +722,10 @@ public final class LedgerOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse other = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse other = (org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse) obj;
 
       if (getOk()
           != other.getOk()) return false;
@@ -748,69 +748,69 @@ public final class LedgerOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -823,7 +823,7 @@ public final class LedgerOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -844,21 +844,21 @@ public final class LedgerOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.CreateLedgerResponse)
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -884,17 +884,17 @@ public final class LedgerOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_CreateLedgerResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_CreateLedgerResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse build() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse build() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -902,8 +902,8 @@ public final class LedgerOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse result = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse result = new org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse(this);
         result.ok_ = ok_;
         onBuilt();
         return result;
@@ -943,16 +943,16 @@ public final class LedgerOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse.getDefaultInstance()) return this;
         if (other.getOk() != false) {
           setOk(other.getOk());
         }
@@ -971,11 +971,11 @@ public final class LedgerOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1031,12 +1031,12 @@ public final class LedgerOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.CreateLedgerResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1061,7 +1061,7 @@ public final class LedgerOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.CreateLedgerResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.CreateLedgerResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1176,15 +1176,15 @@ public final class LedgerOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_GetLedgersResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_GetLedgersResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_GetLedgersResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_GetLedgersResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.Builder.class);
     }
 
     public static final int LEDGERS_FIELD_NUMBER = 1;
@@ -1266,10 +1266,10 @@ public final class LedgerOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse other = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse other = (org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse) obj;
 
       if (!getLedgersList()
           .equals(other.getLedgersList())) return false;
@@ -1293,69 +1293,69 @@ public final class LedgerOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1368,7 +1368,7 @@ public final class LedgerOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1389,21 +1389,21 @@ public final class LedgerOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetLedgersResponse)
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_GetLedgersResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_GetLedgersResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_GetLedgersResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_GetLedgersResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1429,17 +1429,17 @@ public final class LedgerOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_GetLedgersResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_GetLedgersResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse build() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse build() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1447,8 +1447,8 @@ public final class LedgerOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse result = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse result = new org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
           ledgers_ = ledgers_.getUnmodifiableView();
@@ -1493,16 +1493,16 @@ public final class LedgerOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse.getDefaultInstance()) return this;
         if (!other.ledgers_.isEmpty()) {
           if (ledgers_.isEmpty()) {
             ledgers_ = other.ledgers_;
@@ -1528,11 +1528,11 @@ public final class LedgerOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1669,12 +1669,12 @@ public final class LedgerOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetLedgersResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1699,7 +1699,7 @@ public final class LedgerOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1730,11 +1730,11 @@ public final class LedgerOuterClass {
      * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
      * @return The transaction.
      */
-    org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction getTransaction();
+    org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction getTransaction();
     /**
      * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.TransactionOrBuilder getTransactionOrBuilder();
+    org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.TransactionOrBuilder getTransactionOrBuilder();
   }
   /**
    * Protobuf type {@code bdware.bdledger.api.SendTransactionRequest}
@@ -1789,11 +1789,11 @@ public final class LedgerOuterClass {
               break;
             }
             case 18: {
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.Builder subBuilder = null;
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ = input.readMessage(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.parser(), extensionRegistry);
+              transaction_ = input.readMessage(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -1822,15 +1822,15 @@ public final class LedgerOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Builder.class);
     }
 
     public interface TransactionOrBuilder extends
@@ -1846,7 +1846,7 @@ public final class LedgerOuterClass {
        * <code>.bdware.bdledger.api.TransactionType type = 1;</code>
        * @return The type.
        */
-      org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType();
+      org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType getType();
 
       /**
        * <code>bytes from = 2;</code>
@@ -1855,13 +1855,19 @@ public final class LedgerOuterClass {
       com.google.protobuf.ByteString getFrom();
 
       /**
-       * <code>bytes to = 3;</code>
+       * <code>uint64 nonce = 3;</code>
+       * @return The nonce.
+       */
+      long getNonce();
+
+      /**
+       * <code>bytes to = 4;</code>
        * @return The to.
        */
       com.google.protobuf.ByteString getTo();
 
       /**
-       * <code>bytes data = 4;</code>
+       * <code>bytes data = 5;</code>
        * @return The data.
        */
       com.google.protobuf.ByteString getData();
@@ -1926,12 +1932,17 @@ public final class LedgerOuterClass {
                 from_ = input.readBytes();
                 break;
               }
-              case 26: {
+              case 24: {
+
+                nonce_ = input.readUInt64();
+                break;
+              }
+              case 34: {
 
                 to_ = input.readBytes();
                 break;
               }
-              case 34: {
+              case 42: {
 
                 data_ = input.readBytes();
                 break;
@@ -1957,15 +1968,15 @@ public final class LedgerOuterClass {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.Builder.class);
       }
 
       public static final int TYPE_FIELD_NUMBER = 1;
@@ -1981,10 +1992,10 @@ public final class LedgerOuterClass {
        * <code>.bdware.bdledger.api.TransactionType type = 1;</code>
        * @return The type.
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType getType() {
         @SuppressWarnings("deprecation")
-        org.bdware.bdledger.api.grpc.pb.Common.TransactionType result = org.bdware.bdledger.api.grpc.pb.Common.TransactionType.valueOf(type_);
-        return result == null ? org.bdware.bdledger.api.grpc.pb.Common.TransactionType.UNRECOGNIZED : result;
+        org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType result = org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.valueOf(type_);
+        return result == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.UNRECOGNIZED : result;
       }
 
       public static final int FROM_FIELD_NUMBER = 2;
@@ -1997,20 +2008,30 @@ public final class LedgerOuterClass {
         return from_;
       }
 
-      public static final int TO_FIELD_NUMBER = 3;
+      public static final int NONCE_FIELD_NUMBER = 3;
+      private long nonce_;
+      /**
+       * <code>uint64 nonce = 3;</code>
+       * @return The nonce.
+       */
+      public long getNonce() {
+        return nonce_;
+      }
+
+      public static final int TO_FIELD_NUMBER = 4;
       private com.google.protobuf.ByteString to_;
       /**
-       * <code>bytes to = 3;</code>
+       * <code>bytes to = 4;</code>
        * @return The to.
        */
       public com.google.protobuf.ByteString getTo() {
         return to_;
       }
 
-      public static final int DATA_FIELD_NUMBER = 4;
+      public static final int DATA_FIELD_NUMBER = 5;
       private com.google.protobuf.ByteString data_;
       /**
-       * <code>bytes data = 4;</code>
+       * <code>bytes data = 5;</code>
        * @return The data.
        */
       public com.google.protobuf.ByteString getData() {
@@ -2031,17 +2052,20 @@ public final class LedgerOuterClass {
       @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
-        if (type_ != org.bdware.bdledger.api.grpc.pb.Common.TransactionType.RECORD.getNumber()) {
+        if (type_ != org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.RECORD.getNumber()) {
           output.writeEnum(1, type_);
         }
         if (!from_.isEmpty()) {
           output.writeBytes(2, from_);
         }
+        if (nonce_ != 0L) {
+          output.writeUInt64(3, nonce_);
+        }
         if (!to_.isEmpty()) {
-          output.writeBytes(3, to_);
+          output.writeBytes(4, to_);
         }
         if (!data_.isEmpty()) {
-          output.writeBytes(4, data_);
+          output.writeBytes(5, data_);
         }
         unknownFields.writeTo(output);
       }
@@ -2052,7 +2076,7 @@ public final class LedgerOuterClass {
         if (size != -1) return size;
 
         size = 0;
-        if (type_ != org.bdware.bdledger.api.grpc.pb.Common.TransactionType.RECORD.getNumber()) {
+        if (type_ != org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.RECORD.getNumber()) {
           size += com.google.protobuf.CodedOutputStream
             .computeEnumSize(1, type_);
         }
@@ -2060,13 +2084,17 @@ public final class LedgerOuterClass {
           size += com.google.protobuf.CodedOutputStream
             .computeBytesSize(2, from_);
         }
+        if (nonce_ != 0L) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt64Size(3, nonce_);
+        }
         if (!to_.isEmpty()) {
           size += com.google.protobuf.CodedOutputStream
-            .computeBytesSize(3, to_);
+            .computeBytesSize(4, to_);
         }
         if (!data_.isEmpty()) {
           size += com.google.protobuf.CodedOutputStream
-            .computeBytesSize(4, data_);
+            .computeBytesSize(5, data_);
         }
         size += unknownFields.getSerializedSize();
         memoizedSize = size;
@@ -2078,14 +2106,16 @@ public final class LedgerOuterClass {
         if (obj == this) {
          return true;
         }
-        if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction)) {
+        if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction)) {
           return super.equals(obj);
         }
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction other = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction) obj;
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction other = (org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction) obj;
 
         if (type_ != other.type_) return false;
         if (!getFrom()
             .equals(other.getFrom())) return false;
+        if (getNonce()
+            != other.getNonce()) return false;
         if (!getTo()
             .equals(other.getTo())) return false;
         if (!getData()
@@ -2105,6 +2135,9 @@ public final class LedgerOuterClass {
         hash = (53 * hash) + type_;
         hash = (37 * hash) + FROM_FIELD_NUMBER;
         hash = (53 * hash) + getFrom().hashCode();
+        hash = (37 * hash) + NONCE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getNonce());
         hash = (37 * hash) + TO_FIELD_NUMBER;
         hash = (53 * hash) + getTo().hashCode();
         hash = (37 * hash) + DATA_FIELD_NUMBER;
@@ -2114,69 +2147,69 @@ public final class LedgerOuterClass {
         return hash;
       }
 
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(
           java.nio.ByteBuffer data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(
           java.nio.ByteBuffer data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(
           com.google.protobuf.ByteString data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(byte[] data)
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(
           byte[] data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(java.io.InputStream input)
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseDelimitedFrom(java.io.InputStream input)
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseDelimitedFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseDelimitedFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
             .parseWithIOException(PARSER, input);
       }
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parseFrom(
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -2189,7 +2222,7 @@ public final class LedgerOuterClass {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction prototype) {
+      public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
@@ -2210,21 +2243,21 @@ public final class LedgerOuterClass {
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
           // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.SendTransactionRequest.Transaction)
-          org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.TransactionOrBuilder {
+          org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.TransactionOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_descriptor;
+          return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_descriptor;
         }
 
         @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_fieldAccessorTable
+          return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.Builder.class);
+                  org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.Builder.class);
         }
 
-        // Construct using org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.newBuilder()
+        // Construct using org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -2246,6 +2279,8 @@ public final class LedgerOuterClass {
 
           from_ = com.google.protobuf.ByteString.EMPTY;
 
+          nonce_ = 0L;
+
           to_ = com.google.protobuf.ByteString.EMPTY;
 
           data_ = com.google.protobuf.ByteString.EMPTY;
@@ -2256,17 +2291,17 @@ public final class LedgerOuterClass {
         @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_descriptor;
+          return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_descriptor;
         }
 
         @java.lang.Override
-        public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction getDefaultInstanceForType() {
-          return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.getDefaultInstance();
+        public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction getDefaultInstanceForType() {
+          return org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.getDefaultInstance();
         }
 
         @java.lang.Override
-        public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction build() {
-          org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction result = buildPartial();
+        public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction build() {
+          org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
@@ -2274,10 +2309,11 @@ public final class LedgerOuterClass {
         }
 
         @java.lang.Override
-        public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction buildPartial() {
-          org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction result = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction(this);
+        public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction buildPartial() {
+          org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction result = new org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction(this);
           result.type_ = type_;
           result.from_ = from_;
+          result.nonce_ = nonce_;
           result.to_ = to_;
           result.data_ = data_;
           onBuilt();
@@ -2318,22 +2354,25 @@ public final class LedgerOuterClass {
         }
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction) {
-            return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction)other);
+          if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction) {
+            return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction other) {
-          if (other == org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction other) {
+          if (other == org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.getDefaultInstance()) return this;
           if (other.type_ != 0) {
             setTypeValue(other.getTypeValue());
           }
           if (other.getFrom() != com.google.protobuf.ByteString.EMPTY) {
             setFrom(other.getFrom());
           }
+          if (other.getNonce() != 0L) {
+            setNonce(other.getNonce());
+          }
           if (other.getTo() != com.google.protobuf.ByteString.EMPTY) {
             setTo(other.getTo());
           }
@@ -2355,11 +2394,11 @@ public final class LedgerOuterClass {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction parsedMessage = null;
+          org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction) e.getUnfinishedMessage();
+            parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction) e.getUnfinishedMessage();
             throw e.unwrapIOException();
           } finally {
             if (parsedMessage != null) {
@@ -2391,17 +2430,17 @@ public final class LedgerOuterClass {
          * <code>.bdware.bdledger.api.TransactionType type = 1;</code>
          * @return The type.
          */
-        public org.bdware.bdledger.api.grpc.pb.Common.TransactionType getType() {
+        public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType getType() {
           @SuppressWarnings("deprecation")
-          org.bdware.bdledger.api.grpc.pb.Common.TransactionType result = org.bdware.bdledger.api.grpc.pb.Common.TransactionType.valueOf(type_);
-          return result == null ? org.bdware.bdledger.api.grpc.pb.Common.TransactionType.UNRECOGNIZED : result;
+          org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType result = org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.valueOf(type_);
+          return result == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType.UNRECOGNIZED : result;
         }
         /**
          * <code>.bdware.bdledger.api.TransactionType type = 1;</code>
          * @param value The type to set.
          * @return This builder for chaining.
          */
-        public Builder setType(org.bdware.bdledger.api.grpc.pb.Common.TransactionType value) {
+        public Builder setType(org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -2454,16 +2493,46 @@ public final class LedgerOuterClass {
           return this;
         }
 
+        private long nonce_ ;
+        /**
+         * <code>uint64 nonce = 3;</code>
+         * @return The nonce.
+         */
+        public long getNonce() {
+          return nonce_;
+        }
+        /**
+         * <code>uint64 nonce = 3;</code>
+         * @param value The nonce to set.
+         * @return This builder for chaining.
+         */
+        public Builder setNonce(long value) {
+          
+          nonce_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * <code>uint64 nonce = 3;</code>
+         * @return This builder for chaining.
+         */
+        public Builder clearNonce() {
+          
+          nonce_ = 0L;
+          onChanged();
+          return this;
+        }
+
         private com.google.protobuf.ByteString to_ = com.google.protobuf.ByteString.EMPTY;
         /**
-         * <code>bytes to = 3;</code>
+         * <code>bytes to = 4;</code>
          * @return The to.
          */
         public com.google.protobuf.ByteString getTo() {
           return to_;
         }
         /**
-         * <code>bytes to = 3;</code>
+         * <code>bytes to = 4;</code>
          * @param value The to to set.
          * @return This builder for chaining.
          */
@@ -2477,7 +2546,7 @@ public final class LedgerOuterClass {
           return this;
         }
         /**
-         * <code>bytes to = 3;</code>
+         * <code>bytes to = 4;</code>
          * @return This builder for chaining.
          */
         public Builder clearTo() {
@@ -2489,14 +2558,14 @@ public final class LedgerOuterClass {
 
         private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
         /**
-         * <code>bytes data = 4;</code>
+         * <code>bytes data = 5;</code>
          * @return The data.
          */
         public com.google.protobuf.ByteString getData() {
           return data_;
         }
         /**
-         * <code>bytes data = 4;</code>
+         * <code>bytes data = 5;</code>
          * @param value The data to set.
          * @return This builder for chaining.
          */
@@ -2510,7 +2579,7 @@ public final class LedgerOuterClass {
           return this;
         }
         /**
-         * <code>bytes data = 4;</code>
+         * <code>bytes data = 5;</code>
          * @return This builder for chaining.
          */
         public Builder clearData() {
@@ -2536,12 +2605,12 @@ public final class LedgerOuterClass {
       }
 
       // @@protoc_insertion_point(class_scope:bdware.bdledger.api.SendTransactionRequest.Transaction)
-      private static final org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction DEFAULT_INSTANCE;
+      private static final org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction();
+        DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction();
       }
 
-      public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction getDefaultInstance() {
+      public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
@@ -2566,7 +2635,7 @@ public final class LedgerOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction getDefaultInstanceForType() {
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -2609,7 +2678,7 @@ public final class LedgerOuterClass {
     }
 
     public static final int TRANSACTION_FIELD_NUMBER = 2;
-    private org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction transaction_;
+    private org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction transaction_;
     /**
      * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
      * @return Whether the transaction field is set.
@@ -2621,13 +2690,13 @@ public final class LedgerOuterClass {
      * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
      * @return The transaction.
      */
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction getTransaction() {
-      return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.getDefaultInstance() : transaction_;
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction getTransaction() {
+      return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.getDefaultInstance() : transaction_;
     }
     /**
      * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.TransactionOrBuilder getTransactionOrBuilder() {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.TransactionOrBuilder getTransactionOrBuilder() {
       return getTransaction();
     }
 
@@ -2677,10 +2746,10 @@ public final class LedgerOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest other = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest) obj;
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest other = (org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest) obj;
 
       if (!getLedger()
           .equals(other.getLedger())) return false;
@@ -2711,69 +2780,69 @@ public final class LedgerOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2786,7 +2855,7 @@ public final class LedgerOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2807,21 +2876,21 @@ public final class LedgerOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.SendTransactionRequest)
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequestOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2853,17 +2922,17 @@ public final class LedgerOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionRequest_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest build() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest build() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2871,8 +2940,8 @@ public final class LedgerOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest result = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest(this);
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest result = new org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest(this);
         result.ledger_ = ledger_;
         if (transactionBuilder_ == null) {
           result.transaction_ = transaction_;
@@ -2917,16 +2986,16 @@ public final class LedgerOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.getDefaultInstance()) return this;
         if (!other.getLedger().isEmpty()) {
           ledger_ = other.ledger_;
           onChanged();
@@ -2949,11 +3018,11 @@ public final class LedgerOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3039,9 +3108,9 @@ public final class LedgerOuterClass {
         return this;
       }
 
-      private org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction transaction_;
+      private org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction transaction_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.TransactionOrBuilder> transactionBuilder_;
+          org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.TransactionOrBuilder> transactionBuilder_;
       /**
        * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
        * @return Whether the transaction field is set.
@@ -3053,9 +3122,9 @@ public final class LedgerOuterClass {
        * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
        * @return The transaction.
        */
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction getTransaction() {
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction getTransaction() {
         if (transactionBuilder_ == null) {
-          return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.getDefaultInstance() : transaction_;
+          return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.getDefaultInstance() : transaction_;
         } else {
           return transactionBuilder_.getMessage();
         }
@@ -3063,7 +3132,7 @@ public final class LedgerOuterClass {
       /**
        * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
        */
-      public Builder setTransaction(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction value) {
+      public Builder setTransaction(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction value) {
         if (transactionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3080,7 +3149,7 @@ public final class LedgerOuterClass {
        * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
        */
       public Builder setTransaction(
-          org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.Builder builderForValue) {
         if (transactionBuilder_ == null) {
           transaction_ = builderForValue.build();
           onChanged();
@@ -3093,11 +3162,11 @@ public final class LedgerOuterClass {
       /**
        * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
        */
-      public Builder mergeTransaction(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction value) {
+      public Builder mergeTransaction(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction value) {
         if (transactionBuilder_ == null) {
           if (transaction_ != null) {
             transaction_ =
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
           } else {
             transaction_ = value;
           }
@@ -3125,7 +3194,7 @@ public final class LedgerOuterClass {
       /**
        * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.Builder getTransactionBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.Builder getTransactionBuilder() {
         
         onChanged();
         return getTransactionFieldBuilder().getBuilder();
@@ -3133,23 +3202,23 @@ public final class LedgerOuterClass {
       /**
        * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.TransactionOrBuilder getTransactionOrBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.TransactionOrBuilder getTransactionOrBuilder() {
         if (transactionBuilder_ != null) {
           return transactionBuilder_.getMessageOrBuilder();
         } else {
           return transaction_ == null ?
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.getDefaultInstance() : transaction_;
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.getDefaultInstance() : transaction_;
         }
       }
       /**
        * <code>.bdware.bdledger.api.SendTransactionRequest.Transaction transaction = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.TransactionOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.TransactionOrBuilder> 
           getTransactionFieldBuilder() {
         if (transactionBuilder_ == null) {
           transactionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest.TransactionOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest.TransactionOrBuilder>(
                   getTransaction(),
                   getParentForChildren(),
                   isClean());
@@ -3174,12 +3243,12 @@ public final class LedgerOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.SendTransactionRequest)
-    private static final org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3204,7 +3273,7 @@ public final class LedgerOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionRequest getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3292,15 +3361,15 @@ public final class LedgerOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.Builder.class);
     }
 
     public static final int HASH_FIELD_NUMBER = 1;
@@ -3353,10 +3422,10 @@ public final class LedgerOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse other = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse other = (org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse) obj;
 
       if (!getHash()
           .equals(other.getHash())) return false;
@@ -3378,69 +3447,69 @@ public final class LedgerOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3453,7 +3522,7 @@ public final class LedgerOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3474,21 +3543,21 @@ public final class LedgerOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.SendTransactionResponse)
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.class, org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3514,17 +3583,17 @@ public final class LedgerOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.internal_static_bdware_bdledger_api_SendTransactionResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.internal_static_bdware_bdledger_api_SendTransactionResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse build() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse build() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3532,8 +3601,8 @@ public final class LedgerOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse result = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse result = new org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse(this);
         result.hash_ = hash_;
         onBuilt();
         return result;
@@ -3573,16 +3642,16 @@ public final class LedgerOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse.getDefaultInstance()) return this;
         if (other.getHash() != com.google.protobuf.ByteString.EMPTY) {
           setHash(other.getHash());
         }
@@ -3601,11 +3670,11 @@ public final class LedgerOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3664,12 +3733,12 @@ public final class LedgerOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.SendTransactionResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3694,7 +3763,7 @@ public final class LedgerOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.SendTransactionResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.LedgerProto.SendTransactionResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3744,30 +3813,30 @@ public final class LedgerOuterClass {
       "roto\032 bdware/bdledger/api/common.proto\"#" +
       "\n\023CreateLedgerRequest\022\014\n\004name\030\001 \001(\t\"\"\n\024C" +
       "reateLedgerResponse\022\n\n\002ok\030\001 \001(\010\"%\n\022GetLe" +
-      "dgersResponse\022\017\n\007ledgers\030\001 \003(\t\"\341\001\n\026SendT" +
+      "dgersResponse\022\017\n\007ledgers\030\001 \003(\t\"\360\001\n\026SendT" +
       "ransactionRequest\022\016\n\006ledger\030\001 \001(\t\022L\n\013tra" +
       "nsaction\030\002 \001(\01327.bdware.bdledger.api.Sen" +
-      "dTransactionRequest.Transaction\032i\n\013Trans" +
+      "dTransactionRequest.Transaction\032x\n\013Trans" +
       "action\0222\n\004type\030\001 \001(\0162$.bdware.bdledger.a" +
-      "pi.TransactionType\022\014\n\004from\030\002 \001(\014\022\n\n\002to\030\003" +
-      " \001(\014\022\014\n\004data\030\004 \001(\014\"\'\n\027SendTransactionRes" +
-      "ponse\022\014\n\004hash\030\001 \001(\0142\252\002\n\006Ledger\022c\n\014Create" +
-      "Ledger\022(.bdware.bdledger.api.CreateLedge" +
-      "rRequest\032).bdware.bdledger.api.CreateLed" +
-      "gerResponse\022M\n\nGetLedgers\022\026.google.proto" +
-      "buf.Empty\032\'.bdware.bdledger.api.GetLedge" +
-      "rsResponse\022l\n\017SendTransaction\022+.bdware.b" +
-      "dledger.api.SendTransactionRequest\032,.bdw" +
-      "are.bdledger.api.SendTransactionResponse" +
-      "BI\n\037org.bdware.bdledger.api.grpc.pbZ&bdw" +
-      "are.org/bdledger/pkg/api/grpc/apipbb\006pro" +
-      "to3"
+      "pi.TransactionType\022\014\n\004from\030\002 \001(\014\022\r\n\005nonc" +
+      "e\030\003 \001(\004\022\n\n\002to\030\004 \001(\014\022\014\n\004data\030\005 \001(\014\"\'\n\027Sen" +
+      "dTransactionResponse\022\014\n\004hash\030\001 \001(\0142\252\002\n\006L" +
+      "edger\022c\n\014CreateLedger\022(.bdware.bdledger." +
+      "api.CreateLedgerRequest\032).bdware.bdledge" +
+      "r.api.CreateLedgerResponse\022M\n\nGetLedgers" +
+      "\022\026.google.protobuf.Empty\032\'.bdware.bdledg" +
+      "er.api.GetLedgersResponse\022l\n\017SendTransac" +
+      "tion\022+.bdware.bdledger.api.SendTransacti" +
+      "onRequest\032,.bdware.bdledger.api.SendTran" +
+      "sactionResponseBY\n\037org.bdware.bdledger.a" +
+      "pi.grpc.pbB\013LedgerProtoZ)bdware.org/bdle" +
+      "dger/pkg/api/grpc/pb;apipbb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           com.google.protobuf.EmptyProto.getDescriptor(),
-          org.bdware.bdledger.api.grpc.pb.Common.getDescriptor(),
+          org.bdware.bdledger.api.grpc.pb.CommonProto.getDescriptor(),
         });
     internal_static_bdware_bdledger_api_CreateLedgerRequest_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -3798,7 +3867,7 @@ public final class LedgerOuterClass {
     internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_SendTransactionRequest_Transaction_descriptor,
-        new java.lang.String[] { "Type", "From", "To", "Data", });
+        new java.lang.String[] { "Type", "From", "Nonce", "To", "Data", });
     internal_static_bdware_bdledger_api_SendTransactionResponse_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_bdware_bdledger_api_SendTransactionResponse_fieldAccessorTable = new
@@ -3806,7 +3875,7 @@ public final class LedgerOuterClass {
         internal_static_bdware_bdledger_api_SendTransactionResponse_descriptor,
         new java.lang.String[] { "Hash", });
     com.google.protobuf.EmptyProto.getDescriptor();
-    org.bdware.bdledger.api.grpc.pb.Common.getDescriptor();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 ef6edf4..8f2c729 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.30.2)",
+    value = "by gRPC proto compiler (version 1.32.1)",
     comments = "Source: bdware/bdledger/api/node.proto")
 public final class NodeGrpc {
 
@@ -28,28 +28,28 @@ public final class NodeGrpc {
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.protobuf.Empty,
-      org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse> getClientVersionMethod;
+      org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse> getClientVersionMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "ClientVersion",
       requestType = com.google.protobuf.Empty.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<com.google.protobuf.Empty,
-      org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse> getClientVersionMethod() {
-    io.grpc.MethodDescriptor<com.google.protobuf.Empty, org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse> getClientVersionMethod;
+      org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse> getClientVersionMethod() {
+    io.grpc.MethodDescriptor<com.google.protobuf.Empty, org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse> getClientVersionMethod;
     if ((getClientVersionMethod = NodeGrpc.getClientVersionMethod) == null) {
       synchronized (NodeGrpc.class) {
         if ((getClientVersionMethod = NodeGrpc.getClientVersionMethod) == null) {
           NodeGrpc.getClientVersionMethod = getClientVersionMethod =
-              io.grpc.MethodDescriptor.<com.google.protobuf.Empty, org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse>newBuilder()
+              io.grpc.MethodDescriptor.<com.google.protobuf.Empty, org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "ClientVersion"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
                   com.google.protobuf.Empty.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.getDefaultInstance()))
               .setSchemaDescriptor(new NodeMethodDescriptorSupplier("ClientVersion"))
               .build();
         }
@@ -114,7 +114,7 @@ public final class NodeGrpc {
      * </pre>
      */
     public void clientVersion(com.google.protobuf.Empty request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse> responseObserver) {
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getClientVersionMethod(), responseObserver);
     }
 
@@ -125,7 +125,7 @@ public final class NodeGrpc {
             asyncUnaryCall(
               new MethodHandlers<
                 com.google.protobuf.Empty,
-                org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse>(
+                org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse>(
                   this, METHODID_CLIENT_VERSION)))
           .build();
     }
@@ -153,7 +153,7 @@ public final class NodeGrpc {
      * </pre>
      */
     public void clientVersion(com.google.protobuf.Empty request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse> responseObserver) {
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getClientVersionMethod(), getCallOptions()), request, responseObserver);
     }
@@ -180,7 +180,7 @@ public final class NodeGrpc {
      * 查询BDLedger节点版本
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse clientVersion(com.google.protobuf.Empty request) {
+    public org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse clientVersion(com.google.protobuf.Empty request) {
       return blockingUnaryCall(
           getChannel(), getClientVersionMethod(), getCallOptions(), request);
     }
@@ -207,7 +207,7 @@ public final class NodeGrpc {
      * 查询BDLedger节点版本
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse> clientVersion(
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse> clientVersion(
         com.google.protobuf.Empty request) {
       return futureUnaryCall(
           getChannel().newCall(getClientVersionMethod(), getCallOptions()), request);
@@ -235,7 +235,7 @@ public final class NodeGrpc {
       switch (methodId) {
         case METHODID_CLIENT_VERSION:
           serviceImpl.clientVersion((com.google.protobuf.Empty) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse>) responseObserver);
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse>) responseObserver);
           break;
         default:
           throw new AssertionError();
@@ -259,7 +259,7 @@ public final class NodeGrpc {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.NodeOuterClass.getDescriptor();
+      return org.bdware.bdledger.api.grpc.pb.NodeProto.getDescriptor();
     }
 
     @java.lang.Override
diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeOuterClass.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeProto.java
similarity index 81%
rename from src/main/java/org/bdware/bdledger/api/grpc/pb/NodeOuterClass.java
rename to src/main/java/org/bdware/bdledger/api/grpc/pb/NodeProto.java
index 09b9e13..d100b24 100644
--- a/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeOuterClass.java
+++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/NodeProto.java
@@ -3,8 +3,8 @@
 
 package org.bdware.bdledger.api.grpc.pb;
 
-public final class NodeOuterClass {
-  private NodeOuterClass() {}
+public final class NodeProto {
+  private NodeProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -111,15 +111,15 @@ public final class NodeOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.NodeOuterClass.internal_static_bdware_bdledger_api_ClientVersionResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.NodeProto.internal_static_bdware_bdledger_api_ClientVersionResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.NodeOuterClass.internal_static_bdware_bdledger_api_ClientVersionResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.NodeProto.internal_static_bdware_bdledger_api_ClientVersionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.class, org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.class, org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.Builder.class);
     }
 
     public static final int VERSION_FIELD_NUMBER = 1;
@@ -205,10 +205,10 @@ public final class NodeOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse other = (org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse other = (org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse) obj;
 
       if (!getVersion()
           .equals(other.getVersion())) return false;
@@ -230,69 +230,69 @@ public final class NodeOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -305,7 +305,7 @@ public final class NodeOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -326,21 +326,21 @@ public final class NodeOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.ClientVersionResponse)
-        org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.NodeOuterClass.internal_static_bdware_bdledger_api_ClientVersionResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.NodeProto.internal_static_bdware_bdledger_api_ClientVersionResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.NodeOuterClass.internal_static_bdware_bdledger_api_ClientVersionResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.NodeProto.internal_static_bdware_bdledger_api_ClientVersionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.class, org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.class, org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -366,17 +366,17 @@ public final class NodeOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.NodeOuterClass.internal_static_bdware_bdledger_api_ClientVersionResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.NodeProto.internal_static_bdware_bdledger_api_ClientVersionResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse build() {
-        org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse build() {
+        org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -384,8 +384,8 @@ public final class NodeOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse result = new org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse result = new org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse(this);
         result.version_ = version_;
         onBuilt();
         return result;
@@ -425,16 +425,16 @@ public final class NodeOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse.getDefaultInstance()) return this;
         if (!other.getVersion().isEmpty()) {
           version_ = other.version_;
           onChanged();
@@ -454,11 +454,11 @@ public final class NodeOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -580,12 +580,12 @@ public final class NodeOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.ClientVersionResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -610,7 +610,7 @@ public final class NodeOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.NodeOuterClass.ClientVersionResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.NodeProto.ClientVersionResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -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" +
-      "ntVersionResponseBI\n\037org.bdware.bdledger" +
-      ".api.grpc.pbZ&bdware.org/bdledger/pkg/ap" +
-      "i/grpc/apipbb\006proto3"
+      "ntVersionResponseBW\n\037org.bdware.bdledger" +
+      ".api.grpc.pbB\tNodeProtoZ)bdware.org/bdle" +
+      "dger/pkg/api/grpc/pb;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 ae7f2da..ae87201 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.30.2)",
+    value = "by gRPC proto compiler (version 1.32.1)",
     comments = "Source: bdware/bdledger/api/query.proto")
 public final class QueryGrpc {
 
@@ -27,29 +27,29 @@ public final class QueryGrpc {
   public static final String SERVICE_NAME = "bdware.bdledger.api.Query";
 
   // Static method descriptors that strictly reflect the proto.
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse> getGetBlockByHashMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse> getGetBlockByHashMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "GetBlockByHash",
-      requestType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse> getGetBlockByHashMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse> getGetBlockByHashMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse> getGetBlockByHashMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse> getGetBlockByHashMethod;
     if ((getGetBlockByHashMethod = QueryGrpc.getGetBlockByHashMethod) == null) {
       synchronized (QueryGrpc.class) {
         if ((getGetBlockByHashMethod = QueryGrpc.getGetBlockByHashMethod) == null) {
           QueryGrpc.getGetBlockByHashMethod = getGetBlockByHashMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetBlockByHash"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.getDefaultInstance()))
               .setSchemaDescriptor(new QueryMethodDescriptorSupplier("GetBlockByHash"))
               .build();
         }
@@ -58,29 +58,29 @@ public final class QueryGrpc {
     return getGetBlockByHashMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse> getGetBlocksMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> getGetBlocksMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "GetBlocks",
-      requestType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse> getGetBlocksMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse> getGetBlocksMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> getGetBlocksMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> getGetBlocksMethod;
     if ((getGetBlocksMethod = QueryGrpc.getGetBlocksMethod) == null) {
       synchronized (QueryGrpc.class) {
         if ((getGetBlocksMethod = QueryGrpc.getGetBlocksMethod) == null) {
           QueryGrpc.getGetBlocksMethod = getGetBlocksMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetBlocks"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.getDefaultInstance()))
               .setSchemaDescriptor(new QueryMethodDescriptorSupplier("GetBlocks"))
               .build();
         }
@@ -89,29 +89,29 @@ public final class QueryGrpc {
     return getGetBlocksMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse> getCountBlocksMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse> getCountBlocksMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "CountBlocks",
-      requestType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse> getCountBlocksMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse> getCountBlocksMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse> getCountBlocksMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse> getCountBlocksMethod;
     if ((getCountBlocksMethod = QueryGrpc.getCountBlocksMethod) == null) {
       synchronized (QueryGrpc.class) {
         if ((getCountBlocksMethod = QueryGrpc.getCountBlocksMethod) == null) {
           QueryGrpc.getCountBlocksMethod = getCountBlocksMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CountBlocks"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.getDefaultInstance()))
               .setSchemaDescriptor(new QueryMethodDescriptorSupplier("CountBlocks"))
               .build();
         }
@@ -120,29 +120,60 @@ public final class QueryGrpc {
     return getCountBlocksMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse> getGetTransactionByHashMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> getGetRecentBlocksMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "GetRecentBlocks",
+      requestType = org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> getGetRecentBlocksMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> getGetRecentBlocksMethod;
+    if ((getGetRecentBlocksMethod = QueryGrpc.getGetRecentBlocksMethod) == null) {
+      synchronized (QueryGrpc.class) {
+        if ((getGetRecentBlocksMethod = QueryGrpc.getGetRecentBlocksMethod) == null) {
+          QueryGrpc.getGetRecentBlocksMethod = getGetRecentBlocksMethod =
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse>newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetRecentBlocks"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.getDefaultInstance()))
+              .setSchemaDescriptor(new QueryMethodDescriptorSupplier("GetRecentBlocks"))
+              .build();
+        }
+      }
+    }
+    return getGetRecentBlocksMethod;
+  }
+
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse> getGetTransactionByHashMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "GetTransactionByHash",
-      requestType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse> getGetTransactionByHashMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse> getGetTransactionByHashMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse> getGetTransactionByHashMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse> getGetTransactionByHashMethod;
     if ((getGetTransactionByHashMethod = QueryGrpc.getGetTransactionByHashMethod) == null) {
       synchronized (QueryGrpc.class) {
         if ((getGetTransactionByHashMethod = QueryGrpc.getGetTransactionByHashMethod) == null) {
           QueryGrpc.getGetTransactionByHashMethod = getGetTransactionByHashMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetTransactionByHash"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.getDefaultInstance()))
               .setSchemaDescriptor(new QueryMethodDescriptorSupplier("GetTransactionByHash"))
               .build();
         }
@@ -151,29 +182,29 @@ public final class QueryGrpc {
     return getGetTransactionByHashMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse> getGetTransactionByBlockHashAndIndexMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse> getGetTransactionByBlockHashAndIndexMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "GetTransactionByBlockHashAndIndex",
-      requestType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse> getGetTransactionByBlockHashAndIndexMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse> getGetTransactionByBlockHashAndIndexMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse> getGetTransactionByBlockHashAndIndexMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse> getGetTransactionByBlockHashAndIndexMethod;
     if ((getGetTransactionByBlockHashAndIndexMethod = QueryGrpc.getGetTransactionByBlockHashAndIndexMethod) == null) {
       synchronized (QueryGrpc.class) {
         if ((getGetTransactionByBlockHashAndIndexMethod = QueryGrpc.getGetTransactionByBlockHashAndIndexMethod) == null) {
           QueryGrpc.getGetTransactionByBlockHashAndIndexMethod = getGetTransactionByBlockHashAndIndexMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetTransactionByBlockHashAndIndex"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.getDefaultInstance()))
               .setSchemaDescriptor(new QueryMethodDescriptorSupplier("GetTransactionByBlockHashAndIndex"))
               .build();
         }
@@ -182,29 +213,29 @@ public final class QueryGrpc {
     return getGetTransactionByBlockHashAndIndexMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse> getGetTransactionsMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse> getGetTransactionsMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "GetTransactions",
-      requestType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse> getGetTransactionsMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse> getGetTransactionsMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse> getGetTransactionsMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse> getGetTransactionsMethod;
     if ((getGetTransactionsMethod = QueryGrpc.getGetTransactionsMethod) == null) {
       synchronized (QueryGrpc.class) {
         if ((getGetTransactionsMethod = QueryGrpc.getGetTransactionsMethod) == null) {
           QueryGrpc.getGetTransactionsMethod = getGetTransactionsMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetTransactions"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.getDefaultInstance()))
               .setSchemaDescriptor(new QueryMethodDescriptorSupplier("GetTransactions"))
               .build();
         }
@@ -213,29 +244,29 @@ public final class QueryGrpc {
     return getGetTransactionsMethod;
   }
 
-  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse> getCountTransactionsMethod;
+  private static volatile io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse> getCountTransactionsMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "CountTransactions",
-      requestType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.class,
-      responseType = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.class,
+      requestType = org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.class,
+      responseType = org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.class,
       methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
-  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest,
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse> getCountTransactionsMethod() {
-    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse> getCountTransactionsMethod;
+  public static io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest,
+      org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse> getCountTransactionsMethod() {
+    io.grpc.MethodDescriptor<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse> getCountTransactionsMethod;
     if ((getCountTransactionsMethod = QueryGrpc.getCountTransactionsMethod) == null) {
       synchronized (QueryGrpc.class) {
         if ((getCountTransactionsMethod = QueryGrpc.getCountTransactionsMethod) == null) {
           QueryGrpc.getCountTransactionsMethod = getCountTransactionsMethod =
-              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse>newBuilder()
+              io.grpc.MethodDescriptor.<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest, org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CountTransactions"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.getDefaultInstance()))
+                  org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.getDefaultInstance()))
               .setSchemaDescriptor(new QueryMethodDescriptorSupplier("CountTransactions"))
               .build();
         }
@@ -299,8 +330,8 @@ public final class QueryGrpc {
      * 查询哈希所指定的区块
      * </pre>
      */
-    public void getBlockByHash(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse> responseObserver) {
+    public void getBlockByHash(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getGetBlockByHashMethod(), responseObserver);
     }
 
@@ -312,8 +343,8 @@ public final class QueryGrpc {
      * start_timestamp is required
      * </pre>
      */
-    public void getBlocks(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse> responseObserver) {
+    public void getBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getGetBlocksMethod(), responseObserver);
     }
 
@@ -324,11 +355,23 @@ public final class QueryGrpc {
      * 查询帐本中的所有区块数量，或时间范围内的区块数量
      * </pre>
      */
-    public void countBlocks(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse> responseObserver) {
+    public void countBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getCountBlocksMethod(), responseObserver);
     }
 
+    /**
+     * <pre>
+     **
+     * Get recent 'count' blocks (Only support IncludeTransactions=NONE for now)
+     * 查询最新的n个区块
+     * </pre>
+     */
+    public void getRecentBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> responseObserver) {
+      asyncUnimplementedUnaryCall(getGetRecentBlocksMethod(), responseObserver);
+    }
+
     /**
      * <pre>
      **
@@ -336,8 +379,8 @@ public final class QueryGrpc {
      * 查询哈希所指定的事务
      * </pre>
      */
-    public void getTransactionByHash(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse> responseObserver) {
+    public void getTransactionByHash(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getGetTransactionByHashMethod(), responseObserver);
     }
 
@@ -348,8 +391,8 @@ public final class QueryGrpc {
      * 查询所在区块的哈希与其在区块中的index所指定的事务
      * </pre>
      */
-    public void getTransactionByBlockHashAndIndex(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse> responseObserver) {
+    public void getTransactionByBlockHashAndIndex(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getGetTransactionByBlockHashAndIndexMethod(), responseObserver);
     }
 
@@ -360,8 +403,8 @@ public final class QueryGrpc {
      * 查询时间范围内的事务
      * </pre>
      */
-    public void getTransactions(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse> responseObserver) {
+    public void getTransactions(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getGetTransactionsMethod(), responseObserver);
     }
 
@@ -373,8 +416,8 @@ public final class QueryGrpc {
      * start_timestamp is required
      * </pre>
      */
-    public void countTransactions(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse> responseObserver) {
+    public void countTransactions(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse> responseObserver) {
       asyncUnimplementedUnaryCall(getCountTransactionsMethod(), responseObserver);
     }
 
@@ -384,50 +427,57 @@ public final class QueryGrpc {
             getGetBlockByHashMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest,
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse>(
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest,
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse>(
                   this, METHODID_GET_BLOCK_BY_HASH)))
           .addMethod(
             getGetBlocksMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest,
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse>(
+                org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest,
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse>(
                   this, METHODID_GET_BLOCKS)))
           .addMethod(
             getCountBlocksMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest,
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse>(
+                org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest,
+                org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse>(
                   this, METHODID_COUNT_BLOCKS)))
+          .addMethod(
+            getGetRecentBlocksMethod(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest,
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse>(
+                  this, METHODID_GET_RECENT_BLOCKS)))
           .addMethod(
             getGetTransactionByHashMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest,
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse>(
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest,
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse>(
                   this, METHODID_GET_TRANSACTION_BY_HASH)))
           .addMethod(
             getGetTransactionByBlockHashAndIndexMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest,
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse>(
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest,
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse>(
                   this, METHODID_GET_TRANSACTION_BY_BLOCK_HASH_AND_INDEX)))
           .addMethod(
             getGetTransactionsMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest,
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse>(
+                org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest,
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse>(
                   this, METHODID_GET_TRANSACTIONS)))
           .addMethod(
             getCountTransactionsMethod(),
             asyncUnaryCall(
               new MethodHandlers<
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest,
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse>(
+                org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest,
+                org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse>(
                   this, METHODID_COUNT_TRANSACTIONS)))
           .build();
     }
@@ -454,8 +504,8 @@ public final class QueryGrpc {
      * 查询哈希所指定的区块
      * </pre>
      */
-    public void getBlockByHash(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse> responseObserver) {
+    public void getBlockByHash(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getGetBlockByHashMethod(), getCallOptions()), request, responseObserver);
     }
@@ -468,8 +518,8 @@ public final class QueryGrpc {
      * start_timestamp is required
      * </pre>
      */
-    public void getBlocks(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse> responseObserver) {
+    public void getBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getGetBlocksMethod(), getCallOptions()), request, responseObserver);
     }
@@ -481,12 +531,25 @@ public final class QueryGrpc {
      * 查询帐本中的所有区块数量，或时间范围内的区块数量
      * </pre>
      */
-    public void countBlocks(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse> responseObserver) {
+    public void countBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getCountBlocksMethod(), getCallOptions()), request, responseObserver);
     }
 
+    /**
+     * <pre>
+     **
+     * Get recent 'count' blocks (Only support IncludeTransactions=NONE for now)
+     * 查询最新的n个区块
+     * </pre>
+     */
+    public void getRecentBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetRecentBlocksMethod(), getCallOptions()), request, responseObserver);
+    }
+
     /**
      * <pre>
      **
@@ -494,8 +557,8 @@ public final class QueryGrpc {
      * 查询哈希所指定的事务
      * </pre>
      */
-    public void getTransactionByHash(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse> responseObserver) {
+    public void getTransactionByHash(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getGetTransactionByHashMethod(), getCallOptions()), request, responseObserver);
     }
@@ -507,8 +570,8 @@ public final class QueryGrpc {
      * 查询所在区块的哈希与其在区块中的index所指定的事务
      * </pre>
      */
-    public void getTransactionByBlockHashAndIndex(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse> responseObserver) {
+    public void getTransactionByBlockHashAndIndex(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getGetTransactionByBlockHashAndIndexMethod(), getCallOptions()), request, responseObserver);
     }
@@ -520,8 +583,8 @@ public final class QueryGrpc {
      * 查询时间范围内的事务
      * </pre>
      */
-    public void getTransactions(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse> responseObserver) {
+    public void getTransactions(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getGetTransactionsMethod(), getCallOptions()), request, responseObserver);
     }
@@ -534,8 +597,8 @@ public final class QueryGrpc {
      * start_timestamp is required
      * </pre>
      */
-    public void countTransactions(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest request,
-        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse> responseObserver) {
+    public void countTransactions(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest request,
+        io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse> responseObserver) {
       asyncUnaryCall(
           getChannel().newCall(getCountTransactionsMethod(), getCallOptions()), request, responseObserver);
     }
@@ -562,7 +625,7 @@ public final class QueryGrpc {
      * 查询哈希所指定的区块
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse getBlockByHash(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse getBlockByHash(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest request) {
       return blockingUnaryCall(
           getChannel(), getGetBlockByHashMethod(), getCallOptions(), request);
     }
@@ -575,7 +638,7 @@ public final class QueryGrpc {
      * start_timestamp is required
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse getBlocks(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse getBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest request) {
       return blockingUnaryCall(
           getChannel(), getGetBlocksMethod(), getCallOptions(), request);
     }
@@ -587,11 +650,23 @@ public final class QueryGrpc {
      * 查询帐本中的所有区块数量，或时间范围内的区块数量
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse countBlocks(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse countBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest request) {
       return blockingUnaryCall(
           getChannel(), getCountBlocksMethod(), getCallOptions(), request);
     }
 
+    /**
+     * <pre>
+     **
+     * Get recent 'count' blocks (Only support IncludeTransactions=NONE for now)
+     * 查询最新的n个区块
+     * </pre>
+     */
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse getRecentBlocks(org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetRecentBlocksMethod(), getCallOptions(), request);
+    }
+
     /**
      * <pre>
      **
@@ -599,7 +674,7 @@ public final class QueryGrpc {
      * 查询哈希所指定的事务
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse getTransactionByHash(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse getTransactionByHash(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest request) {
       return blockingUnaryCall(
           getChannel(), getGetTransactionByHashMethod(), getCallOptions(), request);
     }
@@ -611,7 +686,7 @@ public final class QueryGrpc {
      * 查询所在区块的哈希与其在区块中的index所指定的事务
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse getTransactionByBlockHashAndIndex(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse getTransactionByBlockHashAndIndex(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest request) {
       return blockingUnaryCall(
           getChannel(), getGetTransactionByBlockHashAndIndexMethod(), getCallOptions(), request);
     }
@@ -623,7 +698,7 @@ public final class QueryGrpc {
      * 查询时间范围内的事务
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse getTransactions(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse getTransactions(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest request) {
       return blockingUnaryCall(
           getChannel(), getGetTransactionsMethod(), getCallOptions(), request);
     }
@@ -636,7 +711,7 @@ public final class QueryGrpc {
      * start_timestamp is required
      * </pre>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse countTransactions(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest request) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse countTransactions(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest request) {
       return blockingUnaryCall(
           getChannel(), getCountTransactionsMethod(), getCallOptions(), request);
     }
@@ -663,8 +738,8 @@ public final class QueryGrpc {
      * 查询哈希所指定的区块
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse> getBlockByHash(
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse> getBlockByHash(
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getGetBlockByHashMethod(), getCallOptions()), request);
     }
@@ -677,8 +752,8 @@ public final class QueryGrpc {
      * start_timestamp is required
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse> getBlocks(
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> getBlocks(
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getGetBlocksMethod(), getCallOptions()), request);
     }
@@ -690,12 +765,25 @@ public final class QueryGrpc {
      * 查询帐本中的所有区块数量，或时间范围内的区块数量
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse> countBlocks(
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse> countBlocks(
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getCountBlocksMethod(), getCallOptions()), request);
     }
 
+    /**
+     * <pre>
+     **
+     * Get recent 'count' blocks (Only support IncludeTransactions=NONE for now)
+     * 查询最新的n个区块
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse> getRecentBlocks(
+        org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetRecentBlocksMethod(), getCallOptions()), request);
+    }
+
     /**
      * <pre>
      **
@@ -703,8 +791,8 @@ public final class QueryGrpc {
      * 查询哈希所指定的事务
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse> getTransactionByHash(
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse> getTransactionByHash(
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getGetTransactionByHashMethod(), getCallOptions()), request);
     }
@@ -716,8 +804,8 @@ public final class QueryGrpc {
      * 查询所在区块的哈希与其在区块中的index所指定的事务
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse> getTransactionByBlockHashAndIndex(
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse> getTransactionByBlockHashAndIndex(
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getGetTransactionByBlockHashAndIndexMethod(), getCallOptions()), request);
     }
@@ -729,8 +817,8 @@ public final class QueryGrpc {
      * 查询时间范围内的事务
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse> getTransactions(
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse> getTransactions(
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getGetTransactionsMethod(), getCallOptions()), request);
     }
@@ -743,8 +831,8 @@ public final class QueryGrpc {
      * start_timestamp is required
      * </pre>
      */
-    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse> countTransactions(
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest request) {
+    public com.google.common.util.concurrent.ListenableFuture<org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse> countTransactions(
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest request) {
       return futureUnaryCall(
           getChannel().newCall(getCountTransactionsMethod(), getCallOptions()), request);
     }
@@ -753,10 +841,11 @@ public final class QueryGrpc {
   private static final int METHODID_GET_BLOCK_BY_HASH = 0;
   private static final int METHODID_GET_BLOCKS = 1;
   private static final int METHODID_COUNT_BLOCKS = 2;
-  private static final int METHODID_GET_TRANSACTION_BY_HASH = 3;
-  private static final int METHODID_GET_TRANSACTION_BY_BLOCK_HASH_AND_INDEX = 4;
-  private static final int METHODID_GET_TRANSACTIONS = 5;
-  private static final int METHODID_COUNT_TRANSACTIONS = 6;
+  private static final int METHODID_GET_RECENT_BLOCKS = 3;
+  private static final int METHODID_GET_TRANSACTION_BY_HASH = 4;
+  private static final int METHODID_GET_TRANSACTION_BY_BLOCK_HASH_AND_INDEX = 5;
+  private static final int METHODID_GET_TRANSACTIONS = 6;
+  private static final int METHODID_COUNT_TRANSACTIONS = 7;
 
   private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -776,32 +865,36 @@ public final class QueryGrpc {
     public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
       switch (methodId) {
         case METHODID_GET_BLOCK_BY_HASH:
-          serviceImpl.getBlockByHash((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse>) responseObserver);
+          serviceImpl.getBlockByHash((org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse>) responseObserver);
           break;
         case METHODID_GET_BLOCKS:
-          serviceImpl.getBlocks((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse>) responseObserver);
+          serviceImpl.getBlocks((org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse>) responseObserver);
           break;
         case METHODID_COUNT_BLOCKS:
-          serviceImpl.countBlocks((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse>) responseObserver);
+          serviceImpl.countBlocks((org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse>) responseObserver);
+          break;
+        case METHODID_GET_RECENT_BLOCKS:
+          serviceImpl.getRecentBlocks((org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse>) responseObserver);
           break;
         case METHODID_GET_TRANSACTION_BY_HASH:
-          serviceImpl.getTransactionByHash((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse>) responseObserver);
+          serviceImpl.getTransactionByHash((org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse>) responseObserver);
           break;
         case METHODID_GET_TRANSACTION_BY_BLOCK_HASH_AND_INDEX:
-          serviceImpl.getTransactionByBlockHashAndIndex((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse>) responseObserver);
+          serviceImpl.getTransactionByBlockHashAndIndex((org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse>) responseObserver);
           break;
         case METHODID_GET_TRANSACTIONS:
-          serviceImpl.getTransactions((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse>) responseObserver);
+          serviceImpl.getTransactions((org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse>) responseObserver);
           break;
         case METHODID_COUNT_TRANSACTIONS:
-          serviceImpl.countTransactions((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest) request,
-              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse>) responseObserver);
+          serviceImpl.countTransactions((org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest) request,
+              (io.grpc.stub.StreamObserver<org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse>) responseObserver);
           break;
         default:
           throw new AssertionError();
@@ -825,7 +918,7 @@ public final class QueryGrpc {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.getDescriptor();
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.getDescriptor();
     }
 
     @java.lang.Override
@@ -867,6 +960,7 @@ public final class QueryGrpc {
               .addMethod(getGetBlockByHashMethod())
               .addMethod(getGetBlocksMethod())
               .addMethod(getCountBlocksMethod())
+              .addMethod(getGetRecentBlocksMethod())
               .addMethod(getGetTransactionByHashMethod())
               .addMethod(getGetTransactionByBlockHashAndIndexMethod())
               .addMethod(getGetTransactionsMethod())
diff --git a/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryOuterClass.java b/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryProto.java
similarity index 74%
rename from src/main/java/org/bdware/bdledger/api/grpc/pb/QueryOuterClass.java
rename to src/main/java/org/bdware/bdledger/api/grpc/pb/QueryProto.java
index 8a01f54..ec1ed5a 100644
--- a/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryOuterClass.java
+++ b/src/main/java/org/bdware/bdledger/api/grpc/pb/QueryProto.java
@@ -3,8 +3,8 @@
 
 package org.bdware.bdledger.api.grpc.pb;
 
-public final class QueryOuterClass {
-  private QueryOuterClass() {}
+public final class QueryProto {
+  private QueryProto() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -14,6 +14,143 @@ public final class QueryOuterClass {
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
+  /**
+   * Protobuf enum {@code bdware.bdledger.api.IncludeTransactions}
+   */
+  public enum IncludeTransactions
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <pre>
+     * 不包含交易数据
+     * </pre>
+     *
+     * <code>NONE = 0;</code>
+     */
+    NONE(0),
+    /**
+     * <pre>
+     * 包含交易哈希列表
+     * </pre>
+     *
+     * <code>HASH = 1;</code>
+     */
+    HASH(1),
+    /**
+     * <pre>
+     * 包含完整交易列表
+     * </pre>
+     *
+     * <code>FULL = 2;</code>
+     */
+    FULL(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <pre>
+     * 不包含交易数据
+     * </pre>
+     *
+     * <code>NONE = 0;</code>
+     */
+    public static final int NONE_VALUE = 0;
+    /**
+     * <pre>
+     * 包含交易哈希列表
+     * </pre>
+     *
+     * <code>HASH = 1;</code>
+     */
+    public static final int HASH_VALUE = 1;
+    /**
+     * <pre>
+     * 包含完整交易列表
+     * </pre>
+     *
+     * <code>FULL = 2;</code>
+     */
+    public static final int FULL_VALUE = 2;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static IncludeTransactions valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static IncludeTransactions forNumber(int value) {
+      switch (value) {
+        case 0: return NONE;
+        case 1: return HASH;
+        case 2: return FULL;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<IncludeTransactions>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        IncludeTransactions> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<IncludeTransactions>() {
+            public IncludeTransactions findValueByNumber(int number) {
+              return IncludeTransactions.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final IncludeTransactions[] VALUES = values();
+
+    public static IncludeTransactions valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private IncludeTransactions(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:bdware.bdledger.api.IncludeTransactions)
+  }
+
   public interface BlockFilterOrBuilder extends
       // @@protoc_insertion_point(interface_extends:bdware.bdledger.api.BlockFilter)
       com.google.protobuf.MessageOrBuilder {
@@ -107,15 +244,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlockFilter_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlockFilter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlockFilter_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlockFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.class, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder.class);
     }
 
     public static final int HASH_FIELD_NUMBER = 1;
@@ -185,10 +322,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter other = (org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter) obj;
 
       if (!getHash()
           .equals(other.getHash())) return false;
@@ -215,69 +352,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -290,7 +427,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -311,21 +448,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.BlockFilter)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlockFilter_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlockFilter_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlockFilter_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlockFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.class, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -353,17 +490,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlockFilter_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlockFilter_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -371,8 +508,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter result = new org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter(this);
         result.hash_ = hash_;
         result.timestamp_ = timestamp_;
         onBuilt();
@@ -413,16 +550,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.getDefaultInstance()) return this;
         if (other.getHash() != com.google.protobuf.ByteString.EMPTY) {
           setHash(other.getHash());
         }
@@ -444,11 +581,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -537,12 +674,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.BlockFilter)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -567,7 +704,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -695,15 +832,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionFilter_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionFilter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionFilter_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.class, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder.class);
     }
 
     public static final int HASH_FIELD_NUMBER = 1;
@@ -807,10 +944,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter other = (org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter) obj;
 
       if (!getHash()
           .equals(other.getHash())) return false;
@@ -844,69 +981,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -919,7 +1056,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -944,21 +1081,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.TransactionFilter)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionFilter_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionFilter_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionFilter_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.class, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -990,17 +1127,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionFilter_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionFilter_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1008,8 +1145,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter result = new org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter(this);
         result.hash_ = hash_;
         result.from_ = from_;
         result.to_ = to_;
@@ -1052,16 +1189,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.getDefaultInstance()) return this;
         if (other.getHash() != com.google.protobuf.ByteString.EMPTY) {
           setHash(other.getHash());
         }
@@ -1089,11 +1226,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1251,12 +1388,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.TransactionFilter)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1281,7 +1418,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1399,15 +1536,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashRequest_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashRequest_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.Builder.class);
     }
 
     public static final int LEDGER_FIELD_NUMBER = 1;
@@ -1519,10 +1656,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest other = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest) obj;
 
       if (!getLedger()
           .equals(other.getLedger())) return false;
@@ -1553,69 +1690,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1628,7 +1765,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1649,21 +1786,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetBlockByHashRequest)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequestOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashRequest_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1693,17 +1830,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashRequest_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1711,8 +1848,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest result = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest(this);
         result.ledger_ = ledger_;
         result.hash_ = hash_;
         result.fullTransactions_ = fullTransactions_;
@@ -1754,16 +1891,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest.getDefaultInstance()) return this;
         if (!other.getLedger().isEmpty()) {
           ledger_ = other.ledger_;
           onChanged();
@@ -1789,11 +1926,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1958,12 +2095,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetBlockByHashRequest)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1988,7 +2125,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashRequest getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2007,11 +2144,11 @@ public final class QueryOuterClass {
      * <code>.bdware.bdledger.api.Block block = 1;</code>
      * @return The block.
      */
-    org.bdware.bdledger.api.grpc.pb.Common.Block getBlock();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.Block getBlock();
     /**
      * <code>.bdware.bdledger.api.Block block = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder getBlockOrBuilder();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder getBlockOrBuilder();
   }
   /**
    * Protobuf type {@code bdware.bdledger.api.GetBlockByHashResponse}
@@ -2059,11 +2196,11 @@ public final class QueryOuterClass {
               done = true;
               break;
             case 10: {
-              org.bdware.bdledger.api.grpc.pb.Common.Block.Builder subBuilder = null;
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder subBuilder = null;
               if (block_ != null) {
                 subBuilder = block_.toBuilder();
               }
-              block_ = input.readMessage(org.bdware.bdledger.api.grpc.pb.Common.Block.parser(), extensionRegistry);
+              block_ = input.readMessage(org.bdware.bdledger.api.grpc.pb.CommonProto.Block.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(block_);
                 block_ = subBuilder.buildPartial();
@@ -2092,19 +2229,19 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.Builder.class);
     }
 
     public static final int BLOCK_FIELD_NUMBER = 1;
-    private org.bdware.bdledger.api.grpc.pb.Common.Block block_;
+    private org.bdware.bdledger.api.grpc.pb.CommonProto.Block block_;
     /**
      * <code>.bdware.bdledger.api.Block block = 1;</code>
      * @return Whether the block field is set.
@@ -2116,13 +2253,13 @@ public final class QueryOuterClass {
      * <code>.bdware.bdledger.api.Block block = 1;</code>
      * @return The block.
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.Block getBlock() {
-      return block_ == null ? org.bdware.bdledger.api.grpc.pb.Common.Block.getDefaultInstance() : block_;
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Block getBlock() {
+      return block_ == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.Block.getDefaultInstance() : block_;
     }
     /**
      * <code>.bdware.bdledger.api.Block block = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder getBlockOrBuilder() {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder getBlockOrBuilder() {
       return getBlock();
     }
 
@@ -2166,10 +2303,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse other = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse) obj;
 
       if (hasBlock() != other.hasBlock()) return false;
       if (hasBlock()) {
@@ -2196,69 +2333,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2271,7 +2408,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2292,21 +2429,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetBlockByHashResponse)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2336,17 +2473,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlockByHashResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlockByHashResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2354,8 +2491,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse result = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse(this);
         if (blockBuilder_ == null) {
           result.block_ = block_;
         } else {
@@ -2399,16 +2536,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse.getDefaultInstance()) return this;
         if (other.hasBlock()) {
           mergeBlock(other.getBlock());
         }
@@ -2427,11 +2564,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -2441,9 +2578,9 @@ public final class QueryOuterClass {
         return this;
       }
 
-      private org.bdware.bdledger.api.grpc.pb.Common.Block block_;
+      private org.bdware.bdledger.api.grpc.pb.CommonProto.Block block_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Block, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder, org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder> blockBuilder_;
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Block, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder> blockBuilder_;
       /**
        * <code>.bdware.bdledger.api.Block block = 1;</code>
        * @return Whether the block field is set.
@@ -2455,9 +2592,9 @@ public final class QueryOuterClass {
        * <code>.bdware.bdledger.api.Block block = 1;</code>
        * @return The block.
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Block getBlock() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block getBlock() {
         if (blockBuilder_ == null) {
-          return block_ == null ? org.bdware.bdledger.api.grpc.pb.Common.Block.getDefaultInstance() : block_;
+          return block_ == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.Block.getDefaultInstance() : block_;
         } else {
           return blockBuilder_.getMessage();
         }
@@ -2465,7 +2602,7 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Block block = 1;</code>
        */
-      public Builder setBlock(org.bdware.bdledger.api.grpc.pb.Common.Block value) {
+      public Builder setBlock(org.bdware.bdledger.api.grpc.pb.CommonProto.Block value) {
         if (blockBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2482,7 +2619,7 @@ public final class QueryOuterClass {
        * <code>.bdware.bdledger.api.Block block = 1;</code>
        */
       public Builder setBlock(
-          org.bdware.bdledger.api.grpc.pb.Common.Block.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder builderForValue) {
         if (blockBuilder_ == null) {
           block_ = builderForValue.build();
           onChanged();
@@ -2495,11 +2632,11 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Block block = 1;</code>
        */
-      public Builder mergeBlock(org.bdware.bdledger.api.grpc.pb.Common.Block value) {
+      public Builder mergeBlock(org.bdware.bdledger.api.grpc.pb.CommonProto.Block value) {
         if (blockBuilder_ == null) {
           if (block_ != null) {
             block_ =
-              org.bdware.bdledger.api.grpc.pb.Common.Block.newBuilder(block_).mergeFrom(value).buildPartial();
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Block.newBuilder(block_).mergeFrom(value).buildPartial();
           } else {
             block_ = value;
           }
@@ -2527,7 +2664,7 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Block block = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Block.Builder getBlockBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder getBlockBuilder() {
         
         onChanged();
         return getBlockFieldBuilder().getBuilder();
@@ -2535,23 +2672,23 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Block block = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder getBlockOrBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder getBlockOrBuilder() {
         if (blockBuilder_ != null) {
           return blockBuilder_.getMessageOrBuilder();
         } else {
           return block_ == null ?
-              org.bdware.bdledger.api.grpc.pb.Common.Block.getDefaultInstance() : block_;
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Block.getDefaultInstance() : block_;
         }
       }
       /**
        * <code>.bdware.bdledger.api.Block block = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Block, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder, org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Block, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder> 
           getBlockFieldBuilder() {
         if (blockBuilder_ == null) {
           blockBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.Common.Block, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder, org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Block, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder>(
                   getBlock(),
                   getParentForChildren(),
                   isClean());
@@ -2576,12 +2713,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetBlockByHashResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2606,7 +2743,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlockByHashResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlockByHashResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2643,12 +2780,12 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
-    java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter> 
+    java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter> 
         getFiltersList();
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter getFilters(int index);
+    org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter getFilters(int index);
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
@@ -2656,24 +2793,24 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
-    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder> 
+    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder> 
         getFiltersOrBuilderList();
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder getFiltersOrBuilder(
+    org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder getFiltersOrBuilder(
         int index);
 
     /**
-     * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+     * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
      * @return The enum numeric value on the wire for includeTransactions.
      */
     int getIncludeTransactionsValue();
     /**
-     * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+     * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
      * @return The includeTransactions.
      */
-    org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions getIncludeTransactions();
+    org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions getIncludeTransactions();
   }
   /**
    * Protobuf type {@code bdware.bdledger.api.BlocksRequest}
@@ -2742,11 +2879,11 @@ public final class QueryOuterClass {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                filters_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter>();
+                filters_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter>();
                 mutable_bitField0_ |= 0x00000001;
               }
               filters_.add(
-                  input.readMessage(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.parser(), extensionRegistry));
+                  input.readMessage(org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.parser(), extensionRegistry));
               break;
             }
             case 40: {
@@ -2779,152 +2916,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlocksRequest_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlocksRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlocksRequest_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlocksRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.Builder.class);
-    }
-
-    /**
-     * Protobuf enum {@code bdware.bdledger.api.BlocksRequest.IncludeTransactions}
-     */
-    public enum IncludeTransactions
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <pre>
-       * 不包含交易数据
-       * </pre>
-       *
-       * <code>NONE = 0;</code>
-       */
-      NONE(0),
-      /**
-       * <pre>
-       * 包含交易哈希列表
-       * </pre>
-       *
-       * <code>HASH = 1;</code>
-       */
-      HASH(1),
-      /**
-       * <pre>
-       * 包含完整交易列表
-       * </pre>
-       *
-       * <code>FULL = 2;</code>
-       */
-      FULL(2),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * <pre>
-       * 不包含交易数据
-       * </pre>
-       *
-       * <code>NONE = 0;</code>
-       */
-      public static final int NONE_VALUE = 0;
-      /**
-       * <pre>
-       * 包含交易哈希列表
-       * </pre>
-       *
-       * <code>HASH = 1;</code>
-       */
-      public static final int HASH_VALUE = 1;
-      /**
-       * <pre>
-       * 包含完整交易列表
-       * </pre>
-       *
-       * <code>FULL = 2;</code>
-       */
-      public static final int FULL_VALUE = 2;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static IncludeTransactions valueOf(int value) {
-        return forNumber(value);
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static IncludeTransactions forNumber(int value) {
-        switch (value) {
-          case 0: return NONE;
-          case 1: return HASH;
-          case 2: return FULL;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<IncludeTransactions>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          IncludeTransactions> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<IncludeTransactions>() {
-              public IncludeTransactions findValueByNumber(int number) {
-                return IncludeTransactions.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final IncludeTransactions[] VALUES = values();
-
-      public static IncludeTransactions valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private IncludeTransactions(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:bdware.bdledger.api.BlocksRequest.IncludeTransactions)
+              org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.Builder.class);
     }
 
     public static final int LEDGER_FIELD_NUMBER = 1;
@@ -2984,17 +2984,17 @@ public final class QueryOuterClass {
     }
 
     public static final int FILTERS_FIELD_NUMBER = 4;
-    private java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter> filters_;
+    private java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter> filters_;
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
-    public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter> getFiltersList() {
+    public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter> getFiltersList() {
       return filters_;
     }
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
-    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder> 
+    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder> 
         getFiltersOrBuilderList() {
       return filters_;
     }
@@ -3007,13 +3007,13 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter getFilters(int index) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter getFilters(int index) {
       return filters_.get(index);
     }
     /**
      * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder getFiltersOrBuilder(
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder getFiltersOrBuilder(
         int index) {
       return filters_.get(index);
     }
@@ -3021,20 +3021,20 @@ public final class QueryOuterClass {
     public static final int INCLUDE_TRANSACTIONS_FIELD_NUMBER = 5;
     private int includeTransactions_;
     /**
-     * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+     * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
      * @return The enum numeric value on the wire for includeTransactions.
      */
     public int getIncludeTransactionsValue() {
       return includeTransactions_;
     }
     /**
-     * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+     * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
      * @return The includeTransactions.
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions getIncludeTransactions() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions getIncludeTransactions() {
       @SuppressWarnings("deprecation")
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions result = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions.valueOf(includeTransactions_);
-      return result == null ? org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions.UNRECOGNIZED : result;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions result = org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.valueOf(includeTransactions_);
+      return result == null ? org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -3063,7 +3063,7 @@ public final class QueryOuterClass {
       for (int i = 0; i < filters_.size(); i++) {
         output.writeMessage(4, filters_.get(i));
       }
-      if (includeTransactions_ != org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions.NONE.getNumber()) {
+      if (includeTransactions_ != org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.NONE.getNumber()) {
         output.writeEnum(5, includeTransactions_);
       }
       unknownFields.writeTo(output);
@@ -3090,7 +3090,7 @@ public final class QueryOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, filters_.get(i));
       }
-      if (includeTransactions_ != org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions.NONE.getNumber()) {
+      if (includeTransactions_ != org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(5, includeTransactions_);
       }
@@ -3104,10 +3104,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest other = (org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest) obj;
 
       if (!getLedger()
           .equals(other.getLedger())) return false;
@@ -3148,69 +3148,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3223,7 +3223,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3244,21 +3244,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.BlocksRequest)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequestOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlocksRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlocksRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlocksRequest_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlocksRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3297,17 +3297,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_BlocksRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_BlocksRequest_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3315,8 +3315,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest result = new org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest(this);
         int from_bitField0_ = bitField0_;
         result.ledger_ = ledger_;
         result.startTimestamp_ = startTimestamp_;
@@ -3369,16 +3369,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest.getDefaultInstance()) return this;
         if (!other.getLedger().isEmpty()) {
           ledger_ = other.ledger_;
           onChanged();
@@ -3433,11 +3433,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -3584,22 +3584,22 @@ public final class QueryOuterClass {
         return this;
       }
 
-      private java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter> filters_ =
+      private java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter> filters_ =
         java.util.Collections.emptyList();
       private void ensureFiltersIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          filters_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter>(filters_);
+          filters_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter>(filters_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder> filtersBuilder_;
+          org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder> filtersBuilder_;
 
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter> getFiltersList() {
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter> getFiltersList() {
         if (filtersBuilder_ == null) {
           return java.util.Collections.unmodifiableList(filters_);
         } else {
@@ -3619,7 +3619,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter getFilters(int index) {
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter getFilters(int index) {
         if (filtersBuilder_ == null) {
           return filters_.get(index);
         } else {
@@ -3630,7 +3630,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
       public Builder setFilters(
-          int index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter value) {
+          int index, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter value) {
         if (filtersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3647,7 +3647,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
       public Builder setFilters(
-          int index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder builderForValue) {
         if (filtersBuilder_ == null) {
           ensureFiltersIsMutable();
           filters_.set(index, builderForValue.build());
@@ -3660,7 +3660,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public Builder addFilters(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter value) {
+      public Builder addFilters(org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter value) {
         if (filtersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3677,7 +3677,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
       public Builder addFilters(
-          int index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter value) {
+          int index, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter value) {
         if (filtersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3694,7 +3694,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
       public Builder addFilters(
-          org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder builderForValue) {
         if (filtersBuilder_ == null) {
           ensureFiltersIsMutable();
           filters_.add(builderForValue.build());
@@ -3708,7 +3708,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
       public Builder addFilters(
-          int index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder builderForValue) {
         if (filtersBuilder_ == null) {
           ensureFiltersIsMutable();
           filters_.add(index, builderForValue.build());
@@ -3722,7 +3722,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
       public Builder addAllFilters(
-          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter> values) {
+          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter> values) {
         if (filtersBuilder_ == null) {
           ensureFiltersIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -3762,14 +3762,14 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder getFiltersBuilder(
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder getFiltersBuilder(
           int index) {
         return getFiltersFieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder getFiltersOrBuilder(
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder getFiltersOrBuilder(
           int index) {
         if (filtersBuilder_ == null) {
           return filters_.get(index);  } else {
@@ -3779,7 +3779,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder> 
+      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder> 
            getFiltersOrBuilderList() {
         if (filtersBuilder_ != null) {
           return filtersBuilder_.getMessageOrBuilderList();
@@ -3790,31 +3790,31 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder addFiltersBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder addFiltersBuilder() {
         return getFiltersFieldBuilder().addBuilder(
-            org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.getDefaultInstance());
+            org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.getDefaultInstance());
       }
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder addFiltersBuilder(
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder addFiltersBuilder(
           int index) {
         return getFiltersFieldBuilder().addBuilder(
-            index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.getDefaultInstance());
+            index, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.getDefaultInstance());
       }
       /**
        * <code>repeated .bdware.bdledger.api.BlockFilter filters = 4;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder> 
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder> 
            getFiltersBuilderList() {
         return getFiltersFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder> 
           getFiltersFieldBuilder() {
         if (filtersBuilder_ == null) {
           filtersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlockFilterOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryProto.BlockFilterOrBuilder>(
                   filters_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -3826,14 +3826,14 @@ public final class QueryOuterClass {
 
       private int includeTransactions_ = 0;
       /**
-       * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
        * @return The enum numeric value on the wire for includeTransactions.
        */
       public int getIncludeTransactionsValue() {
         return includeTransactions_;
       }
       /**
-       * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
        * @param value The enum numeric value on the wire for includeTransactions to set.
        * @return This builder for chaining.
        */
@@ -3843,20 +3843,20 @@ public final class QueryOuterClass {
         return this;
       }
       /**
-       * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
        * @return The includeTransactions.
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions getIncludeTransactions() {
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions getIncludeTransactions() {
         @SuppressWarnings("deprecation")
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions result = org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions.valueOf(includeTransactions_);
-        return result == null ? org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions.UNRECOGNIZED : result;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions result = org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.valueOf(includeTransactions_);
+        return result == null ? org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.UNRECOGNIZED : result;
       }
       /**
-       * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
        * @param value The includeTransactions to set.
        * @return This builder for chaining.
        */
-      public Builder setIncludeTransactions(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest.IncludeTransactions value) {
+      public Builder setIncludeTransactions(org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3866,7 +3866,7 @@ public final class QueryOuterClass {
         return this;
       }
       /**
-       * <code>.bdware.bdledger.api.BlocksRequest.IncludeTransactions include_transactions = 5;</code>
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearIncludeTransactions() {
@@ -3892,12 +3892,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.BlocksRequest)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3922,7 +3922,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.BlocksRequest getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.BlocksRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3935,12 +3935,12 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
-    java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Block> 
+    java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Block> 
         getBlocksList();
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.Block getBlocks(int index);
+    org.bdware.bdledger.api.grpc.pb.CommonProto.Block getBlocks(int index);
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
@@ -3948,12 +3948,12 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
-    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder> 
+    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder> 
         getBlocksOrBuilderList();
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder getBlocksOrBuilder(
+    org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder getBlocksOrBuilder(
         int index);
 
     /**
@@ -4017,11 +4017,11 @@ public final class QueryOuterClass {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                blocks_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.Common.Block>();
+                blocks_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.CommonProto.Block>();
                 mutable_bitField0_ |= 0x00000001;
               }
               blocks_.add(
-                  input.readMessage(org.bdware.bdledger.api.grpc.pb.Common.Block.parser(), extensionRegistry));
+                  input.readMessage(org.bdware.bdledger.api.grpc.pb.CommonProto.Block.parser(), extensionRegistry));
               break;
             }
             case 16: {
@@ -4058,29 +4058,29 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlocksResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlocksResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlocksResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlocksResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.Builder.class);
     }
 
     public static final int BLOCKS_FIELD_NUMBER = 1;
-    private java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Block> blocks_;
+    private java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Block> blocks_;
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
-    public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Block> getBlocksList() {
+    public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Block> getBlocksList() {
       return blocks_;
     }
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
-    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder> 
+    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder> 
         getBlocksOrBuilderList() {
       return blocks_;
     }
@@ -4093,13 +4093,13 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.Block getBlocks(int index) {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Block getBlocks(int index) {
       return blocks_.get(index);
     }
     /**
      * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder getBlocksOrBuilder(
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder getBlocksOrBuilder(
         int index) {
       return blocks_.get(index);
     }
@@ -4178,10 +4178,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse other = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse) obj;
 
       if (!getBlocksList()
           .equals(other.getBlocksList())) return false;
@@ -4215,69 +4215,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4290,7 +4290,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4311,21 +4311,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetBlocksResponse)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlocksResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlocksResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlocksResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlocksResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -4360,17 +4360,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetBlocksResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetBlocksResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4378,8 +4378,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse result = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse(this);
         int from_bitField0_ = bitField0_;
         if (blocksBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -4430,16 +4430,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse.getDefaultInstance()) return this;
         if (blocksBuilder_ == null) {
           if (!other.blocks_.isEmpty()) {
             if (blocks_.isEmpty()) {
@@ -4487,11 +4487,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -4502,22 +4502,22 @@ public final class QueryOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Block> blocks_ =
+      private java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Block> blocks_ =
         java.util.Collections.emptyList();
       private void ensureBlocksIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          blocks_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.Common.Block>(blocks_);
+          blocks_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.CommonProto.Block>(blocks_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Block, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder, org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder> blocksBuilder_;
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Block, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder> blocksBuilder_;
 
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Block> getBlocksList() {
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Block> getBlocksList() {
         if (blocksBuilder_ == null) {
           return java.util.Collections.unmodifiableList(blocks_);
         } else {
@@ -4537,7 +4537,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Block getBlocks(int index) {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block getBlocks(int index) {
         if (blocksBuilder_ == null) {
           return blocks_.get(index);
         } else {
@@ -4548,7 +4548,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
       public Builder setBlocks(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Block value) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Block value) {
         if (blocksBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4565,7 +4565,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
       public Builder setBlocks(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder builderForValue) {
         if (blocksBuilder_ == null) {
           ensureBlocksIsMutable();
           blocks_.set(index, builderForValue.build());
@@ -4578,7 +4578,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public Builder addBlocks(org.bdware.bdledger.api.grpc.pb.Common.Block value) {
+      public Builder addBlocks(org.bdware.bdledger.api.grpc.pb.CommonProto.Block value) {
         if (blocksBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4595,7 +4595,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
       public Builder addBlocks(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Block value) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Block value) {
         if (blocksBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4612,7 +4612,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
       public Builder addBlocks(
-          org.bdware.bdledger.api.grpc.pb.Common.Block.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder builderForValue) {
         if (blocksBuilder_ == null) {
           ensureBlocksIsMutable();
           blocks_.add(builderForValue.build());
@@ -4626,7 +4626,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
       public Builder addBlocks(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder builderForValue) {
         if (blocksBuilder_ == null) {
           ensureBlocksIsMutable();
           blocks_.add(index, builderForValue.build());
@@ -4640,7 +4640,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
       public Builder addAllBlocks(
-          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.Common.Block> values) {
+          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.Block> values) {
         if (blocksBuilder_ == null) {
           ensureBlocksIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -4680,14 +4680,14 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Block.Builder getBlocksBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder getBlocksBuilder(
           int index) {
         return getBlocksFieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder getBlocksOrBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder getBlocksOrBuilder(
           int index) {
         if (blocksBuilder_ == null) {
           return blocks_.get(index);  } else {
@@ -4697,7 +4697,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder> 
+      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder> 
            getBlocksOrBuilderList() {
         if (blocksBuilder_ != null) {
           return blocksBuilder_.getMessageOrBuilderList();
@@ -4708,31 +4708,31 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Block.Builder addBlocksBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder addBlocksBuilder() {
         return getBlocksFieldBuilder().addBuilder(
-            org.bdware.bdledger.api.grpc.pb.Common.Block.getDefaultInstance());
+            org.bdware.bdledger.api.grpc.pb.CommonProto.Block.getDefaultInstance());
       }
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Block.Builder addBlocksBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder addBlocksBuilder(
           int index) {
         return getBlocksFieldBuilder().addBuilder(
-            index, org.bdware.bdledger.api.grpc.pb.Common.Block.getDefaultInstance());
+            index, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.getDefaultInstance());
       }
       /**
        * <code>repeated .bdware.bdledger.api.Block blocks = 1;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Block.Builder> 
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder> 
            getBlocksBuilderList() {
         return getBlocksFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Block, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder, org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Block, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder> 
           getBlocksFieldBuilder() {
         if (blocksBuilder_ == null) {
           blocksBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.Common.Block, org.bdware.bdledger.api.grpc.pb.Common.Block.Builder, org.bdware.bdledger.api.grpc.pb.Common.BlockOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Block, org.bdware.bdledger.api.grpc.pb.CommonProto.Block.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.BlockOrBuilder>(
                   blocks_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -4818,12 +4818,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetBlocksResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4848,7 +4848,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetBlocksResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetBlocksResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4957,15 +4957,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountBlocksResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountBlocksResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountBlocksResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountBlocksResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.Builder.class);
     }
 
     public static final int COUNT_FIELD_NUMBER = 1;
@@ -5052,10 +5052,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse other = (org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse) obj;
 
       if (getCount()
           != other.getCount()) return false;
@@ -5088,69 +5088,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5163,7 +5163,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5184,21 +5184,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.CountBlocksResponse)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountBlocksResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountBlocksResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountBlocksResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountBlocksResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5228,17 +5228,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountBlocksResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountBlocksResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5246,8 +5246,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse result = new org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse(this);
         result.count_ = count_;
         result.startTimestamp_ = startTimestamp_;
         result.endTimestamp_ = endTimestamp_;
@@ -5289,16 +5289,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse.getDefaultInstance()) return this;
         if (other.getCount() != 0L) {
           setCount(other.getCount());
         }
@@ -5323,11 +5323,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -5443,12 +5443,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.CountBlocksResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5473,7 +5473,747 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountBlocksResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.CountBlocksResponse getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface RecentBlocksRequestOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:bdware.bdledger.api.RecentBlocksRequest)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>string ledger = 1;</code>
+     * @return The ledger.
+     */
+    java.lang.String getLedger();
+    /**
+     * <code>string ledger = 1;</code>
+     * @return The bytes for ledger.
+     */
+    com.google.protobuf.ByteString
+        getLedgerBytes();
+
+    /**
+     * <code>int64 count = 2;</code>
+     * @return The count.
+     */
+    long getCount();
+
+    /**
+     * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+     * @return The enum numeric value on the wire for includeTransactions.
+     */
+    int getIncludeTransactionsValue();
+    /**
+     * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+     * @return The includeTransactions.
+     */
+    org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions getIncludeTransactions();
+  }
+  /**
+   * Protobuf type {@code bdware.bdledger.api.RecentBlocksRequest}
+   */
+  public  static final class RecentBlocksRequest extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:bdware.bdledger.api.RecentBlocksRequest)
+      RecentBlocksRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use RecentBlocksRequest.newBuilder() to construct.
+    private RecentBlocksRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private RecentBlocksRequest() {
+      ledger_ = "";
+      includeTransactions_ = 0;
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new RecentBlocksRequest();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private RecentBlocksRequest(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              ledger_ = s;
+              break;
+            }
+            case 16: {
+
+              count_ = input.readInt64();
+              break;
+            }
+            case 24: {
+              int rawValue = input.readEnum();
+
+              includeTransactions_ = rawValue;
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_RecentBlocksRequest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_RecentBlocksRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.Builder.class);
+    }
+
+    public static final int LEDGER_FIELD_NUMBER = 1;
+    private volatile java.lang.Object ledger_;
+    /**
+     * <code>string ledger = 1;</code>
+     * @return The ledger.
+     */
+    public java.lang.String getLedger() {
+      java.lang.Object ref = ledger_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        ledger_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string ledger = 1;</code>
+     * @return The bytes for ledger.
+     */
+    public com.google.protobuf.ByteString
+        getLedgerBytes() {
+      java.lang.Object ref = ledger_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        ledger_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int COUNT_FIELD_NUMBER = 2;
+    private long count_;
+    /**
+     * <code>int64 count = 2;</code>
+     * @return The count.
+     */
+    public long getCount() {
+      return count_;
+    }
+
+    public static final int INCLUDE_TRANSACTIONS_FIELD_NUMBER = 3;
+    private int includeTransactions_;
+    /**
+     * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+     * @return The enum numeric value on the wire for includeTransactions.
+     */
+    public int getIncludeTransactionsValue() {
+      return includeTransactions_;
+    }
+    /**
+     * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+     * @return The includeTransactions.
+     */
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions getIncludeTransactions() {
+      @SuppressWarnings("deprecation")
+      org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions result = org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.valueOf(includeTransactions_);
+      return result == null ? org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.UNRECOGNIZED : result;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (!getLedgerBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, ledger_);
+      }
+      if (count_ != 0L) {
+        output.writeInt64(2, count_);
+      }
+      if (includeTransactions_ != org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.NONE.getNumber()) {
+        output.writeEnum(3, includeTransactions_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (!getLedgerBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, ledger_);
+      }
+      if (count_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(2, count_);
+      }
+      if (includeTransactions_ != org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(3, includeTransactions_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest)) {
+        return super.equals(obj);
+      }
+      org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest other = (org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest) obj;
+
+      if (!getLedger()
+          .equals(other.getLedger())) return false;
+      if (getCount()
+          != other.getCount()) return false;
+      if (includeTransactions_ != other.includeTransactions_) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + LEDGER_FIELD_NUMBER;
+      hash = (53 * hash) + getLedger().hashCode();
+      hash = (37 * hash) + COUNT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getCount());
+      hash = (37 * hash) + INCLUDE_TRANSACTIONS_FIELD_NUMBER;
+      hash = (53 * hash) + includeTransactions_;
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code bdware.bdledger.api.RecentBlocksRequest}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.RecentBlocksRequest)
+        org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequestOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_RecentBlocksRequest_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_RecentBlocksRequest_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.Builder.class);
+      }
+
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        ledger_ = "";
+
+        count_ = 0L;
+
+        includeTransactions_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_RecentBlocksRequest_descriptor;
+      }
+
+      @java.lang.Override
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest result = new org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest(this);
+        result.ledger_ = ledger_;
+        result.count_ = count_;
+        result.includeTransactions_ = includeTransactions_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest.getDefaultInstance()) return this;
+        if (!other.getLedger().isEmpty()) {
+          ledger_ = other.ledger_;
+          onChanged();
+        }
+        if (other.getCount() != 0L) {
+          setCount(other.getCount());
+        }
+        if (other.includeTransactions_ != 0) {
+          setIncludeTransactionsValue(other.getIncludeTransactionsValue());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private java.lang.Object ledger_ = "";
+      /**
+       * <code>string ledger = 1;</code>
+       * @return The ledger.
+       */
+      public java.lang.String getLedger() {
+        java.lang.Object ref = ledger_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          ledger_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string ledger = 1;</code>
+       * @return The bytes for ledger.
+       */
+      public com.google.protobuf.ByteString
+          getLedgerBytes() {
+        java.lang.Object ref = ledger_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          ledger_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string ledger = 1;</code>
+       * @param value The ledger to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLedger(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        ledger_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string ledger = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLedger() {
+        
+        ledger_ = getDefaultInstance().getLedger();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string ledger = 1;</code>
+       * @param value The bytes for ledger to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLedgerBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        ledger_ = value;
+        onChanged();
+        return this;
+      }
+
+      private long count_ ;
+      /**
+       * <code>int64 count = 2;</code>
+       * @return The count.
+       */
+      public long getCount() {
+        return count_;
+      }
+      /**
+       * <code>int64 count = 2;</code>
+       * @param value The count to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCount(long value) {
+        
+        count_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int64 count = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCount() {
+        
+        count_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int includeTransactions_ = 0;
+      /**
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+       * @return The enum numeric value on the wire for includeTransactions.
+       */
+      public int getIncludeTransactionsValue() {
+        return includeTransactions_;
+      }
+      /**
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+       * @param value The enum numeric value on the wire for includeTransactions to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIncludeTransactionsValue(int value) {
+        includeTransactions_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+       * @return The includeTransactions.
+       */
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions getIncludeTransactions() {
+        @SuppressWarnings("deprecation")
+        org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions result = org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.valueOf(includeTransactions_);
+        return result == null ? org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+       * @param value The includeTransactions to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIncludeTransactions(org.bdware.bdledger.api.grpc.pb.QueryProto.IncludeTransactions value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        includeTransactions_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.bdware.bdledger.api.IncludeTransactions include_transactions = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIncludeTransactions() {
+        
+        includeTransactions_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:bdware.bdledger.api.RecentBlocksRequest)
+    }
+
+    // @@protoc_insertion_point(class_scope:bdware.bdledger.api.RecentBlocksRequest)
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest();
+    }
+
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<RecentBlocksRequest>
+        PARSER = new com.google.protobuf.AbstractParser<RecentBlocksRequest>() {
+      @java.lang.Override
+      public RecentBlocksRequest parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new RecentBlocksRequest(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<RecentBlocksRequest> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<RecentBlocksRequest> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.RecentBlocksRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -5580,15 +6320,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.Builder.class);
     }
 
     public static final int LEDGER_FIELD_NUMBER = 1;
@@ -5683,10 +6423,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest other = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest) obj;
 
       if (!getLedger()
           .equals(other.getLedger())) return false;
@@ -5712,69 +6452,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5787,7 +6527,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -5808,21 +6548,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetTransactionByHashRequest)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequestOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5850,17 +6590,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -5868,8 +6608,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest result = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest(this);
         result.ledger_ = ledger_;
         result.hash_ = hash_;
         onBuilt();
@@ -5910,16 +6650,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest.getDefaultInstance()) return this;
         if (!other.getLedger().isEmpty()) {
           ledger_ = other.ledger_;
           onChanged();
@@ -5942,11 +6682,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6081,12 +6821,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetTransactionByHashRequest)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6111,7 +6851,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashRequest getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6130,11 +6870,11 @@ public final class QueryOuterClass {
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      * @return The transaction.
      */
-    org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransaction();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransaction();
     /**
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionOrBuilder();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionOrBuilder();
   }
   /**
    * Protobuf type {@code bdware.bdledger.api.GetTransactionByHashResponse}
@@ -6182,11 +6922,11 @@ public final class QueryOuterClass {
               done = true;
               break;
             case 10: {
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder subBuilder = null;
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ = input.readMessage(org.bdware.bdledger.api.grpc.pb.Common.Transaction.parser(), extensionRegistry);
+              transaction_ = input.readMessage(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -6215,19 +6955,19 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.Builder.class);
     }
 
     public static final int TRANSACTION_FIELD_NUMBER = 1;
-    private org.bdware.bdledger.api.grpc.pb.Common.Transaction transaction_;
+    private org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction transaction_;
     /**
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      * @return Whether the transaction field is set.
@@ -6239,13 +6979,13 @@ public final class QueryOuterClass {
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      * @return The transaction.
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransaction() {
-      return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance() : transaction_;
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransaction() {
+      return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance() : transaction_;
     }
     /**
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionOrBuilder() {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionOrBuilder() {
       return getTransaction();
     }
 
@@ -6289,10 +7029,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse other = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse) obj;
 
       if (hasTransaction() != other.hasTransaction()) return false;
       if (hasTransaction()) {
@@ -6319,69 +7059,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -6394,7 +7134,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6415,21 +7155,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetTransactionByHashResponse)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -6459,17 +7199,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByHashResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6477,8 +7217,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse result = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse(this);
         if (transactionBuilder_ == null) {
           result.transaction_ = transaction_;
         } else {
@@ -6522,16 +7262,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse.getDefaultInstance()) return this;
         if (other.hasTransaction()) {
           mergeTransaction(other.getTransaction());
         }
@@ -6550,11 +7290,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -6564,9 +7304,9 @@ public final class QueryOuterClass {
         return this;
       }
 
-      private org.bdware.bdledger.api.grpc.pb.Common.Transaction transaction_;
+      private org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction transaction_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> transactionBuilder_;
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> transactionBuilder_;
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        * @return Whether the transaction field is set.
@@ -6578,9 +7318,9 @@ public final class QueryOuterClass {
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        * @return The transaction.
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransaction() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransaction() {
         if (transactionBuilder_ == null) {
-          return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance() : transaction_;
+          return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance() : transaction_;
         } else {
           return transactionBuilder_.getMessage();
         }
@@ -6588,7 +7328,7 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
-      public Builder setTransaction(org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+      public Builder setTransaction(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6605,7 +7345,7 @@ public final class QueryOuterClass {
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
       public Builder setTransaction(
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder builderForValue) {
         if (transactionBuilder_ == null) {
           transaction_ = builderForValue.build();
           onChanged();
@@ -6618,11 +7358,11 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
-      public Builder mergeTransaction(org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+      public Builder mergeTransaction(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionBuilder_ == null) {
           if (transaction_ != null) {
             transaction_ =
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
           } else {
             transaction_ = value;
           }
@@ -6650,7 +7390,7 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder getTransactionBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder getTransactionBuilder() {
         
         onChanged();
         return getTransactionFieldBuilder().getBuilder();
@@ -6658,23 +7398,23 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionOrBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionOrBuilder() {
         if (transactionBuilder_ != null) {
           return transactionBuilder_.getMessageOrBuilder();
         } else {
           return transaction_ == null ?
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance() : transaction_;
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance() : transaction_;
         }
       }
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
           getTransactionFieldBuilder() {
         if (transactionBuilder_ == null) {
           transactionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder>(
                   getTransaction(),
                   getParentForChildren(),
                   isClean());
@@ -6699,12 +7439,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetTransactionByHashResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6729,7 +7469,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByHashResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByHashResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -6847,15 +7587,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.Builder.class);
     }
 
     public static final int LEDGER_FIELD_NUMBER = 1;
@@ -6967,10 +7707,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest other = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest) obj;
 
       if (!getLedger()
           .equals(other.getLedger())) return false;
@@ -7000,69 +7740,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7075,7 +7815,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7096,21 +7836,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetTransactionByBlockHashAndIndexRequest)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequestOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -7140,17 +7880,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7158,8 +7898,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest result = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest(this);
         result.ledger_ = ledger_;
         result.blockHash_ = blockHash_;
         result.index_ = index_;
@@ -7201,16 +7941,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest.getDefaultInstance()) return this;
         if (!other.getLedger().isEmpty()) {
           ledger_ = other.ledger_;
           onChanged();
@@ -7236,11 +7976,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7405,12 +8145,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetTransactionByBlockHashAndIndexRequest)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7435,7 +8175,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexRequest getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -7454,11 +8194,11 @@ public final class QueryOuterClass {
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      * @return The transaction.
      */
-    org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransaction();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransaction();
     /**
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionOrBuilder();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionOrBuilder();
   }
   /**
    * Protobuf type {@code bdware.bdledger.api.GetTransactionByBlockHashAndIndexResponse}
@@ -7506,11 +8246,11 @@ public final class QueryOuterClass {
               done = true;
               break;
             case 10: {
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder subBuilder = null;
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder subBuilder = null;
               if (transaction_ != null) {
                 subBuilder = transaction_.toBuilder();
               }
-              transaction_ = input.readMessage(org.bdware.bdledger.api.grpc.pb.Common.Transaction.parser(), extensionRegistry);
+              transaction_ = input.readMessage(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(transaction_);
                 transaction_ = subBuilder.buildPartial();
@@ -7539,19 +8279,19 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.Builder.class);
     }
 
     public static final int TRANSACTION_FIELD_NUMBER = 1;
-    private org.bdware.bdledger.api.grpc.pb.Common.Transaction transaction_;
+    private org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction transaction_;
     /**
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      * @return Whether the transaction field is set.
@@ -7563,13 +8303,13 @@ public final class QueryOuterClass {
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      * @return The transaction.
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransaction() {
-      return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance() : transaction_;
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransaction() {
+      return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance() : transaction_;
     }
     /**
      * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionOrBuilder() {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionOrBuilder() {
       return getTransaction();
     }
 
@@ -7613,10 +8353,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse other = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse) obj;
 
       if (hasTransaction() != other.hasTransaction()) return false;
       if (hasTransaction()) {
@@ -7643,69 +8383,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7718,7 +8458,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -7739,21 +8479,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetTransactionByBlockHashAndIndexResponse)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -7783,17 +8523,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -7801,8 +8541,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse result = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse(this);
         if (transactionBuilder_ == null) {
           result.transaction_ = transaction_;
         } else {
@@ -7846,16 +8586,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse.getDefaultInstance()) return this;
         if (other.hasTransaction()) {
           mergeTransaction(other.getTransaction());
         }
@@ -7874,11 +8614,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -7888,9 +8628,9 @@ public final class QueryOuterClass {
         return this;
       }
 
-      private org.bdware.bdledger.api.grpc.pb.Common.Transaction transaction_;
+      private org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction transaction_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> transactionBuilder_;
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> transactionBuilder_;
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        * @return Whether the transaction field is set.
@@ -7902,9 +8642,9 @@ public final class QueryOuterClass {
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        * @return The transaction.
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransaction() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransaction() {
         if (transactionBuilder_ == null) {
-          return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance() : transaction_;
+          return transaction_ == null ? org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance() : transaction_;
         } else {
           return transactionBuilder_.getMessage();
         }
@@ -7912,7 +8652,7 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
-      public Builder setTransaction(org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+      public Builder setTransaction(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7929,7 +8669,7 @@ public final class QueryOuterClass {
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
       public Builder setTransaction(
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder builderForValue) {
         if (transactionBuilder_ == null) {
           transaction_ = builderForValue.build();
           onChanged();
@@ -7942,11 +8682,11 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
-      public Builder mergeTransaction(org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+      public Builder mergeTransaction(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionBuilder_ == null) {
           if (transaction_ != null) {
             transaction_ =
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.newBuilder(transaction_).mergeFrom(value).buildPartial();
           } else {
             transaction_ = value;
           }
@@ -7974,7 +8714,7 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder getTransactionBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder getTransactionBuilder() {
         
         onChanged();
         return getTransactionFieldBuilder().getBuilder();
@@ -7982,23 +8722,23 @@ public final class QueryOuterClass {
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionOrBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionOrBuilder() {
         if (transactionBuilder_ != null) {
           return transactionBuilder_.getMessageOrBuilder();
         } else {
           return transaction_ == null ?
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance() : transaction_;
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance() : transaction_;
         }
       }
       /**
        * <code>.bdware.bdledger.api.Transaction transaction = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
           getTransactionFieldBuilder() {
         if (transactionBuilder_ == null) {
           transactionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder>(
                   getTransaction(),
                   getParentForChildren(),
                   isClean());
@@ -8023,12 +8763,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetTransactionByBlockHashAndIndexResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8053,7 +8793,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionByBlockHashAndIndexResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionByBlockHashAndIndexResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8094,12 +8834,12 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
-    java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter> 
+    java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter> 
         getFiltersList();
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter getFilters(int index);
+    org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter getFilters(int index);
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
@@ -8107,12 +8847,12 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
-    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder> 
+    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder> 
         getFiltersOrBuilderList();
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder getFiltersOrBuilder(
+    org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder getFiltersOrBuilder(
         int index);
   }
   /**
@@ -8181,11 +8921,11 @@ public final class QueryOuterClass {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                filters_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter>();
+                filters_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter>();
                 mutable_bitField0_ |= 0x00000001;
               }
               filters_.add(
-                  input.readMessage(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.parser(), extensionRegistry));
+                  input.readMessage(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.parser(), extensionRegistry));
               break;
             }
             default: {
@@ -8212,15 +8952,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionsRequest_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionsRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionsRequest_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.Builder.class);
     }
 
     public static final int LEDGER_FIELD_NUMBER = 1;
@@ -8284,17 +9024,17 @@ public final class QueryOuterClass {
     }
 
     public static final int FILTERS_FIELD_NUMBER = 4;
-    private java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter> filters_;
+    private java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter> filters_;
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
-    public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter> getFiltersList() {
+    public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter> getFiltersList() {
       return filters_;
     }
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
-    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder> 
+    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder> 
         getFiltersOrBuilderList() {
       return filters_;
     }
@@ -8307,13 +9047,13 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter getFilters(int index) {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter getFilters(int index) {
       return filters_.get(index);
     }
     /**
      * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder getFiltersOrBuilder(
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder getFiltersOrBuilder(
         int index) {
       return filters_.get(index);
     }
@@ -8378,10 +9118,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest other = (org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest) obj;
 
       if (!getLedger()
           .equals(other.getLedger())) return false;
@@ -8419,69 +9159,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -8494,7 +9234,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -8515,21 +9255,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.TransactionsRequest)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequestOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionsRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionsRequest_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionsRequest_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.class, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -8566,17 +9306,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_TransactionsRequest_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_TransactionsRequest_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -8584,8 +9324,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest result = new org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest(this);
         int from_bitField0_ = bitField0_;
         result.ledger_ = ledger_;
         result.startTimestamp_ = startTimestamp_;
@@ -8637,16 +9377,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest.getDefaultInstance()) return this;
         if (!other.getLedger().isEmpty()) {
           ledger_ = other.ledger_;
           onChanged();
@@ -8698,11 +9438,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -8861,22 +9601,22 @@ public final class QueryOuterClass {
         return this;
       }
 
-      private java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter> filters_ =
+      private java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter> filters_ =
         java.util.Collections.emptyList();
       private void ensureFiltersIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          filters_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter>(filters_);
+          filters_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter>(filters_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder> filtersBuilder_;
+          org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder> filtersBuilder_;
 
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter> getFiltersList() {
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter> getFiltersList() {
         if (filtersBuilder_ == null) {
           return java.util.Collections.unmodifiableList(filters_);
         } else {
@@ -8896,7 +9636,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter getFilters(int index) {
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter getFilters(int index) {
         if (filtersBuilder_ == null) {
           return filters_.get(index);
         } else {
@@ -8907,7 +9647,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
       public Builder setFilters(
-          int index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter value) {
+          int index, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter value) {
         if (filtersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8924,7 +9664,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
       public Builder setFilters(
-          int index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder builderForValue) {
         if (filtersBuilder_ == null) {
           ensureFiltersIsMutable();
           filters_.set(index, builderForValue.build());
@@ -8937,7 +9677,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public Builder addFilters(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter value) {
+      public Builder addFilters(org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter value) {
         if (filtersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8954,7 +9694,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
       public Builder addFilters(
-          int index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter value) {
+          int index, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter value) {
         if (filtersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8971,7 +9711,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
       public Builder addFilters(
-          org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder builderForValue) {
         if (filtersBuilder_ == null) {
           ensureFiltersIsMutable();
           filters_.add(builderForValue.build());
@@ -8985,7 +9725,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
       public Builder addFilters(
-          int index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder builderForValue) {
         if (filtersBuilder_ == null) {
           ensureFiltersIsMutable();
           filters_.add(index, builderForValue.build());
@@ -8999,7 +9739,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
       public Builder addAllFilters(
-          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter> values) {
+          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter> values) {
         if (filtersBuilder_ == null) {
           ensureFiltersIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -9039,14 +9779,14 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder getFiltersBuilder(
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder getFiltersBuilder(
           int index) {
         return getFiltersFieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder getFiltersOrBuilder(
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder getFiltersOrBuilder(
           int index) {
         if (filtersBuilder_ == null) {
           return filters_.get(index);  } else {
@@ -9056,7 +9796,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder> 
+      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder> 
            getFiltersOrBuilderList() {
         if (filtersBuilder_ != null) {
           return filtersBuilder_.getMessageOrBuilderList();
@@ -9067,31 +9807,31 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder addFiltersBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder addFiltersBuilder() {
         return getFiltersFieldBuilder().addBuilder(
-            org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.getDefaultInstance());
+            org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.getDefaultInstance());
       }
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder addFiltersBuilder(
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder addFiltersBuilder(
           int index) {
         return getFiltersFieldBuilder().addBuilder(
-            index, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.getDefaultInstance());
+            index, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.getDefaultInstance());
       }
       /**
        * <code>repeated .bdware.bdledger.api.TransactionFilter filters = 4;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder> 
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder> 
            getFiltersBuilderList() {
         return getFiltersFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder> 
           getFiltersFieldBuilder() {
         if (filtersBuilder_ == null) {
           filtersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionFilterOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilter.Builder, org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionFilterOrBuilder>(
                   filters_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -9117,12 +9857,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.TransactionsRequest)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9147,7 +9887,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.TransactionsRequest getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.TransactionsRequest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9160,12 +9900,12 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
-    java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> 
+    java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> 
         getTransactionsList();
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransactions(int index);
+    org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransactions(int index);
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
@@ -9173,12 +9913,12 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
-    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+    java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
         getTransactionsOrBuilderList();
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
-    org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionsOrBuilder(
+    org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionsOrBuilder(
         int index);
 
     /**
@@ -9242,11 +9982,11 @@ public final class QueryOuterClass {
               break;
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                transactions_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.Common.Transaction>();
+                transactions_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction>();
                 mutable_bitField0_ |= 0x00000001;
               }
               transactions_.add(
-                  input.readMessage(org.bdware.bdledger.api.grpc.pb.Common.Transaction.parser(), extensionRegistry));
+                  input.readMessage(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.parser(), extensionRegistry));
               break;
             }
             case 16: {
@@ -9283,29 +10023,29 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionsResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionsResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionsResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.Builder.class);
     }
 
     public static final int TRANSACTIONS_FIELD_NUMBER = 1;
-    private java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> transactions_;
+    private java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> transactions_;
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
-    public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> getTransactionsList() {
+    public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> getTransactionsList() {
       return transactions_;
     }
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
-    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+    public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
         getTransactionsOrBuilderList() {
       return transactions_;
     }
@@ -9318,13 +10058,13 @@ public final class QueryOuterClass {
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransactions(int index) {
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransactions(int index) {
       return transactions_.get(index);
     }
     /**
      * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
      */
-    public org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionsOrBuilder(
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionsOrBuilder(
         int index) {
       return transactions_.get(index);
     }
@@ -9403,10 +10143,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse other = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse) obj;
 
       if (!getTransactionsList()
           .equals(other.getTransactionsList())) return false;
@@ -9440,69 +10180,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -9515,7 +10255,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9536,21 +10276,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.GetTransactionsResponse)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionsResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionsResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionsResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -9585,17 +10325,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_GetTransactionsResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_GetTransactionsResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9603,8 +10343,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse result = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse(this);
         int from_bitField0_ = bitField0_;
         if (transactionsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -9655,16 +10395,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse.getDefaultInstance()) return this;
         if (transactionsBuilder_ == null) {
           if (!other.transactions_.isEmpty()) {
             if (transactions_.isEmpty()) {
@@ -9712,11 +10452,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -9727,22 +10467,22 @@ public final class QueryOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> transactions_ =
+      private java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> transactions_ =
         java.util.Collections.emptyList();
       private void ensureTransactionsIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          transactions_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.Common.Transaction>(transactions_);
+          transactions_ = new java.util.ArrayList<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction>(transactions_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> transactionsBuilder_;
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> transactionsBuilder_;
 
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction> getTransactionsList() {
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> getTransactionsList() {
         if (transactionsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(transactions_);
         } else {
@@ -9762,7 +10502,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction getTransactions(int index) {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction getTransactions(int index) {
         if (transactionsBuilder_ == null) {
           return transactions_.get(index);
         } else {
@@ -9773,7 +10513,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
       public Builder setTransactions(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9790,7 +10530,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
       public Builder setTransactions(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder builderForValue) {
         if (transactionsBuilder_ == null) {
           ensureTransactionsIsMutable();
           transactions_.set(index, builderForValue.build());
@@ -9803,7 +10543,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public Builder addTransactions(org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+      public Builder addTransactions(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9820,7 +10560,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
       public Builder addTransactions(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Transaction value) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction value) {
         if (transactionsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9837,7 +10577,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
       public Builder addTransactions(
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder builderForValue) {
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder builderForValue) {
         if (transactionsBuilder_ == null) {
           ensureTransactionsIsMutable();
           transactions_.add(builderForValue.build());
@@ -9851,7 +10591,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
       public Builder addTransactions(
-          int index, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder builderForValue) {
+          int index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder builderForValue) {
         if (transactionsBuilder_ == null) {
           ensureTransactionsIsMutable();
           transactions_.add(index, builderForValue.build());
@@ -9865,7 +10605,7 @@ public final class QueryOuterClass {
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
       public Builder addAllTransactions(
-          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.Common.Transaction> values) {
+          java.lang.Iterable<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction> values) {
         if (transactionsBuilder_ == null) {
           ensureTransactionsIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -9905,14 +10645,14 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder getTransactionsBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder getTransactionsBuilder(
           int index) {
         return getTransactionsFieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder getTransactionsOrBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder getTransactionsOrBuilder(
           int index) {
         if (transactionsBuilder_ == null) {
           return transactions_.get(index);  } else {
@@ -9922,7 +10662,7 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+      public java.util.List<? extends org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
            getTransactionsOrBuilderList() {
         if (transactionsBuilder_ != null) {
           return transactionsBuilder_.getMessageOrBuilderList();
@@ -9933,31 +10673,31 @@ public final class QueryOuterClass {
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder addTransactionsBuilder() {
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder addTransactionsBuilder() {
         return getTransactionsFieldBuilder().addBuilder(
-            org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance());
+            org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance());
       }
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder addTransactionsBuilder(
+      public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder addTransactionsBuilder(
           int index) {
         return getTransactionsFieldBuilder().addBuilder(
-            index, org.bdware.bdledger.api.grpc.pb.Common.Transaction.getDefaultInstance());
+            index, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.getDefaultInstance());
       }
       /**
        * <code>repeated .bdware.bdledger.api.Transaction transactions = 1;</code>
        */
-      public java.util.List<org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder> 
+      public java.util.List<org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder> 
            getTransactionsBuilderList() {
         return getTransactionsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder> 
+          org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder> 
           getTransactionsFieldBuilder() {
         if (transactionsBuilder_ == null) {
           transactionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              org.bdware.bdledger.api.grpc.pb.Common.Transaction, org.bdware.bdledger.api.grpc.pb.Common.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.Common.TransactionOrBuilder>(
+              org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction, org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction.Builder, org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionOrBuilder>(
                   transactions_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -10043,12 +10783,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.GetTransactionsResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -10073,7 +10813,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.GetTransactionsResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.GetTransactionsResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -10182,15 +10922,15 @@ public final class QueryOuterClass {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountTransactionsResponse_descriptor;
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountTransactionsResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountTransactionsResponse_fieldAccessorTable
+      return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountTransactionsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.Builder.class);
+              org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.Builder.class);
     }
 
     public static final int COUNT_FIELD_NUMBER = 1;
@@ -10277,10 +11017,10 @@ public final class QueryOuterClass {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse)) {
+      if (!(obj instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse)) {
         return super.equals(obj);
       }
-      org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse other = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse) obj;
+      org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse other = (org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse) obj;
 
       if (getCount()
           != other.getCount()) return false;
@@ -10313,69 +11053,69 @@ public final class QueryOuterClass {
       return hash;
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(byte[] data)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseDelimitedFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
           .parseWithIOException(PARSER, input);
     }
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parseFrom(
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -10388,7 +11128,7 @@ public final class QueryOuterClass {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse prototype) {
+    public static Builder newBuilder(org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -10409,21 +11149,21 @@ public final class QueryOuterClass {
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:bdware.bdledger.api.CountTransactionsResponse)
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponseOrBuilder {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountTransactionsResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountTransactionsResponse_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountTransactionsResponse_fieldAccessorTable
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountTransactionsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.class, org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.Builder.class);
+                org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.class, org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.Builder.class);
       }
 
-      // Construct using org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.newBuilder()
+      // Construct using org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -10453,17 +11193,17 @@ public final class QueryOuterClass {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.internal_static_bdware_bdledger_api_CountTransactionsResponse_descriptor;
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.internal_static_bdware_bdledger_api_CountTransactionsResponse_descriptor;
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse getDefaultInstanceForType() {
-        return org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.getDefaultInstance();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse getDefaultInstanceForType() {
+        return org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.getDefaultInstance();
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse build() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse result = buildPartial();
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse build() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -10471,8 +11211,8 @@ public final class QueryOuterClass {
       }
 
       @java.lang.Override
-      public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse buildPartial() {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse result = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse(this);
+      public org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse buildPartial() {
+        org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse result = new org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse(this);
         result.count_ = count_;
         result.startTimestamp_ = startTimestamp_;
         result.endTimestamp_ = endTimestamp_;
@@ -10514,16 +11254,16 @@ public final class QueryOuterClass {
       }
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse) {
-          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse)other);
+        if (other instanceof org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse) {
+          return mergeFrom((org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse other) {
-        if (other == org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse other) {
+        if (other == org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse.getDefaultInstance()) return this;
         if (other.getCount() != 0L) {
           setCount(other.getCount());
         }
@@ -10548,11 +11288,11 @@ public final class QueryOuterClass {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse parsedMessage = null;
+        org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -10668,12 +11408,12 @@ public final class QueryOuterClass {
     }
 
     // @@protoc_insertion_point(class_scope:bdware.bdledger.api.CountTransactionsResponse)
-    private static final org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse DEFAULT_INSTANCE;
+    private static final org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse();
+      DEFAULT_INSTANCE = new org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse();
     }
 
-    public static org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse getDefaultInstance() {
+    public static org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -10698,7 +11438,7 @@ public final class QueryOuterClass {
     }
 
     @java.lang.Override
-    public org.bdware.bdledger.api.grpc.pb.QueryOuterClass.CountTransactionsResponse getDefaultInstanceForType() {
+    public org.bdware.bdledger.api.grpc.pb.QueryProto.CountTransactionsResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -10739,6 +11479,11 @@ public final class QueryOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_bdware_bdledger_api_CountBlocksResponse_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_bdware_bdledger_api_RecentBlocksRequest_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_bdware_bdledger_api_RecentBlocksRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor;
   private static final 
@@ -10792,63 +11537,69 @@ public final class QueryOuterClass {
       "t\022\016\n\006ledger\030\001 \001(\t\022\014\n\004hash\030\002 \001(\014\022\031\n\021full_" +
       "transactions\030\003 \001(\010\"C\n\026GetBlockByHashResp" +
       "onse\022)\n\005block\030\001 \001(\0132\032.bdware.bdledger.ap" +
-      "i.Block\"\215\002\n\rBlocksRequest\022\016\n\006ledger\030\001 \001(" +
+      "i.Block\"\312\001\n\rBlocksRequest\022\016\n\006ledger\030\001 \001(" +
       "\t\022\027\n\017start_timestamp\030\002 \001(\003\022\025\n\rend_timest" +
       "amp\030\003 \001(\003\0221\n\007filters\030\004 \003(\0132 .bdware.bdle" +
-      "dger.api.BlockFilter\022T\n\024include_transact" +
-      "ions\030\005 \001(\01626.bdware.bdledger.api.BlocksR" +
-      "equest.IncludeTransactions\"3\n\023IncludeTra" +
-      "nsactions\022\010\n\004NONE\020\000\022\010\n\004HASH\020\001\022\010\n\004FULL\020\002\"" +
-      "o\n\021GetBlocksResponse\022*\n\006blocks\030\001 \003(\0132\032.b" +
-      "dware.bdledger.api.Block\022\027\n\017start_timest" +
-      "amp\030\002 \001(\003\022\025\n\rend_timestamp\030\003 \001(\003\"T\n\023Coun" +
-      "tBlocksResponse\022\r\n\005count\030\001 \001(\004\022\027\n\017start_" +
-      "timestamp\030\002 \001(\003\022\025\n\rend_timestamp\030\003 \001(\003\";" +
-      "\n\033GetTransactionByHashRequest\022\016\n\006ledger\030" +
-      "\001 \001(\t\022\014\n\004hash\030\002 \001(\014\"U\n\034GetTransactionByH" +
-      "ashResponse\0225\n\013transaction\030\001 \001(\0132 .bdwar" +
-      "e.bdledger.api.Transaction\"]\n(GetTransac" +
-      "tionByBlockHashAndIndexRequest\022\016\n\006ledger" +
-      "\030\001 \001(\t\022\022\n\nblock_hash\030\002 \001(\014\022\r\n\005index\030\003 \001(" +
-      "\r\"b\n)GetTransactionByBlockHashAndIndexRe" +
-      "sponse\0225\n\013transaction\030\001 \001(\0132 .bdware.bdl" +
-      "edger.api.Transaction\"\216\001\n\023TransactionsRe" +
-      "quest\022\016\n\006ledger\030\001 \001(\t\022\027\n\017start_timestamp" +
-      "\030\002 \001(\003\022\025\n\rend_timestamp\030\003 \001(\003\0227\n\007filters" +
-      "\030\004 \003(\0132&.bdware.bdledger.api.Transaction" +
-      "Filter\"\201\001\n\027GetTransactionsResponse\0226\n\014tr" +
-      "ansactions\030\001 \003(\0132 .bdware.bdledger.api.T" +
-      "ransaction\022\027\n\017start_timestamp\030\002 \001(\003\022\025\n\re" +
-      "nd_timestamp\030\003 \001(\003\"Z\n\031CountTransactionsR" +
-      "esponse\022\r\n\005count\030\001 \001(\004\022\027\n\017start_timestam" +
-      "p\030\002 \001(\003\022\025\n\rend_timestamp\030\003 \001(\0032\244\006\n\005Query" +
-      "\022i\n\016GetBlockByHash\022*.bdware.bdledger.api" +
-      ".GetBlockByHashRequest\032+.bdware.bdledger" +
-      ".api.GetBlockByHashResponse\022W\n\tGetBlocks" +
-      "\022\".bdware.bdledger.api.BlocksRequest\032&.b" +
-      "dware.bdledger.api.GetBlocksResponse\022[\n\013" +
-      "CountBlocks\022\".bdware.bdledger.api.Blocks" +
-      "Request\032(.bdware.bdledger.api.CountBlock" +
-      "sResponse\022{\n\024GetTransactionByHash\0220.bdwa" +
-      "re.bdledger.api.GetTransactionByHashRequ" +
-      "est\0321.bdware.bdledger.api.GetTransaction" +
-      "ByHashResponse\022\242\001\n!GetTransactionByBlock" +
-      "HashAndIndex\022=.bdware.bdledger.api.GetTr" +
-      "ansactionByBlockHashAndIndexRequest\032>.bd" +
-      "ware.bdledger.api.GetTransactionByBlockH" +
-      "ashAndIndexResponse\022i\n\017GetTransactions\022(" +
-      ".bdware.bdledger.api.TransactionsRequest" +
-      "\032,.bdware.bdledger.api.GetTransactionsRe" +
-      "sponse\022m\n\021CountTransactions\022(.bdware.bdl" +
-      "edger.api.TransactionsRequest\032..bdware.b" +
-      "dledger.api.CountTransactionsResponseBI\n" +
-      "\037org.bdware.bdledger.api.grpc.pbZ&bdware" +
-      ".org/bdledger/pkg/api/grpc/apipbb\006proto3"
+      "dger.api.BlockFilter\022F\n\024include_transact" +
+      "ions\030\005 \001(\0162(.bdware.bdledger.api.Include" +
+      "Transactions\"o\n\021GetBlocksResponse\022*\n\006blo" +
+      "cks\030\001 \003(\0132\032.bdware.bdledger.api.Block\022\027\n" +
+      "\017start_timestamp\030\002 \001(\003\022\025\n\rend_timestamp\030" +
+      "\003 \001(\003\"T\n\023CountBlocksResponse\022\r\n\005count\030\001 " +
+      "\001(\004\022\027\n\017start_timestamp\030\002 \001(\003\022\025\n\rend_time" +
+      "stamp\030\003 \001(\003\"|\n\023RecentBlocksRequest\022\016\n\006le" +
+      "dger\030\001 \001(\t\022\r\n\005count\030\002 \001(\003\022F\n\024include_tra" +
+      "nsactions\030\003 \001(\0162(.bdware.bdledger.api.In" +
+      "cludeTransactions\";\n\033GetTransactionByHas" +
+      "hRequest\022\016\n\006ledger\030\001 \001(\t\022\014\n\004hash\030\002 \001(\014\"U" +
+      "\n\034GetTransactionByHashResponse\0225\n\013transa" +
+      "ction\030\001 \001(\0132 .bdware.bdledger.api.Transa" +
+      "ction\"]\n(GetTransactionByBlockHashAndInd" +
+      "exRequest\022\016\n\006ledger\030\001 \001(\t\022\022\n\nblock_hash\030" +
+      "\002 \001(\014\022\r\n\005index\030\003 \001(\r\"b\n)GetTransactionBy" +
+      "BlockHashAndIndexResponse\0225\n\013transaction" +
+      "\030\001 \001(\0132 .bdware.bdledger.api.Transaction" +
+      "\"\216\001\n\023TransactionsRequest\022\016\n\006ledger\030\001 \001(\t" +
+      "\022\027\n\017start_timestamp\030\002 \001(\003\022\025\n\rend_timesta" +
+      "mp\030\003 \001(\003\0227\n\007filters\030\004 \003(\0132&.bdware.bdled" +
+      "ger.api.TransactionFilter\"\201\001\n\027GetTransac" +
+      "tionsResponse\0226\n\014transactions\030\001 \003(\0132 .bd" +
+      "ware.bdledger.api.Transaction\022\027\n\017start_t" +
+      "imestamp\030\002 \001(\003\022\025\n\rend_timestamp\030\003 \001(\003\"Z\n" +
+      "\031CountTransactionsResponse\022\r\n\005count\030\001 \001(" +
+      "\004\022\027\n\017start_timestamp\030\002 \001(\003\022\025\n\rend_timest" +
+      "amp\030\003 \001(\003*3\n\023IncludeTransactions\022\010\n\004NONE" +
+      "\020\000\022\010\n\004HASH\020\001\022\010\n\004FULL\020\0022\211\007\n\005Query\022i\n\016GetB" +
+      "lockByHash\022*.bdware.bdledger.api.GetBloc" +
+      "kByHashRequest\032+.bdware.bdledger.api.Get" +
+      "BlockByHashResponse\022W\n\tGetBlocks\022\".bdwar" +
+      "e.bdledger.api.BlocksRequest\032&.bdware.bd" +
+      "ledger.api.GetBlocksResponse\022[\n\013CountBlo" +
+      "cks\022\".bdware.bdledger.api.BlocksRequest\032" +
+      "(.bdware.bdledger.api.CountBlocksRespons" +
+      "e\022c\n\017GetRecentBlocks\022(.bdware.bdledger.a" +
+      "pi.RecentBlocksRequest\032&.bdware.bdledger" +
+      ".api.GetBlocksResponse\022{\n\024GetTransaction" +
+      "ByHash\0220.bdware.bdledger.api.GetTransact" +
+      "ionByHashRequest\0321.bdware.bdledger.api.G" +
+      "etTransactionByHashResponse\022\242\001\n!GetTrans" +
+      "actionByBlockHashAndIndex\022=.bdware.bdled" +
+      "ger.api.GetTransactionByBlockHashAndInde" +
+      "xRequest\032>.bdware.bdledger.api.GetTransa" +
+      "ctionByBlockHashAndIndexResponse\022i\n\017GetT" +
+      "ransactions\022(.bdware.bdledger.api.Transa" +
+      "ctionsRequest\032,.bdware.bdledger.api.GetT" +
+      "ransactionsResponse\022m\n\021CountTransactions" +
+      "\022(.bdware.bdledger.api.TransactionsReque" +
+      "st\032..bdware.bdledger.api.CountTransactio" +
+      "nsResponseBX\n\037org.bdware.bdledger.api.gr" +
+      "pc.pbB\nQueryProtoZ)bdware.org/bdledger/p" +
+      "kg/api/grpc/pb;apipbb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          org.bdware.bdledger.api.grpc.pb.Common.getDescriptor(),
+          org.bdware.bdledger.api.grpc.pb.CommonProto.getDescriptor(),
         });
     internal_static_bdware_bdledger_api_BlockFilter_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -10892,49 +11643,55 @@ public final class QueryOuterClass {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_CountBlocksResponse_descriptor,
         new java.lang.String[] { "Count", "StartTimestamp", "EndTimestamp", });
-    internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor =
+    internal_static_bdware_bdledger_api_RecentBlocksRequest_descriptor =
       getDescriptor().getMessageTypes().get(7);
+    internal_static_bdware_bdledger_api_RecentBlocksRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_bdware_bdledger_api_RecentBlocksRequest_descriptor,
+        new java.lang.String[] { "Ledger", "Count", "IncludeTransactions", });
+    internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor =
+      getDescriptor().getMessageTypes().get(8);
     internal_static_bdware_bdledger_api_GetTransactionByHashRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_GetTransactionByHashRequest_descriptor,
         new java.lang.String[] { "Ledger", "Hash", });
     internal_static_bdware_bdledger_api_GetTransactionByHashResponse_descriptor =
-      getDescriptor().getMessageTypes().get(8);
+      getDescriptor().getMessageTypes().get(9);
     internal_static_bdware_bdledger_api_GetTransactionByHashResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_GetTransactionByHashResponse_descriptor,
         new java.lang.String[] { "Transaction", });
     internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_descriptor =
-      getDescriptor().getMessageTypes().get(9);
+      getDescriptor().getMessageTypes().get(10);
     internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexRequest_descriptor,
         new java.lang.String[] { "Ledger", "BlockHash", "Index", });
     internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_descriptor =
-      getDescriptor().getMessageTypes().get(10);
+      getDescriptor().getMessageTypes().get(11);
     internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_GetTransactionByBlockHashAndIndexResponse_descriptor,
         new java.lang.String[] { "Transaction", });
     internal_static_bdware_bdledger_api_TransactionsRequest_descriptor =
-      getDescriptor().getMessageTypes().get(11);
+      getDescriptor().getMessageTypes().get(12);
     internal_static_bdware_bdledger_api_TransactionsRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_TransactionsRequest_descriptor,
         new java.lang.String[] { "Ledger", "StartTimestamp", "EndTimestamp", "Filters", });
     internal_static_bdware_bdledger_api_GetTransactionsResponse_descriptor =
-      getDescriptor().getMessageTypes().get(12);
+      getDescriptor().getMessageTypes().get(13);
     internal_static_bdware_bdledger_api_GetTransactionsResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_GetTransactionsResponse_descriptor,
         new java.lang.String[] { "Transactions", "StartTimestamp", "EndTimestamp", });
     internal_static_bdware_bdledger_api_CountTransactionsResponse_descriptor =
-      getDescriptor().getMessageTypes().get(13);
+      getDescriptor().getMessageTypes().get(14);
     internal_static_bdware_bdledger_api_CountTransactionsResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_bdware_bdledger_api_CountTransactionsResponse_descriptor,
         new java.lang.String[] { "Count", "StartTimestamp", "EndTimestamp", });
-    org.bdware.bdledger.api.grpc.pb.Common.getDescriptor();
+    org.bdware.bdledger.api.grpc.pb.CommonProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/test/java/org/bdware/bdledger/api/grpc/ClientTests.java b/src/test/java/org/bdware/bdledger/api/grpc/ClientTests.java
index 9a18156..5909dfe 100644
--- a/src/test/java/org/bdware/bdledger/api/grpc/ClientTests.java
+++ b/src/test/java/org/bdware/bdledger/api/grpc/ClientTests.java
@@ -1,17 +1,12 @@
 package org.bdware.bdledger.api.grpc;
 
-import org.bdware.bdledger.api.grpc.pb.Common.Block;
-import org.bdware.bdledger.api.grpc.pb.Common.Transaction;
-import org.bdware.bdledger.api.grpc.pb.Common.TransactionType;
-import org.bdware.bdledger.api.grpc.pb.LedgerOuterClass.GetLedgersResponse;
 import com.google.protobuf.ByteString;
 import io.grpc.Status;
-import org.bdware.bdledger.api.grpc.pb.QueryOuterClass;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
+import org.bdware.bdledger.api.grpc.pb.CommonProto.Block;
+import org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction;
+import org.bdware.bdledger.api.grpc.pb.CommonProto.TransactionType;
+import org.bdware.bdledger.api.grpc.pb.LedgerProto.GetLedgersResponse;
+import org.junit.jupiter.api.*;
 
 import java.util.Arrays;
 import java.util.List;
@@ -19,7 +14,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @DisplayName("Transaction Ledger tests")
 class ClientTests {
@@ -99,175 +94,175 @@ class ClientTests {
 
   private static Client client;
 
-  @BeforeAll
-  static void initAll() {
-    client = new Client("localhost", 10000);
-  }
-
-  @Test
-  @DisplayName("ClientVersion#1")
-  void clientVersion1() throws ExecutionException, InterruptedException {
-    Assertions.assertEquals(
-        "TxLedgerGo/v0.0.1alpha/darwin/go1.11", client.clientVersion().get().getVersion());
-  }
-
-  @Test
-  @DisplayName("CreateLedger#1")
-  void createLedger1() throws ExecutionException, InterruptedException {
-    Assertions.assertTrue(client.createLedger(ledger).get().getOk());
-  }
-
-  @Test
-  @DisplayName("CreateLedger#2")
-  void createLedger2() {
-    Throwable e = Assertions.assertThrows(Exception.class, () -> client.createLedger("").get());
-    Status s = Status.fromThrowable(e);
-    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
-    Assertions.assertEquals("name must not be empty", s.getDescription());
-  }
-
-  @Test
-  @DisplayName("GetLedgers#1")
-  void getLedgers1() throws ExecutionException, InterruptedException {
-    GetLedgersResponse r = client.getLedgers().get();
-    assertEquals(3, r.getLedgersCount());
-    String[] expected = new String[]{"first", "second", "third"};
-    Assertions.assertAll(
-        IntStream.range(0, 3).boxed().map(i -> () -> assertEquals(expected[i], r.getLedgers(i))));
-  }
-
-  @Test
-  @DisplayName("SendTransaction#1")
-  void sendTransaction1() throws ExecutionException, InterruptedException {
-    String hash =
-        Utils.byteArrayToHexString(
-            client
-                .sendTransaction(
-                    ledger,
-                    TransactionType.MESSAGE,
-                    "f00dcafef00dcafef00dcafef00dcafef00dcafe",
-                    "feedbabefeedbabefeedbabefeedbabefeedbabe",
-                    Utils.hexStringToByteArray("deadbeef"))
-                .get()
-                .getHash()
-                .toByteArray());
-    Assertions.assertEquals("d15ea5edd15ea5edd15ea5edd15ea5edd15ea5ed", hash);
-  }
-
-  @Test
-  @DisplayName("SendTransaction#2")
-  void sendTransaction2() {
-    Throwable e =
-        Assertions.assertThrows(
-            Exception.class,
-            () ->
-                client
-                    .sendTransaction(ledger, TransactionType.MESSAGE, null, "50bada55", null)
-                    .get());
-    Status s = Status.fromThrowable(e);
-    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
-    Assertions.assertEquals("Multiple invalid arguments", s.getDescription());
-  }
-
-  @Test
-  @DisplayName("GetBlockByHash#1")
-  void getBlockByHash1() throws ExecutionException, InterruptedException {
-    Block b = client.getBlockByHash(ledger, blockHashStr, false).get().getBlock();
-    assertEquals(block, b);
-  }
-
-  // TODO
-  @Test
-  @DisplayName("getBlocks#1")
-  void getBlocks1() throws ExecutionException, InterruptedException {
-    client.getBlocks(ledger, 0, null).get();
-  }
-
-  // TODO
-  @Test
-  @DisplayName("getBlocks#2")
-  void getBlocks2() throws ExecutionException, InterruptedException {
-    client.getBlocks(ledger, 0, 0, null).get();
-  }
-
-  @Test
-  @DisplayName("getBlocks#3")
-  void getBlocks3() {
-    Throwable e = Assertions.assertThrows(Exception.class, () -> client.getBlocks("", 0, 0, null).get());
-    Status s = Status.fromThrowable(e);
-    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
-    Assertions.assertEquals("ledger must not be empty", s.getDescription());
-  }
-
-  @Test
-  @DisplayName("CountBlocks#1")
-  void blockNumber1() throws ExecutionException, InterruptedException {
-    Assertions.assertEquals(blockCount, client.countBlocks(ledger).get().getCount());
-  }
-
-  @Test
-  @DisplayName("CountBlocks#2")
-  void blockNumber2() {
-    Throwable e = Assertions.assertThrows(Exception.class, () -> client.countBlocks("").get());
-    Status s = Status.fromThrowable(e);
-    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
-    Assertions.assertEquals("ledger must not be empty", s.getDescription());
-  }
-
-  @Test
-  @DisplayName("GetTransactionByHash#1")
-  void getTransactionByHash1() throws ExecutionException, InterruptedException {
-    Transaction t = client.getTransactionByHash(ledger, txHashStr).get().getTransaction();
-    assertEquals(tx, t);
-  }
-
-  @Test
-  @DisplayName("GetTransactionByBlockHashAndIndex#1")
-  void GetTransactionByBlockHashAndIndex1() throws ExecutionException, InterruptedException {
-    Transaction t = client.getTransactionByBlockHashAndIndex(ledger, blockHashStr, index).get().getTransaction();
-    assertEquals(tx, t);
-  }
-
-  // TODO
-  @Test
-  @DisplayName("getTransactions#1")
-  void getTransactions1() throws ExecutionException, InterruptedException {
-    client.getTransactions(ledger, 0).get();
-  }
-
-  // TODO
-  @Test
-  @DisplayName("getTransactions#2")
-  void getTransactions2() throws ExecutionException, InterruptedException {
-    client.getTransactions(ledger, 0, 0).get();
-  }
-
-  @Test
-  @DisplayName("getTransactions#3")
-  void getTransactions3() {
-    Throwable e = Assertions.assertThrows(Exception.class, () -> client.getTransactions("", 0, 0).get());
-    Status s = Status.fromThrowable(e);
-    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
-    Assertions.assertEquals("ledger must not be empty", s.getDescription());
-  }
-
-  @Test
-  @DisplayName("CountTransactions#1")
-  void CountTransactions1() throws ExecutionException, InterruptedException {
-    Assertions.assertEquals(transactionCount, client.countTransactions(ledger).get().getCount());
-  }
-
-  @Test
-  @DisplayName("CountTransactions#2")
-  void CountTransactions2() {
-    Throwable e = Assertions.assertThrows(Exception.class, () -> client.countTransactions("").get());
-    Status s = Status.fromThrowable(e);
-    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
-    Assertions.assertEquals("ledger must not be empty", s.getDescription());
-  }
-
-  @AfterAll
-  static void teadDwonAll() throws InterruptedException {
-    client.shutdown();
-  }
+//  @BeforeAll
+//  static void initAll() {
+//    client = new Client("localhost", 10000);
+//  }
+//
+//  @Test
+//  @DisplayName("ClientVersion#1")
+//  void clientVersion1() throws ExecutionException, InterruptedException {
+//    Assertions.assertEquals(
+//        "TxLedgerGo/v0.0.1alpha/darwin/go1.11", client.clientVersion().get().getVersion());
+//  }
+//
+//  @Test
+//  @DisplayName("CreateLedger#1")
+//  void createLedger1() throws ExecutionException, InterruptedException {
+//    Assertions.assertTrue(client.createLedger(ledger).get().getOk());
+//  }
+//
+//  @Test
+//  @DisplayName("CreateLedger#2")
+//  void createLedger2() {
+//    Throwable e = Assertions.assertThrows(Exception.class, () -> client.createLedger("").get());
+//    Status s = Status.fromThrowable(e);
+//    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
+//    Assertions.assertEquals("name must not be empty", s.getDescription());
+//  }
+//
+//  @Test
+//  @DisplayName("GetLedgers#1")
+//  void getLedgers1() throws ExecutionException, InterruptedException {
+//    GetLedgersResponse r = client.getLedgers().get();
+//    assertEquals(3, r.getLedgersCount());
+//    String[] expected = new String[]{"first", "second", "third"};
+//    Assertions.assertAll(
+//        IntStream.range(0, 3).boxed().map(i -> () -> assertEquals(expected[i], r.getLedgers(i))));
+//  }
+//
+//  @Test
+//  @DisplayName("SendTransaction#1")
+//  void sendTransaction1() throws ExecutionException, InterruptedException {
+//    String hash =
+//        Utils.byteArrayToHexString(
+//            client
+//                .sendTransaction(
+//                    ledger,
+//                    TransactionType.MESSAGE,
+//                    "f00dcafef00dcafef00dcafef00dcafef00dcafe",
+//                    "feedbabefeedbabefeedbabefeedbabefeedbabe",
+//                    Utils.hexStringToByteArray("deadbeef"))
+//                .get()
+//                .getHash()
+//                .toByteArray());
+//    Assertions.assertEquals("d15ea5edd15ea5edd15ea5edd15ea5edd15ea5ed", hash);
+//  }
+//
+//  @Test
+//  @DisplayName("SendTransaction#2")
+//  void sendTransaction2() {
+//    Throwable e =
+//        Assertions.assertThrows(
+//            Exception.class,
+//            () ->
+//                client
+//                    .sendTransaction(ledger, TransactionType.MESSAGE, null, "50bada55", null)
+//                    .get());
+//    Status s = Status.fromThrowable(e);
+//    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
+//    Assertions.assertEquals("Multiple invalid arguments", s.getDescription());
+//  }
+//
+//  @Test
+//  @DisplayName("GetBlockByHash#1")
+//  void getBlockByHash1() throws ExecutionException, InterruptedException {
+//    Block b = client.getBlockByHash(ledger, blockHashStr, false).get().getBlock();
+//    assertEquals(block, b);
+//  }
+//
+//  // TODO
+//  @Test
+//  @DisplayName("getBlocks#1")
+//  void getBlocks1() throws ExecutionException, InterruptedException {
+//    client.getBlocks(ledger, 0, null).get();
+//  }
+//
+//  // TODO
+//  @Test
+//  @DisplayName("getBlocks#2")
+//  void getBlocks2() throws ExecutionException, InterruptedException {
+//    client.getBlocks(ledger, 0, 0, null).get();
+//  }
+//
+//  @Test
+//  @DisplayName("getBlocks#3")
+//  void getBlocks3() {
+//    Throwable e = Assertions.assertThrows(Exception.class, () -> client.getBlocks("", 0, 0, null).get());
+//    Status s = Status.fromThrowable(e);
+//    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
+//    Assertions.assertEquals("ledger must not be empty", s.getDescription());
+//  }
+//
+//  @Test
+//  @DisplayName("CountBlocks#1")
+//  void blockNumber1() throws ExecutionException, InterruptedException {
+//    Assertions.assertEquals(blockCount, client.countBlocks(ledger).get().getCount());
+//  }
+//
+//  @Test
+//  @DisplayName("CountBlocks#2")
+//  void blockNumber2() {
+//    Throwable e = Assertions.assertThrows(Exception.class, () -> client.countBlocks("").get());
+//    Status s = Status.fromThrowable(e);
+//    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
+//    Assertions.assertEquals("ledger must not be empty", s.getDescription());
+//  }
+//
+//  @Test
+//  @DisplayName("GetTransactionByHash#1")
+//  void getTransactionByHash1() throws ExecutionException, InterruptedException {
+//    Transaction t = client.getTransactionByHash(ledger, txHashStr).get().getTransaction();
+//    assertEquals(tx, t);
+//  }
+//
+//  @Test
+//  @DisplayName("GetTransactionByBlockHashAndIndex#1")
+//  void GetTransactionByBlockHashAndIndex1() throws ExecutionException, InterruptedException {
+//    Transaction t = client.getTransactionByBlockHashAndIndex(ledger, blockHashStr, index).get().getTransaction();
+//    assertEquals(tx, t);
+//  }
+//
+//  // TODO
+//  @Test
+//  @DisplayName("getTransactions#1")
+//  void getTransactions1() throws ExecutionException, InterruptedException {
+//    client.getTransactions(ledger, 0).get();
+//  }
+//
+//  // TODO
+//  @Test
+//  @DisplayName("getTransactions#2")
+//  void getTransactions2() throws ExecutionException, InterruptedException {
+//    client.getTransactions(ledger, 0, 0).get();
+//  }
+//
+//  @Test
+//  @DisplayName("getTransactions#3")
+//  void getTransactions3() {
+//    Throwable e = Assertions.assertThrows(Exception.class, () -> client.getTransactions("", 0, 0).get());
+//    Status s = Status.fromThrowable(e);
+//    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
+//    Assertions.assertEquals("ledger must not be empty", s.getDescription());
+//  }
+//
+//  @Test
+//  @DisplayName("CountTransactions#1")
+//  void CountTransactions1() throws ExecutionException, InterruptedException {
+//    Assertions.assertEquals(transactionCount, client.countTransactions(ledger).get().getCount());
+//  }
+//
+//  @Test
+//  @DisplayName("CountTransactions#2")
+//  void CountTransactions2() {
+//    Throwable e = Assertions.assertThrows(Exception.class, () -> client.countTransactions("").get());
+//    Status s = Status.fromThrowable(e);
+//    Assertions.assertEquals(Status.Code.INVALID_ARGUMENT, s.getCode());
+//    Assertions.assertEquals("ledger must not be empty", s.getDescription());
+//  }
+//
+//  @AfterAll
+//  static void teadDwonAll() throws InterruptedException {
+//    client.shutdown();
+//  }
 }