WIP: kameo::messages wiring for transport generalization

AGENTS.md

@@ -66,7 +66,7 @@ cargo insta review
 The server is actor-based using the **kameo** crate. All long-lived state lives in `GlobalActors`:
 
 - **`Bootstrapper`** — Manages the one-time bootstrap token written to `~/.arbiter/bootstrap_token` on first run.
-- **`KeyHolder`** — Holds the encrypted root key and manages the Sealed/Unsealed vault state machine. On unseal, decrypts the root key into a `memsafe` hardened memory cell.
+- **`Vault`** — Holds the encrypted root key and manages the Sealed/Unsealed vault state machine. On unseal, decrypts the root key into a `memsafe` hardened memory cell.
 - **`FlowCoordinator`** — Coordinates cross-connection flow between user agents and SDK clients.
 - **`EvmActor`** — Handles EVM transaction policy enforcement and signing.
 

CLAUDE.md

@@ -66,7 +66,7 @@ cargo insta review
 The server is actor-based using the **kameo** crate. All long-lived state lives in `GlobalActors`:
 
 - **`Bootstrapper`** — Manages the one-time bootstrap token written to `~/.arbiter/bootstrap_token` on first run.
-- **`KeyHolder`** — Holds the encrypted root key and manages the Sealed/Unsealed vault state machine. On unseal, decrypts the root key into a `memsafe` hardened memory cell.
+- **`Vault`** — Holds the encrypted root key and manages the Sealed/Unsealed vault state machine. On unseal, decrypts the root key into a `memsafe` hardened memory cell.
 - **`FlowCoordinator`** — Coordinates cross-connection flow between user agents and SDK clients.
 - **`EvmActor`** — Handles EVM transaction policy enforcement and signing.
 

mise.lock

@@ -72,6 +72,10 @@ backend = "cargo:diesel_cli"
 default-features = "false"
 features = "sqlite,sqlite-bundled"
 
+[[tools."cargo:flutter_rust_bridge_codegen"]]
+version = "2.12.0"
+backend = "cargo:flutter_rust_bridge_codegen"
+
 [[tools.flutter]]
 version = "3.38.9-stable"
 backend = "asdf:flutter"

mise.toml

@@ -13,6 +13,7 @@ python = "3.14.3"
 ast-grep = "0.42.0"
 "cargo:cargo-edit" = "0.13.9"
 "cargo:cargo-mutants" = "27.0.0"
+"cargo:flutter_rust_bridge_codegen" = "2.12.0"
 
 [tasks.codegen]
 sources = ['protobufs/*.proto', 'protobufs/**/*.proto']

protobufs/user_agent/auth.proto

@@ -2,17 +2,9 @@ syntax = "proto3";
 
 package arbiter.user_agent.auth;
 
