From be89da9afc732c390385684fff8572cf9d6a3e12 Mon Sep 17 00:00:00 2001
From: Jazz Turner-Baggs <473256+jazzz@users.noreply.github.com>
Date: Fri, 11 Jul 2025 14:46:05 -0700
Subject: [PATCH] remove umbra references

---
 protos/common_frames.proto            | 2 +-
 protos/conversations/group_v1.proto   | 2 +-
 protos/conversations/private_v1.proto | 2 +-
 protos/encryption.proto               | 2 +-
 protos/envelope.proto                 | 4 ++--
 protos/inbox.proto                    | 2 +-
 protos/invite.proto                   | 2 +-
 protos/reliability.proto              | 2 +-
 src/client.nim                        | 4 ++--
 src/inbox.nim                         | 4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/protos/common_frames.proto b/protos/common_frames.proto
index 453c00f..972f58e 100644
--- a/protos/common_frames.proto
+++ b/protos/common_frames.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.common_frames;
+package wap.common_frames;
 
 message ContentFrame {
     uint32 domain = 1;
diff --git a/protos/conversations/group_v1.proto b/protos/conversations/group_v1.proto
index 34d7ca2..fde7013 100644
--- a/protos/conversations/group_v1.proto
+++ b/protos/conversations/group_v1.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.convos.group_v1;
+package wap.convos.group_v1;
 
 import "base.proto";
 import "common_frames.proto";
diff --git a/protos/conversations/private_v1.proto b/protos/conversations/private_v1.proto
index 43a6a73..d2022a2 100644
--- a/protos/conversations/private_v1.proto
+++ b/protos/conversations/private_v1.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.convos.private_v1;
+package wap.convos.private_v1;
 
 import "common_frames.proto";
 
diff --git a/protos/encryption.proto b/protos/encryption.proto
index a579382..99708fb 100644
--- a/protos/encryption.proto
+++ b/protos/encryption.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.encryption;
+package wap.encryption;
 
 
 // TODO: This also encompasses plaintexts, is there a better name?
diff --git a/protos/envelope.proto b/protos/envelope.proto
index 0b0d2ea..6a961d4 100644
--- a/protos/envelope.proto
+++ b/protos/envelope.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package umbra.envelope;
+package wap.envelope;
 
 
 ///////////////////////////////////////////////////////////////////////////////
 // Payload Framing Messages
 ///////////////////////////////////////////////////////////////////////////////
 
-message UmbraEnvelopeV1 {
+message WapEnvelopeV1 {
     
     string conversation_hint = 1;
     uint64 salt = 2;           
diff --git a/protos/inbox.proto b/protos/inbox.proto
index ad4fed4..6f85db5 100644
--- a/protos/inbox.proto
+++ b/protos/inbox.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.inbox;
+package wap.inbox;
 
 import "invite.proto";
 
diff --git a/protos/invite.proto b/protos/invite.proto
index 5542b76..76e518e 100644
--- a/protos/invite.proto
+++ b/protos/invite.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.invite;
+package wap.invite;
 
 message InvitePrivateV1 {
     bytes initiator = 1;
diff --git a/protos/reliability.proto b/protos/reliability.proto
index 3c433c3..f71f9b2 100644
--- a/protos/reliability.proto
+++ b/protos/reliability.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.reliability;
+package wap.reliability;
 
 ///////////////////////////////////////////////////////////////////////////////
 // SDS Payloads
diff --git a/src/client.nim b/src/client.nim
index 5718835..c591cf1 100644
--- a/src/client.nim
+++ b/src/client.nim
@@ -158,9 +158,9 @@ proc get_conversation(self: Client,
 proc recv*(self: var Client, transport_message: TransportMessage): seq[
     TransportMessage] =
   ## Reveives a incomming payload, decodes it, and processes it.
-  let res_env = decode(transport_message.payload, UmbraEnvelopeV1)
+  let res_env = decode(transport_message.payload, WapEnvelopeV1)
   if res_env.isErr:
-    raise newException(ValueError, "Failed to decode UmbraEnvelopeV1: " & res_env.error)
+    raise newException(ValueError, "Failed to decode WapEnvelopeV1: " & res_env.error)
   let env = res_env.get()
 
   let res_convo = self.get_conversation(env.conversation_hint)
diff --git a/src/inbox.nim b/src/inbox.nim
index 9479e25..3b6e7b1 100644
--- a/src/inbox.nim
+++ b/src/inbox.nim
@@ -22,11 +22,11 @@ proc initInbox*(inbox_addr: string, invite_callback: InviteCallback): Inbox =
 proc encrypt*(frame: InboxV1Frame): EncryptedPayload =
   return encrypt_plain(frame)
 
-proc wrap_env*(payload: EncryptedPayload, convo_id: string): UmbraEnvelopeV1 =
+proc wrap_env*(payload: EncryptedPayload, convo_id: string): WapEnvelopeV1 =
   let bytes = encode(payload)
   let salt = generateSalt()
 
-  return UmbraEnvelopeV1(
+  return WapEnvelopeV1(
     payload: bytes,
     salt: salt,
     conversation_hint: convo_id,