WIP: kameo::messages wiring for transport generalization

feat(user-agent): add VaultGate for sealed vault authentication
fix(server::integrity): vault now differentias between expected/unexpected states for commands more granularly
2026-04-14 15:31:20 +02:00 · 2026-04-12 11:53:05 +02:00 · 2026-04-08 18:21:48 +02:00 · 2026-04-08 17:43:51 +02:00 · 2026-04-08 17:40:45 +02:00 · 2026-04-08 12:34:16 +02:00
196 changed files with 14063 additions and 3123 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -66,7 +66,7 @@ cargo insta review
 The server is actor-based using the **kameo** crate. All long-lived state lives in `GlobalActors`:

 - **`Bootstrapper`** — Manages the one-time bootstrap token written to `~/.arbiter/bootstrap_token` on first run.
- **`KeyHolder`** — Holds the encrypted root key and manages the Sealed/Unsealed vault state machine. On unseal, decrypts the root key into a `memsafe` hardened memory cell.
+- **`Vault`** — Holds the encrypted root key and manages the Sealed/Unsealed vault state machine. On unseal, decrypts the root key into a `memsafe` hardened memory cell.
 - **`FlowCoordinator`** — Coordinates cross-connection flow between user agents and SDK clients.
 - **`EvmActor`** — Handles EVM transaction policy enforcement and signing.

