✨ Verifier-verifier proto (#22)

Author: no2chem

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainblock/protocol",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Protocol Buffer Definitions for Rainblock",
   "main": "generated_ts/index.js",
   "types": "generated_ts/index.d.ts",

src/prototool.yaml

@@ -67,6 +67,7 @@ lint:
       - FILE_OPTIONS_REQUIRE_JAVA_MULTIPLE_FILES
       - FILE_OPTIONS_REQUIRE_JAVA_OUTER_CLASSNAME
       - FILE_OPTIONS_REQUIRE_JAVA_PACKAGE
+      - REQUEST_RESPONSE_TYPES_UNIQUE
 
 # Code generation directives.
 generate:

src/clientVerifier.proto src/verifier.protosrc/clientVerifier.proto renamed to src/verifier.proto

@@ -1,12 +1,49 @@
 syntax = "proto3";
 
-// Protobuf definitions for client <--> verifier communication
+// Protobuf definitions for client <--> verifier, verifier <--> verifier communication
 package rainblock;
 
-// The verifier service for client <--> verifier
+// The verifier service
 service Verifier {
   // Submit a transaction from a client to a verifier
   rpc SubmitTransaction(TransactionRequest) returns (TransactionReply);
+  // Verifier-Verifer services below:
+  // Advertise a new node to other verifiers
+  rpc AdvertiseNode(stream MerkleNodeAdvertisement) returns (stream MerkleNodeAdvertisement);
+  // Block announcement
+  rpc AdvertiseBlock(stream BlockAdvertisement) returns (stream BlockAdvertisement);
+  // Neighbor Advertisement
+  rpc AdvertiseNeighbor(stream NeighborAdvertisement) returns (stream NeighborAdvertisement);
+  // Handshake
+  rpc VerifierVerifierHandshake(VerifierVerifierHandshakeMessage) returns (VerifierVerifierHandshakeMessage);
+}
+
+// A message indicating new neighbors which have connected or disconnected
+message NeighborAdvertisement {
+  // new neighbors, by their 32 byte BE beneficiary ID
+  repeated bytes new_neighbors = 1;
+  // lost/disconnected neighbors, by their 32 byte BE beneficiary ID
+  repeated bytes lost_neightbors = 2;
+}
+
+// A handshake message between two verifiers. Either verifier can disconnect the link as a result of the handshake.
+message VerifierVerifierHandshakeMessage {
+  // The protocol version
+  string protocol_version = 1;
+  // The verifier version
+  string version = 2;
+}
+
+// Advertisement of a new block
+message BlockAdvertisement {
+  // The block being advertised, as RLP-encoded bytes
+  bytes block = 1;
+}
+
+// Advertisement of a new node
+message MerkleNodeAdvertisement {
+  // The node(s) being advertised, as RLP-encoded bytes
+  repeated bytes node = 1;
 }
 
 // Binary format for a set of witnesses	

ts/index.ts

@@ -1,5 +1,5 @@
-import { VerifierService, VerifierClient, IVerifierServer, IVerifierClient } from '../generated/clientVerifier_grpc_pb'
-import { TransactionRequest, TransactionReply, ErrorCode } from '../generated/clientVerifier_pb';
+import { VerifierService, VerifierClient, IVerifierServer, IVerifierClient } from '../generated/verifier_grpc_pb'
+import { MerkleNodeAdvertisement, BlockAdvertisement, NeighborAdvertisement, VerifierVerifierHandshakeMessage, TransactionRequest, TransactionReply, ErrorCode } from '../generated/verifier_pb';
 import { VerifierStorageService, VerifierStorageClient, IVerifierStorageClient, IVerifierStorageService, IVerifierStorageServer } from '../generated/verifierStorage_grpc_pb'
 import { UpdateMsg, UpdateOp, StorageUpdate } from '../generated/verifierStorage_pb';
 import { StorageNodeClient, StorageNodeService, IStorageNodeClient, IStorageNodeServer } from '../generated/clientStorage_grpc_pb';
@@ -14,5 +14,6 @@ export { VerifierService, VerifierClient, TransactionRequest, TransactionReply,
     IVerifierStorageServer, UpdateMsg, UpdateOp, StorageUpdate,
     StorageNodeClient, StorageNodeService, IStorageNodeClient, IStorageNodeServer,
     RPCWitness, CodeRequest, CodeReply, AccountRequest, AccountReply, 
+    MerkleNodeAdvertisement, BlockAdvertisement, NeighborAdvertisement, VerifierVerifierHandshakeMessage,
     StorageRequest, StorageReply, BlockHashReply, BlockHashRequest,
     IVerifierStorageService, google_protobuf_empty_pb, grpc };