Remove umbra references

nim/.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-    "name": "UmbraTypes",
+    "name": "WapTypes",
     "image": "nimlang/nim",
     "customizations": {
         "vscode": {

proto/wap/common_frames.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.common_frames;
+package wap.common_frames;
 
 message ContentFrame {
     uint32 domain = 1;

proto/wap/conversations/private_v1.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.convos.private_v1;
+package wap.convos.private_v1;
 
 import "common_frames.proto";
 

proto/wap/encryption.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.encryption;
+package wap.encryption;
 
 
 message EncryptedPayload {

proto/wap/envelope.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.envelope;
+package wap.envelope;
 
 
 ///////////////////////////////////////////////////////////////////////////////

proto/wap/inbox.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.inbox;
+package wap.inbox;
 
 import "invite.proto";
 

proto/wap/invite.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.invite;
+package wap.invite;
 
 message InvitePrivateV1 {
     repeated string participants = 1;

proto/wap/reliability.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package umbra.reliability;
+package wap.reliability;
 
 ///////////////////////////////////////////////////////////////////////////////
 // SDS Payloads

rust/.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "Rust-UmbraTypes",
+	"name": "Rust-WapTypes",
 	"image": "mcr.microsoft.com/devcontainers/rust:latest",
 	"customizations": {
 		"vscode": {

rust/Cargo.lock

@@ -401,7 +401,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "umbra-types"
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "wap-types"
 version = "0.0.2-dev"
 dependencies = [
  "bytes 0.4.12",
@@ -410,12 +416,6 @@ dependencies = [
  "protoc-rust",
 ]
 
-[[package]]
-name = "unicode-ident"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-
 [[package]]
 name = "wasi"
 version = "0.14.2+wasi-0.2.4"

rust/cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
 
 members = [
-    "umbra-types"
+    "wap-types"
 ]
 
 default-members = [
-    "umbra-types"
+    "wap-types"
 ]
 
 resolver = "3"

rust/wap-types/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "umbra-types"
+name = "wap-types"
 edition = "2024"
 version = "0.0.2-dev"
 

rust/wap-types/build.rs

@@ -13,7 +13,7 @@ fn get_proto_dir() -> PathBuf {
     proto_root_dir.pop();
     proto_root_dir.pop();
     proto_root_dir.push("proto");
-    proto_root_dir.push("umbra");
+    proto_root_dir.push("wap");
 
     println!("proto_dir: {:?}", proto_root_dir);
     proto_root_dir

rust/wap-types/src/lib.rs

@@ -1,6 +1,6 @@
 pub mod payload;
 
-pub use payload::types::umbra::*;
+pub use payload::types::wap::*;
 
 #[cfg(test)]
 

rust/wap-types/src/payload.rs

@@ -3,12 +3,12 @@ pub mod types {
 }
 
 use prost::Message;
-pub use types::umbra::*;
+pub use types::wap::*;
 
 use crate::{
     convos::private_v1::{PrivateV1Frame, private_v1_frame},
     encryption::EncryptedPayload,
-    envelope::UmbraEnvelopeV1,
+    envelope::WapEnvelopeV1,
     inbox::{InboxV1Frame, inbox_v1_frame},
 };
 
@@ -32,12 +32,12 @@ impl InboxV1Frame {
 }
 
 pub trait ToEnvelope {
-    fn to_envelope(self, conversation_id: String, salt: u64) -> UmbraEnvelopeV1;
+    fn to_envelope(self, conversation_id: String, salt: u64) -> WapEnvelopeV1;
 }
 
 impl ToEnvelope for EncryptedPayload {
-    fn to_envelope(self, conversation_id: String, salt: u64) -> UmbraEnvelopeV1 {
+    fn to_envelope(self, conversation_id: String, salt: u64) -> WapEnvelopeV1 {
-        UmbraEnvelopeV1 {
+        WapEnvelopeV1 {
             conversation_hint: conversation_id, // TODO
             salt,
             payload: self.encode_to_vec(), // Avoid allocation here?

specs/<PROTO>.md

@@ -1,5 +1,5 @@
 ---
-title: <PROTO>>
+title: Waku Application Protocol
 name: A private decentralized messaging protocol for multiple usecases.
 category: Standards Track
 status: raw
@@ -56,7 +56,6 @@ There exists a circular dependency in initializing a Conversation. Conversations
 
 To resolve this all clients MUST implement a default [Inbox](./inbox.md) to receive initial messages. The default inbox allows clients to discover new conversations asynchronously without prior coordination. By listening in a static location.
 
-
 The default inbox MUST be configured with the parameters:
 - **inbox_addr:** `client_address`
 - **discriminator:** "default"
@@ -86,7 +85,7 @@ The wire format is specified using protocol buffers v3.
 
 ```protobuf
 
-message UmbraEnvelopeV1 {
+message WapEnvelopeV1 {
     
     string conversation_hint = 1;
     uint32 salt = 2;