@@ -100,27 +100,6 @@ diesel migration generate <name> --migration-dir crates/arbiter-server/migration
 diesel migration run --migration-dir crates/arbiter-server/migrations
 ```

-### Code Conventions
-
-**`#[must_use]` Attribute:**
-Apply the `#[must_use]` attribute to return types of functions where the return value is critical and should not be accidentally ignored. This is commonly used for:
-
- Methods that return `bool` indicating success/failure or validation state
- Any function where ignoring the return value indicates a logic error
-
-Do not apply `#[must_use]` redundantly to items (types or functions) that are already annotated with `#[must_use]`.
-
-Example:
-
-```rust
-#[must_use]
-pub fn verify(&self, nonce: i32, context: &[u8], signature: &Signature) -> bool {
-    // verification logic
-}
-```
-
-This forces callers to either use the return value or explicitly ignore it with `let _ = ...;`, preventing silent failures.
-
 ## User Agent (Flutter + Rinf at `useragent/`)

 The Flutter app uses [Rinf](https://rinf.cunarist.org) to call Rust code. The Rust logic lives in `useragent/native/hub/` as a separate crate that uses `arbiter-useragent` for the gRPC client.
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -66,7 +66,7 @@ cargo insta review
 The server is actor-based using the **kameo** crate. All long-lived state lives in `GlobalActors`:

 - **`Bootstrapper`** — Manages the one-time bootstrap token written to `~/.arbiter/bootstrap_token` on first run.
- **`KeyHolder`** — Holds the encrypted root key and manages the Sealed/Unsealed vault state machine. On unseal, decrypts the root key into a `memsafe` hardened memory cell.
+- **`Vault`** — Holds the encrypted root key and manages the Sealed/Unsealed vault state machine. On unseal, decrypts the root key into a `memsafe` hardened memory cell.
 - **`FlowCoordinator`** — Coordinates cross-connection flow between user agents and SDK clients.
 - **`EvmActor`** — Handles EVM transaction policy enforcement and signing.

@@ -100,27 +100,6 @@ diesel migration generate <name> --migration-dir crates/arbiter-server/migration
 diesel migration run --migration-dir crates/arbiter-server/migrations
 ```

-### Code Conventions
-
-**`#[must_use]` Attribute:**
-Apply the `#[must_use]` attribute to return types of functions where the return value is critical and should not be accidentally ignored. This is commonly used for:
-
- Methods that return `bool` indicating success/failure or validation state
- Any function where ignoring the return value indicates a logic error
-
-Do not apply `#[must_use]` redundantly to items (types or functions) that are already annotated with `#[must_use]`.
-
-Example:
-
-```rust
-#[must_use]
-pub fn verify(&self, nonce: i32, context: &[u8], signature: &Signature) -> bool {
-    // verification logic
-}
-```
-
-This forces callers to either use the return value or explicitly ignore it with `let _ = ...;`, preventing silent failures.
-
 ## User Agent (Flutter + Rinf at `useragent/`)

 The Flutter app uses [Rinf](https://rinf.cunarist.org) to call Rust code. The Rust logic lives in `useragent/native/hub/` as a separate crate that uses `arbiter-useragent` for the gRPC client.
--- a/mise.lock
+++ b/mise.lock
@@ -72,6 +72,10 @@ backend = "cargo:diesel_cli"
 default-features = "false"
 features = "sqlite,sqlite-bundled"

+[[tools."cargo:flutter_rust_bridge_codegen"]]
+version = "2.12.0"
+backend = "cargo:flutter_rust_bridge_codegen"
+
 [[tools.flutter]]
 version = "3.38.9-stable"
 backend = "asdf:flutter"
--- a/mise.toml
+++ b/mise.toml
@@ -13,6 +13,7 @@ python = "3.14.3"
 ast-grep = "0.42.0"
 "cargo:cargo-edit" = "0.13.9"
 "cargo:cargo-mutants" = "27.0.0"
+"cargo:flutter_rust_bridge_codegen" = "2.12.0"

 [tasks.codegen]
 sources = ['protobufs/*.proto', 'protobufs/**/*.proto']
--- a/protobufs/user_agent/auth.proto
+++ b/protobufs/user_agent/auth.proto
@@ -2,17 +2,9 @@ syntax = "proto3";

 package arbiter.user_agent.auth;

-enum KeyType {
-  KEY_TYPE_UNSPECIFIED = 0;
-  KEY_TYPE_ED25519 = 1;
-  KEY_TYPE_ECDSA_SECP256K1 = 2;
-  KEY_TYPE_RSA = 3;
-}
-
 message AuthChallengeRequest {
  bytes pubkey = 1;
  optional string bootstrap_token = 2;
-  KeyType key_type = 3;
 }

 message AuthChallenge {
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -67,9 +67,9 @@ dependencies = [

 [[package]]
 name = "alloy-chains"
-version = "0.2.33"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4e9e31d834fe25fe991b8884e4b9f0e59db4a97d86e05d1464d6899c013cd62"
+checksum = "84e0378e959aa6a885897522080a990e80eb317f1e9a222a604492ea50e13096"
 dependencies = [
 "alloy-primitives",
 "num_enum",
@@ -336,13 +336,13 @@ dependencies = [
 "derive_more",
 "foldhash 0.2.0",
 "hashbrown 0.16.1",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "itoa",
 "k256",
 "keccak-asm",
 "paste",
 "proptest",
- "rand 0.9.2",
+ "rand 0.9.4",
 "rapidhash",
 "ruint",
 "rustc-hash",
@@ -544,7 +544,7 @@ dependencies = [
 "alloy-sol-macro-input",
 "const-hex",
 "heck",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "proc-macro-error2",
 "proc-macro2",
 "quote",
@@ -684,7 +684,7 @@ dependencies = [
 "arbiter-proto",
 "async-trait",
 "http",
- "rand 0.10.0",
+ "rand 0.10.1",
 "rustls-webpki",
 "thiserror 2.0.18",
 "tokio",
@@ -696,23 +696,11 @@ dependencies = [
 name = "arbiter-crypto"
 version = "0.1.0"
 dependencies = [
- "alloy",
 "base64",
- "chrono",
- "hmac",
 "memsafe",
 "ml-dsa",
- "rand 0.10.0",
-]
-
-[[package]]
-name = "arbiter-macros"
-version = "0.1.0"
-dependencies = [
- "arbiter-crypto",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "rand 0.10.1",
+ "x-wing",
 ]

 [[package]]
@@ -728,7 +716,7 @@ dependencies = [
 "prost",
 "prost-types",
 "protoc-bin-vendored",
- "rand 0.10.0",
+ "rand 0.10.1",
 "rcgen",
 "rstest",
 "rustls-pki-types",
@@ -749,7 +737,6 @@ dependencies = [
 "alloy",
 "anyhow",
 "arbiter-crypto",
- "arbiter-macros",
 "arbiter-proto",
 "arbiter-tokens-registry",
 "argon2",
@@ -767,13 +754,14 @@ dependencies = [
 "insta",
 "k256",
 "kameo",
+ "kameo_actors",
 "ml-dsa",
 "mutants",
 "pem",
 "proptest",
 "prost",
 "prost-types",
- "rand 0.10.0",
+ "rand 0.10.1",
 "rcgen",
 "restructed",
 "rstest",
@@ -792,7 +780,7 @@ dependencies = [
 "tonic",
 "tracing",
 "tracing-subscriber",
- "x25519-dalek",
+ "x25519-dalek 2.0.1",
 "zeroize",
 ]

@@ -1131,9 +1119,9 @@ dependencies = [

 [[package]]
 name = "axum"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
+checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
 dependencies = [
 "axum-core",
 "bytes",
@@ -1382,9 +1370,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.59"
+version = "1.2.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
 "find-msvc-tools",
 "jobserver",
@@ -1429,7 +1417,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
 dependencies = [
 "cfg-if",
 "cpufeatures 0.3.0",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 ]

 [[package]]
@@ -1659,6 +1647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
 dependencies = [
 "hybrid-array",
+ "rand_core 0.10.1",
 ]

 [[package]]
@@ -2051,7 +2040,7 @@ checksum = "053618a4c3d3bc24f188aa660ae75a46eeab74ef07fb415c61431e5e7cd4749b"
 dependencies = [
 "curve25519-dalek 5.0.0-pre.6",
 "ed25519",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 "sha2 0.11.0",
 "subtle",
 "zeroize",
@@ -2200,7 +2189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb42427514b063d97ce21d5199f36c0c307d981434a6be32582bc79fe5bd2303"
 dependencies = [
 "expander",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "proc-macro-crate",
 "proc-macro2",
 "quote",
@@ -2468,7 +2457,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "r-efi 6.0.0",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 "wasip2",
 "wasip3",
 ]
@@ -2508,7 +2497,7 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "http",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "slab",
 "tokio",
 "tokio-util",
@@ -2549,6 +2538,12 @@ dependencies = [
 "serde_core",
 ]

+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -2636,6 +2631,7 @@ version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214"
 dependencies = [
+ "ctutils",
 "typenum",
 "zeroize",
 ]
@@ -2664,15 +2660,14 @@ dependencies = [

 [[package]]
 name = "hyper-rustls"
-version = "0.27.7"
+version = "0.27.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+checksum = "c2b52f86d1d4bc0d6b4e6826d960b1b333217e07d36b882dca570a5e1c48895b"
 dependencies = [
 "http",
 "hyper",
 "hyper-util",
 "rustls",
- "rustls-pki-types",
 "tokio",
 "tokio-rustls",
 "tower-service",
@@ -2886,12 +2881,12 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.13.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
 "serde",
 "serde_core",
 ]
@@ -3028,9 +3023,9 @@ dependencies = [

 [[package]]
 name = "js-sys"
-version = "0.3.94"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
 dependencies = [
 "cfg-if",
 "futures-util",
@@ -3056,7 +3051,7 @@ dependencies = [
 [[package]]
 name = "kameo"
 version = "0.20.0"
-source = "git+https://github.com/tqwewe/kameo#49a18fbbd62cff35ecf856b6a97a21939efb82b5"
+source = "git+https://github.com/hdbg/kameo.git?rev=805b417#805b41783fe90b54827ecad142b422c7a9b69b9a"
 dependencies = [
 "downcast-rs",
 "dyn-clone",
@@ -3067,11 +3062,24 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "kameo_actors"
+version = "0.5.0"
+source = "git+https://github.com/hdbg/kameo.git?rev=805b417#805b41783fe90b54827ecad142b422c7a9b69b9a"
+dependencies = [
+ "futures",
+ "glob",
+ "kameo",
+ "thiserror 2.0.18",
+ "tokio",
+]
+
 [[package]]
 name = "kameo_macros"
 version = "0.20.0"
-source = "git+https://github.com/tqwewe/kameo#49a18fbbd62cff35ecf856b6a97a21939efb82b5"
+source = "git+https://github.com/hdbg/kameo.git?rev=805b417#805b41783fe90b54827ecad142b422c7a9b69b9a"
 dependencies = [
+ "darling 0.23.0",
 "heck",
 "proc-macro2",
 "quote",
@@ -3107,6 +3115,16 @@ dependencies = [
 "sha3-asm",
 ]

+[[package]]
+name = "kem"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01737161ba802849cfd486b5bd209d38ba4943494c249a8126005170c7621edd"
+dependencies = [
+ "crypto-common 0.2.1",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -3121,9 +3139,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"

 [[package]]
 name = "libc"
-version = "0.2.184"
+version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"

 [[package]]
 name = "libm"
@@ -3170,9 +3188,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "lru"
-version = "0.16.3"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"
 dependencies = [
 "hashbrown 0.16.1",
 ]
@@ -3321,18 +3339,33 @@ dependencies = [
 "hybrid-array",
 "module-lattice",
 "pkcs8 0.11.0-rc.11",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 "sha3 0.11.0",
 "signature 3.0.0-rc.10",
 "zeroize",
 ]

+[[package]]
+name = "ml-kem"
+version = "0.3.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04437cb1a66c0b78740927b76cc61f218344b9f6ef3dd430e283274a718ef0e9"
+dependencies = [
+ "hybrid-array",
+ "kem",
+ "module-lattice",
+ "rand_core 0.10.1",
+ "sha3 0.11.0",
+ "zeroize",
+]
+
 [[package]]
 name = "module-lattice"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "164eb3faeaecbd14b0b2a917c1b4d0c035097a9c559b0bed85c2cdd032bc8faa"
 dependencies = [
+ "ctutils",
 "hybrid-array",
 "num-traits",
 "zeroize",
@@ -3593,7 +3626,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 dependencies = [
 "fixedbitset",
 "hashbrown 0.15.5",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 ]

 [[package]]
@@ -3650,9 +3683,9 @@ dependencies = [

 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"

 [[package]]
 name = "poly1305"
@@ -3790,7 +3823,7 @@ dependencies = [
 "bit-vec",
 "bitflags",
 "num-traits",
- "rand 0.9.2",
+ "rand 0.9.4",
 "rand_chacha 0.9.0",
 "rand_xorshift",
 "regex-syntax",
@@ -3973,7 +4006,7 @@ dependencies = [
 "bytes",
 "getrandom 0.3.4",
 "lru-slab",
- "rand 0.9.2",
+ "rand 0.9.4",
 "ring",
 "rustc-hash",
 "rustls",
@@ -4040,9 +4073,9 @@ dependencies = [

 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
 "rand_chacha 0.9.0",
 "rand_core 0.9.5",
@@ -4051,13 +4084,13 @@ dependencies = [

 [[package]]
 name = "rand"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
 "chacha20 0.10.0",
 "getrandom 0.4.2",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 ]

 [[package]]
@@ -4101,9 +4134,9 @@ dependencies = [

 [[package]]
 name = "rand_core"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"

 [[package]]
 name = "rand_xorshift"
@@ -4344,7 +4377,7 @@ dependencies = [
 "primitive-types",
 "proptest",
 "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.9.4",
 "rlp",
 "ruint-macro",
 "serde_core",
@@ -4418,9 +4451,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.37"
+version = "0.23.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4"
+checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21"
 dependencies = [
 "aws-lc-rs",
 "log",
@@ -4482,9 +4515,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"

 [[package]]
 name = "rustls-webpki"
-version = "0.103.10"
+version = "0.103.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef"
+checksum = "20a6af516fea4b20eccceaf166e8aa666ac996208e8a644ce3ef5aa783bc7cd4"
 dependencies = [
 "aws-lc-rs",
 "ring",
@@ -4721,7 +4754,7 @@ dependencies = [
 "chrono",
 "hex",
 "indexmap 1.9.3",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "schemars 0.9.0",
 "schemars 1.2.1",
 "serde_core",
@@ -4846,7 +4879,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f1880df446116126965eeec169136b2e0251dba37c6223bcc819569550edea3"
 dependencies = [
 "digest 0.11.2",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 ]

 [[package]]
@@ -5361,7 +5394,7 @@ version = "0.25.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
 dependencies = [
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "toml_datetime 1.1.1+spec-1.1.0",
 "toml_parser",
 "winnow 1.0.1",
@@ -5455,7 +5488,7 @@ checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
 "futures-core",
 "futures-util",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "pin-project-lite",
 "slab",
 "sync_wrapper",
@@ -5758,9 +5791,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -5771,9 +5804,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.67"
+version = "0.4.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
+checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -5781,9 +5814,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -5791,9 +5824,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
 dependencies = [
 "bumpalo",
 "proc-macro2",
@@ -5804,9 +5837,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
 dependencies = [
 "unicode-ident",
 ]
@@ -5828,7 +5861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
 "anyhow",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "wasm-encoder",
 "wasmparser",
 ]
@@ -5841,7 +5874,7 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
 "bitflags",
 "hashbrown 0.15.5",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "semver 1.0.28",
 ]

@@ -5861,9 +5894,9 @@ dependencies = [

 [[package]]
 name = "web-sys"
-version = "0.3.94"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
+checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -6246,7 +6279,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
 "anyhow",
 "heck",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "prettyplease",
 "syn 2.0.117",
 "wasm-metadata",
@@ -6277,7 +6310,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
 "anyhow",
 "bitflags",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "log",
 "serde",
 "serde_derive",
@@ -6296,7 +6329,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
 "anyhow",
 "id-arena",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
 "log",
 "semver 1.0.28",
 "serde",
@@ -6321,6 +6354,20 @@ dependencies = [
 "tap",
 ]

+[[package]]
+name = "x-wing"
+version = "0.1.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17d0d5f4d1f26b9b9e7477af1d3bef960e1d1fb64edab7912fde472a8a8432e"
+dependencies = [
+ "kem",
+ "ml-kem",
+ "rand_core 0.10.1",
+ "sha3 0.11.0",
+ "x25519-dalek 3.0.0-pre.6",
+ "zeroize",
+]
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -6333,6 +6380,17 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "x25519-dalek"
+version = "3.0.0-pre.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d5d6ff67acd3945b933e592bfa7143db4fcbb2f871754b6b9fbd7847fc5aea"
+dependencies = [
+ "curve25519-dalek 5.0.0-pre.6",
+ "rand_core 0.10.1",
+ "zeroize",
+]
+
 [[package]]
 name = "x509-parser"
 version = "0.18.1"
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -4,169 +4,48 @@ members = [
 ]
 resolver = "3"

+[workspace.lints.clippy]
+disallowed-methods = "deny"
+

 [workspace.dependencies]
-alloy = "1.7.3"
-async-trait = "0.1.89"
-base64 = "0.22.1"
-chrono = { version = "0.4.44", features = ["serde"] }
-ed25519-dalek = { version = "3.0.0-pre.6", features = ["rand_core"] }
-futures = "0.3.32"
-hmac = "0.12.1"
-k256 = { version = "0.13.4", features = ["ecdsa", "pkcs8"] }
-kameo = { version = "0.20.0", git = "https://github.com/tqwewe/kameo" } # hold this until new patch version is released
-miette = { version = "7.6.0", features = ["fancy", "serde"] }
-ml-dsa = { version = "0.1.0-rc.8", features = ["zeroize"] }
-mutants = "0.0.4"
-prost = "0.14.3"
-prost-types = { version = "0.14.3", features = ["chrono"] }
-rand = "0.10.0"
-rcgen = { version = "0.14.7", features = [ "aws_lc_rs",  "pem", "x509-parser", "zeroize" ], default-features = false }
-rsa = { version = "0.9", features = ["sha2"] }
-rstest = "0.26.1"
-rustls = { version = "0.23.37", features = ["aws-lc-rs", "logging", "prefer-post-quantum", "std"], default-features = false }
-rustls-pki-types = "1.14.0"
-sha2 = "0.10"
-smlang = "0.8.0"
-spki = "0.7"
-thiserror = "2.0.18"
-tokio = { version = "1.50.0", features = ["full"] }
-tokio-stream = { version = "0.1.18", features = ["full"] }
-tonic = { version = "0.14.5", features = [ "deflate", "gzip", "tls-connect-info", "zstd" ] }
+tonic = { version = "0.14.5", features = [
+    "deflate",
+    "gzip",
+    "tls-connect-info",
+    "zstd",
+] }
 tracing = "0.1.44"
+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.0"
+rustls = { version = "0.23.37", features = ["aws-lc-rs", "logging", "prefer-post-quantum", "std"], default-features = false }
+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"] }
+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 = "1.7.3"
+rcgen = { version = "0.14.7", features = [
+    "aws_lc_rs",
+    "pem",
+    "x509-parser",
+    "zeroize",
+], default-features = false }
+k256 = { version = "0.13.4", features = ["ecdsa", "pkcs8"] }
+rsa = { version = "0.9", features = ["sha2"] }
+sha2 = "0.10"
+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"}

-[workspace.lints.rust]
-missing_unsafe_on_extern = "deny"
-unsafe_attr_outside_unsafe = "deny"
-unsafe_op_in_unsafe_fn = "deny"
-unstable_features = "deny"
-
-deprecated_safe_2024 = "warn"
-ffi_unwind_calls = "warn"
-linker_messages = "warn"
-
-elided_lifetimes_in_paths = "warn"
-explicit_outlives_requirements = "warn"
-impl-trait-overcaptures = "warn"
-impl-trait-redundant-captures = "warn"
-redundant_lifetimes = "warn"
-single_use_lifetimes = "warn"
-unused_lifetimes = "warn"
-
-macro_use_extern_crate = "warn"
-redundant_imports = "warn"
-unused_import_braces = "warn"
-unused_macro_rules = "warn"
-unused_qualifications = "warn"
-
-unit_bindings = "warn"
-
-# missing_docs = "warn" # ENABLE BY THE FIRST MAJOR VERSION!!
-unnameable_types = "warn"
-variant_size_differences = "warn"
-
-[workspace.lints.clippy]
-derive_partial_eq_without_eq = "allow" 
-future_not_send = "allow"
-inconsistent_struct_constructor = "allow"
-inline_always = "allow"
-missing_errors_doc = "allow"
-missing_fields_in_debug = "allow"
-missing_panics_doc = "allow"
-must_use_candidate = "allow"
-needless_pass_by_ref_mut = "allow"
-pub_underscore_fields = "allow"
-redundant_pub_crate = "allow" 
-uninhabited_references = "allow" # safe with unsafe_code = "forbid" and standard uninhabited pattern (match *self {})
-
-# restriction lints
-alloc_instead_of_core = "warn"
-allow_attributes_without_reason = "warn"
-as_conversions = "warn"
-assertions_on_result_states = "warn"
-cfg_not_test = "warn"
-clone_on_ref_ptr = "warn"
-cognitive_complexity = "warn"
-create_dir = "warn"
-dbg_macro = "warn"
-decimal_literal_representation = "warn"
-default_union_representation = "warn"
-deref_by_slicing = "warn"
-disallowed_script_idents = "warn"
-doc_include_without_cfg = "warn"
-empty_drop = "warn"
-empty_enum_variants_with_brackets = "warn"
-empty_structs_with_brackets = "warn"
-error_impl_error = "warn"
-exit = "warn"
-filetype_is_file = "warn"
-float_arithmetic = "warn"
-float_cmp_const = "warn"
-fn_to_numeric_cast_any = "warn"
-get_unwrap = "warn"
-if_then_some_else_none = "warn"
-indexing_slicing = "warn"
-infinite_loop = "warn"
-inline_asm_x86_att_syntax = "warn"
-inline_asm_x86_intel_syntax = "warn"
-integer_division = "warn"
-large_include_file = "warn"
-lossy_float_literal = "warn"
-map_with_unused_argument_over_ranges = "warn"
-mem_forget = "warn"
-missing_assert_message = "warn"
-mixed_read_write_in_expression = "warn"
-modulo_arithmetic = "warn"
-multiple_unsafe_ops_per_block = "warn"
-mutex_atomic = "warn"
-mutex_integer = "warn"
-needless_raw_strings = "warn"
-non_ascii_literal = "warn"
-non_zero_suggestions = "warn"
-pathbuf_init_then_push = "warn"
-pointer_format = "warn"
-precedence_bits = "warn"
-pub_without_shorthand = "warn"
-rc_buffer = "warn"
-rc_mutex = "warn"
-redundant_test_prefix = "warn"
-redundant_type_annotations = "warn"
-ref_patterns = "warn"
-renamed_function_params = "warn"
-rest_pat_in_fully_bound_structs = "warn"
-return_and_then = "warn"
-semicolon_inside_block = "warn"
-str_to_string = "warn"
-string_add = "warn"
-string_lit_chars_any = "warn"
-string_slice = "warn"
-suspicious_xor_used_as_pow = "warn"
-try_err = "warn"
-undocumented_unsafe_blocks = "warn"
-uninlined_format_args = "warn"
-unnecessary_safety_comment = "warn"
-unnecessary_safety_doc = "warn"
-unnecessary_self_imports = "warn"
-unneeded_field_pattern = "warn"
-unused_result_ok = "warn"
-verbose_file_reads = "warn"
-
-# cargo lints
-negative_feature_names = "warn"
-redundant_feature_names = "warn"
-wildcard_dependencies = "warn"
-
-# ENABLE BY THE FIRST MAJOR VERSION!!
-# todo = "warn"
-# unimplemented = "warn"
-# panic = "warn"
-# panic_in_result_fn = "warn"
-# 
-# cargo_common_metadata = "warn"
-# multiple_crate_versions = "warn" # a controversial option since it's really difficult to maintain
-
-disallowed_methods = "deny"
-
-nursery = { level = "warn", priority = -1 }
-pedantic = { level = "warn", priority = -1 }
--- a/server/clippy.toml
+++ b/server/clippy.toml
@@ -7,22 +7,3 @@ disallowed-methods = [
    { path = "rsa::traits::Decryptor::decrypt", reason = "RSA decryption is forbidden (RUSTSEC-2023-0071 Marvin Attack). This blocks decrypt() on rsa::{pkcs1v15,oaep}::DecryptingKey." },
    { path = "rsa::traits::RandomizedDecryptor::decrypt_with_rng", reason = "RSA decryption is forbidden (RUSTSEC-2023-0071 Marvin Attack). This blocks decrypt_with_rng() on rsa::{pkcs1v15,oaep}::DecryptingKey." },
 ]
-
-allow-indexing-slicing-in-tests = true
-allow-panic-in-tests = true
-check-inconsistent-struct-field-initializers = true
-suppress-restriction-lint-in-const = true
-allow-renamed-params-for = [
-    "core::convert::From",
-    "core::convert::TryFrom",
-    "core::str::FromStr",
-    "kameo::actor::Actor",
-]
-
-module-items-ordered-within-groupings = ["UPPER_SNAKE_CASE"]
-source-item-ordering = ["enum"]
-trait-assoc-item-kinds-order = [
-    "const",
-    "type",
-    "fn",
-] # community tested standard
--- a/server/crates/arbiter-client/src/auth.rs
+++ b/server/crates/arbiter-client/src/auth.rs
@@ -23,20 +23,20 @@ use crate::{

 #[derive(Debug, thiserror::Error)]
 pub enum AuthError {
-    #[error("Client approval denied by User Agent")]
-    ApprovalDenied,
-
    #[error("Auth challenge was not returned by server")]
    MissingAuthChallenge,

+    #[error("Client approval denied by User Agent")]
+    ApprovalDenied,
+
    #[error("No User Agents online to approve client")]
    NoUserAgentsOnline,

-    #[error("Signing key storage error")]
-    Storage(#[from] StorageError),
-
    #[error("Unexpected auth response payload")]
    UnexpectedAuthResponse,
+
+    #[error("Signing key storage error")]
+    Storage(#[from] StorageError),
 }

 fn map_auth_result(code: i32) -> AuthError {
@@ -55,7 +55,7 @@ async fn send_auth_challenge_request(
    transport: &mut ClientTransport,
    metadata: ClientMetadata,
    key: &SigningKey,
-) -> Result<(), AuthError> {
+) -> std::result::Result<(), AuthError> {
    transport
        .send(ClientRequest {
            request_id: next_request_id(),
@@ -76,7 +76,7 @@ async fn send_auth_challenge_request(

 async fn receive_auth_challenge(
    transport: &mut ClientTransport,
-) -> Result<AuthChallenge, AuthError> {
+) -> std::result::Result<AuthChallenge, AuthError> {
    let response = transport
        .recv()
        .await
@@ -97,7 +97,7 @@ async fn send_auth_challenge_solution(
    transport: &mut ClientTransport,
    key: &SigningKey,
    challenge: AuthChallenge,
-) -> Result<(), AuthError> {
+) -> std::result::Result<(), AuthError> {
    let challenge_payload = format_challenge(challenge.nonce, &challenge.pubkey);
    let signature = key
        .sign_message(&challenge_payload, CLIENT_CONTEXT)
@@ -117,7 +117,9 @@ async fn send_auth_challenge_solution(
        .map_err(|_| AuthError::UnexpectedAuthResponse)
 }

-async fn receive_auth_confirmation(transport: &mut ClientTransport) -> Result<(), AuthError> {
+async fn receive_auth_confirmation(
+    transport: &mut ClientTransport,
+) -> std::result::Result<(), AuthError> {
    let response = transport
        .recv()
        .await
@@ -138,11 +140,11 @@ async fn receive_auth_confirmation(transport: &mut ClientTransport) -> Result<()
    }
 }

-pub async fn authenticate(
+pub(crate) async fn authenticate(
    transport: &mut ClientTransport,
    metadata: ClientMetadata,
    key: &SigningKey,
-) -> Result<(), AuthError> {
+) -> std::result::Result<(), AuthError> {
    send_auth_challenge_request(transport, metadata, key).await?;
    let challenge = receive_auth_challenge(transport).await?;
    send_auth_challenge_solution(transport, key, challenge).await?;
--- a/server/crates/arbiter-client/src/bin/test_connect.rs
+++ b/server/crates/arbiter-client/src/bin/test_connect.rs
@@ -29,16 +29,16 @@ async fn main() {
        }
    };

-    println!("{url:#?}");
+    println!("{:#?}", url);

    let metadata = ClientMetadata {
-        name: "arbiter-client test_connect".to_owned(),
-        description: Some("Manual connection smoke test".to_owned()),
-        version: Some(env!("CARGO_PKG_VERSION").to_owned()),
+        name: "arbiter-client test_connect".to_string(),
+        description: Some("Manual connection smoke test".to_string()),
+        version: Some(env!("CARGO_PKG_VERSION").to_string()),
    };

    match ArbiterClient::connect(url, metadata).await {
        Ok(_) => println!("Connected and authenticated successfully."),
-        Err(err) => eprintln!("Failed to connect: {err:#?}"),
+        Err(err) => eprintln!("Failed to connect: {:#?}", err),
    }
 }
--- a/server/crates/arbiter-client/src/client.rs
+++ b/server/crates/arbiter-client/src/client.rs
@@ -18,39 +18,33 @@ use crate::{
 use crate::wallets::evm::ArbiterEvmWallet;

 #[derive(Debug, thiserror::Error)]
-pub enum ArbiterClientError {
-    #[error("Authentication error")]
-    Authentication(#[from] AuthError),
+pub enum Error {
+    #[error("gRPC error")]
+    Grpc(#[from] tonic::Status),

    #[error("Could not establish connection")]
    Connection(#[from] tonic::transport::Error),

-    #[error("gRPC error")]
-    Grpc(#[from] tonic::Status),
+    #[error("Invalid server URI")]
+    InvalidUri(#[from] http::uri::InvalidUri),

    #[error("Invalid CA certificate")]
    InvalidCaCert(#[from] webpki::Error),

-    #[error("Invalid server URI")]
-    InvalidUri(#[from] http::uri::InvalidUri),
+    #[error("Authentication error")]
+    Authentication(#[from] AuthError),

    #[error("Storage error")]
    Storage(#[from] StorageError),
 }

 pub struct ArbiterClient {
-    #[expect(
-        dead_code,
-        reason = "transport will be used in future methods for sending requests and receiving responses"
-    )]
+    #[allow(dead_code)]
    transport: Arc<Mutex<ClientTransport>>,
 }

 impl ArbiterClient {
-    pub async fn connect(
-        url: ArbiterUrl,
-        metadata: ClientMetadata,
-    ) -> Result<Self, ArbiterClientError> {
+    pub async fn connect(url: ArbiterUrl, metadata: ClientMetadata) -> Result<Self, Error> {
        let storage = FileSigningKeyStorage::from_default_location()?;
        Self::connect_with_storage(url, metadata, &storage).await
    }
@@ -59,7 +53,7 @@ impl ArbiterClient {
        url: ArbiterUrl,
        metadata: ClientMetadata,
        storage: &S,
-    ) -> Result<Self, ArbiterClientError> {
+    ) -> Result<Self, Error> {
        let key = storage.load_or_create()?;
        Self::connect_with_key(url, metadata, key).await
    }
@@ -68,7 +62,7 @@ impl ArbiterClient {
        url: ArbiterUrl,
        metadata: ClientMetadata,
        key: SigningKey,
-    ) -> Result<Self, ArbiterClientError> {
+    ) -> Result<Self, Error> {
        let anchor = webpki::anchor_from_trusted_cert(&url.ca_cert)?.to_owned();
        let tls = ClientTlsConfig::new().trust_anchor(anchor);

@@ -95,8 +89,7 @@ impl ArbiterClient {
    }

    #[cfg(feature = "evm")]
-    #[expect(clippy::unused_async, reason = "false positive")]
-    pub async fn evm_wallets(&self) -> Result<Vec<ArbiterEvmWallet>, ArbiterClientError> {
+    pub async fn evm_wallets(&self) -> Result<Vec<ArbiterEvmWallet>, Error> {
        todo!("fetch EVM wallet list from server")
    }
 }
--- a/server/crates/arbiter-client/src/lib.rs
+++ b/server/crates/arbiter-client/src/lib.rs
@@ -5,7 +5,7 @@ mod transport;
 pub mod wallets;

 pub use auth::AuthError;
-pub use client::{ArbiterClient, ArbiterClientError};
+pub use client::{ArbiterClient, Error};
 pub use storage::{FileSigningKeyStorage, SigningKeyStorage, StorageError};

 #[cfg(feature = "evm")]
--- a/server/crates/arbiter-client/src/storage.rs
+++ b/server/crates/arbiter-client/src/storage.rs
@@ -4,15 +4,15 @@ use std::path::{Path, PathBuf};

 #[derive(Debug, thiserror::Error)]
 pub enum StorageError {
-    #[error("Invalid signing key length in storage: expected {expected} bytes, got {actual} bytes")]
-    InvalidKeyLength { expected: usize, actual: usize },
-
    #[error("I/O error")]
    Io(#[from] std::io::Error),
+
+    #[error("Invalid signing key length in storage: expected {expected} bytes, got {actual} bytes")]
+    InvalidKeyLength { expected: usize, actual: usize },
 }

 pub trait SigningKeyStorage {
-    fn load_or_create(&self) -> Result<SigningKey, StorageError>;
+    fn load_or_create(&self) -> std::result::Result<SigningKey, StorageError>;
 }

 #[derive(Debug, Clone)]
@@ -27,11 +27,11 @@ impl FileSigningKeyStorage {
        Self { path: path.into() }
    }

-    pub fn from_default_location() -> Result<Self, StorageError> {
+    pub fn from_default_location() -> std::result::Result<Self, StorageError> {
        Ok(Self::new(home_path()?.join(Self::DEFAULT_FILE_NAME)))
    }

-    fn read_key(path: &Path) -> Result<SigningKey, StorageError> {
+    fn read_key(path: &Path) -> std::result::Result<SigningKey, StorageError> {
        let bytes = std::fs::read(path)?;
        let raw: [u8; 32] =
            bytes
@@ -45,7 +45,7 @@ impl FileSigningKeyStorage {
 }

 impl SigningKeyStorage for FileSigningKeyStorage {
-    fn load_or_create(&self) -> Result<SigningKey, StorageError> {
+    fn load_or_create(&self) -> std::result::Result<SigningKey, StorageError> {
        if let Some(parent) = self.path.parent() {
            std::fs::create_dir_all(parent)?;
        }
@@ -125,7 +125,7 @@ mod tests {
                assert_eq!(expected, 32);
                assert_eq!(actual, 31);
            }
-            other @ StorageError::Io(_) => panic!("unexpected error: {other:?}"),
+            other => panic!("unexpected error: {other:?}"),
        }

        std::fs::remove_file(path).expect("temp key file should be removable");
--- a/server/crates/arbiter-client/src/transport.rs
+++ b/server/crates/arbiter-client/src/transport.rs
@@ -2,15 +2,15 @@ use arbiter_proto::proto::client::{ClientRequest, ClientResponse};
 use std::sync::atomic::{AtomicI32, Ordering};
 use tokio::sync::mpsc;

-pub const BUFFER_LENGTH: usize = 16;
+pub(crate) const BUFFER_LENGTH: usize = 16;
 static NEXT_REQUEST_ID: AtomicI32 = AtomicI32::new(1);

-pub fn next_request_id() -> i32 {
+pub(crate) fn next_request_id() -> i32 {
    NEXT_REQUEST_ID.fetch_add(1, Ordering::Relaxed)
 }

 #[derive(Debug, thiserror::Error)]
-pub enum ClientSignError {
+pub(crate) enum ClientSignError {
    #[error("Transport channel closed")]
    ChannelClosed,

@@ -18,7 +18,7 @@ pub enum ClientSignError {
    ConnectionClosed,
 }

-pub struct ClientTransport {
+pub(crate) struct ClientTransport {
    pub(crate) sender: mpsc::Sender<ClientRequest>,
    pub(crate) receiver: tonic::Streaming<ClientResponse>,
 }
@@ -27,17 +27,18 @@ impl ClientTransport {
    pub(crate) async fn send(
        &mut self,
        request: ClientRequest,
-    ) -> Result<(), ClientSignError> {
+    ) -> std::result::Result<(), ClientSignError> {
        self.sender
            .send(request)
            .await
            .map_err(|_| ClientSignError::ChannelClosed)
    }

-    pub(crate) async fn recv(&mut self) -> Result<ClientResponse, ClientSignError> {
+    pub(crate) async fn recv(&mut self) -> std::result::Result<ClientResponse, ClientSignError> {
        match self.receiver.message().await {
            Ok(Some(resp)) => Ok(resp),
-            Ok(None) | Err(_) => Err(ClientSignError::ConnectionClosed),
+            Ok(None) => Err(ClientSignError::ConnectionClosed),
+            Err(_) => Err(ClientSignError::ConnectionClosed),
        }
    }
 }
--- a/server/crates/arbiter-client/src/wallets/evm.rs
+++ b/server/crates/arbiter-client/src/wallets/evm.rs
@@ -59,11 +59,7 @@ pub struct ArbiterEvmWallet {
 }

 impl ArbiterEvmWallet {
-    #[expect(
-        dead_code,
-        reason = "new will be used in future methods for creating wallets with different parameters"
-    )]
-    pub(crate) const fn new(transport: Arc<Mutex<ClientTransport>>, address: Address) -> Self {
+    pub(crate) fn new(transport: Arc<Mutex<ClientTransport>>, address: Address) -> Self {
        Self {
            transport,
            address,
@@ -71,12 +67,11 @@ impl ArbiterEvmWallet {
        }
    }

-    pub const fn address(&self) -> Address {
+    pub fn address(&self) -> Address {
        self.address
    }

-    #[must_use]
-    pub const fn with_chain_id(mut self, chain_id: ChainId) -> Self {
+    pub fn with_chain_id(mut self, chain_id: ChainId) -> Self {
        self.chain_id = Some(chain_id);
        self
    }
@@ -151,7 +146,6 @@ impl TxSigner<Signature> for ArbiterEvmWallet {
            .recv()
            .await
            .map_err(|_| Error::other("failed to receive evm sign transaction response"))?;
-        drop(transport);

        if response.request_id != Some(request_id) {
            return Err(Error::other(
--- a/server/crates/arbiter-crypto/Cargo.toml
+++ b/server/crates/arbiter-crypto/Cargo.toml
@@ -8,9 +8,7 @@ ml-dsa = {workspace = true, optional = true }
 rand = {workspace = true, optional = true}
 base64 = {workspace = true, optional = true }
 memsafe = {version = "0.4.0", optional = true}
-hmac.workspace = true
-alloy.workspace = true
-chrono.workspace = true
+x-wing = { version = "0.1.0-rc.0", features = ["zeroize"] }

 [lints]
 workspace = true
--- a/server/crates/arbiter-crypto/src/authn/v1.rs
+++ b/server/crates/arbiter-crypto/src/authn/v1.rs
@@ -1,5 +1,6 @@
+use std::hash::Hash;
+
 use base64::{Engine as _, prelude::BASE64_STANDARD};
-use hmac::digest::Digest;
 use ml_dsa::{
    EncodedVerifyingKey, Error, KeyGen, MlDsa87, Seed, Signature as MlDsaSignature,
    SigningKey as MlDsaSigningKey, VerifyingKey as MlDsaVerifyingKey, signature::Keypair as _,
@@ -18,9 +19,9 @@ pub type KeyParams = MlDsa87;
 #[derive(Clone, Debug, PartialEq)]
 pub struct PublicKey(Box<MlDsaVerifyingKey<KeyParams>>);

-impl crate::hashing::Hashable for PublicKey {
-    fn hash<H: Digest>(&self, hasher: &mut H) {
-        hasher.update(self.to_bytes());
+impl Hash for PublicKey {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.to_bytes().hash(state);
    }
 }

@@ -32,10 +33,9 @@ pub struct SigningKey(Box<MlDsaSigningKey<KeyParams>>);

 impl PublicKey {
    pub fn to_bytes(&self) -> Vec<u8> {
-        self.0.encode().0.to_vec()
+        self.0.encode().to_vec()
    }

-    #[must_use]
    pub fn verify(&self, nonce: i32, context: &[u8], signature: &Signature) -> bool {
        self.0.verify_with_context(
            &format_challenge(nonce, &self.to_bytes()),
@@ -47,7 +47,7 @@ impl PublicKey {

 impl Signature {
    pub fn to_bytes(&self) -> Vec<u8> {
-        self.0.encode().0.to_vec()
+        self.0.encode().to_vec()
    }
 }

--- a/server/crates/arbiter-crypto/src/lib.rs
+++ b/server/crates/arbiter-crypto/src/lib.rs
@@ -1,5 +1,7 @@
 #[cfg(feature = "authn")]
 pub mod authn;
-pub mod hashing;
+
 #[cfg(feature = "safecell")]
 pub mod safecell;
+
+pub use x_wing;
--- a/server/crates/arbiter-crypto/src/safecell.rs
+++ b/server/crates/arbiter-crypto/src/safecell.rs
@@ -29,7 +29,7 @@ pub trait SafeCellHandle<T> {
        let mut cell = Self::new(T::default());
        {
            let mut handle = cell.write();
-            f(&mut *handle);
+            f(handle.deref_mut());
        }
        cell
    }
--- a/server/crates/arbiter-macros/Cargo.toml
+++ b/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
--- a/server/crates/arbiter-macros/src/hashable.rs
+++ b/server/crates/arbiter-macros/src/hashable.rs
@@ -1,133 +0,0 @@
-use proc_macro2::{Span, TokenStream, TokenTree};
-use quote::quote;
-use syn::parse_quote;
-use syn::spanned::Spanned;
-use syn::{DataStruct, DeriveInput, Fields, Generics, Index};
-
-use crate::utils::{HASHABLE_TRAIT_PATH, HMAC_DIGEST_PATH};
-
-pub(crate) fn derive(input: &DeriveInput) -> TokenStream {
-    match &input.data {
-        syn::Data::Struct(struct_data) => hashable_struct(input, struct_data),
-        syn::Data::Enum(_) => {
-            syn::Error::new_spanned(input, "Hashable can currently be derived only for structs")
-                .to_compile_error()
-        }
-        syn::Data::Union(_) => {
-            syn::Error::new_spanned(input, "Hashable cannot be derived for unions")
-                .to_compile_error()
-        }
-    }
-}
-
-fn hashable_struct(input: &DeriveInput, struct_data: &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()
-}
--- a/server/crates/arbiter-macros/src/lib.rs
+++ b/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()
-}
--- a/server/crates/arbiter-macros/src/utils.rs
+++ b/server/crates/arbiter-macros/src/utils.rs
@@ -1,24 +0,0 @@
-pub(crate) struct ToPath(pub &'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 as $name:ident) => {
-        const _: () = {
-            #[cfg(test)]
-            #[expect(
-                unused_imports,
-                reason = "Ensures the path is valid and will cause a compile error if not"
-            )]
-            use $path as _;
-        };
-        pub(crate) const $name: ToPath = ToPath(stringify!($path));
-    };
-}
-
-ensure_path!(::arbiter_crypto::hashing::Hashable as HASHABLE_TRAIT_PATH);
-ensure_path!(::arbiter_crypto::hashing::Digest as HMAC_DIGEST_PATH);
--- a/server/crates/arbiter-proto/src/transport.rs
+++ b/server/crates/arbiter-proto/src/transport.rs
@@ -106,6 +106,36 @@ pub trait Receiver<Inbound>: Send + Sync {
 /// any built-in correlation mechanism between inbound and outbound items.
 pub trait Bi<Inbound, Outbound>: Sender<Outbound> + Receiver<Inbound> + Send + Sync {}

+#[async_trait]
+impl<T, Outbound> Sender<Outbound> for &mut T
+where
+    T: Sender<Outbound> + ?Sized,
+    Outbound: Send + 'static,
+{
+    async fn send(&mut self, item: Outbound) -> Result<(), Error> {
+        (**self).send(item).await
+    }
+}
+
+#[async_trait]
+impl<T, Inbound> Receiver<Inbound> for &mut T
+where
+    T: Receiver<Inbound> + ?Sized,
+    Inbound: Send + 'static,
+{
+    async fn recv(&mut self) -> Option<Inbound> {
+        (**self).recv().await
+    }
+}
+
+impl<T, Inbound, Outbound> Bi<Inbound, Outbound> for &mut T
+where
+    T: Bi<Inbound, Outbound> + ?Sized,
+    Inbound: Send + 'static,
+    Outbound: Send + 'static,
+{
+}
+
 pub trait SplittableBi<Inbound, Outbound>: Bi<Inbound, Outbound> {
    type Sender: Sender<Outbound>;
    type Receiver: Receiver<Inbound>;
--- a/server/crates/arbiter-proto/src/url.rs
+++ b/server/crates/arbiter-proto/src/url.rs
@@ -105,7 +105,7 @@ mod tests {

    #[rstest]

-    fn parsing_correctness(
+    fn test_parsing_correctness(
        #[values("127.0.0.1", "localhost", "192.168.1.1", "some.domain.com")] host: &str,

        #[values(None, Some("token123".to_string()))] bootstrap_token: Option<String>,
--- a/server/crates/arbiter-server/Cargo.toml
+++ b/server/crates/arbiter-server/Cargo.toml
@@ -18,7 +18,6 @@ diesel-async = { version = "0.8.0", features = [
 ] }
 arbiter-proto.path = "../arbiter-proto"
 arbiter-crypto.path = "../arbiter-crypto"
-arbiter-macros.path = "../arbiter-macros"
 tracing.workspace = true
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tonic.workspace = true
@@ -45,7 +44,7 @@ restructed = "0.2.2"
 strum = { version = "0.28.0", features = ["derive"] }
 pem = "3.0.6"
 sha2.workspace = true
-hmac.workspace = true
+hmac = "0.12"
 spki.workspace = true
 alloy.workspace = true
 prost-types.workspace = true
@@ -59,6 +58,7 @@ ml-dsa.workspace = true
 ed25519-dalek.workspace = true
 x25519-dalek.workspace = true
 k256.workspace = true
+kameo_actors.workspace = true

 [dev-dependencies]
 insta = "1.46.3"
--- a/server/crates/arbiter-server/src/actors/bootstrap.rs
+++ b/server/crates/arbiter-server/src/actors/bootstrap.rs
@@ -13,8 +13,8 @@ const TOKEN_LENGTH: usize = 64;
 pub async fn generate_token() -> Result<String, std::io::Error> {
    let rng: StdRng = make_rng();

-    let token = rng.sample_iter(Alphanumeric).take(TOKEN_LENGTH).fold(
-        String::default(),
+    let token: String = rng.sample_iter(Alphanumeric).take(TOKEN_LENGTH).fold(
+        Default::default(),
        |mut accum, char| {
            accum += char.to_string().as_str();
            accum
@@ -27,15 +27,15 @@ pub async fn generate_token() -> Result<String, std::io::Error> {
 }

 #[derive(Error, Debug)]
-pub enum BootstrappError {
+pub enum Error {
    #[error("Database error: {0}")]
    Database(#[from] db::PoolError),

-    #[error("I/O error: {0}")]
-    Io(#[from] std::io::Error),
-
    #[error("Database query error: {0}")]
    Query(#[from] diesel::result::Error),
+
+    #[error("I/O error: {0}")]
+    Io(#[from] std::io::Error),
 }

 #[derive(Actor)]
@@ -44,7 +44,7 @@ pub struct Bootstrapper {
 }

 impl Bootstrapper {
-    pub async fn new(db: &DatabasePool) -> Result<Self, BootstrappError> {
+    pub async fn new(db: &DatabasePool) -> Result<Self, Error> {
        let row_count: i64 = {
            let mut conn = db.get().await?;

@@ -69,13 +69,16 @@ impl Bootstrapper {
 impl Bootstrapper {
    #[message]
    pub fn is_correct_token(&self, token: String) -> bool {
-        self.token.as_ref().is_some_and(|expected| {
+        match &self.token {
+            Some(expected) => {
                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,
+        }
    }

    #[message]
--- a/server/crates/arbiter-server/src/actors/evm/mod.rs
+++ b/server/crates/arbiter-server/src/actors/evm/mod.rs
@@ -1,6 +1,4 @@
-use alloy::{
-    consensus::TxEip1559, network::TxSignerSync as _, primitives::Address, signers::Signature,
-};
+use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
 use diesel::{
    ExpressionMethods, OptionalExtension as _, QueryDsl, SelectableHelper as _, dsl::insert_into,
 };
@@ -9,7 +7,7 @@ use kameo::{Actor, actor::ActorRef, messages};
 use rand::{SeedableRng, rng, rngs::StdRng};

 use crate::{
-    actors::keyholder::{CreateNew, Decrypt, KeyHolder},
+    actors::vault::{CreateNew, Decrypt, Vault},
    crypto::integrity,
    db::{
        DatabaseError, DatabasePool,
@@ -36,11 +34,11 @@ pub enum SignTransactionError {
    #[error("Database error: {0}")]
    Database(#[from] DatabaseError),

-    #[error("Keyholder error: {0}")]
-    Keyholder(#[from] crate::actors::keyholder::KeyHolderError),
+    #[error("Vault error: {0}")]
+    Vault(#[from] crate::actors::vault::Error),

-    #[error("Keyholder mailbox error")]
-    KeyholderSend,
+    #[error("Vault mailbox error")]
+    VaultSend,

    #[error("Signing error: {0}")]
    Signing(#[from] alloy::signers::Error),
@@ -50,36 +48,36 @@ pub enum SignTransactionError {
 }

 #[derive(Debug, thiserror::Error)]
-pub enum EvmActorError {
-    #[error("Keyholder error: {0}")]
-    Keyholder(#[from] crate::actors::keyholder::KeyHolderError),
+pub enum Error {
+    #[error("Vault error: {0}")]
+    Vault(#[from] crate::actors::vault::Error),

-    #[error("Keyholder mailbox error")]
-    KeyholderSend,
+    #[error("Vault mailbox error")]
+    VaultSend,

    #[error("Database error: {0}")]
    Database(#[from] DatabaseError),

    #[error("Integrity violation: {0}")]
-    Integrity(#[from] integrity::IntegrityError),
+    Integrity(#[from] integrity::Error),
 }

 #[derive(Actor)]
 pub struct EvmActor {
-    pub keyholder: ActorRef<KeyHolder>,
+    pub vault: ActorRef<Vault>,
    pub db: DatabasePool,
    pub rng: StdRng,
    pub engine: evm::Engine,
 }

 impl EvmActor {
-    pub fn new(keyholder: ActorRef<KeyHolder>, db: DatabasePool) -> Self {
+    pub fn new(vault: ActorRef<Vault>, db: DatabasePool) -> Self {
        // is it safe to seed rng from system once?
        // todo: audit
        let rng = StdRng::from_rng(&mut rng());
-        let engine = evm::Engine::new(db.clone(), keyholder.clone());
+        let engine = evm::Engine::new(db.clone(), vault.clone());
        Self {
-            keyholder,
+            vault,
            db,
            rng,
            engine,
@@ -90,16 +88,16 @@ impl EvmActor {
 #[messages]
 impl EvmActor {
    #[message]
-    pub async fn generate(&mut self) -> Result<(i32, Address), EvmActorError> {
+    pub async fn generate(&mut self) -> Result<(i32, Address), Error> {
        let (mut key_cell, address) = safe_signer::generate(&mut self.rng);

        let plaintext = key_cell.read_inline(|reader| SafeCell::new(reader.to_vec()));

        let aead_id: i32 = self
-            .keyholder
+            .vault
            .ask(CreateNew { plaintext })
            .await
-            .map_err(|_| EvmActorError::KeyholderSend)?;
+            .map_err(|_| Error::VaultSend)?;

        let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
        let wallet_id = insert_into(schema::evm_wallet::table)
@@ -116,7 +114,7 @@ impl EvmActor {
    }

    #[message]
-    pub async fn list_wallets(&self) -> Result<Vec<(i32, Address)>, EvmActorError> {
+    pub async fn list_wallets(&self) -> Result<Vec<(i32, Address)>, Error> {
        let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
        let rows: Vec<models::EvmWallet> = schema::evm_wallet::table
            .select(models::EvmWallet::as_select())
@@ -138,7 +136,7 @@ impl EvmActor {
        &mut self,
        basic: SharedGrantSettings,
        grant: SpecificGrant,
-    ) -> Result<i32, EvmActorError> {
+    ) -> Result<i32, Error> {
        match grant {
            SpecificGrant::EtherTransfer(settings) => self
                .engine
@@ -147,7 +145,7 @@ impl EvmActor {
                    specific: settings,
                })
                .await
-                .map_err(EvmActorError::from),
+                .map_err(Error::from),
            SpecificGrant::TokenTransfer(settings) => self
                .engine
                .create_grant::<TokenTransfer>(CombinedSettings {
@@ -155,15 +153,14 @@ impl EvmActor {
                    specific: settings,
                })
                .await
-                .map_err(EvmActorError::from),
+                .map_err(Error::from),
        }
    }

    #[message]
-    #[expect(clippy::unused_async, reason = "reserved for impl")]
-    pub async fn useragent_delete_grant(&mut self, _grant_id: i32) -> Result<(), EvmActorError> {
+    pub async fn useragent_delete_grant(&mut self, _grant_id: i32) -> Result<(), Error> {
        // let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
-        // let keyholder = self.keyholder.clone();
+        // let vault = self.vault.clone();

        // diesel_async::AsyncConnection::transaction(&mut conn, |conn| {
        //     Box::pin(async move {
@@ -186,15 +183,11 @@ impl EvmActor {
    }

    #[message]
-    pub async fn useragent_list_grants(
-        &mut self,
-    ) -> Result<Vec<Grant<SpecificGrant>>, EvmActorError> {
+    pub async fn useragent_list_grants(&mut self) -> Result<Vec<Grant<SpecificGrant>>, Error> {
        match self.engine.list_all_grants().await {
            Ok(grants) => Ok(grants),
-            Err(ListError::Database(db_err)) => Err(EvmActorError::Database(db_err)),
-            Err(ListError::Integrity(integrity_err)) => {
-                Err(EvmActorError::Integrity(integrity_err))
-            }
+            Err(ListError::Database(db_err)) => Err(Error::Database(db_err)),
+            Err(ListError::Integrity(integrity_err)) => Err(Error::Integrity(integrity_err)),
        }
    }

@@ -261,12 +254,12 @@ impl EvmActor {
        drop(conn);

        let raw_key: SafeCell<Vec<u8>> = self
-            .keyholder
+            .vault
            .ask(Decrypt {
                aead_id: wallet.aead_encrypted_id,
            })
            .await
-            .map_err(|_| SignTransactionError::KeyholderSend)?;
+            .map_err(|_| SignTransactionError::VaultSend)?;

        let signer = safe_signer::SafeSigner::from_cell(raw_key)?;

@@ -274,6 +267,7 @@ impl EvmActor {
            .evaluate_transaction(wallet_access, transaction.clone(), RunKind::Execution)
            .await?;

+        use alloy::network::TxSignerSync as _;
        Ok(signer.sign_transaction_sync(&mut transaction)?)
    }
 }
--- a/server/crates/arbiter-server/src/actors/flow_coordinator/client_connect_approval.rs
+++ b/server/crates/arbiter-server/src/actors/flow_coordinator/client_connect_approval.rs
@@ -6,10 +6,12 @@ use kameo::{
    reply::ReplySender,
 };

-use crate::actors::{
+use crate::{
+    actors::flow_coordinator::ApprovalError,
+    peers::{
        client::ClientProfile,
-    flow_coordinator::ApprovalError,
        user_agent::{UserAgentSession, session::BeginNewClientApproval},
+    },
 };

 pub struct Args {
@@ -41,7 +43,7 @@ impl Actor for ClientApprovalController {
    async fn on_start(
        Args {
            client,
-            user_agents,
+            mut user_agents,
            reply,
        }: Self::Args,
        actor_ref: ActorRef<Self>,
@@ -52,9 +54,8 @@ impl Actor for ClientApprovalController {
            reply: Some(reply),
        };

-        for user_agent in user_agents {
+        for user_agent in user_agents.drain(..) {
            actor_ref.link(&user_agent).await;
-
            let _ = user_agent
                .tell(BeginNewClientApproval {
                    client: client.clone(),
@@ -86,7 +87,7 @@ impl Actor for ClientApprovalController {
 #[messages]
 impl ClientApprovalController {
    #[message(ctx)]
-    pub fn client_approval_answer(&mut self, approved: bool, ctx: &mut Context<Self, ()>) {
+    pub async fn client_approval_answer(&mut self, approved: bool, ctx: &mut Context<Self, ()>) {
        if !approved {
            // Denial wins immediately regardless of other pending responses.
            self.send_reply(Ok(false));
--- a/server/crates/arbiter-server/src/actors/flow_coordinator/mod.rs
+++ b/server/crates/arbiter-server/src/actors/flow_coordinator/mod.rs
@@ -9,10 +9,12 @@ use kameo::{
 };
 use tracing::info;

-use crate::actors::{
+use crate::{
+    actors::flow_coordinator::client_connect_approval::ClientApprovalController,
+    peers::{
        client::{ClientProfile, session::ClientSession},
-    flow_coordinator::client_connect_approval::ClientApprovalController,
-    user_agent::session::UserAgentSession,
+        user_agent::UserAgentSession,
+    },
 };

 pub mod client_connect_approval;
@@ -92,7 +94,7 @@ impl FlowCoordinator {
    }

    #[message(ctx)]
-    pub fn request_client_approval(
+    pub async fn request_client_approval(
        &mut self,
        client: ClientProfile,
        ctx: &mut Context<Self, DelegatedReply<Result<bool, ApprovalError>>>,
--- a/server/crates/arbiter-server/src/actors/mod.rs
+++ b/server/crates/arbiter-server/src/actors/mod.rs
@@ -1,47 +1,53 @@
 use kameo::actor::{ActorRef, Spawn};
+use kameo_actors::{DeliveryStrategy, message_bus::MessageBus};
 use thiserror::Error;

 use crate::{
    actors::{
-        bootstrap::Bootstrapper, evm::EvmActor, flow_coordinator::FlowCoordinator,
-        keyholder::KeyHolder,
+        bootstrap::Bootstrapper, evm::EvmActor, flow_coordinator::FlowCoordinator, vault::Vault,
    },
    db,
 };

 pub mod bootstrap;
-pub mod client;
 pub mod evm;
 pub mod flow_coordinator;
-pub mod keyholder;
-pub mod user_agent;
+pub mod vault;
+pub mod useragent_registry;

 #[derive(Error, Debug)]
-pub enum GlobalActorsSpawnError {
+pub enum SpawnError {
    #[error("Failed to spawn Bootstrapper actor")]
-    Bootstrapper(#[from] bootstrap::BootstrappError),
+    Bootstrapper(#[from] bootstrap::Error),

-    #[error("Failed to spawn KeyHolder actor")]
-    KeyHolder(#[from] keyholder::KeyHolderError),
+    #[error("Failed to spawn Vault actor")]
+    Vault(#[from] vault::Error),
 }

 /// Long-lived actors that are shared across all connections and handle global state and operations
 #[derive(Clone)]
 pub struct GlobalActors {
-    pub key_holder: ActorRef<KeyHolder>,
+    pub vault: ActorRef<Vault>,
    pub bootstrapper: ActorRef<Bootstrapper>,
    pub flow_coordinator: ActorRef<FlowCoordinator>,
    pub evm: ActorRef<EvmActor>,
+    pub events: ActorRef<MessageBus>,
 }

 impl GlobalActors {
-    pub async fn spawn(db: db::DatabasePool) -> Result<Self, GlobalActorsSpawnError> {
-        let key_holder = KeyHolder::spawn(KeyHolder::new(db.clone()).await?);
+    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 = Vault::spawn(Vault::new(db.clone(), message_bus.clone()).await?);
        Ok(Self {
            bootstrapper: Bootstrapper::spawn(Bootstrapper::new(&db).await?),
            evm: EvmActor::spawn(EvmActor::new(key_holder.clone(), db)),
-            key_holder,
+            vault: key_holder,
            flow_coordinator: FlowCoordinator::spawn(FlowCoordinator::default()),
+            events: message_bus,
        })
    }
 }
--- a/server/crates/arbiter-server/src/actors/user_agent/auth/state.rs
+++ b/server/crates/arbiter-server/src/actors/user_agent/auth/state.rs
@@ -1,308 +0,0 @@
-use arbiter_crypto::authn::{self, USERAGENT_CONTEXT};
-use arbiter_proto::transport::Bi;
-use diesel::{ExpressionMethods as _, OptionalExtension as _, QueryDsl, update};
-use diesel_async::{AsyncConnection, RunQueryDsl};
-use kameo::actor::ActorRef;
-use tracing::error;
-
-use super::Error;
-use crate::{
-    actors::{
-        bootstrap::ConsumeToken,
-        keyholder::KeyHolder,
-        user_agent::{UserAgentConnection, UserAgentCredentials, auth::Outbound},
-    },
-    crypto::integrity,
-    db::{DatabasePool, schema::useragent_client},
-};
-
-pub struct ChallengeRequest {
-    pub pubkey: authn::PublicKey,
-}
-
-pub struct BootstrapAuthRequest {
-    pub pubkey: authn::PublicKey,
-    pub token: String,
-}
-
-pub struct ChallengeContext {
-    pub challenge_nonce: i32,
-    pub key: authn::PublicKey,
-}
-
-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(authn::PublicKey),
-        SentChallenge(ChallengeContext) + ReceivedSolution(ChallengeSolution) / async verify_solution = AuthOk(authn::PublicKey),
-    }
-);
-
-/// Returns the current nonce, ready to use for the challenge nonce.
-async fn get_current_nonce_and_id(
-    db: &DatabasePool,
-    key: &authn::PublicKey,
-) -> 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_bytes()))
-                    .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: &authn::PublicKey,
-) -> 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: &authn::PublicKey,
-) -> 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_bytes()))
-                    .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: &authn::PublicKey,
-) -> Result<(), Error> {
-    let pubkey_bytes = pubkey.to_bytes();
-    let mut conn = db.get().await.map_err(|e| {
-        error!(error = ?e, "Database pool error");
-        Error::internal("Database unavailable")
-    })?;
-
-    conn.transaction(|conn| {
-        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),
-                ))
-                .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 const fn new(conn: &'a mut UserAgentConnection, transport: T) -> Self {
-        Self { conn, transport }
-    }
-}
-
-impl<T> AuthStateMachineContext for AuthContext<'_, T>
-where
-    T: Bi<super::Inbound, Result<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,
-        })
-    }
-
-    async fn verify_bootstrap_token(
-        &mut self,
-        BootstrapAuthRequest { pubkey, token }: BootstrapAuthRequest,
-    ) -> Result<authn::PublicKey, 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);
-        }
-
-        if token_ok {
-            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)
-        } else {
-            error!("Invalid bootstrap token provided");
-            self.transport
-                .send(Err(Error::InvalidBootstrapToken))
-                .await
-                .map_err(|_| Error::Transport)?;
-            Err(Error::InvalidBootstrapToken)
-        }
-    }
-
-    async fn verify_solution(
-        &mut self,
-        ChallengeContext {
-            challenge_nonce,
-            key,
-        }: &ChallengeContext,
-        ChallengeSolution { solution }: ChallengeSolution,
-    ) -> Result<authn::PublicKey, 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 = key.verify(*challenge_nonce, USERAGENT_CONTEXT, &signature);
-
-        if valid {
-            self.transport
-                .send(Ok(Outbound::AuthSuccess))
-                .await
-                .map_err(|_| Error::Transport)?;
-            Ok(key.clone())
-        } else {
-            self.transport
-                .send(Err(Error::InvalidChallengeSolution))
-                .await
-                .map_err(|_| Error::Transport)?;
-            Err(Error::InvalidChallengeSolution)
-        }
-    }
-}
--- a/server/crates/arbiter-server/src/actors/user_agent/mod.rs
+++ b/server/crates/arbiter-server/src/actors/user_agent/mod.rs
@@ -1,40 +0,0 @@
-use crate::{
-    actors::{GlobalActors, client::ClientProfile},
-    crypto::integrity::Integrable,
-    db,
-};
-use arbiter_crypto::authn;
-
-#[derive(Debug, arbiter_macros::Hashable)]
-pub struct UserAgentCredentials {
-    pub pubkey: authn::PublicKey,
-    pub nonce: i32,
-}
-
-impl Integrable for UserAgentCredentials {
-    const KIND: &'static str = "useragent_credentials";
-}
-
-// Messages, sent by user agent to connection client without having a request
-#[derive(Debug)]
-pub enum OutOfBand {
-    ClientConnectionRequest { profile: ClientProfile },
-    ClientConnectionCancel { pubkey: authn::PublicKey },
-}
-
-pub struct UserAgentConnection {
-    pub(crate) db: db::DatabasePool,
-    pub(crate) actors: GlobalActors,
-}
-
-impl UserAgentConnection {
-    pub const fn new(db: db::DatabasePool, actors: GlobalActors) -> Self {
-        Self { db, actors }
-    }
-}
-
-pub mod auth;
-pub mod session;
-
-pub use auth::authenticate;
-pub use session::UserAgentSession;
--- a/server/crates/arbiter-server/src/actors/user_agent/session/connection.rs
+++ b/server/crates/arbiter-server/src/actors/user_agent/session/connection.rs
@@ -1,534 +0,0 @@
-use std::sync::Mutex;
-
-use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
-use arbiter_crypto::{
-    authn,
-    safecell::{SafeCell, SafeCellHandle as _},
-};
-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 thiserror::Error;
-use tracing::{error, info};
-use x25519_dalek::{EphemeralSecret, PublicKey};
-
-use crate::{actors::flow_coordinator::client_connect_approval::ClientApprovalAnswer, evm::policies::SharedGrantSettings};
-use crate::actors::keyholder::KeyHolderState;
-use crate::actors::user_agent::session::UserAgentSessionError;
-use crate::actors::{
-    evm::{
-        ClientSignTransaction, Generate, ListWallets, SignTransactionError as EvmSignError,
-        UseragentCreateGrant, UseragentListGrants,
-    },
-    keyholder::{self, Bootstrap, TryUnseal},
-    user_agent::session::{
-        UserAgentSession,
-        state::{UnsealContext, UserAgentEvents, UserAgentStates},
-    },
-};
-use crate::db::models::{
-    EvmWalletAccess, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata,
-};
-use crate::evm::policies::{Grant, SpecificGrant};
-
-impl UserAgentSession {
-    fn take_unseal_secret(&self) -> Result<(EphemeralSecret, PublicKey), UserAgentSessionError> {
-        let UserAgentStates::WaitingForUnsealKey(unseal_context) = self.state.state() else {
-            error!("Received encrypted key in invalid state");
-            return Err(UserAgentSessionError::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();
-            if let Some(secret) = secret {
-                secret
-            } else {
-                drop(secret_lock);
-                error!("Ephemeral secret already taken");
-                return Err(UserAgentSessionError::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] UserAgentSessionError),
-}
-
-#[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] UserAgentSessionError),
-}
-
-#[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 fn handle_unseal_request(
-        &mut self,
-        client_pubkey: PublicKey,
-    ) -> Result<UnsealStartResponse, UserAgentSessionError> {
-        let secret = EphemeralSecret::random();
-        let public_key = PublicKey::from(&secret);
-
-        self.transition(UserAgentEvents::UnsealRequest(UnsealContext {
-            client_public_key: client_pubkey,
-            secret: Mutex::new(Some(secret)),
-        }))?;
-
-        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(UserAgentSessionError::State) => {
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                return Err(UnsealError::InvalidKey);
-            }
-            Err(_err) => {
-                return Err(UserAgentSessionError::internal("Failed to take unseal secret").into());
-            }
-        };
-
-        let Ok(seal_key_buffer) = Self::decrypt_client_key_material(
-            ephemeral_secret,
-            client_public_key,
-            &nonce,
-            &ciphertext,
-            &associated_data,
-        ) else {
-            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::KeyHolderError::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(UserAgentSessionError::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(UserAgentSessionError::State) => {
-                self.transition(UserAgentEvents::ReceivedInvalidKey)?;
-                return Err(BootstrapError::InvalidKey);
-            }
-            Err(err) => return Err(err.into()),
-        };
-
-        let Ok(seal_key_buffer) = Self::decrypt_client_key_material(
-            ephemeral_secret,
-            client_public_key,
-            &nonce,
-            &ciphertext,
-            &associated_data,
-        ) else {
-            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::KeyHolderError::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(UserAgentSessionError::internal(
-                    "Vault actor error",
-                )))
-            }
-        }
-    }
-}
-
-#[messages]
-impl UserAgentSession {
-    #[message]
-    pub(crate) async fn handle_query_vault_state(
-        &mut self,
-    ) -> Result<KeyHolderState, UserAgentSessionError> {
-        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(UserAgentSessionError::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), UserAgentSessionError> {
-        match self.props.actors.evm.ask(Generate {}).await {
-            Ok(address) => Ok(address),
-            Err(SendError::HandlerError(err)) => Err(UserAgentSessionError::internal(format!(
-                "EVM wallet generation failed: {err}"
-            ))),
-            Err(err) => {
-                error!(?err, "EVM actor unreachable during wallet create");
-                Err(UserAgentSessionError::internal("EVM actor unreachable"))
-            }
-        }
-    }
-
-    #[message]
-    pub(crate) async fn handle_evm_wallet_list(
-        &mut self,
-    ) -> Result<Vec<(i32, Address)>, UserAgentSessionError> {
-        match self.props.actors.evm.ask(ListWallets {}).await {
-            Ok(wallets) => Ok(wallets),
-            Err(err) => {
-                error!(?err, "EVM wallet list failed");
-                Err(UserAgentSessionError::internal(
-                    "Failed to list EVM wallets",
-                ))
-            }
-        }
-    }
-}
-
-#[messages]
-impl UserAgentSession {
-    #[message]
-    pub(crate) async fn handle_grant_list(
-        &mut self,
-    ) -> Result<Vec<Grant<SpecificGrant>>, UserAgentSessionError> {
-        match self.props.actors.evm.ask(UseragentListGrants {}).await {
-            Ok(grants) => Ok(grants),
-            Err(err) => {
-                error!(?err, "EVM grant list failed");
-                Err(UserAgentSessionError::internal("Failed to list EVM grants"))
-            }
-        }
-    }
-
-    #[message]
-    pub(crate) async fn handle_grant_create(
-        &mut self,
-        basic: SharedGrantSettings,
-        grant: 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]
-    #[expect(clippy::unused_async, reason = "false positive")]
-    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<(), UserAgentSessionError> {
-        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::<_, UserAgentSessionError>::Ok(())
-            })
-        })
-        .await?;
-        Ok(())
-    }
-
-    #[message]
-    pub(crate) async fn handle_revoke_evm_wallet_access(
-        &mut self,
-        entries: Vec<i32>,
-    ) -> Result<(), UserAgentSessionError> {
-        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::<_, UserAgentSessionError>::Ok(())
-            })
-        })
-        .await?;
-        Ok(())
-    }
-
-    #[message]
-    pub(crate) async fn handle_list_wallet_access(
-        &mut self,
-    ) -> Result<Vec<EvmWalletAccess>, UserAgentSessionError> {
-        let mut conn = self.props.db.get().await?;
-        let access_entries = crate::db::schema::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: &Context<Self, Result<(), UserAgentSessionError>>,
-    ) -> Result<(), UserAgentSessionError> {
-        let Some(pending_approval) = self.pending_client_approvals.remove(&pubkey.to_bytes())
-        else {
-            error!("Received client connection response for unknown client");
-            return Err(UserAgentSessionError::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"
-                );
-                UserAgentSessionError::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)>, UserAgentSessionError> {
-        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)
-    }
-}
--- a/server/crates/arbiter-server/src/actors/user_agent/session/state.rs
+++ b/server/crates/arbiter-server/src/actors/user_agent/session/state.rs
@@ -1,25 +0,0 @@
-use std::sync::Mutex;
-
-use x25519_dalek::{EphemeralSecret, PublicKey};
-
-pub struct UnsealContext {
-    pub client_public_key: PublicKey,
-    pub secret: Mutex<Option<EphemeralSecret>>,
-}
-
-smlang::statemachine!(
-    name: UserAgent,
-    custom_error: false,
-    transitions: {
-        *Idle + UnsealRequest(UnsealContext) / generate_temp_keypair = WaitingForUnsealKey(UnsealContext),
-        WaitingForUnsealKey(UnsealContext) + ReceivedValidKey = Unsealed,
-        WaitingForUnsealKey(UnsealContext) + ReceivedInvalidKey = Idle,
-    }
-);
-
-pub struct DummyContext;
-impl UserAgentStateMachineContext for DummyContext {
-    fn generate_temp_keypair(&mut self, event_data: UnsealContext) -> Result<UnsealContext, ()> {
-        Ok(event_data)
-    }
-}
--- a/server/crates/arbiter-server/src/actors/useragent_registry.rs
+++ b/server/crates/arbiter-server/src/actors/useragent_registry.rs
@@ -0,0 +1,57 @@
+use alloy::primitives::map::HashMap;
+use arbiter_crypto::authn;
+use kameo::{error::Infallible, prelude::*};
+
+use crate::{db::DatabasePool, peers::user_agent::{Credentials, UserAgentSession}};
+
+use super::vault::{Vault, events as vault_events};
+
+pub struct Args {
+    pub vault: ActorRef<Vault>,
+    pub pool: DatabasePool,
+}
+
+pub struct UserAgentRegistry {
+    vault: ActorRef<Vault>,
+    pool: DatabasePool,
+    connected: HashMap<Credentials, ActorRef<UserAgentSession>>,
+}
+
+impl Message<vault_events::Bootstrapped> for UserAgentRegistry {
+    type Reply = ();
+
+    async fn handle(
+        &mut self,
+        msg: vault_events::Bootstrapped,
+        ctx: &mut Context<Self, Self::Reply>,
+    ) -> Self::Reply {
+        todo!()
+    }
+}
+
+impl Message<vault_events::Unsealed> for UserAgentRegistry {
+    type Reply = ();
+
+    async fn handle(
+        &mut self,
+        msg: vault_events::Unsealed,
+        ctx: &mut Context<Self, Self::Reply>,
+    ) -> Self::Reply {
+        todo!()
+    }
+}
+impl Actor for UserAgentRegistry {
+    type Args = Args;
+
+    type Error = Infallible;
+
+    async fn on_start(args: Self::Args, actor_ref: ActorRef<Self>) -> Result<Self, Self::Error> {
+        Ok(Self {
+            vault: args.vault,
+            pool: args.pool,
+            connected: HashMap::default(),
+        })
+    }
+
+    
+}
--- a/server/crates/arbiter-server/src/actors/keyholder/mod.rs
+++ b/server/crates/arbiter-server/src/actors/keyholder/mod.rs
@@ -5,7 +5,8 @@ use diesel::{
 };
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use hmac::Mac as _;
-use kameo::{Actor, Reply, messages};
+use kameo::{Actor, Reply, actor::ActorRef, messages};
+use kameo_actors::message_bus::{MessageBus, Publish};
 use strum::{EnumDiscriminants, IntoDiscriminant};
 use tracing::{error, info};

@@ -21,27 +22,34 @@ use crate::db::{
 };
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};

-#[derive(Default, EnumDiscriminants)]
-#[strum_discriminants(derive(Reply), vis(pub), name(KeyHolderState))]
-enum State {
-    #[default]
-    Unbootstrapped,
-    Sealed {
-        root_key_history_id: i32,
-    },
-    Unsealed {
-        root_key_history_id: i32,
-        root_key: KeyCell,
-    },
+pub mod events {
+
+    #[derive(Clone, Copy)]
+    pub struct Bootstrapped;
+
+    #[derive(Clone, Copy)]
+    pub struct Unsealed;
+
+    #[derive(Clone, Copy)]
+    pub struct VaultResealed;
 }

 #[derive(Debug, thiserror::Error)]
-pub enum KeyHolderError {
-    #[error("Keyholder is already bootstrapped")]
+pub enum Error {
+    #[error("Vault is already bootstrapped")]
    AlreadyBootstrapped,
+    #[error("Vault is not bootstrapped")]
+    NotBootstrapped,
+    #[error("Vault is sealed")]
+    Sealed,
+    #[error("Invalid key provided")]
+    InvalidKey,

-    #[error("Broken database")]
-    BrokenDatabase,
+    #[error("Requested aead entry not found")]
+    NotFound,
+
+    #[error("Encryption error: {0}")]
+    Encryption(#[from] chacha20poly1305::aead::Error),

    #[error("Database error: {0}")]
    DatabaseConnection(#[from] db::PoolError),
@@ -49,32 +57,39 @@ pub enum KeyHolderError {
    #[error("Database transaction error: {0}")]
    DatabaseTransaction(#[from] diesel::result::Error),

-    #[error("Encryption error: {0}")]
-    Encryption(#[from] chacha20poly1305::aead::Error),
+    #[error("Broken database")]
+    BrokenDatabase,
+}

-    #[error("Invalid key provided")]
-    InvalidKey,
+struct Unsealed {
+    root_key_history_id: i32,
+    root_key: KeyCell,
+}

-    #[error("Keyholder is not bootstrapped")]
-    NotBootstrapped,
-
-    #[error("Requested aead entry not found")]
-    NotFound,
+#[derive(Default, EnumDiscriminants)]
+#[strum_discriminants(derive(Reply), vis(pub), name(VaultState))]
+enum State {
+    #[default]
+    Unbootstrapped,
+    Sealed {
+        root_key_history_id: i32,
+    },
+    Unsealed(Unsealed),
 }

 /// Manages vault root key and tracks current state of the vault (bootstrapped/unbootstrapped, sealed/unsealed).
-///
 /// Provides API for encrypting and decrypting data using the vault root key.
 /// Abstraction over database to make sure nonces are never reused and encryption keys are never exposed in plaintext outside of this actor.
 #[derive(Actor)]
-pub struct KeyHolder {
+pub struct Vault {
    db: db::DatabasePool,
    state: State,
+    events: ActorRef<MessageBus>,
 }

 #[messages]
-impl KeyHolder {
-    pub async fn new(db: db::DatabasePool) -> Result<Self, KeyHolderError> {
+impl Vault {
+    pub async fn new(db: db::DatabasePool, events: ActorRef<MessageBus>) -> Result<Self, Error> {
        let state = {
            let mut conn = db.get().await?;

@@ -92,15 +107,12 @@ impl KeyHolder {
            }
        };

-        Ok(Self { db, state })
+        Ok(Self { db, state, events })
    }

-    // Exclusive transaction to avoid race condtions if multiple keyholders write
+    // Exclusive transaction to avoid race condtions if multiple vaults write
    // additional layer of protection against nonce-reuse
-    async fn get_new_nonce(
-        pool: &db::DatabasePool,
-        root_key_id: i32,
-    ) -> Result<Nonce, KeyHolderError> {
+    async fn get_new_nonce(pool: &db::DatabasePool, root_key_id: i32) -> Result<Nonce, Error> {
        let mut conn = pool.get().await?;

        let nonce = conn
@@ -112,12 +124,12 @@ impl KeyHolder {
                        .first(conn)
                        .await?;

-                    let mut nonce = Nonce::try_from(current_nonce.as_slice()).map_err(|()| {
+                    let mut nonce = Nonce::try_from(current_nonce.as_slice()).map_err(|_| {
                        error!(
                            "Broken database: invalid nonce for root key history id={}",
                            root_key_id
                        );
-                        KeyHolderError::BrokenDatabase
+                        Error::BrokenDatabase
                    })?;
                    nonce.increment();

@@ -127,7 +139,7 @@ impl KeyHolder {
                        .execute(conn)
                        .await?;

-                    Result::<_, KeyHolderError>::Ok(nonce)
+                    Result::<_, Error>::Ok(nonce)
                })
            })
            .await?;
@@ -135,13 +147,18 @@ impl KeyHolder {
        Ok(nonce)
    }

+    fn expect_unsealed(state: &mut State) -> Result<&mut Unsealed, Error> {
+        match state {
+            State::Unsealed(unsealed) => Ok(unsealed),
+            State::Unbootstrapped => Err(Error::NotBootstrapped),
+            State::Sealed { .. } => Err(Error::Sealed),
+        }
+    }
+
    #[message]
-    pub async fn bootstrap(
-        &mut self,
-        seal_key_raw: SafeCell<Vec<u8>>,
-    ) -> Result<(), KeyHolderError> {
+    pub async fn bootstrap(&mut self, seal_key_raw: SafeCell<Vec<u8>>) -> Result<(), Error> {
        if !matches!(self.state, State::Unbootstrapped) {
-            return Err(KeyHolderError::AlreadyBootstrapped);
+            return Err(Error::AlreadyBootstrapped);
        }
        let salt = v1::generate_salt();
        let mut seal_key = derive_key(seal_key_raw, &salt);
@@ -157,7 +174,7 @@ impl KeyHolder {
                .encrypt(&root_key_nonce, v1::ROOT_KEY_TAG, root_key_reader)
                .map_err(|err| {
                    error!(?err, "Fatal bootstrap error");
-                    KeyHolderError::Encryption(err)
+                    Error::Encryption(err)
                })
        })?;

@@ -190,26 +207,24 @@ impl KeyHolder {
            })
            .await?;

-        self.state = State::Unsealed {
+        self.state = State::Unsealed(Unsealed {
            root_key,
            root_key_history_id,
-        };
+        });

-        info!("Keyholder bootstrapped successfully");
+        info!("Vault bootstrapped successfully");
+        self.events.tell(Publish(events::Bootstrapped)).await;

        Ok(())
    }

    #[message]
-    pub async fn try_unseal(
-        &mut self,
-        seal_key_raw: SafeCell<Vec<u8>>,
-    ) -> Result<(), KeyHolderError> {
+    pub async fn try_unseal(&mut self, seal_key_raw: SafeCell<Vec<u8>>) -> Result<(), Error> {
        let State::Sealed {
            root_key_history_id,
        } = &self.state
        else {
-            return Err(KeyHolderError::NotBootstrapped);
+            return Err(Error::NotBootstrapped);
        };

        // We don't want to hold connection while doing expensive KDF work
@@ -225,16 +240,16 @@ impl KeyHolder {
        let salt = &current_key.salt;
        let salt = v1::Salt::try_from(salt.as_slice()).map_err(|_| {
            error!("Broken database: invalid salt for root key");
-            KeyHolderError::BrokenDatabase
+            Error::BrokenDatabase
        })?;
        let mut seal_key = derive_key(seal_key_raw, &salt);

        let mut root_key = SafeCell::new(current_key.ciphertext.clone());

-        let nonce = Nonce::try_from(current_key.root_key_encryption_nonce.as_slice()).map_err(
-            |()| {
+        let nonce = v1::Nonce::try_from(current_key.root_key_encryption_nonce.as_slice()).map_err(
+            |_| {
                error!("Broken database: invalid nonce for root key");
-                KeyHolderError::BrokenDatabase
+                Error::BrokenDatabase
            },
        )?;

@@ -242,27 +257,26 @@ impl KeyHolder {
            .decrypt_in_place(&nonce, v1::ROOT_KEY_TAG, &mut root_key)
            .map_err(|err| {
                error!(?err, "Failed to unseal root key: invalid seal key");
-                KeyHolderError::InvalidKey
+                Error::InvalidKey
            })?;

-        self.state = State::Unsealed {
+        self.state = State::Unsealed(Unsealed {
            root_key_history_id: current_key.id,
            root_key: KeyCell::try_from(root_key).map_err(|err| {
                error!(?err, "Broken database: invalid encryption key size");
-                KeyHolderError::BrokenDatabase
+                Error::BrokenDatabase
            })?,
-        };
+        });

-        info!("Keyholder unsealed successfully");
+        info!("Vault unsealed successfully");
+        self.events.tell(Publish(events::Unsealed)).await;

        Ok(())
    }

    #[message]
-    pub async fn decrypt(&mut self, aead_id: i32) -> Result<SafeCell<Vec<u8>>, KeyHolderError> {
-        let State::Unsealed { root_key, .. } = &mut self.state else {
-            return Err(KeyHolderError::NotBootstrapped);
-        };
+    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 row: models::AeadEncrypted = {
            let mut conn = self.db.get().await?;
@@ -272,15 +286,15 @@ impl KeyHolder {
                .first(&mut conn)
                .await
                .optional()?
-                .ok_or(KeyHolderError::NotFound)?
+                .ok_or(Error::NotFound)?
        };

-        let nonce = Nonce::try_from(row.current_nonce.as_slice()).map_err(|()| {
+        let nonce = v1::Nonce::try_from(row.current_nonce.as_slice()).map_err(|_| {
            error!(
                "Broken database: invalid nonce for aead_encrypted id={}",
                aead_id
            );
-            KeyHolderError::BrokenDatabase
+            Error::BrokenDatabase
        })?;
        let mut output = SafeCell::new(row.ciphertext);
        root_key.decrypt_in_place(&nonce, v1::TAG, &mut output)?;
@@ -289,18 +303,11 @@ impl KeyHolder {

    // Creates new `aead_encrypted` entry in the database and returns it's ID
    #[message]
-    pub async fn create_new(
-        &mut self,
-        mut plaintext: SafeCell<Vec<u8>>,
-    ) -> Result<i32, KeyHolderError> {
-        let State::Unsealed {
+    pub async fn create_new(&mut self, mut plaintext: SafeCell<Vec<u8>>) -> Result<i32, Error> {
+        let Unsealed {
            root_key,
            root_key_history_id,
-            ..
-        } = &mut self.state
-        else {
-            return Err(KeyHolderError::NotBootstrapped);
-        };
+        } = Self::expect_unsealed(&mut self.state)?;

        // 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
@@ -330,23 +337,22 @@ impl KeyHolder {
    }

    #[message]
-    pub fn get_state(&self) -> KeyHolderState {
+    pub fn get_state(&self) -> VaultState {
        self.state.discriminant()
    }

    #[message]
-    pub fn sign_integrity(&mut self, mac_input: Vec<u8>) -> Result<(i32, Vec<u8>), KeyHolderError> {
-        let State::Unsealed {
+    pub fn sign_integrity(&mut self, mac_input: Vec<u8>) -> Result<(i32, Vec<u8>), Error> {
+        let Unsealed {
            root_key,
            root_key_history_id,
-        } = &mut self.state
-        else {
-            return Err(KeyHolderError::NotBootstrapped);
-        };
+        } = Self::expect_unsealed(&mut self.state)?;

-        let mut hmac = root_key.0.read_inline(|k| {
-            HmacSha256::new_from_slice(k)
-                .unwrap_or_else(|_| unreachable!("HMAC accepts keys of any size"))
+        let mut hmac = root_key
+            .0
+            .read_inline(|k| match HmacSha256::new_from_slice(k) {
+                Ok(v) => v,
+                Err(_) => unreachable!("HMAC accepts keys of any size"),
            });
        hmac.update(&root_key_history_id.to_be_bytes());
        hmac.update(&mac_input);
@@ -361,22 +367,21 @@ impl KeyHolder {
        mac_input: Vec<u8>,
        expected_mac: Vec<u8>,
        key_version: i32,
-    ) -> Result<bool, KeyHolderError> {
-        let State::Unsealed {
+    ) -> Result<bool, Error> {
+        let Unsealed {
            root_key,
            root_key_history_id,
-        } = &mut self.state
-        else {
-            return Err(KeyHolderError::NotBootstrapped);
-        };
+        } = Self::expect_unsealed(&mut self.state)?;

        if *root_key_history_id != key_version {
            return Ok(false);
        }

-        let mut hmac = root_key.0.read_inline(|k| {
-            HmacSha256::new_from_slice(k)
-                .unwrap_or_else(|_| unreachable!("HMAC accepts keys of any size"))
+        let mut hmac = root_key
+            .0
+            .read_inline(|k| match HmacSha256::new_from_slice(k) {
+                Ok(v) => v,
+                Err(_) => unreachable!("HMAC accepts keys of any size"),
            });
        hmac.update(&key_version.to_be_bytes());
        hmac.update(&mac_input);
@@ -385,29 +390,38 @@ impl KeyHolder {
    }

    #[message]
-    pub fn seal(&mut self) -> Result<(), KeyHolderError> {
-        let State::Unsealed {
+    pub async fn seal(&mut self) -> Result<(), Error> {
+        let Unsealed {
            root_key_history_id,
            ..
-        } = &self.state
-        else {
-            return Err(KeyHolderError::NotBootstrapped);
-        };
+        } = Self::expect_unsealed(&mut self.state)?;
+
        self.state = State::Sealed {
            root_key_history_id: *root_key_history_id,
        };
+        self.events.tell(Publish(events::VaultResealed)).await;
        Ok(())
    }
 }

 #[cfg(test)]
 mod tests {
-    use arbiter_crypto::safecell::SafeCellHandle as _;
+    use diesel::SelectableHelper;
+
+    use diesel_async::RunQueryDsl;
+
+    use crate::{
+        actors::GlobalActors,
+        db::{self},
+    };
+    use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};

    use super::*;

-    async fn bootstrapped_actor(db: &db::DatabasePool) -> KeyHolder {
-        let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+    async fn bootstrapped_actor(db: &db::DatabasePool) -> Vault {
+        let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+            .await
+            .unwrap();
        let seal_key = SafeCell::new(b"test-seal-key".to_vec());
        actor.bootstrap(seal_key).await.unwrap();
        actor
@@ -418,25 +432,25 @@ mod tests {
    async fn nonce_monotonic_even_when_nonce_allocation_interleaves() {
        let db = db::create_test_pool().await;
        let mut actor = bootstrapped_actor(&db).await;
-        let State::Unsealed {
+        let root_key_history_id = match actor.state {
+            State::Unsealed(Unsealed {
                root_key_history_id,
                ..
-        } = actor.state
-        else {
-            panic!("expected unsealed state");
+            }) => root_key_history_id,
+            _ => panic!("expected unsealed state"),
        };

-        let n1 = KeyHolder::get_new_nonce(&db, root_key_history_id)
+        let n1 = Vault::get_new_nonce(&db, root_key_history_id)
            .await
            .unwrap();
-        let n2 = KeyHolder::get_new_nonce(&db, root_key_history_id)
+        let n2 = Vault::get_new_nonce(&db, root_key_history_id)
            .await
            .unwrap();
        assert!(n2.to_vec() > n1.to_vec(), "nonce must increase");

        let mut conn = db.get().await.unwrap();
-        let root_row = schema::root_key_history::table
-            .select(RootKeyHistory::as_select())
+        let root_row: models::RootKeyHistory = schema::root_key_history::table
+            .select(models::RootKeyHistory::as_select())
            .first(&mut conn)
            .await
            .unwrap();
--- a/server/crates/arbiter-server/src/context/mod.rs
+++ b/server/crates/arbiter-server/src/context/mod.rs
@@ -25,22 +25,22 @@ pub enum InitError {
    Tls(#[from] tls::InitError),

    #[error("Actor spawn failed: {0}")]
-    ActorSpawn(#[from] crate::actors::GlobalActorsSpawnError),
+    ActorSpawn(#[from] crate::actors::SpawnError),

    #[error("I/O Error: {0}")]
    Io(#[from] std::io::Error),
 }

-pub struct __ServerContextInner {
+pub struct _ServerContextInner {
    pub db: db::DatabasePool,
    pub tls: TlsManager,
    pub actors: GlobalActors,
 }
 #[derive(Clone)]
-pub struct ServerContext(Arc<__ServerContextInner>);
+pub struct ServerContext(Arc<_ServerContextInner>);

 impl std::ops::Deref for ServerContext {
-    type Target = __ServerContextInner;
+    type Target = _ServerContextInner;

    fn deref(&self) -> &Self::Target {
        &self.0
@@ -49,7 +49,7 @@ impl std::ops::Deref for ServerContext {

 impl ServerContext {
    pub async fn new(db: db::DatabasePool) -> Result<Self, InitError> {
-        Ok(Self(Arc::new(__ServerContextInner {
+        Ok(Self(Arc::new(_ServerContextInner {
            actors: GlobalActors::spawn(db.clone()).await?,
            tls: TlsManager::new(db.clone()).await?,
            db,
--- a/server/crates/arbiter-server/src/context/tls.rs
+++ b/server/crates/arbiter-server/src/context/tls.rs
@@ -22,10 +22,9 @@ use crate::db::{
 };

 const ENCODE_CONFIG: pem::EncodeConfig = {
-    let line_ending = if cfg!(target_family = "windows") {
-        pem::LineEnding::CRLF
-    } else {
-        pem::LineEnding::LF
+    let line_ending = match cfg!(target_family = "windows") {
+        true => pem::LineEnding::CRLF,
+        false => pem::LineEnding::LF,
    };
    pem::EncodeConfig::new().set_line_ending(line_ending)
 };
@@ -53,14 +52,11 @@ pub enum InitError {

 pub type PemCert = String;

-pub fn encode_cert_to_pem(cert: &CertificateDer<'_>) -> PemCert {
+pub fn encode_cert_to_pem(cert: &CertificateDer) -> PemCert {
    pem::encode_config(&Pem::new("CERTIFICATE", cert.to_vec()), ENCODE_CONFIG)
 }

-#[expect(
-    unused,
-    reason = "may be needed for future cert rotation implementation"
-)]
+#[allow(unused)]
 struct SerializedTls {
    cert_pem: PemCert,
    cert_key_pem: String,
@@ -89,7 +85,7 @@ impl TlsCa {

        let cert_key_pem = certified_issuer.key().serialize_pem();

-        #[expect(
+        #[allow(
            clippy::unwrap_used,
            reason = "Broken cert couldn't bootstrap server anyway"
        )]
@@ -128,11 +124,7 @@ impl TlsCa {
        })
    }

-    #[expect(
-        unused,
-        clippy::unnecessary_wraps,
-        reason = "may be needed for future cert rotation implementation"
-    )]
+    #[allow(unused)]
    fn serialize(&self) -> Result<SerializedTls, InitError> {
        let cert_key_pem = self.issuer.key().serialize_pem();
        Ok(SerializedTls {
@@ -141,10 +133,7 @@ impl TlsCa {
        })
    }

-    #[expect(
-        unused,
-        reason = "may be needed for future cert rotation implementation"
-    )]
+    #[allow(unused)]
    fn try_deserialize(cert_pem: &str, cert_key_pem: &str) -> Result<Self, InitError> {
        let keypair =
            KeyPair::from_pem(cert_key_pem).map_err(InitError::KeyDeserializationError)?;
@@ -245,10 +234,10 @@ impl TlsManager {
        }
    }

-    pub const fn cert(&self) -> &CertificateDer<'static> {
+    pub fn cert(&self) -> &CertificateDer<'static> {
        &self.cert
    }
-    pub const fn ca_cert(&self) -> &CertificateDer<'static> {
+    pub fn ca_cert(&self) -> &CertificateDer<'static> {
        &self.ca_cert
    }

--- a/server/crates/arbiter-server/src/crypto/encryption/v1.rs
+++ b/server/crates/arbiter-server/src/crypto/encryption/v1.rs
@@ -5,8 +5,8 @@ use rand::{
    rngs::{StdRng, SysRng},
 };

-pub const ROOT_KEY_TAG: &[u8] = b"arbiter/seal/v1";
-pub const TAG: &[u8] = b"arbiter/private-key/v1";
+pub const ROOT_KEY_TAG: &[u8] = "arbiter/seal/v1".as_bytes();
+pub const TAG: &[u8] = "arbiter/private-key/v1".as_bytes();

 pub const NONCE_LENGTH: usize = 24;

@@ -15,16 +15,14 @@ pub struct Nonce(pub [u8; NONCE_LENGTH]);
 impl Nonce {
    pub fn increment(&mut self) {
        for i in (0..self.0.len()).rev() {
-            if let Some(byte) = self.0.get_mut(i) {
-                if *byte == 0xFF {
-                    *byte = 0;
+            if self.0[i] == 0xFF {
+                self.0[i] = 0;
            } else {
-                    *byte += 1;
+                self.0[i] += 1;
                break;
            }
        }
    }
-    }

    pub fn to_vec(&self) -> Vec<u8> {
        self.0.to_vec()
@@ -47,14 +45,19 @@ pub type Salt = [u8; ArgonSalt::RECOMMENDED_LENGTH];

 pub fn generate_salt() -> Salt {
    let mut salt = Salt::default();
-    let mut rng =
-        StdRng::try_from_rng(&mut SysRng).expect("Rng failure is unrecoverable and should panic");
+    #[allow(
+        clippy::unwrap_used,
+        reason = "Rng failure is unrecoverable and should panic"
+    )]
+    let mut rng = StdRng::try_from_rng(&mut SysRng).unwrap();
    rng.fill_bytes(&mut salt);
    salt
 }

 #[cfg(test)]
 mod tests {
+    use std::ops::Deref as _;
+
    use super::*;
    use crate::crypto::derive_key;
    use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
@@ -72,7 +75,7 @@ mod tests {
        let key1_reader = key1.0.read();
        let key2_reader = key2.0.read();

-        assert_eq!(&*key1_reader, &*key2_reader);
+        assert_eq!(key1_reader.deref(), key2_reader.deref());
    }

    #[test]
@@ -83,13 +86,14 @@ mod tests {

        let mut key = derive_key(password, &salt);
        let key_reader = key.0.read();
+        let key_ref = key_reader.deref();

-        assert_ne!(key_reader.as_slice(), &[0u8; 32][..]);
+        assert_ne!(key_ref.as_slice(), &[0u8; 32][..]);
    }

    #[test]
    // We should fuzz this
-    pub fn nonce_increment() {
+    pub fn test_nonce_increment() {
        let mut nonce = Nonce([0u8; NONCE_LENGTH]);
        nonce.increment();

--- a/server/crates/arbiter-server/src/crypto/integrity/v1.rs
+++ b/server/crates/arbiter-server/src/crypto/integrity/v1.rs
@@ -1,5 +1,7 @@
-use crate::actors::keyholder;
-use arbiter_crypto::hashing::Hashable;
+use crate::{
+    actors::vault::{self, GetState},
+    crypto::integrity::hashing::Hashable,
+};
 use hmac::Hmac;
 use sha2::Sha256;

@@ -8,8 +10,10 @@ use diesel_async::{AsyncConnection, RunQueryDsl};
 use kameo::{actor::ActorRef, error::SendError};
 use sha2::Digest as _;

+pub mod hashing;
+
 use crate::{
-    actors::keyholder::{KeyHolder, SignIntegrity, VerifyIntegrity},
+    actors::vault::{SignIntegrity, Vault, VerifyIntegrity},
    db::{
        self,
        models::{IntegrityEnvelope, NewIntegrityEnvelope},
@@ -18,15 +22,15 @@ use crate::{
 };

 #[derive(Debug, thiserror::Error)]
-pub enum IntegrityError {
+pub enum Error {
    #[error("Database error: {0}")]
    Database(#[from] db::DatabaseError),

-    #[error("KeyHolder error: {0}")]
-    Keyholder(#[from] keyholder::KeyHolderError),
+    #[error("Vault error: {0}")]
+    Vault(#[from] vault::Error),

-    #[error("KeyHolder mailbox error")]
-    KeyholderSend,
+    #[error("Vault mailbox error")]
+    VaultSend,

    #[error("Integrity envelope is missing for entity {entity_kind}")]
    MissingEnvelope { entity_kind: &'static str },
@@ -67,11 +71,6 @@ fn payload_hash(payload: &impl Hashable) -> [u8; 32] {
 }

 fn push_len_prefixed(out: &mut Vec<u8>, bytes: &[u8]) {
-    #[expect(
-        clippy::cast_possible_truncation,
-        clippy::as_conversions,
-        reason = "fixme! #85"
-    )]
    out.extend_from_slice(&(bytes.len() as u32).to_be_bytes());
    out.extend_from_slice(bytes);
 }
@@ -108,22 +107,23 @@ impl IntoId for &'_ [u8] {

 pub async fn sign_entity<E: Integrable>(
    conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
    entity: &E,
    entity_id: impl IntoId,
-) -> Result<(), IntegrityError> {
+) -> Result<(), Error> {
    let payload_hash = payload_hash(&entity);

    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) = keyholder
+    let (key_version, mac) =
+        vault
            .ask(SignIntegrity { mac_input })
            .await
            .map_err(|err| match err {
-            SendError::HandlerError(inner) => IntegrityError::Keyholder(inner),
-            _ => IntegrityError::KeyholderSend,
+                kameo::error::SendError::HandlerError(inner) => Error::Vault(inner),
+                _ => Error::VaultSend,
            })?;

    insert_into(integrity_envelope::table)
@@ -132,7 +132,7 @@ pub async fn sign_entity<E: Integrable>(
            entity_id,
            payload_version: E::VERSION,
            key_version,
-            mac: mac.clone(),
+            mac: mac.to_vec(),
        })
        .on_conflict((
            integrity_envelope::entity_id,
@@ -153,10 +153,10 @@ pub async fn sign_entity<E: Integrable>(

 pub async fn verify_entity<E: Integrable>(
    conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
    entity: &E,
    entity_id: impl IntoId,
-) -> Result<AttestationStatus, IntegrityError> {
+) -> Result<AttestationStatus, Error> {
    let entity_id = entity_id.into_id();
    let envelope: IntegrityEnvelope = integrity_envelope::table
        .filter(integrity_envelope::entity_kind.eq(E::KIND))
@@ -164,14 +164,14 @@ pub async fn verify_entity<E: Integrable>(
        .first(conn)
        .await
        .map_err(|err| match err {
-            diesel::result::Error::NotFound => IntegrityError::MissingEnvelope {
+            diesel::result::Error::NotFound => Error::MissingEnvelope {
                entity_kind: E::KIND,
            },
-            other => IntegrityError::Database(db::DatabaseError::from(other)),
+            other => Error::Database(db::DatabaseError::from(other)),
        })?;

    if envelope.payload_version != E::VERSION {
-        return Err(IntegrityError::PayloadVersionMismatch {
+        return Err(Error::PayloadVersionMismatch {
            entity_kind: E::KIND,
            expected: E::VERSION,
            found: envelope.payload_version,
@@ -181,7 +181,7 @@ pub async fn verify_entity<E: Integrable>(
    let payload_hash = payload_hash(&entity);
    let mac_input = build_mac_input(E::KIND, &entity_id, envelope.payload_version, &payload_hash);

-    let result = keyholder
+    let result = vault
        .ask(VerifyIntegrity {
            mac_input,
            expected_mac: envelope.mac,
@@ -191,40 +191,63 @@ pub async fn verify_entity<E: Integrable>(

    match result {
        Ok(true) => Ok(AttestationStatus::Attested),
-        Ok(false) => Err(IntegrityError::MacMismatch {
+        Ok(false) => Err(Error::MacMismatch {
            entity_kind: E::KIND,
        }),
-        Err(SendError::HandlerError(keyholder::KeyHolderError::NotBootstrapped)) => {
+        Err(SendError::HandlerError(vault::Error::Sealed)) => {
            Ok(AttestationStatus::Unavailable)
        }
-        Err(_) => Err(IntegrityError::KeyholderSend),
+        Err(_) => Err(Error::VaultSend),
    }
 }

+pub async fn is_signing_available(vault: &ActorRef<Vault>) -> Result<bool, Error> {
+    let state = vault.ask(GetState).await.map_err(|_| Error::VaultSend)?;
+    Ok(matches!(state, vault::VaultState::Unsealed))
+}
+
 #[cfg(test)]
 mod tests {
    use diesel::{ExpressionMethods as _, QueryDsl};
    use diesel_async::RunQueryDsl;
    use kameo::{actor::ActorRef, prelude::Spawn};

+    use sha2::Digest;
+
    use crate::{
-        actors::keyholder::{Bootstrap, KeyHolder},
+        actors::{
+            GlobalActors,
+            vault::{Bootstrap, Vault},
+        },
        db::{self, schema},
    };
    use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};

-    use super::{Integrable, IntegrityError, sign_entity, verify_entity};
-    #[derive(Clone, arbiter_macros::Hashable)]
+    use super::hashing::Hashable;
+    use super::{Error, Integrable, sign_entity, verify_entity};
+
+    #[derive(Clone)]
    struct DummyEntity {
        payload_version: i32,
        payload: Vec<u8>,
    }
+
+    impl Hashable for DummyEntity {
+        fn hash<H: Digest>(&self, hasher: &mut H) {
+            self.payload_version.hash(hasher);
+            self.payload.hash(hasher);
+        }
+    }
    impl Integrable for DummyEntity {
        const KIND: &'static str = "dummy_entity";
    }

-    async fn bootstrapped_keyholder(db: &db::DatabasePool) -> ActorRef<KeyHolder> {
-        let actor = KeyHolder::spawn(KeyHolder::new(db.clone()).await.unwrap());
+    async fn bootstrapped_vault(db: &db::DatabasePool) -> ActorRef<Vault> {
+        let actor = Vault::spawn(
+            Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+                .await
+                .unwrap(),
+        );
        actor
            .ask(Bootstrap {
                seal_key_raw: SafeCell::new(b"integrity-test-seal-key".to_vec()),
@@ -236,18 +259,18 @@ mod tests {

    #[tokio::test]
    async fn sign_writes_envelope_and_verify_passes() {
-        const ENTITY_ID: &[u8] = b"entity-id-7";
-
        let db = db::create_test_pool().await;
-        let keyholder = bootstrapped_keyholder(&db).await;
+        let vault = bootstrapped_vault(&db).await;
        let mut conn = db.get().await.unwrap();

+        const ENTITY_ID: &[u8] = b"entity-id-7";
+
        let entity = DummyEntity {
            payload_version: 1,
            payload: b"payload-v1".to_vec(),
        };

-        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
            .await
            .unwrap();

@@ -260,25 +283,25 @@ mod tests {
            .unwrap();

        assert_eq!(count, 1, "envelope row must be created exactly once");
-        verify_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        verify_entity(&mut conn, &vault, &entity, ENTITY_ID)
            .await
            .unwrap();
    }

    #[tokio::test]
    async fn tampered_mac_fails_verification() {
-        const ENTITY_ID: &[u8] = b"entity-id-11";
-
        let db = db::create_test_pool().await;
-        let keyholder = bootstrapped_keyholder(&db).await;
+        let vault = bootstrapped_vault(&db).await;
        let mut conn = db.get().await.unwrap();

+        const ENTITY_ID: &[u8] = b"entity-id-11";
+
        let entity = DummyEntity {
            payload_version: 1,
            payload: b"payload-v1".to_vec(),
        };

-        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
            .await
            .unwrap();

@@ -290,26 +313,26 @@ mod tests {
            .await
            .unwrap();

-        let err = verify_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        let err = verify_entity(&mut conn, &vault, &entity, ENTITY_ID)
            .await
            .unwrap_err();
-        assert!(matches!(err, IntegrityError::MacMismatch { .. }));
+        assert!(matches!(err, Error::MacMismatch { .. }));
    }

    #[tokio::test]
    async fn changed_payload_fails_verification() {
-        const ENTITY_ID: &[u8] = b"entity-id-21";
-
        let db = db::create_test_pool().await;
-        let keyholder = bootstrapped_keyholder(&db).await;
+        let vault = bootstrapped_vault(&db).await;
        let mut conn = db.get().await.unwrap();

+        const ENTITY_ID: &[u8] = b"entity-id-21";
+
        let entity = DummyEntity {
            payload_version: 1,
            payload: b"payload-v1".to_vec(),
        };

-        sign_entity(&mut conn, &keyholder, &entity, ENTITY_ID)
+        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
            .await
            .unwrap();

@@ -318,9 +341,9 @@ mod tests {
            ..entity
        };

-        let err = verify_entity(&mut conn, &keyholder, &tampered, ENTITY_ID)
+        let err = verify_entity(&mut conn, &vault, &tampered, ENTITY_ID)
            .await
            .unwrap_err();
-        assert!(matches!(err, IntegrityError::MacMismatch { .. }));
+        assert!(matches!(err, Error::MacMismatch { .. }));
    }
 }
--- a/server/crates/arbiter-server/src/crypto/integrity/v1/hashing.rs
+++ b/server/crates/arbiter-server/src/crypto/integrity/v1/hashing.rs
@@ -1,11 +1,7 @@
-pub use hmac::digest::Digest;
+use hmac::digest::Digest;
 use std::collections::HashSet;

 /// Deterministically hash a value by feeding its fields into the hasher in a consistent order.
-#[diagnostic::on_unimplemented(
-    note = "for local types consider adding `#[derive(arbiter_macros::Hashable)]` to your `{Self}` type",
-    note = "for types from other crates check whether the crate offers a `Hashable` implementation"
-)]
 pub trait Hashable {
    fn hash<H: Digest>(&self, hasher: &mut H);
 }
@@ -49,7 +45,7 @@ impl<T: Hashable + PartialOrd> Hashable for Vec<T> {
    }
 }

-impl<T: Hashable + PartialOrd, S: std::hash::BuildHasher> Hashable for HashSet<T, S> {
+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<_>>();
--- a/server/crates/arbiter-server/src/crypto/mod.rs
+++ b/server/crates/arbiter-server/src/crypto/mod.rs
@@ -1,3 +1,5 @@
+use std::ops::Deref as _;
+
 use argon2::{Algorithm, Argon2};
 use chacha20poly1305::{
    AeadInPlace, Key, KeyInit as _, XChaCha20Poly1305, XNonce,
@@ -39,8 +41,11 @@ impl TryFrom<SafeCell<Vec<u8>>> for KeyCell {
 impl KeyCell {
    pub fn new_secure_random() -> Self {
        let key = SafeCell::new_inline(|key_buffer: &mut Key| {
-            let mut rng = StdRng::try_from_rng(&mut SysRng)
-                .expect("Rng failure is unrecoverable and should panic");
+            #[allow(
+                clippy::unwrap_used,
+                reason = "Rng failure is unrecoverable and should panic"
+            )]
+            let mut rng = StdRng::try_from_rng(&mut SysRng).unwrap();
            rng.fill_bytes(key_buffer);
        });

@@ -54,7 +59,8 @@ impl KeyCell {
        mut buffer: impl AsMut<Vec<u8>>,
    ) -> Result<(), Error> {
        let key_reader = self.0.read();
-        let cipher = XChaCha20Poly1305::new(&key_reader);
+        let key_ref = key_reader.deref();
+        let cipher = XChaCha20Poly1305::new(key_ref);
        let nonce = XNonce::from_slice(nonce.0.as_ref());
        let buffer = buffer.as_mut();
        cipher.encrypt_in_place(nonce, associated_data, buffer)
@@ -66,7 +72,8 @@ impl KeyCell {
        buffer: &mut SafeCell<Vec<u8>>,
    ) -> Result<(), Error> {
        let key_reader = self.0.read();
-        let cipher = XChaCha20Poly1305::new(&key_reader);
+        let key_ref = key_reader.deref();
+        let cipher = XChaCha20Poly1305::new(key_ref);
        let nonce = XNonce::from_slice(nonce.0.as_ref());
        let mut buffer = buffer.write();
        let buffer: &mut Vec<u8> = buffer.as_mut();
@@ -80,7 +87,8 @@ impl KeyCell {
        plaintext: impl AsRef<[u8]>,
    ) -> Result<Vec<u8>, Error> {
        let key_reader = self.0.read();
-        let mut cipher = XChaCha20Poly1305::new(&key_reader);
+        let key_ref = key_reader.deref();
+        let mut cipher = XChaCha20Poly1305::new(key_ref);
        let nonce = XNonce::from_slice(nonce.0.as_ref());

        let ciphertext = cipher.encrypt(
@@ -108,15 +116,20 @@ pub fn derive_key(mut password: SafeCell<Vec<u8>>, salt: &Salt) -> KeyCell {
        }
    };

+    #[allow(clippy::unwrap_used)]
    let hasher = Argon2::new(Algorithm::Argon2id, argon2::Version::V0x13, params);
    let mut key = SafeCell::new(Key::default());
    password.read_inline(|password_source| {
        let mut key_buffer = key.write();
        let key_buffer: &mut [u8] = key_buffer.as_mut();

+        #[allow(
+            clippy::unwrap_used,
+            reason = "Better fail completely than return a weak key"
+        )]
        hasher
-            .hash_password_into(password_source, salt, key_buffer)
-            .expect("Better fail completely than return a weak key");
+            .hash_password_into(password_source.deref(), salt, key_buffer)
+            .unwrap();
    });

    key.into()
--- a/server/crates/arbiter-server/src/db/mod.rs
+++ b/server/crates/arbiter-server/src/db/mod.rs
@@ -23,14 +23,14 @@ const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations");

 #[derive(Error, Debug)]
 pub enum DatabaseSetupError {
-    #[error(transparent)]
-    ConcurrencySetup(diesel::result::Error),
+    #[error("Failed to determine home directory")]
+    HomeDir(std::io::Error),

    #[error(transparent)]
    Connection(diesel::ConnectionError),

-    #[error("Failed to determine home directory")]
-    HomeDir(std::io::Error),
+    #[error(transparent)]
+    ConcurrencySetup(diesel::result::Error),

    #[error(transparent)]
    Migration(Box<dyn std::error::Error + Send + Sync>),
@@ -41,11 +41,10 @@ pub enum DatabaseSetupError {

 #[derive(Error, Debug)]
 pub enum DatabaseError {
-    #[error("Database query error")]
-    Connection(#[from] diesel::result::Error),
-
    #[error("Database connection error")]
    Pool(#[from] PoolError),
+    #[error("Database query error")]
+    Connection(#[from] diesel::result::Error),
 }

 #[tracing::instrument(level = "info")]
@@ -94,16 +93,13 @@ fn initialize_database(url: &str) -> Result<(), DatabaseSetupError> {
 }

 #[tracing::instrument(level = "info")]
-/// Creates a connection pool for the `SQLite` database.
-///
-/// # Panics
-/// Panics if the database path is not valid UTF-8.
 pub async fn create_pool(url: Option<&str>) -> Result<DatabasePool, DatabaseSetupError> {
    let database_url = url.map(String::from).unwrap_or(
+        #[allow(clippy::expect_used)]
        database_path()?
            .to_str()
            .expect("database path is not valid UTF-8")
-            .to_owned(),
+            .to_string(),
    );

    initialize_database(&database_url)?;
@@ -138,19 +134,19 @@ pub async fn create_pool(url: Option<&str>) -> Result<DatabasePool, DatabaseSetu
 }

 #[mutants::skip]
-#[expect(clippy::missing_panics_doc, reason = "Tests oriented function")]
-/// Creates a test database pool with a temporary `SQLite` database file.
 pub async fn create_test_pool() -> DatabasePool {
    use rand::distr::{Alphanumeric, SampleString as _};

    let tempfile_name = Alphanumeric.sample_string(&mut rand::rng(), 16);

    let file = std::env::temp_dir().join(tempfile_name);
+    #[allow(clippy::expect_used)]
    let url = file
        .to_str()
        .expect("temp file path is not valid UTF-8")
-        .to_owned();
+        .to_string();

+    #[allow(clippy::expect_used)]
    create_pool(Some(&url))
        .await
        .expect("Failed to create test database pool")
--- a/server/crates/arbiter-server/src/db/models.rs
+++ b/server/crates/arbiter-server/src/db/models.rs
@@ -1,7 +1,5 @@
-#![allow(
-    clippy::duplicated_attributes,
-    reason = "restructed's #[view] causes false positives"
-)]
+#![allow(unused)]
+#![allow(clippy::all)]

 use crate::db::schema::{
    self, aead_encrypted, arbiter_settings, evm_basic_grant, evm_ether_transfer_grant,
@@ -9,6 +7,7 @@ use crate::db::schema::{
    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;

@@ -28,16 +27,16 @@ pub mod types {
    pub struct SqliteTimestamp(pub DateTime<Utc>);
    impl SqliteTimestamp {
        pub fn now() -> Self {
-            Self(Utc::now())
+            SqliteTimestamp(Utc::now())
        }
    }

-    impl From<DateTime<Utc>> for SqliteTimestamp {
-        fn from(dt: DateTime<Utc>) -> Self {
-            Self(dt)
+    impl From<chrono::DateTime<Utc>> for SqliteTimestamp {
+        fn from(dt: chrono::DateTime<Utc>) -> Self {
+            SqliteTimestamp(dt)
        }
    }
-    impl From<SqliteTimestamp> for DateTime<Utc> {
+    impl From<SqliteTimestamp> for chrono::DateTime<Utc> {
        fn from(ts: SqliteTimestamp) -> Self {
            ts.0
        }
@@ -48,11 +47,6 @@ pub mod types {
            &'b self,
            out: &mut diesel::serialize::Output<'b, '_, Sqlite>,
        ) -> diesel::serialize::Result {
-            #[expect(
-                clippy::cast_possible_truncation,
-                clippy::as_conversions,
-                reason = "fixme! #84; this will break up in 2038 :3"
-            )]
            let unix_timestamp = self.0.timestamp() as i32;
            out.set_value(unix_timestamp);
            Ok(IsNull::No)
@@ -75,47 +69,7 @@ pub mod types {
            let datetime =
                DateTime::from_timestamp(unix_timestamp, 0).ok_or("Timestamp is out of bounds")?;

-            Ok(Self(datetime))
-        }
-    }
-
-    #[derive(Debug, FromSqlRow, AsExpression, Clone)]
-    #[diesel(sql_type = Integer)]
-    #[repr(transparent)] // hint compiler to optimize the wrapper struct away
-    pub struct ChainId(pub i32);
-
-    #[expect(
-        clippy::cast_sign_loss,
-        clippy::cast_possible_truncation,
-        clippy::as_conversions,
-        reason = "safe because chain_id is stored as i32 but is guaranteed to be a valid ChainId by the API when creating grants"
-    )]
-    const _: () = {
-        impl From<ChainId> for alloy::primitives::ChainId {
-            fn from(chain_id: ChainId) -> Self {
-                chain_id.0 as Self
-            }
-        }
-        impl From<alloy::primitives::ChainId> for ChainId {
-            fn from(chain_id: alloy::primitives::ChainId) -> Self {
-                Self(chain_id as _)
-            }
-        }
-    };
-
-    impl FromSql<Integer, Sqlite> for ChainId {
-        fn from_sql(
-            bytes: <Sqlite as diesel::backend::Backend>::RawValue<'_>,
-        ) -> diesel::deserialize::Result<Self> {
-            FromSql::<Integer, Sqlite>::from_sql(bytes).map(Self)
-        }
-    }
-    impl ToSql<Integer, Sqlite> for ChainId {
-        fn to_sql<'b>(
-            &'b self,
-            out: &mut diesel::serialize::Output<'b, '_, Sqlite>,
-        ) -> diesel::serialize::Result {
-            ToSql::<Integer, Sqlite>::to_sql(&self.0, out)
+            Ok(SqliteTimestamp(datetime))
        }
    }
 }
@@ -283,7 +237,7 @@ pub struct EvmEtherTransferLimit {
 pub struct EvmBasicGrant {
    pub id: i32,
    pub wallet_access_id: i32, // references evm_wallet_access.id
-    pub chain_id: ChainId,
+    pub chain_id: i32,
    pub valid_from: Option<SqliteTimestamp>,
    pub valid_until: Option<SqliteTimestamp>,
    pub max_gas_fee_per_gas: Option<Vec<u8>>,
@@ -306,7 +260,7 @@ pub struct EvmTransactionLog {
    pub id: i32,
    pub grant_id: i32,
    pub wallet_access_id: i32,
-    pub chain_id: ChainId,
+    pub chain_id: i32,
    pub eth_value: Vec<u8>,
    pub signed_at: SqliteTimestamp,
 }
@@ -381,7 +335,7 @@ pub struct EvmTokenTransferLog {
    pub id: i32,
    pub grant_id: i32,
    pub log_id: i32,
-    pub chain_id: ChainId,
+    pub chain_id: i32,
    pub token_contract: Vec<u8>,
    pub recipient_address: Vec<u8>,
    pub value: Vec<u8>,
--- a/server/crates/arbiter-server/src/evm/abi.rs
+++ b/server/crates/arbiter-server/src/evm/abi.rs
@@ -45,7 +45,7 @@ sol! {

 sol! {
    /// Permit2 — Uniswap's canonical token approval manager.
-    /// Replaces per-contract ERC-20 `approve()` with a single approval hub.
+    /// Replaces per-contract ERC-20 approve() with a single approval hub.
    #[derive(Debug)]
    interface IPermit2 {
        struct TokenPermissions {
--- a/server/crates/arbiter-server/src/evm/mod.rs
+++ b/server/crates/arbiter-server/src/evm/mod.rs
@@ -11,7 +11,7 @@ use diesel_async::{AsyncConnection, RunQueryDsl};
 use kameo::actor::ActorRef;

 use crate::{
-    actors::keyholder::KeyHolder,
+    actors::vault::Vault,
    crypto::integrity,
    db::{
        self, DatabaseError,
@@ -34,14 +34,14 @@ mod utils;
 #[derive(Debug, thiserror::Error)]
 pub enum PolicyError {
    #[error("Database error")]
-    Database(#[from] DatabaseError),
+    Database(#[from] crate::db::DatabaseError),
    #[error("Transaction violates policy: {0:?}")]
    Violations(Vec<EvalViolation>),
    #[error("No matching grant found")]
    NoMatchingGrant,

    #[error("Integrity error: {0}")]
-    Integrity(#[from] integrity::IntegrityError),
+    Integrity(#[from] integrity::Error),
 }

 #[derive(Debug, thiserror::Error)]
@@ -66,10 +66,10 @@ pub enum AnalyzeError {
 #[derive(Debug, thiserror::Error)]
 pub enum ListError {
    #[error("Database error")]
-    Database(#[from] DatabaseError),
+    Database(#[from] crate::db::DatabaseError),

    #[error("Integrity verification failed for grant")]
-    Integrity(#[from] integrity::IntegrityError),
+    Integrity(#[from] integrity::Error),
 }

 /// Controls whether a transaction should be executed or only validated
@@ -127,7 +127,7 @@ async fn check_shared_constraints(
            .get_result(conn)
            .await?;

-        if count >= rate_limit.count.into() {
+        if count >= rate_limit.count as i64 {
            violations.push(EvalViolation::RateLimitExceeded);
        }
    }
@@ -138,7 +138,7 @@ async fn check_shared_constraints(
 // Supporting only EIP-1559 transactions for now, but we can easily extend this to support legacy transactions if needed
 pub struct Engine {
    db: db::DatabasePool,
-    keyholder: ActorRef<KeyHolder>,
+    vault: ActorRef<Vault>,
 }

 impl Engine {
@@ -158,7 +158,7 @@ impl Engine {
            .map_err(DatabaseError::from)?
            .ok_or(PolicyError::NoMatchingGrant)?;

-        integrity::verify_entity(&mut conn, &self.keyholder, &grant.settings, grant.id).await?;
+        integrity::verify_entity(&mut conn, &self.vault, &grant.settings, grant.id).await?;

        let mut violations = check_shared_constraints(
            &context,
@@ -185,7 +185,7 @@ impl Engine {
                        .values(&NewEvmTransactionLog {
                            grant_id: grant.common_settings_id,
                            wallet_access_id: context.target.id,
-                            chain_id: context.chain.into(),
+                            chain_id: context.chain as i32,
                            eth_value: utils::u256_to_bytes(context.value).to_vec(),
                            signed_at: Utc::now().into(),
                        })
@@ -207,8 +207,8 @@ impl Engine {
 }

 impl Engine {
-    pub const fn new(db: db::DatabasePool, keyholder: ActorRef<KeyHolder>) -> Self {
-        Self { db, keyholder }
+    pub fn new(db: db::DatabasePool, vault: ActorRef<Vault>) -> Self {
+        Self { db, vault }
    }

    pub async fn create_grant<P: Policy>(
@@ -219,22 +219,16 @@ impl Engine {
        P::Settings: Clone,
    {
        let mut conn = self.db.get().await?;
-        let keyholder = self.keyholder.clone();
+        let vault = self.vault.clone();

        let id = conn
            .transaction(|conn| {
                Box::pin(async move {
                    use schema::evm_basic_grant;

-                    #[expect(
-                        clippy::cast_possible_truncation,
-                        clippy::cast_possible_wrap,
-                        clippy::as_conversions,
-                        reason = "fixme! #86"
-                    )]
                    let basic_grant: EvmBasicGrant = insert_into(evm_basic_grant::table)
                        .values(&NewEvmBasicGrant {
-                            chain_id: full_grant.shared.chain.into(),
+                            chain_id: full_grant.shared.chain as i32,
                            wallet_access_id: full_grant.shared.wallet_access_id,
                            valid_from: full_grant.shared.valid_from.map(SqliteTimestamp),
                            valid_until: full_grant.shared.valid_until.map(SqliteTimestamp),
@@ -264,7 +258,7 @@ impl Engine {

                    P::create_grant(&basic_grant, &full_grant.specific, conn).await?;

-                    integrity::sign_entity(conn, &keyholder, &full_grant, basic_grant.id)
+                    integrity::sign_entity(conn, &vault, &full_grant, basic_grant.id)
                        .await
                        .map_err(|_| diesel::result::Error::RollbackTransaction)?;

@@ -289,7 +283,7 @@ impl Engine {

        // Verify integrity of all grants before returning any results
        for grant in &all_grants {
-            integrity::verify_entity(conn, &self.keyholder, &grant.settings, grant.id).await?;
+            integrity::verify_entity(conn, &self.vault, &grant.settings, grant.id).await?;
        }

        Ok(all_grants.into_iter().map(|g| Grant {
@@ -319,7 +313,7 @@ impl Engine {
        let TxKind::Call(to) = transaction.to else {
            return Err(VetError::ContractCreationNotSupported);
        };
-        let context = EvalContext {
+        let context = policies::EvalContext {
            target,
            chain: transaction.chain_id,
            to,
@@ -410,16 +404,10 @@ mod tests {
        conn: &mut DatabaseConnection,
        shared: &SharedGrantSettings,
    ) -> EvmBasicGrant {
-        #[expect(
-            clippy::cast_possible_truncation,
-            clippy::cast_possible_wrap,
-            clippy::as_conversions,
-            reason = "fixme! #86"
-        )]
        insert_into(evm_basic_grant::table)
            .values(NewEvmBasicGrant {
                wallet_access_id: shared.wallet_access_id,
-                chain_id: shared.chain.into(),
+                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
@@ -583,7 +571,7 @@ mod tests {
            .values(NewEvmTransactionLog {
                grant_id: basic_grant.id,
                wallet_access_id: WALLET_ACCESS_ID,
-                chain_id: CHAIN_ID.into(),
+                chain_id: CHAIN_ID as i32,
                eth_value: super::utils::u256_to_bytes(U256::ZERO).to_vec(),
                signed_at: SqliteTimestamp(Utc::now()),
            })
--- a/server/crates/arbiter-server/src/evm/policies.rs
+++ b/server/crates/arbiter-server/src/evm/policies.rs
@@ -11,7 +11,7 @@ use thiserror::Error;

 use crate::{
    crypto::integrity::v1::Integrable,
-    db::models::{EvmBasicGrant, EvmWalletAccess},
+    db::models::{self, EvmBasicGrant, EvmWalletAccess},
    evm::utils,
 };

@@ -87,10 +87,10 @@ pub trait Policy: Sized {

    // Create a new grant in the database based on the provided grant details, and return its ID
    fn create_grant(
-        basic: &EvmBasicGrant,
+        basic: &models::EvmBasicGrant,
        grant: &Self::Settings,
        conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    ) -> impl Future<Output = QueryResult<DatabaseID>> + Send;
+    ) -> impl std::future::Future<Output = QueryResult<DatabaseID>> + Send;

    // Try to find an existing grant that matches the transaction context, and return its details if found
    // Additionally, return ID of basic grant for shared-logic checks like rate limits and validity periods
@@ -127,19 +127,19 @@ pub enum SpecificMeaning {
    TokenTransfer(token_transfers::Meaning),
 }

-#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, arbiter_macros::Hashable)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct TransactionRateLimit {
    pub count: u32,
    pub window: Duration,
 }

-#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, arbiter_macros::Hashable)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct VolumeRateLimit {
    pub max_volume: U256,
    pub window: Duration,
 }

-#[derive(Clone, Debug, PartialEq, Eq, Hash, arbiter_macros::Hashable)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct SharedGrantSettings {
    pub wallet_access_id: i32,
    pub chain: ChainId,
@@ -157,7 +157,7 @@ impl SharedGrantSettings {
    pub(crate) fn try_from_model(model: EvmBasicGrant) -> QueryResult<Self> {
        Ok(Self {
            wallet_access_id: model.wallet_access_id,
-            chain: model.chain_id.into(),
+            chain: model.chain_id as u64, // safe because chain_id is stored as i32 but is guaranteed to be a valid ChainId by the API when creating grants
            valid_from: model.valid_from.map(Into::into),
            valid_until: model.valid_until.map(Into::into),
            max_gas_fee_per_gas: model
@@ -168,11 +168,10 @@ impl SharedGrantSettings {
                .max_priority_fee_per_gas
                .map(|b| utils::try_bytes_to_u256(&b))
                .transpose()?,
-            #[expect(clippy::cast_sign_loss, clippy::as_conversions, reason = "fixme! #86")]
            rate_limit: match (model.rate_limit_count, model.rate_limit_window_secs) {
                (Some(count), Some(window_secs)) => Some(TransactionRateLimit {
                    count: count as u32,
-                    window: Duration::seconds(window_secs.into()),
+                    window: Duration::seconds(window_secs as i64),
                }),
                _ => None,
            },
@@ -182,7 +181,7 @@ impl SharedGrantSettings {
    pub async fn query_by_id(
        conn: &mut impl AsyncConnection<Backend = Sqlite>,
        id: i32,
-    ) -> QueryResult<Self> {
+    ) -> diesel::result::QueryResult<Self> {
        use crate::db::schema::evm_basic_grant;

        let basic_grant: EvmBasicGrant = evm_basic_grant::table
@@ -201,7 +200,7 @@ pub enum SpecificGrant {
    TokenTransfer(token_transfers::Settings),
 }

-#[derive(Debug, arbiter_macros::Hashable)]
+#[derive(Debug)]
 pub struct CombinedSettings<PolicyGrant> {
    pub shared: SharedGrantSettings,
    pub specific: PolicyGrant,
@@ -220,3 +219,38 @@ impl<P: Integrable> Integrable for CombinedSettings<P> {
    const KIND: &'static str = P::KIND;
    const VERSION: i32 = P::VERSION;
 }
+
+use crate::crypto::integrity::hashing::Hashable;
+
+impl Hashable for TransactionRateLimit {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.count.hash(hasher);
+        self.window.hash(hasher);
+    }
+}
+
+impl Hashable for VolumeRateLimit {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.max_volume.hash(hasher);
+        self.window.hash(hasher);
+    }
+}
+
+impl Hashable for SharedGrantSettings {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.wallet_access_id.hash(hasher);
+        self.chain.hash(hasher);
+        self.valid_from.hash(hasher);
+        self.valid_until.hash(hasher);
+        self.max_gas_fee_per_gas.hash(hasher);
+        self.max_priority_fee_per_gas.hash(hasher);
+        self.rate_limit.hash(hasher);
+    }
+}
+
+impl<P: Hashable> Hashable for CombinedSettings<P> {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.shared.hash(hasher);
+        self.specific.hash(hasher);
+    }
+}
--- a/server/crates/arbiter-server/src/evm/policies/ether_transfer/mod.rs
+++ b/server/crates/arbiter-server/src/evm/policies/ether_transfer/mod.rs
@@ -4,8 +4,8 @@ use std::fmt::Display;
 use alloy::primitives::{Address, U256};
 use chrono::{DateTime, Duration, Utc};
 use diesel::dsl::{auto_type, insert_into};
-use diesel::prelude::*;
 use diesel::sqlite::Sqlite;
+use diesel::{ExpressionMethods, JoinOnDsl, prelude::*};
 use diesel_async::{AsyncConnection, RunQueryDsl};

 use crate::crypto::integrity::v1::Integrable;
@@ -19,7 +19,7 @@ use crate::evm::policies::{
 };
 use crate::{
    db::{
-        models::{NewEvmEtherTransferGrant, NewEvmEtherTransferGrantTarget},
+        models::{self, NewEvmEtherTransferGrant, NewEvmEtherTransferGrantTarget},
        schema::{evm_ether_transfer_grant, evm_ether_transfer_grant_target},
    },
    evm::{policies::Policy, utils},
@@ -46,13 +46,13 @@ impl Display for Meaning {
    }
 }
 impl From<Meaning> for SpecificMeaning {
-    fn from(val: Meaning) -> Self {
-        Self::EtherTransfer(val)
+    fn from(val: Meaning) -> SpecificMeaning {
+        SpecificMeaning::EtherTransfer(val)
    }
 }

 // A grant for ether transfers, which can be scoped to specific target addresses and volume limits
-#[derive(Debug, Clone, arbiter_macros::Hashable)]
+#[derive(Debug, Clone)]
 pub struct Settings {
    pub target: Vec<Address>,
    pub limit: VolumeRateLimit,
@@ -61,9 +61,18 @@ impl Integrable for Settings {
    const KIND: &'static str = "EtherTransfer";
 }

+use crate::crypto::integrity::hashing::Hashable;
+
+impl Hashable for Settings {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.target.hash(hasher);
+        self.limit.hash(hasher);
+    }
+}
+
 impl From<Settings> for SpecificGrant {
-    fn from(val: Settings) -> Self {
-        Self::EtherTransfer(val)
+    fn from(val: Settings) -> SpecificGrant {
+        SpecificGrant::EtherTransfer(val)
    }
 }

@@ -74,7 +83,9 @@ async fn query_relevant_past_transaction(
 ) -> QueryResult<Vec<(U256, DateTime<Utc>)>> {
    let past_transactions: Vec<(Vec<u8>, SqliteTimestamp)> = evm_transaction_log::table
        .filter(evm_transaction_log::grant_id.eq(grant_id))
-        .filter(evm_transaction_log::signed_at.ge(SqliteTimestamp(Utc::now() - longest_window)))
+        .filter(
+            evm_transaction_log::signed_at.ge(SqliteTimestamp(chrono::Utc::now() - longest_window)),
+        )
        .select((
            evm_transaction_log::eth_value,
            evm_transaction_log::signed_at,
@@ -101,7 +112,7 @@ async fn check_rate_limits(

    let past_transaction = query_relevant_past_transaction(grant.id, window, db).await?;

-    let window_start = Utc::now() - grant.settings.specific.limit.window;
+    let window_start = chrono::Utc::now() - grant.settings.specific.limit.window;
    let prospective_cumulative_volume: U256 = past_transaction
        .iter()
        .filter(|(_, timestamp)| timestamp >= &window_start)
@@ -151,15 +162,10 @@ impl Policy for EtherTransfer {
    }

    async fn create_grant(
-        basic: &EvmBasicGrant,
+        basic: &models::EvmBasicGrant,
        grant: &Self::Settings,
        conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    ) -> QueryResult<DatabaseID> {
-        #[expect(
-            clippy::cast_possible_truncation,
-            clippy::as_conversions,
-            reason = "fixme! #86"
-        )]
+    ) -> diesel::result::QueryResult<DatabaseID> {
        let limit_id: i32 = insert_into(evm_ether_transfer_limit::table)
            .values(NewEvmEtherTransferLimit {
                window_secs: grant.limit.window.num_seconds() as i32,
@@ -194,7 +200,7 @@ impl Policy for EtherTransfer {
    async fn try_find_grant(
        context: &EvalContext,
        conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    ) -> QueryResult<Option<Grant<Self::Settings>>> {
+    ) -> diesel::result::QueryResult<Option<Grant<Self::Settings>>> {
        let target_bytes = context.to.to_vec();

        // Find a grant where:
@@ -248,7 +254,7 @@ impl Policy for EtherTransfer {
            limit: VolumeRateLimit {
                max_volume: utils::try_bytes_to_u256(&limit.max_volume)
                    .map_err(|err| diesel::result::Error::DeserializationError(Box::new(err)))?,
-                window: Duration::seconds(limit.window_secs.into()),
+                window: chrono::Duration::seconds(limit.window_secs as i64),
            },
        };

@@ -268,7 +274,7 @@ impl Policy for EtherTransfer {
        _log_id: i32,
        _grant: &Grant<Self::Settings>,
        _conn: &mut impl AsyncConnection<Backend = Sqlite>,
-    ) -> QueryResult<()> {
+    ) -> diesel::result::QueryResult<()> {
        // Basic log is sufficient

        Ok(())
@@ -321,7 +327,7 @@ impl Policy for EtherTransfer {
            .map(|(basic, specific)| {
                let targets: Vec<Address> = targets_by_grant
                    .get(&specific.id)
-                    .map(Vec::as_slice)
+                    .map(|v| v.as_slice())
                    .unwrap_or_default()
                    .iter()
                    .filter_map(|t| {
@@ -345,7 +351,7 @@ impl Policy for EtherTransfer {
                                max_volume: utils::try_bytes_to_u256(&limit.max_volume).map_err(
                                    |e| diesel::result::Error::DeserializationError(Box::new(e)),
                                )?,
-                                window: Duration::seconds(limit.window_secs.into()),
+                                window: Duration::seconds(limit.window_secs as i64),
                            },
                        },
                    },
--- a/server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs
+++ b/server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs
@@ -21,7 +21,7 @@ use crate::evm::{
 use super::{EtherTransfer, Settings};

 const WALLET_ACCESS_ID: i32 = 1;
-const CHAIN_ID: alloy::primitives::ChainId = 1;
+const CHAIN_ID: u64 = 1;

 const ALLOWED: Address = address!("1111111111111111111111111111111111111111");
 const OTHER: Address = address!("2222222222222222222222222222222222222222");
@@ -47,7 +47,7 @@ async fn insert_basic(conn: &mut DatabaseConnection, revoked: bool) -> EvmBasicG
    insert_into(evm_basic_grant::table)
        .values(NewEvmBasicGrant {
            wallet_access_id: WALLET_ACCESS_ID,
-            chain_id: CHAIN_ID.into(),
+            chain_id: CHAIN_ID as i32,
            valid_from: None,
            valid_until: None,
            max_gas_fee_per_gas: None,
@@ -160,7 +160,7 @@ async fn evaluate_passes_when_volume_within_limit() {
        .values(NewEvmTransactionLog {
            grant_id,
            wallet_access_id: WALLET_ACCESS_ID,
-            chain_id: CHAIN_ID.into(),
+            chain_id: CHAIN_ID as i32,
            eth_value: utils::u256_to_bytes(U256::from(500u64)).to_vec(),
            signed_at: SqliteTimestamp(Utc::now()),
        })
@@ -202,7 +202,7 @@ async fn evaluate_rejects_volume_over_limit() {
        .values(NewEvmTransactionLog {
            grant_id,
            wallet_access_id: WALLET_ACCESS_ID,
-            chain_id: CHAIN_ID.into(),
+            chain_id: CHAIN_ID as i32,
            eth_value: utils::u256_to_bytes(U256::from(1_000u64)).to_vec(),
            signed_at: SqliteTimestamp(Utc::now()),
        })
@@ -245,7 +245,7 @@ async fn evaluate_passes_at_exactly_volume_limit() {
        .values(NewEvmTransactionLog {
            grant_id,
            wallet_access_id: WALLET_ACCESS_ID,
-            chain_id: CHAIN_ID.into(),
+            chain_id: CHAIN_ID as i32,
            eth_value: utils::u256_to_bytes(U256::from(900u64)).to_vec(),
            signed_at: SqliteTimestamp(Utc::now()),
        })
@@ -340,7 +340,7 @@ proptest::proptest! {
    ) {
        use rand::{SeedableRng, seq::SliceRandom};
        use sha2::Digest;
-        use arbiter_crypto::hashing::Hashable;
+        use crate::crypto::integrity::hashing::Hashable;

        let addrs: Vec<Address> = raw_addrs.iter().map(|b| Address::from(*b)).collect();
        let mut shuffled = addrs.clone();
--- a/server/crates/arbiter-server/src/evm/policies/token_transfers/mod.rs
+++ b/server/crates/arbiter-server/src/evm/policies/token_transfers/mod.rs
@@ -27,8 +27,8 @@ use alloy::{
 use arbiter_tokens_registry::evm::nonfungible::{self, TokenInfo};
 use chrono::{DateTime, Duration, Utc};
 use diesel::dsl::{auto_type, insert_into};
-use diesel::prelude::*;
 use diesel::sqlite::Sqlite;
+use diesel::{ExpressionMethods, prelude::*};
 use diesel_async::{AsyncConnection, RunQueryDsl};

 use super::{DatabaseID, EvalContext, EvalViolation};
@@ -56,13 +56,13 @@ impl std::fmt::Display for Meaning {
    }
 }
 impl From<Meaning> for SpecificMeaning {
-    fn from(val: Meaning) -> Self {
-        Self::TokenTransfer(val)
+    fn from(val: Meaning) -> SpecificMeaning {
+        SpecificMeaning::TokenTransfer(val)
    }
 }

 // A grant for token transfers, which can be scoped to specific target addresses and volume limits
-#[derive(Debug, Clone, arbiter_macros::Hashable)]
+#[derive(Debug, Clone)]
 pub struct Settings {
    pub token_contract: Address,
    pub target: Option<Address>,
@@ -72,9 +72,19 @@ impl Integrable for Settings {
    const KIND: &'static str = "TokenTransfer";
 }

+use crate::crypto::integrity::hashing::Hashable;
+
+impl Hashable for Settings {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.token_contract.hash(hasher);
+        self.target.hash(hasher);
+        self.volume_limits.hash(hasher);
+    }
+}
+
 impl From<Settings> for SpecificGrant {
-    fn from(val: Settings) -> Self {
-        Self::TokenTransfer(val)
+    fn from(val: Settings) -> SpecificGrant {
+        SpecificGrant::TokenTransfer(val)
    }
 }

@@ -85,7 +95,10 @@ async fn query_relevant_past_transfers(
 ) -> QueryResult<Vec<(U256, DateTime<Utc>)>> {
    let past_logs: Vec<(Vec<u8>, SqliteTimestamp)> = evm_token_transfer_log::table
        .filter(evm_token_transfer_log::grant_id.eq(grant_id))
-        .filter(evm_token_transfer_log::created_at.ge(SqliteTimestamp(Utc::now() - longest_window)))
+        .filter(
+            evm_token_transfer_log::created_at
+                .ge(SqliteTimestamp(chrono::Utc::now() - longest_window)),
+        )
        .select((
            evm_token_transfer_log::value,
            evm_token_transfer_log::created_at,
@@ -125,7 +138,7 @@ async fn check_volume_rate_limits(
    let past_transfers = query_relevant_past_transfers(grant.id, longest_window, db).await?;

    for limit in &grant.settings.specific.volume_limits {
-        let window_start = Utc::now() - limit.window;
+        let window_start = chrono::Utc::now() - limit.window;
        let prospective_cumulative_volume: U256 = past_transfers
            .iter()
            .filter(|(_, timestamp)| timestamp >= &window_start)
@@ -201,11 +214,6 @@ impl Policy for TokenTransfer {
            .await?;

        for limit in &grant.volume_limits {
-            #[expect(
-                clippy::cast_possible_truncation,
-                clippy::as_conversions,
-                reason = "fixme! #86"
-            )]
            insert_into(evm_token_transfer_volume_limit::table)
                .values(NewEvmTokenTransferVolumeLimit {
                    grant_id,
@@ -255,7 +263,7 @@ impl Policy for TokenTransfer {
                    max_volume: utils::try_bytes_to_u256(&row.max_volume).map_err(|err| {
                        diesel::result::Error::DeserializationError(Box::new(err))
                    })?,
-                    window: Duration::seconds(row.window_secs.into()),
+                    window: Duration::seconds(row.window_secs as i64),
                })
            })
            .collect::<QueryResult<Vec<_>>>()?;
@@ -305,7 +313,7 @@ impl Policy for TokenTransfer {
            .values(NewEvmTokenTransferLog {
                grant_id: grant.id,
                log_id,
-                chain_id: context.chain.into(),
+                chain_id: context.chain as i32,
                token_contract: context.to.to_vec(),
                recipient_address: meaning.to.to_vec(),
                value: utils::u256_to_bytes(meaning.value).to_vec(),
@@ -354,7 +362,7 @@ impl Policy for TokenTransfer {
            .map(|(basic, specific)| {
                let volume_limits: Vec<VolumeRateLimit> = limits_by_grant
                    .get(&specific.id)
-                    .map(Vec::as_slice)
+                    .map(|v| v.as_slice())
                    .unwrap_or_default()
                    .iter()
                    .map(|row| {
@@ -362,7 +370,7 @@ impl Policy for TokenTransfer {
                            max_volume: utils::try_bytes_to_u256(&row.max_volume).map_err(|e| {
                                diesel::result::Error::DeserializationError(Box::new(e))
                            })?,
-                            window: Duration::seconds(row.window_secs.into()),
+                            window: Duration::seconds(row.window_secs as i64),
                        })
                    })
                    .collect::<QueryResult<Vec<_>>>()?;
--- a/server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs
+++ b/server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs
@@ -59,7 +59,7 @@ async fn insert_basic(conn: &mut DatabaseConnection, revoked: bool) -> EvmBasicG
    insert_into(evm_basic_grant::table)
        .values(NewEvmBasicGrant {
            wallet_access_id: WALLET_ACCESS_ID,
-            chain_id: CHAIN_ID.into(),
+            chain_id: CHAIN_ID as i32,
            valid_from: None,
            valid_until: None,
            max_gas_fee_per_gas: None,
@@ -238,11 +238,12 @@ async fn evaluate_passes_volume_at_exact_limit() {
        .unwrap();

    // Record a past transfer of 900, with current transfer 100 => exactly 1000 limit
-    insert_into(db::schema::evm_token_transfer_log::table)
-        .values(db::models::NewEvmTokenTransferLog {
+    use crate::db::{models::NewEvmTokenTransferLog, schema::evm_token_transfer_log};
+    insert_into(evm_token_transfer_log::table)
+        .values(NewEvmTokenTransferLog {
            grant_id,
            log_id: 0,
-            chain_id: CHAIN_ID.into(),
+            chain_id: CHAIN_ID as i32,
            token_contract: DAI.to_vec(),
            recipient_address: RECIPIENT.to_vec(),
            value: utils::u256_to_bytes(U256::from(900u64)).to_vec(),
@@ -282,11 +283,12 @@ async fn evaluate_rejects_volume_over_limit() {
        .await
        .unwrap();

-    insert_into(db::schema::evm_token_transfer_log::table)
-        .values(db::models::NewEvmTokenTransferLog {
+    use crate::db::{models::NewEvmTokenTransferLog, schema::evm_token_transfer_log};
+    insert_into(evm_token_transfer_log::table)
+        .values(NewEvmTokenTransferLog {
            grant_id,
            log_id: 0,
-            chain_id: CHAIN_ID.into(),
+            chain_id: CHAIN_ID as i32,
            token_contract: DAI.to_vec(),
            recipient_address: RECIPIENT.to_vec(),
            value: utils::u256_to_bytes(U256::from(1_000u64)).to_vec(),
@@ -417,7 +419,7 @@ proptest::proptest! {
    ) {
        use rand::{SeedableRng, seq::SliceRandom};
        use sha2::Digest;
-        use arbiter_crypto::hashing::Hashable;
+        use crate::crypto::integrity::hashing::Hashable;

        let limits: Vec<VolumeRateLimit> = raw_limits
            .iter()
--- a/server/crates/arbiter-server/src/evm/safe_signer.rs
+++ b/server/crates/arbiter-server/src/evm/safe_signer.rs
@@ -82,8 +82,8 @@ impl SafeSigner {
        })
    }

-    #[expect(clippy::significant_drop_tightening, reason = "false positive")]
    fn sign_hash_inner(&self, hash: &B256) -> Result<Signature> {
+        #[allow(clippy::expect_used)]
        let mut cell = self.key.lock().expect("SafeSigner mutex poisoned");
        let reader = cell.read();
        let sig: (ecdsa::Signature, RecoveryId) = reader.sign_prehash(hash.as_ref())?;
@@ -96,6 +96,7 @@ impl SafeSigner {
        {
            return Err(Error::TransactionChainIdMismatch {
                signer: chain_id,
+                #[allow(clippy::expect_used)]
                tx: tx.chain_id().expect("Chain ID is guaranteed to be set"),
            });
        }
--- a/server/crates/arbiter-server/src/evm/utils.rs
+++ b/server/crates/arbiter-server/src/evm/utils.rs
@@ -7,7 +7,7 @@ pub struct LengthError {
    pub actual: usize,
 }

-pub const fn u256_to_bytes(value: U256) -> [u8; 32] {
+pub fn u256_to_bytes(value: U256) -> [u8; 32] {
    value.to_le_bytes()
 }
 pub fn bytes_to_u256(bytes: &[u8]) -> Option<U256> {
--- a/server/crates/arbiter-server/src/grpc/client.rs
+++ b/server/crates/arbiter-server/src/grpc/client.rs
@@ -10,8 +10,8 @@ use tonic::Status;
 use tracing::{info, warn};

 use crate::{
-    actors::client::{ClientConnection, session::ClientSession},
    grpc::request_tracker::RequestTracker,
+    peers::client::{ClientConnection, session::ClientSession},
 };

 mod auth;
@@ -98,7 +98,8 @@ pub async fn start(mut conn: ClientConnection, mut bi: GrpcBi<ClientRequest, Cli
        Err(err) => {
            let _ = bi
                .send(Err(Status::unauthenticated(format!(
-                    "Authentication failed: {err}",
+                    "Authentication failed: {}",
+                    err
                ))))
                .await;
            warn!(error = ?err, "Client authentication failed");
--- a/server/crates/arbiter-server/src/grpc/client/auth.rs
+++ b/server/crates/arbiter-server/src/grpc/client/auth.rs
@@ -5,7 +5,8 @@ use arbiter_proto::{
        client::{
            ClientRequest, ClientResponse,
            auth::{
-                self as proto_auth, AuthChallengeRequest as ProtoAuthChallengeRequest,
+                self as proto_auth, AuthChallenge as ProtoAuthChallenge,
+                AuthChallengeRequest as ProtoAuthChallengeRequest,
                AuthChallengeSolution as ProtoAuthChallengeSolution, AuthResult as ProtoAuthResult,
                request::Payload as AuthRequestPayload, response::Payload as AuthResponsePayload,
            },
@@ -21,8 +22,8 @@ use tonic::Status;
 use tracing::warn;

 use crate::{
-    actors::client::{ClientConnection, auth},
    grpc::request_tracker::RequestTracker,
+    peers::client::{self, ClientConnection, auth},
 };

 pub struct AuthTransportAdapter<'a> {
@@ -31,7 +32,7 @@ pub struct AuthTransportAdapter<'a> {
 }

 impl<'a> AuthTransportAdapter<'a> {
-    pub const fn new(
+    pub fn new(
        bi: &'a mut GrpcBi<ClientRequest, ClientResponse>,
        request_tracker: &'a mut RequestTracker,
    ) -> Self {
@@ -41,6 +42,40 @@ impl<'a> AuthTransportAdapter<'a> {
        }
    }

+    fn response_to_proto(response: auth::Outbound) -> AuthResponsePayload {
+        match response {
+            auth::Outbound::AuthChallenge { pubkey, nonce } => {
+                AuthResponsePayload::Challenge(ProtoAuthChallenge {
+                    pubkey: pubkey.to_bytes(),
+                    nonce,
+                })
+            }
+            auth::Outbound::AuthSuccess => {
+                AuthResponsePayload::Result(ProtoAuthResult::Success.into())
+            }
+        }
+    }
+
+    fn error_to_proto(error: auth::Error) -> AuthResponsePayload {
+        AuthResponsePayload::Result(
+            match error {
+                auth::Error::InvalidChallengeSolution => ProtoAuthResult::InvalidSignature,
+                auth::Error::ApproveError(auth::ApproveError::Denied) => {
+                    ProtoAuthResult::ApprovalDenied
+                }
+                auth::Error::ApproveError(auth::ApproveError::Upstream(
+                    crate::actors::flow_coordinator::ApprovalError::NoUserAgentsConnected,
+                )) => ProtoAuthResult::NoUserAgentsOnline,
+                auth::Error::ApproveError(auth::ApproveError::Internal)
+                | auth::Error::DatabasePoolUnavailable
+                | auth::Error::DatabaseOperationFailed
+                | auth::Error::IntegrityCheckFailed
+                | auth::Error::Transport => ProtoAuthResult::Internal,
+            }
+            .into(),
+        )
+    }
+
    async fn send_client_response(
        &mut self,
        payload: AuthResponsePayload,
@@ -62,14 +97,14 @@ impl<'a> AuthTransportAdapter<'a> {
 }

 #[async_trait]
-impl Sender<Result<auth::Outbound, auth::ClientAuthError>> for AuthTransportAdapter<'_> {
+impl Sender<Result<auth::Outbound, auth::Error>> for AuthTransportAdapter<'_> {
    async fn send(
        &mut self,
-        item: Result<auth::Outbound, auth::ClientAuthError>,
+        item: Result<auth::Outbound, auth::Error>,
    ) -> Result<(), TransportError> {
        let payload = match item {
-            Ok(message) => message.into(),
-            Err(err) => AuthResponsePayload::Result(ProtoAuthResult::from(err).into()),
+            Ok(message) => AuthTransportAdapter::response_to_proto(message),
+            Err(err) => AuthTransportAdapter::error_to_proto(err),
        };

        self.send_client_response(payload).await
@@ -148,7 +183,7 @@ impl Receiver<auth::Inbound> for AuthTransportAdapter<'_> {
    }
 }

-impl Bi<auth::Inbound, Result<auth::Outbound, auth::ClientAuthError>> for AuthTransportAdapter<'_> {}
+impl Bi<auth::Inbound, Result<auth::Outbound, auth::Error>> for AuthTransportAdapter<'_> {}

 fn client_metadata_from_proto(metadata: ProtoClientInfo) -> ClientMetadata {
    ClientMetadata {
@@ -162,7 +197,7 @@ pub async fn start(
    conn: &mut ClientConnection,
    bi: &mut GrpcBi<ClientRequest, ClientResponse>,
    request_tracker: &mut RequestTracker,
-) -> Result<i32, auth::ClientAuthError> {
+) -> Result<i32, auth::Error> {
    let mut transport = AuthTransportAdapter::new(bi, request_tracker);
-    auth::authenticate(conn, &mut transport).await
+    client::auth::authenticate(conn, &mut transport).await
 }
--- a/server/crates/arbiter-server/src/grpc/client/evm.rs
+++ b/server/crates/arbiter-server/src/grpc/client/evm.rs
@@ -16,14 +16,14 @@ use tonic::Status;
 use tracing::warn;

 use crate::{
-    actors::client::session::{ClientSession, HandleSignTransaction, SignTransactionRpcError},
    grpc::{
        Convert, TryConvert,
        common::inbound::{RawEvmAddress, RawEvmTransaction},
    },
+    peers::client::session::{ClientSession, HandleSignTransaction, SignTransactionRpcError},
 };

-const fn wrap_response(payload: EvmResponsePayload) -> ClientResponsePayload {
+fn wrap_response(payload: EvmResponsePayload) -> ClientResponsePayload {
    ClientResponsePayload::Evm(proto_evm::Response {
        payload: Some(payload),
    })
--- a/server/crates/arbiter-server/src/grpc/client/vault.rs
+++ b/server/crates/arbiter-server/src/grpc/client/vault.rs
@@ -12,9 +12,9 @@ use kameo::{actor::ActorRef, error::SendError};
 use tonic::Status;
 use tracing::warn;

-use crate::actors::{
-    client::session::{ClientSession, ClientSessionError, HandleQueryVaultState},
-    keyholder::KeyHolderState,
+use crate::{
+    actors::vault::VaultState,
+    peers::client::session::{ClientSession, Error, HandleQueryVaultState},
 };

 pub(super) async fn dispatch(
@@ -28,14 +28,12 @@ pub(super) async fn dispatch(
    };

    match payload {
-        VaultRequestPayload::QueryState(()) => {
+        VaultRequestPayload::QueryState(_) => {
            let state = match actor.ask(HandleQueryVaultState {}).await {
-                Ok(KeyHolderState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
-                Ok(KeyHolderState::Sealed) => ProtoVaultState::Sealed,
-                Ok(KeyHolderState::Unsealed) => ProtoVaultState::Unsealed,
-                Err(SendError::HandlerError(ClientSessionError::Internal)) => {
-                    ProtoVaultState::Error
-                }
+                Ok(VaultState::Unbootstrapped) => ProtoVaultState::Unbootstrapped,
+                Ok(VaultState::Sealed) => ProtoVaultState::Sealed,
+                Ok(VaultState::Unsealed) => ProtoVaultState::Unsealed,
+                Err(SendError::HandlerError(Error::Internal)) => ProtoVaultState::Error,
                Err(err) => {
                    warn!(error = ?err, "Failed to query vault state");
                    ProtoVaultState::Error
--- a/server/crates/arbiter-server/src/grpc/common/outbound.rs
+++ b/server/crates/arbiter-server/src/grpc/common/outbound.rs
@@ -31,16 +31,16 @@ impl Convert for SpecificMeaning {

    fn convert(self) -> Self::Output {
        let kind = match self {
-            Self::EtherTransfer(meaning) => ProtoSpecificMeaningKind::EtherTransfer(
+            SpecificMeaning::EtherTransfer(meaning) => ProtoSpecificMeaningKind::EtherTransfer(
                arbiter_proto::proto::shared::evm::EtherTransferMeaning {
                    to: meaning.to.to_vec(),
                    value: u256_to_proto_bytes(meaning.value),
                },
            ),
-            Self::TokenTransfer(meaning) => ProtoSpecificMeaningKind::TokenTransfer(
+            SpecificMeaning::TokenTransfer(meaning) => ProtoSpecificMeaningKind::TokenTransfer(
                arbiter_proto::proto::shared::evm::TokenTransferMeaning {
                    token: Some(ProtoTokenInfo {
-                        symbol: meaning.token.symbol.to_owned(),
+                        symbol: meaning.token.symbol.to_string(),
                        address: meaning.token.contract.to_vec(),
                        chain_id: meaning.token.chain,
                    }),
@@ -61,21 +61,25 @@ impl Convert for EvalViolation {

    fn convert(self) -> Self::Output {
        let kind = match self {
-            Self::InvalidTarget { target } => {
+            EvalViolation::InvalidTarget { target } => {
                ProtoEvalViolationKind::InvalidTarget(target.to_vec())
            }
-            Self::GasLimitExceeded {
+            EvalViolation::GasLimitExceeded {
                max_gas_fee_per_gas,
                max_priority_fee_per_gas,
            } => ProtoEvalViolationKind::GasLimitExceeded(GasLimitExceededViolation {
                max_gas_fee_per_gas: max_gas_fee_per_gas.map(u256_to_proto_bytes),
                max_priority_fee_per_gas: max_priority_fee_per_gas.map(u256_to_proto_bytes),
            }),
-            Self::RateLimitExceeded => ProtoEvalViolationKind::RateLimitExceeded(()),
-            Self::VolumetricLimitExceeded => ProtoEvalViolationKind::VolumetricLimitExceeded(()),
-            Self::InvalidTime => ProtoEvalViolationKind::InvalidTime(()),
-            Self::InvalidTransactionType => ProtoEvalViolationKind::InvalidTransactionType(()),
-            Self::MismatchingChainId { expected, actual } => {
+            EvalViolation::RateLimitExceeded => ProtoEvalViolationKind::RateLimitExceeded(()),
+            EvalViolation::VolumetricLimitExceeded => {
+                ProtoEvalViolationKind::VolumetricLimitExceeded(())
+            }
+            EvalViolation::InvalidTime => ProtoEvalViolationKind::InvalidTime(()),
+            EvalViolation::InvalidTransactionType => {
+                ProtoEvalViolationKind::InvalidTransactionType(())
+            }
+            EvalViolation::MismatchingChainId { expected, actual } => {
                ProtoEvalViolationKind::ChainIdMismatch(proto_eval_violation::ChainIdMismatch {
                    expected,
                    actual,
@@ -92,13 +96,13 @@ impl Convert for VetError {

    fn convert(self) -> Self::Output {
        let kind = match self {
-            Self::ContractCreationNotSupported => {
+            VetError::ContractCreationNotSupported => {
                ProtoTransactionEvalErrorKind::ContractCreationNotSupported(())
            }
-            Self::UnsupportedTransactionType => {
+            VetError::UnsupportedTransactionType => {
                ProtoTransactionEvalErrorKind::UnsupportedTransactionType(())
            }
-            Self::Evaluated(meaning, policy_error) => match policy_error {
+            VetError::Evaluated(meaning, policy_error) => match policy_error {
                PolicyError::NoMatchingGrant => {
                    ProtoTransactionEvalErrorKind::NoMatchingGrant(NoMatchingGrantError {
                        meaning: Some(meaning.convert()),
--- a/server/crates/arbiter-server/src/grpc/mod.rs
+++ b/server/crates/arbiter-server/src/grpc/mod.rs
@@ -10,8 +10,7 @@ use tonic::{Request, Response, Status, async_trait};
 use tracing::info;

 use crate::{
-    actors::{client::ClientConnection, user_agent::UserAgentConnection},
-    grpc::user_agent::start,
+    peers::{client::ClientConnection, user_agent::UserAgentConnection},
 };

 mod request_tracker;
@@ -63,7 +62,7 @@ impl arbiter_proto::proto::arbiter_service_server::ArbiterService for super::Ser

        let (bi, rx) = GrpcBi::from_bi_stream(req_stream);

-        tokio::spawn(start(
+        tokio::spawn(user_agent::start(
            UserAgentConnection {
                db: self.context.db.clone(),
                actors: self.context.actors.clone(),
--- a/server/crates/arbiter-server/src/grpc/request_tracker.rs
+++ b/server/crates/arbiter-server/src/grpc/request_tracker.rs
@@ -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 const fn current_request_id(&self) -> i32 {
+    pub fn current_request_id(&self) -> i32 {
        self.next_request_id - 1
    }
 }
--- a/server/crates/arbiter-server/src/grpc/user_agent.rs
+++ b/server/crates/arbiter-server/src/grpc/user_agent.rs
@@ -1,4 +1,4 @@
-use tokio::sync::mpsc;
+use tokio::sync::{mpsc, oneshot};

 use arbiter_proto::{
    proto::user_agent::{
@@ -14,8 +14,12 @@ use tonic::Status;
 use tracing::{error, info, warn};

 use crate::{
-    actors::user_agent::{OutOfBand, UserAgentConnection, UserAgentSession},
+    crypto::integrity,
    grpc::request_tracker::RequestTracker,
+    peers::user_agent::{
+        Credentials, OutOfBand, UserAgentConnection, UserAgentSession,
+        vault_gate::VaultGate,
+    },
 };

 mod auth;
@@ -24,6 +28,7 @@ mod inbound;
 mod outbound;
 mod sdk_client;
 mod vault;
+mod vault_gate;

 pub struct OutOfBandAdapter(mpsc::Sender<OutOfBand>);

@@ -124,21 +129,115 @@ pub async fn start(
 ) {
    let mut request_tracker = RequestTracker::default();

-    let pubkey = match auth::start(&mut conn, &mut bi, &mut request_tracker).await {
-        Ok(pubkey) => pubkey,
+    let auth_creds = match auth::start(&mut conn, &mut bi, &mut request_tracker).await {
+        Ok(creds) => creds,
        Err(e) => {
            warn!(error = ?e, "Authentication failed");
            return;
        }
    };

+    info!(pubkey = ?auth_creds.creds.pubkey, "User authenticated successfully");
+
+    let creds = if integrity::is_signing_available(&conn.actors.vault)
+        .await
+        .unwrap_or(false)
+    {
+        // Vault is unsealed; integrity was verified during auth — promote directly.
+        auth_creds.creds
+    } else {
+        // Vault is sealed/unbootstrapped; run the VaultGate phase.
+        let (promotion_tx, promotion_rx) = oneshot::channel();
+        let gate = VaultGate::spawn(VaultGate::new(
+            auth_creds,
+            conn.actors.clone(),
+            conn.db.clone(),
+            promotion_tx,
+        ));
+
+        let result = vault_gate_loop(&mut bi, &gate, &mut request_tracker, promotion_rx).await;
+        gate.kill();
+
+        match result {
+            Some(creds) => creds,
+            None => return,
+        }
+    };
+
    let (oob_sender, oob_receiver) = mpsc::channel(16);
    let oob_adapter = OutOfBandAdapter(oob_sender);

-    let actor = UserAgentSession::spawn(UserAgentSession::new(conn, Box::new(oob_adapter)));
+    let actor = UserAgentSession::spawn(UserAgentSession::new(conn, creds, Box::new(oob_adapter)));
    let actor_for_cleanup = actor.clone();

-    info!(?pubkey, "User authenticated successfully");
    dispatch_loop(bi, actor, oob_receiver, request_tracker).await;
    actor_for_cleanup.kill();
 }
+
+async fn vault_gate_loop(
+    bi: &mut GrpcBi<UserAgentRequest, UserAgentResponse>,
+    gate: &ActorRef<VaultGate>,
+    request_tracker: &mut RequestTracker,
+    mut promotion_rx: oneshot::Receiver<Result<Credentials, crate::peers::user_agent::vault_gate::Error>>,
+) -> Option<Credentials> {
+    loop {
+        tokio::select! {
+            result = &mut promotion_rx => {
+                return match result {
+                    Ok(Ok(creds)) => Some(creds),
+                    Ok(Err(e)) => {
+                        warn!(error = ?e, "VaultGate promotion failed");
+                        None
+                    }
+                    Err(_) => {
+                        warn!("VaultGate promotion channel closed unexpectedly");
+                        None
+                    }
+                };
+            }
+
+            message = bi.recv() => {
+                let Some(message) = message else { return None; };
+
+                let conn = match message {
+                    Ok(conn) => conn,
+                    Err(err) => {
+                        warn!(error = ?err, "Failed to receive request during vault gate phase");
+                        return None;
+                    }
+                };
+
+                let request_id = match request_tracker.request(conn.id) {
+                    Ok(id) => id,
+                    Err(err) => {
+                        let _ = bi.send(Err(err)).await;
+                        return None;
+                    }
+                };
+
+                let Some(payload) = conn.payload else {
+                    let _ = bi.send(Err(Status::invalid_argument("Missing request payload"))).await;
+                    return None;
+                };
+
+                let response = match payload {
+                    UserAgentRequestPayload::Vault(req) => vault_gate::dispatch(gate, req).await,
+                    _ => Err(Status::permission_denied("Only vault operations are permitted before unsealing")),
+                };
+
+                match response {
+                    Ok(Some(payload)) => {
+                        if bi.send(Ok(UserAgentResponse { id: Some(request_id), payload: Some(payload) })).await.is_err() {
+                            return None;
+                        }
+                    }
+                    Ok(None) => {}
+                    Err(status) => {
+                        let _ = bi.send(Err(status)).await;
+                        return None;
+                    }
+                }
+            }
+        }
+    }
+}
--- a/server/crates/arbiter-server/src/grpc/user_agent/auth.rs
+++ b/server/crates/arbiter-server/src/grpc/user_agent/auth.rs
@@ -18,17 +18,17 @@ use tonic::Status;
 use tracing::warn;

 use crate::{
-    actors::user_agent::{UserAgentConnection, auth},
    grpc::request_tracker::RequestTracker,
+    peers::user_agent::{AuthCredentials, UserAgentConnection, auth},
 };

 pub struct AuthTransportAdapter<'a> {
-    bi: &'a mut GrpcBi<UserAgentRequest, UserAgentResponse>,
-    request_tracker: &'a mut RequestTracker,
+    pub(super) bi: &'a mut GrpcBi<UserAgentRequest, UserAgentResponse>,
+    pub(super) request_tracker: &'a mut RequestTracker,
 }

 impl<'a> AuthTransportAdapter<'a> {
-    pub const fn new(
+    pub fn new(
        bi: &'a mut GrpcBi<UserAgentRequest, UserAgentResponse>,
        request_tracker: &'a mut RequestTracker,
    ) -> Self {
@@ -38,16 +38,32 @@ impl<'a> AuthTransportAdapter<'a> {
        }
    }

-    async fn send_user_agent_response(
+    pub(super) fn bi_mut(&mut self) -> &mut GrpcBi<UserAgentRequest, UserAgentResponse> {
+        self.bi
+    }
+
+    pub(super) fn tracker_mut(&mut self) -> &mut RequestTracker {
+        self.request_tracker
+    }
+
+    pub(super) async fn send_response_payload(
        &mut self,
-        payload: AuthResponsePayload,
+        payload: UserAgentResponsePayload,
    ) -> Result<(), TransportError> {
        self.bi
            .send(Ok(UserAgentResponse {
                id: Some(self.request_tracker.current_request_id()),
-                payload: Some(UserAgentResponsePayload::Auth(proto_auth::Response {
                payload: Some(payload),
-                })),
+            }))
+            .await
+    }
+
+    async fn send_user_agent_response(
+        &mut self,
+        payload: AuthResponsePayload,
+    ) -> Result<(), TransportError> {
+        self.send_response_payload(UserAgentResponsePayload::Auth(proto_auth::Response {
+            payload: Some(payload),
        }))
        .await
    }
@@ -140,7 +156,6 @@ impl Receiver<auth::Inbound> for AuthTransportAdapter<'_> {
            AuthRequestPayload::ChallengeRequest(ProtoAuthChallengeRequest {
                pubkey,
                bootstrap_token,
-                ..
            }) => {
                let Ok(pubkey) = authn::PublicKey::try_from(pubkey.as_slice()) else {
                    warn!(
@@ -168,7 +183,7 @@ pub async fn start(
    conn: &mut UserAgentConnection,
    bi: &mut GrpcBi<UserAgentRequest, UserAgentResponse>,
    request_tracker: &mut RequestTracker,
-) -> Result<authn::PublicKey, auth::Error> {
-    let transport = AuthTransportAdapter::new(bi, request_tracker);
-    auth::authenticate(conn, transport).await
+) -> Result<AuthCredentials, auth::Error> {
+    let mut transport = AuthTransportAdapter::new(bi, request_tracker);
+    auth::authenticate(conn, &mut transport).await
 }
--- a/server/crates/arbiter-server/src/grpc/user_agent/evm.rs
+++ b/server/crates/arbiter-server/src/grpc/user_agent/evm.rs
@@ -23,21 +23,21 @@ use tonic::Status;
 use tracing::warn;

 use crate::{
-    actors::user_agent::{
+    grpc::{
+        Convert, TryConvert,
+        common::inbound::{RawEvmAddress, RawEvmTransaction},
+    },
+    peers::user_agent::{
        UserAgentSession,
-        session::connection::{
+        session::handlers::{
            GrantMutationError, HandleEvmWalletCreate, HandleEvmWalletList, HandleGrantCreate,
            HandleGrantDelete, HandleGrantList, HandleSignTransaction,
            SignTransactionError as SessionSignTransactionError,
        },
    },
-    grpc::{
-        Convert, TryConvert,
-        common::inbound::{RawEvmAddress, RawEvmTransaction},
-    },
 };

-const fn wrap_evm_response(payload: EvmResponsePayload) -> UserAgentResponsePayload {
+fn wrap_evm_response(payload: EvmResponsePayload) -> UserAgentResponsePayload {
    UserAgentResponsePayload::Evm(proto_evm::Response {
        payload: Some(payload),
    })
@@ -52,8 +52,8 @@ pub(super) async fn dispatch(
    };

    match payload {
-        EvmRequestPayload::WalletCreate(()) => handle_wallet_create(actor).await,
-        EvmRequestPayload::WalletList(()) => handle_wallet_list(actor).await,
+        EvmRequestPayload::WalletCreate(_) => handle_wallet_create(actor).await,
+        EvmRequestPayload::WalletList(_) => handle_wallet_list(actor).await,
        EvmRequestPayload::GrantCreate(req) => handle_grant_create(actor, req).await,
        EvmRequestPayload::GrantDelete(req) => handle_grant_delete(actor, req).await,
        EvmRequestPayload::GrantList(_) => handle_grant_list(actor).await,
--- a/server/crates/arbiter-server/src/grpc/user_agent/inbound.rs
+++ b/server/crates/arbiter-server/src/grpc/user_agent/inbound.rs
@@ -22,11 +22,11 @@ use crate::{
    grpc::TryConvert,
 };

-fn address_from_bytes(bytes: &[u8]) -> Result<Address, Status> {
+fn address_from_bytes(bytes: Vec<u8>) -> Result<Address, Status> {
    if bytes.len() != 20 {
        return Err(Status::invalid_argument("Invalid EVM address"));
    }
-    Ok(Address::from_slice(bytes))
+    Ok(Address::from_slice(&bytes))
 }

 fn u256_from_proto_bytes(bytes: &[u8]) -> Result<U256, Status> {
@@ -41,7 +41,7 @@ impl TryConvert for ProtoTimestamp {
    type Error = Status;

    fn try_convert(self) -> Result<DateTime<Utc>, Status> {
-        Utc.timestamp_opt(self.seconds, self.nanos.try_into().unwrap_or_default())
+        Utc.timestamp_opt(self.seconds, self.nanos as u32)
            .single()
            .ok_or_else(|| Status::invalid_argument("Invalid timestamp"))
    }
@@ -116,8 +116,7 @@ impl TryConvert for ProtoSpecificGrant {
                limit,
            })) => Ok(SpecificGrant::EtherTransfer(ether_transfer::Settings {
                target: targets
-                    .iter()
-                    .map(Vec::as_slice)
+                    .into_iter()
                    .map(address_from_bytes)
                    .collect::<Result<_, _>>()?,
                limit: limit
@@ -131,10 +130,8 @@ impl TryConvert for ProtoSpecificGrant {
                target,
                volume_limits,
            })) => Ok(SpecificGrant::TokenTransfer(token_transfers::Settings {
-                token_contract: address_from_bytes(&token_contract)?,
-                target: target
-                    .map(|target| address_from_bytes(&target))
-                    .transpose()?,
+                token_contract: address_from_bytes(token_contract)?,
+                target: target.map(address_from_bytes).transpose()?,
                volume_limits: volume_limits
                    .into_iter()
                    .map(ProtoVolumeRateLimit::try_convert)
--- a/server/crates/arbiter-server/src/grpc/user_agent/outbound.rs
+++ b/server/crates/arbiter-server/src/grpc/user_agent/outbound.rs
@@ -22,7 +22,7 @@ impl Convert for DateTime<Utc> {
    fn convert(self) -> ProtoTimestamp {
        ProtoTimestamp {
            seconds: self.timestamp(),
-            nanos: self.timestamp_subsec_nanos().try_into().unwrap_or(i32::MAX),
+            nanos: self.timestamp_subsec_nanos() as i32,
        }
    }
 }
@@ -74,13 +74,13 @@ impl Convert for SpecificGrant {

    fn convert(self) -> ProtoSpecificGrant {
        let grant = match self {
-            Self::EtherTransfer(s) => {
+            SpecificGrant::EtherTransfer(s) => {
                ProtoSpecificGrantType::EtherTransfer(ProtoEtherTransferSettings {
                    targets: s.target.into_iter().map(|a| a.to_vec()).collect(),
                    limit: Some(s.limit.convert()),
                })
            }
-            Self::TokenTransfer(s) => {
+            SpecificGrant::TokenTransfer(s) => {
                ProtoSpecificGrantType::TokenTransfer(ProtoTokenTransferSettings {
                    token_contract: s.token_contract.to_vec(),
                    target: s.target.map(|a| a.to_vec()),
--- a/server/crates/arbiter-server/src/grpc/user_agent/sdk_client.rs
+++ b/server/crates/arbiter-server/src/grpc/user_agent/sdk_client.rs
@@ -21,18 +21,18 @@ use tonic::Status;
 use tracing::{info, warn};

 use crate::{
-    actors::user_agent::{
+    db::models::NewEvmWalletAccess,
+    grpc::Convert,
+    peers::user_agent::{
        OutOfBand, UserAgentSession,
-        session::connection::{
+        session::handlers::{
            HandleGrantEvmWalletAccess, HandleListWalletAccess, HandleNewClientApprove,
            HandleRevokeEvmWalletAccess, HandleSdkClientList,
        },
    },
-    db::models::NewEvmWalletAccess,
-    grpc::Convert,
 };

-const fn wrap_sdk_client_response(payload: SdkClientResponsePayload) -> UserAgentResponsePayload {
+fn wrap_sdk_client_response(payload: SdkClientResponsePayload) -> UserAgentResponsePayload {
    UserAgentResponsePayload::SdkClient(proto_sdk_client::Response {
        payload: Some(payload),
    })
@@ -75,14 +75,14 @@ pub(super) async fn dispatch(
        SdkClientRequestPayload::Revoke(_) => Err(Status::unimplemented(
            "SdkClientRevoke is not yet implemented",
        )),
-        SdkClientRequestPayload::List(()) => handle_list(actor).await,
+        SdkClientRequestPayload::List(_) => handle_list(actor).await,
        SdkClientRequestPayload::GrantWalletAccess(req) => {
            handle_grant_wallet_access(actor, req).await
        }
        SdkClientRequestPayload::RevokeWalletAccess(req) => {
            handle_revoke_wallet_access(actor, req).await
        }
-        SdkClientRequestPayload::ListWalletAccess(()) => handle_list_wallet_access(actor).await,
+        SdkClientRequestPayload::ListWalletAccess(_) => handle_list_wallet_access(actor).await,
    }
 }

@@ -91,7 +91,7 @@ async fn handle_connection_response(
    resp: ProtoSdkClientConnectionResponse,
 ) -> Result<Option<UserAgentResponsePayload>, Status> {
    let pubkey = authn::PublicKey::try_from(resp.pubkey.as_slice())
-        .map_err(|()| Status::invalid_argument("Invalid ML-DSA public key"))?;
+        .map_err(|_| Status::invalid_argument("Invalid ML-DSA public key"))?;

    actor
        .ask(HandleNewClientApprove {
@@ -116,17 +116,12 @@ async fn handle_list(
                .into_iter()
                .map(|(client, metadata)| ProtoSdkClientEntry {
                    id: client.id,
-                    pubkey: client.public_key.clone(),
+                    pubkey: client.public_key.to_vec(),
                    info: Some(ProtoClientMetadata {
                        name: metadata.name,
                        description: metadata.description,
                        version: metadata.version,
                    }),
-                    #[expect(
-                        clippy::cast_possible_truncation,
-                        clippy::as_conversions,
-                        reason = "fixme! #84"
-                    )]
                    created_at: client.created_at.0.timestamp() as i32,
                })
                .collect(),
@@ -147,7 +142,7 @@ async fn handle_grant_wallet_access(
    actor: &ActorRef<UserAgentSession>,
    req: ProtoSdkClientGrantWalletAccess,
 ) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let entries: Vec<NewEvmWalletAccess> = req.accesses.into_iter().map(Convert::convert).collect();
+    let entries: Vec<NewEvmWalletAccess> = req.accesses.into_iter().map(|a| a.convert()).collect();
    match actor.ask(HandleGrantEvmWalletAccess { entries }).await {
        Ok(()) => {
            info!("Successfully granted wallet access");
@@ -187,7 +182,7 @@ async fn handle_list_wallet_access(
    match actor.ask(HandleListWalletAccess {}).await {
        Ok(accesses) => Ok(Some(wrap_sdk_client_response(
            SdkClientResponsePayload::ListWalletAccess(ListWalletAccessResponse {
-                accesses: accesses.into_iter().map(Convert::convert).collect(),
+                accesses: accesses.into_iter().map(|a| a.convert()).collect(),
            }),
        ))),
        Err(err) => {
--- a/server/crates/arbiter-server/src/grpc/user_agent/vault.rs
+++ b/server/crates/arbiter-server/src/grpc/user_agent/vault.rs
@@ -1,54 +1,23 @@
 use arbiter_proto::proto::shared::VaultState as ProtoVaultState;
 use arbiter_proto::proto::user_agent::{
    user_agent_response::Payload as UserAgentResponsePayload,
-    vault::{
-        self as proto_vault,
-        bootstrap::{
-            self as proto_bootstrap, BootstrapEncryptedKey as ProtoBootstrapEncryptedKey,
-            BootstrapResult as ProtoBootstrapResult,
-        },
-        request::Payload as VaultRequestPayload,
-        response::Payload as VaultResponsePayload,
-        unseal::{
-            self as proto_unseal, UnsealEncryptedKey as ProtoUnsealEncryptedKey,
-            UnsealResult as ProtoUnsealResult, UnsealStart,
-            request::Payload as UnsealRequestPayload, response::Payload as UnsealResponsePayload,
-        },
-    },
+    vault::{self as proto_vault, request::Payload as VaultRequestPayload, response::Payload as VaultResponsePayload},
 };
-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,
-        },
-    },
+use crate::{
+    actors::vault::VaultState,
+    peers::user_agent::{UserAgentSession, session::handlers::HandleQueryVaultState},
 };

-const fn wrap_vault_response(payload: VaultResponsePayload) -> UserAgentResponsePayload {
+fn wrap_vault_response(payload: VaultResponsePayload) -> UserAgentResponsePayload {
    UserAgentResponsePayload::Vault(proto_vault::Response {
        payload: Some(payload),
    })
 }

-const 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,
@@ -58,117 +27,22 @@ pub(super) async fn dispatch(
    };

    match payload {
-        VaultRequestPayload::QueryState(()) => handle_query_vault_state(actor).await,
-        VaultRequestPayload::Unseal(req) => dispatch_unseal_request(actor, req).await,
-        VaultRequestPayload::Bootstrap(req) => handle_bootstrap_request(actor, req).await,
+        VaultRequestPayload::QueryState(_) => handle_query_vault_state(actor).await,
+        VaultRequestPayload::Unseal(_) | VaultRequestPayload::Bootstrap(_) => {
+            Err(Status::permission_denied(
+                "Vault is already unsealed; unseal/bootstrap not permitted in session",
+            ))
        }
    }
-
-async fn dispatch_unseal_request(
-    actor: &ActorRef<UserAgentSession>,
-    req: proto_unseal::Request,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let Some(payload) = req.payload else {
-        return Err(Status::invalid_argument("Missing unseal request payload"));
-    };
-
-    match payload {
-        UnsealRequestPayload::Start(req) => handle_unseal_start(actor, req).await,
-        UnsealRequestPayload::EncryptedKey(req) => handle_unseal_encrypted_key(actor, req).await,
-    }
-}
-
-async fn handle_unseal_start(
-    actor: &ActorRef<UserAgentSession>,
-    req: UnsealStart,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let client_pubkey = <[u8; 32]>::try_from(req.client_pubkey)
-        .map(x25519_dalek::PublicKey::from)
-        .map_err(|_| Status::invalid_argument("Invalid X25519 public key"))?;
-
-    let response = actor
-        .ask(HandleUnsealRequest { client_pubkey })
-        .await
-        .map_err(|err| {
-            warn!(error = ?err, "Failed to handle unseal start request");
-            Status::internal("Failed to start unseal flow")
-        })?;
-
-    Ok(Some(wrap_unseal_response(UnsealResponsePayload::Start(
-        proto_unseal::UnsealStartResponse {
-            server_pubkey: response.server_pubkey.as_bytes().to_vec(),
-        },
-    ))))
-}
-
-async fn handle_unseal_encrypted_key(
-    actor: &ActorRef<UserAgentSession>,
-    req: ProtoUnsealEncryptedKey,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let result = match actor
-        .ask(HandleUnsealEncryptedKey {
-            nonce: req.nonce,
-            ciphertext: req.ciphertext,
-            associated_data: req.associated_data,
-        })
-        .await
-    {
-        Ok(()) => ProtoUnsealResult::Success,
-        Err(SendError::HandlerError(UnsealError::InvalidKey)) => ProtoUnsealResult::InvalidKey,
-        Err(err) => {
-            warn!(error = ?err, "Failed to handle unseal request");
-            return Err(Status::internal("Failed to unseal vault"));
-        }
-    };
-    Ok(Some(wrap_unseal_response(UnsealResponsePayload::Result(
-        result.into(),
-    ))))
-}
-
-async fn handle_bootstrap_request(
-    actor: &ActorRef<UserAgentSession>,
-    req: proto_bootstrap::Request,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let encrypted_key = req
-        .encrypted_key
-        .ok_or_else(|| Status::invalid_argument("Missing bootstrap encrypted key"))?;
-    handle_bootstrap_encrypted_key(actor, encrypted_key).await
-}
-
-async fn handle_bootstrap_encrypted_key(
-    actor: &ActorRef<UserAgentSession>,
-    req: ProtoBootstrapEncryptedKey,
-) -> Result<Option<UserAgentResponsePayload>, Status> {
-    let result = match actor
-        .ask(HandleBootstrapEncryptedKey {
-            nonce: req.nonce,
-            ciphertext: req.ciphertext,
-            associated_data: req.associated_data,
-        })
-        .await
-    {
-        Ok(()) => ProtoBootstrapResult::Success,
-        Err(SendError::HandlerError(BootstrapError::InvalidKey)) => {
-            ProtoBootstrapResult::InvalidKey
-        }
-        Err(SendError::HandlerError(BootstrapError::AlreadyBootstrapped)) => {
-            ProtoBootstrapResult::AlreadyBootstrapped
-        }
-        Err(err) => {
-            warn!(error = ?err, "Failed to handle bootstrap request");
-            return Err(Status::internal("Failed to bootstrap vault"));
-        }
-    };
-    Ok(Some(wrap_bootstrap_response(result)))
 }

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

 pub mod actors;
@@ -6,6 +7,7 @@ pub mod crypto;
 pub mod db;
 pub mod evm;
 pub mod grpc;
+pub mod peers;
 pub mod utils;

 pub struct Server {
@@ -13,7 +15,7 @@ pub struct Server {
 }

 impl Server {
-    pub const fn new(context: ServerContext) -> Self {
+    pub fn new(context: ServerContext) -> Self {
        Self { context }
    }
 }
--- a/server/crates/arbiter-server/src/actors/client/auth.rs
+++ b/server/crates/arbiter-server/src/actors/client/auth.rs
@@ -1,7 +1,6 @@
 use arbiter_crypto::authn::{self, CLIENT_CONTEXT};
 use arbiter_proto::{
    ClientMetadata,
-    proto::client::auth::{AuthChallenge as ProtoAuthChallenge, AuthResult as ProtoAuthResult},
    transport::{Bi, expect_message},
 };
 use chrono::Utc;
@@ -15,9 +14,9 @@ use tracing::error;

 use crate::{
    actors::{
-        client::{ClientConnection, ClientCredentials, ClientProfile},
+        GlobalActors,
        flow_coordinator::{self, RequestClientApproval},
-        keyholder::KeyHolder,
+        vault::Vault,
    },
    crypto::integrity::{self, AttestationStatus},
    db::{
@@ -27,61 +26,37 @@ use crate::{
    },
 };

+use super::{ClientConnection, ClientCredentials, ClientProfile};
+
 #[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
-pub enum ClientAuthError {
-    #[error("Client approval request failed")]
-    ApproveError(#[from] ApproveError),
-
-    #[error("Database operation failed")]
-    DatabaseOperationFailed,
-
+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")]
+    ApproveError(#[from] ApproveError),
    #[error("Transport error")]
    Transport,
 }

-impl From<diesel::result::Error> for ClientAuthError {
+impl From<diesel::result::Error> for Error {
    fn from(e: diesel::result::Error) -> Self {
        error!(?e, "Database error");
        Self::DatabaseOperationFailed
    }
 }

-impl From<ClientAuthError> for arbiter_proto::proto::client::auth::AuthResult {
-    fn from(value: ClientAuthError) -> Self {
-        match value {
-            ClientAuthError::ApproveError(e) => match e {
-                ApproveError::Denied => Self::ApprovalDenied,
-                ApproveError::Internal => Self::Internal,
-                ApproveError::Upstream(flow_coordinator::ApprovalError::NoUserAgentsConnected) => {
-                    Self::NoUserAgentsOnline
-                } // ApproveError::Upstream(_) => Self::Internal,
-            },
-            ClientAuthError::DatabaseOperationFailed
-            | ClientAuthError::DatabasePoolUnavailable
-            | ClientAuthError::IntegrityCheckFailed
-            | ClientAuthError::Transport => Self::Internal,
-            ClientAuthError::InvalidChallengeSolution => Self::InvalidSignature,
-        }
-    }
-}
-
 #[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
 pub enum ApproveError {
-    #[error("Client connection denied by user agents")]
-    Denied,
-
    #[error("Internal error")]
    Internal,
-
+    #[error("Client connection denied by user agents")]
+    Denied,
    #[error("Upstream error: {0}")]
    Upstream(flow_coordinator::ApprovalError),
 }
@@ -106,28 +81,16 @@ pub enum Outbound {
    AuthSuccess,
 }

-impl From<Outbound> for arbiter_proto::proto::client::auth::response::Payload {
-    fn from(value: Outbound) -> Self {
-        match value {
-            Outbound::AuthChallenge { pubkey, nonce } => Self::Challenge(ProtoAuthChallenge {
-                pubkey: pubkey.to_bytes(),
-                nonce,
-            }),
-            Outbound::AuthSuccess => Self::Result(ProtoAuthResult::Success.into()),
-        }
-    }
-}
-
 /// Returns the current nonce and client ID for a registered client.
 /// Returns `None` if the pubkey is not registered.
 async fn get_current_nonce_and_id(
    db: &db::DatabasePool,
    pubkey: &authn::PublicKey,
-) -> Result<Option<(i32, i32)>, ClientAuthError> {
+) -> Result<Option<(i32, i32)>, Error> {
    let pubkey_bytes = pubkey.to_bytes();
    let mut conn = db.get().await.map_err(|e| {
        error!(error = ?e, "Database pool error");
-        ClientAuthError::DatabasePoolUnavailable
+        Error::DatabasePoolUnavailable
    })?;
    program_client::table
        .filter(program_client::public_key.eq(&pubkey_bytes))
@@ -137,28 +100,28 @@ async fn get_current_nonce_and_id(
        .optional()
        .map_err(|e| {
            error!(error = ?e, "Database error");
-            ClientAuthError::DatabaseOperationFailed
+            Error::DatabaseOperationFailed
        })
 }

 async fn verify_integrity(
    db: &db::DatabasePool,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
    pubkey: &authn::PublicKey,
-) -> Result<(), ClientAuthError> {
+) -> Result<(), Error> {
    let mut db_conn = db.get().await.map_err(|e| {
        error!(error = ?e, "Database pool error");
-        ClientAuthError::DatabasePoolUnavailable
+        Error::DatabasePoolUnavailable
    })?;

    let (id, nonce) = get_current_nonce_and_id(db, pubkey).await?.ok_or_else(|| {
        error!("Client not found during integrity verification");
-        ClientAuthError::DatabaseOperationFailed
+        Error::DatabaseOperationFailed
    })?;

    let attestation = integrity::verify_entity(
        &mut db_conn,
-        keyholder,
+        vault,
        &ClientCredentials {
            pubkey: pubkey.clone(),
            nonce,
@@ -168,12 +131,12 @@ async fn verify_integrity(
    .await
    .map_err(|e| {
        error!(?e, "Integrity verification failed");
-        ClientAuthError::IntegrityCheckFailed
+        Error::IntegrityCheckFailed
    })?;

    if attestation != AttestationStatus::Attested {
        error!("Integrity attestation unavailable for client {id}");
-        return Err(ClientAuthError::IntegrityCheckFailed);
+        return Err(Error::IntegrityCheckFailed);
    }

    Ok(())
@@ -183,19 +146,19 @@ async fn verify_integrity(
 /// Returns the new nonce, which is used as the challenge nonce.
 async fn create_nonce(
    db: &db::DatabasePool,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
    pubkey: &authn::PublicKey,
-) -> Result<i32, ClientAuthError> {
+) -> Result<i32, Error> {
    let pubkey_bytes = pubkey.to_bytes();
    let pubkey = pubkey.clone();

    let mut conn = db.get().await.map_err(|e| {
        error!(error = ?e, "Database pool error");
-        ClientAuthError::DatabasePoolUnavailable
+        Error::DatabasePoolUnavailable
    })?;

    conn.exclusive_transaction(|conn| {
-        let keyholder = keyholder.clone();
+        let vault = vault.clone();
        let pubkey = pubkey.clone();
        Box::pin(async move {
            let (id, new_nonce): (i32, i32) = update(program_client::table)
@@ -207,7 +170,7 @@ async fn create_nonce(

            integrity::sign_entity(
                conn,
-                &keyholder,
+                &vault,
                &ClientCredentials {
                    pubkey: pubkey.clone(),
                    nonce: new_nonce,
@@ -217,7 +180,7 @@ async fn create_nonce(
            .await
            .map_err(|e| {
                error!(?e, "Integrity sign failed after nonce update");
-                ClientAuthError::DatabaseOperationFailed
+                Error::DatabaseOperationFailed
            })?;

            Ok(new_nonce)
@@ -226,10 +189,7 @@ async fn create_nonce(
    .await
 }

-async fn approve_new_client(
-    actors: &crate::actors::GlobalActors,
-    profile: ClientProfile,
-) -> Result<(), ClientAuthError> {
+async fn approve_new_client(actors: &GlobalActors, profile: ClientProfile) -> Result<(), Error> {
    let result = actors
        .flow_coordinator
        .ask(RequestClientApproval { client: profile })
@@ -237,35 +197,35 @@ async fn approve_new_client(

    match result {
        Ok(true) => Ok(()),
-        Ok(false) => Err(ClientAuthError::ApproveError(ApproveError::Denied)),
+        Ok(false) => Err(Error::ApproveError(ApproveError::Denied)),
        Err(SendError::HandlerError(e)) => {
            error!(error = ?e, "Approval upstream error");
-            Err(ClientAuthError::ApproveError(ApproveError::Upstream(e)))
+            Err(Error::ApproveError(ApproveError::Upstream(e)))
        }
        Err(e) => {
            error!(error = ?e, "Approval request to flow coordinator failed");
-            Err(ClientAuthError::ApproveError(ApproveError::Internal))
+            Err(Error::ApproveError(ApproveError::Internal))
        }
    }
 }

 async fn insert_client(
    db: &db::DatabasePool,
-    keyholder: &ActorRef<KeyHolder>,
+    vault: &ActorRef<Vault>,
    pubkey: &authn::PublicKey,
    metadata: &ClientMetadata,
-) -> Result<i32, ClientAuthError> {
-    use crate::db::schema::client_metadata;
+) -> 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");
-        ClientAuthError::DatabasePoolUnavailable
+        Error::DatabasePoolUnavailable
    })?;

    conn.exclusive_transaction(|conn| {
-        let keyholder = keyholder.clone();
+        let vault = vault.clone();
        let pubkey = pubkey.clone();
        Box::pin(async move {
            const NONCE_START: i32 = 1;
@@ -293,7 +253,7 @@ async fn insert_client(

            integrity::sign_entity(
                conn,
-                &keyholder,
+                &vault,
                &ClientCredentials {
                    pubkey: pubkey.clone(),
                    nonce: NONCE_START,
@@ -303,7 +263,7 @@ async fn insert_client(
            .await
            .map_err(|e| {
                error!(error = ?e, "Failed to sign integrity tag for new client key");
-                ClientAuthError::DatabaseOperationFailed
+                Error::DatabaseOperationFailed
            })?;

            Ok(client_id)
@@ -316,14 +276,14 @@ async fn sync_client_metadata(
    db: &db::DatabasePool,
    client_id: i32,
    metadata: &ClientMetadata,
-) -> Result<(), ClientAuthError> {
+) -> Result<(), Error> {
    use crate::db::schema::{client_metadata, client_metadata_history};

    let now = SqliteTimestamp(Utc::now());

    let mut conn = db.get().await.map_err(|e| {
        error!(error = ?e, "Database pool error");
-        ClientAuthError::DatabasePoolUnavailable
+        Error::DatabasePoolUnavailable
    })?;

    conn.exclusive_transaction(|conn| {
@@ -379,7 +339,7 @@ async fn sync_client_metadata(
    .await
    .map_err(|e| {
        error!(error = ?e, "Database error");
-        ClientAuthError::DatabaseOperationFailed
+        Error::DatabaseOperationFailed
    })
 }

@@ -387,9 +347,9 @@ async fn challenge_client<T>(
    transport: &mut T,
    pubkey: authn::PublicKey,
    nonce: i32,
-) -> Result<(), ClientAuthError>
+) -> Result<(), Error>
 where
-    T: Bi<Inbound, Result<Outbound, ClientAuthError>> + ?Sized,
+    T: Bi<Inbound, Result<Outbound, Error>> + ?Sized,
 {
    transport
        .send(Ok(Outbound::AuthChallenge {
@@ -399,42 +359,41 @@ where
        .await
        .map_err(|e| {
            error!(error = ?e, "Failed to send auth challenge");
-            ClientAuthError::Transport
+            Error::Transport
        })?;

    let signature = expect_message(transport, |req: Inbound| match req {
        Inbound::AuthChallengeSolution { signature } => Some(signature),
-        Inbound::AuthChallengeRequest { .. } => None,
+        _ => None,
    })
    .await
    .map_err(|e| {
        error!(error = ?e, "Failed to receive challenge solution");
-        ClientAuthError::Transport
+        Error::Transport
    })?;

    if !pubkey.verify(nonce, CLIENT_CONTEXT, &signature) {
        error!("Challenge solution verification failed");
-        return Err(ClientAuthError::InvalidChallengeSolution);
+        return Err(Error::InvalidChallengeSolution);
    }

    Ok(())
 }

-pub async fn authenticate<T>(
-    props: &mut ClientConnection,
-    transport: &mut T,
-) -> Result<i32, ClientAuthError>
+pub async fn authenticate<T>(props: &mut ClientConnection, transport: &mut T) -> Result<i32, Error>
 where
-    T: Bi<Inbound, Result<Outbound, ClientAuthError>> + Send + ?Sized,
+    T: Bi<Inbound, Result<Outbound, Error>> + Send + ?Sized,
 {
    let Some(Inbound::AuthChallengeRequest { pubkey, metadata }) = transport.recv().await else {
-        return Err(ClientAuthError::Transport);
+        return Err(Error::Transport);
    };

-    let client_id = if let Some((id, _)) = get_current_nonce_and_id(&props.db, &pubkey).await? {
-        verify_integrity(&props.db, &props.actors.key_holder, &pubkey).await?;
+    let client_id = match get_current_nonce_and_id(&props.db, &pubkey).await? {
+        Some((id, _)) => {
+            verify_integrity(&props.db, &props.actors.vault, &pubkey).await?;
            id
-    } else {
+        }
+        None => {
            approve_new_client(
                &props.actors,
                ClientProfile {
@@ -443,11 +402,12 @@ where
                },
            )
            .await?;
-        insert_client(&props.db, &props.actors.key_holder, &pubkey, &metadata).await?
+            insert_client(&props.db, &props.actors.vault, &pubkey, &metadata).await?
+        }
    };

    sync_client_metadata(&props.db, client_id, &metadata).await?;
-    let challenge_nonce = create_nonce(&props.db, &props.actors.key_holder, &pubkey).await?;
+    let challenge_nonce = create_nonce(&props.db, &props.actors.vault, &pubkey).await?;
    challenge_client(transport, pubkey, challenge_nonce).await?;

    transport
@@ -455,7 +415,7 @@ where
        .await
        .map_err(|e| {
            error!(error = ?e, "Failed to send auth success");
-            ClientAuthError::Transport
+            Error::Transport
        })?;

    Ok(client_id)
--- a/server/crates/arbiter-server/src/actors/client/mod.rs
+++ b/server/crates/arbiter-server/src/actors/client/mod.rs
@@ -4,9 +4,10 @@ use kameo::actor::Spawn;
 use tracing::{error, info};

 use crate::{
-    actors::{GlobalActors, client::session::ClientSession},
-    crypto::integrity::Integrable,
+    actors::GlobalActors,
+    crypto::integrity::{Integrable, hashing::Hashable},
    db,
+    peers::client::session::ClientSession,
 };

 #[derive(Debug, Clone)]
@@ -15,7 +16,6 @@ pub struct ClientProfile {
    pub metadata: ClientMetadata,
 }

-#[derive(arbiter_macros::Hashable)]
 pub struct ClientCredentials {
    pub pubkey: authn::PublicKey,
    pub nonce: i32,
@@ -25,13 +25,20 @@ impl Integrable for ClientCredentials {
    const KIND: &'static str = "client_credentials";
 }

+impl Hashable for ClientCredentials {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        hasher.update(self.pubkey.to_bytes());
+        self.nonce.hash(hasher);
+    }
+}
+
 pub struct ClientConnection {
    pub(crate) db: db::DatabasePool,
    pub(crate) actors: GlobalActors,
 }

 impl ClientConnection {
-    pub const fn new(db: db::DatabasePool, actors: GlobalActors) -> Self {
+    pub fn new(db: db::DatabasePool, actors: GlobalActors) -> Self {
        Self { db, actors }
    }
 }
@@ -41,10 +48,10 @@ pub mod session;

 pub async fn connect_client<T>(mut props: ClientConnection, transport: &mut T)
 where
-    T: Bi<auth::Inbound, Result<auth::Outbound, auth::ClientAuthError>> + Send + ?Sized,
+    T: Bi<auth::Inbound, Result<auth::Outbound, auth::Error>> + Send + ?Sized,
 {
    let fut = auth::authenticate(&mut props, transport);
-    println!("authenticate future size: {}", size_of_val(&fut));
+    println!("authenticate future size: {}", std::mem::size_of_val(&fut));
    match fut.await {
        Ok(client_id) => {
            ClientSession::spawn(ClientSession::new(props, client_id));
--- a/server/crates/arbiter-server/src/actors/client/session.rs
+++ b/server/crates/arbiter-server/src/actors/client/session.rs
@@ -6,22 +6,23 @@ use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
 use crate::{
    actors::{
        GlobalActors,
-        client::ClientConnection,
        evm::{ClientSignTransaction, SignTransactionError},
        flow_coordinator::RegisterClient,
-        keyholder::KeyHolderState,
+        vault::VaultState,
    },
    db,
    evm::VetError,
 };

+use super::ClientConnection;
+
 pub struct ClientSession {
    props: ClientConnection,
    client_id: i32,
 }

 impl ClientSession {
-    pub(crate) const fn new(props: ClientConnection, client_id: i32) -> Self {
+    pub(crate) fn new(props: ClientConnection, client_id: i32) -> Self {
        Self { props, client_id }
    }
 }
@@ -29,16 +30,14 @@ impl ClientSession {
 #[messages]
 impl ClientSession {
    #[message]
-    pub(crate) async fn handle_query_vault_state(
-        &mut self,
-    ) -> Result<KeyHolderState, ClientSessionError> {
-        use crate::actors::keyholder::GetState;
+    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.key_holder.ask(GetState {}).await {
+        let vault_state = match self.props.actors.vault.ask(GetState {}).await {
            Ok(state) => state,
            Err(err) => {
-                error!(?err, actor = "client", "keyholder.query.failed");
-                return Err(ClientSessionError::Internal);
+                error!(?err, actor = "client", "vault.query.failed");
+                return Err(Error::Internal);
            }
        };

@@ -77,7 +76,7 @@ impl ClientSession {
 impl Actor for ClientSession {
    type Args = Self;

-    type Error = ClientSessionError;
+    type Error = Error;

    async fn on_start(
        args: Self::Args,
@@ -88,13 +87,13 @@ impl Actor for ClientSession {
            .flow_coordinator
            .ask(RegisterClient { actor: this })
            .await
-            .map_err(|_| ClientSessionError::ConnectionRegistrationFailed)?;
+            .map_err(|_| Error::ConnectionRegistrationFailed)?;
        Ok(args)
    }
 }

 impl ClientSession {
-    pub const fn new_test(db: db::DatabasePool, actors: GlobalActors) -> Self {
+    pub fn new_test(db: db::DatabasePool, actors: GlobalActors) -> Self {
        let props = ClientConnection::new(db, actors);
        Self {
            props,
@@ -104,7 +103,7 @@ impl ClientSession {
 }

 #[derive(Debug, thiserror::Error)]
-pub enum ClientSessionError {
+pub enum Error {
    #[error("Connection registration failed")]
    ConnectionRegistrationFailed,
    #[error("Internal error")]
@@ -113,9 +112,9 @@ pub enum ClientSessionError {

 #[derive(Debug, thiserror::Error)]
 pub enum SignTransactionRpcError {
-    #[error("Internal error")]
-    Internal,
-
    #[error("Policy evaluation failed")]
    Vet(#[from] VetError),
+
+    #[error("Internal error")]
+    Internal,
 }
--- a/server/crates/arbiter-server/src/peers/mod.rs
+++ b/server/crates/arbiter-server/src/peers/mod.rs
@@ -0,0 +1,2 @@
+pub mod client;
+pub mod user_agent;
--- a/server/crates/arbiter-server/src/peers/user_agent/auth/mod.rs
+++ b/server/crates/arbiter-server/src/peers/user_agent/auth/mod.rs
@@ -2,14 +2,10 @@ use arbiter_crypto::authn;
 use arbiter_proto::transport::Bi;
 use tracing::error;

-use crate::actors::user_agent::{
-    UserAgentConnection,
-    auth::state::{AuthContext, AuthStateMachine},
-};
 mod state;
-use state::{
-    AuthError, AuthEvents, AuthStates, BootstrapAuthRequest, ChallengeRequest, ChallengeSolution,
-};
+use state::*;
+
+use super::{AuthCredentials, UserAgentConnection};

 #[derive(Debug, Clone)]
 pub enum Inbound {
@@ -72,10 +68,10 @@ fn parse_auth_event(payload: Inbound) -> AuthEvents {

 pub async fn authenticate<T>(
    props: &mut UserAgentConnection,
-    transport: T,
-) -> Result<authn::PublicKey, Error>
+    transport: &mut T,
+) -> Result<AuthCredentials, Error>
 where
-    T: Bi<Inbound, Result<Outbound, Error>> + Send,
+    T: Bi<Inbound, Result<Outbound, Error>> + Send + ?Sized,
 {
    let mut state = AuthStateMachine::new(AuthContext::new(props, transport));

@@ -86,7 +82,7 @@ where
        };

        match state.process_event(parse_auth_event(payload)).await {
-            Ok(AuthStates::AuthOk(key)) => return Ok(key.clone()),
+            Ok(AuthStates::AuthOk(result)) => return Ok(result.clone()),
            Err(AuthError::ActionFailed(err)) => {
                error!(?err, "State machine action failed");
                return Err(err);
--- a/server/crates/arbiter-server/src/peers/user_agent/auth/state.rs
+++ b/server/crates/arbiter-server/src/peers/user_agent/auth/state.rs
@@ -0,0 +1,329 @@
+use super::super::{AuthCredentials, Credentials, UserAgentConnection};
+use arbiter_crypto::authn::{self, USERAGENT_CONTEXT};
+use arbiter_proto::transport::Bi;
+use diesel::{ExpressionMethods as _, OptionalExtension as _, QueryDsl, sqlite::Sqlite, update};
+use diesel_async::{AsyncConnection, RunQueryDsl};
+use kameo::actor::ActorRef;
+use tracing::error;
+
+use super::Error;
+use crate::peers::user_agent::auth::Outbound;
+use crate::{
+    actors::{bootstrap::ConsumeToken, vault::Vault},
+    crypto::integrity,
+    db::{DatabasePool, schema::useragent_client},
+};
+
+pub struct ChallengeRequest {
+    pub pubkey: authn::PublicKey,
+}
+
+pub struct BootstrapAuthRequest {
+    pub pubkey: authn::PublicKey,
+    pub token: String,
+}
+
+pub struct ChallengeContext {
+    pub id: i32,
+    pub challenge_nonce: i32,
+    pub key: authn::PublicKey,
+}
+
+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(AuthCredentials),
+        SentChallenge(ChallengeContext) + ReceivedSolution(ChallengeSolution) / async verify_solution = AuthOk(AuthCredentials),
+    }
+);
+
+const NONCE_START: i32 = 1;
+
+/// Returns the current nonce, ready to use for the challenge nonce.
+async fn get_current_nonce_and_id(
+    db: &DatabasePool,
+    key: &authn::PublicKey,
+) -> 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_bytes()))
+                    .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,
+    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::internal("Database unavailable")
+    })?;
+
+    let (id, nonce) = get_current_nonce_and_id(db, pubkey).await?;
+
+    let _result = integrity::verify_entity(
+        &mut db_conn,
+        vault,
+        &AuthCredentials {
+            creds: Credentials {
+                id,
+                pubkey: pubkey.clone(),
+            },
+            new_nonce: nonce,
+        },
+        id,
+    )
+    .await
+    .map_err(|e| {
+        error!(?e, "Integrity verification failed");
+        Error::internal("Integrity verification failed")
+    })?;
+
+    Ok(())
+}
+
+async fn compute_current_nonce(
+    conn: &mut impl AsyncConnection<Backend = Sqlite>,
+    pubkey: &authn::PublicKey,
+) -> Result<(i32, i32), Error> {
+    update(useragent_client::table)
+        .filter(useragent_client::public_key.eq(pubkey.to_bytes()))
+        .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 incrementing nonce");
+            Error::internal("Database operation failed")
+        })
+}
+
+async fn resign_credentials(
+    conn: &mut impl AsyncConnection<Backend = Sqlite>,
+    vault: &ActorRef<Vault>,
+    id: i32,
+    pubkey: &authn::PublicKey,
+    new_nonce: i32,
+) -> Result<(), Error> {
+    integrity::sign_entity(
+        conn,
+        vault,
+        &AuthCredentials {
+            creds: Credentials {
+                id,
+                pubkey: pubkey.clone(),
+            },
+            new_nonce,
+        },
+        id,
+    )
+    .await
+    .map_err(|e| {
+        error!(?e, "Integrity signature update failed");
+        Error::internal("Database error")
+    })
+}
+
+async fn register_key(db: &DatabasePool, pubkey: &authn::PublicKey) -> Result<i32, Error> {
+    let pubkey_bytes = pubkey.to_bytes();
+    let mut conn = db.get().await.map_err(|e| {
+        error!(error = ?e, "Database pool error");
+        Error::internal("Database unavailable")
+    })?;
+
+    let id: i32 = diesel::insert_into(useragent_client::table)
+        .values((
+            useragent_client::public_key.eq(pubkey_bytes),
+            useragent_client::nonce.eq(NONCE_START),
+        ))
+        .returning(useragent_client::id)
+        .get_result(&mut conn)
+        .await
+        .map_err(|e| {
+            error!(error = ?e, "Database error");
+            Error::internal("Database operation failed")
+        })?;
+
+    Ok(id)
+}
+
+pub 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 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 }: ChallengeRequest,
+    ) -> Result<ChallengeContext, Self::Error> {
+        let is_signing = integrity::is_signing_available(&self.conn.actors.vault)
+            .await
+            .unwrap_or(false);
+
+        if is_signing {
+            verify_integrity(&self.conn.db, &self.conn.actors.vault, &pubkey).await?;
+        }
+
+        let vault = self.conn.actors.vault.clone();
+        let mut conn = self.conn.db.get().await.map_err(|e| {
+            error!(error = ?e, "Database pool error");
+            Error::internal("Database unavailable")
+        })?;
+
+        let (id, nonce) = conn
+            .exclusive_transaction(|conn| {
+                let pubkey = pubkey.clone();
+                let vault = vault.clone();
+                Box::pin(async move {
+                    let (id, new_nonce) = compute_current_nonce(conn, &pubkey).await?;
+                    if is_signing {
+                        resign_credentials(conn, &vault, id, &pubkey, new_nonce).await?;
+                    }
+                    Result::<_, Error>::Ok((id, new_nonce))
+                })
+            })
+            .await?;
+
+        self.transport
+            .send(Ok(Outbound::AuthChallenge { nonce }))
+            .await
+            .map_err(|e| {
+                error!(?e, "Failed to send auth challenge");
+                Error::Transport
+            })?;
+
+        Ok(ChallengeContext {
+            id,
+            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<AuthCredentials, 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 => {
+                let id = register_key(&self.conn.db, &pubkey).await?;
+                self.transport
+                    .send(Ok(Outbound::AuthSuccess))
+                    .await
+                    .map_err(|_| Error::Transport)?;
+                Ok(AuthCredentials {
+                    creds: Credentials { id, pubkey },
+                    new_nonce: NONCE_START,
+                })
+            }
+            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 {
+            id,
+            challenge_nonce,
+            key,
+        }: &ChallengeContext,
+        ChallengeSolution { solution }: ChallengeSolution,
+    ) -> Result<AuthCredentials, Self::Error> {
+        let signature = authn::Signature::try_from(solution.as_slice()).map_err(|_| {
+            error!("Failed to decode signature in challenge solution");
+            Error::InvalidChallengeSolution
+        })?;
+
+        let valid = key.verify(*challenge_nonce, USERAGENT_CONTEXT, &signature);
+
+        match valid {
+            true => {
+                self.transport
+                    .send(Ok(Outbound::AuthSuccess))
+                    .await
+                    .map_err(|_| Error::Transport)?;
+                Ok(AuthCredentials {
+                    creds: Credentials {
+                        id: *id,
+                        pubkey: key.clone(),
+                    },
+                    new_nonce: *challenge_nonce,
+                })
+            }
+            false => {
+                self.transport
+                    .send(Err(Error::InvalidChallengeSolution))
+                    .await
+                    .map_err(|_| Error::Transport)?;
+                Err(Error::InvalidChallengeSolution)
+            }
+        }
+    }
+}
--- a/server/crates/arbiter-server/src/peers/user_agent/mod.rs
+++ b/server/crates/arbiter-server/src/peers/user_agent/mod.rs
@@ -0,0 +1,175 @@
+use crate::{
+    actors::GlobalActors,
+    crypto::integrity::{self, Integrable},
+    db,
+    peers::client::ClientProfile,
+};
+use arbiter_crypto::authn;
+
+use arbiter_proto::transport::{Bi, Sender};
+pub use auth::authenticate;
+use kameo::actor::{ActorRef, Spawn as _};
+pub use session::UserAgentSession;
+use tokio::sync::oneshot;
+use tracing::warn;
+use vault_gate::VaultGate;
+
+use crate::crypto::integrity::hashing::Hashable;
+
+pub mod auth;
+pub mod session;
+pub mod vault_gate;
+
+#[derive(Debug, Clone, Hash)]
+pub struct Credentials {
+    pub id: i32,
+    pub pubkey: authn::PublicKey,
+}
+impl Hashable for Credentials {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.id.hash(hasher);
+        self.pubkey.hash(hasher);
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct AuthCredentials {
+    pub creds: Credentials,
+    // denotes new nonce, not current
+    pub new_nonce: i32,
+}
+
+impl Hashable for authn::PublicKey {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        hasher.update(self.to_bytes());
+    }
+}
+
+impl Hashable for AuthCredentials {
+    fn hash<H: sha2::Digest>(&self, hasher: &mut H) {
+        self.creds.hash(hasher);
+        self.new_nonce.hash(hasher);
+    }
+}
+
+impl Integrable for AuthCredentials {
+    const KIND: &'static str = "useragent_credentials";
+}
+
+// Messages, sent by user agent to connection client without having a request
+#[derive(Debug)]
+pub enum OutOfBand {
+    ClientConnectionRequest { profile: ClientProfile },
+    ClientConnectionCancel { pubkey: authn::PublicKey },
+}
+
+#[derive(Clone)]
+pub struct UserAgentConnection {
+    pub(crate) db: db::DatabasePool,
+    pub(crate) actors: GlobalActors,
+}
+
+impl UserAgentConnection {
+    pub fn new(db: db::DatabasePool, actors: GlobalActors) -> Self {
+        Self { db, actors }
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("authentication failed: {0:?}")]
+    Auth(auth::Error),
+    #[error("vault gate failed: {0}")]
+    VaultGate(#[from] vault_gate::Error),
+    #[error("transport closed unexpectedly")]
+    Transport,
+    #[error("internal: {0}")]
+    Internal(String),
+}
+
+impl From<auth::Error> for Error {
+    fn from(err: auth::Error) -> Self {
+        Self::Auth(err)
+    }
+}
+
+pub async fn start<T>(
+    props: &mut UserAgentConnection,
+    mut transport: T,
+    oob_sender: Box<dyn Sender<OutOfBand>>,
+) -> Result<ActorRef<UserAgentSession>, Error>
+where
+    T: Bi<auth::Inbound, Result<auth::Outbound, auth::Error>> + Send,
+    T: Bi<vault_gate::Inbound, Result<vault_gate::Outbound, vault_gate::Error>> + Send,
+{
+    let auth_creds = authenticate(props, &mut transport).await?;
+
+    let creds = if integrity::is_signing_available(&props.actors.vault)
+        .await
+        .unwrap_or(false)
+    {
+        auth_creds.creds
+    } else {
+        run_vault_gate(props, &mut transport, auth_creds).await?
+    };
+
+    Ok(UserAgentSession::spawn(UserAgentSession::new(
+        props.clone(),
+        creds,
+        oob_sender,
+    )))
+}
+
+async fn run_vault_gate<T>(
+    props: &UserAgentConnection,
+    transport: &mut T,
+    auth_creds: AuthCredentials,
+) -> Result<Credentials, Error>
+where
+    T: Bi<vault_gate::Inbound, Result<vault_gate::Outbound, vault_gate::Error>> + Send + ?Sized,
+{
+    let (promotion_tx, mut promotion_rx) = oneshot::channel();
+    let gate = VaultGate::spawn(VaultGate::new(
+        auth_creds,
+        props.actors.clone(),
+        props.db.clone(),
+        promotion_tx,
+    ));
+
+    let result = loop {
+        tokio::select! {
+            promotion = &mut promotion_rx => {
+                break match promotion {
+                    Ok(Ok(creds)) => Ok(creds),
+                    Ok(Err(err)) => Err(Error::VaultGate(err)),
+                    Err(_) => Err(Error::Internal(
+                        "vault gate promotion channel closed".into(),
+                    )),
+                };
+            }
+
+            inbound = transport.recv() => {
+                let Some(inbound) = inbound else {
+                    break Err(Error::Transport);
+                };
+
+                match gate.ask(inbound).await {
+                    Ok(outbound) => {
+                        if transport.send(Ok(outbound)).await.is_err() {
+                            break Err(Error::Transport);
+                        }
+                    }
+                    Err(err) => {
+                        warn!(?err, "VaultGate failed to handle message");
+                        break Err(Error::Internal(format!(
+                            "vault gate ask failed: {err:?}"
+                        )));
+                    }
+                }
+            }
+        }
+    };
+
+    gate.kill();
+    result
+}
--- a/server/crates/arbiter-server/src/peers/user_agent/session/handlers.rs
+++ b/server/crates/arbiter-server/src/peers/user_agent/session/handlers.rs
@@ -0,0 +1,299 @@
+use std::sync::Mutex;
+
+use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
+use arbiter_crypto::{
+    authn,
+    safecell::{SafeCell, SafeCellHandle as _},
+};
+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::{
+    evm::{
+        ClientSignTransaction, Generate, ListWallets, SignTransactionError as EvmSignError,
+        UseragentCreateGrant, UseragentListGrants,
+    },
+    vault::{self, Bootstrap, TryUnseal},
+};
+use crate::db::models::{
+    EvmWalletAccess, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata,
+};
+use crate::evm::policies::{Grant, SpecificGrant};
+use crate::{
+    actors::vault::VaultState,
+};
+
+use super::{Error, UserAgentSession};
+
+
+#[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)
+    }
+}
--- a/server/crates/arbiter-server/src/peers/user_agent/session/mod.rs
+++ b/server/crates/arbiter-server/src/peers/user_agent/session/mod.rs
@@ -1,44 +1,47 @@
 use arbiter_crypto::authn;
+use diesel::{ExpressionMethods, QueryDsl};
+use diesel_async::{RunQueryDsl};
+use kameo_actors::message_bus::Register;

 use std::{borrow::Cow, collections::HashMap};

 use arbiter_proto::transport::Sender;
-use async_trait::async_trait;
-use kameo::{Actor, actor::ActorRef, messages};
+use kameo::{Actor, actor::ActorRef, messages, prelude::Message};
 use thiserror::Error;
 use tracing::error;

-use crate::actors::{
-    client::ClientProfile,
+use crate::{
+    actors::{
        flow_coordinator::{RegisterUserAgent, client_connect_approval::ClientApprovalController},
-    user_agent::{OutOfBand, UserAgentConnection},
+        vault::events,
+    }, crypto::integrity, db::schema::useragent_client, peers::{client::ClientProfile, user_agent::{AuthCredentials, Credentials}}
 };
-mod state;
-use state::{DummyContext, UserAgentEvents, UserAgentStateMachine};
+
+use super::{OutOfBand, UserAgentConnection};

 #[derive(Debug, Error)]
-pub enum UserAgentSessionError {
-    #[error("Internal error: {message}")]
-    Internal { message: Cow<'static, str> },
-
+pub enum Error {
    #[error("State transition failed")]
    State,
+
+    #[error("Internal error: {message}")]
+    Internal { message: Cow<'static, str> },
 }

-impl From<crate::db::PoolError> for UserAgentSessionError {
+impl From<crate::db::PoolError> for Error {
    fn from(err: crate::db::PoolError) -> Self {
        error!(?err, "Database pool error");
        Self::internal("Database pool error")
    }
 }
-impl From<diesel::result::Error> for UserAgentSessionError {
+impl From<diesel::result::Error> for Error {
    fn from(err: diesel::result::Error) -> Self {
        error!(?err, "Database error");
        Self::internal("Database error")
    }
 }

-impl UserAgentSessionError {
+impl Error {
    pub fn internal(message: impl Into<Cow<'static, str>>) -> Self {
        Self::Internal {
            message: message.into(),
@@ -52,48 +55,28 @@ pub struct PendingClientApproval {
 }

 pub struct UserAgentSession {
+    creds: Credentials,
    props: UserAgentConnection,
-    state: UserAgentStateMachine<DummyContext>,
    sender: Box<dyn Sender<OutOfBand>>,

    pending_client_approvals: HashMap<Vec<u8>, PendingClientApproval>,
 }

-pub mod connection;
+pub mod handlers;

 impl UserAgentSession {
-    pub(crate) fn new(props: UserAgentConnection, sender: Box<dyn Sender<OutOfBand>>) -> Self {
+    pub(crate) fn new(
+        props: UserAgentConnection,
+        creds: Credentials,
+        sender: Box<dyn Sender<OutOfBand>>,
+    ) -> Self {
        Self {
+            creds,
            props,
-            state: UserAgentStateMachine::new(DummyContext),
            sender,
-            pending_client_approvals: HashMap::default(),
+            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<(), UserAgentSessionError> {
-        self.state.process_event(event).map_err(|e| {
-            error!(?e, "State transition failed");
-            UserAgentSessionError::State
-        })?;
-        Ok(())
-    }
 }

 #[messages]
@@ -132,11 +115,11 @@ impl UserAgentSession {
 impl Actor for UserAgentSession {
    type Args = Self;

-    type Error = UserAgentSessionError;
+    type Error = Error;

    async fn on_start(
        args: Self::Args,
-        this: ActorRef<Self>,
+        this: kameo::prelude::ActorRef<Self>,
    ) -> Result<Self, Self::Error> {
        args.props
            .actors
@@ -150,9 +133,7 @@ impl Actor for UserAgentSession {
                    ?err,
                    "Failed to register user agent connection with flow coordinator"
                );
-                UserAgentSessionError::internal(
-                    "Failed to register user agent connection with flow coordinator",
-                )
+                Error::internal("Failed to register user agent connection with flow coordinator")
            })?;
        Ok(args)
    }
--- a/server/crates/arbiter-server/src/peers/user_agent/vault_gate/mod.rs
+++ b/server/crates/arbiter-server/src/peers/user_agent/vault_gate/mod.rs
@@ -0,0 +1,295 @@
+use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
+use chacha20poly1305::{AeadInPlace, KeyInit as _, XChaCha20Poly1305, XNonce};
+use kameo::{Actor, error::SendError, messages, prelude::Message};
+use kameo_actors::message_bus::Register;
+use tokio::sync::oneshot;
+use tracing::{error, info};
+use x25519_dalek::{EphemeralSecret, PublicKey, SharedSecret};
+
+pub mod state;
+use state::*;
+
+use super::{AuthCredentials, Credentials};
+use crate::{
+    actors::{
+        GlobalActors,
+        vault::{self, Bootstrap, TryUnseal, events},
+    },
+    crypto::integrity::{self, AttestationStatus},
+    db::DatabasePool,
+};
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("Vault is already bootstrapped")]
+    AlreadyBootstrapped,
+    #[error("Invalid key provided")]
+    InvalidKey,
+
+    #[error("State transition failed")]
+    State,
+
+    #[error("Internal error: {0}")]
+    Internal(String),
+}
+impl Error {
+    fn internal(message: impl Into<String>) -> Self {
+        Self::Internal(message.into())
+    }
+}
+
+pub struct HandshakeResponse {
+    pub server_pubkey: PublicKey,
+}
+
+pub struct VaultGate {
+    pub auth_creds: AuthCredentials,
+    pub promotion_tx: Option<oneshot::Sender<Result<Credentials, Error>>>,
+    pub state: State,
+    pub actors: GlobalActors,
+    pub db: DatabasePool,
+}
+
+impl VaultGate {
+    pub fn new(
+        auth_creds: AuthCredentials,
+        actors: GlobalActors,
+        db: DatabasePool,
+        promotion_tx: oneshot::Sender<Result<Credentials, Error>>,
+    ) -> Self {
+        Self {
+            auth_creds,
+            state: State::default(),
+            actors,
+            db,
+            promotion_tx: Some(promotion_tx),
+        }
+    }
+}
+
+impl Actor for VaultGate {
+    type Args = Self;
+
+    type Error = ();
+
+    async fn on_start(
+        args: Self::Args,
+        actor_ref: kameo::prelude::ActorRef<Self>,
+    ) -> Result<Self, Self::Error> {
+        let _ = args
+            .actors
+            .events
+            .tell(Register(
+                actor_ref.clone().recipient::<events::Bootstrapped>(),
+            ))
+            .await;
+        let _ = args
+            .actors
+            .events
+            .tell(Register(actor_ref.recipient::<events::Unsealed>()))
+            .await;
+        Ok(args)
+    }
+}
+
+impl VaultGate {
+    fn decrypt_key(
+        secret: &SharedSecret,
+        nonce: &[u8],
+        ciphertext: &[u8],
+        associated_data: &[u8],
+    ) -> Result<SafeCell<Vec<u8>>, ()> {
+        let nonce = XNonce::from_slice(nonce);
+
+        let cipher = XChaCha20Poly1305::new(secret.as_bytes().into());
+
+        let mut key_buffer = SafeCell::new(ciphertext.to_vec());
+
+        let decryption_result = key_buffer.write_inline(|write_handle| {
+            cipher.decrypt_in_place(nonce, associated_data, write_handle)
+        });
+
+        match decryption_result {
+            Ok(_) => Ok(key_buffer),
+            Err(err) => {
+                error!(?err, "Failed to decrypt encrypted key material");
+                Err(())
+            }
+        }
+    }
+}
+
+#[messages(messages = Inbound, replies = Outbound)]
+impl VaultGate {
+    #[message]
+    pub async fn handle_handshake(
+        &mut self,
+        client_pubkey: x25519_dalek::PublicKey,
+    ) -> Result<HandshakeResponse, Error> {
+        let ephemeral_secret = EphemeralSecret::random();
+        let public_key = PublicKey::from(&ephemeral_secret);
+
+        let secret = ephemeral_secret.diffie_hellman(&client_pubkey);
+
+        self.state = State::ReadyForExchange {
+            server_key: public_key.clone(),
+            secret,
+        };
+
+        Ok(HandshakeResponse {
+            server_pubkey: public_key,
+        })
+    }
+
+    #[message]
+    pub async fn handle_unseal_encrypted_key(
+        &mut self,
+        nonce: Vec<u8>,
+        ciphertext: Vec<u8>,
+        associated_data: Vec<u8>,
+    ) -> Result<(), Error> {
+        let State::ReadyForExchange { secret, .. } = &self.state else {
+            return Err(Error::State);
+        };
+
+        let seal_key_buffer = match Self::decrypt_key(secret, &nonce, &ciphertext, &associated_data)
+        {
+            Ok(buffer) => buffer,
+            Err(()) => {
+                return Err(Error::InvalidKey);
+            }
+        };
+
+        match self
+            .actors
+            .vault
+            .ask(TryUnseal {
+                seal_key_raw: seal_key_buffer,
+            })
+            .await
+        {
+            Ok(_) => {
+                info!("Successfully unsealed key with client-provided key");
+                Ok(())
+            }
+            Err(SendError::HandlerError(vault::Error::InvalidKey)) => Err(Error::InvalidKey),
+            Err(SendError::HandlerError(err)) => {
+                error!(?err, "Vault failed to unseal key");
+                Err(Error::InvalidKey)
+            }
+            Err(err) => {
+                error!(?err, "Failed to send unseal request to vault");
+                Err(Error::internal("Vault actor error").into())
+            }
+        }
+    }
+
+    #[message]
+    pub async fn handle_bootstrap_encrypted_key(
+        &mut self,
+        nonce: Vec<u8>,
+        ciphertext: Vec<u8>,
+        associated_data: Vec<u8>,
+    ) -> Result<(), Error> {
+        let State::ReadyForExchange { secret, .. } = &self.state else {
+            return Err(Error::State);
+        };
+
+        let seal_key_buffer = match Self::decrypt_key(secret, &nonce, &ciphertext, &associated_data)
+        {
+            Ok(buffer) => buffer,
+            Err(()) => {
+                return Err(Error::InvalidKey);
+            }
+        };
+
+        match self
+            .actors
+            .vault
+            .ask(Bootstrap {
+                seal_key_raw: seal_key_buffer,
+            })
+            .await
+        {
+            Ok(_) => {
+                info!("Successfully bootstrapped vault with client-provided key");
+                Ok(())
+            }
+            Err(SendError::HandlerError(vault::Error::AlreadyBootstrapped)) => {
+                Err(Error::AlreadyBootstrapped)
+            }
+            Err(SendError::HandlerError(err)) => {
+                error!(?err, "Vault failed to bootstrap vault");
+                Err(Error::InvalidKey)
+            }
+            Err(err) => {
+                error!(?err, "Failed to send bootstrap request to vault");
+                Err(Error::internal("Vault error"))
+            }
+        }
+    }
+}
+
+impl Message<events::Bootstrapped> for VaultGate {
+    type Reply = ();
+
+    async fn handle(
+        &mut self,
+        _: events::Bootstrapped,
+        ctx: &mut kameo::prelude::Context<Self, Self::Reply>,
+    ) -> Self::Reply {
+        let result = async {
+            let mut conn = self.db.get().await.map_err(|_| Error::internal("DB unavailable"))?;
+            integrity::sign_entity(&mut conn, &self.actors.vault, &self.auth_creds, self.auth_creds.creds.id)
+                .await
+                .map_err(|e| {
+                    error!(?e, "Failed to sign integrity envelope on bootstrap");
+                    Error::internal("Integrity sign failed")
+                })?;
+            Ok(self.auth_creds.creds.clone())
+        }
+        .await;
+
+        if let Some(tx) = self.promotion_tx.take() {
+            let _ = tx.send(result);
+        }
+        ctx.stop();
+    }
+}
+
+impl Message<events::Unsealed> for VaultGate {
+    type Reply = ();
+
+    async fn handle(
+        &mut self,
+        _: events::Unsealed,
+        ctx: &mut kameo::prelude::Context<Self, Self::Reply>,
+    ) -> Self::Reply {
+        let result = async {
+            let mut conn = self.db.get().await.map_err(|_| Error::internal("DB unavailable"))?;
+            match integrity::verify_entity(
+                &mut conn,
+                &self.actors.vault,
+                &self.auth_creds,
+                self.auth_creds.creds.id,
+            )
+            .await
+            {
+                Ok(AttestationStatus::Attested) => Ok(self.auth_creds.creds.clone()),
+                Ok(AttestationStatus::Unavailable) => {
+                    Err(Error::internal("Vault sealed during promotion"))
+                }
+                Err(e) => {
+                    error!(?e, "Integrity verification failed during unseal promotion");
+                    Err(Error::InvalidKey)
+                }
+            }
+        }
+        .await;
+
+        if let Some(tx) = self.promotion_tx.take() {
+            let _ = tx.send(result);
+        }
+        ctx.stop();
+    }
+}
--- a/server/crates/arbiter-server/src/peers/user_agent/vault_gate/state.rs
+++ b/server/crates/arbiter-server/src/peers/user_agent/vault_gate/state.rs
@@ -0,0 +1,17 @@
+use std::sync::Mutex;
+
+use x25519_dalek::{EphemeralSecret, PublicKey, SharedSecret};
+
+pub struct Handshake {
+    client_pubkey: PublicKey,
+}
+
+#[derive(Default)]
+pub enum State {
+    #[default]
+    Idle,
+    ReadyForExchange {
+        server_key: PublicKey,
+        secret: SharedSecret,
+    },
+}
--- a/server/crates/arbiter-server/tests/client/auth.rs
+++ b/server/crates/arbiter-server/tests/client/auth.rs
@@ -5,17 +5,14 @@ use arbiter_crypto::{
 use arbiter_proto::ClientMetadata;
 use arbiter_proto::transport::{Receiver, Sender};
 use arbiter_server::{
-    actors::{
-        GlobalActors,
-        client::{ClientConnection, ClientCredentials, auth, connect_client},
-        keyholder::Bootstrap,
-    },
+    actors::{GlobalActors, vault::Bootstrap},
    crypto::integrity,
    db::{self, schema},
+    peers::client::{ClientConnection, ClientCredentials, auth, connect_client},
 };
 use diesel::{ExpressionMethods as _, NullableExpressionMethods as _, QueryDsl as _, insert_into};
 use diesel_async::RunQueryDsl;
-use ml_dsa::{KeyGen, MlDsa87, SigningKey, VerifyingKey, signature::Keypair};
+use ml_dsa::{KeyGen, MlDsa87, SigningKey, VerifyingKey, signature::Keypair as _};

 use super::common::ChannelTransport;

@@ -27,10 +24,6 @@ fn metadata(name: &str, description: Option<&str>, version: Option<&str>) -> Cli
    }
 }

-fn verifying_key(key: &SigningKey<MlDsa87>) -> VerifyingKey<MlDsa87> {
-    <SigningKey<MlDsa87> as Keypair>::verifying_key(key)
-}
-
 async fn insert_registered_client(
    db: &db::DatabasePool,
    actors: &GlobalActors,
@@ -52,7 +45,7 @@ async fn insert_registered_client(
        .unwrap();
    let client_id: i32 = insert_into(program_client::table)
        .values((
-            program_client::public_key.eq(pubkey.encode().0.to_vec()),
+            program_client::public_key.eq(pubkey.encode().to_vec()),
            program_client::metadata_id.eq(metadata_id),
        ))
        .returning(program_client::id)
@@ -62,7 +55,7 @@ async fn insert_registered_client(

    integrity::sign_entity(
        &mut conn,
-        &actors.key_holder,
+        &actors.vault,
        &ClientCredentials {
            pubkey: pubkey.into(),
            nonce: 1,
@@ -87,9 +80,9 @@ fn sign_client_challenge(

 async fn insert_bootstrap_sentinel_useragent(db: &db::DatabasePool) {
    let mut conn = db.get().await.unwrap();
-    let sentinel_key = verifying_key(&MlDsa87::key_gen(&mut rand::rng()))
+    let sentinel_key = MlDsa87::key_gen(&mut rand::rng())
+        .verifying_key()
        .encode()
-        .0
        .to_vec();

    insert_into(schema::useragent_client::table)
@@ -107,7 +100,7 @@ async fn spawn_test_actors(db: &db::DatabasePool) -> GlobalActors {

    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
    actors
-        .key_holder
+        .vault
        .ask(Bootstrap {
            seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
        })
@@ -118,7 +111,7 @@ async fn spawn_test_actors(db: &db::DatabasePool) -> GlobalActors {

 #[tokio::test]
 #[test_log::test]
-pub async fn 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();
@@ -133,7 +126,7 @@ pub async fn unregistered_pubkey_rejected() {

    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            metadata: metadata("client", Some("desc"), Some("1.0.0")),
        })
        .await
@@ -145,18 +138,18 @@ pub async fn unregistered_pubkey_rejected() {

 #[tokio::test]
 #[test_log::test]
-pub async fn 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());

-    Box::pin(insert_registered_client(
+    insert_registered_client(
        &db,
        &actors,
-        verifying_key(&new_key),
+        new_key.verifying_key(),
        &metadata("client", Some("desc"), Some("1.0.0")),
-    ))
+    )
    .await;

    let (server_transport, mut test_transport) = ChannelTransport::new();
@@ -169,7 +162,7 @@ pub async fn challenge_auth() {
    // Send challenge request
    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            metadata: metadata("client", Some("desc"), Some("1.0.0")),
        })
        .await
@@ -183,7 +176,7 @@ pub async fn challenge_auth() {
    let challenge = match response {
        Ok(resp) => match resp {
            auth::Outbound::AuthChallenge { pubkey, nonce } => (pubkey, nonce),
-            other @ auth::Outbound::AuthSuccess => panic!("Expected AuthChallenge, got {other:?}"),
+            other => panic!("Expected AuthChallenge, got {other:?}"),
        },
        Err(err) => panic!("Expected Ok response, got Err({err:?})"),
    };
@@ -212,19 +205,13 @@ pub async fn challenge_auth() {

 #[tokio::test]
 #[test_log::test]
-pub async fn 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 new_key = MlDsa87::key_gen(&mut rand::rng());
    let requested = metadata("client", Some("desc"), Some("1.0.0"));

-    Box::pin(insert_registered_client(
-        &db,
-        &actors,
-        verifying_key(&new_key),
-        &requested,
-    ))
-    .await;
+    insert_registered_client(&db, &actors, new_key.verifying_key(), &requested).await;

    let props = ClientConnection::new(db.clone(), actors);

@@ -236,7 +223,7 @@ pub async fn metadata_unchanged_does_not_append_history() {

    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            metadata: requested,
        })
        .await
@@ -245,7 +232,7 @@ pub async fn metadata_unchanged_does_not_append_history() {
    let response = test_transport.recv().await.unwrap().unwrap();
    let (pubkey, nonce) = match response {
        auth::Outbound::AuthChallenge { pubkey, nonce } => (pubkey, nonce),
-        auth::Outbound::AuthSuccess => panic!("Expected AuthChallenge, got AuthSuccess"),
+        other => panic!("Expected AuthChallenge, got {other:?}"),
    };
    let signature = sign_client_challenge(&new_key, nonce, &pubkey);
    test_transport
@@ -275,17 +262,17 @@ pub async fn metadata_unchanged_does_not_append_history() {

 #[tokio::test]
 #[test_log::test]
-pub async fn 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 new_key = MlDsa87::key_gen(&mut rand::rng());

-    Box::pin(insert_registered_client(
+    insert_registered_client(
        &db,
        &actors,
-        verifying_key(&new_key),
+        new_key.verifying_key(),
        &metadata("client", Some("old"), Some("1.0.0")),
-    ))
+    )
    .await;

    let props = ClientConnection::new(db.clone(), actors);
@@ -298,7 +285,7 @@ pub async fn metadata_change_appends_history_and_repoints_binding() {

    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            metadata: metadata("client", Some("new"), Some("2.0.0")),
        })
        .await
@@ -307,14 +294,14 @@ pub async fn metadata_change_appends_history_and_repoints_binding() {
    let response = test_transport.recv().await.unwrap().unwrap();
    let (pubkey, nonce) = match response {
        auth::Outbound::AuthChallenge { pubkey, nonce } => (pubkey, nonce),
-        auth::Outbound::AuthSuccess => panic!("Expected AuthChallenge, got AuthSuccess"),
+        other => panic!("Expected AuthChallenge, got {other:?}"),
    };
    let signature = sign_client_challenge(&new_key, nonce, &pubkey);
    test_transport
        .send(auth::Inbound::AuthChallengeSolution { signature })
        .await
        .unwrap();
-    drop(test_transport.recv().await.unwrap());
+    let _ = test_transport.recv().await.unwrap();
    task.await.unwrap();

    {
@@ -362,7 +349,7 @@ pub async fn metadata_change_appends_history_and_repoints_binding() {

 #[tokio::test]
 #[test_log::test]
-pub async fn challenge_auth_rejects_integrity_tag_mismatch() {
+pub async fn test_challenge_auth_rejects_integrity_tag_mismatch() {
    let db = db::create_test_pool().await;
    let actors = spawn_test_actors(&db).await;

@@ -384,7 +371,7 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch() {
            .unwrap();
        insert_into(program_client::table)
            .values((
-                program_client::public_key.eq(verifying_key(&new_key).encode().0.to_vec()),
+                program_client::public_key.eq(new_key.verifying_key().encode().to_vec()),
                program_client::metadata_id.eq(metadata_id),
            ))
            .execute(&mut conn)
@@ -401,7 +388,7 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch() {

    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            metadata: requested,
        })
        .await
@@ -411,10 +398,7 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch() {
        .recv()
        .await
        .expect("should receive auth rejection");
-    assert!(matches!(
-        response,
-        Err(auth::ClientAuthError::IntegrityCheckFailed)
-    ));
+    assert!(matches!(response, Err(auth::Error::IntegrityCheckFailed)));

    task.await.unwrap();
 }
--- a/server/crates/arbiter-server/tests/common/mod.rs
+++ b/server/crates/arbiter-server/tests/common/mod.rs
@@ -1,8 +1,7 @@
-#![allow(dead_code, reason = "Common test utilities that may not be used in every test")]
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_proto::transport::{Bi, Error, Receiver, Sender};
 use arbiter_server::{
-    actors::keyholder::KeyHolder,
+    actors::{GlobalActors, vault::Vault},
    db::{self, schema},
 };

@@ -11,8 +10,11 @@ use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;
 use tokio::sync::mpsc;

-pub async fn bootstrapped_keyholder(db: &db::DatabasePool) -> KeyHolder {
-    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+#[allow(dead_code)]
+pub async fn bootstrapped_vault(db: &db::DatabasePool) -> Vault {
+    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
    actor
        .bootstrap(SafeCell::new(b"test-seal-key".to_vec()))
        .await
@@ -20,6 +22,7 @@ pub async fn bootstrapped_keyholder(db: &db::DatabasePool) -> KeyHolder {
    actor
 }

+#[allow(dead_code)]
 pub async fn root_key_history_id(db: &db::DatabasePool) -> i32 {
    let mut conn = db.get().await.unwrap();
    let id = schema::arbiter_settings::table
@@ -30,12 +33,14 @@ pub async fn root_key_history_id(db: &db::DatabasePool) -> i32 {
    id.expect("root_key_id should be set after bootstrap")
 }

+#[allow(dead_code)]
 pub struct ChannelTransport<T, Y> {
    receiver: mpsc::Receiver<T>,
    sender: mpsc::Sender<Y>,
 }

 impl<T, Y> ChannelTransport<T, Y> {
+    #[allow(dead_code)]
    pub fn new() -> (Self, ChannelTransport<Y, T>) {
        let (tx1, rx1) = mpsc::channel(10);
        let (tx2, rx2) = mpsc::channel(10);
--- a/server/crates/arbiter-server/tests/keyholder.rs
+++ b/server/crates/arbiter-server/tests/keyholder.rs
@@ -1,8 +0,0 @@
-mod common;
-
-#[path = "keyholder/concurrency.rs"]
-mod concurrency;
-#[path = "keyholder/lifecycle.rs"]
-mod lifecycle;
-#[path = "keyholder/storage.rs"]
-mod storage;
--- a/server/crates/arbiter-server/tests/user_agent/auth.rs
+++ b/server/crates/arbiter-server/tests/user_agent/auth.rs
@@ -5,25 +5,17 @@ use arbiter_crypto::{

 use arbiter_proto::transport::{Receiver, Sender};
 use arbiter_server::{
-    actors::{
-        GlobalActors,
-        bootstrap::GetToken,
-        keyholder::Bootstrap,
-        user_agent::{UserAgentConnection, UserAgentCredentials, auth},
-    },
+    actors::{GlobalActors, bootstrap::GetToken, vault::Bootstrap},
    crypto::integrity,
    db::{self, schema},
+    peers::user_agent::{AuthCredentials, Credentials, UserAgentConnection, auth},
 };
 use diesel::{ExpressionMethods as _, QueryDsl, insert_into};
 use diesel_async::RunQueryDsl;
-use ml_dsa::{KeyGen, MlDsa87, SigningKey, VerifyingKey, signature::Keypair};
+use ml_dsa::{KeyGen, MlDsa87, SigningKey, signature::Keypair as _};

 use super::common::ChannelTransport;

-fn verifying_key(key: &SigningKey<MlDsa87>) -> VerifyingKey<MlDsa87> {
-    <SigningKey<MlDsa87> as Keypair>::verifying_key(key)
-}
-
 fn sign_useragent_challenge(
    key: &SigningKey<MlDsa87>,
    nonce: i32,
@@ -38,11 +30,11 @@ fn sign_useragent_challenge(

 #[tokio::test]
 #[test_log::test]
-pub async fn bootstrap_token_auth() {
+pub async fn test_bootstrap_token_auth() {
    let db = db::create_test_pool().await;
    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
    actors
-        .key_holder
+        .vault
        .ask(Bootstrap {
            seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
        })
@@ -50,17 +42,17 @@ pub async fn bootstrap_token_auth() {
        .unwrap();
    let token = actors.bootstrapper.ask(GetToken).await.unwrap().unwrap();

-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
    let db_for_task = db.clone();
    let task = tokio::spawn(async move {
        let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
    });

    let new_key = MlDsa87::key_gen(&mut rand::rng());
    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            bootstrap_token: Some(token),
        })
        .await
@@ -83,27 +75,27 @@ pub async fn bootstrap_token_auth() {
        .first::<Vec<u8>>(&mut conn)
        .await
        .unwrap();
-    assert_eq!(stored_pubkey, verifying_key(&new_key).encode().0.to_vec());
+    assert_eq!(stored_pubkey, new_key.verifying_key().encode().to_vec());
 }

 #[tokio::test]
 #[test_log::test]
-pub async fn bootstrap_invalid_token_auth() {
+pub async fn test_bootstrap_invalid_token_auth() {
    let db = db::create_test_pool().await;
    let actors = GlobalActors::spawn(db.clone()).await.unwrap();

-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
    let db_for_task = db.clone();
    let task = tokio::spawn(async move {
        let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
    });

    let new_key = MlDsa87::key_gen(&mut rand::rng());
    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
-            bootstrap_token: Some("invalid_token".to_owned()),
+            pubkey: new_key.verifying_key().into(),
+            bootstrap_token: Some("invalid_token".to_string()),
        })
        .await
        .unwrap();
@@ -124,11 +116,11 @@ pub async fn bootstrap_invalid_token_auth() {

 #[tokio::test]
 #[test_log::test]
-pub async fn challenge_auth() {
+pub async fn test_challenge_auth() {
    let db = db::create_test_pool().await;
    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
    actors
-        .key_holder
+        .vault
        .ask(Bootstrap {
            seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
        })
@@ -136,7 +128,7 @@ pub async fn challenge_auth() {
        .unwrap();

    let new_key = MlDsa87::key_gen(&mut rand::rng());
-    let pubkey_bytes = authn::PublicKey::from(verifying_key(&new_key)).to_bytes();
+    let pubkey_bytes = new_key.verifying_key().encode().to_vec();

    {
        let mut conn = db.get().await.unwrap();
@@ -151,10 +143,13 @@ pub async fn challenge_auth() {
            .unwrap();
        integrity::sign_entity(
            &mut conn,
-            &actors.key_holder,
-            &UserAgentCredentials {
-                pubkey: verifying_key(&new_key).into(),
-                nonce: 1,
+            &actors.vault,
+            &AuthCredentials {
+                creds: Credentials {
+                    id,
+                    pubkey: new_key.verifying_key().into(),
+                },
+                new_nonce: 1,
            },
            id,
        )
@@ -162,16 +157,16 @@ pub async fn challenge_auth() {
        .unwrap();
    }

-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
    let db_for_task = db.clone();
    let task = tokio::spawn(async move {
        let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
    });

    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            bootstrap_token: None,
        })
        .await
@@ -184,7 +179,7 @@ pub async fn challenge_auth() {
    let challenge = match response {
        Ok(resp) => match resp {
            auth::Outbound::AuthChallenge { nonce } => nonce,
-            auth::Outbound::AuthSuccess => panic!("Expected AuthChallenge, got AuthSuccess"),
+            other => panic!("Expected AuthChallenge, got {other:?}"),
        },
        Err(err) => panic!("Expected Ok response, got Err({err:?})"),
    };
@@ -212,12 +207,12 @@ pub async fn challenge_auth() {

 #[tokio::test]
 #[test_log::test]
-pub async fn challenge_auth_rejects_integrity_tag_mismatch_when_unsealed() {
+pub async fn test_challenge_auth_rejects_integrity_tag_mismatch_when_unsealed() {
    let db = db::create_test_pool().await;
    let actors = GlobalActors::spawn(db.clone()).await.unwrap();

    actors
-        .key_holder
+        .vault
        .ask(Bootstrap {
            seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
        })
@@ -225,7 +220,7 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch_when_unsealed() {
        .unwrap();

    let new_key = MlDsa87::key_gen(&mut rand::rng());
-    let pubkey_bytes = authn::PublicKey::from(verifying_key(&new_key)).to_bytes();
+    let pubkey_bytes = new_key.verifying_key().encode().to_vec();

    {
        let mut conn = db.get().await.unwrap();
@@ -239,16 +234,16 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch_when_unsealed() {
            .unwrap();
    }

-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
    let db_for_task = db.clone();
    let task = tokio::spawn(async move {
        let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
    });

    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            bootstrap_token: None,
        })
        .await
@@ -262,11 +257,11 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch_when_unsealed() {

 #[tokio::test]
 #[test_log::test]
-pub async fn challenge_auth_rejects_invalid_signature() {
+pub async fn test_challenge_auth_rejects_invalid_signature() {
    let db = db::create_test_pool().await;
    let actors = GlobalActors::spawn(db.clone()).await.unwrap();
    actors
-        .key_holder
+        .vault
        .ask(Bootstrap {
            seal_key_raw: SafeCell::new(b"test-seal-key".to_vec()),
        })
@@ -274,7 +269,7 @@ pub async fn challenge_auth_rejects_invalid_signature() {
        .unwrap();

    let new_key = MlDsa87::key_gen(&mut rand::rng());
-    let pubkey_bytes = authn::PublicKey::from(verifying_key(&new_key)).to_bytes();
+    let pubkey_bytes = new_key.verifying_key().encode().to_vec();

    {
        let mut conn = db.get().await.unwrap();
@@ -289,10 +284,13 @@ pub async fn challenge_auth_rejects_invalid_signature() {
            .unwrap();
        integrity::sign_entity(
            &mut conn,
-            &actors.key_holder,
-            &UserAgentCredentials {
-                pubkey: verifying_key(&new_key).into(),
-                nonce: 1,
+            &actors.vault,
+            &AuthCredentials {
+                creds: Credentials {
+                    id,
+                    pubkey: new_key.verifying_key().into(),
+                },
+                new_nonce: 1,
            },
            id,
        )
@@ -300,16 +298,16 @@ pub async fn challenge_auth_rejects_invalid_signature() {
        .unwrap();
    }

-    let (server_transport, mut test_transport) = ChannelTransport::new();
+    let (mut server_transport, mut test_transport) = ChannelTransport::new();
    let db_for_task = db.clone();
    let task = tokio::spawn(async move {
        let mut props = UserAgentConnection::new(db_for_task, actors);
-        auth::authenticate(&mut props, server_transport).await
+        auth::authenticate(&mut props, &mut server_transport).await
    });

    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
-            pubkey: verifying_key(&new_key).into(),
+            pubkey: new_key.verifying_key().into(),
            bootstrap_token: None,
        })
        .await
@@ -322,7 +320,7 @@ pub async fn challenge_auth_rejects_invalid_signature() {
    let challenge = match response {
        Ok(resp) => match resp {
            auth::Outbound::AuthChallenge { nonce } => nonce,
-            auth::Outbound::AuthSuccess => panic!("Expected AuthChallenge, got AuthSuccess"),
+            other => panic!("Expected AuthChallenge, got {other:?}"),
        },
        Err(err) => panic!("Expected Ok response, got Err({err:?})"),
    };
--- a/server/crates/arbiter-server/tests/user_agent/unseal.rs
+++ b/server/crates/arbiter-server/tests/user_agent/unseal.rs
@@ -1,49 +1,59 @@
-use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
+use arbiter_crypto::{
+    authn,
+    safecell::{SafeCell, SafeCellHandle as _},
+};
 use arbiter_server::{
    actors::{
        GlobalActors,
-        keyholder::{Bootstrap, Seal},
-        user_agent::{
-            UserAgentSession,
-            session::connection::{HandleUnsealEncryptedKey, HandleUnsealRequest, UnsealError},
-        },
+        vault::{Bootstrap, Seal},
    },
    db,
+    peers::user_agent::{
+        AuthCredentials, Credentials,
+        vault_gate::{Error as VaultGateError, HandleHandshake, HandleUnsealEncryptedKey, VaultGate},
+    },
 };

 use chacha20poly1305::{AeadInPlace, XChaCha20Poly1305, XNonce, aead::KeyInit};
 use kameo::actor::Spawn as _;
+use tokio::sync::oneshot;
 use x25519_dalek::{EphemeralSecret, PublicKey};

-async fn setup_sealed_user_agent(
+async fn setup_sealed_gate(
    seal_key: &[u8],
-) -> (db::DatabasePool, kameo::actor::ActorRef<UserAgentSession>) {
+) -> (db::DatabasePool, kameo::actor::ActorRef<VaultGate>, oneshot::Receiver<Result<Credentials, VaultGateError>>) {
    let db = db::create_test_pool().await;
    let actors = GlobalActors::spawn(db.clone()).await.unwrap();

    actors
-        .key_holder
+        .vault
        .ask(Bootstrap {
            seal_key_raw: SafeCell::new(seal_key.to_vec()),
        })
        .await
        .unwrap();
-    actors.key_holder.ask(Seal).await.unwrap();
+    actors.vault.ask(Seal).await.unwrap();

-    let session = UserAgentSession::spawn(UserAgentSession::new_test(db.clone(), actors));
+    let (promotion_tx, promotion_rx) = oneshot::channel();
+    let pubkey = authn::SigningKey::generate().public_key();
+    let auth_creds = AuthCredentials {
+        creds: Credentials { id: 1, pubkey },
+        new_nonce: 1,
+    };
+    let gate = VaultGate::spawn(VaultGate::new(auth_creds, actors, db.clone(), promotion_tx));

-    (db, session)
+    (db, gate, promotion_rx)
 }

 async fn client_dh_encrypt(
-    user_agent: &kameo::actor::ActorRef<UserAgentSession>,
+    gate: &kameo::actor::ActorRef<VaultGate>,
    key_to_send: &[u8],
 ) -> HandleUnsealEncryptedKey {
    let client_secret = EphemeralSecret::random();
    let client_public = PublicKey::from(&client_secret);

-    let response = user_agent
-        .ask(HandleUnsealRequest {
+    let response = gate
+        .ask(HandleHandshake {
            client_pubkey: client_public,
        })
        .await
@@ -69,48 +79,47 @@ async fn client_dh_encrypt(

 #[tokio::test]
 #[test_log::test]
-pub async fn unseal_success() {
+pub async fn test_unseal_success() {
    let seal_key = b"test-seal-key";
-    let (_db, user_agent) = setup_sealed_user_agent(seal_key).await;
+    let (_db, gate, _promotion_rx) = setup_sealed_gate(seal_key).await;

-    let encrypted_key = client_dh_encrypt(&user_agent, seal_key).await;
+    let encrypted_key = client_dh_encrypt(&gate, seal_key).await;

-    let response = user_agent.ask(encrypted_key).await;
+    let response = gate.ask(encrypted_key).await;
    assert!(matches!(response, Ok(())));
 }

 #[tokio::test]
 #[test_log::test]
-pub async fn unseal_wrong_seal_key() {
-    let (_db, user_agent) = setup_sealed_user_agent(b"correct-key").await;
+pub async fn test_unseal_wrong_seal_key() {
+    let (_db, gate, _promotion_rx) = setup_sealed_gate(b"correct-key").await;

-    let encrypted_key = client_dh_encrypt(&user_agent, b"wrong-key").await;
+    let encrypted_key = client_dh_encrypt(&gate, b"wrong-key").await;

-    let response = user_agent.ask(encrypted_key).await;
+    let response = gate.ask(encrypted_key).await;
    assert!(matches!(
        response,
        Err(kameo::error::SendError::HandlerError(
-            UnsealError::InvalidKey
+            VaultGateError::InvalidKey
        ))
    ));
 }

 #[tokio::test]
 #[test_log::test]
-pub async fn unseal_corrupted_ciphertext() {
-    let (_db, user_agent) = setup_sealed_user_agent(b"test-key").await;
+pub async fn test_unseal_corrupted_ciphertext() {
+    let (_db, gate, _promotion_rx) = setup_sealed_gate(b"test-key").await;

    let client_secret = EphemeralSecret::random();
    let client_public = PublicKey::from(&client_secret);

-    user_agent
-        .ask(HandleUnsealRequest {
+    gate.ask(HandleHandshake {
        client_pubkey: client_public,
    })
    .await
    .unwrap();

-    let response = user_agent
+    let response = gate
        .ask(HandleUnsealEncryptedKey {
            nonce: vec![0u8; 24],
            ciphertext: vec![0u8; 32],
@@ -121,33 +130,33 @@ pub async fn unseal_corrupted_ciphertext() {
    assert!(matches!(
        response,
        Err(kameo::error::SendError::HandlerError(
-            UnsealError::InvalidKey
+            VaultGateError::InvalidKey
        ))
    ));
 }

 #[tokio::test]
 #[test_log::test]
-pub async fn unseal_retry_after_invalid_key() {
+pub async fn test_unseal_retry_after_invalid_key() {
    let seal_key = b"real-seal-key";
-    let (_db, user_agent) = setup_sealed_user_agent(seal_key).await;
+    let (_db, gate, _promotion_rx) = setup_sealed_gate(seal_key).await;

    {
-        let encrypted_key = client_dh_encrypt(&user_agent, b"wrong-key").await;
+        let encrypted_key = client_dh_encrypt(&gate, b"wrong-key").await;

-        let response = user_agent.ask(encrypted_key).await;
+        let response = gate.ask(encrypted_key).await;
        assert!(matches!(
            response,
            Err(kameo::error::SendError::HandlerError(
-                UnsealError::InvalidKey
+                VaultGateError::InvalidKey
            ))
        ));
    }

    {
-        let encrypted_key = client_dh_encrypt(&user_agent, seal_key).await;
+        let encrypted_key = client_dh_encrypt(&gate, seal_key).await;

-        let response = user_agent.ask(encrypted_key).await;
+        let response = gate.ask(encrypted_key).await;
        assert!(matches!(response, Ok(())));
    }
 }
--- a/server/crates/arbiter-server/tests/vault.rs
+++ b/server/crates/arbiter-server/tests/vault.rs
@@ -0,0 +1,8 @@
+mod common;
+
+#[path = "vault/concurrency.rs"]
+mod concurrency;
+#[path = "vault/lifecycle.rs"]
+mod lifecycle;
+#[path = "vault/storage.rs"]
+mod storage;
--- a/server/crates/arbiter-server/tests/keyholder/concurrency.rs
+++ b/server/crates/arbiter-server/tests/keyholder/concurrency.rs
@@ -2,7 +2,10 @@ use std::collections::{HashMap, HashSet};

 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_server::{
-    actors::keyholder::{CreateNew, KeyHolder, KeyHolderError},
+    actors::{
+        GlobalActors,
+        vault::{CreateNew, Error, Vault},
+    },
    db::{self, models, schema},
 };

@@ -14,7 +17,7 @@ use tokio::task::JoinSet;
 use crate::common;

 async fn write_concurrently(
-    actor: ActorRef<KeyHolder>,
+    actor: ActorRef<Vault>,
    prefix: &'static str,
    count: usize,
 ) -> Vec<(i32, Vec<u8>)> {
@@ -44,7 +47,7 @@ async fn write_concurrently(
 #[test_log::test]
 async fn concurrent_create_new_no_duplicate_nonces_() {
    let db = db::create_test_pool().await;
-    let actor = KeyHolder::spawn(common::bootstrapped_keyholder(&db).await);
+    let actor = Vault::spawn(common::bootstrapped_vault(&db).await);

    let writes = write_concurrently(actor, "nonce-unique", 32).await;
    assert_eq!(writes.len(), 32);
@@ -66,7 +69,7 @@ async fn concurrent_create_new_no_duplicate_nonces_() {
 #[test_log::test]
 async fn concurrent_create_new_root_nonce_never_moves_backward() {
    let db = db::create_test_pool().await;
-    let actor = KeyHolder::spawn(common::bootstrapped_keyholder(&db).await);
+    let actor = Vault::spawn(common::bootstrapped_vault(&db).await);

    write_concurrently(actor, "root-max", 24).await;

@@ -94,7 +97,7 @@ async fn concurrent_create_new_root_nonce_never_moves_backward() {
 #[test_log::test]
 async fn insert_failure_does_not_create_partial_row() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
    let root_key_history_id = common::root_key_history_id(&db).await;

    let mut conn = db.get().await.unwrap();
@@ -122,7 +125,7 @@ async fn insert_failure_does_not_create_partial_row() {
        .create_new(SafeCell::new(b"should fail".to_vec()))
        .await
        .unwrap_err();
-    assert!(matches!(err, KeyHolderError::DatabaseTransaction(_)));
+    assert!(matches!(err, Error::DatabaseTransaction(_)));

    let mut conn = db.get().await.unwrap();
    sql_query("DROP TRIGGER fail_aead_insert;")
@@ -156,12 +159,14 @@ async fn insert_failure_does_not_create_partial_row() {
 #[test_log::test]
 async fn decrypt_roundtrip_after_high_concurrency() {
    let db = db::create_test_pool().await;
-    let actor = KeyHolder::spawn(common::bootstrapped_keyholder(&db).await);
+    let actor = Vault::spawn(common::bootstrapped_vault(&db).await);

    let writes = write_concurrently(actor, "roundtrip", 40).await;
    let expected: HashMap<i32, Vec<u8>> = writes.into_iter().collect();

-    let mut decryptor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut decryptor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
    decryptor
        .try_unseal(SafeCell::new(b"test-seal-key".to_vec()))
        .await
--- a/server/crates/arbiter-server/tests/keyholder/lifecycle.rs
+++ b/server/crates/arbiter-server/tests/keyholder/lifecycle.rs
@@ -1,6 +1,9 @@
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_server::{
-    actors::keyholder::{KeyHolder, KeyHolderError},
+    actors::{
+        GlobalActors,
+        vault::{Error, Vault},
+    },
    crypto::encryption::v1::{Nonce, ROOT_KEY_TAG},
    db::{self, models, schema},
 };
@@ -12,9 +15,11 @@ use crate::common;

 #[tokio::test]
 #[test_log::test]
-async fn bootstrap() {
+async fn test_bootstrap() {
    let db = db::create_test_pool().await;
-    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();

    let seal_key = SafeCell::new(b"test-seal-key".to_vec());
    actor.bootstrap(seal_key).await.unwrap();
@@ -35,55 +40,61 @@ async fn bootstrap() {

 #[tokio::test]
 #[test_log::test]
-async fn bootstrap_rejects_double() {
+async fn test_bootstrap_rejects_double() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;

    let seal_key2 = SafeCell::new(b"test-seal-key".to_vec());
    let err = actor.bootstrap(seal_key2).await.unwrap_err();
-    assert!(matches!(err, KeyHolderError::AlreadyBootstrapped));
+    assert!(matches!(err, Error::AlreadyBootstrapped));
 }

 #[tokio::test]
 #[test_log::test]
-async fn create_new_before_bootstrap_fails() {
+async fn test_create_new_before_bootstrap_fails() {
    let db = db::create_test_pool().await;
-    let mut actor = KeyHolder::new(db).await.unwrap();
+    let mut actor = Vault::new(db, GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();

    let err = actor
        .create_new(SafeCell::new(b"data".to_vec()))
        .await
        .unwrap_err();
-    assert!(matches!(err, KeyHolderError::NotBootstrapped));
+    assert!(matches!(err, Error::NotBootstrapped));
 }

 #[tokio::test]
 #[test_log::test]
-async fn decrypt_before_bootstrap_fails() {
+async fn test_decrypt_before_bootstrap_fails() {
    let db = db::create_test_pool().await;
-    let mut actor = KeyHolder::new(db).await.unwrap();
+    let mut actor = Vault::new(db, GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();

    let err = actor.decrypt(1).await.unwrap_err();
-    assert!(matches!(err, KeyHolderError::NotBootstrapped));
+    assert!(matches!(err, Error::NotBootstrapped));
 }

 #[tokio::test]
 #[test_log::test]
-async fn new_restores_sealed_state() {
+async fn test_new_restores_sealed_state() {
    let db = db::create_test_pool().await;
-    let actor = common::bootstrapped_keyholder(&db).await;
+    let actor = common::bootstrapped_vault(&db).await;
    drop(actor);

-    let mut actor2 = KeyHolder::new(db).await.unwrap();
+    let mut actor2 = Vault::new(db, GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
    let err = actor2.decrypt(1).await.unwrap_err();
-    assert!(matches!(err, KeyHolderError::NotBootstrapped));
+    assert!(matches!(err, Error::NotBootstrapped));
 }

 #[tokio::test]
 #[test_log::test]
-async fn unseal_correct_password() {
+async fn test_unseal_correct_password() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;

    let plaintext = b"survive a restart";
    let aead_id = actor
@@ -92,7 +103,9 @@ async fn unseal_correct_password() {
        .unwrap();
    drop(actor);

-    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();
    let seal_key = SafeCell::new(b"test-seal-key".to_vec());
    actor.try_unseal(seal_key).await.unwrap();

@@ -102,9 +115,9 @@ async fn unseal_correct_password() {

 #[tokio::test]
 #[test_log::test]
-async fn unseal_wrong_then_correct_password() {
+async fn test_unseal_wrong_then_correct_password() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;

    let plaintext = b"important data";
    let aead_id = actor
@@ -113,11 +126,13 @@ async fn unseal_wrong_then_correct_password() {
        .unwrap();
    drop(actor);

-    let mut actor = KeyHolder::new(db.clone()).await.unwrap();
+    let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
+        .await
+        .unwrap();

    let bad_key = SafeCell::new(b"wrong-password".to_vec());
    let err = actor.try_unseal(bad_key).await.unwrap_err();
-    assert!(matches!(err, KeyHolderError::InvalidKey));
+    assert!(matches!(err, Error::InvalidKey));

    let good_key = SafeCell::new(b"test-seal-key".to_vec());
    actor.try_unseal(good_key).await.unwrap();
--- a/server/crates/arbiter-server/tests/keyholder/storage.rs
+++ b/server/crates/arbiter-server/tests/keyholder/storage.rs
@@ -2,7 +2,7 @@ use std::collections::HashSet;

 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_server::{
-    actors::keyholder::KeyHolderError,
+    actors::vault::Error,
    crypto::encryption::v1::Nonce,
    db::{self, models, schema},
 };
@@ -14,9 +14,9 @@ use crate::common;

 #[tokio::test]
 #[test_log::test]
-async fn create_decrypt_roundtrip() {
+async fn test_create_decrypt_roundtrip() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;

    let plaintext = b"hello arbiter";
    let aead_id = actor
@@ -30,19 +30,19 @@ async fn create_decrypt_roundtrip() {

 #[tokio::test]
 #[test_log::test]
-async fn decrypt_nonexistent_returns_not_found() {
+async fn test_decrypt_nonexistent_returns_not_found() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;

    let err = actor.decrypt(9999).await.unwrap_err();
-    assert!(matches!(err, KeyHolderError::NotFound));
+    assert!(matches!(err, Error::NotFound));
 }

 #[tokio::test]
 #[test_log::test]
-async fn ciphertext_differs_across_entries() {
+async fn test_ciphertext_differs_across_entries() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;

    let plaintext = b"same content";
    let id1 = actor
@@ -78,9 +78,9 @@ async fn ciphertext_differs_across_entries() {

 #[tokio::test]
 #[test_log::test]
-async fn nonce_never_reused() {
+async fn test_nonce_never_reused() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;

    let n = 5;
    for i in 0..n {
@@ -124,7 +124,7 @@ async fn nonce_never_reused() {
 #[test_log::test]
 async fn broken_db_nonce_format_fails_closed() {
    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
    let root_key_history_id = common::root_key_history_id(&db).await;

    let mut conn = db.get().await.unwrap();
@@ -142,10 +142,10 @@ async fn broken_db_nonce_format_fails_closed() {
        .create_new(SafeCell::new(b"must fail".to_vec()))
        .await
        .unwrap_err();
-    assert!(matches!(err, KeyHolderError::BrokenDatabase));
+    assert!(matches!(err, Error::BrokenDatabase));

    let db = db::create_test_pool().await;
-    let mut actor = common::bootstrapped_keyholder(&db).await;
+    let mut actor = common::bootstrapped_vault(&db).await;
    let id = actor
        .create_new(SafeCell::new(b"decrypt target".to_vec()))
        .await
@@ -159,5 +159,5 @@ async fn broken_db_nonce_format_fails_closed() {
    drop(conn);

    let err = actor.decrypt(id).await.unwrap_err();
-    assert!(matches!(err, KeyHolderError::BrokenDatabase));
+    assert!(matches!(err, Error::BrokenDatabase));
 }
--- a/useragent/flutter_rust_bridge.yaml
+++ b/useragent/flutter_rust_bridge.yaml
@@ -0,0 +1,3 @@
+rust_input: crate::api
+rust_root: rust/
+dart_output: lib/src/rust
--- a/useragent/lib/features/callouts/callout_event.dart
+++ b/useragent/lib/features/callouts/callout_event.dart
@@ -18,7 +18,6 @@ sealed class CalloutEvent with _$CalloutEvent {
    required CalloutData data,
  }) = CalloutEventAdded;

-  const factory CalloutEvent.cancelled({
-    required String id,
-  }) = CalloutEventCancelled;
+  const factory CalloutEvent.cancelled({required String id}) =
+      CalloutEventCancelled;
 }
--- a/useragent/lib/features/callouts/show_callout.dart
+++ b/useragent/lib/features/callouts/show_callout.dart
@@ -14,11 +14,8 @@ Future<void> showCallout(BuildContext context, WidgetRef ref, String id) async {
    barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
    barrierColor: Colors.transparent,
    transitionDuration: const Duration(milliseconds: 320),
-    pageBuilder: (_, animation, _) => _CalloutOverlay(
-      id: id,
-      data: data,
-      animation: animation,
-    ),
+    pageBuilder: (_, animation, _) =>
+        _CalloutOverlay(id: id, data: data, animation: animation),
  );
 }

@@ -35,21 +32,24 @@ class _CalloutOverlay extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    ref.listen(
-      calloutManagerProvider.select((map) => map.containsKey(id)),
-      (wasPresent, isPresent) {
+    ref.listen(calloutManagerProvider.select((map) => map.containsKey(id)), (
+      wasPresent,
+      isPresent,
+    ) {
      if (wasPresent == true && !isPresent && context.mounted) {
        Navigator.of(context).pop();
      }
-      },
-    );
+    });

    final content = switch (data) {
-      ConnectApprovalData(:final pubkey, :final clientInfo) => SdkConnectCallout(
+      ConnectApprovalData(:final pubkey, :final clientInfo) =>
+        SdkConnectCallout(
          pubkey: pubkey,
          clientInfo: clientInfo,
-        onAccept: () => ref.read(calloutManagerProvider.notifier).sendDecision(id, true),
-        onDecline: () => ref.read(calloutManagerProvider.notifier).sendDecision(id, false),
+          onAccept: () =>
+              ref.read(calloutManagerProvider.notifier).sendDecision(id, true),
+          onDecline: () =>
+              ref.read(calloutManagerProvider.notifier).sendDecision(id, false),
        ),
    };

--- a/useragent/lib/features/callouts/show_callout_list.dart
+++ b/useragent/lib/features/callouts/show_callout_list.dart
@@ -14,7 +14,8 @@ Future<void> showCalloutList(BuildContext context, WidgetRef ref) async {
    barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
    barrierColor: Colors.transparent,
    transitionDuration: const Duration(milliseconds: 280),
-    pageBuilder: (_, animation, __) => _CalloutListOverlay(animation: animation),
+    pageBuilder: (_, animation, __) =>
+        _CalloutListOverlay(animation: animation),
  );

  if (selectedId != null && context.mounted) {
@@ -51,7 +52,9 @@ class _CalloutListOverlay extends ConsumerWidget {
              child: AnimatedBuilder(
                animation: barrierAnim,
                builder: (_, __) => ColoredBox(
-                  color: Colors.black.withValues(alpha: 0.35 * barrierAnim.value),
+                  color: Colors.black.withValues(
+                    alpha: 0.35 * barrierAnim.value,
+                  ),
                ),
              ),
            ),
--- a/useragent/lib/features/connection/arbiter_url.dart
+++ b/useragent/lib/features/connection/arbiter_url.dart
@@ -50,7 +50,9 @@ class ArbiterUrl {
    try {
      return base64Url.decode(base64Url.normalize(cert));
    } on FormatException catch (error) {
-      throw FormatException("Invalid base64 in 'cert' query parameter: ${error.message}");
+      throw FormatException(
+        "Invalid base64 in 'cert' query parameter: ${error.message}",
+      );
    }
  }
 }
--- a/useragent/lib/features/connection/auth.dart
+++ b/useragent/lib/features/connection/auth.dart
@@ -61,11 +61,6 @@ Future<Connection> connectAndAuthorize(
    final req = ua_auth.AuthChallengeRequest(
      pubkey: pubkey,
      bootstrapToken: bootstrapToken,
-      keyType: switch (key.alg) {
-        KeyAlgorithm.rsa => ua_auth.KeyType.KEY_TYPE_RSA,
-        KeyAlgorithm.ecdsa => ua_auth.KeyType.KEY_TYPE_ECDSA_SECP256K1,
-        KeyAlgorithm.ed25519 => ua_auth.KeyType.KEY_TYPE_ED25519,
-      },
    );
    final response = await connection.ask(
      UserAgentRequest(auth: ua_auth.Request(challengeRequest: req)),
@@ -106,7 +101,9 @@ Future<Connection> connectAndAuthorize(
    final solutionResponse = await connection.ask(
      UserAgentRequest(
        auth: ua_auth.Request(
-          challengeSolution: ua_auth.AuthChallengeSolution(signature: signature),
+          challengeSolution: ua_auth.AuthChallengeSolution(
+            signature: signature,
+          ),
        ),
      ),
    );
--- a/useragent/lib/features/connection/connection.dart
+++ b/useragent/lib/features/connection/connection.dart
@@ -85,7 +85,9 @@ class Connection {
    if (response.hasId()) {
      final completer = _pendingRequests.remove(response.id);
      if (completer == null) {
-        talker.warning('Received response for unknown request id ${response.id}');
+        talker.warning(
+          'Received response for unknown request id ${response.id}',
+        );
        return;
      }
      completer.complete(response);
--- a/useragent/lib/features/connection/evm.dart
+++ b/useragent/lib/features/connection/evm.dart
@@ -9,9 +9,7 @@ Future<List<WalletEntry>> listEvmWallets(Connection connection) async {
    UserAgentRequest(evm: ua_evm.Request(walletList: Empty())),
  );
  if (!response.hasEvm()) {
-    throw Exception(
-      'Expected EVM response, got ${response.whichPayload()}',
-    );
+    throw Exception('Expected EVM response, got ${response.whichPayload()}');
  }

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

  final evmResponse = response.evm;
--- a/useragent/lib/features/connection/evm/grants.dart
+++ b/useragent/lib/features/connection/evm/grants.dart
@@ -10,9 +10,7 @@ Future<List<GrantEntry>> listEvmGrants(Connection connection) async {
    UserAgentRequest(evm: ua_evm.Request(grantList: request)),
  );
  if (!response.hasEvm()) {
-    throw Exception(
-      'Expected EVM response, got ${response.whichPayload()}',
-    );
+    throw Exception('Expected EVM response, got ${response.whichPayload()}');
  }

  final evmResponse = response.evm;
@@ -50,9 +48,7 @@ Future<int> createEvmGrant(
  final resp = await connection.ask(request);

  if (!resp.hasEvm()) {
-    throw Exception(
-      'Expected EVM response, got ${resp.whichPayload()}',
-    );
+    throw Exception('Expected EVM response, got ${resp.whichPayload()}');
  }

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

  final evmResponse = response.evm;
--- a/useragent/lib/features/connection/evm/wallet_access.dart
+++ b/useragent/lib/features/connection/evm/wallet_access.dart
@@ -8,9 +8,7 @@ Future<Set<int>> readClientWalletAccess(
  required int clientId,
 }) async {
  final response = await connection.ask(
-    UserAgentRequest(
-      sdkClient: ua_sdk.Request(listWalletAccess: Empty()),
-    ),
+    UserAgentRequest(sdkClient: ua_sdk.Request(listWalletAccess: Empty())),
  );
  if (!response.hasSdkClient()) {
    throw Exception(
@@ -33,9 +31,7 @@ Future<List<ua_sdk.WalletAccessEntry>> listAllWalletAccesses(
  Connection connection,
 ) async {
  final response = await connection.ask(
-    UserAgentRequest(
-      sdkClient: ua_sdk.Request(listWalletAccess: Empty()),
-    ),
+    UserAgentRequest(sdkClient: ua_sdk.Request(listWalletAccess: Empty())),
  );
  if (!response.hasSdkClient()) {
    throw Exception(
@@ -81,9 +77,7 @@ Future<void> writeClientWalletAccess(
      UserAgentRequest(
        sdkClient: ua_sdk.Request(
          revokeWalletAccess: ua_sdk.RevokeWalletAccess(
-            accesses: [
-              for (final walletId in toRevoke) walletId,
-            ],
+            accesses: [for (final walletId in toRevoke) walletId],
          ),
        ),
      ),
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hdbg	8c4c63f51e	WIP: `kameo::messages` wiring for transport generalization	2026-04-14 15:31:20 +02:00
hdbg	87ee0fe87b	feat(user-agent): add VaultGate for sealed vault authentication	2026-04-12 11:53:05 +02:00
hdbg	205227a3df	fix(server::integrity): `vault` now differentias between expected/unexpected states for commands more granularly	2026-04-08 18:21:48 +02:00
hdbg	a4070e7df7	fix(useragent): unsafe, but working implementation of ml-dsa	2026-04-08 17:43:51 +02:00
hdbg	6b8da567dd	fix(server::user_agent): useragents now self-sign themselves on bootstrap	2026-04-08 17:40:45 +02:00
hdbg	1585f90cae	refactor(server): reorganized client/user_agent actors into separate module `peers` and added event `MessageBus`	2026-04-08 12:34:16 +02:00