Update presage and patch dependencies to support latest upstream libsignal changes.

Author: jheretic

Cargo.lock

@@ -2,7 +2,7 @@
 resolver = "2"
 members = [
   "crates/bitpart",
-  "crates/bitpart-cli",
+  # "crates/bitpart-cli",
   "crates/bitpart-common",
   "crates/presage-store-bitpart",
 ]
@@ -20,6 +20,7 @@ keywords = ["signal", "chat", "bot"]
 reqwest-websocket = { git = 'https://github.com/throneless-tech/reqwest-websocket' }
 curve25519-dalek = { git = 'https://github.com/signalapp/curve25519-dalek', tag = 'signal-curve25519-4.1.3' }
 quickcheck_async = { git = 'https://github.com/markbt/quickcheck_async', branch = 'syn-deps' }
+libsqlite3-sys = { version = "0.36.0", git = "https://github.com/whisperfish/rusqlite", rev = '2a42b3354c9194700d08aa070f70a131a470e7dc' }
 
 [profile.dev]
 debug = true

Cargo.toml

@@ -22,7 +22,7 @@ serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.132"
 similar = "2.7.0"
 tokio = { version = "1.43.0", features = ["full"] }
-tokio-tungstenite = { version = "0.26.1", features = ["url"] }
+tokio-tungstenite = { version = "0.26.1", features = ["url", "native-tls"] }
 tracing = "0.1.41"
 tracing-log = "0.2.0"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }

crates/bitpart-cli/Cargo.toml

@@ -18,10 +18,11 @@ figment = "0.10.19"
 futures = "0.3.31"
 hex = "0.4.3"
 opentelemetry-otlp = "0.29.0"
-presage = { git = "https://github.com/whisperfish/presage", rev = "c9276897d1ae31212f724dcece830822e3b037fd" }
+presage = { git = "https://github.com/whisperfish/presage", rev = "52057088c979eb404432ef2f7f9939ce141bb964" }
 presage-store-bitpart= { path = "../presage-store-bitpart" }
 prost = "0.13.5"
-sea-orm = "~1.0"
+sea-orm = { git = "https://github.com/throneless-tech/sea-orm", rev = "0c889ce5643fa1431f5107fe597070f3248a95e6", features = ["sqlx-sqlite", "runtime-tokio-rustls", "macros"] }
+sea-orm-migration = { git = "https://github.com/throneless-tech/sea-orm", rev = "0c889ce5643fa1431f5107fe597070f3248a95e6" }
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.132"
 thiserror = "2.0.12"

crates/bitpart-common/Cargo.toml

@@ -22,7 +22,7 @@ use hex;
 use opentelemetry_otlp;
 use presage::{
     self,
-    libsignal_service::{prelude::InvalidDeviceId, protocol::SignalProtocolError},
+    libsignal_service::{protocol::InvalidDeviceId, protocol::SignalProtocolError},
 };
 use presage_store_bitpart::BitpartStoreError;
 use prost;

crates/bitpart-common/src/error.rs

@@ -12,7 +12,7 @@ keywords.workspace = true
 [dependencies]
 anyhow = "1.0"
 async-recursion = "1.1.1"
-axum = { version = "0.8.0", features = ["http2", "macros", "ws"] }
+axum = { version = "^0.8.8", features = ["http2", "macros", "ws"] }
 base64 = "0.22.1"
 bincode = "1.3.3"
 bitpart-common = { path = "../bitpart-common" }
@@ -25,19 +25,19 @@ figment = { version = "0.10.19", features = ["env", "toml"] }
 figment_file_provider_adapter = "0.1.1"
 futures = "0.3.31"
 hex = "0.4.3"
-libsqlite3-sys = { version = "0.26.0", features = ["bundled-sqlcipher"] }
+libsqlite3-sys = { version = "0.36.0", features = ["bundled-sqlcipher-custom-crypto"] }
 md-5 = "0.10.6"
 mime_guess = "2.0.5"
 opentelemetry = "0.29.1"
 opentelemetry-otlp = { version = "0.29.0", features = ["reqwest-rustls"] }
 opentelemetry_sdk = "0.29.0"
-presage = { git = "https://github.com/whisperfish/presage", rev = "c9276897d1ae31212f724dcece830822e3b037fd" }
+presage = { git = "https://github.com/whisperfish/presage", rev = "52057088c979eb404432ef2f7f9939ce141bb964" }
 presage-store-bitpart= { path = "../presage-store-bitpart" }
 rand = "0.8.5"
-regex = "1.10.6"
+regex = "1.11.2"
 sanitise-file-name = "1.0.0"
