From e7b9b4a7b5fba89cbaccd702a22f9177e8ff7689 Mon Sep 17 00:00:00 2001
From: Jazz Turner-Baggs <473256+jazzz@users.noreply.github.com>
Date: Thu, 10 Jul 2025 18:14:16 -0700
Subject: [PATCH] Bring inline with inbox.md spec

---
 proto/umbra/encryption.proto | 15 +++------------
 proto/umbra/envelope.proto   |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/proto/umbra/encryption.proto b/proto/umbra/encryption.proto
index a579382..5bb740d 100644
--- a/proto/umbra/encryption.proto
+++ b/proto/umbra/encryption.proto
@@ -3,22 +3,13 @@ syntax = "proto3";
 package umbra.encryption;
 
 
-// TODO: This also encompasses plaintexts, is there a better name?
-// Alternatives: ???
 message EncryptedPayload {
-
     oneof encryption {
-        encryption.Plaintext plaintext = 1;
-		encryption.Ecies ecies = 2;
+		NoiseKN noise_KN = 3;
     }
 }
 
-message Plaintext {
-    bytes payload=1;
-}
-
-message Ecies {
-    bytes encrypted_bytes=1;
+message NoiseKN {
+    bytes encrypted_bytes = 1;
     bytes ephemeral_pubkey = 2;
-    bytes tag = 3;
 }
diff --git a/proto/umbra/envelope.proto b/proto/umbra/envelope.proto
index 0b0d2ea..0ee50bc 100644
--- a/proto/umbra/envelope.proto
+++ b/proto/umbra/envelope.proto
@@ -7,7 +7,7 @@ package umbra.envelope;
 // Payload Framing Messages
 ///////////////////////////////////////////////////////////////////////////////
 
-message UmbraEnvelopeV1 {
+message WapEnvelopeV1 {
     
     string conversation_hint = 1;
     uint64 salt = 2;