-enum KeyType {
-  KEY_TYPE_UNSPECIFIED = 0;
-  KEY_TYPE_ED25519 = 1;
-  KEY_TYPE_ECDSA_SECP256K1 = 2;
-  KEY_TYPE_RSA = 3;
-}
-
 message AuthChallengeRequest {
   bytes pubkey = 1;
   optional string bootstrap_token = 2;
-  KeyType key_type = 3;
 }
 
 message AuthChallenge {

server/Cargo.toml

@@ -26,7 +26,6 @@ thiserror = "2.0.18"
 async-trait = "0.1.89"
 futures = "0.3.32"
 tokio-stream = { version = "0.1.18", features = ["full"] }
-kameo = "0.19.2"
 prost-types = { version = "0.14.3", features = ["chrono"] }
 x25519-dalek = { version = "2.0.1", features = ["getrandom"] }
 rstest = "0.26.1"
@@ -47,4 +46,6 @@ miette = { version = "7.6.0", features = ["fancy", "serde"] }
 mutants = "0.0.4"
 ml-dsa = { version = "0.1.0-rc.8", features = ["zeroize"] }
 base64 = "0.22.1"
-hmac = "0.12.1"
+kameo = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"}
+kameo_actors = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"}
+

server/crates/arbiter-crypto/Cargo.toml

@@ -8,9 +8,7 @@ ml-dsa = {workspace = true, optional = true }
 rand = {workspace = true, optional = true}
 base64 = {workspace = true, optional = true }
 memsafe = {version = "0.4.0", optional = true}
-hmac.workspace = true
+x-wing = { version = "0.1.0-rc.0", features = ["zeroize"] }
-alloy.workspace = true
-chrono.workspace = true
 
 [lints]
 workspace = true

server/crates/arbiter-crypto/src/authn/v1.rs

@@ -1,5 +1,6 @@
+use std::hash::Hash;
+
 use base64::{Engine as _, prelude::BASE64_STANDARD};
-use hmac::digest::Digest;
 use ml_dsa::{
     EncodedVerifyingKey, Error, KeyGen, MlDsa87, Seed, Signature as MlDsaSignature,
     SigningKey as MlDsaSigningKey, VerifyingKey as MlDsaVerifyingKey, signature::Keypair as _,
@@ -18,9 +19,9 @@ pub type KeyParams = MlDsa87;
 #[derive(Clone, Debug, PartialEq)]
 pub struct PublicKey(Box<MlDsaVerifyingKey<KeyParams>>);
 
-impl crate::hashing::Hashable for PublicKey {
+impl Hash for PublicKey {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        hasher.update(self.to_bytes());
+        self.to_bytes().hash(state);
     }
 }
 
@@ -32,7 +33,7 @@ pub struct SigningKey(Box<MlDsaSigningKey<KeyParams>>);
 
 impl PublicKey {
     pub fn to_bytes(&self) -> Vec<u8> {
-        self.0.encode().0.to_vec()
+        self.0.encode().to_vec()
     }
 
     pub fn verify(&self, nonce: i32, context: &[u8], signature: &Signature) -> bool {
@@ -46,7 +47,7 @@ impl PublicKey {
 
 impl Signature {
     pub fn to_bytes(&self) -> Vec<u8> {
-        self.0.encode().0.to_vec()
+        self.0.encode().to_vec()
     }
 }
 

server/crates/arbiter-crypto/src/lib.rs

@@ -1,5 +1,7 @@
 #[cfg(feature = "authn")]
 pub mod authn;
-pub mod hashing;
+
 #[cfg(feature = "safecell")]
 pub mod safecell;
+
+pub use x_wing;

server/crates/arbiter-macros/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "arbiter-macros"
-version = "0.1.0"
-edition = "2024"
-
-[lib]
-proc-macro = true
-
-[dependencies]
-proc-macro2 = "1.0"
-quote = "1.0"
-syn = { version = "2.0", features = ["derive", "fold", "full", "visit-mut"] }
-
-[dev-dependencies]
-arbiter-crypto = { path = "../arbiter-crypto" }
-
-[lints]
-workspace = true

server/crates/arbiter-macros/src/hashable.rs

@@ -1,133 +0,0 @@
-use proc_macro2::{Span, TokenStream, TokenTree};
-use quote::quote;
-use syn::parse_quote;
-use syn::spanned::Spanned;
-use syn::{DataStruct, DeriveInput, Fields, Generics, Index};
-
-use crate::utils::{HASHABLE_TRAIT_PATH, HMAC_DIGEST_PATH};
-
-pub(crate) fn derive(input: &DeriveInput) -> TokenStream {
-    match &input.data {
-        syn::Data::Struct(struct_data) => hashable_struct(input, struct_data),
-        syn::Data::Enum(_) => {
-            syn::Error::new_spanned(input, "Hashable can currently be derived only for structs")
-                .to_compile_error()
-        }
-        syn::Data::Union(_) => {
-            syn::Error::new_spanned(input, "Hashable cannot be derived for unions")
-                .to_compile_error()
-        }
-    }
-}
-
-fn hashable_struct(input: &DeriveInput, struct_data: &syn::DataStruct) -> TokenStream {
-    let ident = &input.ident;
-    let hashable_trait = HASHABLE_TRAIT_PATH.to_path();
-    let hmac_digest = HMAC_DIGEST_PATH.to_path();
-    let generics = add_hashable_bounds(input.generics.clone(), &hashable_trait);
-    let field_accesses = collect_field_accesses(struct_data);
-    let hash_calls = build_hash_calls(&field_accesses, &hashable_trait);
-
-    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-
-    quote! {
-        #[automatically_derived]
-        impl #impl_generics #hashable_trait for #ident #ty_generics #where_clause {
-            fn hash<H: #hmac_digest>(&self, hasher: &mut H) {
-                #(#hash_calls)*
-            }
-        }
-    }
-}
-
-fn add_hashable_bounds(mut generics: Generics, hashable_trait: &syn::Path) -> Generics {
-    for type_param in generics.type_params_mut() {
-        type_param.bounds.push(parse_quote!(#hashable_trait));
-    }
-
-    generics
-}
-
-struct FieldAccess {
-    access: TokenStream,
-    span: Span,
-}
-
-fn collect_field_accesses(struct_data: &DataStruct) -> Vec<FieldAccess> {
-    match &struct_data.fields {
-        Fields::Named(fields) => {
-            // Keep deterministic alphabetical order for named fields.
-            // Do not remove this sort, because it keeps hash output stable regardless of source order.
-            let mut named_fields = fields
-                .named
-                .iter()
-                .map(|field| {
-                    let name = field
-                        .ident
-                        .as_ref()
-                        .expect("Fields::Named(fields) must have names")
-                        .clone();
-                    (name.to_string(), name)
-                })
-                .collect::<Vec<_>>();
-
-            named_fields.sort_by(|a, b| a.0.cmp(&b.0));
-
-            named_fields
-                .into_iter()
-                .map(|(_, name)| FieldAccess {
-                    access: quote! { #name },
-                    span: name.span(),
-                })
-                .collect()
-        }
-        Fields::Unnamed(fields) => fields
-            .unnamed
-            .iter()
-            .enumerate()
-            .map(|(i, field)| FieldAccess {
-                access: {
-                    let index = Index::from(i);
-                    quote! { #index }
-                },
-                span: field.ty.span(),
-            })
-            .collect(),
-        Fields::Unit => Vec::new(),
-    }
-}
-
-fn build_hash_calls(
-    field_accesses: &[FieldAccess],
-    hashable_trait: &syn::Path,
-) -> Vec<TokenStream> {
-    field_accesses
-        .iter()
-        .map(|field| {
-            let access = &field.access;
-            let call = quote! {
-                #hashable_trait::hash(&self.#access, hasher);
-            };
-
-            respan(call, field.span)
-        })
-        .collect()
-}
-
-/// Recursively set span on all tokens, including interpolated ones.
-fn respan(tokens: TokenStream, span: Span) -> TokenStream {
-    tokens
-        .into_iter()
-        .map(|tt| match tt {
-            TokenTree::Group(g) => {
-                let mut new = proc_macro2::Group::new(g.delimiter(), respan(g.stream(), span));
-                new.set_span(span);
-                TokenTree::Group(new)
-            }
-            mut other => {
-                other.set_span(span);
-                other
-            }
-        })
-        .collect()
-}

server/crates/arbiter-macros/src/lib.rs

@@ -1,10 +0,0 @@
-use syn::{DeriveInput, parse_macro_input};
-
-mod hashable;
-mod utils;
-
-#[proc_macro_derive(Hashable)]
-pub fn derive_hashable(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-    hashable::derive(&input).into()
-}

server/crates/arbiter-macros/src/utils.rs

@@ -1,19 +0,0 @@
-pub struct ToPath(pub &'static str);
-
-impl ToPath {
-    pub fn to_path(&self) -> syn::Path {
-        syn::parse_str(self.0).expect("Invalid path")
-    }
-}
-
-macro_rules! ensure_path {
-    ($path:path) => {{
-        #[cfg(test)]
-        #[expect(unused_imports)]
-        use $path as _;
-        ToPath(stringify!($path))
-    }};
-}
-
-pub const HASHABLE_TRAIT_PATH: ToPath = ensure_path!(::arbiter_crypto::hashing::Hashable);
-pub const HMAC_DIGEST_PATH: ToPath = ensure_path!(::arbiter_crypto::hashing::Digest);

server/crates/arbiter-proto/src/transport.rs

@@ -106,6 +106,36 @@ pub trait Receiver<Inbound>: Send + Sync {
 /// any built-in correlation mechanism between inbound and outbound items.
 pub trait Bi<Inbound, Outbound>: Sender<Outbound> + Receiver<Inbound> + Send + Sync {}
 
+#[async_trait]
+impl<T, Outbound> Sender<Outbound> for &mut T
+where
+    T: Sender<Outbound> + ?Sized,
+    Outbound: Send + 'static,
+{
+    async fn send(&mut self, item: Outbound) -> Result<(), Error> {
+        (**self).send(item).await
+    }
+}
+
+#[async_trait]
+impl<T, Inbound> Receiver<Inbound> for &mut T
+where
+    T: Receiver<Inbound> + ?Sized,
+    Inbound: Send + 'static,
+{
+    async fn recv(&mut self) -> Option<Inbound> {
+        (**self).recv().await
+    }
+}
+
+impl<T, Inbound, Outbound> Bi<Inbound, Outbound> for &mut T
+where
+    T: Bi<Inbound, Outbound> + ?Sized,
+    Inbound: Send + 'static,
+    Outbound: Send + 'static,
+{
+}
+
 pub trait SplittableBi<Inbound, Outbound>: Bi<Inbound, Outbound> {
     type Sender: Sender<Outbound>;
     type Receiver: Receiver<Inbound>;

server/crates/arbiter-server/Cargo.toml

@@ -18,7 +18,6 @@ diesel-async = { version = "0.8.0", features = [
 ] }
 arbiter-proto.path = "../arbiter-proto"
 arbiter-crypto.path = "../arbiter-crypto"
-arbiter-macros.path = "../arbiter-macros"
 tracing.workspace = true
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tonic.workspace = true
@@ -45,7 +44,7 @@ restructed = "0.2.2"
 strum = { version = "0.28.0", features = ["derive"] }
 pem = "3.0.6"
 sha2.workspace = true
-hmac.workspace = true
+hmac = "0.12"
 spki.workspace = true
 alloy.workspace = true
 prost-types.workspace = true
@@ -59,6 +58,7 @@ ml-dsa.workspace = true
 ed25519-dalek.workspace = true
 x25519-dalek.workspace = true
 k256.workspace = true
+kameo_actors.workspace = true
 
 [dev-dependencies]
 insta = "1.46.3"

server/crates/arbiter-server/src/actors/evm/mod.rs

@@ -7,7 +7,7 @@ use kameo::{Actor, actor::ActorRef, messages};
 use rand::{SeedableRng, rng, rngs::StdRng};
 
 use crate::{
-    actors::keyholder::{CreateNew, Decrypt, KeyHolder},
+    actors::vault::{CreateNew, Decrypt, Vault},
     crypto::integrity,
     db::{
         DatabaseError, DatabasePool,
@@ -34,11 +34,11 @@ pub enum SignTransactionError {
     #[error("Database error: {0}")]
     Database(#[from] DatabaseError),
 
-    #[error("Keyholder error: {0}")]
+    #[error("Vault error: {0}")]
-    Keyholder(#[from] crate::actors::keyholder::Error),
+    Vault(#[from] crate::actors::vault::Error),
 
-    #[error("Keyholder mailbox error")]
+    #[error("Vault mailbox error")]
-    KeyholderSend,
+    VaultSend,
 
     #[error("Signing error: {0}")]
     Signing(#[from] alloy::signers::Error),
@@ -49,11 +49,11 @@ pub enum SignTransactionError {
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("Keyholder error: {0}")]
+    #[error("Vault error: {0}")]
-    Keyholder(#[from] crate::actors::keyholder::Error),
+    Vault(#[from] crate::actors::vault::Error),
 
-    #[error("Keyholder mailbox error")]
+    #[error("Vault mailbox error")]
-    KeyholderSend,
+    VaultSend,
 
     #[error("Database error: {0}")]
     Database(#[from] DatabaseError),
@@ -64,20 +64,20 @@ pub enum Error {
 
 #[derive(Actor)]
 pub struct EvmActor {
-    pub keyholder: ActorRef<KeyHolder>,
+    pub vault: ActorRef<Vault>,
     pub db: DatabasePool,
     pub rng: StdRng,
     pub engine: evm::Engine,
 }
 
 impl EvmActor {
-    pub fn new(keyholder: ActorRef<KeyHolder>, db: DatabasePool) -> Self {
+    pub fn new(vault: ActorRef<Vault>, db: DatabasePool) -> Self {
         // is it safe to seed rng from system once?
         // todo: audit
         let rng = StdRng::from_rng(&mut rng());
-        let engine = evm::Engine::new(db.clone(), keyholder.clone());
+        let engine = evm::Engine::new(db.clone(), vault.clone());
         Self {
-            keyholder,
+            vault,
             db,
             rng,
             engine,
@@ -94,10 +94,10 @@ impl EvmActor {
         let plaintext = key_cell.read_inline(|reader| SafeCell::new(reader.to_vec()));
 
         let aead_id: i32 = self
-            .keyholder
+            .vault
             .ask(CreateNew { plaintext })
             .await
-            .map_err(|_| Error::KeyholderSend)?;
+            .map_err(|_| Error::VaultSend)?;
 
         let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
         let wallet_id = insert_into(schema::evm_wallet::table)
@@ -160,7 +160,7 @@ impl EvmActor {
     #[message]
     pub async fn useragent_delete_grant(&mut self, _grant_id: i32) -> Result<(), Error> {
         // let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
-        // let keyholder = self.keyholder.clone();
+        // let vault = self.vault.clone();
 
         // diesel_async::AsyncConnection::transaction(&mut conn, |conn| {
         //     Box::pin(async move {
@@ -254,12 +254,12 @@ impl EvmActor {
         drop(conn);
 
         let raw_key: SafeCell<Vec<u8>> = self
-            .keyholder
+            .vault
             .ask(Decrypt {
                 aead_id: wallet.aead_encrypted_id,
             })
             .await
-            .map_err(|_| SignTransactionError::KeyholderSend)?;
+            .map_err(|_| SignTransactionError::VaultSend)?;
 
         let signer = safe_signer::SafeSigner::from_cell(raw_key)?;
 

server/crates/arbiter-server/src/actors/flow_coordinator/client_connect_approval.rs

@@ -6,10 +6,12 @@ use kameo::{
     reply::ReplySender,
 };
 
-use crate::actors::{
+use crate::{
-    client::ClientProfile,
+    actors::flow_coordinator::ApprovalError,
-    flow_coordinator::ApprovalError,
+    peers::{
-    user_agent::{UserAgentSession, session::BeginNewClientApproval},
+        client::ClientProfile,
+        user_agent::{UserAgentSession, session::BeginNewClientApproval},
+    },
 };
 
 pub struct Args {

server/crates/arbiter-server/src/actors/flow_coordinator/mod.rs

@@ -9,10 +9,12 @@ use kameo::{
 };
 use tracing::info;
 
-use crate::actors::{
+use crate::{
-    client::{ClientProfile, session::ClientSession},
+    actors::flow_coordinator::client_connect_approval::ClientApprovalController,
-    flow_coordinator::client_connect_approval::ClientApprovalController,
+    peers::{
-    user_agent::session::UserAgentSession,
+        client::{ClientProfile, session::ClientSession},
+        user_agent::UserAgentSession,
+    },
 };
 
 pub mod client_connect_approval;

server/crates/arbiter-server/src/actors/mod.rs

@@ -1,47 +1,53 @@
 use kameo::actor::{ActorRef, Spawn};
+use kameo_actors::{DeliveryStrategy, message_bus::MessageBus};
 use thiserror::Error;
 
 use crate::{
     actors::{
-        bootstrap::Bootstrapper, evm::EvmActor, flow_coordinator::FlowCoordinator,
+        bootstrap::Bootstrapper, evm::EvmActor, flow_coordinator::FlowCoordinator, vault::Vault,
-        keyholder::KeyHolder,
     },
     db,
 };
 
 pub mod bootstrap;
-pub mod client;
+pub mod evm;
-mod evm;
 pub mod flow_coordinator;
-pub mod keyholder;
+pub mod vault;
-pub mod user_agent;
+pub mod useragent_registry;
 
 #[derive(Error, Debug)]
 pub enum SpawnError {
     #[error("Failed to spawn Bootstrapper actor")]
     Bootstrapper(#[from] bootstrap::Error),
 
-    #[error("Failed to spawn KeyHolder actor")]
+    #[error("Failed to spawn Vault actor")]
-    KeyHolder(#[from] keyholder::Error),
+    Vault(#[from] vault::Error),
 }
 
 /// Long-lived actors that are shared across all connections and handle global state and operations
 #[derive(Clone)]
 pub struct GlobalActors {
-    pub key_holder: ActorRef<KeyHolder>,
+    pub vault: ActorRef<Vault>,
     pub bootstrapper: ActorRef<Bootstrapper>,
     pub flow_coordinator: ActorRef<FlowCoordinator>,
     pub evm: ActorRef<EvmActor>,
+    pub events: ActorRef<MessageBus>,
 }
 
 impl GlobalActors {
+    pub fn spawn_message_bus() -> ActorRef<MessageBus> {
+        MessageBus::spawn(MessageBus::new(DeliveryStrategy::Guaranteed))
+    }
+
     pub async fn spawn(db: db::DatabasePool) -> Result<Self, SpawnError> {
-        let key_holder = KeyHolder::spawn(KeyHolder::new(db.clone()).await?);
+        let message_bus = Self::spawn_message_bus();
+        let key_holder = Vault::spawn(Vault::new(db.clone(), message_bus.clone()).await?);
         Ok(Self {
             bootstrapper: Bootstrapper::spawn(Bootstrapper::new(&db).await?),
             evm: EvmActor::spawn(EvmActor::new(key_holder.clone(), db)),
-            key_holder,
+            vault: key_holder,
             flow_coordinator: FlowCoordinator::spawn(FlowCoordinator::default()),
+            events: message_bus,
         })
     }
 }

server/crates/arbiter-server/src/actors/user_agent/mod.rs

@@ -1,40 +0,0 @@
-use crate::{
-    actors::{GlobalActors, client::ClientProfile},
-    crypto::integrity::Integrable,
-    db,
-};
-use arbiter_crypto::authn;
-
-#[derive(Debug, arbiter_macros::Hashable)]
-pub struct UserAgentCredentials {
-    pub pubkey: authn::PublicKey,
-    pub nonce: i32,
-}
-
-impl Integrable for UserAgentCredentials {
-    const KIND: &'static str = "useragent_credentials";
-}
-
-// Messages, sent by user agent to connection client without having a request
-#[derive(Debug)]
-pub enum OutOfBand {
-    ClientConnectionRequest { profile: ClientProfile },
-    ClientConnectionCancel { pubkey: authn::PublicKey },
-}
-
-pub struct UserAgentConnection {
-    pub(crate) db: db::DatabasePool,
-    pub(crate) actors: GlobalActors,
-}
-
-impl UserAgentConnection {
-    pub fn new(db: db::DatabasePool, actors: GlobalActors) -> Self {
-        Self { db, actors }
-    }
-}
-
-pub mod auth;
-pub mod session;
-
-pub use auth::authenticate;
-pub use session::UserAgentSession;

server/crates/arbiter-server/src/actors/user_agent/session/state.rs

@@ -1,27 +0,0 @@
-use std::sync::Mutex;
-
-use x25519_dalek::{EphemeralSecret, PublicKey};
-
-pub struct UnsealContext {
-    pub client_public_key: PublicKey,
-    pub secret: Mutex<Option<EphemeralSecret>>,
-}
-
-smlang::statemachine!(
-    name: UserAgent,
-    custom_error: false,
-    transitions: {
-        *Idle + UnsealRequest(UnsealContext) / generate_temp_keypair = WaitingForUnsealKey(UnsealContext),
-        WaitingForUnsealKey(UnsealContext) + ReceivedValidKey = Unsealed,
-        WaitingForUnsealKey(UnsealContext) + ReceivedInvalidKey = Idle,
-    }
-);
-
-pub struct DummyContext;
-impl UserAgentStateMachineContext for DummyContext {
-    #[allow(missing_docs)]
-    #[allow(clippy::unused_unit)]
-    fn generate_temp_keypair(&mut self, event_data: UnsealContext) -> Result<UnsealContext, ()> {
-        Ok(event_data)
-    }
-}

server/crates/arbiter-server/src/actors/useragent_registry.rs

@@ -0,0 +1,57 @@
+use alloy::primitives::map::HashMap;
+use arbiter_crypto::authn;
+use kameo::{error::Infallible, prelude::*};
+
+use crate::{db::DatabasePool, peers::user_agent::{Credentials, UserAgentSession}};
+
+use super::vault::{Vault, events as vault_events};
+
+pub struct Args {
+    pub vault: ActorRef<Vault>,
+    pub pool: DatabasePool,
+}
+
+pub struct UserAgentRegistry {
+    vault: ActorRef<Vault>,
+    pool: DatabasePool,
+    connected: HashMap<Credentials, ActorRef<UserAgentSession>>,
+}
+
+impl Message<vault_events::Bootstrapped> for UserAgentRegistry {
+    type Reply = ();
+
+    async fn handle(
+        &mut self,
+        msg: vault_events::Bootstrapped,
+        ctx: &mut Context<Self, Self::Reply>,
+    ) -> Self::Reply {
+        todo!()
+    }
+}
+
+impl Message<vault_events::Unsealed> for UserAgentRegistry {
+    type Reply = ();
+
+    async fn handle(
+        &mut self,
+        msg: vault_events::Unsealed,
+        ctx: &mut Context<Self, Self::Reply>,
+    ) -> Self::Reply {
+        todo!()
+    }
+}
+impl Actor for UserAgentRegistry {
+    type Args = Args;
+
+    type Error = Infallible;
+
+    async fn on_start(args: Self::Args, actor_ref: ActorRef<Self>) -> Result<Self, Self::Error> {
+        Ok(Self {
+            vault: args.vault,
+            pool: args.pool,
+            connected: HashMap::default(),
+        })
+    }
+
+    
+}

server/crates/arbiter-server/src/actors/vault/mod.rs

@@ -5,7 +5,8 @@ use diesel::{
 };
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use hmac::Mac as _;
-use kameo::{Actor, Reply, messages};
+use kameo::{Actor, Reply, actor::ActorRef, messages};
+use kameo_actors::message_bus::{MessageBus, Publish};
 use strum::{EnumDiscriminants, IntoDiscriminant};
 use tracing::{error, info};
 
@@ -21,26 +22,26 @@ use crate::db::{
 };
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 
-#[derive(Default, EnumDiscriminants)]
+pub mod events {
-#[strum_discriminants(derive(Reply), vis(pub), name(KeyHolderState))]
+
-enum State {
+    #[derive(Clone, Copy)]
-    #[default]
+    pub struct Bootstrapped;
-    Unbootstrapped,
+
-    Sealed {
+    #[derive(Clone, Copy)]
-        root_key_history_id: i32,
+    pub struct Unsealed;
-    },
+
-    Unsealed {
+    #[derive(Clone, Copy)]
-        root_key_history_id: i32,
+    pub struct VaultResealed;
-        root_key: KeyCell,
-    },
 }
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("Keyholder is already bootstrapped")]
+    #[error("Vault is already bootstrapped")]
     AlreadyBootstrapped,
-    #[error("Keyholder is not bootstrapped")]
+    #[error("Vault is not bootstrapped")]
     NotBootstrapped,
+    #[error("Vault is sealed")]
+    Sealed,
     #[error("Invalid key provided")]
     InvalidKey,
 
@@ -60,18 +61,35 @@ pub enum Error {
     BrokenDatabase,
 }
 
+struct Unsealed {
+    root_key_history_id: i32,
+    root_key: KeyCell,
+}
+
+#[derive(Default, EnumDiscriminants)]
+#[strum_discriminants(derive(Reply), vis(pub), name(VaultState))]
+enum State {
+    #[default]
+    Unbootstrapped,
+    Sealed {
+        root_key_history_id: i32,
+    },
+    Unsealed(Unsealed),
+}
+
 /// Manages vault root key and tracks current state of the vault (bootstrapped/unbootstrapped, sealed/unsealed).
 /// Provides API for encrypting and decrypting data using the vault root key.
 /// Abstraction over database to make sure nonces are never reused and encryption keys are never exposed in plaintext outside of this actor.
 #[derive(Actor)]
-pub struct KeyHolder {
+pub struct Vault {
     db: db::DatabasePool,
     state: State,
+    events: ActorRef<MessageBus>,
 }
 
 #[messages]
-impl KeyHolder {
+impl Vault {
-    pub async fn new(db: db::DatabasePool) -> Result<Self, Error> {
+    pub async fn new(db: db::DatabasePool, events: ActorRef<MessageBus>) -> Result<Self, Error> {
         let state = {
             let mut conn = db.get().await?;
 
@@ -89,10 +107,10 @@ impl KeyHolder {
             }
         };
 
-        Ok(Self { db, state })
+        Ok(Self { db, state, events })
     }
 
-    // Exclusive transaction to avoid race condtions if multiple keyholders write
+    // Exclusive transaction to avoid race condtions if multiple vaults write
     // additional layer of protection against nonce-reuse
     async fn get_new_nonce(pool: &db::DatabasePool, root_key_id: i32) -> Result<Nonce, Error> {
         let mut conn = pool.get().await?;
@@ -129,6 +147,14 @@ impl KeyHolder {
         Ok(nonce)
     }
 
+    fn expect_unsealed(state: &mut State) -> Result<&mut Unsealed, Error> {
+        match state {
+            State::Unsealed(unsealed) => Ok(unsealed),
+            State::Unbootstrapped => Err(Error::NotBootstrapped),
+            State::Sealed { .. } => Err(Error::Sealed),
+        }
+    }
+
     #[message]
     pub async fn bootstrap(&mut self, seal_key_raw: SafeCell<Vec<u8>>) -> Result<(), Error> {
         if !matches!(self.state, State::Unbootstrapped) {
@@ -181,12 +207,13 @@ impl KeyHolder {
             })
             .await?;
 
-        self.state = State::Unsealed {
+        self.state = State::Unsealed(Unsealed {
             root_key,
             root_key_history_id,
-        };
+        });
 
-        info!("Keyholder bootstrapped successfully");
+        info!("Vault bootstrapped successfully");
+        self.events.tell(Publish(events::Bootstrapped)).await;
 
         Ok(())
     }
@@ -233,24 +260,23 @@ impl KeyHolder {
                 Error::InvalidKey
             })?;
 
-        self.state = State::Unsealed {
+        self.state = State::Unsealed(Unsealed {
             root_key_history_id: current_key.id,
             root_key: KeyCell::try_from(root_key).map_err(|err| {
                 error!(?err, "Broken database: invalid encryption key size");
                 Error::BrokenDatabase
             })?,
-        };
+        });
 
-        info!("Keyholder unsealed successfully");
+        info!("Vault unsealed successfully");
+        self.events.tell(Publish(events::Unsealed)).await;
 
         Ok(())
     }
 
     #[message]
     pub async fn decrypt(&mut self, aead_id: i32) -> Result<SafeCell<Vec<u8>>, Error> {
-        let State::Unsealed { root_key, .. } = &mut self.state else {
+        let Unsealed { root_key, .. } = Self::expect_unsealed(&mut self.state)?;
-            return Err(Error::NotBootstrapped);
-        };
 
         let row: models::AeadEncrypted = {
             let mut conn = self.db.get().await?;
@@ -278,14 +304,10 @@ impl KeyHolder {
     // Creates new `aead_encrypted` entry in the database and returns it's ID
     #[message]
     pub async fn create_new(&mut self, mut plaintext: SafeCell<Vec<u8>>) -> Result<i32, Error> {
-        let State::Unsealed {
+        let Unsealed {
             root_key,
             root_key_history_id,
-            ..
+        } = Self::expect_unsealed(&mut self.state)?;
-        } = &mut self.state
-        else {
-            return Err(Error::NotBootstrapped);
-        };
 
         // Order matters here - `get_new_nonce` acquires connection, so we need to call it before next acquire
         // Borrow checker note: &mut borrow a few lines above is disjoint from this field
@@ -315,19 +337,16 @@ impl KeyHolder {
     }
 
     #[message]
-    pub fn get_state(&self) -> KeyHolderState {
+    pub fn get_state(&self) -> VaultState {
         self.state.discriminant()
     }
 
     #[message]
     pub fn sign_integrity(&mut self, mac_input: Vec<u8>) -> Result<(i32, Vec<u8>), Error> {
-        let State::Unsealed {
+        let Unsealed {
             root_key,
             root_key_history_id,
-        } = &mut self.state
+        } = Self::expect_unsealed(&mut self.state)?;
-        else {
-            return Err(Error::NotBootstrapped);
-        };
 
         let mut hmac = root_key
             .0
@@ -349,13 +368,10 @@ impl KeyHolder {
         expected_mac: Vec<u8>,
         key_version: i32,
     ) -> Result<bool, Error> {
-        let State::Unsealed {
+        let Unsealed {
             root_key,
             root_key_history_id,
-        } = &mut self.state
+        } = Self::expect_unsealed(&mut self.state)?;
-        else {
-            return Err(Error::NotBootstrapped);
-        };
 
         if *root_key_history_id != key_version {
             return Ok(false);
@@ -374,17 +390,16 @@ impl KeyHolder {
     }
 
     #[message]
-    pub fn seal(&mut self) -> Result<(), Error> {
+    pub async fn seal(&mut self) -> Result<(), Error> {
-        let State::Unsealed {
+        let Unsealed {
             root_key_history_id,
             ..
-        } = &self.state
+        } = Self::expect_unsealed(&mut self.state)?;
-        else {
+
-            return Err(Error::NotBootstrapped);
-        };
         self.state = State::Sealed {
             root_key_history_id: *root_key_history_id,
         };
+        self.events.tell(Publish(events::VaultResealed)).await;
         Ok(())
     }
 }
@@ -395,13 +410,18 @@ mod tests {
 
     use diesel_async::RunQueryDsl;
 
-    use crate::db::{self};
+    use crate::{
+        actors::GlobalActors,
+        db::{self},
+    };
     use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 
     use super::*;
 
-    async fn bootstrapped_actor(db: &db::DatabasePool) -> KeyHolder {
+    async fn bootstrapped_actor(db: &db::DatabasePool) -> Vault {
-        let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+        let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+            .await
+            .unwrap();
         let seal_key = SafeCell::new(b"test-seal-key".to_vec());
         actor.bootstrap(seal_key).await.unwrap();
         actor
@@ -413,17 +433,17 @@ mod tests {
         let db = db::create_test_pool().await;
         let mut actor = bootstrapped_actor(&db).await;
         let root_key_history_id = match actor.state {
-            State::Unsealed {
+            State::Unsealed(Unsealed {
                 root_key_history_id,
                 ..
-            } => root_key_history_id,
+            }) => root_key_history_id,
             _ => panic!("expected unsealed state"),
         };
 
-        let n1 = KeyHolder::get_new_nonce(&db, root_key_history_id)
+        let n1 = Vault::get_new_nonce(&db, root_key_history_id)
             .await
             .unwrap();
-        let n2 = KeyHolder::get_new_nonce(&db, root_key_history_id)
+        let n2 = Vault::get_new_nonce(&db, root_key_history_id)
             .await
             .unwrap();
         assert!(n2.to_vec() > n1.to_vec(), "nonce must increase");

server/crates/arbiter-server/src/crypto/integrity/v1.rs

@@ -1,5 +1,7 @@
-use crate::actors::keyholder;
+use crate::{
-use arbiter_crypto::hashing::Hashable;
+    actors::vault::{self, GetState},
+    crypto::integrity::hashing::Hashable,
+};
 use hmac::Hmac;
 use sha2::Sha256;
 
@@ -8,8 +10,10 @@ use diesel_async::{AsyncConnection, RunQueryDsl};
 use kameo::{actor::ActorRef, error::SendError};
 use sha2::Digest as _;
 
+pub mod hashing;
+
 use crate::{
-    actors::keyholder::{KeyHolder, SignIntegrity, VerifyIntegrity},
+    actors::vault::{SignIntegrity, Vault, VerifyIntegrity},
     db::{
         self,
         models::{IntegrityEnvelope, NewIntegrityEnvelope},
@@ -22,11 +26,11 @@ pub enum Error {
     #[error("Database error: {0}")]
     Database(#[from] db::DatabaseError),
 
-    #[error("KeyHolder error: {0}")]
+    #[error("Vault error: {0}")]
-    Keyholder(#[from] keyholder::Error),
+    Vault(#[from] vault::Error),
 
-    #[error("KeyHolder mailbox error")]
+    #[error("Vault mailbox error")]
-    KeyholderSend,
+    VaultSend,
 
     #[error("Integrity envelope is missing for entity {entity_kind}")]
     MissingEnvelope { entity_kind: &'static str },
@@ -103,7 +107,7 @@ impl IntoId for &'_ [u8] {
 
 pub async fn sign_entity<E: Integrable>(
     conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
     entity: &E,
     entity_id: impl IntoId,
 ) -> Result<(), Error> {
@@ -113,13 +117,14 @@ pub async fn sign_entity<E: Integrable>(
 
     let mac_input = build_mac_input(E::KIND, &entity_id, E::VERSION, &payload_hash);
 
-    let (key_version, mac) = keyholder
+    let (key_version, mac) =
-        .ask(SignIntegrity { mac_input })
+        vault
-        .await
+            .ask(SignIntegrity { mac_input })
-        .map_err(|err| match err {
+            .await
-            kameo::error::SendError::HandlerError(inner) => Error::Keyholder(inner),
+            .map_err(|err| match err {
-            _ => Error::KeyholderSend,
+                kameo::error::SendError::HandlerError(inner) => Error::Vault(inner),
-        })?;
+                _ => Error::VaultSend,
+            })?;
 
     insert_into(integrity_envelope::table)
         .values(NewIntegrityEnvelope {
@@ -148,7 +153,7 @@ pub async fn sign_entity<E: Integrable>(
 
 pub async fn verify_entity<E: Integrable>(
     conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
     entity: &E,
     entity_id: impl IntoId,
 ) -> Result<AttestationStatus, Error> {
@@ -176,7 +181,7 @@ pub async fn verify_entity<E: Integrable>(
     let payload_hash = payload_hash(&entity);
     let mac_input = build_mac_input(E::KIND, &entity_id, envelope.payload_version, &payload_hash);
 
-    let result = keyholder
+    let result = vault
         .ask(VerifyIntegrity {
             mac_input,
             expected_mac: envelope.mac,
@@ -189,37 +194,60 @@ pub async fn verify_entity<E: Integrable>(
         Ok(false) => Err(Error::MacMismatch {
             entity_kind: E::KIND,
         }),
-        Err(SendError::HandlerError(keyholder::Error::NotBootstrapped)) => {
+        Err(SendError::HandlerError(vault::Error::Sealed)) => {
             Ok(AttestationStatus::Unavailable)
         }
-        Err(_) => Err(Error::KeyholderSend),
+        Err(_) => Err(Error::VaultSend),
     }
 }
 
+pub async fn is_signing_available(vault: &ActorRef<Vault>) -> Result<bool, Error> {
+    let state = vault.ask(GetState).await.map_err(|_| Error::VaultSend)?;
+    Ok(matches!(state, vault::VaultState::Unsealed))
+}
+
 #[cfg(test)]
 mod tests {
     use diesel::{ExpressionMethods as _, QueryDsl};
     use diesel_async::RunQueryDsl;
     use kameo::{actor::ActorRef, prelude::Spawn};
 
+    use sha2::Digest;
+
     use crate::{
-        actors::keyholder::{Bootstrap, KeyHolder},
+        actors::{
+            GlobalActors,
+            vault::{Bootstrap, Vault},
+        },
         db::{self, schema},
     };
     use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 
+    use super::hashing::Hashable;
     use super::{Error, Integrable, sign_entity, verify_entity};
-    #[derive(Clone, arbiter_macros::Hashable)]
+
+    #[derive(Clone)]
     struct DummyEntity {
         payload_version: i32,
         payload: Vec<u8>,
     }
+
+    impl Hashable for DummyEntity {
+        fn hash<H: Digest>(&self, hasher: &mut H) {
+            self.payload_version.hash(hasher);
+            self.payload.hash(hasher);
+        }
+    }
     impl Integrable for DummyEntity {
         const KIND: &'static str = "dummy_entity";
     }
 
-    async fn bootstrapped_keyholder(db: &db::DatabasePool) -> ActorRef<KeyHolder> {
+    async fn bootstrapped_vault(db: &db::DatabasePool) -> ActorRef<Vault> {
-        let actor = KeyHolder::spawn(KeyHolder::new(db.clone()).await.unwrap());
+        let actor = Vault::spawn(
+            Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+                .await
+                .unwrap(),
+        );
         actor
             .ask(Bootstrap {
                 seal_key_raw: SafeCell::new(b"integrity-test-seal-key".to_vec()),
@@ -232,7 +260,7 @@ mod tests {
     #[tokio::test]
     async fn sign_writes_envelope_and_verify_passes() {
         let db = db::create_test_pool().await;
-        let keyholder = bootstrapped_keyholder(&db).await;
+        let vault = bootstrapped_vault(&db).await;
         let mut conn = db.get().await.unwrap();
 
         const ENTITY_ID: &[u8] = b"entity-id-7";
@@ -242,7 +270,7 @@ mod tests {
             payload: b"payload-v1".to_vec(),
         };
 
-        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
             .await
             .unwrap();
 
@@ -255,7 +283,7 @@ mod tests {
             .unwrap();
 
         assert_eq!(count, 1, "envelope row must be created exactly once");
-        verify_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        verify_entity(&mut conn, &vault, &entity, ENTITY_ID)
             .await
             .unwrap();
     }
@@ -263,7 +291,7 @@ mod tests {
     #[tokio::test]
     async fn tampered_mac_fails_verification() {
         let db = db::create_test_pool().await;
-        let keyholder = bootstrapped_keyholder(&db).await;
+        let vault = bootstrapped_vault(&db).await;
         let mut conn = db.get().await.unwrap();
 
         const ENTITY_ID: &[u8] = b"entity-id-11";
@@ -273,7 +301,7 @@ mod tests {
             payload: b"payload-v1".to_vec(),
         };
 
-        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
             .await
             .unwrap();
 
@@ -285,7 +313,7 @@ mod tests {
             .await
             .unwrap();
 
-        let err = verify_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        let err = verify_entity(&mut conn, &vault, &entity, ENTITY_ID)
             .await
             .unwrap_err();
         assert!(matches!(err, Error::MacMismatch { .. }));
@@ -294,7 +322,7 @@ mod tests {
     #[tokio::test]
     async fn changed_payload_fails_verification() {
         let db = db::create_test_pool().await;
-        let keyholder = bootstrapped_keyholder(&db).await;
+        let vault = bootstrapped_vault(&db).await;
         let mut conn = db.get().await.unwrap();
 
         const ENTITY_ID: &[u8] = b"entity-id-21";
@@ -304,7 +332,7 @@ mod tests {
             payload: b"payload-v1".to_vec(),
         };
 
-        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
             .await
             .unwrap();
 
@@ -313,7 +341,7 @@ mod tests {
             ..entity
         };
 
-        let err = verify_entity(&mut conn, &keyholder, &tampered, ENTITY_ID)
+        let err = verify_entity(&mut conn, &vault, &tampered, ENTITY_ID)
             .await
             .unwrap_err();
         assert!(matches!(err, Error::MacMismatch { .. }));

server/crates/arbiter-server/src/crypto/integrity/v1/hashing.rs

@@ -1,25 +1,21 @@
-pub use hmac::digest::Digest;
+use hmac::digest::Digest;
 use std::collections::HashSet;
 
 /// Deterministically hash a value by feeding its fields into the hasher in a consistent order.
-#[diagnostic::on_unimplemented(
-    note = "for local types consider adding `#[derive(arbiter_macros::Hashable)]` to your `{Self}` type",
-    note = "for types from other crates check whether the crate offers a `Hashable` implementation"
-)]
 pub trait Hashable {
     fn hash<H: Digest>(&self, hasher: &mut H);
 }
 
 macro_rules! impl_numeric {
-    ($($t:ty),*) => {
+($($t:ty),*) => {
-        $(
+    $(
-            impl Hashable for $t {
+        impl Hashable for $t {
-                fn hash<H: Digest>(&self, hasher: &mut H) {
+            fn hash<H: Digest>(&self, hasher: &mut H) {
-                    hasher.update(&self.to_be_bytes());
+                hasher.update(&self.to_be_bytes());
-                }
             }
-        )*
+        }
-    };
+    )*
+};
 }
 
 impl_numeric!(u8, u16, u32, u64, i8, i16, i32, i64);

server/crates/arbiter-server/src/evm/mod.rs

@@ -11,7 +11,7 @@ use diesel_async::{AsyncConnection, RunQueryDsl};
 use kameo::actor::ActorRef;
 
 use crate::{
-    actors::keyholder::KeyHolder,
+    actors::vault::Vault,
     crypto::integrity,
     db::{
         self, DatabaseError,
@@ -138,7 +138,7 @@ async fn check_shared_constraints(
 // Supporting only EIP-1559 transactions for now, but we can easily extend this to support legacy transactions if needed
 pub struct Engine {
     db: db::DatabasePool,
-    keyholder: ActorRef<KeyHolder>,
+    vault: ActorRef<Vault>,
 }
 
 impl Engine {
@@ -158,7 +158,7 @@ impl Engine {
             .map_err(DatabaseError::from)?
             .ok_or(PolicyError::NoMatchingGrant)?;
 
-        integrity::verify_entity(&mut conn, &self.keyholder, &grant.settings, grant.id).await?;
+        integrity::verify_entity(&mut conn, &self.vault, &grant.settings, grant.id).await?;
 
         let mut violations = check_shared_constraints(
             &context,
@@ -207,8 +207,8 @@ impl Engine {
 }
 
 impl Engine {
-    pub fn new(db: db::DatabasePool, keyholder: ActorRef<KeyHolder>) -> Self {
+    pub fn new(db: db::DatabasePool, vault: ActorRef<Vault>) -> Self {
-        Self { db, keyholder }
+        Self { db, vault }
     }
 
     pub async fn create_grant<P: Policy>(
@@ -219,7 +219,7 @@ impl Engine {
         P::Settings: Clone,
     {
         let mut conn = self.db.get().await?;
-        let keyholder = self.keyholder.clone();
+        let vault = self.vault.clone();
 
         let id = conn
             .transaction(|conn| {
@@ -258,7 +258,7 @@ impl Engine {
 
                     P::create_grant(&basic_grant, &full_grant.specific, conn).await?;
 
-                    integrity::sign_entity(conn, &keyholder, &full_grant, basic_grant.id)
+                    integrity::sign_entity(conn, &vault, &full_grant, basic_grant.id)
                         .await
                         .map_err(|_| diesel::result::Error::RollbackTransaction)?;
 
@@ -283,7 +283,7 @@ impl Engine {
 
         // Verify integrity of all grants before returning any results
         for grant in &all_grants {
-            integrity::verify_entity(conn, &self.keyholder, &grant.settings, grant.id).await?;
+            integrity::verify_entity(conn, &self.vault, &grant.settings, grant.id).await?;
         }
 
         Ok(all_grants.into_iter().map(|g| Grant {

server/crates/arbiter-server/src/evm/policies.rs

@@ -127,19 +127,19 @@ pub enum SpecificMeaning {
     TokenTransfer(token_transfers::Meaning),
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, arbiter_macros::Hashable)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct TransactionRateLimit {
     pub count: u32,
     pub window: Duration,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, arbiter_macros::Hashable)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct VolumeRateLimit {
     pub max_volume: U256,
     pub window: Duration,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, arbiter_macros::Hashable)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct SharedGrantSettings {
     pub wallet_access_id: i32,
     pub chain: ChainId,
@@ -200,7 +200,7 @@ pub enum SpecificGrant {
     TokenTransfer(token_transfers::Settings),
 }
 
-#[derive(Debug, arbiter_macros::Hashable)]
+#[derive(Debug)]
 pub struct CombinedSettings<PolicyGrant> {
     pub shared: SharedGrantSettings,
     pub specific: PolicyGrant,
@@ -219,3 +219,38 @@ impl<P: Integrable> Integrable for CombinedSettings<P> {
     const KIND: &'static str = P::KIND;
     const VERSION: i32 = P::VERSION;
 }
+
+use crate::crypto::integrity::hashing::Hashable;
+
+impl Hashable for TransactionRateLimit {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.count.hash(hasher);
+        self.window.hash(hasher);
+    }
+}
+
+impl Hashable for VolumeRateLimit {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.max_volume.hash(hasher);
+        self.window.hash(hasher);
+    }
+}
+
+impl Hashable for SharedGrantSettings {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.wallet_access_id.hash(hasher);
+        self.chain.hash(hasher);
+        self.valid_from.hash(hasher);
+        self.valid_until.hash(hasher);
+        self.max_gas_fee_per_gas.hash(hasher);
+        self.max_priority_fee_per_gas.hash(hasher);
+        self.rate_limit.hash(hasher);
+    }
+}
+
+impl<P: Hashable> Hashable for CombinedSettings<P> {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.shared.hash(hasher);
+        self.specific.hash(hasher);
+    }
+}

server/crates/arbiter-server/src/evm/policies/ether_transfer/mod.rs

@@ -52,7 +52,7 @@ impl From<Meaning> for SpecificMeaning {
 }
 
 // A grant for ether transfers, which can be scoped to specific target addresses and volume limits
-#[derive(Debug, Clone, arbiter_macros::Hashable)]
+#[derive(Debug, Clone)]
 pub struct Settings {
     pub target: Vec<Address>,
     pub limit: VolumeRateLimit,
@@ -61,6 +61,15 @@ impl Integrable for Settings {
     const KIND: &'static str = "EtherTransfer";
 }
 
+use crate::crypto::integrity::hashing::Hashable;
+
+impl Hashable for Settings {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.target.hash(hasher);
+        self.limit.hash(hasher);
+    }
+}
+
 impl From<Settings> for SpecificGrant {
     fn from(val: Settings) -> SpecificGrant {
         SpecificGrant::EtherTransfer(val)

server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs

@@ -340,7 +340,7 @@ proptest::proptest! {
     ) {
         use rand::{SeedableRng, seq::SliceRandom};
         use sha2::Digest;
-        use arbiter_crypto::hashing::Hashable;
+        use crate::crypto::integrity::hashing::Hashable;
 
         let addrs: Vec<Address> = raw_addrs.iter().map(|b| Address::from(*b)).collect();
         let mut shuffled = addrs.clone();

server/crates/arbiter-server/src/evm/policies/token_transfers/mod.rs

@@ -62,7 +62,7 @@ impl From<Meaning> for SpecificMeaning {
 }
 
 // A grant for token transfers, which can be scoped to specific target addresses and volume limits
-#[derive(Debug, Clone, arbiter_macros::Hashable)]
+#[derive(Debug, Clone)]
 pub struct Settings {
     pub token_contract: Address,
     pub target: Option<Address>,
@@ -72,6 +72,16 @@ impl Integrable for Settings {
     const KIND: &'static str = "TokenTransfer";
 }
 
+use crate::crypto::integrity::hashing::Hashable;
+
+impl Hashable for Settings {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.token_contract.hash(hasher);
+        self.target.hash(hasher);
+        self.volume_limits.hash(hasher);
+    }
+}
+
 impl From<Settings> for SpecificGrant {
     fn from(val: Settings) -> SpecificGrant {
         SpecificGrant::TokenTransfer(val)

server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs

@@ -419,7 +419,7 @@ proptest::proptest! {
     ) {
         use rand::{SeedableRng, seq::SliceRandom};
         use sha2::Digest;
-        use arbiter_crypto::hashing::Hashable;
+        use crate::crypto::integrity::hashing::Hashable;
 
         let limits: Vec<VolumeRateLimit> = raw_limits
             .iter()

server/crates/arbiter-server/src/grpc/client.rs

@@ -10,8 +10,8 @@ use tonic::Status;
 use tracing::{info, warn};
 
 use crate::{
-    actors::client::{ClientConnection, session::ClientSession},
     grpc::request_tracker::RequestTracker,
+    peers::client::{ClientConnection, session::ClientSession},
 };
 
 mod auth;

server/crates/arbiter-server/src/grpc/client/auth.rs

@@ -22,8 +22,8 @@ use tonic::Status;
 use tracing::warn;
 
 use crate::{
-    actors::client::{self, ClientConnection, auth},
     grpc::request_tracker::RequestTracker,
+    peers::client::{self, ClientConnection, auth},
 };
 
 pub struct AuthTransportAdapter<'a> {

server/crates/arbiter-server/src/grpc/client/evm.rs

@@ -16,11 +16,11 @@ use tonic::Status;
 use tracing::warn;
 
 use crate::{
-    actors::client::session::{ClientSession, HandleSignTransaction, SignTransactionRpcError},
     grpc::{
         Convert, TryConvert,
         common::inbound::{RawEvmAddress, RawEvmTransaction},
     },
+    peers::client::session::{ClientSession, HandleSignTransaction, SignTransactionRpcError},
 };
 
 fn wrap_response(payload: EvmResponsePayload) -> ClientResponsePayload {

server/crates/arbiter-server/src/grpc/client/vault.rs

@@ -12,9 +12,9 @@ use kameo::{actor::ActorRef, error::SendError};
 use tonic::Status;
 use tracing::warn;
 
-use crate::actors::{
+use crate::{
-    client::session::{ClientSession, Error, HandleQueryVaultState},
+    actors::vault::VaultState,
-    keyholder::KeyHolderState,
+    peers::client::session::{ClientSession, Error, HandleQueryVaultState},
 };
 
 pub(super) async fn dispatch(
@@ -30,9 +30,9 @@ pub(super) async fn dispatch(
     match payload {
         VaultRequestPayload::QueryState(_) => {
             let state = match actor.ask(HandleQueryVaultState {}).await {
-                Ok(KeyHolderState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
+                Ok(VaultState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
-                Ok(KeyHolderState::Sealed) => ProtoVaultState::Sealed,
+                Ok(VaultState::Sealed) => ProtoVaultState::Sealed,
-                Ok(KeyHolderState::Unsealed) => ProtoVaultState::Unsealed,
+                Ok(VaultState::Unsealed) => ProtoVaultState::Unsealed,
                 Err(SendError::HandlerError(Error::Internal)) => ProtoVaultState::Error,
                 Err(err) => {
                     warn!(error = ?err, "Failed to query vault state");

server/crates/arbiter-server/src/grpc/mod.rs

@@ -10,8 +10,7 @@ use tonic::{Request, Response, Status, async_trait};
 use tracing::info;
 
 use crate::{
-    actors::{client::ClientConnection, user_agent::UserAgentConnection},
+    peers::{client::ClientConnection, user_agent::UserAgentConnection},
-    grpc::user_agent::start,
 };
 
 mod request_tracker;
@@ -63,7 +62,7 @@ impl arbiter_proto::proto::arbiter_service_server::ArbiterService for super::Ser
 
         let (bi, rx) = GrpcBi::from_bi_stream(req_stream);
 
-        tokio::spawn(start(
+        tokio::spawn(user_agent::start(
             UserAgentConnection {
                 db: self.context.db.clone(),
                 actors: self.context.actors.clone(),

server/crates/arbiter-server/src/grpc/user_agent.rs

@@ -1,4 +1,4 @@
-use tokio::sync::mpsc;
+use tokio::sync::{mpsc, oneshot};
 
 use arbiter_proto::{
     proto::user_agent::{
@@ -14,8 +14,12 @@ use tonic::Status;
 use tracing::{error, info, warn};
 
 use crate::{
-    actors::user_agent::{OutOfBand, UserAgentConnection, UserAgentSession},
+    crypto::integrity,
     grpc::request_tracker::RequestTracker,
+    peers::user_agent::{
+        Credentials, OutOfBand, UserAgentConnection, UserAgentSession,
+        vault_gate::VaultGate,
+    },
 };
 
 mod auth;
@@ -24,6 +28,7 @@ mod inbound;
 mod outbound;
 mod sdk_client;
 mod vault;
+mod vault_gate;
 
 pub struct OutOfBandAdapter(mpsc::Sender<OutOfBand>);
 
@@ -124,21 +129,115 @@ pub async fn start(
 ) {
     let mut request_tracker = RequestTracker::default();
 
-    let pubkey = match auth::start(&mut conn, &mut bi, &mut request_tracker).await {
+    let auth_creds = match auth::start(&mut conn, &mut bi, &mut request_tracker).await {
-        Ok(pubkey) => pubkey,
+        Ok(creds) => creds,
         Err(e) => {
             warn!(error = ?e, "Authentication failed");
             return;
         }
     };
 
+    info!(pubkey = ?auth_creds.creds.pubkey, "User authenticated successfully");
+
+    let creds = if integrity::is_signing_available(&conn.actors.vault)
+        .await
+        .unwrap_or(false)
+    {
+        // Vault is unsealed; integrity was verified during auth — promote directly.
+        auth_creds.creds
+    } else {
+        // Vault is sealed/unbootstrapped; run the VaultGate phase.
+        let (promotion_tx, promotion_rx) = oneshot::channel();
+        let gate = VaultGate::spawn(VaultGate::new(
+            auth_creds,
+            conn.actors.clone(),
+            conn.db.clone(),
+            promotion_tx,
+        ));
+
+        let result = vault_gate_loop(&mut bi, &gate, &mut request_tracker, promotion_rx).await;
+        gate.kill();
+
+        match result {
+            Some(creds) => creds,
+            None => return,
+        }
+    };
+
     let (oob_sender, oob_receiver) = mpsc::channel(16);
     let oob_adapter = OutOfBandAdapter(oob_sender);
 
-    let actor = UserAgentSession::spawn(UserAgentSession::new(conn, Box::new(oob_adapter)));
+    let actor = UserAgentSession::spawn(UserAgentSession::new(conn, creds, Box::new(oob_adapter)));
     let actor_for_cleanup = actor.clone();
 
-    info!(?pubkey, "User authenticated successfully");
     dispatch_loop(bi, actor, oob_receiver, request_tracker).await;
     actor_for_cleanup.kill();
 }
+
+async fn vault_gate_loop(
+    bi: &mut GrpcBi<UserAgentRequest, UserAgentResponse>,
+    gate: &ActorRef<VaultGate>,
+    request_tracker: &mut RequestTracker,
+    mut promotion_rx: oneshot::Receiver<Result<Credentials, crate::peers::user_agent::vault_gate::Error>>,
+) -> Option<Credentials> {
+    loop {
+        tokio::select! {
+            result = &mut promotion_rx => {
+                return match result {
+                    Ok(Ok(creds)) => Some(creds),
+                    Ok(Err(e)) => {
+                        warn!(error = ?e, "VaultGate promotion failed");
+                        None
+                    }
+                    Err(_) => {
+                        warn!("VaultGate promotion channel closed unexpectedly");
+                        None
+                    }
+                };
+            }
+
+            message = bi.recv() => {
+                let Some(message) = message else { return None; };
+
+                let conn = match message {
+                    Ok(conn) => conn,
+                    Err(err) => {
+                        warn!(error = ?err, "Failed to receive request during vault gate phase");
+                        return None;
+                    }
+                };
+
+                let request_id = match request_tracker.request(conn.id) {
+                    Ok(id) => id,
+                    Err(err) => {
+                        let _ = bi.send(Err(err)).await;
+                        return None;
+                    }
+                };
+
+                let Some(payload) = conn.payload else {
+                    let _ = bi.send(Err(Status::invalid_argument("Missing request payload"))).await;
+                    return None;
+                };
+
+                let response = match payload {
+                    UserAgentRequestPayload::Vault(req) => vault_gate::dispatch(gate, req).await,
+                    _ => Err(Status::permission_denied("Only vault operations are permitted before unsealing")),
+                };
+
+                match response {
+                    Ok(Some(payload)) => {
+                        if bi.send(Ok(UserAgentResponse { id: Some(request_id), payload: Some(payload) })).await.is_err() {
+                            return None;
+                        }
+                    }
+                    Ok(None) => {}
+                    Err(status) => {
+                        let _ = bi.send(Err(status)).await;
+                        return None;
+                    }
+                }
+            }
+        }
+    }
+}

server/crates/arbiter-server/src/grpc/user_agent/auth.rs

@@ -18,13 +18,13 @@ use tonic::Status;
 use tracing::warn;
 
 use crate::{
-    actors::user_agent::{UserAgentConnection, auth},
     grpc::request_tracker::RequestTracker,
+    peers::user_agent::{AuthCredentials, UserAgentConnection, auth},
 };
 
 pub struct AuthTransportAdapter<'a> {
-    bi: &'a mut GrpcBi<UserAgentRequest, UserAgentResponse>,
+    pub(super) bi: &'a mut GrpcBi<UserAgentRequest, UserAgentResponse>,
-    request_tracker: &'a mut RequestTracker,
+    pub(super) request_tracker: &'a mut RequestTracker,
 }
 
 impl<'a> AuthTransportAdapter<'a> {
@@ -38,19 +38,35 @@ impl<'a> AuthTransportAdapter<'a> {
         }
     }
 
-    async fn send_user_agent_response(
+    pub(super) fn bi_mut(&mut self) -> &mut GrpcBi<UserAgentRequest, UserAgentResponse> {
+        self.bi
+    }
+
+    pub(super) fn tracker_mut(&mut self) -> &mut RequestTracker {
+        self.request_tracker
+    }
+
+    pub(super) async fn send_response_payload(
         &mut self,
-        payload: AuthResponsePayload,
+        payload: UserAgentResponsePayload,
     ) -> Result<(), TransportError> {
         self.bi
             .send(Ok(UserAgentResponse {
                 id: Some(self.request_tracker.current_request_id()),
-                payload: Some(UserAgentResponsePayload::Auth(proto_auth::Response {
+                payload: Some(payload),
-                    payload: Some(payload),
-                })),
             }))
             .await
     }
+
+    async fn send_user_agent_response(
+        &mut self,
+        payload: AuthResponsePayload,
+    ) -> Result<(), TransportError> {
+        self.send_response_payload(UserAgentResponsePayload::Auth(proto_auth::Response {
+            payload: Some(payload),
+        }))
+        .await
+    }
 }
 
 #[async_trait]
@@ -140,7 +156,6 @@ impl Receiver<auth::Inbound> for AuthTransportAdapter<'_> {
             AuthRequestPayload::ChallengeRequest(ProtoAuthChallengeRequest {
                 pubkey,
                 bootstrap_token,
-                key_type: _,
             }) => {
                 let Ok(pubkey) = authn::PublicKey::try_from(pubkey.as_slice()) else {
                     warn!(
@@ -168,7 +183,7 @@ pub async fn start(
     conn: &mut UserAgentConnection,
     bi: &mut GrpcBi<UserAgentRequest, UserAgentResponse>,
     request_tracker: &mut RequestTracker,
-) -> Result<authn::PublicKey, auth::Error> {
+) -> Result<AuthCredentials, auth::Error> {
-    let transport = AuthTransportAdapter::new(bi, request_tracker);
+    let mut transport = AuthTransportAdapter::new(bi, request_tracker);
-    auth::authenticate(conn, transport).await
+    auth::authenticate(conn, &mut transport).await
 }

server/crates/arbiter-server/src/grpc/user_agent/evm.rs

@@ -23,18 +23,18 @@ use tonic::Status;
 use tracing::warn;
 
 use crate::{
-    actors::user_agent::{
+    grpc::{
+        Convert, TryConvert,
+        common::inbound::{RawEvmAddress, RawEvmTransaction},
+    },
+    peers::user_agent::{
         UserAgentSession,
-        session::connection::{
+        session::handlers::{
             GrantMutationError, HandleEvmWalletCreate, HandleEvmWalletList, HandleGrantCreate,
             HandleGrantDelete, HandleGrantList, HandleSignTransaction,
             SignTransactionError as SessionSignTransactionError,
         },
     },
-    grpc::{
-        Convert, TryConvert,
-        common::inbound::{RawEvmAddress, RawEvmTransaction},
-    },
 };
 
 fn wrap_evm_response(payload: EvmResponsePayload) -> UserAgentResponsePayload {

server/crates/arbiter-server/src/grpc/user_agent/sdk_client.rs

@@ -21,15 +21,15 @@ use tonic::Status;
 use tracing::{info, warn};
 
 use crate::{
-    actors::user_agent::{
+    db::models::NewEvmWalletAccess,
+    grpc::Convert,
+    peers::user_agent::{
         OutOfBand, UserAgentSession,
-        session::connection::{
+        session::handlers::{
             HandleGrantEvmWalletAccess, HandleListWalletAccess, HandleNewClientApprove,
             HandleRevokeEvmWalletAccess, HandleSdkClientList,
         },
     },
-    db::models::NewEvmWalletAccess,
-    grpc::Convert,
 };
 
 fn wrap_sdk_client_response(payload: SdkClientResponsePayload) -> UserAgentResponsePayload {

server/crates/arbiter-server/src/grpc/user_agent/vault.rs

@@ -1,34 +1,15 @@
 use arbiter_proto::proto::shared::VaultState as ProtoVaultState;
 use arbiter_proto::proto::user_agent::{
     user_agent_response::Payload as UserAgentResponsePayload,
-    vault::{
+    vault::{self as proto_vault, request::Payload as VaultRequestPayload, response::Payload as VaultResponsePayload},
-        self as proto_vault,
-        bootstrap::{
-            self as proto_bootstrap, BootstrapEncryptedKey as ProtoBootstrapEncryptedKey,
-            BootstrapResult as ProtoBootstrapResult,
-        },
-        request::Payload as VaultRequestPayload,
-        response::Payload as VaultResponsePayload,
-        unseal::{
-            self as proto_unseal, UnsealEncryptedKey as ProtoUnsealEncryptedKey,
-            UnsealResult as ProtoUnsealResult, UnsealStart,
-            request::Payload as UnsealRequestPayload, response::Payload as UnsealResponsePayload,
-        },
-    },
 };
-use kameo::{actor::ActorRef, error::SendError};
+use kameo::actor::ActorRef;
 use tonic::Status;
 use tracing::warn;
 
-use crate::actors::{
+use crate::{
-    keyholder::KeyHolderState,
+    actors::vault::VaultState,
-    user_agent::{
+    peers::user_agent::{UserAgentSession, session::handlers::HandleQueryVaultState},
-        UserAgentSession,
-        session::connection::{
-            BootstrapError, HandleBootstrapEncryptedKey, HandleQueryVaultState,
-            HandleUnsealEncryptedKey, HandleUnsealRequest, UnsealError,
-        },
-    },
 };
 
 fn wrap_vault_response(payload: VaultResponsePayload) -> UserAgentResponsePayload {
@@ -37,18 +18,6 @@ fn wrap_vault_response(payload: VaultResponsePayload) -> UserAgentResponsePayloa
     })
 }
 
-fn wrap_unseal_response(payload: UnsealResponsePayload) -> UserAgentResponsePayload {
-    wrap_vault_response(VaultResponsePayload::Unseal(proto_unseal::Response {
-        payload: Some(payload),
-    }))
-}
-
-fn wrap_bootstrap_response(result: ProtoBootstrapResult) -> UserAgentResponsePayload {
-    wrap_vault_response(VaultResponsePayload::Bootstrap(proto_bootstrap::Response {
-        result: result.into(),
-    }))
-}
-
 pub(super) async fn dispatch(
     actor: &ActorRef<UserAgentSession>,
     req: proto_vault::Request,
@@ -59,116 +28,21 @@ pub(super) async fn dispatch(
 
     match payload {
         VaultRequestPayload::QueryState(_) => handle_query_vault_state(actor).await,
-        VaultRequestPayload::Unseal(req) => dispatch_unseal_request(actor, req).await,
+        VaultRequestPayload::Unseal(_) | VaultRequestPayload::Bootstrap(_) => {
-        VaultRequestPayload::Bootstrap(req) => handle_bootstrap_request(actor, req).await,
+            Err(Status::permission_denied(
+                "Vault is already unsealed; unseal/bootstrap not permitted in session",
+            ))
+        }
     }
 }
 
-async fn dispatch_unseal_request(
-    actor: &ActorRef<UserAgentSession>,
-    req: proto_unseal::Request,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let Some(payload) = req.payload else {
-        return Err(Status::invalid_argument("Missing unseal request payload"));
-    };
-
-    match payload {
-        UnsealRequestPayload::Start(req) => handle_unseal_start(actor, req).await,
-        UnsealRequestPayload::EncryptedKey(req) => handle_unseal_encrypted_key(actor, req).await,
-    }
-}
-
-async fn handle_unseal_start(
-    actor: &ActorRef<UserAgentSession>,
-    req: UnsealStart,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let client_pubkey = <[u8; 32]>::try_from(req.client_pubkey)
-        .map(x25519_dalek::PublicKey::from)
-        .map_err(|_| Status::invalid_argument("Invalid X25519 public key"))?;
-
-    let response = actor
-        .ask(HandleUnsealRequest { client_pubkey })
-        .await
-        .map_err(|err| {
-            warn!(error = ?err, "Failed to handle unseal start request");
-            Status::internal("Failed to start unseal flow")
-        })?;
-
-    Ok(Some(wrap_unseal_response(UnsealResponsePayload::Start(
-        proto_unseal::UnsealStartResponse {
-            server_pubkey: response.server_pubkey.as_bytes().to_vec(),
-        },
-    ))))
-}
-
-async fn handle_unseal_encrypted_key(
-    actor: &ActorRef<UserAgentSession>,
-    req: ProtoUnsealEncryptedKey,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let result = match actor
-        .ask(HandleUnsealEncryptedKey {
-            nonce: req.nonce,
-            ciphertext: req.ciphertext,
-            associated_data: req.associated_data,
-        })
-        .await
-    {
-        Ok(()) => ProtoUnsealResult::Success,
-        Err(SendError::HandlerError(UnsealError::InvalidKey)) => ProtoUnsealResult::InvalidKey,
-        Err(err) => {
-            warn!(error = ?err, "Failed to handle unseal request");
-            return Err(Status::internal("Failed to unseal vault"));
-        }
-    };
-    Ok(Some(wrap_unseal_response(UnsealResponsePayload::Result(
-        result.into(),
-    ))))
-}
-
-async fn handle_bootstrap_request(
-    actor: &ActorRef<UserAgentSession>,
-    req: proto_bootstrap::Request,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let encrypted_key = req
-        .encrypted_key
-        .ok_or_else(|| Status::invalid_argument("Missing bootstrap encrypted key"))?;
-    handle_bootstrap_encrypted_key(actor, encrypted_key).await
-}
-
-async fn handle_bootstrap_encrypted_key(
-    actor: &ActorRef<UserAgentSession>,
-    req: ProtoBootstrapEncryptedKey,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let result = match actor
-        .ask(HandleBootstrapEncryptedKey {
-            nonce: req.nonce,
-            ciphertext: req.ciphertext,
-            associated_data: req.associated_data,
-        })
-        .await
-    {
-        Ok(()) => ProtoBootstrapResult::Success,
-        Err(SendError::HandlerError(BootstrapError::InvalidKey)) => {
-            ProtoBootstrapResult::InvalidKey
-        }
-        Err(SendError::HandlerError(BootstrapError::AlreadyBootstrapped)) => {
-            ProtoBootstrapResult::AlreadyBootstrapped
-        }
-        Err(err) => {
-            warn!(error = ?err, "Failed to handle bootstrap request");
-            return Err(Status::internal("Failed to bootstrap vault"));
-        }
-    };
-    Ok(Some(wrap_bootstrap_response(result)))
-}
-
 async fn handle_query_vault_state(
     actor: &ActorRef<UserAgentSession>,
 ) -> Result<Option<UserAgentResponsePayload>, Status> {
     let state = match actor.ask(HandleQueryVaultState {}).await {
-        Ok(KeyHolderState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
+        Ok(VaultState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
-        Ok(KeyHolderState::Sealed) => ProtoVaultState::Sealed,
+        Ok(VaultState::Sealed) => ProtoVaultState::Sealed,
-        Ok(KeyHolderState::Unsealed) => ProtoVaultState::Unsealed,
+        Ok(VaultState::Unsealed) => ProtoVaultState::Unsealed,
         Err(err) => {
             warn!(error = ?err, "Failed to query vault state");
             ProtoVaultState::Error

server/crates/arbiter-server/src/grpc/user_agent/vault_gate.rs

@@ -0,0 +1,238 @@
+use arbiter_proto::{
+    proto::user_agent::{
+        user_agent_request::Payload as UserAgentRequestPayload,
+        user_agent_response::Payload as UserAgentResponsePayload,
+        vault::{
+            self as proto_vault,
+            bootstrap::{self as proto_bootstrap, BootstrapResult as ProtoBootstrapResult},
+            request::Payload as VaultRequestPayload,
+            response::Payload as VaultResponsePayload,
+            unseal::{
+                self as proto_unseal, UnsealResult as ProtoUnsealResult,
+                request::Payload as UnsealRequestPayload,
+                response::Payload as UnsealResponsePayload,
+            },
+        },
+    },
+    transport::{Bi, Error as TransportError, Receiver, Sender},
+};
+use async_trait::async_trait;
+use tonic::Status;
+use tracing::warn;
+
+use super::auth::AuthTransportAdapter;
+use crate::peers::user_agent::vault_gate::{
+    self as vault_gate, HandleBootstrapEncryptedKey, HandleHandshake, HandleUnsealEncryptedKey,
+};
+
+fn wrap_vault_response(payload: VaultResponsePayload) -> UserAgentResponsePayload {
+    UserAgentResponsePayload::Vault(proto_vault::Response {
+        payload: Some(payload),
+    })
+}
+
+fn wrap_unseal_response(payload: UnsealResponsePayload) -> UserAgentResponsePayload {
+    wrap_vault_response(VaultResponsePayload::Unseal(proto_unseal::Response {
+        payload: Some(payload),
+    }))
+}
+
+fn wrap_bootstrap_response(result: ProtoBootstrapResult) -> UserAgentResponsePayload {
+    wrap_vault_response(VaultResponsePayload::Bootstrap(proto_bootstrap::Response {
+        result: result.into(),
+    }))
+}
+
+impl AuthTransportAdapter<'_> {
+    async fn send_query_state(&mut self) -> Result<(), TransportError> {
+        use arbiter_proto::proto::shared::VaultState as ProtoVaultState;
+        self.send_response_payload(wrap_vault_response(VaultResponsePayload::State(
+            ProtoVaultState::Sealed.into(),
+        )))
+        .await
+    }
+}
+
+#[async_trait]
+impl Receiver<vault_gate::Inbound> for AuthTransportAdapter<'_> {
+    async fn recv(&mut self) -> Option<vault_gate::Inbound> {
+        loop {
+            let request = match self.bi_mut().recv().await? {
+                Ok(request) => request,
+                Err(error) => {
+                    warn!(?error, "Failed to receive user agent request during vault gate");
+                    return None;
+                }
+            };
+
+            if let Err(err) = self.tracker_mut().request(request.id) {
+                let _ = self.bi_mut().send(Err(err)).await;
+                return None;
+            }
+
+            let Some(payload) = request.payload else {
+                let _ = self
+                    .bi_mut()
+                    .send(Err(Status::invalid_argument("Missing request payload")))
+                    .await;
+                return None;
+            };
+
+            let vault_req = match payload {
+                UserAgentRequestPayload::Vault(req) => req,
+                _ => {
+                    let _ = self
+                        .bi_mut()
+                        .send(Err(Status::permission_denied(
+                            "Only vault operations are permitted before unsealing",
+                        )))
+                        .await;
+                    return None;
+                }
+            };
+
+            let Some(vault_payload) = vault_req.payload else {
+                let _ = self
+                    .bi_mut()
+                    .send(Err(Status::invalid_argument("Missing vault request payload")))
+                    .await;
+                return None;
+            };
+
+            match vault_payload {
+                VaultRequestPayload::QueryState(_) => {
+                    if self.send_query_state().await.is_err() {
+                        return None;
+                    }
+                    continue;
+                }
+                VaultRequestPayload::Unseal(req) => {
+                    let Some(unseal_payload) = req.payload else {
+                        let _ = self
+                            .bi_mut()
+                            .send(Err(Status::invalid_argument("Missing unseal request payload")))
+                            .await;
+                        return None;
+                    };
+                    match unseal_payload {
+                        UnsealRequestPayload::Start(start) => {
+                            let Ok(bytes) = <[u8; 32]>::try_from(start.client_pubkey) else {
+                                let _ = self
+                                    .bi_mut()
+                                    .send(Err(Status::invalid_argument(
+                                        "Invalid X25519 public key",
+                                    )))
+                                    .await;
+                                return None;
+                            };
+                            return Some(vault_gate::Inbound::HandleHandshake(HandleHandshake {
+                                client_pubkey: x25519_dalek::PublicKey::from(bytes),
+                            }));
+                        }
+                        UnsealRequestPayload::EncryptedKey(key) => {
+                            return Some(vault_gate::Inbound::HandleUnsealEncryptedKey(
+                                HandleUnsealEncryptedKey {
+                                    nonce: key.nonce,
+                                    ciphertext: key.ciphertext,
+                                    associated_data: key.associated_data,
+                                },
+                            ));
+                        }
+                    }
+                }
+                VaultRequestPayload::Bootstrap(req) => {
+                    let Some(encrypted_key) = req.encrypted_key else {
+                        let _ = self
+                            .bi_mut()
+                            .send(Err(Status::invalid_argument(
+                                "Missing bootstrap encrypted key",
+                            )))
+                            .await;
+                        return None;
+                    };
+                    return Some(vault_gate::Inbound::HandleBootstrapEncryptedKey(
+                        HandleBootstrapEncryptedKey {
+                            nonce: encrypted_key.nonce,
+                            ciphertext: encrypted_key.ciphertext,
+                            associated_data: encrypted_key.associated_data,
+                        },
+                    ));
+                }
+            }
+        }
+    }
+}
+
+#[async_trait]
+impl Sender<Result<vault_gate::Outbound, vault_gate::Error>> for AuthTransportAdapter<'_> {
+    async fn send(
+        &mut self,
+        item: Result<vault_gate::Outbound, vault_gate::Error>,
+    ) -> Result<(), TransportError> {
+        let outbound = match item {
+            Ok(outbound) => outbound,
+            Err(err) => {
+                warn!(?err, "vault gate produced transport-level error");
+                return self
+                    .bi_mut()
+                    .send(Err(Status::internal(err.to_string())))
+                    .await;
+            }
+        };
+
+        let payload = match outbound {
+            vault_gate::Outbound::HandleHandshake(Ok(response)) => {
+                wrap_unseal_response(UnsealResponsePayload::Start(
+                    proto_unseal::UnsealStartResponse {
+                        server_pubkey: response.server_pubkey.as_bytes().to_vec(),
+                    },
+                ))
+            }
+            vault_gate::Outbound::HandleHandshake(Err(err)) => {
+                warn!(?err, "handshake failed");
+                return self
+                    .bi_mut()
+                    .send(Err(Status::internal("Failed to start unseal flow")))
+                    .await;
+            }
+            vault_gate::Outbound::HandleUnsealEncryptedKey(result) => {
+                let proto_result = match result {
+                    Ok(()) => ProtoUnsealResult::Success,
+                    Err(vault_gate::Error::InvalidKey) => ProtoUnsealResult::InvalidKey,
+                    Err(err) => {
+                        warn!(?err, "unseal failed");
+                        return self
+                            .bi_mut()
+                            .send(Err(Status::internal("Failed to unseal vault")))
+                            .await;
+                    }
+                };
+                wrap_unseal_response(UnsealResponsePayload::Result(proto_result.into()))
+            }
+            vault_gate::Outbound::HandleBootstrapEncryptedKey(result) => {
+                let proto_result = match result {
+                    Ok(()) => ProtoBootstrapResult::Success,
+                    Err(vault_gate::Error::InvalidKey) => ProtoBootstrapResult::InvalidKey,
+                    Err(vault_gate::Error::AlreadyBootstrapped) => {
+                        ProtoBootstrapResult::AlreadyBootstrapped
+                    }
+                    Err(err) => {
+                        warn!(?err, "bootstrap failed");
+                        return self
+                            .bi_mut()
+                            .send(Err(Status::internal("Failed to bootstrap vault")))
+                            .await;
+                    }
+                };
+                wrap_bootstrap_response(proto_result)
+            }
+        };
+
+        self.send_response_payload(payload).await
+    }
+}
+
+impl Bi<vault_gate::Inbound, Result<vault_gate::Outbound, vault_gate::Error>>
+    for AuthTransportAdapter<'_>
+{
+}

server/crates/arbiter-server/src/lib.rs

@@ -7,6 +7,7 @@ pub mod crypto;
 pub mod db;
 pub mod evm;
 pub mod grpc;
+pub mod peers;
 pub mod utils;
 
 pub struct Server {

server/crates/arbiter-server/src/peers/client/auth.rs

@@ -14,9 +14,9 @@ use tracing::error;
 
 use crate::{
     actors::{
-        client::{ClientConnection, ClientCredentials, ClientProfile},
+        GlobalActors,
         flow_coordinator::{self, RequestClientApproval},
-        keyholder::KeyHolder,
+        vault::Vault,
     },
     crypto::integrity::{self, AttestationStatus},
     db::{
@@ -26,6 +26,8 @@ use crate::{
     },
 };
 
+use super::{ClientConnection, ClientCredentials, ClientProfile};
+
 #[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
 pub enum Error {
     #[error("Database pool unavailable")]
@@ -104,7 +106,7 @@ async fn get_current_nonce_and_id(
 
 async fn verify_integrity(
     db: &db::DatabasePool,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
     pubkey: &authn::PublicKey,
 ) -> Result<(), Error> {
     let mut db_conn = db.get().await.map_err(|e| {
@@ -119,7 +121,7 @@ async fn verify_integrity(
 
     let attestation = integrity::verify_entity(
         &mut db_conn,
-        keyholder,
+        vault,
         &ClientCredentials {
             pubkey: pubkey.clone(),
             nonce,
@@ -144,7 +146,7 @@ async fn verify_integrity(
 /// Returns the new nonce, which is used as the challenge nonce.
 async fn create_nonce(
     db: &db::DatabasePool,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
     pubkey: &authn::PublicKey,
 ) -> Result<i32, Error> {
     let pubkey_bytes = pubkey.to_bytes();
@@ -156,7 +158,7 @@ async fn create_nonce(
     })?;
 
     conn.exclusive_transaction(|conn| {
-        let keyholder = keyholder.clone();
+        let vault = vault.clone();
         let pubkey = pubkey.clone();
         Box::pin(async move {
             let (id, new_nonce): (i32, i32) = update(program_client::table)
@@ -168,7 +170,7 @@ async fn create_nonce(
 
             integrity::sign_entity(
                 conn,
-                &keyholder,
+                &vault,
                 &ClientCredentials {
                     pubkey: pubkey.clone(),
                     nonce: new_nonce,
@@ -187,10 +189,7 @@ async fn create_nonce(
     .await
 }
 
-async fn approve_new_client(
+async fn approve_new_client(actors: &GlobalActors, profile: ClientProfile) -> Result<(), Error> {
-    actors: &crate::actors::GlobalActors,
-    profile: ClientProfile,
-) -> Result<(), Error> {
     let result = actors
         .flow_coordinator
         .ask(RequestClientApproval { client: profile })
@@ -212,7 +211,7 @@ async fn approve_new_client(
 
 async fn insert_client(
     db: &db::DatabasePool,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
     pubkey: &authn::PublicKey,
     metadata: &ClientMetadata,
 ) -> Result<i32, Error> {
@@ -226,7 +225,7 @@ async fn insert_client(
     })?;
 
     conn.exclusive_transaction(|conn| {
-        let keyholder = keyholder.clone();
+        let vault = vault.clone();
         let pubkey = pubkey.clone();
         Box::pin(async move {
             const NONCE_START: i32 = 1;
@@ -254,7 +253,7 @@ async fn insert_client(
 
             integrity::sign_entity(
                 conn,
-                &keyholder,
+                &vault,
                 &ClientCredentials {
                     pubkey: pubkey.clone(),
                     nonce: NONCE_START,
@@ -391,7 +390,7 @@ where
 
     let client_id = match get_current_nonce_and_id(&props.db, &pubkey).await? {
         Some((id, _)) => {
-            verify_integrity(&props.db, &props.actors.key_holder, &pubkey).await?;
+            verify_integrity(&props.db, &props.actors.vault, &pubkey).await?;
             id
         }
         None => {
@@ -403,12 +402,12 @@ where
                 },
             )
             .await?;
-            insert_client(&props.db, &props.actors.key_holder, &pubkey, &metadata).await?
+            insert_client(&props.db, &props.actors.vault, &pubkey, &metadata).await?
         }
     };
 
     sync_client_metadata(&props.db, client_id, &metadata).await?;
-    let challenge_nonce = create_nonce(&props.db, &props.actors.key_holder, &pubkey).await?;
+    let challenge_nonce = create_nonce(&props.db, &props.actors.vault, &pubkey).await?;
     challenge_client(transport, pubkey, challenge_nonce).await?;
 
     transport

server/crates/arbiter-server/src/peers/client/mod.rs

@@ -4,9 +4,10 @@ use kameo::actor::Spawn;
 use tracing::{error, info};
 
 use crate::{
-    actors::{GlobalActors, client::session::ClientSession},
+    actors::GlobalActors,
-    crypto::integrity::Integrable,
+    crypto::integrity::{Integrable, hashing::Hashable},
     db,
+    peers::client::session::ClientSession,
 };
 
 #[derive(Debug, Clone)]
@@ -15,7 +16,6 @@ pub struct ClientProfile {
     pub metadata: ClientMetadata,
 }
 
-#[derive(arbiter_macros::Hashable)]
 pub struct ClientCredentials {
     pub pubkey: authn::PublicKey,
     pub nonce: i32,
@@ -25,6 +25,13 @@ impl Integrable for ClientCredentials {
     const KIND: &'static str = "client_credentials";
 }
 
+impl Hashable for ClientCredentials {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        hasher.update(self.pubkey.to_bytes());
+        self.nonce.hash(hasher);
+    }
+}
+
 pub struct ClientConnection {
     pub(crate) db: db::DatabasePool,
     pub(crate) actors: GlobalActors,

server/crates/arbiter-server/src/peers/client/session.rs

@@ -6,15 +6,16 @@ use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
 use crate::{
     actors::{
         GlobalActors,
-        client::ClientConnection,
         evm::{ClientSignTransaction, SignTransactionError},
         flow_coordinator::RegisterClient,
-        keyholder::KeyHolderState,
+        vault::VaultState,
     },
     db,
     evm::VetError,
 };
 
+use super::ClientConnection;
+
 pub struct ClientSession {
     props: ClientConnection,
     client_id: i32,
@@ -29,13 +30,13 @@ impl ClientSession {
 #[messages]
 impl ClientSession {
     #[message]
-    pub(crate) async fn handle_query_vault_state(&mut self) -> Result<KeyHolderState, Error> {
+    pub(crate) async fn handle_query_vault_state(&mut self) -> Result<VaultState, Error> {
-        use crate::actors::keyholder::GetState;
+        use crate::actors::vault::GetState;
 
-        let vault_state = match self.props.actors.key_holder.ask(GetState {}).await {
+        let vault_state = match self.props.actors.vault.ask(GetState {}).await {
             Ok(state) => state,
             Err(err) => {
-                error!(?err, actor = "client", "keyholder.query.failed");
+                error!(?err, actor = "client", "vault.query.failed");
                 return Err(Error::Internal);
             }
         };

server/crates/arbiter-server/src/peers/mod.rs

@@ -0,0 +1,2 @@
+pub mod client;
+pub mod user_agent;

server/crates/arbiter-server/src/peers/user_agent/auth/mod.rs

@@ -2,13 +2,11 @@ use arbiter_crypto::authn;
 use arbiter_proto::transport::Bi;
 use tracing::error;
 
-use crate::actors::user_agent::{
-    UserAgentConnection,
-    auth::state::{AuthContext, AuthStateMachine},
-};
 mod state;
 use state::*;
 
+use super::{AuthCredentials, UserAgentConnection};
+
 #[derive(Debug, Clone)]
 pub enum Inbound {
     AuthChallengeRequest {
@@ -70,10 +68,10 @@ fn parse_auth_event(payload: Inbound) -> AuthEvents {
 
 pub async fn authenticate<T>(
     props: &mut UserAgentConnection,
-    transport: T,
+    transport: &mut T,
-) -> Result<authn::PublicKey, Error>
+) -> Result<AuthCredentials, Error>
 where
-    T: Bi<Inbound, Result<Outbound, Error>> + Send,
+    T: Bi<Inbound, Result<Outbound, Error>> + Send + ?Sized,
 {
     let mut state = AuthStateMachine::new(AuthContext::new(props, transport));
 
@@ -84,7 +82,7 @@ where
         };
 
         match state.process_event(parse_auth_event(payload)).await {
-            Ok(AuthStates::AuthOk(key)) => return Ok(key.clone()),
+            Ok(AuthStates::AuthOk(result)) => return Ok(result.clone()),
             Err(AuthError::ActionFailed(err)) => {
                 error!(?err, "State machine action failed");
                 return Err(err);

server/crates/arbiter-server/src/peers/user_agent/auth/state.rs

@@ -1,17 +1,15 @@
+use super::super::{AuthCredentials, Credentials, UserAgentConnection};
 use arbiter_crypto::authn::{self, USERAGENT_CONTEXT};
 use arbiter_proto::transport::Bi;
-use diesel::{ExpressionMethods as _, OptionalExtension as _, QueryDsl, update};
+use diesel::{ExpressionMethods as _, OptionalExtension as _, QueryDsl, sqlite::Sqlite, update};
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use kameo::actor::ActorRef;
 use tracing::error;
 
 use super::Error;
+use crate::peers::user_agent::auth::Outbound;
 use crate::{
-    actors::{
+    actors::{bootstrap::ConsumeToken, vault::Vault},
-        bootstrap::ConsumeToken,
-        keyholder::KeyHolder,
-        user_agent::{UserAgentConnection, UserAgentCredentials, auth::Outbound},
-    },
     crypto::integrity,
     db::{DatabasePool, schema::useragent_client},
 };
@@ -26,6 +24,7 @@ pub struct BootstrapAuthRequest {
 }
 
 pub struct ChallengeContext {
+    pub id: i32,
     pub challenge_nonce: i32,
     pub key: authn::PublicKey,
 }
@@ -39,11 +38,13 @@ smlang::statemachine!(
     custom_error: true,
     transitions: {
         *Init + AuthRequest(ChallengeRequest) / async prepare_challenge = SentChallenge(ChallengeContext),
-        Init + BootstrapAuthRequest(BootstrapAuthRequest) / async verify_bootstrap_token = AuthOk(authn::PublicKey),
+        Init + BootstrapAuthRequest(BootstrapAuthRequest) / async verify_bootstrap_token = AuthOk(AuthCredentials),
-        SentChallenge(ChallengeContext) + ReceivedSolution(ChallengeSolution) / async verify_solution = AuthOk(authn::PublicKey),
+        SentChallenge(ChallengeContext) + ReceivedSolution(ChallengeSolution) / async verify_solution = AuthOk(AuthCredentials),
     }
 );
 
+const NONCE_START: i32 = 1;
+
 /// Returns the current nonce, ready to use for the challenge nonce.
 async fn get_current_nonce_and_id(
     db: &DatabasePool,
@@ -77,7 +78,7 @@ async fn get_current_nonce_and_id(
 
 async fn verify_integrity(
     db: &DatabasePool,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
     pubkey: &authn::PublicKey,
 ) -> Result<(), Error> {
     let mut db_conn = db.get().await.map_err(|e| {
@@ -89,10 +90,13 @@ async fn verify_integrity(
 
     let _result = integrity::verify_entity(
         &mut db_conn,
-        keyholder,
+        vault,
-        &UserAgentCredentials {
+        &AuthCredentials {
-            pubkey: pubkey.clone(),
+            creds: Credentials {
-            nonce,
+                id,
+                pubkey: pubkey.clone(),
+            },
+            new_nonce: nonce,
         },
         id,
     )
@@ -105,113 +109,85 @@ async fn verify_integrity(
     Ok(())
 }
 
-async fn create_nonce(
+async fn compute_current_nonce(
-    db: &DatabasePool,
+    conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    keyholder: &ActorRef<KeyHolder>,
     pubkey: &authn::PublicKey,
-) -> Result<i32, Error> {
+) -> Result<(i32, i32), Error> {
-    let mut db_conn = db.get().await.map_err(|e| {
+    update(useragent_client::table)
-        error!(error = ?e, "Database pool error");
+        .filter(useragent_client::public_key.eq(pubkey.to_bytes()))
-        Error::internal("Database unavailable")
+        .set(useragent_client::nonce.eq(useragent_client::nonce + 1))
-    })?;
+        .returning((useragent_client::id, useragent_client::nonce))
-    let new_nonce = db_conn
+        .get_result(conn)
-        .exclusive_transaction(|conn| {
+        .await
-            Box::pin(async move {
+        .map_err(|e| {
-                let (id, new_nonce): (i32, i32) = update(useragent_client::table)
+            error!(error = ?e, "Database error incrementing nonce");
-                    .filter(useragent_client::public_key.eq(pubkey.to_bytes()))
+            Error::internal("Database operation failed")
-                    .set(useragent_client::nonce.eq(useragent_client::nonce + 1))
-                    .returning((useragent_client::id, useragent_client::nonce))
-                    .get_result(conn)
-                    .await
-                    .map_err(|e| {
-                        error!(error = ?e, "Database error");
-                        Error::internal("Database operation failed")
-                    })?;
-
-                integrity::sign_entity(
-                    conn,
-                    keyholder,
-                    &UserAgentCredentials {
-                        pubkey: pubkey.clone(),
-                        nonce: new_nonce,
-                    },
-                    id,
-                )
-                .await
-                .map_err(|e| {
-                    error!(?e, "Integrity signature update failed");
-                    Error::internal("Database error")
-                })?;
-
-                Result::<_, Error>::Ok(new_nonce)
-            })
         })
-        .await?;
-    Ok(new_nonce)
 }
 
-async fn register_key(
+async fn resign_credentials(
-    db: &DatabasePool,
+    conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
+    id: i32,
     pubkey: &authn::PublicKey,
+    new_nonce: i32,
 ) -> Result<(), Error> {
+    integrity::sign_entity(
+        conn,
+        vault,
+        &AuthCredentials {
+            creds: Credentials {
+                id,
+                pubkey: pubkey.clone(),
+            },
+            new_nonce,
+        },
+        id,
+    )
+    .await
+    .map_err(|e| {
+        error!(?e, "Integrity signature update failed");
+        Error::internal("Database error")
+    })
+}
+
+async fn register_key(db: &DatabasePool, pubkey: &authn::PublicKey) -> Result<i32, Error> {
     let pubkey_bytes = pubkey.to_bytes();
     let mut conn = db.get().await.map_err(|e| {
         error!(error = ?e, "Database pool error");
         Error::internal("Database unavailable")
     })?;
 
-    conn.transaction(|conn| {
+    let id: i32 = diesel::insert_into(useragent_client::table)
-        Box::pin(async move {
+        .values((
-            const NONCE_START: i32 = 1;
+            useragent_client::public_key.eq(pubkey_bytes),
+            useragent_client::nonce.eq(NONCE_START),
+        ))
+        .returning(useragent_client::id)
+        .get_result(&mut conn)
+        .await
+        .map_err(|e| {
+            error!(error = ?e, "Database error");
+            Error::internal("Database operation failed")
+        })?;
 
-            let id: i32 = diesel::insert_into(useragent_client::table)
+    Ok(id)
-                .values((
-                    useragent_client::public_key.eq(pubkey_bytes),
-                    useragent_client::nonce.eq(NONCE_START),
-                ))
-                .returning(useragent_client::id)
-                .get_result(conn)
-                .await
-                .map_err(|e| {
-                    error!(error = ?e, "Database error");
-                    Error::internal("Database operation failed")
-                })?;
-
-            let entity = UserAgentCredentials {
-                pubkey: pubkey.clone(),
-                nonce: NONCE_START,
-            };
-
-            integrity::sign_entity(conn, keyholder, &entity, id)
-                .await
-                .map_err(|e| {
-                    error!(error = ?e, "Failed to sign integrity tag for new user-agent key");
-                    Error::internal("Failed to register public key")
-                })?;
-
-            Result::<_, Error>::Ok(())
-        })
-    })
-    .await?;
-
-    Ok(())
 }
 
-pub struct AuthContext<'a, T> {
+pub struct AuthContext<'a, T: ?Sized> {
     pub(super) conn: &'a mut UserAgentConnection,
-    pub(super) transport: T,
+    pub(super) transport: &'a mut T,
 }
 
-impl<'a, T> AuthContext<'a, T> {
+impl<'a, T: ?Sized> AuthContext<'a, T> {
-    pub fn new(conn: &'a mut UserAgentConnection, transport: T) -> Self {
+    pub fn new(conn: &'a mut UserAgentConnection, transport: &'a mut T) -> Self {
         Self { conn, transport }
     }
 }
 
 impl<T> AuthStateMachineContext for AuthContext<'_, T>
 where
-    T: Bi<super::Inbound, Result<super::Outbound, Error>> + Send,
+    T: Bi<super::Inbound, Result<super::Outbound, Error>> + Send + ?Sized,
 {
     type Error = Error;
 
@@ -219,9 +195,33 @@ where
         &mut self,
         ChallengeRequest { pubkey }: ChallengeRequest,
     ) -> Result<ChallengeContext, Self::Error> {
-        verify_integrity(&self.conn.db, &self.conn.actors.key_holder, &pubkey).await?;
+        let is_signing = integrity::is_signing_available(&self.conn.actors.vault)
+            .await
+            .unwrap_or(false);
 
-        let nonce = create_nonce(&self.conn.db, &self.conn.actors.key_holder, &pubkey).await?;
+        if is_signing {
+            verify_integrity(&self.conn.db, &self.conn.actors.vault, &pubkey).await?;
+        }
+
+        let vault = self.conn.actors.vault.clone();
+        let mut conn = self.conn.db.get().await.map_err(|e| {
+            error!(error = ?e, "Database pool error");
+            Error::internal("Database unavailable")
+        })?;
+
+        let (id, nonce) = conn
+            .exclusive_transaction(|conn| {
+                let pubkey = pubkey.clone();
+                let vault = vault.clone();
+                Box::pin(async move {
+                    let (id, new_nonce) = compute_current_nonce(conn, &pubkey).await?;
+                    if is_signing {
+                        resign_credentials(conn, &vault, id, &pubkey, new_nonce).await?;
+                    }
+                    Result::<_, Error>::Ok((id, new_nonce))
+                })
+            })
+            .await?;
 
         self.transport
             .send(Ok(Outbound::AuthChallenge { nonce }))
@@ -232,6 +232,7 @@ where
             })?;
 
         Ok(ChallengeContext {
+            id,
             challenge_nonce: nonce,
             key: pubkey,
         })
@@ -242,7 +243,7 @@ where
     async fn verify_bootstrap_token(
         &mut self,
         BootstrapAuthRequest { pubkey, token }: BootstrapAuthRequest,
-    ) -> Result<authn::PublicKey, Self::Error> {
+    ) -> Result<AuthCredentials, Self::Error> {
         let token_ok: bool = self
             .conn
             .actors
@@ -263,12 +264,15 @@ where
 
         match token_ok {
             true => {
-                register_key(&self.conn.db, &self.conn.actors.key_holder, &pubkey).await?;
+                let id = register_key(&self.conn.db, &pubkey).await?;
                 self.transport
                     .send(Ok(Outbound::AuthSuccess))
                     .await
                     .map_err(|_| Error::Transport)?;
-                Ok(pubkey)
+                Ok(AuthCredentials {
+                    creds: Credentials { id, pubkey },
+                    new_nonce: NONCE_START,
+                })
             }
             false => {
                 error!("Invalid bootstrap token provided");
@@ -286,11 +290,12 @@ where
     async fn verify_solution(
         &mut self,
         ChallengeContext {
+            id,
             challenge_nonce,
             key,
         }: &ChallengeContext,
         ChallengeSolution { solution }: ChallengeSolution,
-    ) -> Result<authn::PublicKey, Self::Error> {
+    ) -> Result<AuthCredentials, Self::Error> {
         let signature = authn::Signature::try_from(solution.as_slice()).map_err(|_| {
             error!("Failed to decode signature in challenge solution");
             Error::InvalidChallengeSolution
@@ -304,7 +309,13 @@ where
                     .send(Ok(Outbound::AuthSuccess))
                     .await
                     .map_err(|_| Error::Transport)?;
-                Ok(key.clone())
+                Ok(AuthCredentials {
+                    creds: Credentials {
+                        id: *id,
+                        pubkey: key.clone(),
+                    },
+                    new_nonce: *challenge_nonce,
+                })
             }
             false => {
                 self.transport

server/crates/arbiter-server/src/peers/user_agent/mod.rs

@@ -0,0 +1,175 @@
+use crate::{
+    actors::GlobalActors,
+    crypto::integrity::{self, Integrable},
+    db,
+    peers::client::ClientProfile,
+};
+use arbiter_crypto::authn;
+
+use arbiter_proto::transport::{Bi, Sender};
+pub use auth::authenticate;
+use kameo::actor::{ActorRef, Spawn as _};
+pub use session::UserAgentSession;
+use tokio::sync::oneshot;
+use tracing::warn;
+use vault_gate::VaultGate;
+
+use crate::crypto::integrity::hashing::Hashable;
+
+pub mod auth;
+pub mod session;
+pub mod vault_gate;
+
+#[derive(Debug, Clone, Hash)]
+pub struct Credentials {
+    pub id: i32,
+    pub pubkey: authn::PublicKey,
+}
+impl Hashable for Credentials {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.id.hash(hasher);
+        self.pubkey.hash(hasher);
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct AuthCredentials {
+    pub creds: Credentials,
+    // denotes new nonce, not current
+    pub new_nonce: i32,
+}
+
+impl Hashable for authn::PublicKey {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        hasher.update(self.to_bytes());
+    }
+}
+
+impl Hashable for AuthCredentials {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.creds.hash(hasher);
+        self.new_nonce.hash(hasher);
+    }
+}
+
+impl Integrable for AuthCredentials {
+    const KIND: &'static str = "useragent_credentials";
+}
+
+// Messages, sent by user agent to connection client without having a request
+#[derive(Debug)]
+pub enum OutOfBand {
+    ClientConnectionRequest { profile: ClientProfile },
+    ClientConnectionCancel { pubkey: authn::PublicKey },
+}
+
+#[derive(Clone)]
+pub struct UserAgentConnection {
+    pub(crate) db: db::DatabasePool,
+    pub(crate) actors: GlobalActors,
+}
+
+impl UserAgentConnection {
+    pub fn new(db: db::DatabasePool, actors: GlobalActors) -> Self {
+        Self { db, actors }
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("authentication failed: {0:?}")]
+    Auth(auth::Error),
+    #[error("vault gate failed: {0}")]
+    VaultGate(#[from] vault_gate::Error),
+    #[error("transport closed unexpectedly")]
+    Transport,
+    #[error("internal: {0}")]
+    Internal(String),
+}
+
+impl From<auth::Error> for Error {
+    fn from(err: auth::Error) -> Self {
+        Self::Auth(err)
+    }
+}
+
+pub async fn start<T>(
+    props: &mut UserAgentConnection,
+    mut transport: T,
+    oob_sender: Box<dyn Sender<OutOfBand>>,
+) -> Result<ActorRef<UserAgentSession>, Error>
+where
+    T: Bi<auth::Inbound, Result<auth::Outbound, auth::Error>> + Send,
+    T: Bi<vault_gate::Inbound, Result<vault_gate::Outbound, vault_gate::Error>> + Send,
+{
+    let auth_creds = authenticate(props, &mut transport).await?;
+
+    let creds = if integrity::is_signing_available(&props.actors.vault)
+        .await
+        .unwrap_or(false)
+    {
+        auth_creds.creds
+    } else {
+        run_vault_gate(props, &mut transport, auth_creds).await?
+    };
+
+    Ok(UserAgentSession::spawn(UserAgentSession::new(
+        props.clone(),
+        creds,
+        oob_sender,
+    )))
+}
+
+async fn run_vault_gate<T>(
+    props: &UserAgentConnection,
+    transport: &mut T,
+    auth_creds: AuthCredentials,
+) -> Result<Credentials, Error>
+where
+    T: Bi<vault_gate::Inbound, Result<vault_gate::Outbound, vault_gate::Error>> + Send + ?Sized,
+{
+    let (promotion_tx, mut promotion_rx) = oneshot::channel();
+    let gate = VaultGate::spawn(VaultGate::new(
+        auth_creds,
+        props.actors.clone(),
+        props.db.clone(),
+        promotion_tx,
+    ));
+
+    let result = loop {
+        tokio::select! {
+            promotion = &mut promotion_rx => {
+                break match promotion {
+                    Ok(Ok(creds)) => Ok(creds),
+                    Ok(Err(err)) => Err(Error::VaultGate(err)),
+                    Err(_) => Err(Error::Internal(
+                        "vault gate promotion channel closed".into(),
+                    )),
+                };
+            }
+
+            inbound = transport.recv() => {
+                let Some(inbound) = inbound else {
+                    break Err(Error::Transport);
+                };
+
+                match gate.ask(inbound).await {
+                    Ok(outbound) => {
+                        if transport.send(Ok(outbound)).await.is_err() {
+                            break Err(Error::Transport);
+                        }
+                    }
+                    Err(err) => {
+                        warn!(?err, "VaultGate failed to handle message");
+                        break Err(Error::Internal(format!(
+                            "vault gate ask failed: {err:?}"
+                        )));
+                    }
+                }
+            }
+        }
+    };
+
+    gate.kill();
+    result
+}

server/crates/arbiter-server/src/peers/user_agent/session/handlers.rs

@@ -15,101 +15,23 @@ use tracing::{error, info};
 use x25519_dalek::{EphemeralSecret, PublicKey};
 
 use crate::actors::flow_coordinator::client_connect_approval::ClientApprovalAnswer;
-use crate::actors::keyholder::KeyHolderState;
-use crate::actors::user_agent::session::Error;
 use crate::actors::{
     evm::{
         ClientSignTransaction, Generate, ListWallets, SignTransactionError as EvmSignError,
         UseragentCreateGrant, UseragentListGrants,
     },
-    keyholder::{self, Bootstrap, TryUnseal},
+    vault::{self, Bootstrap, TryUnseal},
-    user_agent::session::{
-        UserAgentSession,
-        state::{UnsealContext, UserAgentEvents, UserAgentStates},
-    },
 };
 use crate::db::models::{
     EvmWalletAccess, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata,
 };
 use crate::evm::policies::{Grant, SpecificGrant};
+use crate::{
+    actors::vault::VaultState,
+};
 
-impl UserAgentSession {
+use super::{Error, UserAgentSession};
-    fn take_unseal_secret(&mut self) -> Result<(EphemeralSecret, PublicKey), Error> {
-        let UserAgentStates::WaitingForUnsealKey(unseal_context) = self.state.state() else {
-            error!("Received encrypted key in invalid state");
-            return Err(Error::internal("Invalid state for unseal encrypted key"));
-        };
 
-        let ephemeral_secret = {
-            #[allow(
-                clippy::unwrap_used,
-                reason = "Mutex poison is unrecoverable and should panic"
-            )]
-            let mut secret_lock = unseal_context.secret.lock().unwrap();
-            let secret = secret_lock.take();
-            match secret {
-                Some(secret) => secret,
-                None => {
-                    drop(secret_lock);
-                    error!("Ephemeral secret already taken");
-                    return Err(Error::internal("Ephemeral secret already taken"));
-                }
-            }
-        };
-
-        Ok((ephemeral_secret, unseal_context.client_public_key))
-    }
-
-    fn decrypt_client_key_material(
-        ephemeral_secret: EphemeralSecret,
-        client_public_key: PublicKey,
-        nonce: &[u8],
-        ciphertext: &[u8],
-        associated_data: &[u8],
-    ) -> Result<SafeCell<Vec<u8>>, ()> {
-        let nonce = XNonce::from_slice(nonce);
-
-        let shared_secret = ephemeral_secret.diffie_hellman(&client_public_key);
-        let cipher = XChaCha20Poly1305::new(shared_secret.as_bytes().into());
-
-        let mut key_buffer = SafeCell::new(ciphertext.to_vec());
-
-        let decryption_result = key_buffer.write_inline(|write_handle| {
-            cipher.decrypt_in_place(nonce, associated_data, write_handle)
-        });
-
-        match decryption_result {
-            Ok(_) => Ok(key_buffer),
-            Err(err) => {
-                error!(?err, "Failed to decrypt encrypted key material");
-                Err(())
-            }
-        }
-    }
-}
-
-pub struct UnsealStartResponse {
-    pub server_pubkey: PublicKey,
-}
-
-#[derive(Debug, Error)]
-pub enum UnsealError {
-    #[error("Invalid key provided for unsealing")]
-    InvalidKey,
-    #[error("Internal error during unsealing process")]
-    General(#[from] super::Error),
-}
-
-#[derive(Debug, Error)]
-pub enum BootstrapError {
-    #[error("Invalid key provided for bootstrapping")]
-    InvalidKey,
-    #[error("Vault is already bootstrapped")]
-    AlreadyBootstrapped,
-
-    #[error("Internal error during bootstrapping process")]
-    General(#[from] super::Error),
-}
 
 #[derive(Debug, Error)]
 pub enum SignTransactionError {
@@ -132,160 +54,13 @@ pub enum GrantMutationError {
 #[messages]
 impl UserAgentSession {
     #[message]
-    pub async fn handle_unseal_request(
+    pub(crate) async fn handle_query_vault_state(&mut self) -> Result<VaultState, Error> {
-        &mut self,
+        use crate::actors::vault::GetState;
-        client_pubkey: x25519_dalek::PublicKey,
-    ) -> Result<UnsealStartResponse, Error> {
-        let secret = EphemeralSecret::random();
-        let public_key = PublicKey::from(&secret);
 
-        self.transition(UserAgentEvents::UnsealRequest(UnsealContext {
+        let vault_state = match self.props.actors.vault.ask(GetState {}).await {
-            secret: Mutex::new(Some(secret)),
-            client_public_key: client_pubkey,
-        }))?;
-
-        Ok(UnsealStartResponse {
-            server_pubkey: public_key,
-        })
-    }
-
-    #[message]
-    pub async fn handle_unseal_encrypted_key(
-        &mut self,
-        nonce: Vec<u8>,
-        ciphertext: Vec<u8>,
-        associated_data: Vec<u8>,
-    ) -> Result<(), UnsealError> {
-        let (ephemeral_secret, client_public_key) = match self.take_unseal_secret() {
-            Ok(values) => values,
-            Err(Error::State) => {
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                return Err(UnsealError::InvalidKey);
-            }
-            Err(_err) => {
-                return Err(Error::internal("Failed to take unseal secret").into());
-            }
-        };
-
-        let seal_key_buffer = match Self::decrypt_client_key_material(
-            ephemeral_secret,
-            client_public_key,
-            &nonce,
-            &ciphertext,
-            &associated_data,
-        ) {
-            Ok(buffer) => buffer,
-            Err(()) => {
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                return Err(UnsealError::InvalidKey);
-            }
-        };
-
-        match self
-            .props
-            .actors
-            .key_holder
-            .ask(TryUnseal {
-                seal_key_raw: seal_key_buffer,
-            })
-            .await
-        {
-            Ok(_) => {
-                info!("Successfully unsealed key with client-provided key");
-                self.transition(UserAgentEvents::ReceivedValidKey)?;
-                Ok(())
-            }
-            Err(SendError::HandlerError(keyholder::Error::InvalidKey)) => {
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                Err(UnsealError::InvalidKey)
-            }
-            Err(SendError::HandlerError(err)) => {
-                error!(?err, "Keyholder failed to unseal key");
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                Err(UnsealError::InvalidKey)
-            }
-            Err(err) => {
-                error!(?err, "Failed to send unseal request to keyholder");
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                Err(Error::internal("Vault actor error").into())
-            }
-        }
-    }
-
-    #[message]
-    pub(crate) async fn handle_bootstrap_encrypted_key(
-        &mut self,
-        nonce: Vec<u8>,
-        ciphertext: Vec<u8>,
-        associated_data: Vec<u8>,
-    ) -> Result<(), BootstrapError> {
-        let (ephemeral_secret, client_public_key) = match self.take_unseal_secret() {
-            Ok(values) => values,
-            Err(Error::State) => {
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                return Err(BootstrapError::InvalidKey);
-            }
-            Err(err) => return Err(err.into()),
-        };
-
-        let seal_key_buffer = match Self::decrypt_client_key_material(
-            ephemeral_secret,
-            client_public_key,
-            &nonce,
-            &ciphertext,
-            &associated_data,
-        ) {
-            Ok(buffer) => buffer,
-            Err(()) => {
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                return Err(BootstrapError::InvalidKey);
-            }
-        };
-
-        match self
-            .props
-            .actors
-            .key_holder
-            .ask(Bootstrap {
-                seal_key_raw: seal_key_buffer,
-            })
-            .await
-        {
-            Ok(_) => {
-                info!("Successfully bootstrapped vault with client-provided key");
-                self.transition(UserAgentEvents::ReceivedValidKey)?;
-                Ok(())
-            }
-            Err(SendError::HandlerError(keyholder::Error::AlreadyBootstrapped)) => {
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                Err(BootstrapError::AlreadyBootstrapped)
-            }
-            Err(SendError::HandlerError(err)) => {
-                error!(?err, "Keyholder failed to bootstrap vault");
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                Err(BootstrapError::InvalidKey)
-            }
-            Err(err) => {
-                error!(?err, "Failed to send bootstrap request to keyholder");
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                Err(BootstrapError::General(Error::internal(
-                    "Vault actor error",
-                )))
-            }
-        }
-    }
-}
-
-#[messages]
-impl UserAgentSession {
-    #[message]
-    pub(crate) async fn handle_query_vault_state(&mut self) -> Result<KeyHolderState, Error> {
-        use crate::actors::keyholder::GetState;
-
-        let vault_state = match self.props.actors.key_holder.ask(GetState {}).await {
             Ok(state) => state,
             Err(err) => {
-                error!(?err, actor = "useragent", "keyholder.query.failed");
+                error!(?err, actor = "useragent", "vault.query.failed");
                 return Err(Error::internal("Vault is in broken state"));
             }
         };
@@ -374,7 +149,7 @@ impl UserAgentSession {
         //         Err(GrantMutationError::Internal)
         //     }
         // }
-       let _ = grant_id;
+        let _ = grant_id;
         todo!()
     }
 

server/crates/arbiter-server/src/peers/user_agent/session/mod.rs

@@ -1,20 +1,23 @@
 use arbiter_crypto::authn;
+use diesel::{ExpressionMethods, QueryDsl};
+use diesel_async::{RunQueryDsl};
+use kameo_actors::message_bus::Register;
 
 use std::{borrow::Cow, collections::HashMap};
 
 use arbiter_proto::transport::Sender;
-use async_trait::async_trait;
+use kameo::{Actor, actor::ActorRef, messages, prelude::Message};
-use kameo::{Actor, actor::ActorRef, messages};
 use thiserror::Error;
 use tracing::error;
 
-use crate::actors::{
+use crate::{
-    client::ClientProfile,
+    actors::{
-    flow_coordinator::{RegisterUserAgent, client_connect_approval::ClientApprovalController},
+        flow_coordinator::{RegisterUserAgent, client_connect_approval::ClientApprovalController},
-    user_agent::{OutOfBand, UserAgentConnection},
+        vault::events,
+    }, crypto::integrity, db::schema::useragent_client, peers::{client::ClientProfile, user_agent::{AuthCredentials, Credentials}}
 };
-mod state;
+
-use state::{DummyContext, UserAgentEvents, UserAgentStateMachine};
+use super::{OutOfBand, UserAgentConnection};
 
 #[derive(Debug, Error)]
 pub enum Error {
@@ -52,48 +55,28 @@ pub struct PendingClientApproval {
 }
 
 pub struct UserAgentSession {
+    creds: Credentials,
     props: UserAgentConnection,
-    state: UserAgentStateMachine<DummyContext>,
     sender: Box<dyn Sender<OutOfBand>>,
 
     pending_client_approvals: HashMap<Vec<u8>, PendingClientApproval>,
 }
 
-pub mod connection;
+pub mod handlers;
 
 impl UserAgentSession {
-    pub(crate) fn new(props: UserAgentConnection, sender: Box<dyn Sender<OutOfBand>>) -> Self {
+    pub(crate) fn new(
+        props: UserAgentConnection,
+        creds: Credentials,
+        sender: Box<dyn Sender<OutOfBand>>,
+    ) -> Self {
         Self {
+            creds,
             props,
-            state: UserAgentStateMachine::new(DummyContext),
             sender,
             pending_client_approvals: Default::default(),
         }
     }
-
-    pub fn new_test(db: crate::db::DatabasePool, actors: crate::actors::GlobalActors) -> Self {
-        struct DummySender;
-
-        #[async_trait]
-        impl Sender<OutOfBand> for DummySender {
-            async fn send(
-                &mut self,
-                _item: OutOfBand,
-            ) -> Result<(), arbiter_proto::transport::Error> {
-                Ok(())
-            }
-        }
-
-        Self::new(UserAgentConnection::new(db, actors), Box::new(DummySender))
-    }
-
-    fn transition(&mut self, event: UserAgentEvents) -> Result<(), Error> {
-        self.state.process_event(event).map_err(|e| {
-            error!(?e, "State transition failed");
-            Error::State
-        })?;
-        Ok(())
-    }
 }
 
 #[messages]

server/crates/arbiter-server/src/peers/user_agent/vault_gate/mod.rs

@@ -0,0 +1,295 @@
+use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
+use chacha20poly1305::{AeadInPlace, KeyInit as _, XChaCha20Poly1305, XNonce};
+use kameo::{Actor, error::SendError, messages, prelude::Message};
+use kameo_actors::message_bus::Register;
+use tokio::sync::oneshot;
+use tracing::{error, info};
+use x25519_dalek::{EphemeralSecret, PublicKey, SharedSecret};
+
+pub mod state;
+use state::*;
+
+use super::{AuthCredentials, Credentials};
+use crate::{
+    actors::{
+        GlobalActors,
+        vault::{self, Bootstrap, TryUnseal, events},
+    },
+    crypto::integrity::{self, AttestationStatus},
+    db::DatabasePool,
+};
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("Vault is already bootstrapped")]
+    AlreadyBootstrapped,
+    #[error("Invalid key provided")]
+    InvalidKey,
+
+    #[error("State transition failed")]
+    State,
+
+    #[error("Internal error: {0}")]
+    Internal(String),
+}
+impl Error {
+    fn internal(message: impl Into<String>) -> Self {
+        Self::Internal(message.into())
+    }
+}
+
+pub struct HandshakeResponse {
+    pub server_pubkey: PublicKey,
+}
+
+pub struct VaultGate {
+    pub auth_creds: AuthCredentials,
+    pub promotion_tx: Option<oneshot::Sender<Result<Credentials, Error>>>,
+    pub state: State,
+    pub actors: GlobalActors,
+    pub db: DatabasePool,
+}
+
+impl VaultGate {
+    pub fn new(
+        auth_creds: AuthCredentials,
+        actors: GlobalActors,
+        db: DatabasePool,
+        promotion_tx: oneshot::Sender<Result<Credentials, Error>>,
+    ) -> Self {
+        Self {
+            auth_creds,
+            state: State::default(),
+            actors,
+            db,
+            promotion_tx: Some(promotion_tx),
+        }
+    }
+}
+
+impl Actor for VaultGate {
+    type Args = Self;
+
+    type Error = ();
+
+    async fn on_start(
+        args: Self::Args,
+        actor_ref: kameo::prelude::ActorRef<Self>,
+    ) -> Result<Self, Self::Error> {
+        let _ = args
+            .actors
+            .events
+            .tell(Register(
+                actor_ref.clone().recipient::<events::Bootstrapped>(),
+            ))
+            .await;
+        let _ = args
+            .actors
+            .events
+            .tell(Register(actor_ref.recipient::<events::Unsealed>()))
+            .await;
+        Ok(args)
+    }
+}
+
+impl VaultGate {
+    fn decrypt_key(
+        secret: &SharedSecret,
+        nonce: &[u8],
+        ciphertext: &[u8],
+        associated_data: &[u8],
+    ) -> Result<SafeCell<Vec<u8>>, ()> {
+        let nonce = XNonce::from_slice(nonce);
+
+        let cipher = XChaCha20Poly1305::new(secret.as_bytes().into());
+
+        let mut key_buffer = SafeCell::new(ciphertext.to_vec());
+
+        let decryption_result = key_buffer.write_inline(|write_handle| {
+            cipher.decrypt_in_place(nonce, associated_data, write_handle)
+        });
+
+        match decryption_result {
+            Ok(_) => Ok(key_buffer),
+            Err(err) => {
+                error!(?err, "Failed to decrypt encrypted key material");
+                Err(())
+            }
+        }
+    }
+}
+
+#[messages(messages = Inbound, replies = Outbound)]
+impl VaultGate {
+    #[message]
+    pub async fn handle_handshake(
+        &mut self,
+        client_pubkey: x25519_dalek::PublicKey,
+    ) -> Result<HandshakeResponse, Error> {
+        let ephemeral_secret = EphemeralSecret::random();
+        let public_key = PublicKey::from(&ephemeral_secret);
+
+        let secret = ephemeral_secret.diffie_hellman(&client_pubkey);
+
+        self.state = State::ReadyForExchange {
+            server_key: public_key.clone(),
+            secret,
+        };
+
+        Ok(HandshakeResponse {
+            server_pubkey: public_key,
+        })
+    }
+
+    #[message]
+    pub async fn handle_unseal_encrypted_key(
+        &mut self,
+        nonce: Vec<u8>,
+        ciphertext: Vec<u8>,
+        associated_data: Vec<u8>,
+    ) -> Result<(), Error> {
+        let State::ReadyForExchange { secret, .. } = &self.state else {
+            return Err(Error::State);
+        };
+
+        let seal_key_buffer = match Self::decrypt_key(secret, &nonce, &ciphertext, &associated_data)
+        {
+            Ok(buffer) => buffer,
+            Err(()) => {
+                return Err(Error::InvalidKey);
+            }
+        };
+
+        match self
+            .actors
+            .vault
+            .ask(TryUnseal {
+                seal_key_raw: seal_key_buffer,
+            })
+            .await
+        {
+            Ok(_) => {
+                info!("Successfully unsealed key with client-provided key");
+                Ok(())
+            }
+            Err(SendError::HandlerError(vault::Error::InvalidKey)) => Err(Error::InvalidKey),
+            Err(SendError::HandlerError(err)) => {
+                error!(?err, "Vault failed to unseal key");
+                Err(Error::InvalidKey)
+            }
+            Err(err) => {
+                error!(?err, "Failed to send unseal request to vault");
+                Err(Error::internal("Vault actor error").into())
+            }
+        }
+    }
+
+    #[message]
+    pub async fn handle_bootstrap_encrypted_key(
+        &mut self,
+        nonce: Vec<u8>,
+        ciphertext: Vec<u8>,
+        associated_data: Vec<u8>,
+    ) -> Result<(), Error> {
+        let State::ReadyForExchange { secret, .. } = &self.state else {
+            return Err(Error::State);
+        };
+
+        let seal_key_buffer = match Self::decrypt_key(secret, &nonce, &ciphertext, &associated_data)
+        {
+            Ok(buffer) => buffer,
+            Err(()) => {
+                return Err(Error::InvalidKey);
+            }
+        };
+
+        match self
+            .actors
+            .vault
+            .ask(Bootstrap {
+                seal_key_raw: seal_key_buffer,
+            })
+            .await
+        {
+            Ok(_) => {
+                info!("Successfully bootstrapped vault with client-provided key");
+                Ok(())
+            }
+            Err(SendError::HandlerError(vault::Error::AlreadyBootstrapped)) => {
+                Err(Error::AlreadyBootstrapped)
+            }
+            Err(SendError::HandlerError(err)) => {
+                error!(?err, "Vault failed to bootstrap vault");
+                Err(Error::InvalidKey)
+            }
+            Err(err) => {
+                error!(?err, "Failed to send bootstrap request to vault");
+                Err(Error::internal("Vault error"))
+            }
+        }
+    }
+}
+
+impl Message<events::Bootstrapped> for VaultGate {
+    type Reply = ();
+
+    async fn handle(
+        &mut self,
+        _: events::Bootstrapped,
+        ctx: &mut kameo::prelude::Context<Self, Self::Reply>,
+    ) -> Self::Reply {
+        let result = async {
+            let mut conn = self.db.get().await.map_err(|_| Error::internal("DB unavailable"))?;
+            integrity::sign_entity(&mut conn, &self.actors.vault, &self.auth_creds, self.auth_creds.creds.id)
+                .await
+                .map_err(|e| {
+                    error!(?e, "Failed to sign integrity envelope on bootstrap");
+                    Error::internal("Integrity sign failed")
+                })?;
+            Ok(self.auth_creds.creds.clone())
+        }
+        .await;
+
+        if let Some(tx) = self.promotion_tx.take() {
+            let _ = tx.send(result);
+        }
+        ctx.stop();
+    }
+}
+
+impl Message<events::Unsealed> for VaultGate {
+    type Reply = ();
+
+    async fn handle(
+        &mut self,
+        _: events::Unsealed,
+        ctx: &mut kameo::prelude::Context<Self, Self::Reply>,
+    ) -> Self::Reply {
+        let result = async {
+            let mut conn = self.db.get().await.map_err(|_| Error::internal("DB unavailable"))?;
+            match integrity::verify_entity(
+                &mut conn,
+                &self.actors.vault,
+                &self.auth_creds,
+                self.auth_creds.creds.id,
+            )
+            .await
+            {
+                Ok(AttestationStatus::Attested) => Ok(self.auth_creds.creds.clone()),
+                Ok(AttestationStatus::Unavailable) => {
+                    Err(Error::internal("Vault sealed during promotion"))
+                }
+                Err(e) => {
+                    error!(?e, "Integrity verification failed during unseal promotion");
+                    Err(Error::InvalidKey)
+                }
+            }
+        }
+        .await;
+
+        if let Some(tx) = self.promotion_tx.take() {
+            let _ = tx.send(result);
+        }
+        ctx.stop();
+    }
+}

server/crates/arbiter-server/src/peers/user_agent/vault_gate/state.rs

@@ -0,0 +1,17 @@
+use std::sync::Mutex;
+
+use x25519_dalek::{EphemeralSecret, PublicKey, SharedSecret};
+
+pub struct Handshake {
+    client_pubkey: PublicKey,
+}
+
+#[derive(Default)]
+pub enum State {
+    #[default]
+    Idle,
+    ReadyForExchange {
+        server_key: PublicKey,
+        secret: SharedSecret,
+    },
+}

server/crates/arbiter-server/tests/client/auth.rs

@@ -5,13 +5,10 @@ use arbiter_crypto::{
 use arbiter_proto::ClientMetadata;
 use arbiter_proto::transport::{Receiver, Sender};
 use arbiter_server::{
-    actors::{
+    actors::{GlobalActors, vault::Bootstrap},
-        GlobalActors,
-        client::{ClientConnection, ClientCredentials, auth, connect_client},
-        keyholder::Bootstrap,
-    },
     crypto::integrity,
     db::{self, schema},
+    peers::client::{ClientConnection, ClientCredentials, auth, connect_client},
 };
 use diesel::{ExpressionMethods as _, NullableExpressionMethods as _, QueryDsl as _, insert_into};
 use diesel_async::RunQueryDsl;
@@ -58,7 +55,7 @@ async fn insert_registered_client(
 
     integrity::sign_entity(
         &mut conn,
-        &actors.key_holder,
+        &actors.vault,
         &ClientCredentials {
             pubkey: pubkey.into(),
             nonce: 1,
@@ -103,7 +100,7 @@ async fn spawn_test_actors(db: &db::DatabasePool) -> GlobalActors {
 
     let actors = GlobalActors::spawn(db.clone()).await.unwrap();
     actors
-        .key_holder
+        .vault
         .ask(Bootstrap {
             seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
         })

server/crates/arbiter-server/tests/common/mod.rs

@@ -1,7 +1,7 @@
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_proto::transport::{Bi, Error, Receiver, Sender};
 use arbiter_server::{
-    actors::keyholder::KeyHolder,
+    actors::{GlobalActors, vault::Vault},
     db::{self, schema},
 };
 
@@ -11,8 +11,10 @@ use diesel_async::RunQueryDsl;
 use tokio::sync::mpsc;
 
 #[allow(dead_code)]
-pub async fn bootstrapped_keyholder(db: &db::DatabasePool) -> KeyHolder {
+pub async fn bootstrapped_vault(db: &db::DatabasePool) -> Vault {
-    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
     actor
         .bootstrap(SafeCell::new(b"test-seal-key".to_vec()))
         .await

server/crates/arbiter-server/tests/keyholder.rs

@@ -1,8 +0,0 @@
-mod common;
-
-#[path = "keyholder/concurrency.rs"]
-mod concurrency;
-#[path = "keyholder/lifecycle.rs"]
-mod lifecycle;
-#[path = "keyholder/storage.rs"]
-mod storage;

server/crates/arbiter-server/tests/user_agent/auth.rs

@@ -5,14 +5,10 @@ use arbiter_crypto::{
 
 use arbiter_proto::transport::{Receiver, Sender};
 use arbiter_server::{
-    actors::{
+    actors::{GlobalActors, bootstrap::GetToken, vault::Bootstrap},
-        GlobalActors,
-        bootstrap::GetToken,
-        keyholder::Bootstrap,
-        user_agent::{UserAgentConnection, UserAgentCredentials, auth},
-    },
     crypto::integrity,
     db::{self, schema},
+    peers::user_agent::{AuthCredentials, Credentials, UserAgentConnection, auth},
 };
 use diesel::{ExpressionMethods as _, QueryDsl, insert_into};
 use diesel_async::RunQueryDsl;
@@ -38,7 +34,7 @@ pub async fn test_bootstrap_token_auth() {
     let db = db::create_test_pool().await;
     let actors = GlobalActors::spawn(db.clone()).await.unwrap();
     actors
-        .key_holder
+        .vault
         .ask(Bootstrap {
             seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
         })
@@ -46,11 +42,11 @@ pub async fn test_bootstrap_token_auth() {
         .unwrap();
     let token = actors.bootstrapper.ask(GetToken).await.unwrap().unwrap();
 
-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
     let db_for_task = db.clone();
     let task = tokio::spawn(async move {
         let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
     });
 
     let new_key = MlDsa87::key_gen(&mut rand::rng());
@@ -88,11 +84,11 @@ pub async fn test_bootstrap_invalid_token_auth() {
     let db = db::create_test_pool().await;
     let actors = GlobalActors::spawn(db.clone()).await.unwrap();
 
-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
     let db_for_task = db.clone();
     let task = tokio::spawn(async move {
         let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
     });
 
     let new_key = MlDsa87::key_gen(&mut rand::rng());
@@ -124,7 +120,7 @@ pub async fn test_challenge_auth() {
     let db = db::create_test_pool().await;
     let actors = GlobalActors::spawn(db.clone()).await.unwrap();
     actors
-        .key_holder
+        .vault
         .ask(Bootstrap {
             seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
         })
@@ -147,10 +143,13 @@ pub async fn test_challenge_auth() {
             .unwrap();
         integrity::sign_entity(
             &mut conn,
-            &actors.key_holder,
+            &actors.vault,
-            &UserAgentCredentials {
+            &AuthCredentials {
-                pubkey: new_key.verifying_key().into(),
+                creds: Credentials {
-                nonce: 1,
+                    id,
+                    pubkey: new_key.verifying_key().into(),
+                },
+                new_nonce: 1,
             },
             id,
         )
@@ -158,11 +157,11 @@ pub async fn test_challenge_auth() {
         .unwrap();
     }
 
-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
     let db_for_task = db.clone();
     let task = tokio::spawn(async move {
         let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
     });
 
     test_transport
@@ -213,7 +212,7 @@ pub async fn test_challenge_auth_rejects_integrity_tag_mismatch_when_unsealed()
     let actors = GlobalActors::spawn(db.clone()).await.unwrap();
 
     actors
-        .key_holder
+        .vault
         .ask(Bootstrap {
             seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
         })
@@ -235,11 +234,11 @@ pub async fn test_challenge_auth_rejects_integrity_tag_mismatch_when_unsealed()
             .unwrap();
     }
 
-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
     let db_for_task = db.clone();
     let task = tokio::spawn(async move {
         let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
     });
 
     test_transport
@@ -262,7 +261,7 @@ pub async fn test_challenge_auth_rejects_invalid_signature() {
     let db = db::create_test_pool().await;
     let actors = GlobalActors::spawn(db.clone()).await.unwrap();
     actors
-        .key_holder
+        .vault
         .ask(Bootstrap {
             seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
         })
@@ -285,10 +284,13 @@ pub async fn test_challenge_auth_rejects_invalid_signature() {
             .unwrap();
         integrity::sign_entity(
             &mut conn,
-            &actors.key_holder,
+            &actors.vault,
-            &UserAgentCredentials {
+            &AuthCredentials {
-                pubkey: new_key.verifying_key().into(),
+                creds: Credentials {
-                nonce: 1,
+                    id,
+                    pubkey: new_key.verifying_key().into(),
+                },
+                new_nonce: 1,
             },
             id,
         )
@@ -296,11 +298,11 @@ pub async fn test_challenge_auth_rejects_invalid_signature() {
         .unwrap();
     }
 
-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
     let db_for_task = db.clone();
     let task = tokio::spawn(async move {
         let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
     });
 
     test_transport

server/crates/arbiter-server/tests/user_agent/unseal.rs

@@ -1,49 +1,59 @@
-use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
+use arbiter_crypto::{
+    authn,
+    safecell::{SafeCell, SafeCellHandle as _},
+};
 use arbiter_server::{
     actors::{
         GlobalActors,
-        keyholder::{Bootstrap, Seal},
+        vault::{Bootstrap, Seal},
-        user_agent::{
-            UserAgentSession,
-            session::connection::{HandleUnsealEncryptedKey, HandleUnsealRequest, UnsealError},
-        },
     },
     db,
+    peers::user_agent::{
+        AuthCredentials, Credentials,
+        vault_gate::{Error as VaultGateError, HandleHandshake, HandleUnsealEncryptedKey, VaultGate},
+    },
 };
 
 use chacha20poly1305::{AeadInPlace, XChaCha20Poly1305, XNonce, aead::KeyInit};
 use kameo::actor::Spawn as _;
+use tokio::sync::oneshot;
 use x25519_dalek::{EphemeralSecret, PublicKey};
 
-async fn setup_sealed_user_agent(
+async fn setup_sealed_gate(
     seal_key: &[u8],
-) -> (db::DatabasePool, kameo::actor::ActorRef<UserAgentSession>) {
+) -> (db::DatabasePool, kameo::actor::ActorRef<VaultGate>, oneshot::Receiver<Result<Credentials, VaultGateError>>) {
     let db = db::create_test_pool().await;
     let actors = GlobalActors::spawn(db.clone()).await.unwrap();
 
     actors
-        .key_holder
+        .vault
         .ask(Bootstrap {
             seal_key_raw: SafeCell::new(seal_key.to_vec()),
         })
         .await
         .unwrap();
-    actors.key_holder.ask(Seal).await.unwrap();
+    actors.vault.ask(Seal).await.unwrap();
 
-    let session = UserAgentSession::spawn(UserAgentSession::new_test(db.clone(), actors));
+    let (promotion_tx, promotion_rx) = oneshot::channel();
+    let pubkey = authn::SigningKey::generate().public_key();
+    let auth_creds = AuthCredentials {
+        creds: Credentials { id: 1, pubkey },
+        new_nonce: 1,
+    };
+    let gate = VaultGate::spawn(VaultGate::new(auth_creds, actors, db.clone(), promotion_tx));
 
-    (db, session)
+    (db, gate, promotion_rx)
 }
 
 async fn client_dh_encrypt(
-    user_agent: &kameo::actor::ActorRef<UserAgentSession>,
+    gate: &kameo::actor::ActorRef<VaultGate>,
     key_to_send: &[u8],
 ) -> HandleUnsealEncryptedKey {
     let client_secret = EphemeralSecret::random();
     let client_public = PublicKey::from(&client_secret);
 
-    let response = user_agent
+    let response = gate
-        .ask(HandleUnsealRequest {
+        .ask(HandleHandshake {
             client_pubkey: client_public,
         })
         .await
@@ -71,26 +81,26 @@ async fn client_dh_encrypt(
 #[test_log::test]
 pub async fn test_unseal_success() {
     let seal_key = b"test-seal-key";
-    let (_db, user_agent) = setup_sealed_user_agent(seal_key).await;
+    let (_db, gate, _promotion_rx) = setup_sealed_gate(seal_key).await;
 
-    let encrypted_key = client_dh_encrypt(&user_agent, seal_key).await;
+    let encrypted_key = client_dh_encrypt(&gate, seal_key).await;
 
-    let response = user_agent.ask(encrypted_key).await;
+    let response = gate.ask(encrypted_key).await;
     assert!(matches!(response, Ok(())));
 }
 
 #[tokio::test]
 #[test_log::test]
 pub async fn test_unseal_wrong_seal_key() {
-    let (_db, user_agent) = setup_sealed_user_agent(b"correct-key").await;
+    let (_db, gate, _promotion_rx) = setup_sealed_gate(b"correct-key").await;
 
-    let encrypted_key = client_dh_encrypt(&user_agent, b"wrong-key").await;
+    let encrypted_key = client_dh_encrypt(&gate, b"wrong-key").await;
 
-    let response = user_agent.ask(encrypted_key).await;
+    let response = gate.ask(encrypted_key).await;
     assert!(matches!(
         response,
         Err(kameo::error::SendError::HandlerError(
-            UnsealError::InvalidKey
+            VaultGateError::InvalidKey
         ))
     ));
 }
@@ -98,19 +108,18 @@ pub async fn test_unseal_wrong_seal_key() {
 #[tokio::test]
 #[test_log::test]
 pub async fn test_unseal_corrupted_ciphertext() {
-    let (_db, user_agent) = setup_sealed_user_agent(b"test-key").await;
+    let (_db, gate, _promotion_rx) = setup_sealed_gate(b"test-key").await;
 
     let client_secret = EphemeralSecret::random();
     let client_public = PublicKey::from(&client_secret);
 
-    user_agent
+    gate.ask(HandleHandshake {
-        .ask(HandleUnsealRequest {
+        client_pubkey: client_public,
-            client_pubkey: client_public,
+    })
-        })
+    .await
-        .await
+    .unwrap();
-        .unwrap();
 
-    let response = user_agent
+    let response = gate
         .ask(HandleUnsealEncryptedKey {
             nonce: vec![0u8; 24],
             ciphertext: vec![0u8; 32],
@@ -121,7 +130,7 @@ pub async fn test_unseal_corrupted_ciphertext() {
     assert!(matches!(
         response,
         Err(kameo::error::SendError::HandlerError(
-            UnsealError::InvalidKey
+            VaultGateError::InvalidKey
         ))
     ));
 }
@@ -130,24 +139,24 @@ pub async fn test_unseal_corrupted_ciphertext() {
 #[test_log::test]
 pub async fn test_unseal_retry_after_invalid_key() {
     let seal_key = b"real-seal-key";
-    let (_db, user_agent) = setup_sealed_user_agent(seal_key).await;
+    let (_db, gate, _promotion_rx) = setup_sealed_gate(seal_key).await;
 
     {
-        let encrypted_key = client_dh_encrypt(&user_agent, b"wrong-key").await;
+        let encrypted_key = client_dh_encrypt(&gate, b"wrong-key").await;
 
-        let response = user_agent.ask(encrypted_key).await;
+        let response = gate.ask(encrypted_key).await;
         assert!(matches!(
             response,
             Err(kameo::error::SendError::HandlerError(
-                UnsealError::InvalidKey
+                VaultGateError::InvalidKey
             ))
         ));
     }
 
     {
-        let encrypted_key = client_dh_encrypt(&user_agent, seal_key).await;
+        let encrypted_key = client_dh_encrypt(&gate, seal_key).await;
 
-        let response = user_agent.ask(encrypted_key).await;
+        let response = gate.ask(encrypted_key).await;
         assert!(matches!(response, Ok(())));
     }
 }

server/crates/arbiter-server/tests/vault.rs

@@ -0,0 +1,8 @@
+mod common;
+
+#[path = "vault/concurrency.rs"]
+mod concurrency;
+#[path = "vault/lifecycle.rs"]
+mod lifecycle;
+#[path = "vault/storage.rs"]
+mod storage;

server/crates/arbiter-server/tests/vault/concurrency.rs

@@ -2,7 +2,10 @@ use std::collections::{HashMap, HashSet};
 
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_server::{
-    actors::keyholder::{CreateNew, Error, KeyHolder},
+    actors::{
+        GlobalActors,
+        vault::{CreateNew, Error, Vault},
+    },
     db::{self, models, schema},
 };
 
@@ -14,7 +17,7 @@ use tokio::task::JoinSet;
 use crate::common;
 
 async fn write_concurrently(
-    actor: ActorRef<KeyHolder>,
+    actor: ActorRef<Vault>,
     prefix: &'static str,
     count: usize,
 ) -> Vec<(i32, Vec<u8>)> {
@@ -44,7 +47,7 @@ async fn write_concurrently(
 #[test_log::test]
 async fn concurrent_create_new_no_duplicate_nonces_() {
     let db = db::create_test_pool().await;
-    let actor = KeyHolder::spawn(common::bootstrapped_keyholder(&db).await);
+    let actor = Vault::spawn(common::bootstrapped_vault(&db).await);
 
     let writes = write_concurrently(actor, "nonce-unique", 32).await;
     assert_eq!(writes.len(), 32);
@@ -66,7 +69,7 @@ async fn concurrent_create_new_no_duplicate_nonces_() {
 #[test_log::test]
 async fn concurrent_create_new_root_nonce_never_moves_backward() {
     let db = db::create_test_pool().await;
-    let actor = KeyHolder::spawn(common::bootstrapped_keyholder(&db).await);
+    let actor = Vault::spawn(common::bootstrapped_vault(&db).await);
 
     write_concurrently(actor, "root-max", 24).await;
 
@@ -94,7 +97,7 @@ async fn concurrent_create_new_root_nonce_never_moves_backward() {
 #[test_log::test]
 async fn insert_failure_does_not_create_partial_row() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
     let root_key_history_id = common::root_key_history_id(&db).await;
 
     let mut conn = db.get().await.unwrap();
@@ -156,12 +159,14 @@ async fn insert_failure_does_not_create_partial_row() {
 #[test_log::test]
 async fn decrypt_roundtrip_after_high_concurrency() {
     let db = db::create_test_pool().await;
-    let actor = KeyHolder::spawn(common::bootstrapped_keyholder(&db).await);
+    let actor = Vault::spawn(common::bootstrapped_vault(&db).await);
 
     let writes = write_concurrently(actor, "roundtrip", 40).await;
     let expected: HashMap<i32, Vec<u8>> = writes.into_iter().collect();
 
-    let mut decryptor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut decryptor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
     decryptor
         .try_unseal(SafeCell::new(b"test-seal-key".to_vec()))
         .await

server/crates/arbiter-server/tests/vault/lifecycle.rs

@@ -1,6 +1,9 @@
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_server::{
-    actors::keyholder::{Error, KeyHolder},
+    actors::{
+        GlobalActors,
+        vault::{Error, Vault},
+    },
     crypto::encryption::v1::{Nonce, ROOT_KEY_TAG},
     db::{self, models, schema},
 };
@@ -14,7 +17,9 @@ use crate::common;
 #[test_log::test]
 async fn test_bootstrap() {
     let db = db::create_test_pool().await;
-    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
 
     let seal_key = SafeCell::new(b"test-seal-key".to_vec());
     actor.bootstrap(seal_key).await.unwrap();
@@ -37,7 +42,7 @@ async fn test_bootstrap() {
 #[test_log::test]
 async fn test_bootstrap_rejects_double() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
 
     let seal_key2 = SafeCell::new(b"test-seal-key".to_vec());
     let err = actor.bootstrap(seal_key2).await.unwrap_err();
@@ -48,7 +53,9 @@ async fn test_bootstrap_rejects_double() {
 #[test_log::test]
 async fn test_create_new_before_bootstrap_fails() {
     let db = db::create_test_pool().await;
-    let mut actor = KeyHolder::new(db).await.unwrap();
+    let mut actor = Vault::new(db, GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
 
     let err = actor
         .create_new(SafeCell::new(b"data".to_vec()))
@@ -61,7 +68,9 @@ async fn test_create_new_before_bootstrap_fails() {
 #[test_log::test]
 async fn test_decrypt_before_bootstrap_fails() {
     let db = db::create_test_pool().await;
-    let mut actor = KeyHolder::new(db).await.unwrap();
+    let mut actor = Vault::new(db, GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
 
     let err = actor.decrypt(1).await.unwrap_err();
     assert!(matches!(err, Error::NotBootstrapped));
@@ -71,10 +80,12 @@ async fn test_decrypt_before_bootstrap_fails() {
 #[test_log::test]
 async fn test_new_restores_sealed_state() {
     let db = db::create_test_pool().await;
-    let actor = common::bootstrapped_keyholder(&db).await;
+    let actor = common::bootstrapped_vault(&db).await;
     drop(actor);
 
-    let mut actor2 = KeyHolder::new(db).await.unwrap();
+    let mut actor2 = Vault::new(db, GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
     let err = actor2.decrypt(1).await.unwrap_err();
     assert!(matches!(err, Error::NotBootstrapped));
 }
@@ -83,7 +94,7 @@ async fn test_new_restores_sealed_state() {
 #[test_log::test]
 async fn test_unseal_correct_password() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
 
     let plaintext = b"survive a restart";
     let aead_id = actor
@@ -92,7 +103,9 @@ async fn test_unseal_correct_password() {
         .unwrap();
     drop(actor);
 
-    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
     let seal_key = SafeCell::new(b"test-seal-key".to_vec());
     actor.try_unseal(seal_key).await.unwrap();
 
@@ -104,7 +117,7 @@ async fn test_unseal_correct_password() {
 #[test_log::test]
 async fn test_unseal_wrong_then_correct_password() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
 
     let plaintext = b"important data";
     let aead_id = actor
@@ -113,7 +126,9 @@ async fn test_unseal_wrong_then_correct_password() {
         .unwrap();
     drop(actor);
 
-    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
 
     let bad_key = SafeCell::new(b"wrong-password".to_vec());
     let err = actor.try_unseal(bad_key).await.unwrap_err();

server/crates/arbiter-server/tests/vault/storage.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_server::{
-    actors::keyholder::Error,
+    actors::vault::Error,
     crypto::encryption::v1::Nonce,
     db::{self, models, schema},
 };
@@ -16,7 +16,7 @@ use crate::common;
 #[test_log::test]
 async fn test_create_decrypt_roundtrip() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
 
     let plaintext = b"hello arbiter";
     let aead_id = actor
@@ -32,7 +32,7 @@ async fn test_create_decrypt_roundtrip() {
 #[test_log::test]
 async fn test_decrypt_nonexistent_returns_not_found() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
 
     let err = actor.decrypt(9999).await.unwrap_err();
     assert!(matches!(err, Error::NotFound));
@@ -42,7 +42,7 @@ async fn test_decrypt_nonexistent_returns_not_found() {
 #[test_log::test]
 async fn test_ciphertext_differs_across_entries() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
 
     let plaintext = b"same content";
     let id1 = actor
@@ -80,7 +80,7 @@ async fn test_ciphertext_differs_across_entries() {
 #[test_log::test]
 async fn test_nonce_never_reused() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
 
     let n = 5;
     for i in 0..n {
@@ -124,7 +124,7 @@ async fn test_nonce_never_reused() {
 #[test_log::test]
 async fn broken_db_nonce_format_fails_closed() {
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
     let root_key_history_id = common::root_key_history_id(&db).await;
 
     let mut conn = db.get().await.unwrap();
@@ -145,7 +145,7 @@ async fn broken_db_nonce_format_fails_closed() {
     assert!(matches!(err, Error::BrokenDatabase));
 
     let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
     let id = actor
         .create_new(SafeCell::new(b"decrypt target".to_vec()))
         .await

useragent/flutter_rust_bridge.yaml

@@ -0,0 +1,3 @@
+rust_input: crate::api
+rust_root: rust/
+dart_output: lib/src/rust

useragent/lib/features/callouts/callout_event.dart

@@ -18,7 +18,6 @@ sealed class CalloutEvent with _$CalloutEvent {
     required CalloutData data,
   }) = CalloutEventAdded;
 
-  const factory CalloutEvent.cancelled({
+  const factory CalloutEvent.cancelled({required String id}) =
-    required String id,
+      CalloutEventCancelled;
-  }) = CalloutEventCancelled;
 }

useragent/lib/features/callouts/show_callout.dart

@@ -14,11 +14,8 @@ Future<void> showCallout(BuildContext context, WidgetRef ref, String id) async {
     barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
     barrierColor: Colors.transparent,
     transitionDuration: const Duration(milliseconds: 320),
-    pageBuilder: (_, animation, _) => _CalloutOverlay(
+    pageBuilder: (_, animation, _) =>
-      id: id,
+        _CalloutOverlay(id: id, data: data, animation: animation),
-      data: data,
-      animation: animation,
-    ),
   );
 }
 
@@ -35,22 +32,25 @@ class _CalloutOverlay extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    ref.listen(
+    ref.listen(calloutManagerProvider.select((map) => map.containsKey(id)), (
-      calloutManagerProvider.select((map) => map.containsKey(id)),
+      wasPresent,
-      (wasPresent, isPresent) {
+      isPresent,
-        if (wasPresent == true && !isPresent && context.mounted) {
+    ) {
-          Navigator.of(context).pop();
+      if (wasPresent == true && !isPresent && context.mounted) {
-        }
+        Navigator.of(context).pop();
-      },
+      }
-    );
+    });
 
     final content = switch (data) {
-      ConnectApprovalData(:final pubkey, :final clientInfo) => SdkConnectCallout(
+      ConnectApprovalData(:final pubkey, :final clientInfo) =>
-        pubkey: pubkey,
+        SdkConnectCallout(
-        clientInfo: clientInfo,
+          pubkey: pubkey,
-        onAccept: () => ref.read(calloutManagerProvider.notifier).sendDecision(id, true),
+          clientInfo: clientInfo,
-        onDecline: () => ref.read(calloutManagerProvider.notifier).sendDecision(id, false),
+          onAccept: () =>
-      ),
+              ref.read(calloutManagerProvider.notifier).sendDecision(id, true),
+          onDecline: () =>
+              ref.read(calloutManagerProvider.notifier).sendDecision(id, false),
+        ),
     };
 
     final barrierAnim = CurvedAnimation(

useragent/lib/features/callouts/show_callout_list.dart

@@ -14,7 +14,8 @@ Future<void> showCalloutList(BuildContext context, WidgetRef ref) async {
     barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
     barrierColor: Colors.transparent,
     transitionDuration: const Duration(milliseconds: 280),
-    pageBuilder: (_, animation, __) => _CalloutListOverlay(animation: animation),
+    pageBuilder: (_, animation, __) =>
+        _CalloutListOverlay(animation: animation),
   );
 
   if (selectedId != null && context.mounted) {
@@ -51,7 +52,9 @@ class _CalloutListOverlay extends ConsumerWidget {
               child: AnimatedBuilder(
                 animation: barrierAnim,
                 builder: (_, __) => ColoredBox(
-                  color: Colors.black.withValues(alpha: 0.35 * barrierAnim.value),
+                  color: Colors.black.withValues(
+                    alpha: 0.35 * barrierAnim.value,
+                  ),
                 ),
               ),
             ),

useragent/lib/features/connection/arbiter_url.dart

@@ -50,7 +50,9 @@ class ArbiterUrl {
     try {
       return base64Url.decode(base64Url.normalize(cert));
     } on FormatException catch (error) {
-      throw FormatException("Invalid base64 in 'cert' query parameter: ${error.message}");
+      throw FormatException(
+        "Invalid base64 in 'cert' query parameter: ${error.message}",
+      );
     }
   }
 }

useragent/lib/features/connection/auth.dart

@@ -61,11 +61,6 @@ Future<Connection> connectAndAuthorize(
     final req = ua_auth.AuthChallengeRequest(
       pubkey: pubkey,
       bootstrapToken: bootstrapToken,
-      keyType: switch (key.alg) {
-        KeyAlgorithm.rsa => ua_auth.KeyType.KEY_TYPE_RSA,
-        KeyAlgorithm.ecdsa => ua_auth.KeyType.KEY_TYPE_ECDSA_SECP256K1,
-        KeyAlgorithm.ed25519 => ua_auth.KeyType.KEY_TYPE_ED25519,
-      },
     );
     final response = await connection.ask(
       UserAgentRequest(auth: ua_auth.Request(challengeRequest: req)),
@@ -106,7 +101,9 @@ Future<Connection> connectAndAuthorize(
     final solutionResponse = await connection.ask(
       UserAgentRequest(
         auth: ua_auth.Request(
-          challengeSolution: ua_auth.AuthChallengeSolution(signature: signature),
+          challengeSolution: ua_auth.AuthChallengeSolution(
+            signature: signature,
+          ),
         ),
       ),
     );

useragent/lib/features/connection/connection.dart

@@ -85,7 +85,9 @@ class Connection {
     if (response.hasId()) {
       final completer = _pendingRequests.remove(response.id);
       if (completer == null) {
-        talker.warning('Received response for unknown request id ${response.id}');
+        talker.warning(
+          'Received response for unknown request id ${response.id}',
+        );
         return;
       }
       completer.complete(response);

useragent/lib/features/connection/evm.dart

@@ -9,9 +9,7 @@ Future<List<WalletEntry>> listEvmWallets(Connection connection) async {
     UserAgentRequest(evm: ua_evm.Request(walletList: Empty())),
   );
   if (!response.hasEvm()) {
-    throw Exception(
+    throw Exception('Expected EVM response, got ${response.whichPayload()}');
-      'Expected EVM response, got ${response.whichPayload()}',
-    );
   }
 
   final evmResponse = response.evm;
@@ -37,9 +35,7 @@ Future<void> createEvmWallet(Connection connection) async {
     UserAgentRequest(evm: ua_evm.Request(walletCreate: Empty())),
   );
   if (!response.hasEvm()) {
-    throw Exception(
+    throw Exception('Expected EVM response, got ${response.whichPayload()}');
-      'Expected EVM response, got ${response.whichPayload()}',
-    );
   }
 
   final evmResponse = response.evm;

useragent/lib/features/connection/evm/grants.dart

@@ -10,9 +10,7 @@ Future<List<GrantEntry>> listEvmGrants(Connection connection) async {
     UserAgentRequest(evm: ua_evm.Request(grantList: request)),
   );
   if (!response.hasEvm()) {
-    throw Exception(
+    throw Exception('Expected EVM response, got ${response.whichPayload()}');
-      'Expected EVM response, got ${response.whichPayload()}',
-    );
   }
 
   final evmResponse = response.evm;
@@ -50,9 +48,7 @@ Future<int> createEvmGrant(
   final resp = await connection.ask(request);
 
   if (!resp.hasEvm()) {
-    throw Exception(
+    throw Exception('Expected EVM response, got ${resp.whichPayload()}');
-      'Expected EVM response, got ${resp.whichPayload()}',
-    );
   }
 
   final evmResponse = resp.evm;
@@ -70,15 +66,11 @@ Future<int> createEvmGrant(
 Future<void> deleteEvmGrant(Connection connection, int grantId) async {
   final response = await connection.ask(
     UserAgentRequest(
-      evm: ua_evm.Request(
+      evm: ua_evm.Request(grantDelete: EvmGrantDeleteRequest(grantId: grantId)),
-        grantDelete: EvmGrantDeleteRequest(grantId: grantId),
-      ),
     ),
   );
   if (!response.hasEvm()) {
-    throw Exception(
+    throw Exception('Expected EVM response, got ${response.whichPayload()}');
-      'Expected EVM response, got ${response.whichPayload()}',
-    );
   }
 
   final evmResponse = response.evm;

useragent/lib/features/connection/evm/wallet_access.dart

@@ -8,9 +8,7 @@ Future<Set<int>> readClientWalletAccess(
   required int clientId,
 }) async {
   final response = await connection.ask(
-    UserAgentRequest(
+    UserAgentRequest(sdkClient: ua_sdk.Request(listWalletAccess: Empty())),
-      sdkClient: ua_sdk.Request(listWalletAccess: Empty()),
-    ),
   );
   if (!response.hasSdkClient()) {
     throw Exception(
@@ -33,9 +31,7 @@ Future<List<ua_sdk.WalletAccessEntry>> listAllWalletAccesses(
   Connection connection,
 ) async {
   final response = await connection.ask(
-    UserAgentRequest(
+    UserAgentRequest(sdkClient: ua_sdk.Request(listWalletAccess: Empty())),
-      sdkClient: ua_sdk.Request(listWalletAccess: Empty()),
-    ),
   );
   if (!response.hasSdkClient()) {
     throw Exception(
@@ -81,9 +77,7 @@ Future<void> writeClientWalletAccess(
       UserAgentRequest(
         sdkClient: ua_sdk.Request(
           revokeWalletAccess: ua_sdk.RevokeWalletAccess(
-            accesses: [
+            accesses: [for (final walletId in toRevoke) walletId],
-              for (final walletId in toRevoke) walletId,
-            ],
           ),
         ),
       ),

useragent/lib/features/connection/server_info_storage.dart

@@ -17,9 +17,9 @@ class StoredServerInfo {
   final int port;
   final String caCertFingerprint;
 
-  factory StoredServerInfo.fromJson(Map<String, dynamic> json) => _$StoredServerInfoFromJson(json);
+  factory StoredServerInfo.fromJson(Map<String, dynamic> json) =>
+      _$StoredServerInfoFromJson(json);
   Map<String, dynamic> toJson() => _$StoredServerInfoToJson(this);
-  
 }
 
 abstract class ServerInfoStorage {

useragent/lib/features/connection/vault.dart

@@ -1,5 +1,6 @@
 import 'package:arbiter/features/connection/connection.dart';
-import 'package:arbiter/proto/user_agent/vault/bootstrap.pb.dart' as ua_bootstrap;
+import 'package:arbiter/proto/user_agent/vault/bootstrap.pb.dart'
+    as ua_bootstrap;
 import 'package:arbiter/proto/user_agent/vault/unseal.pb.dart' as ua_unseal;
 import 'package:arbiter/proto/user_agent/vault/vault.pb.dart' as ua_vault;
 import 'package:arbiter/proto/user_agent.pb.dart';
@@ -27,9 +28,7 @@ Future<ua_bootstrap.BootstrapResult> bootstrapVault(
     ),
   );
   if (!response.hasVault()) {
-    throw Exception(
+    throw Exception('Expected vault response, got ${response.whichPayload()}');
-      'Expected vault response, got ${response.whichPayload()}',
-    );
   }
 
   final vaultResponse = response.vault;

useragent/lib/features/identity/hazmat_mldsa.dart

@@ -0,0 +1,71 @@
+import 'dart:convert';
+
+import 'package:arbiter/src/rust/api.dart';
+import 'package:cryptography/cryptography.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:arbiter/features/identity/pk_manager.dart';
+
+final storage = FlutterSecureStorage(
+  aOptions: AndroidOptions.biometric(
+    enforceBiometrics: true,
+    biometricPromptTitle: 'Authentication Required',
+  ),
+  mOptions: MacOsOptions(
+    accessibility: KeychainAccessibility.unlocked_this_device,
+    label: "Arbiter",
+    description: "Confirm your identity to access vault",
+    synchronizable: false,
+    accessControlFlags: [AccessControlFlag.userPresence],
+    usesDataProtectionKeychain: true,
+  ),
+);
+
+class HazmatMldsa extends KeyHandle {
+  final MldsaKey _key;
+
+  HazmatMldsa({required MldsaKey key}) : _key = key;
+
+  @override
+  Future<List<int>> getPublicKey() async {
+    final publicKey = await _key.getPublicKey();
+    return publicKey;
+  }
+
+  @override
+  Future<List<int>> sign(List<int> data) async {
+    final signature = await _key.sign(message: data);
+    return signature;
+  }
+}
+
+class HazmatMLDSAManager extends KeyManager {
+  static const _storageKey = "ed25519_identity";
+
+  @override
+  Future<KeyHandle> create() async {
+    final storedKey = await get();
+    if (storedKey != null) {
+      return storedKey;
+    }
+
+    final newKeypair = await MldsaKey.generate();
+    final keyBytes = await newKeypair.toBytes();
+
+    await storage.write(key: _storageKey, value: base64Encode(keyBytes));
+
+    return HazmatMldsa(key: newKeypair);
+  }
+
+  @override
+  Future<KeyHandle?> get() async {
+    final storedKeyPair = await storage.read(key: _storageKey);
+    if (storedKeyPair == null) {
+      return null;
+    }
+
+    final keyBytes = base64Decode(storedKeyPair);
+    final key = await MldsaKey.fromBytes(bytes: keyBytes);
+
+    return HazmatMldsa(key: key);
+  }
+}

useragent/lib/features/identity/pk_manager.dart

@@ -1,11 +1,6 @@
-enum KeyAlgorithm {
-  rsa, ecdsa, ed25519
-}
-
 // The API to handle without storing the private key in memory.
 //The implementation will use platform-specific secure storage and signing capabilities.
 abstract class KeyHandle {
-  KeyAlgorithm get alg;
   Future<List<int>> sign(List<int> data);
   Future<List<int>> getPublicKey();
 }

useragent/lib/features/identity/simple_ed25519.dart

@@ -1,93 +0,0 @@
-import 'dart:convert';
-
-import 'package:cryptography/cryptography.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:arbiter/features/identity/pk_manager.dart';
-
-final storage = FlutterSecureStorage(
-  aOptions: AndroidOptions.biometric(
-    enforceBiometrics: true,
-    biometricPromptTitle: 'Authentication Required',
-  ),
-  mOptions: MacOsOptions(
-    accessibility: KeychainAccessibility.unlocked_this_device,
-    label: "Arbiter",
-    description: "Confirm your identity to access vault",
-    synchronizable: false,
-    accessControlFlags: [
-      AccessControlFlag.userPresence,
-    ],
-    usesDataProtectionKeychain: true,
-  ),
-);
-
-final processor = Ed25519();
-
-class SimpleEd25519 extends KeyHandle {
-  final SimpleKeyPair _keyPair;
-
-  SimpleEd25519({required SimpleKeyPair keyPair}) : _keyPair = keyPair;
-
-  @override
-  KeyAlgorithm get alg => KeyAlgorithm.ed25519;
-
-  @override
-  Future<List<int>> getPublicKey() async {
-    final publicKey = await _keyPair.extractPublicKey();
-    return publicKey.bytes;
-  }
-
-  @override
-  Future<List<int>> sign(List<int> data) async {
-    final signature = await processor.sign(data, keyPair: _keyPair);
-    return signature.bytes;
-  }
-}
-
-class SimpleEd25519Manager extends KeyManager {
-  static const _storageKey = "ed25519_identity";
-  static const _storagePublicKey = "ed25519_public_key";
-
-  @override
-  Future<KeyHandle> create() async {
-    final storedKey = await get();
-    if (storedKey != null) {
-      return storedKey;
-    }
-
-    final newKey = await processor.newKeyPair();
-    final rawKey = await newKey.extract();
-
-    final keyData = base64Encode(rawKey.bytes);
-    await storage.write(key: _storageKey, value: keyData);
-
-    final publicKeyData = base64Encode(rawKey.publicKey.bytes);
-    await storage.write(key: _storagePublicKey, value: publicKeyData);
-
-    return SimpleEd25519(keyPair: newKey);
-  }
-
-  @override
-  Future<KeyHandle?> get() async {
-    final storedKeyPair = await storage.read(key: _storageKey);
-    if (storedKeyPair == null) {
-      return null;
-    }
-
-    final publicKeyData = await storage.read(key: _storagePublicKey);
-    final publicKeyRaw = base64Decode(publicKeyData!);
-    final publicKey = SimplePublicKey(
-      publicKeyRaw,
-      type: processor.keyPairType,
-    );
-
-    final keyBytes = base64Decode(storedKeyPair);
-    final keypair = SimpleKeyPairData(
-      keyBytes,
-      publicKey: publicKey,
-      type: processor.keyPairType,
-    );
-
-    return SimpleEd25519(keyPair: keypair);
-  }
-}

useragent/lib/main.dart

@@ -1,10 +1,12 @@
 import 'package:arbiter/router.dart';
+import 'package:arbiter/src/rust/frb_generated.dart';
 import 'package:flutter/material.dart' hide Router;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:sizer/sizer.dart';
 
-void main() {
+Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  await RustLib.init();
   runApp(const ProviderScope(child: App()));
 }
 
@@ -33,3 +35,5 @@ class _AppState extends State<App> {
     );
   }
 }
+
+

useragent/lib/proto/shared/evm.pb.dart

@@ -414,6 +414,79 @@ class GasLimitExceededViolation extends $pb.GeneratedMessage {
   void clearMaxPriorityFeePerGas() => $_clearField(2);
 }
 
+class EvalViolation_ChainIdMismatch extends $pb.GeneratedMessage {
+  factory EvalViolation_ChainIdMismatch({
+    $fixnum.Int64? expected,
+    $fixnum.Int64? actual,
+  }) {
+    final result = create();
+    if (expected != null) result.expected = expected;
+    if (actual != null) result.actual = actual;
+    return result;
+  }
+
+  EvalViolation_ChainIdMismatch._();
+
+  factory EvalViolation_ChainIdMismatch.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EvalViolation_ChainIdMismatch.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EvalViolation.ChainIdMismatch',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'arbiter.shared.evm'),
+      createEmptyInstance: create)
+    ..a<$fixnum.Int64>(
+        1, _omitFieldNames ? '' : 'expected', $pb.PbFieldType.OU6,
+        defaultOrMaker: $fixnum.Int64.ZERO)
+    ..a<$fixnum.Int64>(2, _omitFieldNames ? '' : 'actual', $pb.PbFieldType.OU6,
+        defaultOrMaker: $fixnum.Int64.ZERO)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EvalViolation_ChainIdMismatch clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EvalViolation_ChainIdMismatch copyWith(
+          void Function(EvalViolation_ChainIdMismatch) updates) =>
+      super.copyWith(
+              (message) => updates(message as EvalViolation_ChainIdMismatch))
+          as EvalViolation_ChainIdMismatch;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static EvalViolation_ChainIdMismatch create() =>
+      EvalViolation_ChainIdMismatch._();
+  @$core.override
+  EvalViolation_ChainIdMismatch createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static EvalViolation_ChainIdMismatch getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EvalViolation_ChainIdMismatch>(create);
+  static EvalViolation_ChainIdMismatch? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $fixnum.Int64 get expected => $_getI64(0);
+  @$pb.TagNumber(1)
+  set expected($fixnum.Int64 value) => $_setInt64(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasExpected() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearExpected() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $fixnum.Int64 get actual => $_getI64(1);
+  @$pb.TagNumber(2)
+  set actual($fixnum.Int64 value) => $_setInt64(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasActual() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearActual() => $_clearField(2);
+}
+
 enum EvalViolation_Kind {
   invalidTarget,
   gasLimitExceeded,
@@ -421,6 +494,7 @@ enum EvalViolation_Kind {
   volumetricLimitExceeded,
   invalidTime,
   invalidTransactionType,
+  chainIdMismatch,
   notSet
 }
 
@@ -432,6 +506,7 @@ class EvalViolation extends $pb.GeneratedMessage {
     $0.Empty? volumetricLimitExceeded,
     $0.Empty? invalidTime,
     $0.Empty? invalidTransactionType,
+    EvalViolation_ChainIdMismatch? chainIdMismatch,
   }) {
     final result = create();
     if (invalidTarget != null) result.invalidTarget = invalidTarget;
@@ -442,6 +517,7 @@ class EvalViolation extends $pb.GeneratedMessage {
     if (invalidTime != null) result.invalidTime = invalidTime;
     if (invalidTransactionType != null)
       result.invalidTransactionType = invalidTransactionType;
+    if (chainIdMismatch != null) result.chainIdMismatch = chainIdMismatch;
     return result;
   }
 
@@ -462,6 +538,7 @@ class EvalViolation extends $pb.GeneratedMessage {
     4: EvalViolation_Kind.volumetricLimitExceeded,
     5: EvalViolation_Kind.invalidTime,
     6: EvalViolation_Kind.invalidTransactionType,
+    7: EvalViolation_Kind.chainIdMismatch,
     0: EvalViolation_Kind.notSet
   };
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
@@ -469,7 +546,7 @@ class EvalViolation extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'arbiter.shared.evm'),
       createEmptyInstance: create)
-    ..oo(0, [1, 2, 3, 4, 5, 6])
+    ..oo(0, [1, 2, 3, 4, 5, 6, 7])
     ..a<$core.List<$core.int>>(
         1, _omitFieldNames ? '' : 'invalidTarget', $pb.PbFieldType.OY)
     ..aOM<GasLimitExceededViolation>(
@@ -483,6 +560,9 @@ class EvalViolation extends $pb.GeneratedMessage {
         subBuilder: $0.Empty.create)
     ..aOM<$0.Empty>(6, _omitFieldNames ? '' : 'invalidTransactionType',
         subBuilder: $0.Empty.create)
+    ..aOM<EvalViolation_ChainIdMismatch>(
+        7, _omitFieldNames ? '' : 'chainIdMismatch',
+        subBuilder: EvalViolation_ChainIdMismatch.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@@ -510,6 +590,7 @@ class EvalViolation extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   @$pb.TagNumber(5)
   @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
   EvalViolation_Kind whichKind() => _EvalViolation_KindByTag[$_whichOneof(0)]!;
   @$pb.TagNumber(1)
   @$pb.TagNumber(2)
@@ -517,6 +598,7 @@ class EvalViolation extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   @$pb.TagNumber(5)
   @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
   void clearKind() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -582,6 +664,18 @@ class EvalViolation extends $pb.GeneratedMessage {
   void clearInvalidTransactionType() => $_clearField(6);
   @$pb.TagNumber(6)
   $0.Empty ensureInvalidTransactionType() => $_ensure(5);
+
+  @$pb.TagNumber(7)
+  EvalViolation_ChainIdMismatch get chainIdMismatch => $_getN(6);
+  @$pb.TagNumber(7)
+  set chainIdMismatch(EvalViolation_ChainIdMismatch value) =>
+      $_setField(7, value);
+  @$pb.TagNumber(7)
+  $core.bool hasChainIdMismatch() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearChainIdMismatch() => $_clearField(7);
+  @$pb.TagNumber(7)
+  EvalViolation_ChainIdMismatch ensureChainIdMismatch() => $_ensure(6);
 }
 
 /// Transaction was classified but no grant covers it

useragent/lib/proto/shared/evm.pbjson.dart

@@ -195,12 +195,31 @@ const EvalViolation$json = {
       '9': 0,
       '10': 'invalidTransactionType'
     },
+    {
+      '1': 'chain_id_mismatch',
+      '3': 7,
+      '4': 1,
+      '5': 11,
+      '6': '.arbiter.shared.evm.EvalViolation.ChainIdMismatch',
+      '9': 0,
+      '10': 'chainIdMismatch'
+    },
   ],
+  '3': [EvalViolation_ChainIdMismatch$json],
   '8': [
     {'1': 'kind'},
   ],
 };
 
+@$core.Deprecated('Use evalViolationDescriptor instead')
+const EvalViolation_ChainIdMismatch$json = {
+  '1': 'ChainIdMismatch',
+  '2': [
+    {'1': 'expected', '3': 1, '4': 1, '5': 4, '10': 'expected'},
+    {'1': 'actual', '3': 2, '4': 1, '5': 4, '10': 'actual'},
+  ],
+};
+
 /// Descriptor for `EvalViolation`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List evalViolationDescriptor = $convert.base64Decode(
     'Cg1FdmFsVmlvbGF0aW9uEicKDmludmFsaWRfdGFyZ2V0GAEgASgMSABSDWludmFsaWRUYXJnZX'
@@ -211,7 +230,10 @@ final $typed_data.Uint8List evalViolationDescriptor = $convert.base64Decode(
     'YuRW1wdHlIAFIXdm9sdW1ldHJpY0xpbWl0RXhjZWVkZWQSOwoMaW52YWxpZF90aW1lGAUgASgL'
     'MhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5SABSC2ludmFsaWRUaW1lElIKGGludmFsaWRfdHJhbn'
     'NhY3Rpb25fdHlwZRgGIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAUhZpbnZhbGlkVHJh'
-    'bnNhY3Rpb25UeXBlQgYKBGtpbmQ=');
+    'bnNhY3Rpb25UeXBlEl8KEWNoYWluX2lkX21pc21hdGNoGAcgASgLMjEuYXJiaXRlci5zaGFyZW'
+    'QuZXZtLkV2YWxWaW9sYXRpb24uQ2hhaW5JZE1pc21hdGNoSABSD2NoYWluSWRNaXNtYXRjaBpF'
+    'Cg9DaGFpbklkTWlzbWF0Y2gSGgoIZXhwZWN0ZWQYASABKARSCGV4cGVjdGVkEhYKBmFjdHVhbB'
+    'gCIAEoBFIGYWN0dWFsQgYKBGtpbmQ=');
 
 @$core.Deprecated('Use noMatchingGrantErrorDescriptor instead')
 const NoMatchingGrantError$json = {

useragent/lib/proto/user_agent/auth.pb.dart

@@ -24,12 +24,10 @@ class AuthChallengeRequest extends $pb.GeneratedMessage {
   factory AuthChallengeRequest({
     $core.List<$core.int>? pubkey,
     $core.String? bootstrapToken,
-    KeyType? keyType,
   }) {
     final result = create();
     if (pubkey != null) result.pubkey = pubkey;
     if (bootstrapToken != null) result.bootstrapToken = bootstrapToken;
-    if (keyType != null) result.keyType = keyType;
     return result;
   }
 
@@ -50,8 +48,6 @@ class AuthChallengeRequest extends $pb.GeneratedMessage {
     ..a<$core.List<$core.int>>(
         1, _omitFieldNames ? '' : 'pubkey', $pb.PbFieldType.OY)
     ..aOS(2, _omitFieldNames ? '' : 'bootstrapToken')
-    ..aE<KeyType>(3, _omitFieldNames ? '' : 'keyType',
-        enumValues: KeyType.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
@@ -90,15 +86,6 @@ class AuthChallengeRequest extends $pb.GeneratedMessage {
   $core.bool hasBootstrapToken() => $_has(1);
   @$pb.TagNumber(2)
   void clearBootstrapToken() => $_clearField(2);
-
-  @$pb.TagNumber(3)
-  KeyType get keyType => $_getN(2);
-  @$pb.TagNumber(3)
-  set keyType(KeyType value) => $_setField(3, value);
-  @$pb.TagNumber(3)
-  $core.bool hasKeyType() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearKeyType() => $_clearField(3);
 }
 
 class AuthChallenge extends $pb.GeneratedMessage {

useragent/lib/proto/user_agent/auth.pbenum.dart

@@ -14,31 +14,6 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-class KeyType extends $pb.ProtobufEnum {
-  static const KeyType KEY_TYPE_UNSPECIFIED =
-      KeyType._(0, _omitEnumNames ? '' : 'KEY_TYPE_UNSPECIFIED');
-  static const KeyType KEY_TYPE_ED25519 =
-      KeyType._(1, _omitEnumNames ? '' : 'KEY_TYPE_ED25519');
-  static const KeyType KEY_TYPE_ECDSA_SECP256K1 =
-      KeyType._(2, _omitEnumNames ? '' : 'KEY_TYPE_ECDSA_SECP256K1');
-  static const KeyType KEY_TYPE_RSA =
-      KeyType._(3, _omitEnumNames ? '' : 'KEY_TYPE_RSA');
-
-  static const $core.List<KeyType> values = <KeyType>[
-    KEY_TYPE_UNSPECIFIED,
-    KEY_TYPE_ED25519,
-    KEY_TYPE_ECDSA_SECP256K1,
-    KEY_TYPE_RSA,
-  ];
-
-  static final $core.List<KeyType?> _byValue =
-      $pb.ProtobufEnum.$_initByValueList(values, 3);
-  static KeyType? valueOf($core.int value) =>
-      value < 0 || value >= _byValue.length ? null : _byValue[value];
-
-  const KeyType._(super.value, super.name);
-}
-
 class AuthResult extends $pb.ProtobufEnum {
   static const AuthResult AUTH_RESULT_UNSPECIFIED =
       AuthResult._(0, _omitEnumNames ? '' : 'AUTH_RESULT_UNSPECIFIED');

useragent/lib/proto/user_agent/auth.pbjson.dart

@@ -15,22 +15,6 @@ import 'dart:convert' as $convert;
 import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
-@$core.Deprecated('Use keyTypeDescriptor instead')
-const KeyType$json = {
-  '1': 'KeyType',
-  '2': [
-    {'1': 'KEY_TYPE_UNSPECIFIED', '2': 0},
-    {'1': 'KEY_TYPE_ED25519', '2': 1},
-    {'1': 'KEY_TYPE_ECDSA_SECP256K1', '2': 2},
-    {'1': 'KEY_TYPE_RSA', '2': 3},
-  ],
-};
-
-/// Descriptor for `KeyType`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List keyTypeDescriptor = $convert.base64Decode(
-    'CgdLZXlUeXBlEhgKFEtFWV9UWVBFX1VOU1BFQ0lGSUVEEAASFAoQS0VZX1RZUEVfRUQyNTUxOR'
-    'ABEhwKGEtFWV9UWVBFX0VDRFNBX1NFQ1AyNTZLMRACEhAKDEtFWV9UWVBFX1JTQRAD');
-
 @$core.Deprecated('Use authResultDescriptor instead')
 const AuthResult$json = {
   '1': 'AuthResult',
@@ -67,14 +51,6 @@ const AuthChallengeRequest$json = {
       '10': 'bootstrapToken',
       '17': true
     },
-    {
-      '1': 'key_type',
-      '3': 3,
-      '4': 1,
-      '5': 14,
-      '6': '.arbiter.user_agent.auth.KeyType',
-      '10': 'keyType'
-    },
   ],
   '8': [
     {'1': '_bootstrap_token'},
@@ -84,9 +60,8 @@ const AuthChallengeRequest$json = {
 /// Descriptor for `AuthChallengeRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List authChallengeRequestDescriptor = $convert.base64Decode(
     'ChRBdXRoQ2hhbGxlbmdlUmVxdWVzdBIWCgZwdWJrZXkYASABKAxSBnB1YmtleRIsCg9ib290c3'
-    'RyYXBfdG9rZW4YAiABKAlIAFIOYm9vdHN0cmFwVG9rZW6IAQESOwoIa2V5X3R5cGUYAyABKA4y'
+    'RyYXBfdG9rZW4YAiABKAlIAFIOYm9vdHN0cmFwVG9rZW6IAQFCEgoQX2Jvb3RzdHJhcF90b2tl'
-    'IC5hcmJpdGVyLnVzZXJfYWdlbnQuYXV0aC5LZXlUeXBlUgdrZXlUeXBlQhIKEF9ib290c3RyYX'
+    'bg==');
-    'BfdG9rZW4=');
 
 @$core.Deprecated('Use authChallengeDescriptor instead')
 const AuthChallenge$json = {

useragent/lib/providers/connection/bootstrap_token.dart

@@ -1,5 +1,3 @@
-
-
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'bootstrap_token.g.dart';

useragent/lib/providers/evm/evm.dart

@@ -2,7 +2,6 @@ import 'package:arbiter/features/connection/evm.dart' as evm;
 import 'package:arbiter/proto/evm.pb.dart';
 import 'package:arbiter/providers/connection/connection_manager.dart';
 import 'package:hooks_riverpod/experimental/mutation.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'evm.g.dart';
@@ -35,7 +34,7 @@ final createEvmWallet = Mutation();
 
 Future<void> executeCreateEvmWallet(MutationTarget target) async {
   return await createEvmWallet.run(target, (tsx) async {
-       final connection = await tsx.get(connectionManagerProvider.future);
+    final connection = await tsx.get(connectionManagerProvider.future);
     if (connection == null) {
       throw Exception('Not connected to the server.');
     }

useragent/lib/providers/key.dart

@@ -1,13 +1,13 @@
 import 'package:mtcore/markettakers.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:arbiter/features/identity/pk_manager.dart';
-import 'package:arbiter/features/identity/simple_ed25519.dart';
+import 'package:arbiter/features/identity/hazmat_mldsa.dart';
 
 part 'key.g.dart';
 
 @riverpod
 KeyManager keyManager(Ref ref) {
-  return SimpleEd25519Manager();
+  return HazmatMLDSAManager();
 }
 
 @Riverpod(keepAlive: true)

useragent/lib/providers/sdk_clients/list.dart

@@ -18,9 +18,7 @@ Future<List<ua_sdk.Entry>?> sdkClients(Ref ref) async {
   );
 
   if (!resp.hasSdkClient()) {
-    throw Exception(
+    throw Exception('Expected SDK client response, got ${resp.whichPayload()}');
-      'Expected SDK client response, got ${resp.whichPayload()}',
-    );
   }
   final sdkClientResponse = resp.sdkClient;
   if (!sdkClientResponse.hasList()) {

useragent/lib/providers/server_info.dart

@@ -46,6 +46,8 @@ class ServerInfo extends _$ServerInfo {
 
   Future<String> _fingerprint(List<int> caCert) async {
     final digest = await Sha256().hash(caCert);
-    return digest.bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
+    return digest.bytes
+        .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+        .join();
   }
 }

useragent/lib/screens/callouts/sdk_connect.dart

@@ -28,8 +28,7 @@ class SdkConnectCallout extends StatelessWidget {
 
     final hasDescription =
         clientInfo.hasDescription() && clientInfo.description.isNotEmpty;
-    final hasVersion =
+    final hasVersion = clientInfo.hasVersion() && clientInfo.version.isNotEmpty;
-        clientInfo.hasVersion() && clientInfo.version.isNotEmpty;
     final showInfoCard = hasDescription || hasVersion;
 
     return CreamFrame(
@@ -74,10 +73,7 @@ class SdkConnectCallout extends StatelessWidget {
                 borderRadius: BorderRadius.circular(14),
                 border: Border.all(color: Palette.line),
               ),
-              padding: EdgeInsets.symmetric(
+              padding: EdgeInsets.symmetric(horizontal: 1.6.w, vertical: 1.2.h),
-                horizontal: 1.6.w,
-                vertical: 1.2.h,
-              ),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 spacing: 0.6.h,

useragent/lib/screens/dashboard.dart

@@ -78,7 +78,7 @@ class DashboardRouter extends StatelessWidget {
 }
 
 class _CalloutBell extends ConsumerWidget {
-  const _CalloutBell({super.key});
+  const _CalloutBell();
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

useragent/lib/screens/dashboard/clients/details.dart

@@ -1,4 +1,3 @@
-
 import 'package:arbiter/proto/user_agent/sdk_client.pb.dart' as ua_sdk;
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
@@ -13,5 +12,4 @@ class ClientDetails extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     throw UnimplementedError();
   }
-
 }

useragent/lib/screens/dashboard/clients/details/widgets/client_summary_card.dart

@@ -12,30 +12,24 @@ class ClientSummaryCard extends StatelessWidget {
     return CreamFrame(
       padding: const EdgeInsets.all(20),
       child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
+        children: [
-            Text(
+          Text(client.info.name, style: Theme.of(context).textTheme.titleLarge),
-              client.info.name,
+          const SizedBox(height: 8),
-              style: Theme.of(context).textTheme.titleLarge,
+          Text(client.info.description),
-            ),
+          const SizedBox(height: 16),
-            const SizedBox(height: 8),
+          Wrap(
-            Text(client.info.description),
+            runSpacing: 8,
-            const SizedBox(height: 16),
+            spacing: 16,
-            Wrap(
+            children: [
-              runSpacing: 8,
+              _Fact(label: 'Client ID', value: '${client.id}'),
-              spacing: 16,
+              _Fact(label: 'Version', value: client.info.version),
-              children: [
+              _Fact(label: 'Registered', value: _formatDate(client.createdAt)),
-                _Fact(label: 'Client ID', value: '${client.id}'),
+              _Fact(label: 'Pubkey', value: _shortPubkey(client.pubkey)),
-                _Fact(label: 'Version', value: client.info.version),
+            ],
-                _Fact(
+          ),
-                  label: 'Registered',
+        ],
-                  value: _formatDate(client.createdAt),
+      ),
-                ),
-                _Fact(label: 'Pubkey', value: _shortPubkey(client.pubkey)),
-              ],
-            ),
-          ],
-        ),
     );
   }
 }

useragent/lib/screens/dashboard/clients/details/widgets/wallet_access_save_bar.dart

@@ -28,27 +28,27 @@ class WalletAccessSaveBar extends StatelessWidget {
     return CreamFrame(
       padding: const EdgeInsets.all(16),
       child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
+        children: [
-            if (errorText != null) ...[
+          if (errorText != null) ...[
-              Text(errorText, style: TextStyle(color: Palette.coral)),
+            Text(errorText, style: TextStyle(color: Palette.coral)),
-              const SizedBox(height: 12),
+            const SizedBox(height: 12),
-            ],
-            Row(
-              children: [
-                TextButton(
-                  onPressed: state.hasChanges && !isPending ? onDiscard : null,
-                  child: const Text('Reset'),
-                ),
-                const Spacer(),
-                FilledButton(
-                  onPressed: state.hasChanges && !isPending ? onSave : null,
-                  child: Text(isPending ? 'Saving...' : 'Save changes'),
-                ),
-              ],
-            ),
           ],
-        ),
+          Row(
+            children: [
+              TextButton(
+                onPressed: state.hasChanges && !isPending ? onDiscard : null,
+                child: const Text('Reset'),
+              ),
+              const Spacer(),
+              FilledButton(
+                onPressed: state.hasChanges && !isPending ? onSave : null,
+                child: Text(isPending ? 'Saving...' : 'Save changes'),
+              ),
+            ],
+          ),
+        ],
+      ),
     );
   }
 }

useragent/lib/screens/dashboard/clients/details/widgets/wallet_access_section.dart

@@ -30,26 +30,23 @@ class WalletAccessSection extends ConsumerWidget {
     return CreamFrame(
       padding: const EdgeInsets.all(20),
       child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
+        children: [
-            Text(
+          Text('Wallet access', style: Theme.of(context).textTheme.titleLarge),
-              'Wallet access',
+          const SizedBox(height: 8),
-              style: Theme.of(context).textTheme.titleLarge,
+          Text('Choose which managed wallets this client can see.'),
-            ),
+          const SizedBox(height: 16),
-            const SizedBox(height: 8),
+          _WalletAccessBody(
-            Text('Choose which managed wallets this client can see.'),
+            clientId: clientId,
-            const SizedBox(height: 16),
+            state: state,
-            _WalletAccessBody(
+            accessSelectionAsync: accessSelectionAsync,
-              clientId: clientId,
+            isSavePending: isSavePending,
-              state: state,
+            optionsAsync: optionsAsync,
-              accessSelectionAsync: accessSelectionAsync,
+            onSearchChanged: onSearchChanged,
-              isSavePending: isSavePending,
+            onToggleWallet: onToggleWallet,
-              optionsAsync: optionsAsync,
+          ),
-              onSearchChanged: onSearchChanged,
+        ],
-              onToggleWallet: onToggleWallet,
+      ),
-            ),
-          ],
-        ),
     );
   }
 }

useragent/lib/screens/dashboard/clients/table.dart

@@ -378,48 +378,48 @@ class _ClientTable extends StatelessWidget {
         builder: (context, constraints) {
           final tableWidth = math.max(_tableMinWidth, constraints.maxWidth);
 
-            return Column(
+          return Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
+            children: [
-                Text(
+              Text(
-                  'Registered clients',
+                'Registered clients',
-                  style: theme.textTheme.titleLarge?.copyWith(
+                style: theme.textTheme.titleLarge?.copyWith(
-                    color: Palette.ink,
+                  color: Palette.ink,
-                    fontWeight: FontWeight.w800,
+                  fontWeight: FontWeight.w800,
-                  ),
                 ),
-                SizedBox(height: 0.6.h),
+              ),
-                Text(
+              SizedBox(height: 0.6.h),
-                  'Every entry here has authenticated with Arbiter at least once.',
+              Text(
-                  style: theme.textTheme.bodyMedium?.copyWith(
+                'Every entry here has authenticated with Arbiter at least once.',
-                    color: Palette.ink.withValues(alpha: 0.70),
+                style: theme.textTheme.bodyMedium?.copyWith(
-                    height: 1.4,
+                  color: Palette.ink.withValues(alpha: 0.70),
-                  ),
+                  height: 1.4,
                 ),
-                SizedBox(height: 1.6.h),
+              ),
-                SingleChildScrollView(
+              SizedBox(height: 1.6.h),
-                  scrollDirection: Axis.horizontal,
+              SingleChildScrollView(
-                  child: SizedBox(
+                scrollDirection: Axis.horizontal,
-                    width: tableWidth,
+                child: SizedBox(
-                    child: Column(
+                  width: tableWidth,
-                      children: [
+                  child: Column(
-                        const _ClientTableHeader(),
+                    children: [
-                        SizedBox(height: 1.h),
+                      const _ClientTableHeader(),
-                        for (var i = 0; i < clients.length; i++)
+                      SizedBox(height: 1.h),
-                          Padding(
+                      for (var i = 0; i < clients.length; i++)
-                            padding: EdgeInsets.only(
+                        Padding(
-                              bottom: i == clients.length - 1 ? 0 : 1.h,
+                          padding: EdgeInsets.only(
-                            ),
+                            bottom: i == clients.length - 1 ? 0 : 1.h,
-                            child: _ClientTableRow(client: clients[i]),
                           ),
-                      ],
+                          child: _ClientTableRow(client: clients[i]),
-                    ),
+                        ),
+                    ],
                   ),
                 ),
-              ],
+              ),
-            );
+            ],
-          },
+          );
-        ),
+        },
+      ),
     );
   }
 }

useragent/lib/screens/dashboard/evm/grants/create/fields/client_picker_field.dart

@@ -31,7 +31,9 @@ class ClientPickerField extends ConsumerWidget {
           ? null
           : (value) {
               ref.read(grantCreationProvider.notifier).setClientId(value);
-              FormBuilder.of(context)?.fields['walletAccessId']?.didChange(null);
+              FormBuilder.of(
+                context,
+              )?.fields['walletAccessId']?.didChange(null);
             },
     );
   }

useragent/lib/screens/dashboard/evm/grants/create/fields/date_time_field.dart

@@ -16,46 +16,48 @@ class FormBuilderDateTimeField extends FormBuilderField<DateTime?> {
     super.onChanged,
     super.validator,
   }) : super(
-          builder: (FormFieldState<DateTime?> field) {
+         builder: (FormFieldState<DateTime?> field) {
-            final value = field.value;
+           final value = field.value;
-            return OutlinedButton(
+           return OutlinedButton(
-              onPressed: () async {
+             onPressed: () async {
-                final ctx = field.context;
+               final ctx = field.context;
-                final now = DateTime.now();
+               final now = DateTime.now();
-                final date = await showDatePicker(
+               final date = await showDatePicker(
-                  context: ctx,
+                 context: ctx,
-                  firstDate: DateTime(now.year - 5),
+                 firstDate: DateTime(now.year - 5),
-                  lastDate: DateTime(now.year + 10),
+                 lastDate: DateTime(now.year + 10),
-                  initialDate: value ?? now,
+                 initialDate: value ?? now,
-                );
+               );
-                if (date == null) return;
+               if (date == null) return;
-                if (!ctx.mounted) return;
+               if (!ctx.mounted) return;
-                final time = await showTimePicker(
+               final time = await showTimePicker(
-                  context: ctx,
+                 context: ctx,
-                  initialTime: TimeOfDay.fromDateTime(value ?? now),
+                 initialTime: TimeOfDay.fromDateTime(value ?? now),
-                );
+               );
-                if (time == null) return;
+               if (time == null) return;
-                field.didChange(DateTime(
+               field.didChange(
-                  date.year,
+                 DateTime(
-                  date.month,
+                   date.year,
-                  date.day,
+                   date.month,
-                  time.hour,
+                   date.day,
-                  time.minute,
+                   time.hour,
-                ));
+                   time.minute,
-              },
+                 ),
-              onLongPress: value == null ? null : () => field.didChange(null),
+               );
-              child: Padding(
+             },
-                padding: EdgeInsets.symmetric(vertical: 1.8.h),
+             onLongPress: value == null ? null : () => field.didChange(null),
-                child: Column(
+             child: Padding(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+               padding: EdgeInsets.symmetric(vertical: 1.8.h),
-                  children: [
+               child: Column(
-                    Text(label),
+                 crossAxisAlignment: CrossAxisAlignment.start,
-                    SizedBox(height: 0.6.h),
+                 children: [
-                    Text(value?.toLocal().toString() ?? 'Not set'),
+                   Text(label),
-                  ],
+                   SizedBox(height: 0.6.h),
-                ),
+                   Text(value?.toLocal().toString() ?? 'Not set'),
-              ),
+                 ],
-            );
+               ),
-          },
+             ),
-        );
+           );
+         },
+       );
 }

useragent/lib/screens/dashboard/evm/grants/create/fields/wallet_access_picker_field.dart

@@ -36,8 +36,8 @@ class WalletAccessPickerField extends ConsumerWidget {
         helperText: state.selectedClientId == null
             ? 'Select a client first'
             : accesses.isEmpty
-                ? 'No wallet accesses for this client'
+            ? 'No wallet accesses for this client'
-                : null,
+            : null,
         border: const OutlineInputBorder(),
       ),
       items: [