@dxos/protocols 0.6.3-main.cc41ccb → 0.6.3-main.d76104f

package/src/proto/dxos/halo/invitations.proto

@@ -7,14 +7,14 @@ syntax = "proto3";
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 
-import "dxos/client/services.proto";
+import "dxos/client/invitation.proto";
 import "dxos/echo/timeframe.proto";
 import "dxos/halo/credentials.proto";
 import "dxos/keys.proto";
 
 package dxos.halo.invitations;
 
-message Options {
+message InvitationOptions {
   enum Role {
     GUEST = 0;
     HOST = 1;
@@ -127,7 +127,7 @@ message AdmissionResponse {
 // TODO(dmaretskyi): Rename to InvitationExtensionService.
 service InvitationHostService {
   /// Both peers must call this method before any other.
-  rpc Options(Options) returns (google.protobuf.Empty);
+  rpc Options(InvitationOptions) returns (google.protobuf.Empty);
 
   /// Introduce guest to the host. Only on the host.
   rpc Introduce(IntroductionRequest) returns (IntroductionResponse);

package/src/proto/dxos/halo/keys.proto

@@ -5,7 +5,6 @@
 syntax = "proto3";
 
 import "dxos/keys.proto";
-import "dxos/halo/signed.proto";
 
 package dxos.halo.keys;
 
@@ -70,14 +69,3 @@ message KeyRecord {
 message KeyRecordList {
   repeated KeyRecord keys = 1;
 }
-
-//
-// A key which includes its parent keys and SignedMessages leading back to the root of its authority.
-// For example, if IdentityA signed for DeviceA, which signed for DeviceB, which signed for DeviceC the chain
-// would comprised: DeviceC->DeviceB->DeviceA->IdentityA moving from tip to root.
-//
-message KeyChain {
-  dxos.keys.PublicKey public_key = 1;
-  dxos.halo.signed.SignedMessage message = 2; // TODO(burdon): Circular dep.
-  repeated KeyChain parents = 3;
-}

package/src/proto/dxos/halo/signed.proto

@@ -6,15 +6,19 @@ syntax = "proto3";
 
 import "google/protobuf/any.proto";
 
-import "dxos/halo/keys.proto";
 import "dxos/keys.proto";
 
 package dxos.halo.signed;
 
-// TODO(burdon): Rename (too generic).
-// TODO(burdon): Use default from codec-protobuf.
-message Message {
-  google.protobuf.Any payload = 1;
+//
+// A key which includes its parent keys and SignedMessages leading back to the root of its authority.
+// For example, if IdentityA signed for DeviceA, which signed for DeviceB, which signed for DeviceC the chain
+// would comprised: DeviceC->DeviceB->DeviceA->IdentityA moving from tip to root.
+//
+message KeyChain {
+  dxos.keys.PublicKey public_key = 1;
+  SignedMessage message = 2;
+  repeated KeyChain parents = 3;
 }
 
 /**
@@ -41,7 +45,7 @@ message SignedMessage {
     /// The bytes of the signature.
     bytes signature = 2;
     /// The certification chain of SignedMessages for this key.
-    optional keys.KeyChain key_chain = 3;
+    optional KeyChain key_chain = 3;
   }
 
   /// The signed message contents.

package/src/proto/dxos/mesh/presence.proto

@@ -4,6 +4,8 @@
 
 syntax = "proto3";
 
+import "dxos/keys.proto";
+
 package dxos.mesh.presence;
 
 // Even though those definitions don't use Any the schema can be added dynamically later.
@@ -12,7 +14,7 @@ import "google/protobuf/any.proto";
 
 message PeerState {
   /// Will be used to build network graph
-  repeated dxos.keys.PublicKey connections = 1; 
+  repeated dxos.keys.PublicKey connections = 1;
 
   // TODO(mykola): Remove once IdentityKey can be obtained from DeviceKey.
   dxos.keys.PublicKey identity_key = 2;

package/src/proto/dxos/mesh/teleport/gossip.proto

@@ -6,13 +6,15 @@ syntax = "proto3";
 
 import "google/protobuf/empty.proto";
 import "google/protobuf/any.proto";
+import "google/protobuf/timestamp.proto";
+
 import "dxos/keys.proto";
 
 package dxos.mesh.teleport.gossip;
 
 message GossipMessage {
   dxos.keys.PublicKey peer_id = 1;
-  /// Used to route differnt payload types to correct listeners.
+  /// Used to route different payload types to correct listeners.
   string channel_id = 2;
   /// Peer tracks what had been sent by message id.
   dxos.keys.PublicKey message_id = 3;