-sea-orm = { version = "~1.0", features = ["sqlx-sqlite", "runtime-tokio-rustls", "macros"] }
-sea-orm-migration = "1.0.1"
+sea-orm = { git = "https://github.com/throneless-tech/sea-orm", rev = "0c889ce5643fa1431f5107fe597070f3248a95e6", features = ["sqlx-sqlite", "runtime-tokio-rustls", "macros"] }
+sea-orm-migration = { git = "https://github.com/throneless-tech/sea-orm", rev = "0c889ce5643fa1431f5107fe597070f3248a95e6" }
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.117"
 subtle = { version = "2.6.1", features = ["const-generics"] }

crates/bitpart/Cargo.toml

@@ -15,10 +15,10 @@ base64 = "0.22"
 chrono = "0.4.35"
 fs_extra = "1.3"
 futures = "0.3.31"
-presage = { git = "https://github.com/whisperfish/presage", rev = "c9276897d1ae31212f724dcece830822e3b037fd" }
+presage = { git = "https://github.com/whisperfish/presage", rev = "52057088c979eb404432ef2f7f9939ce141bb964" }
 prost = "0.13"
 quickcheck_macros = "1.0.0"
-sea-orm = { version = "~1.0", features = ["sqlx-sqlite", "runtime-tokio-rustls", "macros"] }
+sea-orm = { git = "https://github.com/throneless-tech/sea-orm", rev = "0c889ce5643fa1431f5107fe597070f3248a95e6", features = ["sqlx-sqlite", "runtime-tokio-rustls", "macros"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 sha2 = "0.10"

crates/presage-store-bitpart/Cargo.toml

@@ -18,10 +18,11 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use presage::{
-    libsignal_service::{prelude::InvalidDeviceId, protocol::SignalProtocolError},
+    libsignal_service::{protocol::InvalidDeviceId, protocol::SignalProtocolError},
     store::StoreError,
 };
 use sea_orm::DbErr;
+use std::array::TryFromSliceError;
 use std::str;
 use tracing::error;
 
@@ -53,6 +54,8 @@ pub enum BitpartStoreError {
     SignalProtocol(#[from] SignalProtocolError),
     #[error("Invalid device ID: `{0}`")]
     InvalidDeviceId(#[from] InvalidDeviceId),
+    #[error("Invalid master key: `{0}`")]
+    InvalidMasterKey(#[from] TryFromSliceError),
 }
 
 impl StoreError for BitpartStoreError {}

crates/presage-store-bitpart/src/error.rs

@@ -20,7 +20,7 @@
 use base64::prelude::*;
 use presage::{
     libsignal_service::{
-        prelude::{ProfileKey, Uuid},
+        prelude::{MasterKey, ProfileKey, Uuid},
         protocol::{IdentityKeyPair, SenderCertificate},
     },
     manager::RegistrationData,
@@ -49,6 +49,7 @@ const BITPART_TREE_STATE: &str = "state";
 
 const BITPART_KEY_REGISTRATION: &str = "registration";
 const BITPART_KEY_SENDER_CERTIFICATE: &str = "sender_certificate";
+const BITPART_KEY_MASTER: &str = "master";
 
 #[derive(Clone)]
 pub struct BitpartStore {
@@ -309,6 +310,27 @@ impl StateStore for BitpartStore {
         .await?;
         Ok(())
     }
+
+    async fn fetch_master_key(&self) -> Result<Option<MasterKey>, Self::StateStoreError> {
+        let value: Option<Vec<u8>> = self.get(BITPART_TREE_STATE, BITPART_KEY_MASTER).await?;
+        value
+            .map(|value| MasterKey::from_slice(&value))
+            .transpose()
+            .map_err(From::from)
+    }
+
+    async fn store_master_key(
+        &self,
+        master_key: Option<&MasterKey>,
+    ) -> Result<(), Self::StateStoreError> {
+        self.insert(
+            BITPART_TREE_STATE,
+            BITPART_KEY_MASTER,
+            master_key.map(|k| &k.inner[..]),
+        )
+        .await?;
+        Ok(())
+    }
 }
 
 impl Store for BitpartStore {

crates/presage-store-bitpart/src/lib.rs

@@ -27,9 +27,9 @@ use std::str::FromStr;
 use presage::libsignal_service::content::Content;
 use presage::libsignal_service::content::ContentBody;
 use presage::libsignal_service::content::Metadata;
-use presage::libsignal_service::prelude::DeviceId;
 use presage::libsignal_service::prelude::Uuid;
 use presage::libsignal_service::proto;
+use presage::libsignal_service::protocol::DeviceId;
 use presage::libsignal_service::protocol::ServiceId;
 
 use crate::BitpartStoreError;