From 2d68897123a103d4dd7917a905d86708755ce204 Mon Sep 17 00:00:00 2001
From: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:44:08 -0800
Subject: [PATCH] feat: add new payload format

---
 go/keystore_api/v1/keystore.pb.go             | 31 +++++++++++--------
 .../private_preferences.proto                 |  8 ++++-
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/go/keystore_api/v1/keystore.pb.go b/go/keystore_api/v1/keystore.pb.go
index d84940bb..67c45322 100644
--- a/go/keystore_api/v1/keystore.pb.go
+++ b/go/keystore_api/v1/keystore.pb.go
@@ -77,9 +77,10 @@ func (ErrorCode) EnumDescriptor() ([]byte, []int) {
 type JobType int32
 
 const (
-	JobType_JOB_TYPE_UNSPECIFIED JobType = 0
-	JobType_JOB_TYPE_REFRESH_V1  JobType = 1
-	JobType_JOB_TYPE_REFRESH_V2  JobType = 2
+	JobType_JOB_TYPE_UNSPECIFIED  JobType = 0
+	JobType_JOB_TYPE_REFRESH_V1   JobType = 1
+	JobType_JOB_TYPE_REFRESH_V2   JobType = 2
+	JobType_JOB_TYPE_REFRESH_PPPP JobType = 3
 )
 
 // Enum value maps for JobType.
@@ -88,11 +89,13 @@ var (
 		0: "JOB_TYPE_UNSPECIFIED",
 		1: "JOB_TYPE_REFRESH_V1",
 		2: "JOB_TYPE_REFRESH_V2",
+		3: "JOB_TYPE_REFRESH_PPPP",
 	}
 	JobType_value = map[string]int32{
-		"JOB_TYPE_UNSPECIFIED": 0,
-		"JOB_TYPE_REFRESH_V1":  1,
-		"JOB_TYPE_REFRESH_V2":  2,
+		"JOB_TYPE_UNSPECIFIED":  0,
+		"JOB_TYPE_REFRESH_V1":   1,
+		"JOB_TYPE_REFRESH_V2":   2,
+		"JOB_TYPE_REFRESH_PPPP": 3,
 	}
 )
 
@@ -2991,17 +2994,19 @@ var file_keystore_api_v1_keystore_proto_rawDesc = []byte{
 	0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x5f, 0x49, 0x4e, 0x50, 0x55, 0x54, 0x10, 0x01, 0x12, 0x21,
 	0x0a, 0x1d, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x5f,
 	0x4d, 0x41, 0x54, 0x43, 0x48, 0x49, 0x4e, 0x47, 0x5f, 0x50, 0x52, 0x45, 0x4b, 0x45, 0x59, 0x10,
-	0x02, 0x2a, 0x55, 0x0a, 0x07, 0x4a, 0x6f, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14,
+	0x02, 0x2a, 0x70, 0x0a, 0x07, 0x4a, 0x6f, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14,
 	0x4a, 0x4f, 0x42, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
 	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4a, 0x4f, 0x42, 0x5f, 0x54, 0x59,
 	0x50, 0x45, 0x5f, 0x52, 0x45, 0x46, 0x52, 0x45, 0x53, 0x48, 0x5f, 0x56, 0x31, 0x10, 0x01, 0x12,
 	0x17, 0x0a, 0x13, 0x4a, 0x4f, 0x42, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x46, 0x52,
-	0x45, 0x53, 0x48, 0x5f, 0x56, 0x32, 0x10, 0x02, 0x42, 0x4d, 0x0a, 0x1e, 0x6f, 0x72, 0x67, 0x2e,
-	0x78, 0x6d, 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6b, 0x65, 0x79, 0x73, 0x74,
-	0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x76, 0x33, 0x2f, 0x67, 0x6f, 0x2f, 0x6b, 0x65, 0x79, 0x73, 0x74, 0x6f, 0x72, 0x65,
-	0x5f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x45, 0x53, 0x48, 0x5f, 0x56, 0x32, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x4a, 0x4f, 0x42, 0x5f,
+	0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x46, 0x52, 0x45, 0x53, 0x48, 0x5f, 0x50, 0x50, 0x50,
+	0x50, 0x10, 0x03, 0x42, 0x4d, 0x0a, 0x1e, 0x6f, 0x72, 0x67, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6b, 0x65, 0x79, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x31, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x33, 0x2f,
+	0x67, 0x6f, 0x2f, 0x6b, 0x65, 0x79, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x61, 0x70, 0x69, 0x2f,
+	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/message_contents/private_preferences.proto b/proto/message_contents/private_preferences.proto
index 5a516f63..5dc9aa7c 100644
--- a/proto/message_contents/private_preferences.proto
+++ b/proto/message_contents/private_preferences.proto
@@ -7,7 +7,6 @@ syntax = "proto3";
 package xmtp.message_contents;
 
 import "message_contents/ciphertext.proto";
-import "message_contents/public_key.proto";
 
 option go_package = "github.com/xmtp/proto/v3/go/message_contents";
 option java_package = "org.xmtp.proto.message.contents";
@@ -30,3 +29,10 @@ message PrivatePreferencesAction {
     Block block = 2;
   }
 }
+
+// The payload that goes over the wire
+message PrivatePreferencesPayload {
+  oneof version {
+    Ciphertext v1 = 1;
+  }
+}
\ No newline at end of file