Merge branch 'master' into docupdate

RTradeLtd · Apr 14, 2020 · 931fde3 · 931fde3
2 parents 2342daf + 5b3867e
commit 931fde3
Show file tree

Hide file tree

Showing 7 changed files with 725 additions and 660 deletions.
diff --git a/doc/PROTO.md b/doc/PROTO.md
@@ -953,6 +953,9 @@ BSREQTYPE is a particular blockstore request type
 | BS_GET_MANY | 4 | BS_GET_MANY is used to get many blocks from the store |
 | BS_GET_ALL | 5 | BS_GET_ALL is used to retrieve all blocks from the store It is the gRPC equivalent of Blockstore::AllKeysChan |
 | BS_GET_STATS | 6 | BS_GET_STATS is used to retrieve statistics about individual blocks |
+| BS_HAS | 7 | BS_HAS is used to retrieve whether or not we have the block |
+| BS_HASH_ON_READ_ENABLE | 8 | BS_HASH_ON_READ_ENABLE is used to enable hash on read |
+| BS_HASH_ON_READ_DISABLE | 9 | BS_HASH_ON_READ_DISABLE is used to disable hash on read |
 
 
 

diff --git a/go/node.pb.go b/go/node.pb.go
diff --git a/js/node_pb.js b/js/node_pb.js
@@ -4877,7 +4877,10 @@ proto.pb.BSREQTYPE = {
   BS_GET: 3,
   BS_GET_MANY: 4,
   BS_GET_ALL: 5,
-  BS_GET_STATS: 6
+  BS_GET_STATS: 6,
+  BS_HAS: 7,
+  BS_HASH_ON_READ_ENABLE: 8,
+  BS_HASH_ON_READ_DISABLE: 9
 };
 
 /**

diff --git a/pb/node.proto b/pb/node.proto
@@ -174,6 +174,12 @@ enum BSREQTYPE {
     BS_GET_ALL = 5;
     // BS_GET_STATS is used to retrieve statistics about individual blocks
     BS_GET_STATS = 6;
+    // BS_HAS is used to retrieve whether or not we have the block
+    BS_HAS = 7;
+    // BS_HASH_ON_READ_ENABLE is used to enable hash on read
+    BS_HASH_ON_READ_ENABLE = 8;
+    // BS_HASH_ON_READ_DISABLE is used to disable hash on read
+    BS_HASH_ON_READ_DISABLE = 9;
 }
 
 // BSREQOPTS are options for blockstore requests

diff --git a/py/node_pb2.py b/py/node_pb2.py