Merge remote-tracking branch 'origin/master' into bbalser/mobile-rewa…

…rd-multipliers

src/service/iot_config.proto

@@ -391,6 +391,9 @@ message route_stream_req_v1 {
   bytes signature = 2;
   // pubkey binary of the signing keypair
   bytes signer = 3;
+  // timestamp in milliseconds, only changes since this timestamp are
+  // streamed back to caller
+  uint64 since = 4;
 }
 
 message route_stream_res_v1 {

src/service/mobile_config.proto

@@ -28,6 +28,8 @@ message gateway_info {
   bytes address = 1;
   // The gateway metadata as recorded on the blockchain
   gateway_metadata metadata = 2;
+  // the asserted device type of the gateway
+  device_type device_type = 3;
 }
 
 message gateway_info_req_v1 {
@@ -38,6 +40,16 @@ message gateway_info_req_v1 {
   bytes signature = 3;
 }
 
+message gateway_info_batch_req_v1 {
+  // List of public key addresses of gateways to look up
+  repeated bytes addresses = 1;
+  // max number of gateway info records in each message of the response stream
+  uint32 batch_size = 2;
+  // pubkey binary of the signing keypair
+  bytes signer = 3;
+  bytes signature = 4;
+}
+
 message gateway_info_res_v1 {
   gateway_info info = 1;
   // unix epoch timestamp in seconds
@@ -101,6 +113,12 @@ enum network_key_role {
   mobile_pcs = 2;
 }
 
+enum device_type {
+  cbrs = 0;
+  wifi_indoor = 1;
+  wifi_outdoor = 2;
+}
+
 message authorization_verify_req_v1 {
   // the pubkey binary of the authorized entity being verified
   bytes pubkey = 1;
@@ -181,6 +199,9 @@ message admin_key_res_v1 {
 service gateway {
   // Get info for the specified gateway
   rpc info(gateway_info_req_v1) returns (gateway_info_res_v1);
+  // Get info for a batch of gateways specified by public key
+  rpc info_batch(gateway_info_batch_req_v1)
+      returns (stream gateway_info_stream_res_v1);
   // Get a stream of gateway info
   rpc info_stream(gateway_info_stream_req_v1)
       returns (stream gateway_info_stream_res_v1);

src/service/packet_router.proto

@@ -51,6 +51,7 @@ message packet_router_register_v1 {
   bytes gateway = 2;
   bytes signature = 3;
   bool session_capable = 4;
+  uint32 packet_ack_interval = 5;
 }
 
 // Session offer from the packet router to the gateway. If the gateway wants to
@@ -102,10 +103,13 @@ message packet_router_packet_down_v1 {
   window_v1 rx2 = 3;
 }
 
+message packet_router_packet_ack_v1 { bytes payload_hash = 1; }
+
 message envelope_down_v1 {
   oneof data {
     packet_router_packet_down_v1 packet = 1;
     packet_router_session_offer_v1 session_offer = 2;
+    packet_router_packet_ack_v1 packet_ack = 3;
   }
 }
 

src/service/poc_mobile.proto

@@ -386,6 +386,7 @@ enum cell_type {
   sercomm_outdoor = 4;
   cell_type_none = 5;
   nova_generic_wifi_indoor = 6;
+  nova_generic_wifi_outdoor = 7;
 }
 
 message data_transfer_session_req_v1 {