feat(server): implement useragent_delete_grant hard delete cleanup

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.
-- **`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.
+- **`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.
 - **`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.
-- **`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.
+- **`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.
 - **`FlowCoordinator`** — Coordinates cross-connection flow between user agents and SDK clients.
 - **`EvmActor`** — Handles EVM transaction policy enforcement and signing.
 

IMPLEMENTATION.md

@@ -29,37 +29,56 @@ flowchart TD
     A([Client connects]) --> B[Receive AuthChallengeRequest]
     B --> C{pubkey in DB?}
 
-    C -- yes --> G[Generate AuthChallenge]
+    C -- yes --> D[Read nonce\nIncrement nonce in DB]
+    D --> G
 
     C -- no --> E[Ask all UserAgents:\nClientConnectionRequest]
     E --> F{First response}
     F -- denied --> Z([Reject connection])
     F -- approved --> F2[Cancel remaining\nUserAgent requests]
-    F2 --> F3[INSERT client]
+    F2 --> F3[INSERT client\nnonce = 1]
-    F3 --> G
+    F3 --> G[Send AuthChallenge\nwith nonce]
 
-    G --> H[Send AuthChallenge\ntimestamp + random bytes]
+    G --> H[Receive AuthChallengeSolution]
-    H --> I[Receive AuthChallengeSolution]
+    H --> I{Signature valid?}
-    I --> K{Signature valid?}
+    I -- no --> Z
-    K -- no --> Z
+    I -- yes --> J([Session started])
-    K -- yes --> J([Session started])
 ```
 
-Auth challenges are generated from fresh random bytes plus a timestamp. They are signed as the canonical challenge payload and are not persisted in `program_client`.
+### Known Issue: Concurrent Registration Race (TOCTOU)
+
+Two connections presenting the same previously-unknown public key can race through the approval flow simultaneously:
+
+1. Both check the DB → neither is registered.
+2. Both request approval from user agents → both receive approval.
+3. Both `INSERT` the client record → the second insert silently overwrites the first, resetting the nonce.
+
+This means the first connection's nonce is invalidated by the second, causing its challenge verification to fail. A fix requires either serialising new-client registration (e.g. an in-memory lock keyed on pubkey) or replacing the separate check + insert with an `INSERT OR IGNORE` / upsert guarded by a unique constraint on `public_key`.
+
+### Nonce Semantics
+
+The `program_client.nonce` column stores the **next usable nonce** — i.e. it is always one ahead of the nonce last issued in a challenge.
+
+- **New client:** inserted with `nonce = 1`; the first challenge is issued with `nonce = 0`.
+- **Existing client:** the current DB value is read and used as the challenge nonce, then immediately incremented within the same exclusive transaction, preventing replay.
 
 ---
 
 ## Cryptography
 
 ### Authentication
-- **Client protocol:** ML-DSA
+- **Client protocol:** ed25519
 
 ### User-Agent Authentication
 
 User-agent authentication supports multiple signature schemes because platform-provided "hardware-bound" keys do not expose a uniform algorithm across operating systems and hardware.
 
-- **Supported schemes:** ML-DSA
+- **Supported schemes:** RSA, Ed25519, ECDSA (secp256k1)
-- **Why:** Secure Enclave (MacOS) support them natively, on other platforms we could emulate while they roll-out
+- **Why:** the user agent authenticates with keys backed by platform facilities, and those facilities differ by platform
+- **Apple Silicon Secure Enclave / Secure Element:** ECDSA-only in practice
+- **Windows Hello / TPM 2.0:** currently RSA-backed in our integration
+
+This is why the user-agent auth protocol carries an explicit `KeyType`, while the SDK client protocol remains fixed to ed25519.
 
 ### Encryption at Rest
 - **Scheme:** Symmetric AEAD — currently **XChaCha20-Poly1305**

mise.lock

@@ -48,10 +48,6 @@ backend = "cargo:cargo-features-manager"
 version = "1.46.3"
 backend = "cargo:cargo-insta"
 
-[[tools."cargo:cargo-mutants"]]
-version = "27.0.0"
-backend = "cargo:cargo-mutants"
-
 [[tools."cargo:cargo-nextest"]]
 version = "0.9.126"
 backend = "cargo:cargo-nextest"
@@ -72,10 +68,6 @@ 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"
@@ -119,37 +111,30 @@ backend = "core:python"
 [tools.python."platforms.linux-arm64"]
 checksum = "sha256:53700338695e402a1a1fe22be4a41fbdacc70e22bb308a48eca8ed67cb7992be"
 url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260324/cpython-3.14.3+20260324-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz"
-provenance = "github-attestations"
 
 [tools.python."platforms.linux-arm64-musl"]
 checksum = "sha256:53700338695e402a1a1fe22be4a41fbdacc70e22bb308a48eca8ed67cb7992be"
 url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260324/cpython-3.14.3+20260324-aarch64-unknown-linux-gnu-install_only_stripped.tar.gz"
-provenance = "github-attestations"
 
 [tools.python."platforms.linux-x64"]
 checksum = "sha256:d7a9f970914bb4c88756fe3bdcc186d4feb90e9500e54f1db47dae4dc9687e39"
 url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260324/cpython-3.14.3+20260324-x86_64-unknown-linux-gnu-install_only_stripped.tar.gz"
-provenance = "github-attestations"
 
 [tools.python."platforms.linux-x64-musl"]
 checksum = "sha256:d7a9f970914bb4c88756fe3bdcc186d4feb90e9500e54f1db47dae4dc9687e39"
 url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260324/cpython-3.14.3+20260324-x86_64-unknown-linux-gnu-install_only_stripped.tar.gz"
-provenance = "github-attestations"
 
 [tools.python."platforms.macos-arm64"]
 checksum = "sha256:c43aecde4a663aebff99b9b83da0efec506479f1c3f98331442f33d2c43501f9"
 url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260324/cpython-3.14.3+20260324-aarch64-apple-darwin-install_only_stripped.tar.gz"
-provenance = "github-attestations"
 
 [tools.python."platforms.macos-x64"]
 checksum = "sha256:9ab41dbc2f100a2a45d1833b9c11165f51051c558b5213eda9a9731d5948a0c0"
 url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260324/cpython-3.14.3+20260324-x86_64-apple-darwin-install_only_stripped.tar.gz"
-provenance = "github-attestations"
 
 [tools.python."platforms.windows-x64"]
 checksum = "sha256:bbe19034b35b0267176a7442575ae7dc6343480fd4d35598cb7700173d431e09"
 url = "https://github.com/astral-sh/python-build-standalone/releases/download/20260324/cpython-3.14.3+20260324-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
-provenance = "github-attestations"
 
 [[tools.rust]]
 version = "1.93.0"

mise.toml

@@ -4,7 +4,7 @@
 "cargo:cargo-vet" = "0.10.2"
 flutter = "3.38.9-stable"
 protoc = "29.6"
-"rust" = {version = "1.93.0", components = "clippy,rust-analyzer"}
+"rust" = {version = "1.93.0", components = "clippy"}
 "cargo:cargo-features-manager" = "0.11.1"
 "cargo:cargo-nextest" = "0.9.126"
 "cargo:cargo-shear" = "latest"
@@ -12,8 +12,6 @@ protoc = "29.6"
 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/client/auth.proto

@@ -10,8 +10,8 @@ message AuthChallengeRequest {
 }
 
 message AuthChallenge {
-  uint64 timestamp_nanos = 1;
+  bytes pubkey = 1;
-  bytes random = 2;
+  int32 nonce = 2;
 }
 
 message AuthChallengeSolution {

protobufs/shared/evm.proto

@@ -36,10 +36,6 @@ message GasLimitExceededViolation {
 }
 
 message EvalViolation {
-  message ChainIdMismatch {
-    uint64 expected = 1;
-    uint64 actual = 2;
-  }
   oneof kind {
     bytes invalid_target = 1; // 20-byte Ethereum address
     GasLimitExceededViolation gas_limit_exceeded = 2;
@@ -47,8 +43,6 @@ message EvalViolation {
     google.protobuf.Empty volumetric_limit_exceeded = 4;
     google.protobuf.Empty invalid_time = 5;
     google.protobuf.Empty invalid_transaction_type = 6;
-
-    ChainIdMismatch chain_id_mismatch = 7;
   }
 }
 

protobufs/user_agent/auth.proto

@@ -2,14 +2,21 @@ 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 {
-  uint64 timestamp_nanos = 1;
+  int32 nonce = 1;
-  bytes random = 2;
 }
 
 message AuthChallengeSolution {

server/.cargo/mutants.toml

@@ -1 +0,0 @@
-test_tool = "nextest"

server/.gitignore

@@ -1,2 +0,0 @@
-mutants.out/
-mutants.out.old/

server/Cargo.toml

@@ -16,21 +16,22 @@ tonic = { version = "0.14.5", features = [
     "zstd",
 ] }
 tracing = "0.1.44"
-tokio = { version = "1.51.1", features = ["full"] }
+tokio = { version = "1.50.0", features = ["full"] }
 ed25519-dalek = { version = "3.0.0-pre.6", features = ["rand_core"] }
 chrono = { version = "0.4.44", features = ["serde"] }
-rand = "0.10.1"
+rand = "0.10.0"
-rustls = { version = "0.23.38", features = ["aws-lc-rs", "logging", "prefer-post-quantum", "std"], default-features = false }
+rustls = { version = "0.23.37", features = ["aws-lc-rs"] }
 smlang = "0.8.0"
 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"
 rustls-pki-types = "1.14.0"
-alloy = "2.0.0"
+alloy = "1.7.3"
 rcgen = { version = "0.14.7", features = [
     "aws_lc_rs",
     "pem",
@@ -39,13 +40,7 @@ rcgen = { version = "0.14.7", features = [
 ], default-features = false }
 k256 = { version = "0.13.4", features = ["ecdsa", "pkcs8"] }
 rsa = { version = "0.9", features = ["sha2"] }
-sha2 = "0.11"
+sha2 = "0.10"
-spki = "0.8"
+spki = "0.7"
 prost = "0.14.3"
 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"
-kameo = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"}
-kameo_actors = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"}
-hmac = "0.13.0"

server/crates/arbiter-client/Cargo.toml

@@ -13,15 +13,14 @@ evm = ["dep:alloy"]
 
 [dependencies]
 arbiter-proto.path = "../arbiter-proto"
-arbiter-crypto.path = "../arbiter-crypto"
 alloy = { workspace = true, optional = true }
 tonic.workspace = true
 tonic.features = ["tls-aws-lc"]
 tokio.workspace = true
 tokio-stream.workspace = true
+ed25519-dalek.workspace = true
 thiserror.workspace = true
 http = "1.4.0"
-rustls-webpki = { version = "0.103.12", features = ["aws-lc-rs"] }
+rustls-webpki = { version = "0.103.10", features = ["aws-lc-rs"] }
 async-trait.workspace = true
 rand.workspace = true
-chrono.workspace = true

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

@@ -1,10 +1,5 @@
-use crate::{
-    storage::StorageError,
-    transport::{ClientTransport, next_request_id},
-};
-use arbiter_crypto::authn::{self, CLIENT_CONTEXT, SigningKey};
 use arbiter_proto::{
-    ClientMetadata,
+    ClientMetadata, format_challenge,
     proto::{
         client::{
             ClientRequest,
@@ -19,13 +14,15 @@ use arbiter_proto::{
         shared::ClientInfo as ProtoClientInfo,
     },
 };
+use ed25519_dalek::Signer as _;
 
-use chrono::DateTime;
+use crate::{
+    storage::StorageError,
+    transport::{ClientTransport, next_request_id},
+};
 
 #[derive(Debug, thiserror::Error)]
 pub enum AuthError {
-    #[error("Server sent invalid auth challenge")]
-    InvalidChallenge,
     #[error("Auth challenge was not returned by server")]
     MissingAuthChallenge,
 
@@ -57,14 +54,14 @@ fn map_auth_result(code: i32) -> AuthError {
 async fn send_auth_challenge_request(
     transport: &mut ClientTransport,
     metadata: ClientMetadata,
-    key: &SigningKey,
+    key: &ed25519_dalek::SigningKey,
 ) -> std::result::Result<(), AuthError> {
     transport
         .send(ClientRequest {
             request_id: next_request_id(),
             payload: Some(ClientRequestPayload::Auth(proto_auth::Request {
                 payload: Some(AuthRequestPayload::ChallengeRequest(AuthChallengeRequest {
-                    pubkey: key.public_key().to_bytes(),
+                    pubkey: key.verifying_key().to_bytes().to_vec(),
                     client_info: Some(ProtoClientInfo {
                         name: metadata.name,
                         description: metadata.description,
@@ -98,22 +95,11 @@ async fn receive_auth_challenge(
 
 async fn send_auth_challenge_solution(
     transport: &mut ClientTransport,
-    key: &SigningKey,
+    key: &ed25519_dalek::SigningKey,
     challenge: AuthChallenge,
 ) -> std::result::Result<(), AuthError> {
-    let timestamp = DateTime::from_timestamp_nanos(challenge.timestamp_nanos as i64);
+    let challenge_payload = format_challenge(challenge.nonce, &challenge.pubkey);
-    let challenge = authn::AuthChallenge {
+    let signature = key.sign(&challenge_payload).to_bytes().to_vec();
-        nonce: *challenge
-            .random
-            .as_array()
-            .ok_or(AuthError::InvalidChallenge)?,
-        timestamp,
-    };
-    let challenge_payload: Vec<u8> = challenge.format();
-    let signature = key
-        .sign_message(&challenge_payload, CLIENT_CONTEXT)
-        .map_err(|_| AuthError::UnexpectedAuthResponse)?
-        .to_bytes();
 
     transport
         .send(ClientRequest {
@@ -154,7 +140,7 @@ async fn receive_auth_confirmation(
 pub(crate) async fn authenticate(
     transport: &mut ClientTransport,
     metadata: ClientMetadata,
-    key: &SigningKey,
+    key: &ed25519_dalek::SigningKey,
 ) -> std::result::Result<(), AuthError> {
     send_auth_challenge_request(transport, metadata, key).await?;
     let challenge = receive_auth_challenge(transport).await?;

server/crates/arbiter-client/src/bin/test_connect.rs

@@ -1,8 +1,8 @@
+use std::io::{self, Write};
+
 use arbiter_client::ArbiterClient;
 use arbiter_proto::{ClientMetadata, url::ArbiterUrl};
 
-use std::io::{self, Write};
-
 #[tokio::main]
 async fn main() {
     println!("Testing connection to Arbiter server...");

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

@@ -1,20 +1,20 @@
-#[cfg(feature = "evm")]
+use arbiter_proto::{
-use crate::wallets::evm::ArbiterEvmWallet;
+    ClientMetadata, proto::arbiter_service_client::ArbiterServiceClient, url::ArbiterUrl,
+};
+use std::sync::Arc;
+use tokio::sync::{Mutex, mpsc};
+use tokio_stream::wrappers::ReceiverStream;
+use tonic::transport::ClientTlsConfig;
+
 use crate::{
     StorageError,
     auth::{AuthError, authenticate},
     storage::{FileSigningKeyStorage, SigningKeyStorage},
     transport::{BUFFER_LENGTH, ClientTransport},
 };
-use arbiter_crypto::authn::SigningKey;
-use arbiter_proto::{
-    ClientMetadata, proto::arbiter_service_client::ArbiterServiceClient, url::ArbiterUrl,
-};
 
-use std::sync::Arc;
+#[cfg(feature = "evm")]
-use tokio::sync::{Mutex, mpsc};
+use crate::wallets::evm::ArbiterEvmWallet;
-use tokio_stream::wrappers::ReceiverStream;
-use tonic::transport::ClientTlsConfig;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
@@ -60,7 +60,7 @@ impl ArbiterClient {
     pub async fn connect_with_key(
         url: ArbiterUrl,
         metadata: ClientMetadata,
-        key: SigningKey,
+        key: ed25519_dalek::SigningKey,
     ) -> Result<Self, Error> {
         let anchor = webpki::anchor_from_trusted_cert(&url.ca_cert)?.to_owned();
         let tls = ClientTlsConfig::new().trust_anchor(anchor);

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

@@ -1,6 +1,4 @@
-use arbiter_crypto::authn::SigningKey;
 use arbiter_proto::home_path;
-
 use std::path::{Path, PathBuf};
 
 #[derive(Debug, thiserror::Error)]
@@ -13,7 +11,7 @@ pub enum StorageError {
 }
 
 pub trait SigningKeyStorage {
-    fn load_or_create(&self) -> std::result::Result<SigningKey, StorageError>;
+    fn load_or_create(&self) -> std::result::Result<ed25519_dalek::SigningKey, StorageError>;
 }
 
 #[derive(Debug, Clone)]
@@ -22,7 +20,7 @@ pub struct FileSigningKeyStorage {
 }
 
 impl FileSigningKeyStorage {
-    pub const DEFAULT_FILE_NAME: &str = "sdk_client_ml_dsa.key";
+    pub const DEFAULT_FILE_NAME: &str = "sdk_client_ed25519.key";
 
     pub fn new(path: impl Into<PathBuf>) -> Self {
         Self { path: path.into() }
@@ -32,7 +30,7 @@ impl FileSigningKeyStorage {
         Ok(Self::new(home_path()?.join(Self::DEFAULT_FILE_NAME)))
     }
 
-    fn read_key(path: &Path) -> std::result::Result<SigningKey, StorageError> {
+    fn read_key(path: &Path) -> std::result::Result<ed25519_dalek::SigningKey, StorageError> {
         let bytes = std::fs::read(path)?;
         let raw: [u8; 32] =
             bytes
@@ -41,12 +39,12 @@ impl FileSigningKeyStorage {
                     expected: 32,
                     actual: v.len(),
                 })?;
-        Ok(SigningKey::from_seed(raw))
+        Ok(ed25519_dalek::SigningKey::from_bytes(&raw))
     }
 }
 
 impl SigningKeyStorage for FileSigningKeyStorage {
-    fn load_or_create(&self) -> std::result::Result<SigningKey, StorageError> {
+    fn load_or_create(&self) -> std::result::Result<ed25519_dalek::SigningKey, StorageError> {
         if let Some(parent) = self.path.parent() {
             std::fs::create_dir_all(parent)?;
         }
@@ -55,8 +53,8 @@ impl SigningKeyStorage for FileSigningKeyStorage {
             return Self::read_key(&self.path);
         }
 
-        let key = SigningKey::generate();
+        let key = ed25519_dalek::SigningKey::generate(&mut rand::rng());
-        let raw_key = key.to_seed();
+        let raw_key = key.to_bytes();
 
         // Use create_new to prevent accidental overwrite if another process creates the key first.
         match std::fs::OpenOptions::new()
@@ -105,7 +103,7 @@ mod tests {
             .load_or_create()
             .expect("second load_or_create should read same key");
 
-        assert_eq!(key_a.to_seed(), key_b.to_seed());
+        assert_eq!(key_a.to_bytes(), key_b.to_bytes());
         assert!(path.exists());
 
         std::fs::remove_file(path).expect("temp key file should be removable");

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

@@ -1,5 +1,4 @@
 use arbiter_proto::proto::client::{ClientRequest, ClientResponse};
-
 use std::sync::atomic::{AtomicI32, Ordering};
 use tokio::sync::mpsc;
 

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

@@ -1,4 +1,13 @@
-use crate::transport::{ClientTransport, next_request_id};
+use alloy::{
+    consensus::SignableTransaction,
+    network::TxSigner,
+    primitives::{Address, B256, ChainId, Signature},
+    signers::{Error, Result, Signer},
+};
+use async_trait::async_trait;
+use std::sync::Arc;
+use tokio::sync::Mutex;
+
 use arbiter_proto::proto::{
     client::{
         ClientRequest,
@@ -16,15 +25,7 @@ use arbiter_proto::proto::{
     shared::evm::TransactionEvalError,
 };
 
-use alloy::{
+use crate::transport::{ClientTransport, next_request_id};
-    consensus::SignableTransaction,
-    network::TxSigner,
-    primitives::{Address, B256, ChainId, Signature},
-    signers::{Error, Result, Signer},
-};
-use async_trait::async_trait;
-use std::sync::Arc;
-use tokio::sync::Mutex;
 
 /// A typed error payload returned by [`ArbiterEvmWallet`] transaction signing.
 ///

server/crates/arbiter-crypto/.gitignore

@@ -1 +0,0 @@
-/target

server/crates/arbiter-crypto/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-name = "arbiter-crypto"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-ml-dsa = {workspace = true, optional = true }
-rand = {workspace = true, optional = true}
-memsafe = {version = "0.4.0", optional = true}
-hmac.workspace = true
-alloy.workspace = true
-x-wing = { version = "0.1.0-rc.0", features = ["zeroize"] }
-chrono.workspace = true
-
-[lints]
-workspace = true
-
-[features]
-default = ["authn", "safecell"]
-authn = ["dep:ml-dsa", "dep:rand"]
-safecell = ["dep:memsafe"]

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

@@ -1,2 +0,0 @@
-pub mod v1;
-pub use v1::*;

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

@@ -1,241 +0,0 @@
-use chrono::{DateTime, Utc};
-use hmac::digest::Digest;
-use ml_dsa::{
-    EncodedVerifyingKey, Error, KeyGen, MlDsa87, Seed, Signature as MlDsaSignature,
-    SigningKey as MlDsaSigningKey, VerifyingKey as MlDsaVerifyingKey, signature::Keypair as _,
-};
-use rand::RngExt;
-
-pub static CLIENT_CONTEXT: &[u8] = b"arbiter_client";
-pub static USERAGENT_CONTEXT: &[u8] = b"arbiter_user_agent";
-
-const NONCE_SIZE: usize = 32;
-
-#[derive(Debug, Clone)]
-pub struct AuthChallenge {
-    pub nonce: [u8; NONCE_SIZE],
-    pub timestamp: DateTime<Utc>,
-}
-
-impl AuthChallenge {
-    pub fn generate(rng: &mut impl rand::CryptoRng) -> Self {
-        let timestamp = Utc::now();
-        let nonce = {
-            let mut array = [0; NONCE_SIZE];
-            rng.fill(&mut array);
-            array
-        };
-
-        Self { nonce, timestamp }
-    }
-
-    pub fn format(&self) -> Vec<u8> {
-        {
-            let mut buffer = Vec::from(self.nonce);
-
-            let stamp = self
-                .timestamp
-                .timestamp_nanos_opt()
-                .expect("We would be long dead by the time this triggers :)");
-            buffer.extend_from_slice(stamp.to_be_bytes().as_slice());
-
-            buffer
-        }
-    }
-
-    pub fn from_parts(nonce: &[u8], timestamp: i64) -> Result<Self, ()> {
-        let random_nonce = nonce.as_array().ok_or(())?;
-        Ok(AuthChallenge {
-            nonce: *random_nonce,
-            timestamp: DateTime::from_timestamp_nanos(timestamp),
-        })
-    }
-}
-
-pub type KeyParams = MlDsa87;
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct PublicKey(Box<MlDsaVerifyingKey<KeyParams>>);
-
-impl crate::hashing::Hashable for PublicKey {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        hasher.update(self.to_bytes());
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Signature(Box<MlDsaSignature<KeyParams>>);
-
-#[derive(Debug)]
-pub struct SigningKey(Box<MlDsaSigningKey<KeyParams>>);
-
-impl PublicKey {
-    pub fn to_bytes(&self) -> Vec<u8> {
-        self.0.encode().0.to_vec()
-    }
-
-    pub fn verify(&self, challenge: &AuthChallenge, context: &[u8], signature: &Signature) -> bool {
-        let challenge = challenge.format();
-        self.0
-            .verify_with_context(&challenge, context, &signature.0)
-    }
-}
-
-impl Signature {
-    pub fn to_bytes(&self) -> Vec<u8> {
-        self.0.encode().0.to_vec()
-    }
-}
-
-impl SigningKey {
-    pub fn generate() -> Self {
-        Self(Box::new(KeyParams::key_gen(&mut rand::rng())))
-    }
-
-    pub fn from_seed(seed: [u8; 32]) -> Self {
-        Self(Box::new(KeyParams::from_seed(&Seed::from(seed))))
-    }
-
-    pub fn to_seed(&self) -> [u8; 32] {
-        self.0.to_seed().into()
-    }
-
-    pub fn public_key(&self) -> PublicKey {
-        self.0.verifying_key().into()
-    }
-
-    pub fn sign_message(&self, message: &[u8], context: &[u8]) -> Result<Signature, Error> {
-        self.0
-            .signing_key()
-            .sign_deterministic(message, context)
-            .map(Into::into)
-    }
-
-    pub fn sign_challenge(
-        &self,
-        challenge: &AuthChallenge,
-        context: &[u8],
-    ) -> Result<Signature, Error> {
-        let challenge = challenge.format();
-
-        self.sign_message(&challenge, context)
-    }
-}
-
-impl From<MlDsaVerifyingKey<KeyParams>> for PublicKey {
-    fn from(value: MlDsaVerifyingKey<KeyParams>) -> Self {
-        Self(Box::new(value))
-    }
-}
-
-impl From<MlDsaSignature<KeyParams>> for Signature {
-    fn from(value: MlDsaSignature<KeyParams>) -> Self {
-        Self(Box::new(value))
-    }
-}
-
-impl From<MlDsaSigningKey<KeyParams>> for SigningKey {
-    fn from(value: MlDsaSigningKey<KeyParams>) -> Self {
-        Self(Box::new(value))
-    }
-}
-
-impl TryFrom<Vec<u8>> for PublicKey {
-    type Error = ();
-
-    fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {
-        Self::try_from(value.as_slice())
-    }
-}
-
-impl TryFrom<&'_ [u8]> for PublicKey {
-    type Error = ();
-
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        let encoded = EncodedVerifyingKey::<KeyParams>::try_from(value).map_err(|_| ())?;
-        Ok(Self(Box::new(MlDsaVerifyingKey::decode(&encoded))))
-    }
-}
-
-impl TryFrom<Vec<u8>> for Signature {
-    type Error = ();
-
-    fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {
-        Self::try_from(value.as_slice())
-    }
-}
-
-impl TryFrom<&'_ [u8]> for Signature {
-    type Error = ();
-
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        MlDsaSignature::try_from(value)
-            .map(|sig| Self(Box::new(sig)))
-            .map_err(|_| ())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use ml_dsa::{KeyGen, MlDsa87, signature::Keypair as _};
-
-    use crate::authn::AuthChallenge;
-
-    use super::{CLIENT_CONTEXT, PublicKey, Signature, SigningKey, USERAGENT_CONTEXT};
-
-    #[test]
-    fn public_key_round_trip_decodes() {
-        let key = MlDsa87::key_gen(&mut rand::rng());
-        let encoded = PublicKey::from(key.verifying_key()).to_bytes();
-
-        let decoded = PublicKey::try_from(encoded.as_slice()).expect("public key should decode");
-
-        assert_eq!(decoded, PublicKey::from(key.verifying_key()));
-    }
-
-    #[test]
-    fn signature_round_trip_decodes() {
-        let key = SigningKey::generate();
-        let signature = key
-            .sign_message(b"challenge", CLIENT_CONTEXT)
-            .expect("signature should be created");
-
-        let decoded =
-            Signature::try_from(signature.to_bytes().as_slice()).expect("signature should decode");
-
-        assert_eq!(decoded, signature);
-    }
-
-    #[test]
-    fn challenge_verification_uses_context_and_canonical_key_bytes() {
-        let key = SigningKey::generate();
-        let public_key = key.public_key();
-        let challenge = AuthChallenge::generate(&mut rand::rng());
-        let signature = key
-            .sign_challenge(&challenge, CLIENT_CONTEXT)
-            .expect("signature should be created");
-
-        assert!(public_key.verify(&challenge, CLIENT_CONTEXT, &signature));
-        assert!(!public_key.verify(&challenge, USERAGENT_CONTEXT, &signature));
-    }
-
-    #[test]
-    fn signing_key_round_trip_seed_preserves_public_key_and_signing() {
-        let original = SigningKey::generate();
-        let restored = SigningKey::from_seed(original.to_seed());
-
-        assert_eq!(restored.public_key(), original.public_key());
-
-        let challenge = AuthChallenge::generate(&mut rand::rng());
-
-        let signature = restored
-            .sign_challenge(&challenge, CLIENT_CONTEXT)
-            .expect("signature should be created");
-
-        assert!(
-            restored
-                .public_key()
-                .verify(&challenge, CLIENT_CONTEXT, &signature)
-        );
-    }
-}

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

@@ -1,112 +0,0 @@
-use std::collections::HashSet;
-
-pub use hmac::digest::Digest;
-
-/// 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),*) => {
-        $(
-            impl Hashable for $t {
-                fn hash<H: Digest>(&self, hasher: &mut H) {
-                    hasher.update(&self.to_be_bytes());
-                }
-            }
-        )*
-    };
-}
-
-impl_numeric!(u8, u16, u32, u64, i8, i16, i32, i64);
-
-impl Hashable for &[u8] {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        hasher.update(self);
-    }
-}
-
-impl Hashable for String {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        hasher.update(self.as_bytes());
-    }
-}
-
-impl<T: Hashable + PartialOrd> Hashable for Vec<T> {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        let ref_sorted = {
-            let mut sorted = self.iter().collect::<Vec<_>>();
-            sorted.sort_by(|a, b| a.partial_cmp(b).unwrap());
-            sorted
-        };
-        for item in ref_sorted {
-            item.hash(hasher);
-        }
-    }
-}
-
-impl<T: Hashable + PartialOrd> Hashable for HashSet<T> {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        let ref_sorted = {
-            let mut sorted = self.iter().collect::<Vec<_>>();
-            sorted.sort_by(|a, b| a.partial_cmp(b).unwrap());
-            sorted
-        };
-        for item in ref_sorted {
-            item.hash(hasher);
-        }
-    }
-}
-
-impl<T: Hashable> Hashable for Option<T> {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        match self {
-            Some(value) => {
-                hasher.update([1]);
-                value.hash(hasher);
-            }
-            None => hasher.update([0]),
-        }
-    }
-}
-
-impl<T: Hashable> Hashable for Box<T> {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        self.as_ref().hash(hasher);
-    }
-}
-
-impl<T: Hashable> Hashable for &T {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        (*self).hash(hasher);
-    }
-}
-
-impl Hashable for alloy::primitives::Address {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        hasher.update(self.as_slice());
-    }
-}
-
-impl Hashable for alloy::primitives::U256 {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        hasher.update(self.to_be_bytes::<32>());
-    }
-}
-
-impl Hashable for chrono::Duration {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        hasher.update(self.num_seconds().to_be_bytes());
-    }
-}
-
-impl Hashable for chrono::DateTime<chrono::Utc> {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        hasher.update(self.timestamp_millis().to_be_bytes());
-    }
-}

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

@@ -1,7 +0,0 @@
-#[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,131 +0,0 @@
-use crate::utils::{HASHABLE_TRAIT_PATH, HMAC_DIGEST_PATH};
-
-use proc_macro2::{Span, TokenStream, TokenTree};
-use quote::quote;
-use syn::{DataStruct, DeriveInput, Fields, Generics, Index, parse_quote, spanned::Spanned};
-
-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(crate) struct ToPath(pub(crate) &'static str);
-
-impl ToPath {
-    pub(crate) 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(crate) const HASHABLE_TRAIT_PATH: ToPath = ensure_path!(::arbiter_crypto::hashing::Hashable);
-pub(crate) const HMAC_DIGEST_PATH: ToPath = ensure_path!(::arbiter_crypto::hashing::Digest);

server/crates/arbiter-proto/Cargo.toml

@@ -17,7 +17,7 @@ url = "2.5.8"
 miette.workspace = true
 thiserror.workspace = true
 rustls-pki-types.workspace = true
-base64.workspace = true
+base64 = "0.22.1"
 prost-types.workspace = true
 tracing.workspace = true
 async-trait.workspace = true

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

@@ -1,6 +1,8 @@
 pub mod transport;
 pub mod url;
 
+use base64::{Engine, prelude::BASE64_STANDARD};
+
 pub mod proto {
     tonic::include_proto!("arbiter");
 
@@ -82,3 +84,8 @@ pub fn home_path() -> Result<std::path::PathBuf, std::io::Error> {
 
     Ok(arbiter_home)
 }
+
+pub fn format_challenge(nonce: i32, pubkey: &[u8]) -> Vec<u8> {
+    let concat_form = format!("{}:{}", nonce, BASE64_STANDARD.encode(pubkey));
+    concat_form.into_bytes()
+}

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

@@ -54,10 +54,11 @@
 //!   as a closed outbound channel.
 //! - [`Bi::recv`] returns `None` when the underlying transport closes.
 //! - Message translation is intentionally out of scope for this module.
-use async_trait::async_trait;
+
-use kameo::{error::Infallible, prelude::*};
 use std::marker::PhantomData;
 
+use async_trait::async_trait;
+
 /// Errors returned by transport adapters implementing [`Bi`].
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -105,36 +106,6 @@ 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>;
@@ -190,29 +161,3 @@ where
 }
 
 pub mod grpc;
-
-#[derive(thiserror::Error, Debug)]
-pub enum ForwardError<I> {
-    #[error("Transport error: {0}")]
-    Transport(#[from] Error),
-    #[error("Actor delivery error: {0}")]
-    Actor(SendError<I>),
-}
-
-pub async fn forward_to_actor<Transport, Inbound, Outbound, Handler>(
-    transport: &mut Transport,
-    actor: &ActorRef<Handler>,
-) -> Result<(), ForwardError<Inbound>>
-where
-    Transport: Bi<Inbound, <Outbound as Reply>::Ok>,
-    Handler: Actor + Message<Inbound, Reply = Outbound>,
-    Inbound: Send + 'static,
-    Outbound: Send + 'static + Reply<Error = Infallible>, // `Infallible` to enforce contract that `Outbound` carries handler-level error
-{
-    while let Some(request) = transport.recv().await {
-        let resp = actor.ask(request).await.map_err(ForwardError::Actor)?;
-        transport.send(resp).await?
-    }
-
-    Err(Error::ChannelClosed.into())
-}

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

@@ -1,10 +1,10 @@
-use super::{Bi, Receiver, Sender};
-
 use async_trait::async_trait;
 use futures::StreamExt;
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 
+use super::{Bi, Receiver, Sender};
+
 pub struct GrpcSender<Outbound> {
     tx: mpsc::Sender<Result<Outbound, tonic::Status>>,
 }

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

@@ -1,6 +1,7 @@
+use std::fmt::Display;
+
 use base64::{Engine as _, prelude::BASE64_URL_SAFE};
 use rustls_pki_types::CertificateDer;
-use std::fmt::Display;
 
 const ARBITER_URL_SCHEME: &str = "arbiter";
 const CERT_QUERY_KEY: &str = "cert";

server/crates/arbiter-server/Cargo.toml

@@ -16,9 +16,9 @@ diesel-async = { version = "0.8.0", features = [
     "sqlite",
     "tokio",
 ] }
+ed25519-dalek.workspace = true
+ed25519-dalek.features = ["serde"]
 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
@@ -37,32 +37,31 @@ dashmap = "6.1.0"
 rand.workspace = true
 rcgen.workspace = true
 chrono.workspace = true
+memsafe = "0.4.0"
 zeroize = { version = "1.8.2", features = ["std", "simd"] }
 kameo.workspace = true
+x25519-dalek.workspace = true
 chacha20poly1305 = { version = "0.10.1", features = ["std"] }
 argon2 = { version = "0.5.3", features = ["zeroize"] }
 restructed = "0.2.2"
 strum = { version = "0.28.0", features = ["derive"] }
 pem = "3.0.6"
+k256.workspace = true
+k256.features = ["serde"]
+rsa.workspace = true
+rsa.features = ["serde"]
 sha2.workspace = true
-hmac.workspace = true
+hmac = "0.12"
 spki.workspace = true
 alloy.workspace = true
 prost-types.workspace = true
 prost.workspace = true
 arbiter-tokens-registry.path = "../arbiter-tokens-registry"
 anyhow = "1.0.102"
+postcard = { version = "1.1.3", features = ["use-std"] }
+serde = { version = "1.0.228", features = ["derive"] }
 serde_with = "3.18.0"
-mutants.workspace = true
-subtle = "2.6.1"
-ml-dsa.workspace = true
-ed25519-dalek.workspace = true
-x25519-dalek.workspace = true
-k256.workspace = true
-kameo_actors.workspace = true
 
 [dev-dependencies]
-insta = "1.47.2"
+insta = "1.46.3"
-proptest = "1.11.0"
-rstest.workspace = true
 test-log = { version = "0.2", default-features = false, features = ["trace"] }

server/crates/arbiter-server/migrations/2026-02-14-171124-0000_init/up.sql

@@ -45,11 +45,13 @@ insert into arbiter_settings (id) values (1) on conflict do nothing;
 
 create table if not exists useragent_client (
     id integer not null primary key,
+    nonce integer not null default(1), -- used for auth challenge
     public_key blob not null,
+    key_type integer not null default(1), -- 1=Ed25519, 2=ECDSA(secp256k1)
     created_at integer not null default(unixepoch ('now')),
     updated_at integer not null default(unixepoch ('now'))
 ) STRICT;
-create unique index if not exists uniq_useragent_client_public_key on useragent_client (public_key);
+create unique index if not exists uniq_useragent_client_public_key on useragent_client (public_key, key_type);
 
 create table if not exists client_metadata (
     id integer not null primary key,
@@ -71,6 +73,7 @@ create unique index if not exists uniq_metadata_binding_client on client_metadat
 
 create table if not exists program_client (
     id integer not null primary key,
+    nonce integer not null default(1), -- used for auth challenge
     public_key blob not null,
     metadata_id integer not null references client_metadata (id) on delete cascade,
     created_at integer not null default(unixepoch ('now')),

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

@@ -1,13 +1,12 @@
-use crate::db::{self, DatabasePool, schema};
 use arbiter_proto::{BOOTSTRAP_PATH, home_path};
-
 use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;
 use kameo::{Actor, messages};
+
 use rand::{RngExt, distr::Alphanumeric, make_rng, rngs::StdRng};
-use subtle::ConstantTimeEq as _;
 use thiserror::Error;
 
+use crate::db::{self, DatabasePool, schema};
 const TOKEN_LENGTH: usize = 64;
 
 pub async fn generate_token() -> Result<String, std::io::Error> {
@@ -45,14 +44,14 @@ pub struct Bootstrapper {
 
 impl Bootstrapper {
     pub async fn new(db: &DatabasePool) -> Result<Self, Error> {
-        let row_count: i64 = {
+        let mut conn = db.get().await?;
-            let mut conn = db.get().await?;
 
-            schema::useragent_client::table
+        let row_count: i64 = schema::useragent_client::table
-                .count()
+            .count()
-                .get_result(&mut conn)
+            .get_result(&mut conn)
-                .await?
+            .await?;
-        };
+
+        drop(conn);
 
         let token = if row_count == 0 {
             let token = generate_token().await?;
@@ -70,13 +69,7 @@ impl Bootstrapper {
     #[message]
     pub fn is_correct_token(&self, token: String) -> bool {
         match &self.token {
-            Some(expected) => {
+            Some(expected) => *expected == token,
-                let expected_bytes = expected.as_bytes();
-                let token_bytes = token.as_bytes();
-
-                let choice = expected_bytes.ct_eq(token_bytes);
-                bool::from(choice)
-            }
             None => false,
         }
     }

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

@@ -1,40 +1,35 @@
-use super::{ClientConnection, ClientCredentials, ClientProfile};
-use crate::{
-    actors::{
-        GlobalActors,
-        flow_coordinator::{self, RequestClientApproval},
-        vault::Vault,
-    },
-    crypto::integrity::{self, AttestationStatus},
-    db::{
-        self,
-        models::{ProgramClientMetadata, SqliteTimestamp},
-        schema::program_client,
-    },
-};
-use arbiter_crypto::authn::{self, AuthChallenge, CLIENT_CONTEXT};
 use arbiter_proto::{
-    ClientMetadata,
+    ClientMetadata, format_challenge,
     transport::{Bi, expect_message},
 };
-
 use chrono::Utc;
 use diesel::{
     ExpressionMethods as _, OptionalExtension as _, QueryDsl as _, SelectableHelper as _,
     dsl::insert_into, update,
 };
 use diesel_async::RunQueryDsl as _;
-use kameo::{actor::ActorRef, error::SendError};
+use ed25519_dalek::{Signature, VerifyingKey};
+use kameo::error::SendError;
 use tracing::error;
 
+use crate::{
+    actors::{
+        client::{ClientConnection, ClientProfile},
+        flow_coordinator::{self, RequestClientApproval},
+    },
+    db::{
+        self,
+        models::{ProgramClientMetadata, SqliteTimestamp},
+        schema::program_client,
+    },
+};
+
 #[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
 pub enum Error {
     #[error("Database pool unavailable")]
     DatabasePoolUnavailable,
     #[error("Database operation failed")]
     DatabaseOperationFailed,
-    #[error("Integrity check failed")]
-    IntegrityCheckFailed,
     #[error("Invalid challenge solution")]
     InvalidChallengeSolution,
     #[error("Client approval request failed")]
@@ -43,13 +38,6 @@ pub enum Error {
     Transport,
 }
 
-impl From<diesel::result::Error> for Error {
-    fn from(e: diesel::result::Error) -> Self {
-        error!(?e, "Database error");
-        Self::DatabaseOperationFailed
-    }
-}
-
 #[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
 pub enum ApproveError {
     #[error("Internal error")]
@@ -63,79 +51,73 @@ pub enum ApproveError {
 #[derive(Debug, Clone)]
 pub enum Inbound {
     AuthChallengeRequest {
-        pubkey: authn::PublicKey,
+        pubkey: VerifyingKey,
         metadata: ClientMetadata,
     },
     AuthChallengeSolution {
-        signature: authn::Signature,
+        signature: Signature,
     },
 }
 
 #[derive(Debug, Clone)]
 pub enum Outbound {
-    AuthChallenge { challenge: AuthChallenge },
+    AuthChallenge { pubkey: VerifyingKey, nonce: i32 },
     AuthSuccess,
 }
 
-async fn get_client_id(
+pub struct ClientInfo {
+    pub id: i32,
+    pub current_nonce: i32,
+}
+
+/// Atomically reads and increments the nonce for a known client.
+/// Returns `None` if the pubkey is not registered.
+async fn get_client_and_nonce(
     db: &db::DatabasePool,
-    pubkey: &authn::PublicKey,
+    pubkey: &VerifyingKey,
-) -> Result<Option<i32>, Error> {
+) -> Result<Option<ClientInfo>, Error> {
-    let pubkey_bytes = pubkey.to_bytes();
+    let pubkey_bytes = pubkey.as_bytes().to_vec();
+
     let mut conn = db.get().await.map_err(|e| {
         error!(error = ?e, "Database pool error");
         Error::DatabasePoolUnavailable
     })?;
-    program_client::table
+
-        .filter(program_client::public_key.eq(&pubkey_bytes))
+    conn.exclusive_transaction(|conn| {
-        .select(program_client::id)
+        Box::pin(async move {
-        .first::<i32>(&mut conn)
+            let Some((client_id, current_nonce)) = program_client::table
-        .await
+                .filter(program_client::public_key.eq(&pubkey_bytes))
-        .optional()
+                .select((program_client::id, program_client::nonce))
-        .map_err(|e| {
+                .first::<(i32, i32)>(conn)
-            error!(error = ?e, "Database error");
+                .await
-            Error::DatabaseOperationFailed
+                .optional()?
+            else {
+                return Result::<_, diesel::result::Error>::Ok(None);
+            };
+
+            update(program_client::table)
+                .filter(program_client::public_key.eq(&pubkey_bytes))
+                .set(program_client::nonce.eq(current_nonce + 1))
+                .execute(conn)
+                .await?;
+
+            Ok(Some(ClientInfo {
+                id: client_id,
+                current_nonce,
+            }))
         })
-}
+    })
-
-async fn verify_integrity(
-    db: &db::DatabasePool,
-    vault: &ActorRef<Vault>,
-    pubkey: &authn::PublicKey,
-) -> Result<(), Error> {
-    let mut db_conn = db.get().await.map_err(|e| {
-        error!(error = ?e, "Database pool error");
-        Error::DatabasePoolUnavailable
-    })?;
-
-    let id = get_client_id(db, pubkey).await?.ok_or_else(|| {
-        error!("Client not found during integrity verification");
-        Error::DatabaseOperationFailed
-    })?;
-
-    let attestation = integrity::verify_entity(
-        &mut db_conn,
-        vault,
-        &ClientCredentials {
-            pubkey: pubkey.clone(),
-        },
-        id,
-    )
     .await
     .map_err(|e| {
-        error!(?e, "Integrity verification failed");
+        error!(error = ?e, "Database error");
-        Error::IntegrityCheckFailed
+        Error::DatabaseOperationFailed
-    })?;
+    })
-
-    if attestation != AttestationStatus::Attested {
-        error!("Integrity attestation unavailable for client {id}");
-        return Err(Error::IntegrityCheckFailed);
-    }
-
-    Ok(())
 }
 
-async fn approve_new_client(actors: &GlobalActors, profile: ClientProfile) -> Result<(), Error> {
+async fn approve_new_client(
+    actors: &crate::actors::GlobalActors,
+    profile: ClientProfile,
+) -> Result<(), Error> {
     let result = actors
         .flow_coordinator
         .ask(RequestClientApproval { client: profile })
@@ -157,61 +139,45 @@ async fn approve_new_client(actors: &GlobalActors, profile: ClientProfile) -> Re
 
 async fn insert_client(
     db: &db::DatabasePool,
-    vault: &ActorRef<Vault>,
+    pubkey: &VerifyingKey,
-    pubkey: &authn::PublicKey,
     metadata: &ClientMetadata,
 ) -> Result<i32, Error> {
     use crate::db::schema::{client_metadata, program_client};
-    let pubkey = pubkey.clone();
-    let metadata = metadata.clone();
-
     let mut conn = db.get().await.map_err(|e| {
         error!(error = ?e, "Database pool error");
         Error::DatabasePoolUnavailable
     })?;
 
-    conn.exclusive_transaction(|conn| {
+    let metadata_id = insert_into(client_metadata::table)
-        let vault = vault.clone();
+        .values((
-        let pubkey = pubkey.clone();
+            client_metadata::name.eq(&metadata.name),
-        Box::pin(async move {
+            client_metadata::description.eq(&metadata.description),
-            let metadata_id = insert_into(client_metadata::table)
+            client_metadata::version.eq(&metadata.version),
-                .values((
+        ))
-                    client_metadata::name.eq(&metadata.name),
+        .returning(client_metadata::id)
-                    client_metadata::description.eq(&metadata.description),
+        .get_result::<i32>(&mut conn)
-                    client_metadata::version.eq(&metadata.version),
+        .await
-                ))
+        .map_err(|e| {
-                .returning(client_metadata::id)
+            error!(error = ?e, "Failed to insert client metadata");
-                .get_result::<i32>(conn)
+            Error::DatabaseOperationFailed
-                .await?;
+        })?;
 
-            let client_id = insert_into(program_client::table)
+    let client_id = insert_into(program_client::table)
-                .values((
+        .values((
-                    program_client::public_key.eq(pubkey.to_bytes()),
+            program_client::public_key.eq(pubkey.as_bytes().to_vec()),
-                    program_client::metadata_id.eq(metadata_id),
+            program_client::metadata_id.eq(metadata_id),
-                ))
+            program_client::nonce.eq(1), // pre-incremented; challenge uses 0
-                .on_conflict_do_nothing()
+        ))
-                .returning(program_client::id)
+        .on_conflict_do_nothing()
-                .get_result::<i32>(conn)
+        .returning(program_client::id)
-                .await?;
+        .get_result::<i32>(&mut conn)
+        .await
+        .map_err(|e| {
+            error!(error = ?e, "Failed to insert client metadata");
+            Error::DatabaseOperationFailed
+        })?;
 
-            integrity::sign_entity(
+    Ok(client_id)
-                conn,
-                &vault,
-                &ClientCredentials {
-                    pubkey: pubkey.clone(),
-                },
-                client_id,
-            )
-            .await
-            .map_err(|e| {
-                error!(error = ?e, "Failed to sign integrity tag for new client key");
-                Error::DatabaseOperationFailed
-            })?;
-
-            Ok(client_id)
-        })
-    })
-    .await
 }
 
 async fn sync_client_metadata(
@@ -287,16 +253,14 @@ async fn sync_client_metadata(
 
 async fn challenge_client<T>(
     transport: &mut T,
-    pubkey: authn::PublicKey,
+    pubkey: VerifyingKey,
-    challenge: AuthChallenge,
+    nonce: i32,
 ) -> Result<(), Error>
 where
     T: Bi<Inbound, Result<Outbound, Error>> + ?Sized,
 {
     transport
-        .send(Ok(Outbound::AuthChallenge {
+        .send(Ok(Outbound::AuthChallenge { pubkey, nonce }))
-            challenge: challenge.clone(),
-        }))
         .await
         .map_err(|e| {
             error!(error = ?e, "Failed to send auth challenge");
@@ -313,10 +277,12 @@ where
         Error::Transport
     })?;
 
-    if !pubkey.verify(&challenge, CLIENT_CONTEXT, &signature) {
+    let formatted = format_challenge(nonce, pubkey.as_bytes());
+
+    pubkey.verify_strict(&formatted, &signature).map_err(|_| {
         error!("Challenge solution verification failed");
-        return Err(Error::InvalidChallengeSolution);
+        Error::InvalidChallengeSolution
-    }
+    })?;
 
     Ok(())
 }
@@ -329,28 +295,27 @@ where
         return Err(Error::Transport);
     };
 
-    let client_id = match get_client_id(&props.db, &pubkey).await? {
+    let info = match get_client_and_nonce(&props.db, &pubkey).await? {
-        Some(id) => {
+        Some(nonce) => nonce,
-            verify_integrity(&props.db, &props.actors.vault, &pubkey).await?;
-            id
-        }
         None => {
             approve_new_client(
                 &props.actors,
                 ClientProfile {
-                    pubkey: pubkey.clone(),
+                    pubkey,
                     metadata: metadata.clone(),
                 },
             )
             .await?;
-            insert_client(&props.db, &props.actors.vault, &pubkey, &metadata).await?
+            let client_id = insert_client(&props.db, &pubkey, &metadata).await?;
+            ClientInfo {
+                id: client_id,
+                current_nonce: 0,
+            }
         }
     };
 
-    sync_client_metadata(&props.db, client_id, &metadata).await?;
+    sync_client_metadata(&props.db, info.id, &metadata).await?;
-
+    challenge_client(transport, pubkey, info.current_nonce).await?;
-    let challenge = AuthChallenge::generate(&mut rand::rng());
-    challenge_client(transport, pubkey, challenge).await?;
 
     transport
         .send(Ok(Outbound::AuthSuccess))
@@ -360,5 +325,5 @@ where
             Error::Transport
         })?;
 
-    Ok(client_id)
+    Ok(info.id)
 }

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

@@ -1,28 +1,18 @@
-use crate::{
-    actors::GlobalActors, crypto::integrity::Integrable, db, peers::client::session::ClientSession,
-};
-use arbiter_crypto::authn;
-use arbiter_macros::Hashable;
 use arbiter_proto::{ClientMetadata, transport::Bi};
-
 use kameo::actor::Spawn;
 use tracing::{error, info};
 
+use crate::{
+    actors::{GlobalActors, client::session::ClientSession},
+    db,
+};
+
 #[derive(Debug, Clone)]
 pub struct ClientProfile {
-    pub pubkey: authn::PublicKey,
+    pub pubkey: ed25519_dalek::VerifyingKey,
     pub metadata: ClientMetadata,
 }
 
-#[derive(Hashable)]
-pub struct ClientCredentials {
-    pub pubkey: authn::PublicKey,
-}
-
-impl Integrable for ClientCredentials {
-    const KIND: &'static str = "client_credentials";
-}
-
 pub struct ClientConnection {
     pub(crate) db: db::DatabasePool,
     pub(crate) actors: GlobalActors,
@@ -41,9 +31,7 @@ pub async fn connect_client<T>(mut props: ClientConnection, transport: &mut T)
 where
     T: Bi<auth::Inbound, Result<auth::Outbound, auth::Error>> + Send + ?Sized,
 {
-    let fut = auth::authenticate(&mut props, transport);
+    match auth::authenticate(&mut props, transport).await {
-    println!("authenticate future size: {}", std::mem::size_of_val(&fut));
-    match fut.await {
         Ok(client_id) => {
             ClientSession::spawn(ClientSession::new(props, client_id));
             info!("Client authenticated, session started");

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

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

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

@@ -1,5 +1,14 @@
+use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
+use diesel::{
+    BoolExpressionMethods as _, ExpressionMethods, OptionalExtension as _, QueryDsl,
+    SelectableHelper as _, dsl::insert_into,
+};
+use diesel_async::{AsyncConnection as _, RunQueryDsl};
+use kameo::{Actor, actor::ActorRef, messages};
+use rand::{SeedableRng, rng, rngs::StdRng};
+
 use crate::{
-    actors::vault::{CreateNew, Decrypt, Vault},
+    actors::keyholder::{CreateNew, Decrypt, KeyHolder},
     crypto::integrity,
     db::{
         DatabaseError, DatabasePool,
@@ -13,16 +22,8 @@ use crate::{
             ether_transfer::EtherTransfer, token_transfers::TokenTransfer,
         },
     },
+    safe_cell::{SafeCell, SafeCellHandle as _},
 };
-use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
-
-use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
-use diesel::{
-    ExpressionMethods, OptionalExtension as _, QueryDsl, SelectableHelper as _, dsl::insert_into,
-};
-use diesel_async::RunQueryDsl;
-use kameo::{Actor, actor::ActorRef, messages};
-use rand::{SeedableRng, rng, rngs::StdRng};
 
 pub use crate::evm::safe_signer;
 
@@ -34,11 +35,11 @@ pub enum SignTransactionError {
     #[error("Database error: {0}")]
     Database(#[from] DatabaseError),
 
-    #[error("Vault error: {0}")]
+    #[error("Keyholder error: {0}")]
-    Vault(#[from] crate::actors::vault::Error),
+    Keyholder(#[from] crate::actors::keyholder::Error),
 
-    #[error("Vault mailbox error")]
+    #[error("Keyholder mailbox error")]
-    VaultSend,
+    KeyholderSend,
 
     #[error("Signing error: {0}")]
     Signing(#[from] alloy::signers::Error),
@@ -49,11 +50,11 @@ pub enum SignTransactionError {
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("Vault error: {0}")]
+    #[error("Keyholder error: {0}")]
-    Vault(#[from] crate::actors::vault::Error),
+    Keyholder(#[from] crate::actors::keyholder::Error),
 
-    #[error("Vault mailbox error")]
+    #[error("Keyholder mailbox error")]
-    VaultSend,
+    KeyholderSend,
 
     #[error("Database error: {0}")]
     Database(#[from] DatabaseError),
@@ -64,20 +65,20 @@ pub enum Error {
 
 #[derive(Actor)]
 pub struct EvmActor {
-    pub vault: ActorRef<Vault>,
+    pub keyholder: ActorRef<KeyHolder>,
     pub db: DatabasePool,
     pub rng: StdRng,
     pub engine: evm::Engine,
 }
 
 impl EvmActor {
-    pub fn new(vault: ActorRef<Vault>, db: DatabasePool) -> Self {
+    pub fn new(keyholder: ActorRef<KeyHolder>, 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(), vault.clone());
+        let engine = evm::Engine::new(db.clone(), keyholder.clone());
         Self {
-            vault,
+            keyholder,
             db,
             rng,
             engine,
@@ -94,10 +95,10 @@ impl EvmActor {
         let plaintext = key_cell.read_inline(|reader| SafeCell::new(reader.to_vec()));
 
         let aead_id: i32 = self
-            .vault
+            .keyholder
             .ask(CreateNew { plaintext })
             .await
-            .map_err(|_| Error::VaultSend)?;
+            .map_err(|_| Error::KeyholderSend)?;
 
         let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
         let wallet_id = insert_into(schema::evm_wallet::table)
@@ -158,28 +159,115 @@ impl EvmActor {
     }
 
     #[message]
-    pub async fn useragent_delete_grant(&mut self, _grant_id: i32) -> Result<(), Error> {
+    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 mut conn = self.db.get().await.map_err(DatabaseError::from)?;
-        // let vault = self.vault.clone();
 
-        // diesel_async::AsyncConnection::transaction(&mut conn, |conn| {
+        // We intentionally perform a hard delete here to avoid leaving revoked grants and their
-        //     Box::pin(async move {
+        // related rows as long-lived DB garbage. We also don't rely on SQLite FK cascades because
-        //         diesel::update(schema::evm_basic_grant::table)
+        // they can be disabled per-connection.
-        //             .filter(schema::evm_basic_grant::id.eq(grant_id))
+        conn.transaction(|conn| {
-        //             .set(schema::evm_basic_grant::revoked_at.eq(SqliteTimestamp::now()))
+            Box::pin(async move {
-        //             .execute(conn)
+                // First, resolve policy-specific rows by basic grant id.
-        //             .await?;
+                let token_grant_id: Option<i32> = schema::evm_token_transfer_grant::table
+                    .select(schema::evm_token_transfer_grant::id)
+                    .filter(schema::evm_token_transfer_grant::basic_grant_id.eq(grant_id))
+                    .first::<i32>(conn)
+                    .await
+                    .optional()?;
 
-        //         let signed = integrity::evm::load_signed_grant_by_basic_id(conn, grant_id).await?;
+                let ether_grant: Option<(i32, i32)> = schema::evm_ether_transfer_grant::table
+                    .select((
+                        schema::evm_ether_transfer_grant::id,
+                        schema::evm_ether_transfer_grant::limit_id,
+                    ))
+                    .filter(schema::evm_ether_transfer_grant::basic_grant_id.eq(grant_id))
+                    .first::<(i32, i32)>(conn)
+                    .await
+                    .optional()?;
 
-        //         diesel::result::QueryResult::Ok(())
+                // Token-transfer: logs must be deleted before transaction logs (FK restrict).
-        //     })
+                if let Some(token_grant_id) = token_grant_id {
-        // })
+                    diesel::delete(
-        // .await
+                        schema::evm_token_transfer_log::table
-        // .map_err(DatabaseError::from)?;
+                            .filter(schema::evm_token_transfer_log::grant_id.eq(token_grant_id)),
+                    )
+                    .execute(conn)
+                    .await?;
 
-        // Ok(())
+                    diesel::delete(schema::evm_token_transfer_volume_limit::table.filter(
-        todo!()
+                        schema::evm_token_transfer_volume_limit::grant_id.eq(token_grant_id),
+                    ))
+                    .execute(conn)
+                    .await?;
+
+                    diesel::delete(
+                        schema::evm_token_transfer_grant::table
+                            .filter(schema::evm_token_transfer_grant::id.eq(token_grant_id)),
+                    )
+                    .execute(conn)
+                    .await?;
+                }
+
+                // Shared transaction logs for any grant kind.
+                diesel::delete(
+                    schema::evm_transaction_log::table
+                        .filter(schema::evm_transaction_log::grant_id.eq(grant_id)),
+                )
+                .execute(conn)
+                .await?;
+
+                // Ether-transfer: delete targets, grant row, then its limit row.
+                if let Some((ether_grant_id, limit_id)) = ether_grant {
+                    diesel::delete(schema::evm_ether_transfer_grant_target::table.filter(
+                        schema::evm_ether_transfer_grant_target::grant_id.eq(ether_grant_id),
+                    ))
+                    .execute(conn)
+                    .await?;
+
+                    diesel::delete(
+                        schema::evm_ether_transfer_grant::table
+                            .filter(schema::evm_ether_transfer_grant::id.eq(ether_grant_id)),
+                    )
+                    .execute(conn)
+                    .await?;
+
+                    diesel::delete(
+                        schema::evm_ether_transfer_limit::table
+                            .filter(schema::evm_ether_transfer_limit::id.eq(limit_id)),
+                    )
+                    .execute(conn)
+                    .await?;
+                }
+
+                // Integrity envelopes are not FK-constrained; delete only grant-related kinds to
+                // avoid accidentally deleting other entities that share the same integer ID.
+                let entity_id = grant_id.to_be_bytes().to_vec();
+                diesel::delete(
+                    schema::integrity_envelope::table
+                        .filter(schema::integrity_envelope::entity_id.eq(entity_id))
+                        .filter(
+                            schema::integrity_envelope::entity_kind
+                                .eq("EtherTransfer")
+                                .or(schema::integrity_envelope::entity_kind.eq("TokenTransfer")),
+                        ),
+                )
+                .execute(conn)
+                .await?;
+
+                // Finally remove the basic grant row itself (idempotent if it doesn't exist).
+                diesel::delete(
+                    schema::evm_basic_grant::table.filter(schema::evm_basic_grant::id.eq(grant_id)),
+                )
+                .execute(conn)
+                .await?;
+
+                diesel::result::QueryResult::Ok(())
+            })
+        })
+        .await
+        .map_err(DatabaseError::from)?;
+
+        Ok(())
     }
 
     #[message]
@@ -254,12 +342,12 @@ impl EvmActor {
         drop(conn);
 
         let raw_key: SafeCell<Vec<u8>> = self
-            .vault
+            .keyholder
             .ask(Decrypt {
                 aead_id: wallet.aead_encrypted_id,
             })
             .await
-            .map_err(|_| SignTransactionError::VaultSend)?;
+            .map_err(|_| SignTransactionError::KeyholderSend)?;
 
         let signer = safe_signer::SafeSigner::from_cell(raw_key)?;
 
@@ -271,3 +359,6 @@ impl EvmActor {
         Ok(signer.sign_transaction_sync(&mut transaction)?)
     }
 }
+
+#[cfg(test)]
+mod tests;

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

@@ -0,0 +1,283 @@
+use diesel::{ExpressionMethods as _, QueryDsl as _, dsl::insert_into};
+use diesel_async::RunQueryDsl;
+use kameo::actor::Spawn as _;
+
+use crate::{
+    actors::{evm::EvmActor, keyholder::KeyHolder},
+    db::{self, models, schema},
+};
+
+#[tokio::test]
+async fn delete_ether_grant_cleans_related_tables() {
+    let db = db::create_test_pool().await;
+    let keyholder = KeyHolder::spawn(KeyHolder::new(db.clone()).await.unwrap());
+    let mut actor = EvmActor::new(keyholder, db.clone());
+
+    let mut conn = db.get().await.unwrap();
+
+    let basic_id: i32 = insert_into(schema::evm_basic_grant::table)
+        .values(&models::NewEvmBasicGrant {
+            wallet_access_id: 1,
+            chain_id: 1,
+            valid_from: None,
+            valid_until: None,
+            max_gas_fee_per_gas: None,
+            max_priority_fee_per_gas: None,
+            rate_limit_count: None,
+            rate_limit_window_secs: None,
+            revoked_at: None,
+        })
+        .returning(schema::evm_basic_grant::id)
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+
+    let limit_id: i32 = insert_into(schema::evm_ether_transfer_limit::table)
+        .values(&models::NewEvmEtherTransferLimit {
+            window_secs: 60,
+            max_volume: vec![1],
+        })
+        .returning(schema::evm_ether_transfer_limit::id)
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+
+    let ether_grant_id: i32 = insert_into(schema::evm_ether_transfer_grant::table)
+        .values(&models::NewEvmEtherTransferGrant {
+            basic_grant_id: basic_id,
+            limit_id,
+        })
+        .returning(schema::evm_ether_transfer_grant::id)
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+
+    insert_into(schema::evm_ether_transfer_grant_target::table)
+        .values(&models::NewEvmEtherTransferGrantTarget {
+            grant_id: ether_grant_id,
+            address: vec![0u8; 20],
+        })
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    insert_into(schema::evm_transaction_log::table)
+        .values(&models::NewEvmTransactionLog {
+            grant_id: basic_id,
+            wallet_access_id: 1,
+            chain_id: 1,
+            eth_value: vec![0],
+            signed_at: models::SqliteTimestamp::now(),
+        })
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    insert_into(schema::integrity_envelope::table)
+        .values(&models::NewIntegrityEnvelope {
+            entity_kind: "EtherTransfer".to_owned(),
+            entity_id: basic_id.to_be_bytes().to_vec(),
+            payload_version: 1,
+            key_version: 1,
+            mac: vec![0u8; 32],
+        })
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    drop(conn);
+
+    actor.useragent_delete_grant(basic_id).await.unwrap();
+
+    // Idempotency: second delete should be a no-op.
+    actor.useragent_delete_grant(basic_id).await.unwrap();
+
+    let mut conn = db.get().await.unwrap();
+
+    let basic_count: i64 = schema::evm_basic_grant::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(basic_count, 0);
+
+    let ether_grant_count: i64 = schema::evm_ether_transfer_grant::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(ether_grant_count, 0);
+
+    let target_count: i64 = schema::evm_ether_transfer_grant_target::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(target_count, 0);
+
+    let limit_count: i64 = schema::evm_ether_transfer_limit::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(limit_count, 0);
+
+    let log_count: i64 = schema::evm_transaction_log::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(log_count, 0);
+
+    let envelope_count: i64 = schema::integrity_envelope::table
+        .filter(schema::integrity_envelope::entity_kind.eq("EtherTransfer"))
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(envelope_count, 0);
+}
+
+#[tokio::test]
+async fn delete_token_grant_cleans_related_tables() {
+    let db = db::create_test_pool().await;
+    let keyholder = KeyHolder::spawn(KeyHolder::new(db.clone()).await.unwrap());
+    let mut actor = EvmActor::new(keyholder, db.clone());
+
+    let mut conn = db.get().await.unwrap();
+
+    let basic_id: i32 = insert_into(schema::evm_basic_grant::table)
+        .values(&models::NewEvmBasicGrant {
+            wallet_access_id: 1,
+            chain_id: 1,
+            valid_from: None,
+            valid_until: None,
+            max_gas_fee_per_gas: None,
+            max_priority_fee_per_gas: None,
+            rate_limit_count: None,
+            rate_limit_window_secs: None,
+            revoked_at: None,
+        })
+        .returning(schema::evm_basic_grant::id)
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+
+    let token_grant_id: i32 = insert_into(schema::evm_token_transfer_grant::table)
+        .values(&models::NewEvmTokenTransferGrant {
+            basic_grant_id: basic_id,
+            token_contract: vec![1u8; 20],
+            receiver: None,
+        })
+        .returning(schema::evm_token_transfer_grant::id)
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+
+    insert_into(schema::evm_token_transfer_volume_limit::table)
+        .values(&models::NewEvmTokenTransferVolumeLimit {
+            grant_id: token_grant_id,
+            window_secs: 60,
+            max_volume: vec![1],
+        })
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    insert_into(schema::evm_token_transfer_volume_limit::table)
+        .values(&models::NewEvmTokenTransferVolumeLimit {
+            grant_id: token_grant_id,
+            window_secs: 3600,
+            max_volume: vec![2],
+        })
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    let tx_log_id: i32 = insert_into(schema::evm_transaction_log::table)
+        .values(&models::NewEvmTransactionLog {
+            grant_id: basic_id,
+            wallet_access_id: 1,
+            chain_id: 1,
+            eth_value: vec![0],
+            signed_at: models::SqliteTimestamp::now(),
+        })
+        .returning(schema::evm_transaction_log::id)
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+
+    insert_into(schema::evm_token_transfer_log::table)
+        .values(&models::NewEvmTokenTransferLog {
+            grant_id: token_grant_id,
+            log_id: tx_log_id,
+            chain_id: 1,
+            token_contract: vec![1u8; 20],
+            recipient_address: vec![2u8; 20],
+            value: vec![3],
+        })
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    insert_into(schema::integrity_envelope::table)
+        .values(&models::NewIntegrityEnvelope {
+            entity_kind: "TokenTransfer".to_owned(),
+            entity_id: basic_id.to_be_bytes().to_vec(),
+            payload_version: 1,
+            key_version: 1,
+            mac: vec![0u8; 32],
+        })
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    drop(conn);
+
+    actor.useragent_delete_grant(basic_id).await.unwrap();
+
+    let mut conn = db.get().await.unwrap();
+
+    let basic_count: i64 = schema::evm_basic_grant::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(basic_count, 0);
+
+    let token_grant_count: i64 = schema::evm_token_transfer_grant::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(token_grant_count, 0);
+
+    let token_limits_count: i64 = schema::evm_token_transfer_volume_limit::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(token_limits_count, 0);
+
+    let token_logs_count: i64 = schema::evm_token_transfer_log::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(token_logs_count, 0);
+
+    let tx_logs_count: i64 = schema::evm_transaction_log::table
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(tx_logs_count, 0);
+
+    let envelope_count: i64 = schema::integrity_envelope::table
+        .filter(schema::integrity_envelope::entity_kind.eq("TokenTransfer"))
+        .count()
+        .get_result(&mut conn)
+        .await
+        .unwrap();
+    assert_eq!(envelope_count, 0);
+}

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

@@ -1,17 +1,16 @@
-use crate::{
+use std::ops::ControlFlow;
-    actors::flow_coordinator::ApprovalError,
-    peers::{
-        client::ClientProfile,
-        user_agent::{UserAgentSession, session::BeginNewClientApproval},
-    },
-};
 
 use kameo::{
     Actor, messages,
     prelude::{ActorId, ActorRef, ActorStopReason, Context, WeakActorRef},
     reply::ReplySender,
 };
-use std::ops::ControlFlow;
+
+use crate::actors::{
+    client::ClientProfile,
+    flow_coordinator::ApprovalError,
+    user_agent::{UserAgentSession, session::BeginNewClientApproval},
+};
 
 pub struct Args {
     pub client: ClientProfile,

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

@@ -1,10 +1,4 @@
-use crate::{
+use std::{collections::HashMap, ops::ControlFlow};
-    actors::{
-        flow_coordinator::client_connect_approval::ClientApprovalController,
-        useragent_registry::{GetConnected, UserAgentRegistry},
-    },
-    peers::client::{ClientProfile, session::ClientSession},
-};
 
 use kameo::{
     Actor,
@@ -13,23 +7,20 @@ use kameo::{
     prelude::{ActorStopReason, Context, WeakActorRef},
     reply::DelegatedReply,
 };
-use std::{collections::HashMap, ops::ControlFlow};
 use tracing::info;
 
+use crate::actors::{
+    client::{ClientProfile, session::ClientSession},
+    flow_coordinator::client_connect_approval::ClientApprovalController,
+    user_agent::session::UserAgentSession,
+};
+
 pub mod client_connect_approval;
 
+#[derive(Default)]
 pub struct FlowCoordinator {
+    pub user_agents: HashMap<ActorId, ActorRef<UserAgentSession>>,
     pub clients: HashMap<ActorId, ActorRef<ClientSession>>,
-    useragent_registry: ActorRef<UserAgentRegistry>,
-}
-
-impl FlowCoordinator {
-    pub fn new(useragent_registry: ActorRef<UserAgentRegistry>) -> Self {
-        Self {
-            clients: HashMap::default(),
-            useragent_registry,
-        }
-    }
 }
 
 impl Actor for FlowCoordinator {
@@ -47,7 +38,13 @@ impl Actor for FlowCoordinator {
         id: ActorId,
         _: ActorStopReason,
     ) -> Result<ControlFlow<ActorStopReason>, Self::Error> {
-        if self.clients.remove(&id).is_some() {
+        if self.user_agents.remove(&id).is_some() {
+            info!(
+                ?id,
+                actor = "FlowCoordinator",
+                event = "useragent.disconnected"
+            );
+        } else if self.clients.remove(&id).is_some() {
             info!(
                 ?id,
                 actor = "FlowCoordinator",
@@ -72,6 +69,17 @@ pub enum ApprovalError {
 
 #[messages]
 impl FlowCoordinator {
+    #[message(ctx)]
+    pub async fn register_user_agent(
+        &mut self,
+        actor: ActorRef<UserAgentSession>,
+        ctx: &mut Context<Self, ()>,
+    ) {
+        info!(id = %actor.id(), actor = "FlowCoordinator", event = "useragent.connected");
+        ctx.actor_ref().link(&actor).await;
+        self.user_agents.insert(actor.id(), actor);
+    }
+
     #[message(ctx)]
     pub async fn register_client(
         &mut self,
@@ -93,14 +101,7 @@ impl FlowCoordinator {
             unreachable!("Expected `request_client_approval` to have callback channel");
         };
 
-        let refs = match self.useragent_registry.ask(GetConnected).await {
+        let refs: Vec<_> = self.user_agents.values().cloned().collect();
-            Ok(refs) => refs,
-            Err(_) => {
-                reply_sender.send(Err(ApprovalError::NoUserAgentsConnected));
-                return reply;
-            }
-        };
-
         if refs.is_empty() {
             reply_sender.send(Err(ApprovalError::NoUserAgentsConnected));
             return reply;

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

@@ -1,17 +1,3 @@
-use crate::{
-    crypto::{
-        KeyCell, derive_key,
-        encryption::v1::{self, Nonce},
-        integrity::v1::HmacSha256,
-    },
-    db::{
-        self,
-        models::{self, RootKeyHistory},
-        schema::{self},
-    },
-};
-use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
-
 use chrono::Utc;
 use diesel::{
     ExpressionMethods as _, OptionalExtension, QueryDsl, SelectableHelper,
@@ -19,31 +5,47 @@ use diesel::{
 };
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use hmac::Mac as _;
-use kameo::{Actor, Reply, actor::ActorRef, messages};
+use kameo::{Actor, Reply, messages};
-use kameo_actors::message_bus::{MessageBus, Publish};
 use strum::{EnumDiscriminants, IntoDiscriminant};
 use tracing::{error, info};
 
-pub mod events {
+use crate::{
+    crypto::{
+        KeyCell, derive_key,
+        encryption::v1::{self, Nonce},
+        integrity::v1::HmacSha256,
+    },
+    safe_cell::SafeCell,
+};
+use crate::{
+    db::{
+        self,
+        models::{self, RootKeyHistory},
+        schema::{self},
+    },
+    safe_cell::SafeCellHandle as _,
+};
 
-    #[derive(Clone, Copy)]
+#[derive(Default, EnumDiscriminants)]
-    pub struct Bootstrapped;
+#[strum_discriminants(derive(Reply), vis(pub), name(KeyHolderState))]
-
+enum State {
-    #[derive(Clone, Copy)]
+    #[default]
-    pub struct Unsealed;
+    Unbootstrapped,
-
+    Sealed {
-    #[derive(Clone, Copy)]
+        root_key_history_id: i32,
-    pub struct VaultResealed;
+    },
+    Unsealed {
+        root_key_history_id: i32,
+        root_key: KeyCell,
+    },
 }
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("Vault is already bootstrapped")]
+    #[error("Keyholder is already bootstrapped")]
     AlreadyBootstrapped,
-    #[error("Vault is not bootstrapped")]
+    #[error("Keyholder is not bootstrapped")]
     NotBootstrapped,
-    #[error("Vault is sealed")]
-    Sealed,
     #[error("Invalid key provided")]
     InvalidKey,
 
@@ -63,35 +65,18 @@ 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 Vault {
+pub struct KeyHolder {
     db: db::DatabasePool,
     state: State,
-    events: ActorRef<MessageBus>,
 }
 
 #[messages]
-impl Vault {
+impl KeyHolder {
-    pub async fn new(db: db::DatabasePool, events: ActorRef<MessageBus>) -> Result<Self, Error> {
+    pub async fn new(db: db::DatabasePool) -> Result<Self, Error> {
         let state = {
             let mut conn = db.get().await?;
 
@@ -109,10 +94,10 @@ impl Vault {
             }
         };
 
-        Ok(Self { db, state, events })
+        Ok(Self { db, state })
     }
 
-    // Exclusive transaction to avoid race condtions if multiple vaults write
+    // Exclusive transaction to avoid race condtions if multiple keyholders 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?;
@@ -149,14 +134,6 @@ impl Vault {
         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) {
@@ -209,13 +186,12 @@ impl Vault {
             })
             .await?;
 
-        self.state = State::Unsealed(Unsealed {
+        self.state = State::Unsealed {
             root_key,
             root_key_history_id,
-        });
+        };
 
-        info!("Vault bootstrapped successfully");
+        info!("Keyholder bootstrapped successfully");
-        let _ = self.events.tell(Publish(events::Bootstrapped)).await;
 
         Ok(())
     }
@@ -262,23 +238,24 @@ impl Vault {
                 Error::InvalidKey
             })?;
 
-        self.state = State::Unsealed(Unsealed {
+        self.state = State::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!("Vault unsealed successfully");
+        info!("Keyholder unsealed successfully");
-        let _ = self.events.tell(Publish(events::Unsealed)).await;
 
         Ok(())
     }
 
     #[message]
     pub async fn decrypt(&mut self, aead_id: i32) -> Result<SafeCell<Vec<u8>>, Error> {
-        let Unsealed { root_key, .. } = Self::expect_unsealed(&mut self.state)?;
+        let State::Unsealed { root_key, .. } = &mut self.state else {
+            return Err(Error::NotBootstrapped);
+        };
 
         let row: models::AeadEncrypted = {
             let mut conn = self.db.get().await?;
@@ -306,10 +283,14 @@ impl Vault {
     // 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 Unsealed {
+        let State::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
@@ -339,16 +320,19 @@ impl Vault {
     }
 
     #[message]
-    pub fn get_state(&self) -> VaultState {
+    pub fn get_state(&self) -> KeyHolderState {
         self.state.discriminant()
     }
 
     #[message]
     pub fn sign_integrity(&mut self, mac_input: Vec<u8>) -> Result<(i32, Vec<u8>), Error> {
-        let Unsealed {
+        let State::Unsealed {
             root_key,
             root_key_history_id,
-        } = Self::expect_unsealed(&mut self.state)?;
+        } = &mut self.state
+        else {
+            return Err(Error::NotBootstrapped);
+        };
 
         let mut hmac = root_key
             .0
@@ -370,10 +354,13 @@ impl Vault {
         expected_mac: Vec<u8>,
         key_version: i32,
     ) -> Result<bool, Error> {
-        let Unsealed {
+        let State::Unsealed {
             root_key,
             root_key_history_id,
-        } = Self::expect_unsealed(&mut self.state)?;
+        } = &mut self.state
+        else {
+            return Err(Error::NotBootstrapped);
+        };
 
         if *root_key_history_id != key_version {
             return Ok(false);
@@ -392,16 +379,17 @@ impl Vault {
     }
 
     #[message]
-    pub async fn seal(&mut self) -> Result<(), Error> {
+    pub fn seal(&mut self) -> Result<(), Error> {
-        let Unsealed {
+        let State::Unsealed {
             root_key_history_id,
             ..
-        } = Self::expect_unsealed(&mut self.state)?;
+        } = &self.state
-
+        else {
+            return Err(Error::NotBootstrapped);
+        };
         self.state = State::Sealed {
             root_key_history_id: *root_key_history_id,
         };
-        let _ = self.events.tell(Publish(events::VaultResealed)).await;
         Ok(())
     }
 }
@@ -413,17 +401,14 @@ mod tests {
     use diesel_async::RunQueryDsl;
 
     use crate::{
-        actors::GlobalActors,
         db::{self},
+        safe_cell::SafeCell,
     };
-    use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 
     use super::*;
 
-    async fn bootstrapped_actor(db: &db::DatabasePool) -> Vault {
+    async fn bootstrapped_actor(db: &db::DatabasePool) -> KeyHolder {
-        let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        let mut actor = KeyHolder::new(db.clone()).await.unwrap();
-            .await
-            .unwrap();
         let seal_key = SafeCell::new(b"test-seal-key".to_vec());
         actor.bootstrap(seal_key).await.unwrap();
         actor
@@ -435,17 +420,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(Unsealed {
+            State::Unsealed {
                 root_key_history_id,
                 ..
-            }) => root_key_history_id,
+            } => root_key_history_id,
             _ => panic!("expected unsealed state"),
         };
 
-        let n1 = Vault::get_new_nonce(&db, root_key_history_id)
+        let n1 = KeyHolder::get_new_nonce(&db, root_key_history_id)
             .await
             .unwrap();
-        let n2 = Vault::get_new_nonce(&db, root_key_history_id)
+        let n2 = KeyHolder::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/actors/mod.rs

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

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

@@ -1,16 +1,18 @@
-use super::{Credentials, UserAgentConnection};
-use arbiter_crypto::authn::{self, AuthChallenge};
 use arbiter_proto::transport::Bi;
-
-use state::*;
 use tracing::error;
 
+use crate::actors::user_agent::{
+    AuthPublicKey, UserAgentConnection,
+    auth::state::{AuthContext, AuthStateMachine},
+};
+
 mod state;
+use state::*;
 
 #[derive(Debug, Clone)]
 pub enum Inbound {
     AuthChallengeRequest {
-        pubkey: authn::PublicKey,
+        pubkey: AuthPublicKey,
         bootstrap_token: Option<String>,
     },
     AuthChallengeSolution {
@@ -44,7 +46,7 @@ impl From<diesel::result::Error> for Error {
 
 #[derive(Debug, Clone)]
 pub enum Outbound {
-    AuthChallenge { challenge: AuthChallenge },
+    AuthChallenge { nonce: i32 },
     AuthSuccess,
 }
 
@@ -52,11 +54,12 @@ fn parse_auth_event(payload: Inbound) -> AuthEvents {
     match payload {
         Inbound::AuthChallengeRequest {
             pubkey,
-            bootstrap_token,
+            bootstrap_token: None,
-        } => AuthEvents::AuthRequest(ChallengeRequest {
+        } => AuthEvents::AuthRequest(ChallengeRequest { pubkey }),
+        Inbound::AuthChallengeRequest {
             pubkey,
-            bootstrap_token,
+            bootstrap_token: Some(token),
-        }),
+        } => AuthEvents::BootstrapAuthRequest(BootstrapAuthRequest { pubkey, token }),
         Inbound::AuthChallengeSolution { signature } => {
             AuthEvents::ReceivedSolution(ChallengeSolution {
                 solution: signature,
@@ -67,20 +70,21 @@ fn parse_auth_event(payload: Inbound) -> AuthEvents {
 
 pub async fn authenticate<T>(
     props: &mut UserAgentConnection,
-    transport: &mut T,
+    transport: T,
-) -> Result<Credentials, Error>
+) -> Result<AuthPublicKey, Error>
 where
-    T: Bi<Inbound, Result<Outbound, Error>> + Send + ?Sized,
+    T: Bi<Inbound, Result<Outbound, Error>> + Send,
 {
     let mut state = AuthStateMachine::new(AuthContext::new(props, transport));
 
     loop {
+        // `state` holds a mutable reference to `props` so we can't access it directly here
         let Some(payload) = state.context_mut().transport.recv().await else {
             return Err(Error::Transport);
         };
 
         match state.process_event(parse_auth_event(payload)).await {
-            Ok(AuthStates::AuthOk(result)) => return Ok(result.clone()),
+            Ok(AuthStates::AuthOk(key)) => return Ok(key.clone()),
             Err(AuthError::ActionFailed(err)) => {
                 error!(?err, "State machine action failed");
                 return Err(err);

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

@@ -0,0 +1,344 @@
+use arbiter_proto::transport::Bi;
+use diesel::{ExpressionMethods as _, OptionalExtension as _, QueryDsl, update};
+use diesel_async::{AsyncConnection, RunQueryDsl};
+use kameo::{actor::ActorRef, error::SendError};
+use tracing::error;
+
+use super::Error;
+use crate::{
+    actors::{
+        bootstrap::ConsumeToken,
+        keyholder::KeyHolder,
+        user_agent::{AuthPublicKey, UserAgentConnection, UserAgentCredentials, auth::Outbound},
+    },
+    crypto::integrity::{self, AttestationStatus},
+    db::{DatabasePool, schema::useragent_client},
+};
+
+pub struct ChallengeRequest {
+    pub pubkey: AuthPublicKey,
+}
+
+pub struct BootstrapAuthRequest {
+    pub pubkey: AuthPublicKey,
+    pub token: String,
+}
+
+pub struct ChallengeContext {
+    pub challenge_nonce: i32,
+    pub key: AuthPublicKey,
+}
+
+pub struct ChallengeSolution {
+    pub solution: Vec<u8>,
+}
+
+smlang::statemachine!(
+    name: Auth,
+    custom_error: true,
+    transitions: {
+        *Init + AuthRequest(ChallengeRequest) / async prepare_challenge = SentChallenge(ChallengeContext),
+        Init + BootstrapAuthRequest(BootstrapAuthRequest) / async verify_bootstrap_token = AuthOk(AuthPublicKey),
+        SentChallenge(ChallengeContext) + ReceivedSolution(ChallengeSolution) / async verify_solution = AuthOk(AuthPublicKey),
+    }
+);
+
+/// Returns the current nonce, ready to use for the challenge nonce.
+async fn get_current_nonce_and_id(
+    db: &DatabasePool,
+    key: &AuthPublicKey,
+) -> Result<(i32, i32), Error> {
+    let mut db_conn = db.get().await.map_err(|e| {
+        error!(error = ?e, "Database pool error");
+        Error::internal("Database unavailable")
+    })?;
+    db_conn
+        .exclusive_transaction(|conn| {
+            Box::pin(async move {
+                useragent_client::table
+                    .filter(useragent_client::public_key.eq(key.to_stored_bytes()))
+                    .filter(useragent_client::key_type.eq(key.key_type()))
+                    .select((useragent_client::id, useragent_client::nonce))
+                    .first::<(i32, i32)>(conn)
+                    .await
+            })
+        })
+        .await
+        .optional()
+        .map_err(|e| {
+            error!(error = ?e, "Database error");
+            Error::internal("Database operation failed")
+        })?
+        .ok_or_else(|| {
+            error!(?key, "Public key not found in database");
+            Error::UnregisteredPublicKey
+        })
+}
+
+async fn verify_integrity(
+    db: &DatabasePool,
+    keyholder: &ActorRef<KeyHolder>,
+    pubkey: &AuthPublicKey,
+) -> Result<(), Error> {
+    let mut db_conn = db.get().await.map_err(|e| {
+        error!(error = ?e, "Database pool error");
+        Error::internal("Database unavailable")
+    })?;
+
+    let (id, nonce) = get_current_nonce_and_id(db, pubkey).await?;
+
+    let result = integrity::verify_entity(
+        &mut db_conn,
+        keyholder,
+        &UserAgentCredentials {
+            pubkey: pubkey.clone(),
+            nonce,
+        },
+        id,
+    )
+    .await
+    .map_err(|e| {
+        error!(?e, "Integrity verification failed");
+        Error::internal("Integrity verification failed")
+    })?;
+
+    Ok(())
+
+}
+
+async fn create_nonce(
+    db: &DatabasePool,
+    keyholder: &ActorRef<KeyHolder>,
+    pubkey: &AuthPublicKey,
+) -> Result<i32, Error> {
+    let mut db_conn = db.get().await.map_err(|e| {
+        error!(error = ?e, "Database pool error");
+        Error::internal("Database unavailable")
+    })?;
+    let new_nonce = db_conn
+        .exclusive_transaction(|conn| {
+            Box::pin(async move {
+                let (id, new_nonce): (i32, i32) = update(useragent_client::table)
+                    .filter(useragent_client::public_key.eq(pubkey.to_stored_bytes()))
+                    .filter(useragent_client::key_type.eq(pubkey.key_type()))
+                    .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(
+    db: &DatabasePool,
+    keyholder: &ActorRef<KeyHolder>,
+    pubkey: &AuthPublicKey,
+) -> Result<(), Error> {
+    let pubkey_bytes = pubkey.to_stored_bytes();
+    let key_type = pubkey.key_type();
+    let mut conn = db.get().await.map_err(|e| {
+        error!(error = ?e, "Database pool error");
+        Error::internal("Database unavailable")
+    })?;
+
+    conn.transaction(|conn| {
+        Box::pin(async move {
+            const NONCE_START: i32 = 1;
+
+            let id: i32 = diesel::insert_into(useragent_client::table)
+                .values((
+                    useragent_client::public_key.eq(pubkey_bytes),
+                    useragent_client::nonce.eq(NONCE_START),
+                    useragent_client::key_type.eq(key_type),
+                ))
+                .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(super) conn: &'a mut UserAgentConnection,
+    pub(super) transport: T,
+}
+
+impl<'a, T> AuthContext<'a, T> {
+    pub fn new(conn: &'a mut UserAgentConnection, transport: T) -> Self {
+        Self { conn, transport }
+    }
+}
+
+impl<T> AuthStateMachineContext for AuthContext<'_, T>
+where
+    T: Bi<super::Inbound, Result<super::Outbound, Error>> + Send,
+{
+    type Error = Error;
+
+    async fn prepare_challenge(
+        &mut self,
+        ChallengeRequest { pubkey }: ChallengeRequest,
+    ) -> Result<ChallengeContext, Self::Error> {
+        verify_integrity(&self.conn.db, &self.conn.actors.key_holder, &pubkey).await?;
+
+        let nonce = create_nonce(&self.conn.db, &self.conn.actors.key_holder, &pubkey).await?;
+
+        self.transport
+            .send(Ok(Outbound::AuthChallenge { nonce }))
+            .await
+            .map_err(|e| {
+                error!(?e, "Failed to send auth challenge");
+                Error::Transport
+            })?;
+
+        Ok(ChallengeContext {
+            challenge_nonce: nonce,
+            key: pubkey,
+        })
+    }
+
+    #[allow(missing_docs)]
+    #[allow(clippy::result_unit_err)]
+    async fn verify_bootstrap_token(
+        &mut self,
+        BootstrapAuthRequest { pubkey, token }: BootstrapAuthRequest,
+    ) -> Result<AuthPublicKey, Self::Error> {
+        let token_ok: bool = self
+            .conn
+            .actors
+            .bootstrapper
+            .ask(ConsumeToken {
+                token: token.clone(),
+            })
+            .await
+            .map_err(|e| {
+                error!(?e, "Failed to consume bootstrap token");
+                Error::internal("Failed to consume bootstrap token")
+            })?;
+
+        if !token_ok {
+            error!("Invalid bootstrap token provided");
+            return Err(Error::InvalidBootstrapToken);
+        }
+
+        match token_ok {
+            true => {
+                register_key(&self.conn.db, &self.conn.actors.key_holder, &pubkey).await?;
+                self.transport
+                    .send(Ok(Outbound::AuthSuccess))
+                    .await
+                    .map_err(|_| Error::Transport)?;
+                Ok(pubkey)
+            }
+            false => {
+                error!("Invalid bootstrap token provided");
+                self.transport
+                    .send(Err(Error::InvalidBootstrapToken))
+                    .await
+                    .map_err(|_| Error::Transport)?;
+                Err(Error::InvalidBootstrapToken)
+            }
+        }
+    }
+
+    #[allow(missing_docs)]
+    #[allow(clippy::unused_unit)]
+    async fn verify_solution(
+        &mut self,
+        ChallengeContext {
+            challenge_nonce,
+            key,
+        }: &ChallengeContext,
+        ChallengeSolution { solution }: ChallengeSolution,
+    ) -> Result<AuthPublicKey, Self::Error> {
+        let formatted = arbiter_proto::format_challenge(*challenge_nonce, &key.to_stored_bytes());
+
+        let valid = match key {
+            AuthPublicKey::Ed25519(vk) => {
+                let sig = solution.as_slice().try_into().map_err(|_| {
+                    error!(?solution, "Invalid Ed25519 signature length");
+                    Error::InvalidChallengeSolution
+                })?;
+                vk.verify_strict(&formatted, &sig).is_ok()
+            }
+            AuthPublicKey::EcdsaSecp256k1(vk) => {
+                use k256::ecdsa::signature::Verifier as _;
+                let sig = k256::ecdsa::Signature::try_from(solution.as_slice()).map_err(|_| {
+                    error!(?solution, "Invalid ECDSA signature bytes");
+                    Error::InvalidChallengeSolution
+                })?;
+                vk.verify(&formatted, &sig).is_ok()
+            }
+            AuthPublicKey::Rsa(pk) => {
+                use rsa::signature::Verifier as _;
+                let verifying_key = rsa::pss::VerifyingKey::<sha2::Sha256>::new(pk.clone());
+                let sig = rsa::pss::Signature::try_from(solution.as_slice()).map_err(|_| {
+                    error!(?solution, "Invalid RSA signature bytes");
+                    Error::InvalidChallengeSolution
+                })?;
+                verifying_key.verify(&formatted, &sig).is_ok()
+            }
+        };
+
+        match valid {
+            true => {
+                self.transport
+                    .send(Ok(Outbound::AuthSuccess))
+                    .await
+                    .map_err(|_| Error::Transport)?;
+                Ok(key.clone())
+            }
+            false => {
+                self.transport
+                    .send(Err(Error::InvalidChallengeSolution))
+                    .await
+                    .map_err(|_| Error::Transport)?;
+                Err(Error::InvalidChallengeSolution)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,142 @@
+use crate::{
+    actors::{GlobalActors, client::ClientProfile}, crypto::integrity::Integrable, db::{self, models::KeyType}
+};
+
+fn serialize_ecdsa<S>(key: &k256::ecdsa::VerifyingKey, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    // Serialize as hex string for easier debugging (33 bytes compressed SEC1 format)
+    let key = key.to_encoded_point(true);
+    let bytes = key.as_bytes();
+    serializer.serialize_bytes(bytes)
+}
+
+fn deserialize_ecdsa<'de, D>(deserializer: D) -> Result<k256::ecdsa::VerifyingKey, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    struct EcdsaVisitor;
+
+    impl<'de> serde::de::Visitor<'de> for EcdsaVisitor {
+        type Value = k256::ecdsa::VerifyingKey;
+
+        fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+            formatter.write_str("a compressed SEC1-encoded ECDSA public key")
+        }
+
+        fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+        where
+            E: serde::de::Error,
+        {
+            let point = k256::EncodedPoint::from_bytes(v)
+                .map_err(|_| E::custom("invalid compressed SEC1 format"))?;
+            k256::ecdsa::VerifyingKey::from_encoded_point(&point)
+                .map_err(|_| E::custom("invalid ECDSA public key"))
+        }
+    }
+
+    deserializer.deserialize_bytes(EcdsaVisitor)
+}
+
+/// Abstraction over Ed25519 / ECDSA-secp256k1 / RSA public keys used during the auth handshake.
+#[derive(Clone, Debug, Serialize)]
+pub enum AuthPublicKey {
+    Ed25519(ed25519_dalek::VerifyingKey),
+    /// Compressed SEC1 public key; signature bytes are raw 64-byte (r||s).
+    #[serde(serialize_with = "serialize_ecdsa", deserialize_with = "deserialize_ecdsa")]
+    EcdsaSecp256k1(k256::ecdsa::VerifyingKey),
+    /// RSA-2048+ public key (Windows Hello / KeyCredentialManager); signature bytes are PSS+SHA-256.
+    Rsa(rsa::RsaPublicKey),
+}
+
+#[derive(Debug, Serialize)]
+pub struct UserAgentCredentials {
+    pub pubkey: AuthPublicKey,
+    pub nonce: i32
+}
+
+impl Integrable for UserAgentCredentials {
+    const KIND: &'static str = "useragent_credentials";
+}
+
+impl AuthPublicKey {
+    /// Canonical bytes stored in DB and echoed back in the challenge.
+    /// Ed25519: raw 32 bytes. ECDSA: SEC1 compressed 33 bytes. RSA: DER-encoded SPKI.
+    pub fn to_stored_bytes(&self) -> Vec<u8> {
+        match self {
+            AuthPublicKey::Ed25519(k) => k.to_bytes().to_vec(),
+            // SEC1 compressed (33 bytes) is the natural compact format for secp256k1
+            AuthPublicKey::EcdsaSecp256k1(k) => k.to_encoded_point(true).as_bytes().to_vec(),
+            AuthPublicKey::Rsa(k) => {
+                use rsa::pkcs8::EncodePublicKey as _;
+                #[allow(clippy::expect_used)]
+                k.to_public_key_der()
+                    .expect("rsa SPKI encoding is infallible")
+                    .to_vec()
+            }
+        }
+    }
+
+    pub fn key_type(&self) -> KeyType {
+        match self {
+            AuthPublicKey::Ed25519(_) => KeyType::Ed25519,
+            AuthPublicKey::EcdsaSecp256k1(_) => KeyType::EcdsaSecp256k1,
+            AuthPublicKey::Rsa(_) => KeyType::Rsa,
+        }
+    }
+}
+
+impl TryFrom<(KeyType, Vec<u8>)> for AuthPublicKey {
+    type Error = &'static str;
+
+    fn try_from(value: (KeyType, Vec<u8>)) -> Result<Self, Self::Error> {
+        let (key_type, bytes) = value;
+        match key_type {
+            KeyType::Ed25519 => {
+                let bytes: [u8; 32] = bytes.try_into().map_err(|_| "invalid Ed25519 key length")?;
+                let key = ed25519_dalek::VerifyingKey::from_bytes(&bytes)
+                    .map_err(|_e| "invalid Ed25519 key")?;
+                Ok(AuthPublicKey::Ed25519(key))
+            }
+            KeyType::EcdsaSecp256k1 => {
+                let point =
+                    k256::EncodedPoint::from_bytes(&bytes).map_err(|_e| "invalid ECDSA key")?;
+                let key = k256::ecdsa::VerifyingKey::from_encoded_point(&point)
+                    .map_err(|_e| "invalid ECDSA key")?;
+                Ok(AuthPublicKey::EcdsaSecp256k1(key))
+            }
+            KeyType::Rsa => {
+                use rsa::pkcs8::DecodePublicKey as _;
+                let key = rsa::RsaPublicKey::from_public_key_der(&bytes)
+                    .map_err(|_e| "invalid RSA key")?;
+                Ok(AuthPublicKey::Rsa(key))
+            }
+        }
+    }
+}
+
+// Messages, sent by user agent to connection client without having a request
+#[derive(Debug)]
+pub enum OutOfBand {
+    ClientConnectionRequest { profile: ClientProfile },
+    ClientConnectionCancel { pubkey: ed25519_dalek::VerifyingKey },
+}
+
+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;
+use serde::Serialize;
+pub use session::UserAgentSession;

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

@@ -1,19 +1,21 @@
-use super::{OutOfBand, UserAgentConnection};
-use crate::{
-    actors::{
-        flow_coordinator::client_connect_approval::ClientApprovalController,
-        useragent_registry::ConnectUseragent,
-    },
-    peers::client::ClientProfile,
-};
-use arbiter_crypto::authn;
-use arbiter_proto::transport::Sender;
-
-use kameo::{Actor, actor::ActorRef, messages};
 use std::{borrow::Cow, collections::HashMap};
+
+use arbiter_proto::transport::Sender;
+use async_trait::async_trait;
+use ed25519_dalek::VerifyingKey;
+use kameo::{Actor, actor::ActorRef, messages};
 use thiserror::Error;
 use tracing::error;
 
+use crate::actors::{
+    client::ClientProfile,
+    flow_coordinator::{RegisterUserAgent, client_connect_approval::ClientApprovalController},
+    user_agent::{OutOfBand, UserAgentConnection},
+};
+
+mod state;
+use state::{DummyContext, UserAgentEvents, UserAgentStateMachine};
+
 #[derive(Debug, Error)]
 pub enum Error {
     #[error("State transition failed")]
@@ -45,27 +47,52 @@ impl Error {
 }
 
 pub struct PendingClientApproval {
-    pubkey: authn::PublicKey,
     controller: ActorRef<ClientApprovalController>,
 }
 
 pub struct UserAgentSession {
     props: UserAgentConnection,
+    state: UserAgentStateMachine<DummyContext>,
     sender: Box<dyn Sender<OutOfBand>>,
 
-    pending_client_approvals: HashMap<Vec<u8>, PendingClientApproval>,
+    pending_client_approvals: HashMap<VerifyingKey, PendingClientApproval>,
 }
 
-pub mod handlers;
+pub mod connection;
 
 impl UserAgentSession {
     pub(crate) fn new(props: UserAgentConnection, sender: Box<dyn Sender<OutOfBand>>) -> Self {
         Self {
             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]
@@ -91,13 +118,8 @@ impl UserAgentSession {
             return;
         }
 
-        self.pending_client_approvals.insert(
+        self.pending_client_approvals
-            client.pubkey.to_bytes(),
+            .insert(client.pubkey, PendingClientApproval { controller });
-            PendingClientApproval {
-                pubkey: client.pubkey,
-                controller,
-            },
-        );
     }
 }
 
@@ -112,17 +134,17 @@ impl Actor for UserAgentSession {
     ) -> Result<Self, Self::Error> {
         args.props
             .actors
-            .useragent_registry
+            .flow_coordinator
-            .ask(ConnectUseragent {
+            .ask(RegisterUserAgent {
                 actor: this.clone(),
             })
             .await
             .map_err(|err| {
                 error!(
                     ?err,
-                    "Failed to register user agent connection with user agent registry"
+                    "Failed to register user agent connection with flow coordinator"
                 );
-                Error::internal("Failed to register user agent connection with user agent registry")
+                Error::internal("Failed to register user agent connection with flow coordinator")
             })?;
         Ok(args)
     }
@@ -136,18 +158,14 @@ impl Actor for UserAgentSession {
         let cancelled_pubkey = self
             .pending_client_approvals
             .iter()
-            .find_map(|(k, v)| (v.controller.id() == id).then_some(k.clone()));
+            .find_map(|(k, v)| (v.controller.id() == id).then_some(*k));
 
-        if let Some(pubkey_bytes) = cancelled_pubkey {
+        if let Some(pubkey) = cancelled_pubkey {
-            let Some(approval) = self.pending_client_approvals.remove(&pubkey_bytes) else {
+            self.pending_client_approvals.remove(&pubkey);
-                return Ok(std::ops::ControlFlow::Continue(()));
-            };
 
             if let Err(e) = self
                 .sender
-                .send(OutOfBand::ClientConnectionCancel {
+                .send(OutOfBand::ClientConnectionCancel { pubkey })
-                    pubkey: approval.pubkey,
-                })
                 .await
             {
                 error!(

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

@@ -0,0 +1,522 @@
+use std::sync::Mutex;
+
+use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
+use chacha20poly1305::{AeadInPlace, XChaCha20Poly1305, XNonce, aead::KeyInit};
+use diesel::{ExpressionMethods as _, QueryDsl as _, SelectableHelper};
+use diesel_async::{AsyncConnection, RunQueryDsl};
+use kameo::error::SendError;
+use kameo::messages;
+use kameo::prelude::Context;
+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::db::models::{
+    EvmWalletAccess, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata,
+};
+use crate::evm::policies::{Grant, SpecificGrant};
+use crate::safe_cell::SafeCell;
+use crate::{
+    actors::{
+        evm::{
+            ClientSignTransaction, Generate, ListWallets, SignTransactionError as EvmSignError,
+            UseragentCreateGrant, UseragentDeleteGrant, UseragentListGrants,
+        },
+        keyholder::{self, Bootstrap, TryUnseal},
+        user_agent::session::{
+            UserAgentSession,
+            state::{UnsealContext, UserAgentEvents, UserAgentStates},
+        },
+    },
+    safe_cell::SafeCellHandle as _,
+};
+
+impl 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 {
+    #[error("Policy evaluation failed")]
+    Vet(#[from] crate::evm::VetError),
+
+    #[error("Internal signing error")]
+    Internal,
+}
+
+#[derive(Debug, Error)]
+pub enum GrantMutationError {
+    #[error("Vault is sealed")]
+    VaultSealed,
+
+    #[error("Internal grant mutation error")]
+    Internal,
+}
+
+#[messages]
+impl UserAgentSession {
+    #[message]
+    pub async fn handle_unseal_request(
+        &mut self,
+        client_pubkey: x25519_dalek::PublicKey,
+    ) -> Result<UnsealStartResponse, Error> {
+        let secret = EphemeralSecret::random();
+        let public_key = PublicKey::from(&secret);
+
+        self.transition(UserAgentEvents::UnsealRequest(UnsealContext {
+            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");
+                return Err(Error::internal("Vault is in broken state"));
+            }
+        };
+
+        Ok(vault_state)
+    }
+}
+
+#[messages]
+impl UserAgentSession {
+    #[message]
+    pub(crate) async fn handle_evm_wallet_create(&mut self) -> Result<(i32, Address), Error> {
+        match self.props.actors.evm.ask(Generate {}).await {
+            Ok(address) => Ok(address),
+            Err(SendError::HandlerError(err)) => Err(Error::internal(format!(
+                "EVM wallet generation failed: {err}"
+            ))),
+            Err(err) => {
+                error!(?err, "EVM actor unreachable during wallet create");
+                Err(Error::internal("EVM actor unreachable"))
+            }
+        }
+    }
+
+    #[message]
+    pub(crate) async fn handle_evm_wallet_list(&mut self) -> Result<Vec<(i32, Address)>, Error> {
+        match self.props.actors.evm.ask(ListWallets {}).await {
+            Ok(wallets) => Ok(wallets),
+            Err(err) => {
+                error!(?err, "EVM wallet list failed");
+                Err(Error::internal("Failed to list EVM wallets"))
+            }
+        }
+    }
+}
+
+#[messages]
+impl UserAgentSession {
+    #[message]
+    pub(crate) async fn handle_grant_list(&mut self) -> Result<Vec<Grant<SpecificGrant>>, Error> {
+        match self.props.actors.evm.ask(UseragentListGrants {}).await {
+            Ok(grants) => Ok(grants),
+            Err(err) => {
+                error!(?err, "EVM grant list failed");
+                Err(Error::internal("Failed to list EVM grants"))
+            }
+        }
+    }
+
+    #[message]
+    pub(crate) async fn handle_grant_create(
+        &mut self,
+        basic: crate::evm::policies::SharedGrantSettings,
+        grant: crate::evm::policies::SpecificGrant,
+    ) -> Result<i32, GrantMutationError> {
+        match self
+            .props
+            .actors
+            .evm
+            .ask(UseragentCreateGrant { basic, grant })
+            .await
+        {
+            Ok(grant_id) => Ok(grant_id),
+            Err(err) => {
+                error!(?err, "EVM grant create failed");
+                Err(GrantMutationError::Internal)
+            }
+        }
+    }
+
+    #[message]
+    pub(crate) async fn handle_grant_delete(
+        &mut self,
+        grant_id: i32,
+    ) -> Result<(), GrantMutationError> {
+        match self
+            .props
+            .actors
+            .evm
+            .ask(UseragentDeleteGrant { grant_id })
+            .await
+        {
+            Ok(()) => Ok(()),
+            Err(err) => {
+                error!(?err, "EVM grant delete failed");
+                Err(GrantMutationError::Internal)
+            }
+        }
+    }
+
+    #[message]
+    pub(crate) async fn handle_sign_transaction(
+        &mut self,
+        client_id: i32,
+        wallet_address: Address,
+        transaction: TxEip1559,
+    ) -> Result<Signature, SignTransactionError> {
+        match self
+            .props
+            .actors
+            .evm
+            .ask(ClientSignTransaction {
+                client_id,
+                wallet_address,
+                transaction,
+            })
+            .await
+        {
+            Ok(signature) => Ok(signature),
+            Err(SendError::HandlerError(EvmSignError::Vet(vet_error))) => {
+                Err(SignTransactionError::Vet(vet_error))
+            }
+            Err(err) => {
+                error!(?err, "EVM sign transaction failed in user-agent session");
+                Err(SignTransactionError::Internal)
+            }
+        }
+    }
+
+    #[message]
+    pub(crate) async fn handle_grant_evm_wallet_access(
+        &mut self,
+        entries: Vec<NewEvmWalletAccess>,
+    ) -> Result<(), Error> {
+        let mut conn = self.props.db.get().await?;
+        conn.transaction(|conn| {
+            Box::pin(async move {
+                use crate::db::schema::evm_wallet_access;
+
+                for entry in entries {
+                    diesel::insert_into(evm_wallet_access::table)
+                        .values(&entry)
+                        .on_conflict_do_nothing()
+                        .execute(conn)
+                        .await?;
+                }
+
+                Result::<_, Error>::Ok(())
+            })
+        })
+        .await?;
+        Ok(())
+    }
+
+    #[message]
+    pub(crate) async fn handle_revoke_evm_wallet_access(
+        &mut self,
+        entries: Vec<i32>,
+    ) -> Result<(), Error> {
+        let mut conn = self.props.db.get().await?;
+        conn.transaction(|conn| {
+            Box::pin(async move {
+                use crate::db::schema::evm_wallet_access;
+                for entry in entries {
+                    diesel::delete(evm_wallet_access::table)
+                        .filter(evm_wallet_access::wallet_id.eq(entry))
+                        .execute(conn)
+                        .await?;
+                }
+
+                Result::<_, Error>::Ok(())
+            })
+        })
+        .await?;
+        Ok(())
+    }
+
+    #[message]
+    pub(crate) async fn handle_list_wallet_access(
+        &mut self,
+    ) -> Result<Vec<EvmWalletAccess>, Error> {
+        let mut conn = self.props.db.get().await?;
+        use crate::db::schema::evm_wallet_access;
+        let access_entries = evm_wallet_access::table
+            .select(EvmWalletAccess::as_select())
+            .load::<_>(&mut conn)
+            .await?;
+        Ok(access_entries)
+    }
+}
+
+#[messages]
+impl UserAgentSession {
+    #[message(ctx)]
+    pub(crate) async fn handle_new_client_approve(
+        &mut self,
+        approved: bool,
+        pubkey: ed25519_dalek::VerifyingKey,
+        ctx: &mut Context<Self, Result<(), Error>>,
+    ) -> Result<(), Error> {
+        let pending_approval = match self.pending_client_approvals.remove(&pubkey) {
+            Some(approval) => approval,
+            None => {
+                error!("Received client connection response for unknown client");
+                return Err(Error::internal("Unknown client in connection response"));
+            }
+        };
+
+        pending_approval
+            .controller
+            .tell(ClientApprovalAnswer { approved })
+            .await
+            .map_err(|err| {
+                error!(
+                    ?err,
+                    "Failed to send client approval response to controller"
+                );
+                Error::internal("Failed to send client approval response to controller")
+            })?;
+
+        ctx.actor_ref().unlink(&pending_approval.controller).await;
+
+        Ok(())
+    }
+
+    #[message]
+    pub(crate) async fn handle_sdk_client_list(
+        &mut self,
+    ) -> Result<Vec<(ProgramClient, ProgramClientMetadata)>, Error> {
+        use crate::db::schema::{client_metadata, program_client};
+        let mut conn = self.props.db.get().await?;
+
+        let clients = program_client::table
+            .inner_join(client_metadata::table)
+            .select((
+                ProgramClient::as_select(),
+                ProgramClientMetadata::as_select(),
+            ))
+            .load::<(ProgramClient, ProgramClientMetadata)>(&mut conn)
+            .await?;
+
+        Ok(clients)
+    }
+}

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

@@ -0,0 +1,27 @@
+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

@@ -1,61 +0,0 @@
-use crate::peers::user_agent::UserAgentSession;
-
-use kameo::{
-    Actor,
-    actor::{ActorId, ActorRef},
-    error::Infallible,
-    messages,
-    prelude::{ActorStopReason, Context, WeakActorRef},
-};
-use std::{collections::HashMap, ops::ControlFlow};
-use tracing::info;
-
-#[derive(Default)]
-pub struct UserAgentRegistry {
-    connected: HashMap<ActorId, ActorRef<UserAgentSession>>,
-}
-
-impl Actor for UserAgentRegistry {
-    type Args = Self;
-
-    type Error = Infallible;
-
-    async fn on_start(args: Self::Args, _: ActorRef<Self>) -> Result<Self, Self::Error> {
-        Ok(args)
-    }
-
-    async fn on_link_died(
-        &mut self,
-        _: WeakActorRef<Self>,
-        id: ActorId,
-        _: ActorStopReason,
-    ) -> Result<ControlFlow<ActorStopReason>, Self::Error> {
-        if self.connected.remove(&id).is_some() {
-            info!(
-                ?id,
-                actor = "UserAgentRegistry",
-                event = "useragent.disconnected"
-            );
-        }
-        Ok(ControlFlow::Continue(()))
-    }
-}
-
-#[messages]
-impl UserAgentRegistry {
-    #[message(ctx)]
-    pub async fn connect_useragent(
-        &mut self,
-        actor: ActorRef<UserAgentSession>,
-        ctx: &mut Context<Self, ()>,
-    ) {
-        info!(id = %actor.id(), actor = "UserAgentRegistry", event = "useragent.connected");
-        ctx.actor_ref().link(&actor).await;
-        self.connected.insert(actor.id(), actor);
-    }
-
-    #[message]
-    pub fn get_connected(&self) -> Vec<ActorRef<UserAgentSession>> {
-        self.connected.values().cloned().collect()
-    }
-}

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

@@ -1,12 +1,13 @@
+use std::sync::Arc;
+
+use thiserror::Error;
+
 use crate::{
     actors::GlobalActors,
     context::tls::TlsManager,
     db::{self},
 };
 
-use std::sync::Arc;
-use thiserror::Error;
-
 pub mod tls;
 
 #[derive(Error, Debug)]

server/crates/arbiter-server/src/context/tls.rs

@@ -1,3 +1,17 @@
+use std::{net::Ipv4Addr, string::FromUtf8Error};
+
+use diesel::{ExpressionMethods as _, QueryDsl, SelectableHelper as _};
+use diesel_async::{AsyncConnection, RunQueryDsl};
+
+use pem::Pem;
+use rcgen::{
+    BasicConstraints, Certificate, CertificateParams, CertifiedIssuer, DistinguishedName, DnType,
+    IsCa, Issuer, KeyPair, KeyUsagePurpose, SanType,
+};
+use rustls::pki_types::pem::PemObject;
+use thiserror::Error;
+use tonic::transport::CertificateDer;
+
 use crate::db::{
     self,
     models::{NewTlsHistory, TlsHistory},
@@ -7,18 +21,6 @@ use crate::db::{
     },
 };
 
-use diesel::{ExpressionMethods as _, QueryDsl, SelectableHelper as _};
-use diesel_async::{AsyncConnection, RunQueryDsl};
-use pem::Pem;
-use rcgen::{
-    BasicConstraints, Certificate, CertificateParams, CertifiedIssuer, DistinguishedName, DnType,
-    IsCa, Issuer, KeyPair, KeyUsagePurpose, SanType,
-};
-use rustls::pki_types::pem::PemObject;
-use std::{net::Ipv4Addr, string::FromUtf8Error};
-use thiserror::Error;
-use tonic::transport::CertificateDer;
-
 const ENCODE_CONFIG: pem::EncodeConfig = {
     let line_ending = match cfg!(target_family = "windows") {
         true => pem::LineEnding::CRLF,

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

@@ -1,4 +1,5 @@
 use argon2::password_hash::Salt as ArgonSalt;
+
 use rand::{
     Rng as _, SeedableRng,
     rngs::{StdRng, SysRng},
@@ -58,11 +59,13 @@ mod tests {
     use std::ops::Deref as _;
 
     use super::*;
-    use crate::crypto::derive_key;
+    use crate::{
-    use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
+        crypto::derive_key,
+        safe_cell::{SafeCell, SafeCellHandle as _},
+    };
 
     #[test]
-    fn derive_seal_key_deterministic() {
+    pub fn derive_seal_key_deterministic() {
         static PASSWORD: &[u8] = b"password";
         let password = SafeCell::new(PASSWORD.to_vec());
         let password2 = SafeCell::new(PASSWORD.to_vec());
@@ -78,7 +81,7 @@ mod tests {
     }
 
     #[test]
-    fn successful_derive() {
+    pub fn successful_derive() {
         static PASSWORD: &[u8] = b"password";
         let password = SafeCell::new(PASSWORD.to_vec());
         let salt = generate_salt();
@@ -92,7 +95,7 @@ mod tests {
 
     #[test]
     // We should fuzz this
-    fn test_nonce_increment() {
+    pub fn test_nonce_increment() {
         let mut nonce = Nonce([0u8; NONCE_LENGTH]);
         nonce.increment();
 

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

@@ -1,29 +1,33 @@
+use crate::{actors::keyholder, crypto::KeyCell,safe_cell::SafeCellHandle as _};
+use chacha20poly1305::Key;
+use hmac::{Hmac, Mac as _};
+use serde::Serialize;
+use sha2::Sha256;
+
+use diesel::{ExpressionMethods as _, QueryDsl, dsl::insert_into, sqlite::Sqlite};
+use diesel_async::{AsyncConnection, RunQueryDsl};
+use kameo::{actor::ActorRef, error::SendError};
+use sha2::Digest as _;
+
 use crate::{
-    actors::vault::{self, GetState, SignIntegrity, Vault, VerifyIntegrity},
+    actors::keyholder::{KeyHolder, SignIntegrity, VerifyIntegrity},
     db::{
         self,
         models::{IntegrityEnvelope, NewIntegrityEnvelope},
         schema::integrity_envelope,
     },
 };
-use arbiter_crypto::hashing::Hashable;
-
-use diesel::{ExpressionMethods as _, QueryDsl, dsl::insert_into, sqlite::Sqlite};
-use diesel_async::{AsyncConnection, RunQueryDsl};
-use hmac::Hmac;
-use kameo::{actor::ActorRef, error::SendError};
-use sha2::{Digest as _, Sha256};
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("Database error: {0}")]
     Database(#[from] db::DatabaseError),
 
-    #[error("Vault error: {0}")]
+    #[error("KeyHolder error: {0}")]
-    Vault(#[from] vault::Error),
+    Keyholder(#[from] keyholder::Error),
 
-    #[error("Vault mailbox error")]
+    #[error("KeyHolder mailbox error")]
-    VaultSend,
+    KeyholderSend,
 
     #[error("Integrity envelope is missing for entity {entity_kind}")]
     MissingEnvelope { entity_kind: &'static str },
@@ -39,6 +43,9 @@ pub enum Error {
 
     #[error("Integrity MAC mismatch for entity {entity_kind}")]
     MacMismatch { entity_kind: &'static str },
+
+    #[error("Payload serialization error: {0}")]
+    PayloadSerialization(#[from] postcard::Error),
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -52,15 +59,13 @@ pub const INTEGRITY_SUBKEY_TAG: &[u8] = b"arbiter/db-integrity-key/v1";
 
 pub type HmacSha256 = Hmac<Sha256>;
 
-pub trait Integrable: Hashable {
+pub trait Integrable: Serialize {
     const KIND: &'static str;
     const VERSION: i32 = 1;
 }
 
-fn payload_hash(payload: &impl Hashable) -> [u8; 32] {
+fn payload_hash(payload: &[u8]) -> [u8; 32] {
-    let mut hasher = Sha256::new();
+    Sha256::digest(payload).into()
-    payload.hash(&mut hasher);
-    hasher.finalize().into()
 }
 
 fn push_len_prefixed(out: &mut Vec<u8>, bytes: &[u8]) {
@@ -100,30 +105,30 @@ impl IntoId for &'_ [u8] {
 
 pub async fn sign_entity<E: Integrable>(
     conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    vault: &ActorRef<Vault>,
+    keyholder: &ActorRef<KeyHolder>,
     entity: &E,
     entity_id: impl IntoId,
 ) -> Result<(), Error> {
-    let payload_hash = payload_hash(&entity);
+    let payload = postcard::to_stdvec(entity)?;
+    let payload_hash = payload_hash(&payload);
 
     let entity_id = entity_id.into_id();
 
     let mac_input = build_mac_input(E::KIND, &entity_id, E::VERSION, &payload_hash);
 
-    let (key_version, mac) =
+    let (key_version, mac) = keyholder
-        vault
+        .ask(SignIntegrity { mac_input })
-            .ask(SignIntegrity { mac_input })
+        .await
-            .await
+        .map_err(|err| match err {
-            .map_err(|err| match err {
+            kameo::error::SendError::HandlerError(inner) => Error::Keyholder(inner),
-                kameo::error::SendError::HandlerError(inner) => Error::Vault(inner),
+            _ => Error::KeyholderSend,
-                _ => Error::VaultSend,
+        })?;
-            })?;
 
     insert_into(integrity_envelope::table)
         .values(NewIntegrityEnvelope {
             entity_kind: E::KIND.to_owned(),
-            entity_id,
+            entity_id: entity_id,
-            payload_version: E::VERSION,
+            payload_version: E::VERSION ,
             key_version,
             mac: mac.to_vec(),
         })
@@ -146,7 +151,7 @@ pub async fn sign_entity<E: Integrable>(
 
 pub async fn verify_entity<E: Integrable>(
     conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    vault: &ActorRef<Vault>,
+    keyholder: &ActorRef<KeyHolder>,
     entity: &E,
     entity_id: impl IntoId,
 ) -> Result<AttestationStatus, Error> {
@@ -157,9 +162,7 @@ pub async fn verify_entity<E: Integrable>(
         .first(conn)
         .await
         .map_err(|err| match err {
-            diesel::result::Error::NotFound => Error::MissingEnvelope {
+            diesel::result::Error::NotFound => Error::MissingEnvelope { entity_kind: E::KIND },
-                entity_kind: E::KIND,
-            },
             other => Error::Database(db::DatabaseError::from(other)),
         })?;
 
@@ -171,32 +174,32 @@ pub async fn verify_entity<E: Integrable>(
         });
     }
 
-    let payload_hash = payload_hash(&entity);
+    let payload = postcard::to_stdvec(entity)?;
-    let mac_input = build_mac_input(E::KIND, &entity_id, envelope.payload_version, &payload_hash);
+    let payload_hash = payload_hash(&payload);
+    let mac_input = build_mac_input(
+        E::KIND,
+        &entity_id,
+        envelope.payload_version,
+        &payload_hash,
+    );
 
-    let result = vault
+    let result = keyholder
         .ask(VerifyIntegrity {
             mac_input,
             expected_mac: envelope.mac,
             key_version: envelope.key_version,
         })
-        .await;
+        .await
+        ;
 
     match result {
         Ok(true) => Ok(AttestationStatus::Attested),
-        Ok(false) => Err(Error::MacMismatch {
+        Ok(false) => Err(Error::MacMismatch { entity_kind: E::KIND }),
-            entity_kind: E::KIND,
+        Err(SendError::HandlerError(keyholder::Error::NotBootstrapped)) => Ok(AttestationStatus::Unavailable),
-        }),
+        Err(_) => Err(Error::KeyholderSend),
-        Err(SendError::HandlerError(vault::Error::Sealed)) => Ok(AttestationStatus::Unavailable),
-        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};
@@ -204,30 +207,25 @@ mod tests {
     use kameo::{actor::ActorRef, prelude::Spawn};
 
     use crate::{
-        actors::{
+        actors::keyholder::{Bootstrap, KeyHolder},
-            GlobalActors,
-            vault::{Bootstrap, Vault},
-        },
         db::{self, schema},
+        safe_cell::{SafeCell, SafeCellHandle as _},
     };
-    use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 
     use super::{Error, Integrable, sign_entity, verify_entity};
-    #[derive(Clone, arbiter_macros::Hashable)]
+
+    #[derive(Clone, serde::Serialize)]
     struct DummyEntity {
         payload_version: i32,
         payload: Vec<u8>,
     }
+
     impl Integrable for DummyEntity {
         const KIND: &'static str = "dummy_entity";
     }
 
-    async fn bootstrapped_vault(db: &db::DatabasePool) -> ActorRef<Vault> {
+    async fn bootstrapped_keyholder(db: &db::DatabasePool) -> ActorRef<KeyHolder> {
-        let actor = Vault::spawn(
+        let actor = KeyHolder::spawn(KeyHolder::new(db.clone()).await.unwrap());
-            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()),
@@ -240,7 +238,7 @@ mod tests {
     #[tokio::test]
     async fn sign_writes_envelope_and_verify_passes() {
         let db = db::create_test_pool().await;
-        let vault = bootstrapped_vault(&db).await;
+        let keyholder = bootstrapped_keyholder(&db).await;
         let mut conn = db.get().await.unwrap();
 
         const ENTITY_ID: &[u8] = b"entity-id-7";
@@ -250,9 +248,7 @@ mod tests {
             payload: b"payload-v1".to_vec(),
         };
 
-        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID).await.unwrap();
-            .await
-            .unwrap();
 
         let count: i64 = schema::integrity_envelope::table
             .filter(schema::integrity_envelope::entity_kind.eq("dummy_entity"))
@@ -263,15 +259,13 @@ mod tests {
             .unwrap();
 
         assert_eq!(count, 1, "envelope row must be created exactly once");
-        verify_entity(&mut conn, &vault, &entity, ENTITY_ID)
+        verify_entity(&mut conn, &keyholder, &entity, ENTITY_ID).await.unwrap();
-            .await
-            .unwrap();
     }
 
     #[tokio::test]
     async fn tampered_mac_fails_verification() {
         let db = db::create_test_pool().await;
-        let vault = bootstrapped_vault(&db).await;
+        let keyholder = bootstrapped_keyholder(&db).await;
         let mut conn = db.get().await.unwrap();
 
         const ENTITY_ID: &[u8] = b"entity-id-11";
@@ -281,9 +275,7 @@ mod tests {
             payload: b"payload-v1".to_vec(),
         };
 
-        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID).await.unwrap();
-            .await
-            .unwrap();
 
         diesel::update(schema::integrity_envelope::table)
             .filter(schema::integrity_envelope::entity_kind.eq("dummy_entity"))
@@ -293,7 +285,7 @@ mod tests {
             .await
             .unwrap();
 
-        let err = verify_entity(&mut conn, &vault, &entity, ENTITY_ID)
+        let err = verify_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
             .await
             .unwrap_err();
         assert!(matches!(err, Error::MacMismatch { .. }));
@@ -302,7 +294,7 @@ mod tests {
     #[tokio::test]
     async fn changed_payload_fails_verification() {
         let db = db::create_test_pool().await;
-        let vault = bootstrapped_vault(&db).await;
+        let keyholder = bootstrapped_keyholder(&db).await;
         let mut conn = db.get().await.unwrap();
 
         const ENTITY_ID: &[u8] = b"entity-id-21";
@@ -312,16 +304,14 @@ mod tests {
             payload: b"payload-v1".to_vec(),
         };
 
-        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID).await.unwrap();
-            .await
-            .unwrap();
 
         let tampered = DummyEntity {
             payload: b"payload-v1-but-tampered".to_vec(),
             ..entity
         };
 
-        let err = verify_entity(&mut conn, &vault, &tampered, ENTITY_ID)
+        let err = verify_entity(&mut conn, &keyholder, &tampered, ENTITY_ID)
             .await
             .unwrap_err();
         assert!(matches!(err, Error::MacMismatch { .. }));

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

@@ -1,5 +1,4 @@
-use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
+use std::ops::Deref as _;
-use encryption::v1::{Nonce, Salt};
 
 use argon2::{Algorithm, Argon2};
 use chacha20poly1305::{
@@ -10,11 +9,14 @@ use rand::{
     Rng as _, SeedableRng as _,
     rngs::{StdRng, SysRng},
 };
-use std::ops::Deref as _;
+
+use crate::safe_cell::{SafeCell, SafeCellHandle as _};
 
 pub mod encryption;
 pub mod integrity;
 
+use encryption::v1::{Nonce, Salt};
+
 pub struct KeyCell(pub SafeCell<Key>);
 impl From<SafeCell<Key>> for KeyCell {
     fn from(value: SafeCell<Key>) -> Self {
@@ -100,21 +102,11 @@ impl KeyCell {
     }
 }
 
+/// User password might be of different length, have not enough entropy, etc...
 /// Derive a fixed-length key from the password using Argon2id, which is designed for password hashing and key derivation.
 pub fn derive_key(mut password: SafeCell<Vec<u8>>, salt: &Salt) -> KeyCell {
-    let params = {
-        #[cfg(debug_assertions)]
-        {
-            argon2::Params::new(8, 1, 1, None).unwrap()
-        }
-
-        #[cfg(not(debug_assertions))]
-        {
-            argon2::Params::new(262_144, 3, 4, None).unwrap()
-        }
-    };
-
     #[allow(clippy::unwrap_used)]
+    let params = argon2::Params::new(262_144, 3, 4, None).unwrap();
     let hasher = Argon2::new(Algorithm::Argon2id, argon2::Version::V0x13, params);
     let mut key = SafeCell::new(Key::default());
     password.read_inline(|password_source| {
@@ -139,10 +131,10 @@ mod tests {
         derive_key,
         encryption::v1::{Nonce, generate_salt},
     };
-    use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
+    use crate::safe_cell::{SafeCell, SafeCellHandle as _};
 
     #[test]
-    fn encrypt_decrypt() {
+    pub fn encrypt_decrypt() {
         static PASSWORD: &[u8] = b"password";
         let password = SafeCell::new(PASSWORD.to_vec());
         let salt = generate_salt();

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

@@ -5,6 +5,7 @@ use diesel_async::{
     sync_connection_wrapper::SyncConnectionWrapper,
 };
 use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
+
 use thiserror::Error;
 use tracing::info;
 
@@ -132,7 +133,6 @@ pub async fn create_pool(url: Option<&str>) -> Result<DatabasePool, DatabaseSetu
     Ok(pool)
 }
 
-#[mutants::skip]
 pub async fn create_test_pool() -> DatabasePool {
     use rand::distr::{Alphanumeric, SampleString as _};
 

server/crates/arbiter-server/src/db/models.rs

@@ -1,12 +1,12 @@
 #![allow(unused)]
 #![allow(clippy::all)]
+
 use crate::db::schema::{
     self, aead_encrypted, arbiter_settings, evm_basic_grant, evm_ether_transfer_grant,
     evm_ether_transfer_grant_target, evm_ether_transfer_limit, evm_token_transfer_grant,
     evm_token_transfer_log, evm_token_transfer_volume_limit, evm_transaction_log, evm_wallet,
     integrity_envelope, root_key_history, tls_history,
 };
-
 use chrono::{DateTime, Utc};
 use diesel::{prelude::*, sqlite::Sqlite};
 use restructed::Models;
@@ -72,6 +72,40 @@ pub mod types {
             Ok(SqliteTimestamp(datetime))
         }
     }
+
+    /// Key algorithm stored in the `useragent_client.key_type` column.
+    /// Values must stay stable — they are persisted in the database.
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, FromSqlRow, AsExpression, strum::FromRepr)]
+    #[diesel(sql_type = Integer)]
+    #[repr(i32)]
+    pub enum KeyType {
+        Ed25519 = 1,
+        EcdsaSecp256k1 = 2,
+        Rsa = 3,
+    }
+
+    impl ToSql<Integer, Sqlite> for KeyType {
+        fn to_sql<'b>(
+            &'b self,
+            out: &mut diesel::serialize::Output<'b, '_, Sqlite>,
+        ) -> diesel::serialize::Result {
+            out.set_value(*self as i32);
+            Ok(IsNull::No)
+        }
+    }
+
+    impl FromSql<Integer, Sqlite> for KeyType {
+        fn from_sql(
+            mut bytes: <Sqlite as diesel::backend::Backend>::RawValue<'_>,
+        ) -> diesel::deserialize::Result<Self> {
+            let Some(SqliteType::Long) = bytes.value_type() else {
+                return Err("Expected Integer for KeyType".into());
+            };
+            let discriminant = bytes.read_long();
+            KeyType::from_repr(discriminant as i32)
+                .ok_or_else(|| format!("Unknown KeyType discriminant: {discriminant}").into())
+        }
+    }
 }
 pub use types::*;
 
@@ -195,6 +229,7 @@ pub struct ProgramClientMetadataHistory {
 #[diesel(table_name = schema::program_client, check_for_backend(Sqlite))]
 pub struct ProgramClient {
     pub id: i32,
+    pub nonce: i32,
     pub public_key: Vec<u8>,
     pub metadata_id: i32,
     pub created_at: SqliteTimestamp,
@@ -205,9 +240,11 @@ pub struct ProgramClient {
 #[diesel(table_name = schema::useragent_client, check_for_backend(Sqlite))]
 pub struct UseragentClient {
     pub id: i32,
+    pub nonce: i32,
     pub public_key: Vec<u8>,
     pub created_at: SqliteTimestamp,
     pub updated_at: SqliteTimestamp,
+    pub key_type: KeyType,
 }
 
 #[derive(Models, Queryable, Debug, Insertable, Selectable)]

server/crates/arbiter-server/src/db/schema.rs

@@ -155,6 +155,7 @@ diesel::table! {
 diesel::table! {
     program_client (id) {
         id -> Integer,
+        nonce -> Integer,
         public_key -> Binary,
         metadata_id -> Integer,
         created_at -> Integer,
@@ -188,7 +189,9 @@ diesel::table! {
 diesel::table! {
     useragent_client (id) {
         id -> Integer,
+        nonce -> Integer,
         public_key -> Binary,
+        key_type -> Integer,
         created_at -> Integer,
         updated_at -> Integer,
     }

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

@@ -1,19 +1,5 @@
-use crate::{
+pub mod abi;
-    actors::vault::Vault,
+pub mod safe_signer;
-    crypto::integrity,
-    db::{
-        self, DatabaseError,
-        models::{
-            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
-        },
-        schema::{self, evm_transaction_log},
-    },
-    evm::policies::{
-        CombinedSettings, DatabaseID, EvalContext, EvalViolation, Grant, Policy,
-        SharedGrantSettings, SpecificGrant, SpecificMeaning, ether_transfer::EtherTransfer,
-        token_transfers::TokenTransfer,
-    },
-};
 
 use alloy::{
     consensus::TxEip1559,
@@ -24,8 +10,22 @@ use diesel::{ExpressionMethods as _, QueryDsl as _, QueryResult, insert_into, sq
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use kameo::actor::ActorRef;
 
-pub mod abi;
+use crate::{
-pub mod safe_signer;
+    actors::keyholder::KeyHolder,
+    crypto::integrity,
+    db::{
+        self, DatabaseError,
+        models::{
+            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
+        },
+        schema::{self, evm_transaction_log},
+    },
+    evm::policies::{
+        DatabaseID, EvalContext, EvalViolation, Grant, Policy, CombinedSettings, SharedGrantSettings,
+        SpecificGrant, SpecificMeaning, ether_transfer::EtherTransfer,
+        token_transfers::TokenTransfer,
+    },
+};
 
 pub mod policies;
 mod utils;
@@ -90,14 +90,6 @@ async fn check_shared_constraints(
     let mut violations = Vec::new();
     let now = Utc::now();
 
-    if shared.chain != context.chain {
-        violations.push(EvalViolation::MismatchingChainId {
-            expected: shared.chain,
-            actual: context.chain,
-        });
-        return Ok(violations);
-    }
-
     // Validity window
     if shared.valid_from.is_some_and(|t| now < t) || shared.valid_until.is_some_and(|t| now > t) {
         violations.push(EvalViolation::InvalidTime);
@@ -138,7 +130,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,
-    vault: ActorRef<Vault>,
+    keyholder: ActorRef<KeyHolder>,
 }
 
 impl Engine {
@@ -158,7 +150,7 @@ impl Engine {
             .map_err(DatabaseError::from)?
             .ok_or(PolicyError::NoMatchingGrant)?;
 
-        integrity::verify_entity(&mut conn, &self.vault, &grant.settings, grant.id).await?;
+        integrity::verify_entity(&mut conn, &self.keyholder, &grant.settings, grant.id).await?;
 
         let mut violations = check_shared_constraints(
             &context,
@@ -207,8 +199,8 @@ impl Engine {
 }
 
 impl Engine {
-    pub fn new(db: db::DatabasePool, vault: ActorRef<Vault>) -> Self {
+    pub fn new(db: db::DatabasePool, keyholder: ActorRef<KeyHolder>) -> Self {
-        Self { db, vault }
+        Self { db, keyholder }
     }
 
     pub async fn create_grant<P: Policy>(
@@ -219,7 +211,7 @@ impl Engine {
         P::Settings: Clone,
     {
         let mut conn = self.db.get().await?;
-        let vault = self.vault.clone();
+        let keyholder = self.keyholder.clone();
 
         let id = conn
             .transaction(|conn| {
@@ -258,9 +250,14 @@ impl Engine {
 
                     P::create_grant(&basic_grant, &full_grant.specific, conn).await?;
 
-                    integrity::sign_entity(conn, &vault, &full_grant, basic_grant.id)
+                    integrity::sign_entity(
-                        .await
+                        conn,
-                        .map_err(|_| diesel::result::Error::RollbackTransaction)?;
+                        &keyholder,
+                        &full_grant,
+                    basic_grant.id,
+                    )
+                    .await
+                    .map_err(|_| diesel::result::Error::RollbackTransaction)?;
 
                     QueryResult::Ok(basic_grant.id)
                 })
@@ -283,7 +280,7 @@ impl Engine {
 
         // Verify integrity of all grants before returning any results
         for grant in &all_grants {
-            integrity::verify_entity(conn, &self.vault, &grant.settings, grant.id).await?;
+            integrity::verify_entity(conn, &self.keyholder, &grant.settings, grant.id).await?;
         }
 
         Ok(all_grants.into_iter().map(|g| Grant {
@@ -345,255 +342,3 @@ impl Engine {
         Err(VetError::UnsupportedTransactionType)
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use alloy::primitives::{Address, Bytes, U256, address};
-    use chrono::{Duration, Utc};
-    use diesel::{SelectableHelper, insert_into};
-    use diesel_async::RunQueryDsl;
-    use rstest::rstest;
-
-    use crate::db::{
-        self, DatabaseConnection,
-        models::{
-            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
-        },
-        schema::{evm_basic_grant, evm_transaction_log},
-    };
-    use crate::evm::policies::{
-        EvalContext, EvalViolation, SharedGrantSettings, TransactionRateLimit,
-    };
-
-    use super::check_shared_constraints;
-
-    const WALLET_ACCESS_ID: i32 = 1;
-    const CHAIN_ID: u64 = 1;
-    const RECIPIENT: Address = address!("1111111111111111111111111111111111111111");
-
-    fn context() -> EvalContext {
-        EvalContext {
-            target: EvmWalletAccess {
-                id: WALLET_ACCESS_ID,
-                wallet_id: 10,
-                client_id: 20,
-                created_at: SqliteTimestamp(Utc::now()),
-            },
-            chain: CHAIN_ID,
-            to: RECIPIENT,
-            value: U256::ZERO,
-            calldata: Bytes::new(),
-            max_fee_per_gas: 100,
-            max_priority_fee_per_gas: 10,
-        }
-    }
-
-    fn shared_settings() -> SharedGrantSettings {
-        SharedGrantSettings {
-            wallet_access_id: WALLET_ACCESS_ID,
-            chain: CHAIN_ID,
-            valid_from: None,
-            valid_until: None,
-            max_gas_fee_per_gas: None,
-            max_priority_fee_per_gas: None,
-            rate_limit: None,
-        }
-    }
-
-    async fn insert_basic_grant(
-        conn: &mut DatabaseConnection,
-        shared: &SharedGrantSettings,
-    ) -> EvmBasicGrant {
-        insert_into(evm_basic_grant::table)
-            .values(NewEvmBasicGrant {
-                wallet_access_id: shared.wallet_access_id,
-                chain_id: shared.chain as i32,
-                valid_from: shared.valid_from.map(SqliteTimestamp),
-                valid_until: shared.valid_until.map(SqliteTimestamp),
-                max_gas_fee_per_gas: shared
-                    .max_gas_fee_per_gas
-                    .map(|fee| super::utils::u256_to_bytes(fee).to_vec()),
-                max_priority_fee_per_gas: shared
-                    .max_priority_fee_per_gas
-                    .map(|fee| super::utils::u256_to_bytes(fee).to_vec()),
-                rate_limit_count: shared.rate_limit.as_ref().map(|limit| limit.count as i32),
-                rate_limit_window_secs: shared
-                    .rate_limit
-                    .as_ref()
-                    .map(|limit| limit.window.num_seconds() as i32),
-                revoked_at: None,
-            })
-            .returning(EvmBasicGrant::as_select())
-            .get_result(conn)
-            .await
-            .unwrap()
-    }
-
-    #[rstest]
-    #[case::matching_chain(CHAIN_ID, false)]
-    #[case::mismatching_chain(CHAIN_ID + 1, true)]
-    #[tokio::test]
-    async fn check_shared_constraints_enforces_chain_id(
-        #[case] context_chain: u64,
-        #[case] expect_mismatch: bool,
-    ) {
-        let db = db::create_test_pool().await;
-        let mut conn = db.get().await.unwrap();
-
-        let context = EvalContext {
-            chain: context_chain,
-            ..context()
-        };
-
-        let violations = check_shared_constraints(&context, &shared_settings(), 999, &mut *conn)
-            .await
-            .unwrap();
-
-        assert_eq!(
-            violations
-                .iter()
-                .any(|violation| matches!(violation, EvalViolation::MismatchingChainId { .. })),
-            expect_mismatch
-        );
-
-        if expect_mismatch {
-            assert_eq!(violations.len(), 1);
-        } else {
-            assert!(violations.is_empty());
-        }
-    }
-
-    #[rstest]
-    #[case::valid_from_in_bounds(Some(Utc::now() - Duration::hours(1)), None, false)]
-    #[case::valid_from_out_of_bounds(Some(Utc::now() + Duration::hours(1)), None, true)]
-    #[case::valid_until_in_bounds(None, Some(Utc::now() + Duration::hours(1)), false)]
-    #[case::valid_until_out_of_bounds(None, Some(Utc::now() - Duration::hours(1)), true)]
-    #[tokio::test]
-    async fn check_shared_constraints_enforces_validity_window(
-        #[case] valid_from: Option<chrono::DateTime<Utc>>,
-        #[case] valid_until: Option<chrono::DateTime<Utc>>,
-        #[case] expect_invalid_time: bool,
-    ) {
-        let db = db::create_test_pool().await;
-        let mut conn = db.get().await.unwrap();
-
-        let shared = SharedGrantSettings {
-            valid_from,
-            valid_until,
-            ..shared_settings()
-        };
-
-        let violations = check_shared_constraints(&context(), &shared, 999, &mut *conn)
-            .await
-            .unwrap();
-
-        assert_eq!(
-            violations
-                .iter()
-                .any(|violation| matches!(violation, EvalViolation::InvalidTime)),
-            expect_invalid_time
-        );
-
-        if expect_invalid_time {
-            assert_eq!(violations.len(), 1);
-        } else {
-            assert!(violations.is_empty());
-        }
-    }
-
-    #[rstest]
-    #[case::max_fee_within_limit(Some(U256::from(100u64)), None, 100, 10, false)]
-    #[case::max_fee_exceeded(Some(U256::from(99u64)), None, 100, 10, true)]
-    #[case::priority_fee_within_limit(None, Some(U256::from(10u64)), 100, 10, false)]
-    #[case::priority_fee_exceeded(None, Some(U256::from(9u64)), 100, 10, true)]
-    #[tokio::test]
-    async fn check_shared_constraints_enforces_gas_fee_caps(
-        #[case] max_gas_fee_per_gas: Option<U256>,
-        #[case] max_priority_fee_per_gas: Option<U256>,
-        #[case] actual_max_fee_per_gas: u128,
-        #[case] actual_max_priority_fee_per_gas: u128,
-        #[case] expect_gas_limit_violation: bool,
-    ) {
-        let db = db::create_test_pool().await;
-        let mut conn = db.get().await.unwrap();
-
-        let context = EvalContext {
-            max_fee_per_gas: actual_max_fee_per_gas,
-            max_priority_fee_per_gas: actual_max_priority_fee_per_gas,
-            ..context()
-        };
-
-        let shared = SharedGrantSettings {
-            max_gas_fee_per_gas,
-            max_priority_fee_per_gas,
-            ..shared_settings()
-        };
-        let violations = check_shared_constraints(&context, &shared, 999, &mut *conn)
-            .await
-            .unwrap();
-
-        assert_eq!(
-            violations
-                .iter()
-                .any(|violation| matches!(violation, EvalViolation::GasLimitExceeded { .. })),
-            expect_gas_limit_violation
-        );
-
-        if expect_gas_limit_violation {
-            assert_eq!(violations.len(), 1);
-        } else {
-            assert!(violations.is_empty());
-        }
-    }
-
-    #[rstest]
-    #[case::under_rate_limit(2, false)]
-    #[case::at_rate_limit(1, true)]
-    #[tokio::test]
-    async fn check_shared_constraints_enforces_rate_limit(
-        #[case] rate_limit_count: u32,
-        #[case] expect_rate_limit_violation: bool,
-    ) {
-        let db = db::create_test_pool().await;
-        let mut conn = db.get().await.unwrap();
-
-        let shared = SharedGrantSettings {
-            rate_limit: Some(TransactionRateLimit {
-                count: rate_limit_count,
-                window: Duration::hours(1),
-            }),
-            ..shared_settings()
-        };
-
-        let basic_grant = insert_basic_grant(&mut conn, &shared).await;
-
-        insert_into(evm_transaction_log::table)
-            .values(NewEvmTransactionLog {
-                grant_id: basic_grant.id,
-                wallet_access_id: WALLET_ACCESS_ID,
-                chain_id: CHAIN_ID as i32,
-                eth_value: super::utils::u256_to_bytes(U256::ZERO).to_vec(),
-                signed_at: SqliteTimestamp(Utc::now()),
-            })
-            .execute(&mut *conn)
-            .await
-            .unwrap();
-
-        let violations = check_shared_constraints(&context(), &shared, basic_grant.id, &mut *conn)
-            .await
-            .unwrap();
-
-        assert_eq!(
-            violations
-                .iter()
-                .any(|violation| matches!(violation, EvalViolation::RateLimitExceeded)),
-            expect_rate_limit_violation
-        );
-
-        if expect_rate_limit_violation {
-            assert_eq!(violations.len(), 1);
-        } else {
-            assert!(violations.is_empty());
-        }
-    }
-}

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

@@ -1,8 +1,4 @@
-use crate::{
+use std::fmt::Display;
-    crypto::integrity::v1::Integrable,
-    db::models::{self, EvmBasicGrant, EvmWalletAccess},
-    evm::utils,
-};
 
 use alloy::primitives::{Address, Bytes, ChainId, U256};
 use chrono::{DateTime, Duration, Utc};
@@ -10,9 +6,14 @@ use diesel::{
     ExpressionMethods as _, QueryDsl, SelectableHelper, result::QueryResult, sqlite::Sqlite,
 };
 use diesel_async::{AsyncConnection, RunQueryDsl};
-use std::fmt::Display;
+
+use serde::Serialize;
 use thiserror::Error;
 
+use crate::{
+    crypto::integrity::v1::Integrable, db::models::{self, EvmBasicGrant, EvmWalletAccess}, evm::utils
+};
+
 pub mod ether_transfer;
 pub mod token_transfers;
 
@@ -54,14 +55,11 @@ pub enum EvalViolation {
 
     #[error("Transaction type is not allowed by this grant")]
     InvalidTransactionType,
-
-    #[error("Mismatching chain ID")]
-    MismatchingChainId { expected: ChainId, actual: ChainId },
 }
 
 pub type DatabaseID = i32;
 
-#[derive(Debug)]
+#[derive(Debug, Serialize)]
 pub struct Grant<PolicySettings> {
     pub id: DatabaseID,
     pub common_settings_id: DatabaseID, // ID of the basic grant for shared-logic checks like rate limits and validity periods
@@ -125,19 +123,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, Serialize)]
 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, Serialize)]
 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, Serialize)]
 pub struct SharedGrantSettings {
     pub wallet_access_id: i32,
     pub chain: ChainId,
@@ -198,7 +196,7 @@ pub enum SpecificGrant {
     TokenTransfer(token_transfers::Settings),
 }
 
-#[derive(Debug, arbiter_macros::Hashable)]
+#[derive(Debug, Serialize)]
 pub struct CombinedSettings<PolicyGrant> {
     pub shared: SharedGrantSettings,
     pub specific: PolicyGrant,
@@ -217,3 +215,4 @@ impl<P: Integrable> Integrable for CombinedSettings<P> {
     const KIND: &'static str = P::KIND;
     const VERSION: i32 = P::VERSION;
 }
+

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

@@ -1,33 +1,30 @@
-use super::{DatabaseID, EvalContext, EvalViolation};
+use std::collections::HashMap;
+use std::fmt::Display;
+
+use alloy::primitives::{Address, U256};
+use chrono::{DateTime, Duration, Utc};
+use diesel::dsl::{auto_type, insert_into};
+use diesel::sqlite::Sqlite;
+use diesel::{ExpressionMethods, JoinOnDsl, prelude::*};
+use diesel_async::{AsyncConnection, RunQueryDsl};
+
+use crate::crypto::integrity::v1::Integrable;
+use crate::db::models::{
+    EvmBasicGrant, EvmEtherTransferGrant, EvmEtherTransferGrantTarget, EvmEtherTransferLimit,
+    NewEvmEtherTransferLimit, SqliteTimestamp,
+};
+use crate::db::schema::{evm_basic_grant, evm_ether_transfer_limit, evm_transaction_log};
+use crate::evm::policies::{
+    CombinedSettings, Grant, SharedGrantSettings, SpecificGrant, SpecificMeaning, VolumeRateLimit,
+};
 use crate::{
-    crypto::integrity::v1::Integrable,
-    db::models::{
-        EvmBasicGrant, EvmEtherTransferGrant, EvmEtherTransferGrantTarget, EvmEtherTransferLimit,
-        NewEvmEtherTransferLimit, SqliteTimestamp,
-    },
-    db::schema::{evm_basic_grant, evm_ether_transfer_limit, evm_transaction_log},
     db::{
         models::{self, NewEvmEtherTransferGrant, NewEvmEtherTransferGrantTarget},
         schema::{evm_ether_transfer_grant, evm_ether_transfer_grant_target},
     },
-    evm::policies::{
-        CombinedSettings, Grant, SharedGrantSettings, SpecificGrant, SpecificMeaning,
-        VolumeRateLimit,
-    },
     evm::{policies::Policy, utils},
 };
 
-use alloy::primitives::{Address, U256};
-use chrono::{DateTime, Duration, Utc};
-use diesel::{
-    ExpressionMethods, JoinOnDsl,
-    dsl::{auto_type, insert_into},
-    prelude::*,
-    sqlite::Sqlite,
-};
-use diesel_async::{AsyncConnection, RunQueryDsl};
-use std::{collections::HashMap, fmt::Display};
-
 #[auto_type]
 fn grant_join() -> _ {
     evm_ether_transfer_grant::table.inner_join(
@@ -35,6 +32,8 @@ fn grant_join() -> _ {
     )
 }
 
+use super::{DatabaseID, EvalContext, EvalViolation};
+
 // Plain ether transfer
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Meaning {
@@ -53,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, serde::Serialize)]
 pub struct Settings {
     pub target: Vec<Address>,
     pub limit: VolumeRateLimit,

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

@@ -1,26 +1,25 @@
-use super::{EtherTransfer, Settings};
-use crate::{
-    db::{
-        self, DatabaseConnection,
-        models::{
-            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
-        },
-        schema::{evm_basic_grant, evm_transaction_log},
-    },
-    evm::{
-        policies::{
-            CombinedSettings, EvalContext, EvalViolation, Grant, Policy, SharedGrantSettings,
-            VolumeRateLimit,
-        },
-        utils,
-    },
-};
-
 use alloy::primitives::{Address, Bytes, U256, address};
 use chrono::{Duration, Utc};
 use diesel::{SelectableHelper, insert_into};
 use diesel_async::RunQueryDsl;
 
+use crate::db::{
+    self, DatabaseConnection,
+    models::{
+        EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
+    },
+    schema::{evm_basic_grant, evm_transaction_log},
+};
+use crate::evm::{
+    policies::{
+        CombinedSettings, EvalContext, EvalViolation, Grant, Policy, SharedGrantSettings,
+        VolumeRateLimit,
+    },
+    utils,
+};
+
+use super::{EtherTransfer, Settings};
+
 const WALLET_ACCESS_ID: i32 = 1;
 const CHAIN_ID: u64 = 1;
 
@@ -85,6 +84,8 @@ fn shared() -> SharedGrantSettings {
     }
 }
 
+// ── analyze ─────────────────────────────────────────────────────────────
+
 #[test]
 fn analyze_matches_empty_calldata() {
     let m = EtherTransfer::analyze(&ctx(ALLOWED, U256::from(1_000u64))).unwrap();
@@ -101,6 +102,8 @@ fn analyze_rejects_nonempty_calldata() {
     assert!(EtherTransfer::analyze(&context).is_none());
 }
 
+// ── evaluate ────────────────────────────────────────────────────────────
+
 #[tokio::test]
 async fn evaluate_passes_for_allowed_target() {
     let db = db::create_test_pool().await;
@@ -273,6 +276,8 @@ async fn evaluate_passes_at_exactly_volume_limit() {
     );
 }
 
+// ── try_find_grant ───────────────────────────────────────────────────────
+
 #[tokio::test]
 async fn try_find_grant_roundtrip() {
     let db = db::create_test_pool().await;
@@ -331,36 +336,7 @@ async fn try_find_grant_wrong_target_returns_none() {
     assert!(found.is_none());
 }
 
-proptest::proptest! {
+// ── find_all_grants ──────────────────────────────────────────────────────
-    #[test]
-    fn target_order_does_not_affect_hash(
-        raw_addrs in proptest::collection::vec(proptest::prelude::any::<[u8; 20]>(), 0..8),
-        seed in proptest::prelude::any::<u64>(),
-        max_volume in proptest::prelude::any::<u64>(),
-        window_secs in 1i64..=86400,
-    ) {
-        use rand::{SeedableRng, seq::SliceRandom};
-        use sha2::Digest;
-        use arbiter_crypto::hashing::Hashable;
-
-        let addrs: Vec<Address> = raw_addrs.iter().map(|b| Address::from(*b)).collect();
-        let mut shuffled = addrs.clone();
-        shuffled.shuffle(&mut rand::rngs::StdRng::seed_from_u64(seed));
-
-        let limit = VolumeRateLimit {
-            max_volume: U256::from(max_volume),
-            window: Duration::seconds(window_secs),
-        };
-
-        let mut h1 = sha2::Sha256::new();
-        Settings { target: addrs, limit: limit.clone() }.hash(&mut h1);
-
-        let mut h2 = sha2::Sha256::new();
-        Settings { target: shuffled, limit }.hash(&mut h2);
-
-        proptest::prop_assert_eq!(h1.finalize(), h2.finalize());
-    }
-}
 
 #[tokio::test]
 async fn find_all_grants_empty_db() {

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

@@ -1,4 +1,28 @@
-use super::{DatabaseID, EvalContext, EvalViolation};
+use std::collections::HashMap;
+
+use alloy::{
+    primitives::{Address, U256},
+    sol_types::SolCall,
+};
+use arbiter_tokens_registry::evm::nonfungible::{self, TokenInfo};
+use chrono::{DateTime, Duration, Utc};
+use diesel::dsl::{auto_type, insert_into};
+use diesel::sqlite::Sqlite;
+use diesel::{ExpressionMethods, prelude::*};
+use diesel_async::{AsyncConnection, RunQueryDsl};
+use serde::Serialize;
+
+use crate::db::schema::{
+    evm_basic_grant, evm_token_transfer_grant, evm_token_transfer_log,
+    evm_token_transfer_volume_limit,
+};
+use crate::evm::{
+    abi::IERC20::transferCall,
+    policies::{
+        Grant, Policy, SharedGrantSettings, SpecificGrant, SpecificMeaning, VolumeRateLimit,
+    },
+    utils,
+};
 use crate::{
     crypto::integrity::Integrable,
     db::models::{
@@ -6,34 +30,10 @@ use crate::{
         NewEvmTokenTransferGrant, NewEvmTokenTransferLog, NewEvmTokenTransferVolumeLimit,
         SqliteTimestamp,
     },
-    db::schema::{
-        evm_basic_grant, evm_token_transfer_grant, evm_token_transfer_log,
-        evm_token_transfer_volume_limit,
-    },
     evm::policies::CombinedSettings,
-    evm::{
-        abi::IERC20::transferCall,
-        policies::{
-            Grant, Policy, SharedGrantSettings, SpecificGrant, SpecificMeaning, VolumeRateLimit,
-        },
-        utils,
-    },
 };
-use arbiter_tokens_registry::evm::nonfungible::{self, TokenInfo};
 
-use alloy::{
+use super::{DatabaseID, EvalContext, EvalViolation};
-    primitives::{Address, U256},
-    sol_types::SolCall,
-};
-use chrono::{DateTime, Duration, Utc};
-use diesel::{
-    ExpressionMethods,
-    dsl::{auto_type, insert_into},
-    prelude::*,
-    sqlite::Sqlite,
-};
-use diesel_async::{AsyncConnection, RunQueryDsl};
-use std::collections::HashMap;
 
 #[auto_type]
 fn grant_join() -> _ {
@@ -64,7 +64,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, Serialize)]
 pub struct Settings {
     pub token_contract: Address,
     pub target: Option<Address>,
@@ -73,7 +73,6 @@ pub struct Settings {
 impl Integrable for Settings {
     const KIND: &'static str = "TokenTransfer";
 }
-
 impl From<Settings> for SpecificGrant {
     fn from(val: Settings) -> SpecificGrant {
         SpecificGrant::TokenTransfer(val)

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

@@ -1,28 +1,25 @@
-use super::{Settings, TokenTransfer};
+use alloy::primitives::{Address, Bytes, U256, address};
-use crate::{
+use alloy::sol_types::SolCall;
-    db::{
-        self, DatabaseConnection,
-        models::{EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, SqliteTimestamp},
-        schema::evm_basic_grant,
-    },
-    evm::{
-        abi::IERC20::transferCall,
-        policies::{
-            CombinedSettings, EvalContext, EvalViolation, Grant, Policy, SharedGrantSettings,
-            VolumeRateLimit,
-        },
-        utils,
-    },
-};
-
-use alloy::{
-    primitives::{Address, Bytes, U256, address},
-    sol_types::SolCall,
-};
 use chrono::{Duration, Utc};
 use diesel::{SelectableHelper, insert_into};
 use diesel_async::RunQueryDsl;
 
+use crate::db::{
+    self, DatabaseConnection,
+    models::{EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, SqliteTimestamp},
+    schema::evm_basic_grant,
+};
+use crate::evm::{
+    abi::IERC20::transferCall,
+    policies::{
+        CombinedSettings, EvalContext, EvalViolation, Grant, Policy, SharedGrantSettings,
+        VolumeRateLimit,
+    },
+    utils,
+};
+
+use super::{Settings, TokenTransfer};
+
 // DAI on Ethereum mainnet — present in the static token registry
 const CHAIN_ID: u64 = 1;
 const DAI: Address = address!("6B175474E89094C44Da98b954EedeAC495271d0F");
@@ -104,6 +101,8 @@ fn shared() -> SharedGrantSettings {
     }
 }
 
+// ── analyze ─────────────────────────────────────────────────────────────
+
 #[test]
 fn analyze_known_token_valid_calldata() {
     let calldata = transfer_calldata(RECIPIENT, U256::from(100u64));
@@ -129,6 +128,8 @@ fn analyze_empty_calldata_returns_none() {
     assert!(TokenTransfer::analyze(&ctx(DAI, Bytes::new())).is_none());
 }
 
+// ── evaluate ────────────────────────────────────────────────────────────
+
 #[tokio::test]
 async fn evaluate_rejects_nonzero_eth_value() {
     let db = db::create_test_pool().await;
@@ -411,39 +412,7 @@ async fn try_find_grant_unknown_token_returns_none() {
     assert!(found.is_none());
 }
 
-proptest::proptest! {
+// ── find_all_grants ──────────────────────────────────────────────────────
-    #[test]
-    fn volume_limits_order_does_not_affect_hash(
-        raw_limits in proptest::collection::vec(
-            (proptest::prelude::any::<u64>(), 1i64..=86400),
-            0..8,
-        ),
-        seed in proptest::prelude::any::<u64>(),
-    ) {
-        use rand::{SeedableRng, seq::SliceRandom};
-        use sha2::Digest;
-        use arbiter_crypto::hashing::Hashable;
-
-        let limits: Vec<VolumeRateLimit> = raw_limits
-            .iter()
-            .map(|(max_vol, window_secs)| VolumeRateLimit {
-                max_volume: U256::from(*max_vol),
-                window: Duration::seconds(*window_secs),
-            })
-            .collect();
-
-        let mut shuffled = limits.clone();
-        shuffled.shuffle(&mut rand::rngs::StdRng::seed_from_u64(seed));
-
-        let mut h1 = sha2::Sha256::new();
-        Settings { token_contract: DAI, target: None, volume_limits: limits }.hash(&mut h1);
-
-        let mut h2 = sha2::Sha256::new();
-        Settings { token_contract: DAI, target: None, volume_limits: shuffled }.hash(&mut h2);
-
-        proptest::prop_assert_eq!(h1.finalize(), h2.finalize());
-    }
-}
 
 #[tokio::test]
 async fn find_all_grants_empty_db() {

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

@@ -1,5 +1,6 @@
-use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
+use std::sync::Mutex;
 
+use crate::safe_cell::{SafeCell, SafeCellHandle as _};
 use alloy::{
     consensus::SignableTransaction,
     network::{TxSigner, TxSignerSync},
@@ -8,7 +9,6 @@ use alloy::{
 };
 use async_trait::async_trait;
 use k256::ecdsa::{self, RecoveryId, SigningKey, signature::hazmat::PrehashSigner};
-use std::sync::Mutex;
 
 /// An Ethereum signer that stores its secp256k1 secret key inside a
 /// hardware-protected [`MemSafe`] cell.

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

@@ -2,20 +2,20 @@ use alloy::primitives::U256;
 
 #[derive(thiserror::Error, Debug)]
 #[error("Expected {expected} bytes but got {actual} bytes")]
-pub(super) struct LengthError {
+pub struct LengthError {
-    pub(super) expected: usize,
+    pub expected: usize,
-    pub(super) actual: usize,
+    pub actual: usize,
 }
 
-pub(super) fn u256_to_bytes(value: U256) -> [u8; 32] {
+pub fn u256_to_bytes(value: U256) -> [u8; 32] {
     value.to_le_bytes()
 }
-pub(super) fn bytes_to_u256(bytes: &[u8]) -> Option<U256> {
+pub fn bytes_to_u256(bytes: &[u8]) -> Option<U256> {
     let bytes: [u8; 32] = bytes.try_into().ok()?;
     Some(U256::from_le_bytes(bytes))
 }
 
-pub(super) fn try_bytes_to_u256(bytes: &[u8]) -> diesel::result::QueryResult<U256> {
+pub fn try_bytes_to_u256(bytes: &[u8]) -> diesel::result::QueryResult<U256> {
     let bytes: [u8; 32] = bytes.try_into().map_err(|_| {
         diesel::result::Error::DeserializationError(Box::new(LengthError {
             expected: 32,

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

@@ -1,7 +1,3 @@
-use crate::{
-    grpc::request_tracker::RequestTracker,
-    peers::client::{ClientConnection, session::ClientSession},
-};
 use arbiter_proto::{
     proto::client::{
         ClientRequest, ClientResponse, client_request::Payload as ClientRequestPayload,
@@ -9,11 +5,15 @@ use arbiter_proto::{
     },
     transport::{Receiver, Sender, grpc::GrpcBi},
 };
-
 use kameo::actor::{ActorRef, Spawn as _};
 use tonic::Status;
 use tracing::{info, warn};
 
+use crate::{
+    actors::client::{ClientConnection, session::ClientSession},
+    grpc::request_tracker::RequestTracker,
+};
+
 mod auth;
 mod evm;
 mod inbound;

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

@@ -1,8 +1,3 @@
-use crate::{
-    grpc::request_tracker::RequestTracker,
-    peers::client::{self, ClientConnection, auth},
-};
-use arbiter_crypto::authn;
 use arbiter_proto::{
     ClientMetadata,
     proto::{
@@ -21,18 +16,22 @@ use arbiter_proto::{
     },
     transport::{Bi, Error as TransportError, Receiver, Sender, grpc::GrpcBi},
 };
-
 use async_trait::async_trait;
 use tonic::Status;
 use tracing::warn;
 
-pub(super) struct AuthTransportAdapter<'a> {
+use crate::{
+    actors::client::{self, ClientConnection, auth},
+    grpc::request_tracker::RequestTracker,
+};
+
+pub struct AuthTransportAdapter<'a> {
     bi: &'a mut GrpcBi<ClientRequest, ClientResponse>,
     request_tracker: &'a mut RequestTracker,
 }
 
 impl<'a> AuthTransportAdapter<'a> {
-    pub(super) fn new(
+    pub fn new(
         bi: &'a mut GrpcBi<ClientRequest, ClientResponse>,
         request_tracker: &'a mut RequestTracker,
     ) -> Self {
@@ -44,14 +43,10 @@ impl<'a> AuthTransportAdapter<'a> {
 
     fn response_to_proto(response: auth::Outbound) -> AuthResponsePayload {
         match response {
-            auth::Outbound::AuthChallenge { challenge } => {
+            auth::Outbound::AuthChallenge { pubkey, nonce } => {
                 AuthResponsePayload::Challenge(ProtoAuthChallenge {
-                    timestamp_nanos: challenge
+                    pubkey: pubkey.to_bytes().to_vec(),
-                        .timestamp
+                    nonce,
-                        .timestamp_nanos_opt()
-                        .expect("timestamp within range")
-                        as u64,
-                    random: challenge.nonce.to_vec(),
                 })
             }
             auth::Outbound::AuthSuccess => {
@@ -73,7 +68,6 @@ impl<'a> AuthTransportAdapter<'a> {
                 auth::Error::ApproveError(auth::ApproveError::Internal)
                 | auth::Error::DatabasePoolUnavailable
                 | auth::Error::DatabaseOperationFailed
-                | auth::Error::IntegrityCheckFailed
                 | auth::Error::Transport => ProtoAuthResult::Internal,
             }
             .into(),
@@ -165,7 +159,11 @@ impl Receiver<auth::Inbound> for AuthTransportAdapter<'_> {
                         .await;
                     return None;
                 };
-                let Ok(pubkey) = authn::PublicKey::try_from(pubkey.as_slice()) else {
+                let Ok(pubkey) = <[u8; 32]>::try_from(pubkey) else {
+                    let _ = self.send_auth_result(ProtoAuthResult::InvalidKey).await;
+                    return None;
+                };
+                let Ok(pubkey) = ed25519_dalek::VerifyingKey::from_bytes(&pubkey) else {
                     let _ = self.send_auth_result(ProtoAuthResult::InvalidKey).await;
                     return None;
                 };
@@ -175,7 +173,7 @@ impl Receiver<auth::Inbound> for AuthTransportAdapter<'_> {
                 })
             }
             AuthRequestPayload::ChallengeSolution(ProtoAuthChallengeSolution { signature }) => {
-                let Ok(signature) = authn::Signature::try_from(signature.as_slice()) else {
+                let Ok(signature) = ed25519_dalek::Signature::try_from(signature.as_slice()) else {
                     let _ = self
                         .send_auth_result(ProtoAuthResult::InvalidSignature)
                         .await;
@@ -197,7 +195,7 @@ fn client_metadata_from_proto(metadata: ProtoClientInfo) -> ClientMetadata {
     }
 }
 
-pub(super) async fn start(
+pub async fn start(
     conn: &mut ClientConnection,
     bi: &mut GrpcBi<ClientRequest, ClientResponse>,
     request_tracker: &mut RequestTracker,

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

@@ -1,10 +1,3 @@
-use crate::{
-    grpc::{
-        Convert, TryConvert,
-        common::inbound::{RawEvmAddress, RawEvmTransaction},
-    },
-    peers::client::session::{ClientSession, HandleSignTransaction, SignTransactionRpcError},
-};
 use arbiter_proto::proto::{
     client::{
         client_response::Payload as ClientResponsePayload,
@@ -18,11 +11,18 @@ use arbiter_proto::proto::{
         evm_sign_transaction_response::Result as EvmSignTransactionResult,
     },
 };
-
 use kameo::actor::ActorRef;
 use tonic::Status;
 use tracing::warn;
 
+use crate::{
+    actors::client::session::{ClientSession, HandleSignTransaction, SignTransactionRpcError},
+    grpc::{
+        Convert, TryConvert,
+        common::inbound::{RawEvmAddress, RawEvmTransaction},
+    },
+};
+
 fn wrap_response(payload: EvmResponsePayload) -> ClientResponsePayload {
     ClientResponsePayload::Evm(proto_evm::Response {
         payload: Some(payload),

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

@@ -1,7 +1,3 @@
-use crate::{
-    actors::vault::VaultState,
-    peers::client::session::{ClientSession, Error, HandleQueryVaultState},
-};
 use arbiter_proto::proto::{
     client::{
         client_response::Payload as ClientResponsePayload,
@@ -12,11 +8,15 @@ use arbiter_proto::proto::{
     },
     shared::VaultState as ProtoVaultState,
 };
-
 use kameo::{actor::ActorRef, error::SendError};
 use tonic::Status;
 use tracing::warn;
 
+use crate::actors::{
+    client::session::{ClientSession, Error, HandleQueryVaultState},
+    keyholder::KeyHolderState,
+};
+
 pub(super) async fn dispatch(
     actor: &ActorRef<ClientSession>,
     req: proto_vault::Request,
@@ -30,9 +30,9 @@ pub(super) async fn dispatch(
     match payload {
         VaultRequestPayload::QueryState(_) => {
             let state = match actor.ask(HandleQueryVaultState {}).await {
-                Ok(VaultState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
+                Ok(KeyHolderState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
-                Ok(VaultState::Sealed) => ProtoVaultState::Sealed,
+                Ok(KeyHolderState::Sealed) => ProtoVaultState::Sealed,
-                Ok(VaultState::Unsealed) => ProtoVaultState::Unsealed,
+                Ok(KeyHolderState::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/common.rs

@@ -1,2 +1,2 @@
-pub(super) mod inbound;
+pub mod inbound;
-pub(super) mod outbound;
+pub mod outbound;

server/crates/arbiter-server/src/grpc/common/inbound.rs

@@ -1,8 +1,8 @@
-use crate::grpc::TryConvert;
-
 use alloy::{consensus::TxEip1559, primitives::Address, rlp::Decodable as _};
 
-pub(in crate::grpc) struct RawEvmAddress(pub(in crate::grpc) Vec<u8>);
+use crate::grpc::TryConvert;
+
+pub struct RawEvmAddress(pub Vec<u8>);
 impl TryConvert for RawEvmAddress {
     type Output = Address;
 
@@ -21,7 +21,7 @@ impl TryConvert for RawEvmAddress {
     }
 }
 
-pub(in crate::grpc) struct RawEvmTransaction(pub(in crate::grpc) Vec<u8>);
+pub struct RawEvmTransaction(pub Vec<u8>);
 impl TryConvert for RawEvmTransaction {
     type Output = TxEip1559;
 

server/crates/arbiter-server/src/grpc/common/outbound.rs

@@ -1,10 +1,4 @@
-use crate::{
+use alloy::primitives::U256;
-    evm::{
-        PolicyError, VetError,
-        policies::{EvalViolation, SpecificMeaning},
-    },
-    grpc::Convert,
-};
 use arbiter_proto::proto::{
     evm::{
         EvmError as ProtoEvmError,
@@ -14,13 +8,19 @@ use arbiter_proto::proto::{
         EvalViolation as ProtoEvalViolation, GasLimitExceededViolation, NoMatchingGrantError,
         PolicyViolationsError, SpecificMeaning as ProtoSpecificMeaning,
         TokenInfo as ProtoTokenInfo, TransactionEvalError as ProtoTransactionEvalError,
-        eval_violation as proto_eval_violation, eval_violation::Kind as ProtoEvalViolationKind,
+        eval_violation::Kind as ProtoEvalViolationKind,
         specific_meaning::Meaning as ProtoSpecificMeaningKind,
         transaction_eval_error::Kind as ProtoTransactionEvalErrorKind,
     },
 };
 
-use alloy::primitives::U256;
+use crate::{
+    evm::{
+        PolicyError, VetError,
+        policies::{EvalViolation, SpecificMeaning},
+    },
+    grpc::Convert,
+};
 
 fn u256_to_proto_bytes(value: U256) -> Vec<u8> {
     value.to_be_bytes::<32>().to_vec()
@@ -79,12 +79,6 @@ impl Convert for EvalViolation {
             EvalViolation::InvalidTransactionType => {
                 ProtoEvalViolationKind::InvalidTransactionType(())
             }
-            EvalViolation::MismatchingChainId { expected, actual } => {
-                ProtoEvalViolationKind::ChainIdMismatch(proto_eval_violation::ChainIdMismatch {
-                    expected,
-                    actual,
-                })
-            }
         };
 
         ProtoEvalViolation { kind: Some(kind) }
@@ -114,7 +108,7 @@ impl Convert for VetError {
                         violations: violations.into_iter().map(Convert::convert).collect(),
                     })
                 }
-                PolicyError::Database(_) | PolicyError::Integrity(_) => {
+                PolicyError::Database(_)| PolicyError::Integrity(_) => {
                     return EvmSignTransactionResult::Error(ProtoEvmError::Internal.into());
                 }
             },

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

@@ -1,4 +1,3 @@
-use crate::peers::{client::ClientConnection, user_agent::UserAgentConnection};
 use arbiter_proto::{
     proto::{
         client::{ClientRequest, ClientResponse},
@@ -6,11 +5,15 @@ use arbiter_proto::{
     },
     transport::grpc::GrpcBi,
 };
-
 use tokio_stream::wrappers::ReceiverStream;
 use tonic::{Request, Response, Status, async_trait};
 use tracing::info;
 
+use crate::{
+    actors::{client::ClientConnection, user_agent::UserAgentConnection},
+    grpc::user_agent::start,
+};
+
 mod request_tracker;
 
 pub mod client;
@@ -60,7 +63,7 @@ impl arbiter_proto::proto::arbiter_service_server::ArbiterService for super::Ser
 
         let (bi, rx) = GrpcBi::from_bi_stream(req_stream);
 
-        tokio::spawn(user_agent::start(
+        tokio::spawn(start(
             UserAgentConnection {
                 db: self.context.db.clone(),
                 actors: self.context.actors.clone(),

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

@@ -1,12 +1,12 @@
 use tonic::Status;
 
 #[derive(Default)]
-pub(super) struct RequestTracker {
+pub struct RequestTracker {
     next_request_id: i32,
 }
 
 impl RequestTracker {
-    pub(super) fn request(&mut self, id: i32) -> Result<i32, Status> {
+    pub fn request(&mut self, id: i32) -> Result<i32, Status> {
         if id < self.next_request_id {
             return Err(Status::invalid_argument("Duplicate request id"));
         }
@@ -20,7 +20,7 @@ impl RequestTracker {
 
     // This is used to set the response id for auth responses, which need to match the request id of the auth challenge request.
     // -1 offset is needed because request() increments the next_request_id after returning the current request id.
-    pub(super) fn current_request_id(&self) -> i32 {
+    pub fn current_request_id(&self) -> i32 {
         self.next_request_id - 1
     }
 }

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

@@ -1,7 +1,5 @@
-use crate::{
+use tokio::sync::mpsc;
-    grpc::request_tracker::RequestTracker,
+
-    peers::user_agent::{OutOfBand, UserAgentConnection, UserAgentSession},
-};
 use arbiter_proto::{
     proto::user_agent::{
         UserAgentRequest, UserAgentResponse,
@@ -10,20 +8,22 @@ use arbiter_proto::{
     },
     transport::{Error as TransportError, Receiver, Sender, grpc::GrpcBi},
 };
-
 use async_trait::async_trait;
-use kameo::actor::ActorRef;
+use kameo::actor::{ActorRef, Spawn as _};
-use tokio::sync::mpsc;
 use tonic::Status;
 use tracing::{error, info, warn};
 
+use crate::{
+    actors::user_agent::{OutOfBand, UserAgentConnection, UserAgentSession},
+    grpc::request_tracker::RequestTracker,
+};
+
 mod auth;
 mod evm;
 mod inbound;
 mod outbound;
 mod sdk_client;
 mod vault;
-mod vault_gate;
 
 pub struct OutOfBandAdapter(mpsc::Sender<OutOfBand>);
 
@@ -124,22 +124,21 @@ pub async fn start(
 ) {
     let mut request_tracker = RequestTracker::default();
 
-    let (oob_sender, oob_receiver) = mpsc::channel(16);
+    let pubkey = match auth::start(&mut conn, &mut bi, &mut request_tracker).await {
-    let oob_adapter = OutOfBandAdapter(oob_sender);
+        Ok(pubkey) => pubkey,
-
+        Err(e) => {
-    let actor = {
+            warn!(error = ?e, "Authentication failed");
-        let transport = auth::AuthTransportAdapter::new(&mut bi, &mut request_tracker);
+            return;
-        match crate::peers::user_agent::start(&mut conn, transport, Box::new(oob_adapter)).await {
-            Ok(actor) => actor,
-            Err(e) => {
-                warn!(error = ?e, "User agent connection failed");
-                return;
-            }
         }
     };
 
-    info!("User agent session established");
+    let (oob_sender, oob_receiver) = mpsc::channel(16);
+    let oob_adapter = OutOfBandAdapter(oob_sender);
 
-    dispatch_loop(bi, actor.clone(), oob_receiver, request_tracker).await;
+    let actor = UserAgentSession::spawn(UserAgentSession::new(conn, Box::new(oob_adapter)));
-    actor.kill();
+    let actor_for_cleanup = actor.clone();
+
+    info!(?pubkey, "User authenticated successfully");
+    dispatch_loop(bi, actor, oob_receiver, request_tracker).await;
+    actor_for_cleanup.kill();
 }

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

@@ -1,5 +1,3 @@
-use crate::{grpc::request_tracker::RequestTracker, peers::user_agent::auth};
-use arbiter_crypto::authn;
 use arbiter_proto::{
     proto::user_agent::{
         UserAgentRequest, UserAgentResponse,
@@ -7,25 +5,31 @@ use arbiter_proto::{
             self as proto_auth, AuthChallenge as ProtoAuthChallenge,
             AuthChallengeRequest as ProtoAuthChallengeRequest,
             AuthChallengeSolution as ProtoAuthChallengeSolution, AuthResult as ProtoAuthResult,
-            request::Payload as AuthRequestPayload, response::Payload as AuthResponsePayload,
+            KeyType as ProtoKeyType, request::Payload as AuthRequestPayload,
+            response::Payload as AuthResponsePayload,
         },
         user_agent_request::Payload as UserAgentRequestPayload,
         user_agent_response::Payload as UserAgentResponsePayload,
     },
     transport::{Bi, Error as TransportError, Receiver, Sender, grpc::GrpcBi},
 };
-
 use async_trait::async_trait;
 use tonic::Status;
 use tracing::warn;
 
-pub(super) struct AuthTransportAdapter<'a> {
+use crate::{
-    pub(super) bi: &'a mut GrpcBi<UserAgentRequest, UserAgentResponse>,
+    actors::user_agent::{AuthPublicKey, UserAgentConnection, auth},
-    pub(super) request_tracker: &'a mut RequestTracker,
+    db::models::KeyType,
+    grpc::request_tracker::RequestTracker,
+};
+
+pub struct AuthTransportAdapter<'a> {
+    bi: &'a mut GrpcBi<UserAgentRequest, UserAgentResponse>,
+    request_tracker: &'a mut RequestTracker,
 }
 
 impl<'a> AuthTransportAdapter<'a> {
-    pub(super) fn new(
+    pub fn new(
         bi: &'a mut GrpcBi<UserAgentRequest, UserAgentResponse>,
         request_tracker: &'a mut RequestTracker,
     ) -> Self {
@@ -35,34 +39,18 @@ impl<'a> AuthTransportAdapter<'a> {
         }
     }
 
-    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: UserAgentResponsePayload,
-    ) -> Result<(), TransportError> {
-        self.bi
-            .send(Ok(UserAgentResponse {
-                id: Some(self.request_tracker.current_request_id()),
-                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 {
+        self.bi
-            payload: Some(payload),
+            .send(Ok(UserAgentResponse {
-        }))
+                id: Some(self.request_tracker.current_request_id()),
-        .await
+                payload: Some(UserAgentResponsePayload::Auth(proto_auth::Response {
+                    payload: Some(payload),
+                })),
+            }))
+            .await
     }
 }
 
@@ -74,15 +62,8 @@ impl Sender<Result<auth::Outbound, auth::Error>> for AuthTransportAdapter<'_> {
     ) -> Result<(), TransportError> {
         use auth::{Error, Outbound};
         let payload = match item {
-            Ok(Outbound::AuthChallenge { challenge }) => {
+            Ok(Outbound::AuthChallenge { nonce }) => {
-                AuthResponsePayload::Challenge(ProtoAuthChallenge {
+                AuthResponsePayload::Challenge(ProtoAuthChallenge { nonce })
-                    timestamp_nanos: challenge
-                        .timestamp
-                        .timestamp_nanos_opt()
-                        .expect("timestamp within range")
-                        as u64,
-                    random: challenge.nonce.to_vec(),
-                })
             }
             Ok(Outbound::AuthSuccess) => {
                 AuthResponsePayload::Result(ProtoAuthResult::Success.into())
@@ -160,8 +141,28 @@ 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 {
+                let Ok(key_type) = ProtoKeyType::try_from(key_type) else {
+                    warn!(
+                        event = "received request with invalid key type",
+                        "grpc.useragent.auth_adapter"
+                    );
+                    return None;
+                };
+                let key_type = match key_type {
+                    ProtoKeyType::Ed25519 => KeyType::Ed25519,
+                    ProtoKeyType::EcdsaSecp256k1 => KeyType::EcdsaSecp256k1,
+                    ProtoKeyType::Rsa => KeyType::Rsa,
+                    ProtoKeyType::Unspecified => {
+                        warn!(
+                            event = "received request with unspecified key type",
+                            "grpc.useragent.auth_adapter"
+                        );
+                        return None;
+                    }
+                };
+                let Ok(pubkey) = AuthPublicKey::try_from((key_type, pubkey)) else {
                     warn!(
                         event = "received request with invalid public key",
                         "grpc.useragent.auth_adapter"
@@ -182,3 +183,12 @@ impl Receiver<auth::Inbound> for AuthTransportAdapter<'_> {
 }
 
 impl Bi<auth::Inbound, Result<auth::Outbound, auth::Error>> for AuthTransportAdapter<'_> {}
+
+pub async fn start(
+    conn: &mut UserAgentConnection,
+    bi: &mut GrpcBi<UserAgentRequest, UserAgentResponse>,
+    request_tracker: &mut RequestTracker,
+) -> Result<AuthPublicKey, auth::Error> {
+    let transport = AuthTransportAdapter::new(bi, request_tracker);
+    auth::authenticate(conn, transport).await
+}

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

@@ -1,17 +1,3 @@
-use crate::{
-    grpc::{
-        Convert, TryConvert,
-        common::inbound::{RawEvmAddress, RawEvmTransaction},
-    },
-    peers::user_agent::{
-        UserAgentSession,
-        session::handlers::{
-            GrantMutationError, HandleEvmWalletCreate, HandleEvmWalletList, HandleGrantCreate,
-            HandleGrantDelete, HandleGrantList, HandleSignTransaction,
-            SignTransactionError as SessionSignTransactionError,
-        },
-    },
-};
 use arbiter_proto::proto::{
     evm::{
         EvmError as ProtoEvmError, EvmGrantCreateRequest, EvmGrantCreateResponse,
@@ -32,11 +18,25 @@ use arbiter_proto::proto::{
         user_agent_response::Payload as UserAgentResponsePayload,
     },
 };
-
 use kameo::actor::ActorRef;
 use tonic::Status;
 use tracing::warn;
 
+use crate::{
+    actors::user_agent::{
+        UserAgentSession,
+        session::connection::{
+            GrantMutationError, HandleEvmWalletCreate, HandleEvmWalletList, HandleGrantCreate,
+            HandleGrantDelete, HandleGrantList, HandleSignTransaction,
+            SignTransactionError as SessionSignTransactionError,
+        },
+    },
+    grpc::{
+        Convert, TryConvert,
+        common::inbound::{RawEvmAddress, RawEvmTransaction},
+    },
+};
+
 fn wrap_evm_response(payload: EvmResponsePayload) -> UserAgentResponsePayload {
     UserAgentResponsePayload::Evm(proto_evm::Response {
         payload: Some(payload),

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

@@ -1,26 +1,26 @@
+use alloy::primitives::{Address, U256};
+use arbiter_proto::proto::evm::{
+    EtherTransferSettings as ProtoEtherTransferSettings, SharedSettings as ProtoSharedSettings,
+    SpecificGrant as ProtoSpecificGrant, TokenTransferSettings as ProtoTokenTransferSettings,
+    TransactionRateLimit as ProtoTransactionRateLimit, VolumeRateLimit as ProtoVolumeRateLimit,
+    specific_grant::Grant as ProtoSpecificGrantType,
+};
+use arbiter_proto::proto::user_agent::sdk_client::{
+    WalletAccess, WalletAccessEntry as SdkClientWalletAccess,
+};
+use chrono::{DateTime, TimeZone, Utc};
+use prost_types::Timestamp as ProtoTimestamp;
+use tonic::Status;
+
+use crate::db::models::{CoreEvmWalletAccess, NewEvmWalletAccess};
+use crate::grpc::Convert;
 use crate::{
-    db::models::{CoreEvmWalletAccess, NewEvmWalletAccess},
     evm::policies::{
         SharedGrantSettings, SpecificGrant, TransactionRateLimit, VolumeRateLimit, ether_transfer,
         token_transfers,
     },
-    grpc::Convert,
     grpc::TryConvert,
 };
-use arbiter_proto::{
-    proto::evm::{
-        EtherTransferSettings as ProtoEtherTransferSettings, SharedSettings as ProtoSharedSettings,
-        SpecificGrant as ProtoSpecificGrant, TokenTransferSettings as ProtoTokenTransferSettings,
-        TransactionRateLimit as ProtoTransactionRateLimit, VolumeRateLimit as ProtoVolumeRateLimit,
-        specific_grant::Grant as ProtoSpecificGrantType,
-    },
-    proto::user_agent::sdk_client::{WalletAccess, WalletAccessEntry as SdkClientWalletAccess},
-};
-
-use alloy::primitives::{Address, U256};
-use chrono::{DateTime, TimeZone, Utc};
-use prost_types::Timestamp as ProtoTimestamp;
-use tonic::Status;
 
 fn address_from_bytes(bytes: Vec<u8>) -> Result<Address, Status> {
     if bytes.len() != 20 {

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

@@ -1,8 +1,3 @@
-use crate::{
-    db::models::EvmWalletAccess,
-    evm::policies::{SharedGrantSettings, SpecificGrant, TransactionRateLimit, VolumeRateLimit},
-    grpc::Convert,
-};
 use arbiter_proto::proto::{
     evm::{
         EtherTransferSettings as ProtoEtherTransferSettings, SharedSettings as ProtoSharedSettings,
@@ -12,10 +7,15 @@ use arbiter_proto::proto::{
     },
     user_agent::sdk_client::{WalletAccess, WalletAccessEntry as ProtoSdkClientWalletAccess},
 };
-
 use chrono::{DateTime, Utc};
 use prost_types::Timestamp as ProtoTimestamp;
 
+use crate::{
+    db::models::EvmWalletAccess,
+    evm::policies::{SharedGrantSettings, SpecificGrant, TransactionRateLimit, VolumeRateLimit},
+    grpc::Convert,
+};
+
 impl Convert for DateTime<Utc> {
     type Output = ProtoTimestamp;
 

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

@@ -1,15 +1,3 @@
-use crate::{
-    db::models::NewEvmWalletAccess,
-    grpc::Convert,
-    peers::user_agent::{
-        OutOfBand, UserAgentSession,
-        session::handlers::{
-            HandleGrantEvmWalletAccess, HandleListWalletAccess, HandleNewClientApprove,
-            HandleRevokeEvmWalletAccess, HandleSdkClientList,
-        },
-    },
-};
-use arbiter_crypto::authn;
 use arbiter_proto::proto::{
     shared::ClientInfo as ProtoClientMetadata,
     user_agent::{
@@ -27,11 +15,22 @@ use arbiter_proto::proto::{
         user_agent_response::Payload as UserAgentResponsePayload,
     },
 };
-
 use kameo::actor::ActorRef;
 use tonic::Status;
 use tracing::{info, warn};
 
+use crate::{
+    actors::user_agent::{
+        OutOfBand, UserAgentSession,
+        session::connection::{
+            HandleGrantEvmWalletAccess, HandleListWalletAccess, HandleNewClientApprove,
+            HandleRevokeEvmWalletAccess, HandleSdkClientList,
+        },
+    },
+    db::models::NewEvmWalletAccess,
+    grpc::Convert,
+};
+
 fn wrap_sdk_client_response(payload: SdkClientResponsePayload) -> UserAgentResponsePayload {
     UserAgentResponsePayload::SdkClient(proto_sdk_client::Response {
         payload: Some(payload),
@@ -42,7 +41,7 @@ pub(super) fn out_of_band_payload(oob: OutOfBand) -> UserAgentResponsePayload {
     match oob {
         OutOfBand::ClientConnectionRequest { profile } => wrap_sdk_client_response(
             SdkClientResponsePayload::ConnectionRequest(ProtoSdkClientConnectionRequest {
-                pubkey: profile.pubkey.to_bytes(),
+                pubkey: profile.pubkey.to_bytes().to_vec(),
                 info: Some(ProtoClientMetadata {
                     name: profile.metadata.name,
                     description: profile.metadata.description,
@@ -52,7 +51,7 @@ pub(super) fn out_of_band_payload(oob: OutOfBand) -> UserAgentResponsePayload {
         ),
         OutOfBand::ClientConnectionCancel { pubkey } => wrap_sdk_client_response(
             SdkClientResponsePayload::ConnectionCancel(ProtoSdkClientConnectionCancel {
-                pubkey: pubkey.to_bytes(),
+                pubkey: pubkey.to_bytes().to_vec(),
             }),
         ),
     }
@@ -90,8 +89,10 @@ async fn handle_connection_response(
     actor: &ActorRef<UserAgentSession>,
     resp: ProtoSdkClientConnectionResponse,
 ) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let pubkey = authn::PublicKey::try_from(resp.pubkey.as_slice())
+    let pubkey_bytes = <[u8; 32]>::try_from(resp.pubkey)
-        .map_err(|_| Status::invalid_argument("Invalid ML-DSA public key"))?;
+        .map_err(|_| Status::invalid_argument("Invalid Ed25519 public key length"))?;
+    let pubkey = ed25519_dalek::VerifyingKey::from_bytes(&pubkey_bytes)
+        .map_err(|_| Status::invalid_argument("Invalid Ed25519 public key"))?;
 
     actor
         .ask(HandleNewClientApprove {
@@ -116,7 +117,7 @@ async fn handle_list(
                 .into_iter()
                 .map(|(client, metadata)| ProtoSdkClientEntry {
                     id: client.id,
-                    pubkey: client.public_key.to_vec(),
+                    pubkey: client.public_key,
                     info: Some(ProtoClientMetadata {
                         name: metadata.name,
                         description: metadata.description,

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

@@ -1,28 +1,54 @@
-use crate::{
+use arbiter_proto::proto::shared::VaultState as ProtoVaultState;
-    actors::vault::VaultState,
+use arbiter_proto::proto::user_agent::{
-    peers::user_agent::{UserAgentSession, session::handlers::HandleQueryVaultState},
+    user_agent_response::Payload as UserAgentResponsePayload,
-};
+    vault::{
-use arbiter_proto::{
+        self as proto_vault,
-    proto::shared::VaultState as ProtoVaultState,
+        bootstrap::{
-    proto::user_agent::{
+            self as proto_bootstrap, BootstrapEncryptedKey as ProtoBootstrapEncryptedKey,
-        user_agent_response::Payload as UserAgentResponsePayload,
+            BootstrapResult as ProtoBootstrapResult,
-        vault::{
+        },
-            self as proto_vault, request::Payload as VaultRequestPayload,
+        request::Payload as VaultRequestPayload,
-            response::Payload as VaultResponsePayload,
+        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::{
+    keyholder::KeyHolderState,
+    user_agent::{
+        UserAgentSession,
+        session::connection::{
+            BootstrapError, HandleBootstrapEncryptedKey, HandleQueryVaultState,
+            HandleUnsealEncryptedKey, HandleUnsealRequest, UnsealError,
+        },
+    },
+};
+
 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(),
+    }))
+}
+
 pub(super) async fn dispatch(
     actor: &ActorRef<UserAgentSession>,
     req: proto_vault::Request,
@@ -33,21 +59,116 @@ pub(super) async fn dispatch(
 
     match payload {
         VaultRequestPayload::QueryState(_) => handle_query_vault_state(actor).await,
-        VaultRequestPayload::Unseal(_) | VaultRequestPayload::Bootstrap(_) => {
+        VaultRequestPayload::Unseal(req) => dispatch_unseal_request(actor, req).await,
-            Err(Status::permission_denied(
+        VaultRequestPayload::Bootstrap(req) => handle_bootstrap_request(actor, req).await,
-                "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(VaultState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
+        Ok(KeyHolderState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
-        Ok(VaultState::Sealed) => ProtoVaultState::Sealed,
+        Ok(KeyHolderState::Sealed) => ProtoVaultState::Sealed,
-        Ok(VaultState::Unsealed) => ProtoVaultState::Unsealed,
+        Ok(KeyHolderState::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

@@ -1,81 +0,0 @@
-use super::auth::AuthTransportAdapter;
-use crate::{
-    grpc::TryConvert,
-    peers::user_agent::vault_gate::{self as vault_gate},
-};
-use arbiter_proto::transport::{Bi, Error as TransportError, Receiver, Sender};
-
-use async_trait::async_trait;
-use tonic::Status;
-use tracing::warn;
-
-mod inbound;
-mod outbound;
-
-#[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;
-            };
-
-            match payload.try_convert() {
-                Ok(inbound) => return Some(inbound),
-                Err(status) => {
-                    let _ = self.bi_mut().send(Err(status)).await;
-                    return None;
-                }
-            }
-        }
-    }
-}
-
-#[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;
-            }
-        };
-
-        match outbound.try_convert() {
-            Ok(payload) => self.send_response_payload(payload).await,
-            Err(status) => self.bi_mut().send(Err(status)).await,
-        }
-    }
-}
-
-impl Bi<vault_gate::Inbound, Result<vault_gate::Outbound, vault_gate::Error>>
-    for AuthTransportAdapter<'_>
-{
-}

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

@@ -1,129 +0,0 @@
-use crate::{
-    grpc::{Convert, TryConvert},
-    peers::user_agent::vault_gate::{
-        self as vault_gate, HandleBootstrapEncryptedKey, HandleHandshake, HandleUnsealEncryptedKey,
-    },
-};
-use arbiter_proto::proto::user_agent::{
-    user_agent_request::Payload as UserAgentRequestPayload,
-    vault::{
-        self as proto_vault,
-        bootstrap::{self as proto_bootstrap},
-        request::Payload as VaultRequestPayload,
-        unseal::{self as proto_unseal, request::Payload as UnsealRequestPayload},
-    },
-};
-
-use tonic::Status;
-
-impl TryConvert for UserAgentRequestPayload {
-    type Output = vault_gate::Inbound;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        match self {
-            UserAgentRequestPayload::Vault(req) => req.try_convert(),
-            _ => Err(Status::permission_denied(
-                "Only vault operations are permitted before unsealing",
-            )),
-        }
-    }
-}
-
-impl TryConvert for proto_vault::Request {
-    type Output = vault_gate::Inbound;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        self.payload
-            .ok_or_else(|| Status::invalid_argument("Missing vault request payload"))?
-            .try_convert()
-    }
-}
-
-impl TryConvert for VaultRequestPayload {
-    type Output = vault_gate::Inbound;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        match self {
-            VaultRequestPayload::QueryState(_) => Ok(vault_gate::Inbound::HandleVaultState),
-            VaultRequestPayload::Unseal(req) => req.try_convert(),
-            VaultRequestPayload::Bootstrap(req) => req.try_convert(),
-        }
-    }
-}
-
-impl TryConvert for proto_unseal::Request {
-    type Output = vault_gate::Inbound;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        self.payload
-            .ok_or_else(|| Status::invalid_argument("Missing unseal request payload"))?
-            .try_convert()
-    }
-}
-
-impl TryConvert for UnsealRequestPayload {
-    type Output = vault_gate::Inbound;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        match self {
-            UnsealRequestPayload::Start(start) => start.try_convert(),
-            UnsealRequestPayload::EncryptedKey(key) => Ok(key.convert()),
-        }
-    }
-}
-
-impl TryConvert for proto_unseal::UnsealStart {
-    type Output = vault_gate::Inbound;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        let bytes = <[u8; 32]>::try_from(self.client_pubkey)
-            .map_err(|_| Status::invalid_argument("Invalid X25519 public key"))?;
-        Ok(vault_gate::Inbound::HandleHandshake(HandleHandshake {
-            client_pubkey: x25519_dalek::PublicKey::from(bytes),
-        }))
-    }
-}
-
-impl Convert for proto_unseal::UnsealEncryptedKey {
-    type Output = vault_gate::Inbound;
-
-    fn convert(self) -> vault_gate::Inbound {
-        vault_gate::Inbound::HandleUnsealEncryptedKey(HandleUnsealEncryptedKey {
-            nonce: self.nonce,
-            ciphertext: self.ciphertext,
-            associated_data: self.associated_data,
-        })
-    }
-}
-
-impl TryConvert for proto_bootstrap::Request {
-    type Output = vault_gate::Inbound;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        self.encrypted_key
-            .ok_or_else(|| Status::invalid_argument("Missing bootstrap encrypted key"))?
-            .try_convert()
-    }
-}
-
-impl TryConvert for proto_bootstrap::BootstrapEncryptedKey {
-    type Output = vault_gate::Inbound;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        Ok(vault_gate::Inbound::HandleBootstrapEncryptedKey(
-            HandleBootstrapEncryptedKey {
-                nonce: self.nonce,
-                ciphertext: self.ciphertext,
-                associated_data: self.associated_data,
-            },
-        ))
-    }
-}

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

@@ -1,115 +0,0 @@
-use crate::{
-    actors::vault::VaultState,
-    grpc::{Convert, TryConvert},
-    peers::user_agent::vault_gate::{self as vault_gate},
-};
-use arbiter_proto::proto::{
-    shared::VaultState as ProtoVaultState,
-    user_agent::{
-        user_agent_response::Payload as UserAgentResponsePayload,
-        vault::{
-            self as proto_vault,
-            bootstrap::{self as proto_bootstrap, BootstrapResult as ProtoBootstrapResult},
-            response::Payload as VaultResponsePayload,
-            unseal::{
-                self as proto_unseal, UnsealResult as ProtoUnsealResult,
-                response::Payload as UnsealResponsePayload,
-            },
-        },
-    },
-};
-
-use tonic::Status;
-use tracing::warn;
-
-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 Convert for VaultState {
-    type Output = UserAgentResponsePayload;
-
-    fn convert(self) -> UserAgentResponsePayload {
-        let proto_state = match self {
-            VaultState::Unbootstrapped => ProtoVaultState::Unbootstrapped,
-            VaultState::Sealed => ProtoVaultState::Sealed,
-            VaultState::Unsealed => ProtoVaultState::Unsealed,
-        };
-        wrap_vault_response(VaultResponsePayload::State(proto_state.into()))
-    }
-}
-
-impl Convert for vault_gate::HandshakeResponse {
-    type Output = UserAgentResponsePayload;
-
-    fn convert(self) -> UserAgentResponsePayload {
-        wrap_unseal_response(UnsealResponsePayload::Start(
-            proto_unseal::UnsealStartResponse {
-                server_pubkey: self.server_pubkey.as_bytes().to_vec(),
-            },
-        ))
-    }
-}
-
-impl TryConvert for vault_gate::Outbound {
-    type Output = UserAgentResponsePayload;
-    type Error = Status;
-
-    fn try_convert(self) -> Result<UserAgentResponsePayload, Status> {
-        match self {
-            vault_gate::Outbound::HandleVaultState(result) => result
-                .map_err(|err| {
-                    warn!(?err, "vault state query failed");
-                    Status::internal("Failed to query vault state")
-                })
-                .map(VaultState::convert),
-            vault_gate::Outbound::HandleHandshake(result) => result
-                .map_err(|err| {
-                    warn!(?err, "handshake failed");
-                    Status::internal("Failed to start unseal flow")
-                })
-                .map(vault_gate::HandshakeResponse::convert),
-            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 Err(Status::internal("Failed to unseal vault"));
-                    }
-                };
-                Ok(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 Err(Status::internal("Failed to bootstrap vault"));
-                    }
-                };
-                Ok(wrap_bootstrap_response(proto_result))
-            }
-        }
-    }
-}

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

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

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

@@ -1,16 +1,15 @@
-use arbiter_proto::{proto::arbiter_service_server::ArbiterServiceServer, url::ArbiterUrl};
+use std::net::SocketAddr;
-use arbiter_server::{Server, actors::bootstrap::GetToken, context::ServerContext, db};
 
 use anyhow::anyhow;
+use arbiter_proto::{proto::arbiter_service_server::ArbiterServiceServer, url::ArbiterUrl};
+use arbiter_server::{Server, actors::bootstrap::GetToken, context::ServerContext, db};
 use rustls::crypto::aws_lc_rs;
-use std::net::SocketAddr;
 use tonic::transport::{Identity, ServerTlsConfig};
 use tracing::info;
 
 const PORT: u16 = 50051;
 
 #[tokio::main]
-#[mutants::skip]
 async fn main() -> anyhow::Result<()> {
     aws_lc_rs::default_provider().install_default().unwrap();
 

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

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

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

@@ -1,198 +0,0 @@
-use super::{
-    super::{Credentials, UserAgentConnection},
-    Error,
-};
-use crate::{
-    actors::bootstrap::ConsumeToken,
-    db::{DatabasePool, schema::useragent_client},
-    peers::user_agent::auth::Outbound,
-};
-use arbiter_crypto::authn::{self, AuthChallenge, USERAGENT_CONTEXT};
-use arbiter_proto::transport::Bi;
-
-use diesel::{ExpressionMethods as _, OptionalExtension as _, QueryDsl};
-use diesel_async::RunQueryDsl;
-use tracing::error;
-
-pub(super) struct ChallengeRequest {
-    pub(super) pubkey: authn::PublicKey,
-    pub(super) bootstrap_token: Option<String>,
-}
-
-pub(super) struct ChallengeContext {
-    pub(super) challenge: AuthChallenge,
-    pub(super) pubkey: authn::PublicKey,
-    pub(super) bootstrap_token: Option<String>,
-}
-
-pub(super) struct ChallengeSolution {
-    pub(super) solution: Vec<u8>,
-}
-
-smlang::statemachine!(
-    name: Auth,
-    custom_error: true,
-    transitions: {
-        *Init + AuthRequest(ChallengeRequest) / async prepare_challenge = SentChallenge(ChallengeContext),
-        SentChallenge(ChallengeContext) + ReceivedSolution(ChallengeSolution) / async verify_solution = AuthOk(Credentials),
-    }
-);
-
-async fn get_client_id(db: &DatabasePool, pubkey: &authn::PublicKey) -> Result<Option<i32>, Error> {
-    let mut conn = db.get().await.map_err(|e| {
-        error!(error = ?e, "Database pool error");
-        Error::internal("Database unavailable")
-    })?;
-
-    useragent_client::table
-        .filter(useragent_client::public_key.eq(pubkey.to_bytes()))
-        .select(useragent_client::id)
-        .first::<i32>(&mut conn)
-        .await
-        .optional()
-        .map_err(|e| {
-            error!(error = ?e, "Database error");
-            Error::internal("Database operation failed")
-        })
-}
-
-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")
-    })?;
-
-    let id: i32 = diesel::insert_into(useragent_client::table)
-        .values((useragent_client::public_key.eq(pubkey_bytes),))
-        .returning(useragent_client::id)
-        .get_result(&mut conn)
-        .await
-        .map_err(|e| {
-            error!(error = ?e, "Database error");
-            Error::internal("Database operation failed")
-        })?;
-
-    Ok(id)
-}
-
-pub(super) struct AuthContext<'a, T: ?Sized> {
-    pub(super) conn: &'a mut UserAgentConnection,
-    pub(super) transport: &'a mut T,
-}
-
-impl<'a, T: ?Sized> AuthContext<'a, T> {
-    pub(super) 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 + ?Sized,
-{
-    type Error = Error;
-
-    async fn prepare_challenge(
-        &mut self,
-        ChallengeRequest {
-            pubkey,
-            bootstrap_token,
-        }: ChallengeRequest,
-    ) -> Result<ChallengeContext, Self::Error> {
-        // Verify pubkey is registered (unless bootstrapping)
-        if bootstrap_token.is_none() {
-            let id = get_client_id(&self.conn.db, &pubkey).await?;
-            if id.is_none() {
-                return Err(Error::UnregisteredPublicKey);
-            }
-        }
-
-        let challenge = AuthChallenge::generate(&mut rand::rng());
-
-        self.transport
-            .send(Ok(Outbound::AuthChallenge {
-                challenge: challenge.clone(),
-            }))
-            .await
-            .map_err(|e| {
-                error!(?e, "Failed to send auth challenge");
-                Error::Transport
-            })?;
-
-        Ok(ChallengeContext {
-            challenge,
-            pubkey,
-            bootstrap_token,
-        })
-    }
-
-    #[allow(missing_docs)]
-    #[allow(clippy::unused_unit)]
-    async fn verify_solution(
-        &mut self,
-        ChallengeContext {
-            challenge,
-            pubkey,
-            bootstrap_token,
-        }: &ChallengeContext,
-        ChallengeSolution { solution }: ChallengeSolution,
-    ) -> Result<Credentials, Self::Error> {
-        let signature = authn::Signature::try_from(solution.as_slice()).map_err(|_| {
-            error!("Failed to decode signature in challenge solution");
-            Error::InvalidChallengeSolution
-        })?;
-
-        let valid = pubkey.verify(challenge, USERAGENT_CONTEXT, &signature);
-
-        if !valid {
-            self.transport
-                .send(Err(Error::InvalidChallengeSolution))
-                .await
-                .map_err(|_| Error::Transport)?;
-            return Err(Error::InvalidChallengeSolution);
-        }
-
-        // Resolve client id: bootstrap (consume token + register) or lookup
-        let id = match bootstrap_token {
-            Some(token) => {
-                let token_ok: bool = self
-                    .conn
-                    .actors
-                    .bootstrapper
-                    .ask(ConsumeToken {
-                        token: token.clone(),
-                    })
-                    .await
-                    .map_err(|e| {
-                        error!(?e, "Failed to consume bootstrap token");
-                        Error::internal("Failed to consume bootstrap token")
-                    })?;
-
-                if !token_ok {
-                    error!("Invalid bootstrap token provided");
-                    self.transport
-                        .send(Err(Error::InvalidBootstrapToken))
-                        .await
-                        .map_err(|_| Error::Transport)?;
-                    return Err(Error::InvalidBootstrapToken);
-                }
-
-                register_key(&self.conn.db, pubkey).await?
-            }
-            None => get_client_id(&self.conn.db, pubkey)
-                .await?
-                .ok_or(Error::UnregisteredPublicKey)?,
-        };
-
-        self.transport
-            .send(Ok(Outbound::AuthSuccess))
-            .await
-            .map_err(|_| Error::Transport)?;
-
-        Ok(Credentials {
-            id,
-            pubkey: pubkey.clone(),
-        })
-    }
-}

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

@@ -1,185 +0,0 @@
-use crate::{
-    actors::{
-        GlobalActors,
-        vault::{GetState, Vault},
-    },
-    crypto::integrity::{self, AttestationStatus, Integrable},
-    db::{self, DatabaseError, DatabasePool},
-    peers::client::ClientProfile,
-};
-use arbiter_crypto::authn;
-use arbiter_macros::Hashable;
-use arbiter_proto::transport::{Bi, Sender};
-use vault_gate::VaultGate;
-
-use kameo::actor::{ActorRef, Spawn as _};
-use tokio::sync::oneshot;
-use tracing::{error, warn};
-
-pub use auth::authenticate;
-pub use session::UserAgentSession;
-
-pub mod auth;
-pub mod session;
-pub mod vault_gate;
-
-#[derive(Debug, Clone, Hashable)]
-pub struct Credentials {
-    pub id: i32,
-    pub pubkey: authn::PublicKey,
-}
-
-impl Integrable for Credentials {
-    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("database error: {0}")]
-    Database(DatabaseError),
-    #[error("internal: {0}")]
-    Internal(String),
-}
-
-impl From<auth::Error> for Error {
-    fn from(err: auth::Error) -> Self {
-        Self::Auth(err)
-    }
-}
-
-async fn verify_integrity(
-    db: &DatabasePool,
-    vault: &ActorRef<Vault>,
-    credentials: &Credentials,
-) -> Result<(), Error> {
-    let mut conn = db
-        .get()
-        .await
-        .map_err(|_| Error::Internal("DB unavailable".into()))?;
-    match integrity::verify_entity(&mut conn, &vault, credentials, credentials.id).await {
-        Ok(AttestationStatus::Attested) => Ok(()),
-        Ok(AttestationStatus::Unavailable) => {
-            Err(Error::Internal("Vault sealed during promotion".into()))
-        }
-        Err(e) => {
-            error!(?e, "Integrity verification failed during unseal promotion");
-            Err(Error::Internal("Integrity check failed".into()))
-        }
-    }
-}
-
-async fn should_run_gate(vault: &ActorRef<Vault>) -> Result<bool, Error> {
-    let vault_state = vault
-        .ask(GetState {})
-        .await
-        .map_err(|_| Error::Internal("Failed to contact the vault".into()))?;
-
-    Ok(!matches!(
-        vault_state,
-        crate::actors::vault::VaultState::Unsealed
-    ))
-}
-
-async fn run_vault_gate<T>(
-    props: &UserAgentConnection,
-    transport: &mut T,
-    auth_creds: Credentials,
-) -> Result<(), 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
-}
-
-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 creds = authenticate(props, &mut transport).await?;
-
-    // should run vault gate only if sealed / unbootstrapped
-    if should_run_gate(&props.actors.vault).await? {
-        run_vault_gate(props, &mut transport, creds.clone()).await?;
-    }
-
-    // checking the integrity
-    verify_integrity(&props.db, &props.actors.vault, &creds).await?;
-
-    Ok(UserAgentSession::spawn(UserAgentSession::new(
-        props.clone(),
-        oob_sender,
-    )))
-}

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

@@ -1,283 +0,0 @@
-use super::{Error, UserAgentSession};
-use crate::{
-    actors::evm::{
-        ClientSignTransaction, Generate, ListWallets, SignTransactionError as EvmSignError,
-        UseragentCreateGrant, UseragentListGrants,
-    },
-    actors::flow_coordinator::client_connect_approval::ClientApprovalAnswer,
-    actors::vault::VaultState,
-    db::models::{EvmWalletAccess, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata},
-    evm::policies::{Grant, SpecificGrant},
-};
-use arbiter_crypto::authn;
-
-use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
-use diesel::{ExpressionMethods as _, QueryDsl as _, SelectableHelper};
-use diesel_async::{AsyncConnection, RunQueryDsl};
-use kameo::{error::SendError, messages, prelude::Context};
-use tracing::error;
-
-#[derive(Debug, Error)]
-pub enum SignTransactionError {
-    #[error("Policy evaluation failed")]
-    Vet(#[from] crate::evm::VetError),
-
-    #[error("Internal signing error")]
-    Internal,
-}
-
-#[derive(Debug, Error)]
-pub enum GrantMutationError {
-    #[error("Vault is sealed")]
-    VaultSealed,
-
-    #[error("Internal grant mutation error")]
-    Internal,
-}
-
-#[messages]
-impl UserAgentSession {
-    #[message]
-    pub(crate) async fn handle_query_vault_state(&mut self) -> Result<VaultState, Error> {
-        use crate::actors::vault::GetState;
-
-        let vault_state = match self.props.actors.vault.ask(GetState {}).await {
-            Ok(state) => state,
-            Err(err) => {
-                error!(?err, actor = "useragent", "vault.query.failed");
-                return Err(Error::internal("Vault is in broken state"));
-            }
-        };
-
-        Ok(vault_state)
-    }
-}
-
-#[messages]
-impl UserAgentSession {
-    #[message]
-    pub(crate) async fn handle_evm_wallet_create(&mut self) -> Result<(i32, Address), Error> {
-        match self.props.actors.evm.ask(Generate {}).await {
-            Ok(address) => Ok(address),
-            Err(SendError::HandlerError(err)) => Err(Error::internal(format!(
-                "EVM wallet generation failed: {err}"
-            ))),
-            Err(err) => {
-                error!(?err, "EVM actor unreachable during wallet create");
-                Err(Error::internal("EVM actor unreachable"))
-            }
-        }
-    }
-
-    #[message]
-    pub(crate) async fn handle_evm_wallet_list(&mut self) -> Result<Vec<(i32, Address)>, Error> {
-        match self.props.actors.evm.ask(ListWallets {}).await {
-            Ok(wallets) => Ok(wallets),
-            Err(err) => {
-                error!(?err, "EVM wallet list failed");
-                Err(Error::internal("Failed to list EVM wallets"))
-            }
-        }
-    }
-}
-
-#[messages]
-impl UserAgentSession {
-    #[message]
-    pub(crate) async fn handle_grant_list(&mut self) -> Result<Vec<Grant<SpecificGrant>>, Error> {
-        match self.props.actors.evm.ask(UseragentListGrants {}).await {
-            Ok(grants) => Ok(grants),
-            Err(err) => {
-                error!(?err, "EVM grant list failed");
-                Err(Error::internal("Failed to list EVM grants"))
-            }
-        }
-    }
-
-    #[message]
-    pub(crate) async fn handle_grant_create(
-        &mut self,
-        basic: crate::evm::policies::SharedGrantSettings,
-        grant: crate::evm::policies::SpecificGrant,
-    ) -> Result<i32, GrantMutationError> {
-        match self
-            .props
-            .actors
-            .evm
-            .ask(UseragentCreateGrant { basic, grant })
-            .await
-        {
-            Ok(grant_id) => Ok(grant_id),
-            Err(err) => {
-                error!(?err, "EVM grant create failed");
-                Err(GrantMutationError::Internal)
-            }
-        }
-    }
-
-    #[message]
-    pub(crate) async fn handle_grant_delete(
-        &mut self,
-        grant_id: i32,
-    ) -> Result<(), GrantMutationError> {
-        // match self
-        //     .props
-        //     .actors
-        //     .evm
-        //     .ask(UseragentDeleteGrant { grant_id })
-        //     .await
-        // {
-        //     Ok(()) => Ok(()),
-        //     Err(err) => {
-        //         error!(?err, "EVM grant delete failed");
-        //         Err(GrantMutationError::Internal)
-        //     }
-        // }
-        let _ = grant_id;
-        todo!()
-    }
-
-    #[message]
-    pub(crate) async fn handle_sign_transaction(
-        &mut self,
-        client_id: i32,
-        wallet_address: Address,
-        transaction: TxEip1559,
-    ) -> Result<Signature, SignTransactionError> {
-        match self
-            .props
-            .actors
-            .evm
-            .ask(ClientSignTransaction {
-                client_id,
-                wallet_address,
-                transaction,
-            })
-            .await
-        {
-            Ok(signature) => Ok(signature),
-            Err(SendError::HandlerError(EvmSignError::Vet(vet_error))) => {
-                Err(SignTransactionError::Vet(vet_error))
-            }
-            Err(err) => {
-                error!(?err, "EVM sign transaction failed in user-agent session");
-                Err(SignTransactionError::Internal)
-            }
-        }
-    }
-
-    #[message]
-    pub(crate) async fn handle_grant_evm_wallet_access(
-        &mut self,
-        entries: Vec<NewEvmWalletAccess>,
-    ) -> Result<(), Error> {
-        let mut conn = self.props.db.get().await?;
-        conn.transaction(|conn| {
-            Box::pin(async move {
-                use crate::db::schema::evm_wallet_access;
-
-                for entry in entries {
-                    diesel::insert_into(evm_wallet_access::table)
-                        .values(&entry)
-                        .on_conflict_do_nothing()
-                        .execute(conn)
-                        .await?;
-                }
-
-                Result::<_, Error>::Ok(())
-            })
-        })
-        .await?;
-        Ok(())
-    }
-
-    #[message]
-    pub(crate) async fn handle_revoke_evm_wallet_access(
-        &mut self,
-        entries: Vec<i32>,
-    ) -> Result<(), Error> {
-        let mut conn = self.props.db.get().await?;
-        conn.transaction(|conn| {
-            Box::pin(async move {
-                use crate::db::schema::evm_wallet_access;
-                for entry in entries {
-                    diesel::delete(evm_wallet_access::table)
-                        .filter(evm_wallet_access::wallet_id.eq(entry))
-                        .execute(conn)
-                        .await?;
-                }
-
-                Result::<_, Error>::Ok(())
-            })
-        })
-        .await?;
-        Ok(())
-    }
-
-    #[message]
-    pub(crate) async fn handle_list_wallet_access(
-        &mut self,
-    ) -> Result<Vec<EvmWalletAccess>, Error> {
-        let mut conn = self.props.db.get().await?;
-        use crate::db::schema::evm_wallet_access;
-        let access_entries = evm_wallet_access::table
-            .select(EvmWalletAccess::as_select())
-            .load::<_>(&mut conn)
-            .await?;
-        Ok(access_entries)
-    }
-}
-
-#[messages]
-impl UserAgentSession {
-    #[message(ctx)]
-    pub(crate) async fn handle_new_client_approve(
-        &mut self,
-        approved: bool,
-        pubkey: authn::PublicKey,
-        ctx: &mut Context<Self, Result<(), Error>>,
-    ) -> Result<(), Error> {
-        let pending_approval = match self.pending_client_approvals.remove(&pubkey.to_bytes()) {
-            Some(approval) => approval,
-            None => {
-                error!("Received client connection response for unknown client");
-                return Err(Error::internal("Unknown client in connection response"));
-            }
-        };
-
-        pending_approval
-            .controller
-            .tell(ClientApprovalAnswer { approved })
-            .await
-            .map_err(|err| {
-                error!(
-                    ?err,
-                    "Failed to send client approval response to controller"
-                );
-                Error::internal("Failed to send client approval response to controller")
-            })?;
-
-        ctx.actor_ref().unlink(&pending_approval.controller).await;
-
-        Ok(())
-    }
-
-    #[message]
-    pub(crate) async fn handle_sdk_client_list(
-        &mut self,
-    ) -> Result<Vec<(ProgramClient, ProgramClientMetadata)>, Error> {
-        use crate::db::schema::{client_metadata, program_client};
-        let mut conn = self.props.db.get().await?;
-
-        let clients = program_client::table
-            .inner_join(client_metadata::table)
-            .select((
-                ProgramClient::as_select(),
-                ProgramClientMetadata::as_select(),
-            ))
-            .load::<(ProgramClient, ProgramClientMetadata)>(&mut conn)
-            .await?;
-
-        Ok(clients)
-    }
-}

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

@@ -1,294 +0,0 @@
-use super::Credentials;
-use crate::{
-    actors::{
-        GlobalActors,
-        vault::{self, Bootstrap, GetState, TryUnseal, VaultState, events},
-    },
-    crypto::integrity::{self},
-    db::DatabasePool,
-};
-use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
-use state::*;
-
-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;
-
-#[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: Credentials,
-    pub promotion_tx: Option<oneshot::Sender<Result<(), Error>>>,
-    pub state: State,
-    pub actors: GlobalActors,
-    pub db: DatabasePool,
-}
-
-impl VaultGate {
-    pub fn new(
-        auth_creds: Credentials,
-        actors: GlobalActors,
-        db: DatabasePool,
-        promotion_tx: oneshot::Sender<Result<(), 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"))
-            }
-        }
-    }
-
-    #[message]
-    pub async fn handle_vault_state(&mut self) -> Result<VaultState, Error> {
-        let answer = self
-            .actors
-            .vault
-            .ask(GetState {})
-            .await
-            .map_err(|_| Error::internal("failed to query vault"))?;
-
-        Ok(answer)
-    }
-}
-
-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.id,
-            )
-            .await
-            .map_err(|e| {
-                error!(?e, "Failed to sign integrity envelope on bootstrap");
-                Error::internal("Integrity sign failed")
-            })?;
-            Ok(())
-        }
-        .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 {
-        if let Some(tx) = self.promotion_tx.take() {
-            let _ = tx.send(Ok(()));
-        }
-        ctx.stop();
-    }
-}

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

@@ -1,11 +0,0 @@
-use x25519_dalek::{PublicKey, SharedSecret};
-
-#[derive(Default)]
-pub enum State {
-    #[default]
-    Idle,
-    ReadyForExchange {
-        server_key: PublicKey,
-        secret: SharedSecret,
-    },
-}

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

@@ -1,9 +1,7 @@
+use std::ops::{Deref, DerefMut};
+use std::{any::type_name, fmt};
+
 use memsafe::MemSafe;
-use std::{
-    any::type_name,
-    fmt,
-    ops::{Deref, DerefMut},
-};
 
 pub trait SafeCellHandle<T> {
     type CellRead<'a>: Deref<Target = T>
@@ -107,11 +105,6 @@ impl<T> SafeCellHandle<T> for MemSafeCell<T> {
 
 fn abort_memory_breach(action: &str, err: &memsafe::error::MemoryError) -> ! {
     eprintln!("fatal {action}: {err}");
-    // SAFETY: Intentionally cause a segmentation fault to prevent further execution in a compromised state.
-    unsafe {
-        let unsafe_pointer = std::ptr::null_mut::<u8>();
-        std::ptr::write_volatile(unsafe_pointer, 0);
-    }
     std::process::abort();
 }
 

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

@@ -1,22 +1,15 @@
-use super::common::ChannelTransport;
+use arbiter_proto::ClientMetadata;
-use arbiter_crypto::{
+use arbiter_proto::transport::{Receiver, Sender};
-    authn::{self, AuthChallenge, CLIENT_CONTEXT},
+use arbiter_server::actors::GlobalActors;
-    safecell::{SafeCell, SafeCellHandle as _},
-};
-use arbiter_proto::{
-    ClientMetadata,
-    transport::{Receiver, Sender},
-};
 use arbiter_server::{
-    actors::{GlobalActors, vault::Bootstrap},
+    actors::client::{ClientConnection, auth, connect_client},
-    crypto::integrity,
+    db,
-    db::{self, schema},
-    peers::client::{ClientConnection, ClientCredentials, auth, connect_client},
 };
-
 use diesel::{ExpressionMethods as _, NullableExpressionMethods as _, QueryDsl as _, insert_into};
 use diesel_async::RunQueryDsl;
-use ml_dsa::{KeyGen, MlDsa87, SigningKey, VerifyingKey, signature::Keypair as _};
+use ed25519_dalek::Signer as _;
+
+use super::common::ChannelTransport;
 
 fn metadata(name: &str, description: Option<&str>, version: Option<&str>) -> ClientMetadata {
     ClientMetadata {
@@ -28,8 +21,7 @@ fn metadata(name: &str, description: Option<&str>, version: Option<&str>) -> Cli
 
 async fn insert_registered_client(
     db: &db::DatabasePool,
-    actors: &GlobalActors,
+    pubkey: Vec<u8>,
-    pubkey: VerifyingKey<MlDsa87>,
     metadata: &ClientMetadata,
 ) {
     use arbiter_server::db::schema::{client_metadata, program_client};
@@ -45,82 +37,34 @@ async fn insert_registered_client(
         .get_result(&mut conn)
         .await
         .unwrap();
-    let client_id: i32 = insert_into(program_client::table)
+    insert_into(program_client::table)
         .values((
-            program_client::public_key.eq(pubkey.encode().to_vec()),
+            program_client::public_key.eq(pubkey),
             program_client::metadata_id.eq(metadata_id),
         ))
-        .returning(program_client::id)
-        .get_result(&mut conn)
-        .await
-        .unwrap();
-
-    integrity::sign_entity(
-        &mut conn,
-        &actors.vault,
-        &ClientCredentials {
-            pubkey: pubkey.into(),
-        },
-        client_id,
-    )
-    .await
-    .unwrap();
-}
-
-fn sign_client_challenge(key: &SigningKey<MlDsa87>, challenge: &AuthChallenge) -> authn::Signature {
-    let challenge = challenge.format();
-    key.signing_key()
-        .sign_deterministic(&challenge, CLIENT_CONTEXT)
-        .unwrap()
-        .into()
-}
-
-async fn insert_bootstrap_sentinel_useragent(db: &db::DatabasePool) {
-    let mut conn = db.get().await.unwrap();
-    let sentinel_key = MlDsa87::key_gen(&mut rand::rng())
-        .verifying_key()
-        .encode()
-        .to_vec();
-
-    insert_into(schema::useragent_client::table)
-        .values((schema::useragent_client::public_key.eq(sentinel_key),))
         .execute(&mut conn)
         .await
         .unwrap();
 }
 
-async fn spawn_test_actors(db: &db::DatabasePool) -> GlobalActors {
-    insert_bootstrap_sentinel_useragent(db).await;
-
-    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
-    actors
-        .vault
-        .ask(Bootstrap {
-            seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
-        })
-        .await
-        .unwrap();
-    actors
-}
-
 #[tokio::test]
 #[test_log::test]
-async fn test_unregistered_pubkey_rejected() {
+pub async fn test_unregistered_pubkey_rejected() {
     let db = db::create_test_pool().await;
 
     let (server_transport, mut test_transport) = ChannelTransport::new();
-    let actors = spawn_test_actors(&db).await;
+    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
     let props = ClientConnection::new(db.clone(), actors);
     let task = tokio::spawn(async move {
         let mut server_transport = server_transport;
         connect_client(props, &mut server_transport).await;
     });
 
-    let new_key = MlDsa87::key_gen(&mut rand::rng());
+    let new_key = ed25519_dalek::SigningKey::generate(&mut rand::rng());
 
     test_transport
         .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: new_key.verifying_key().into(),
+            pubkey: new_key.verifying_key(),
             metadata: metadata("client", Some("desc"), Some("1.0.0")),
         })
         .await
@@ -132,21 +76,22 @@ async fn test_unregistered_pubkey_rejected() {
 
 #[tokio::test]
 #[test_log::test]
-async fn test_challenge_auth() {
+pub async fn test_challenge_auth() {
     let db = db::create_test_pool().await;
-    let actors = spawn_test_actors(&db).await;
 
-    let new_key = MlDsa87::key_gen(&mut rand::rng());
+    let new_key = ed25519_dalek::SigningKey::generate(&mut rand::rng());
+    let pubkey_bytes = new_key.verifying_key().to_bytes().to_vec();
 
     insert_registered_client(
         &db,
-        &actors,
+        pubkey_bytes.clone(),
-        new_key.verifying_key(),
         &metadata("client", Some("desc"), Some("1.0.0")),
     )
     .await;
 
     let (server_transport, mut test_transport) = ChannelTransport::new();
+    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
+
     let props = ClientConnection::new(db.clone(), actors);
     let task = tokio::spawn(async move {
         let mut server_transport = server_transport;
@@ -156,7 +101,7 @@ async fn test_challenge_auth() {
     // Send challenge request
     test_transport
         .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: new_key.verifying_key().into(),
+            pubkey: new_key.verifying_key(),
             metadata: metadata("client", Some("desc"), Some("1.0.0")),
         })
         .await
@@ -169,14 +114,15 @@ async fn test_challenge_auth() {
         .expect("should receive challenge");
     let challenge = match response {
         Ok(resp) => match resp {
-            auth::Outbound::AuthChallenge { challenge } => challenge,
+            auth::Outbound::AuthChallenge { pubkey, nonce } => (pubkey, nonce),
             other => panic!("Expected AuthChallenge, got {other:?}"),
         },
         Err(err) => panic!("Expected Ok response, got Err({err:?})"),
     };
 
     // Sign the challenge and send solution
-    let signature = sign_client_challenge(&new_key, &challenge);
+    let formatted_challenge = arbiter_proto::format_challenge(challenge.1, challenge.0.as_bytes());
+    let signature = new_key.sign(&formatted_challenge);
 
     test_transport
         .send(auth::Inbound::AuthChallengeSolution { signature })
@@ -199,15 +145,36 @@ async fn test_challenge_auth() {
 
 #[tokio::test]
 #[test_log::test]
-async fn test_metadata_unchanged_does_not_append_history() {
+pub async fn test_metadata_unchanged_does_not_append_history() {
     let db = db::create_test_pool().await;
-    let actors = spawn_test_actors(&db).await;
+    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
-    let new_key = MlDsa87::key_gen(&mut rand::rng());
+    let props = ClientConnection::new(db.clone(), actors);
+
+    let new_key = ed25519_dalek::SigningKey::generate(&mut rand::rng());
     let requested = metadata("client", Some("desc"), Some("1.0.0"));
 
-    insert_registered_client(&db, &actors, new_key.verifying_key(), &requested).await;
+    {
-
+        use arbiter_server::db::schema::{client_metadata, program_client};
-    let props = ClientConnection::new(db.clone(), actors);
+        let mut conn = db.get().await.unwrap();
+        let metadata_id: i32 = insert_into(client_metadata::table)
+            .values((
+                client_metadata::name.eq(&requested.name),
+                client_metadata::description.eq(&requested.description),
+                client_metadata::version.eq(&requested.version),
+            ))
+            .returning(client_metadata::id)
+            .get_result(&mut conn)
+            .await
+            .unwrap();
+        insert_into(program_client::table)
+            .values((
+                program_client::public_key.eq(new_key.verifying_key().to_bytes().to_vec()),
+                program_client::metadata_id.eq(metadata_id),
+            ))
+            .execute(&mut conn)
+            .await
+            .unwrap();
+    }
 
     let (server_transport, mut test_transport) = ChannelTransport::new();
     let task = tokio::spawn(async move {
@@ -217,18 +184,18 @@ async fn test_metadata_unchanged_does_not_append_history() {
 
     test_transport
         .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: new_key.verifying_key().into(),
+            pubkey: new_key.verifying_key(),
             metadata: requested,
         })
         .await
         .unwrap();
 
     let response = test_transport.recv().await.unwrap().unwrap();
-    let challenge = match response {
+    let (pubkey, nonce) = match response {
-        auth::Outbound::AuthChallenge { challenge } => challenge,
+        auth::Outbound::AuthChallenge { pubkey, nonce } => (pubkey, nonce),
         other => panic!("Expected AuthChallenge, got {other:?}"),
     };
-    let signature = sign_client_challenge(&new_key, &challenge);
+    let signature = new_key.sign(&arbiter_proto::format_challenge(nonce, pubkey.as_bytes()));
     test_transport
         .send(auth::Inbound::AuthChallengeSolution { signature })
         .await
@@ -256,21 +223,36 @@ async fn test_metadata_unchanged_does_not_append_history() {
 
 #[tokio::test]
 #[test_log::test]
-async fn test_metadata_change_appends_history_and_repoints_binding() {
+pub async fn test_metadata_change_appends_history_and_repoints_binding() {
     let db = db::create_test_pool().await;
-    let actors = spawn_test_actors(&db).await;
+    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
-    let new_key = MlDsa87::key_gen(&mut rand::rng());
-
-    insert_registered_client(
-        &db,
-        &actors,
-        new_key.verifying_key(),
-        &metadata("client", Some("old"), Some("1.0.0")),
-    )
-    .await;
-
     let props = ClientConnection::new(db.clone(), actors);
 
+    let new_key = ed25519_dalek::SigningKey::generate(&mut rand::rng());
+
+    {
+        use arbiter_server::db::schema::{client_metadata, program_client};
+        let mut conn = db.get().await.unwrap();
+        let metadata_id: i32 = insert_into(client_metadata::table)
+            .values((
+                client_metadata::name.eq("client"),
+                client_metadata::description.eq(Some("old")),
+                client_metadata::version.eq(Some("1.0.0")),
+            ))
+            .returning(client_metadata::id)
+            .get_result(&mut conn)
+            .await
+            .unwrap();
+        insert_into(program_client::table)
+            .values((
+                program_client::public_key.eq(new_key.verifying_key().to_bytes().to_vec()),
+                program_client::metadata_id.eq(metadata_id),
+            ))
+            .execute(&mut conn)
+            .await
+            .unwrap();
+    }
+
     let (server_transport, mut test_transport) = ChannelTransport::new();
     let task = tokio::spawn(async move {
         let mut server_transport = server_transport;
@@ -279,18 +261,18 @@ async fn test_metadata_change_appends_history_and_repoints_binding() {
 
     test_transport
         .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: new_key.verifying_key().into(),
+            pubkey: new_key.verifying_key(),
             metadata: metadata("client", Some("new"), Some("2.0.0")),
         })
         .await
         .unwrap();
 
     let response = test_transport.recv().await.unwrap().unwrap();
-    let challenge = match response {
+    let (pubkey, nonce) = match response {
-        auth::Outbound::AuthChallenge { challenge } => challenge,
+        auth::Outbound::AuthChallenge { pubkey, nonce } => (pubkey, nonce),
         other => panic!("Expected AuthChallenge, got {other:?}"),
     };
-    let signature = sign_client_challenge(&new_key, &challenge);
+    let signature = new_key.sign(&arbiter_proto::format_challenge(nonce, pubkey.as_bytes()));
     test_transport
         .send(auth::Inbound::AuthChallengeSolution { signature })
         .await
@@ -340,59 +322,3 @@ async fn test_metadata_change_appends_history_and_repoints_binding() {
         );
     }
 }
-
-#[tokio::test]
-#[test_log::test]
-async fn test_challenge_auth_rejects_integrity_tag_mismatch() {
-    let db = db::create_test_pool().await;
-    let actors = spawn_test_actors(&db).await;
-
-    let new_key = MlDsa87::key_gen(&mut rand::rng());
-    let requested = metadata("client", Some("desc"), Some("1.0.0"));
-
-    {
-        use arbiter_server::db::schema::{client_metadata, program_client};
-        let mut conn = db.get().await.unwrap();
-        let metadata_id: i32 = insert_into(client_metadata::table)
-            .values((
-                client_metadata::name.eq(&requested.name),
-                client_metadata::description.eq(&requested.description),
-                client_metadata::version.eq(&requested.version),
-            ))
-            .returning(client_metadata::id)
-            .get_result(&mut conn)
-            .await
-            .unwrap();
-        insert_into(program_client::table)
-            .values((
-                program_client::public_key.eq(new_key.verifying_key().encode().to_vec()),
-                program_client::metadata_id.eq(metadata_id),
-            ))
-            .execute(&mut conn)
-            .await
-            .unwrap();
-    }
-
-    let (server_transport, mut test_transport) = ChannelTransport::new();
-    let props = ClientConnection::new(db.clone(), actors);
-    let task = tokio::spawn(async move {
-        let mut server_transport = server_transport;
-        connect_client(props, &mut server_transport).await;
-    });
-
-    test_transport
-        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: new_key.verifying_key().into(),
-            metadata: requested,
-        })
-        .await
-        .unwrap();
-
-    let response = test_transport
-        .recv()
-        .await
-        .expect("should receive auth rejection");
-    assert!(matches!(response, Err(auth::Error::IntegrityCheckFailed)));
-
-    task.await.unwrap();
-}

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

@@ -1,20 +1,17 @@
-use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_proto::transport::{Bi, Error, Receiver, Sender};
 use arbiter_server::{
-    actors::{GlobalActors, vault::Vault},
+    actors::keyholder::KeyHolder,
     db::{self, schema},
+    safe_cell::{SafeCell, SafeCellHandle as _},
 };
-
 use async_trait::async_trait;
 use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;
 use tokio::sync::mpsc;
 
 #[allow(dead_code)]
-pub(crate) async fn bootstrapped_vault(db: &db::DatabasePool) -> Vault {
+pub async fn bootstrapped_keyholder(db: &db::DatabasePool) -> KeyHolder {
-    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
-        .await
-        .unwrap();
     actor
         .bootstrap(SafeCell::new(b"test-seal-key".to_vec()))
         .await
@@ -23,7 +20,7 @@ pub(crate) async fn bootstrapped_vault(db: &db::DatabasePool) -> Vault {
 }
 
 #[allow(dead_code)]
-pub(crate) async fn root_key_history_id(db: &db::DatabasePool) -> i32 {
+pub async fn root_key_history_id(db: &db::DatabasePool) -> i32 {
     let mut conn = db.get().await.unwrap();
     let id = schema::arbiter_settings::table
         .select(schema::arbiter_settings::root_key_id)
@@ -34,14 +31,14 @@ pub(crate) async fn root_key_history_id(db: &db::DatabasePool) -> i32 {
 }
 
 #[allow(dead_code)]
-pub(crate) struct ChannelTransport<T, Y> {
+pub struct ChannelTransport<T, Y> {
     receiver: mpsc::Receiver<T>,
     sender: mpsc::Sender<Y>,
 }
 
 impl<T, Y> ChannelTransport<T, Y> {
     #[allow(dead_code)]
-    pub(crate) fn new() -> (Self, ChannelTransport<Y, T>) {
+    pub fn new() -> (Self, ChannelTransport<Y, T>) {
         let (tx1, rx1) = mpsc::channel(10);
         let (tx2, rx2) = mpsc::channel(10);
         (

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

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