feat(server::grpc): wire Shamir committee bootstrap and unseal proto messages

Adds DeclareCommittee and ContributePassphrase variants to bootstrap.proto, ContributePassphrase to unseal.proto, and AwaitingContributions result codes to both. Implements corresponding inbound converters and outbound reply mappings. VaultGate handlers delegate to VaultCoordinator.
feat(server): introduce VaultCoordinator for multi-operator Shamir bootstrap/unseal
2026-06-12 19:43:17 +02:00 · 2026-06-12 19:43:09 +02:00 · 2026-06-12 19:43:02 +02:00 · 2026-06-12 19:42:56 +02:00 · 2026-06-12 19:42:49 +02:00 · 2026-06-12 19:42:43 +02:00
37 changed files with 1007 additions and 258 deletions
--- a/mise.toml
+++ b/mise.toml
@@ -22,3 +22,5 @@ run = '''
 dart pub global activate protoc_plugin && \
 protoc --dart_out=grpc:useragent/lib/proto --proto_path=protobufs/ $(find protobufs -name '*.proto' | sort)
 '''
 [tasks.generate_schema]
--- a/protobufs/operator/vault/bootstrap.proto
+++ b/protobufs/operator/vault/bootstrap.proto
@@ -8,15 +8,28 @@ message BootstrapEncryptedKey {
  bytes associated_data = 3;
 }
 message DeclareCommittee {
  uint32 count = 1;
 }
 message ContributePassphrase {
  bytes passphrase = 1;
 }
 enum BootstrapResult {
  BOOTSTRAP_RESULT_UNSPECIFIED = 0;
  BOOTSTRAP_RESULT_SUCCESS = 1;
  BOOTSTRAP_RESULT_ALREADY_BOOTSTRAPPED = 2;
  BOOTSTRAP_RESULT_INVALID_KEY = 3;
  BOOTSTRAP_RESULT_AWAITING_CONTRIBUTIONS = 4;
 }
 message Request {
  oneof payload {
    BootstrapEncryptedKey encrypted_key = 2;
    DeclareCommittee declare_committee = 3;
    ContributePassphrase contribute_passphrase = 4;
  }
 }
 message Response {
--- a/protobufs/operator/vault/unseal.proto
+++ b/protobufs/operator/vault/unseal.proto
@@ -15,17 +15,23 @@ message UnsealEncryptedKey {
  bytes associated_data = 3;
 }
 message ContributePassphrase {
  bytes passphrase = 1;
 }
 enum UnsealResult {
  UNSEAL_RESULT_UNSPECIFIED = 0;
  UNSEAL_RESULT_SUCCESS = 1;
  UNSEAL_RESULT_INVALID_KEY = 2;
  UNSEAL_RESULT_UNBOOTSTRAPPED = 3;
  UNSEAL_RESULT_AWAITING_CONTRIBUTIONS = 4;
 }
 message Request {
  oneof payload {
    UnsealStart start = 1;
    UnsealEncryptedKey encrypted_key = 2;
    ContributePassphrase contribute_passphrase = 3;
  }
 }
--- a/protobufs/shared/vault.proto
+++ b/protobufs/shared/vault.proto
@@ -5,7 +5,8 @@ package arbiter.shared;
 enum VaultState {
  VAULT_STATE_UNSPECIFIED = 0;
  VAULT_STATE_UNBOOTSTRAPPED = 1;
-  VAULT_STATE_SEALED = 2;
+  VAULT_STATE_BOOSTRAPPING = 2;
-  VAULT_STATE_UNSEALED = 3;
+  VAULT_STATE_SEALED = 3;
-  VAULT_STATE_ERROR = 4;
+  VAULT_STATE_UNSEALED = 4;
  VAULT_STATE_ERROR = 5;
 }
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
 dependencies = [
 "crypto-common 0.1.7",
- "generic-array",
+ "generic-array 0.14.7",
 ]
 [[package]]
@@ -771,6 +771,7 @@ dependencies = [
 "proptest",
 "prost-types",
 "rand 0.10.1",
 "rand_core 0.6.4",
 "rcgen",
 "restructed",
 "rstest",
@@ -786,6 +787,7 @@ dependencies = [
 "tonic",
 "tracing",
 "tracing-subscriber",
 "vsss-rs",
 "x25519-dalek 2.0.1",
 ]
@@ -1283,7 +1285,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.7",
 ]
 [[package]]
@@ -1612,8 +1614,22 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.7",
 "rand_core 0.6.4",
 "serdect 0.2.0",
 "subtle",
 "zeroize",
 ]
 [[package]]
 name = "crypto-bigint"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96272c2ff28b807e09250b180ad1fb7889a3258f7455759b5c3c58b719467130"
 dependencies = [
 "num-traits",
 "rand_core 0.6.4",
 "serdect 0.3.0",
 "subtle",
 "zeroize",
 ]
@@ -1624,7 +1640,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.7",
 "rand_core 0.6.4",
 "typenum",
 ]
@@ -1927,7 +1943,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.7",
 ]
 [[package]]
@@ -2007,7 +2023,7 @@ dependencies = [
 "digest 0.10.7",
 "elliptic-curve",
 "rfc6979",
- "serdect",
+ "serdect 0.2.0",
 "signature 2.2.0",
 "spki 0.7.3",
 ]
@@ -2040,16 +2056,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
 "base16ct",
- "crypto-bigint",
+ "crypto-bigint 0.5.5",
 "digest 0.10.7",
 "ff",
- "generic-array",
+ "generic-array 0.14.7",
 "group",
 "hkdf",
 "pkcs8 0.10.2",
 "rand_core 0.6.4",
 "sec1",
- "serdect",
+ "serdect 0.2.0",
 "subtle",
 "tap",
 "zeroize",
 ]
 [[package]]
 name = "elliptic-curve-tools"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1de2b6fae800f08032a6ea32995b52925b1d451bff9d445c8ab2932323277faf"
 dependencies = [
 "elliptic-curve",
 "heapless",
 "hex",
 "multiexp",
 "serde",
 "zeroize",
 ]
@@ -2123,6 +2155,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
 dependencies = [
 "bitvec",
 "rand_core 0.6.4",
 "subtle",
 ]
@@ -2323,6 +2356,17 @@ dependencies = [
 "zeroize",
 ]
 [[package]]
 name = "generic-array"
 version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dab9e9188e97a93276e1fe7b56401b851e2b45a46d045ca658100c1303ada649"
 dependencies = [
 "rustversion",
 "serde_core",
 "typenum",
 ]
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -2406,6 +2450,15 @@ dependencies = [
 "tracing",
 ]
 [[package]]
 name = "hash32"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
 dependencies = [
 "byteorder",
 ]
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -2446,6 +2499,16 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
 [[package]]
 name = "heapless"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
 dependencies = [
 "hash32",
 "stable_deref_trait",
 ]
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -2473,6 +2536,15 @@ dependencies = [
 "arrayvec",
 ]
 [[package]]
 name = "hkdf"
 version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
 "hmac 0.12.1",
 ]
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -2543,6 +2615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d46837a0ed51fe95bd3b05de33cd64a1ee88fc797477ca48446872504507c5"
 dependencies = [
 "ctutils",
 "serde",
 "typenum",
 "zeroize",
 ]
@@ -2808,7 +2881,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.7",
 ]
 [[package]]
@@ -2947,7 +3020,7 @@ dependencies = [
 "ecdsa",
 "elliptic-curve",
 "once_cell",
- "serdect",
+ "serdect 0.2.0",
 "sha2 0.10.9",
 "signature 2.2.0",
 ]
@@ -2955,7 +3028,7 @@ dependencies = [
 [[package]]
 name = "kameo"
 version = "0.20.0"
-source = "git+https://github.com/hdbg/kameo.git?rev=805b417#805b41783fe90b54827ecad142b422c7a9b69b9a"
+source = "git+https://github.com/hdbg/kameo.git?rev=3e18ba2#3e18ba24023d0422034e60ff2ea1ecd49e8c3c93"
 dependencies = [
 "downcast-rs",
 "dyn-clone",
@@ -2969,7 +3042,7 @@ dependencies = [
 [[package]]
 name = "kameo_actors"
 version = "0.5.0"
-source = "git+https://github.com/hdbg/kameo.git?rev=805b417#805b41783fe90b54827ecad142b422c7a9b69b9a"
+source = "git+https://github.com/hdbg/kameo.git?rev=3e18ba2#3e18ba24023d0422034e60ff2ea1ecd49e8c3c93"
 dependencies = [
 "futures",
 "glob",
@@ -2981,9 +3054,8 @@ dependencies = [
 [[package]]
 name = "kameo_macros"
 version = "0.20.0"
-source = "git+https://github.com/hdbg/kameo.git?rev=805b417#805b41783fe90b54827ecad142b422c7a9b69b9a"
+source = "git+https://github.com/hdbg/kameo.git?rev=3e18ba2#3e18ba24023d0422034e60ff2ea1ecd49e8c3c93"
 dependencies = [
 "darling 0.23.0",
 "heck",
 "proc-macro2",
 "quote",
@@ -3290,6 +3362,20 @@ dependencies = [
 "zeroize",
 ]
 [[package]]
 name = "multiexp"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ec2ce93a6f06ac6cae04c1da3f2a6a24fcfc1f0eb0b4e0f3d302f0df45326cb"
 dependencies = [
 "ff",
 "group",
 "rand_core 0.6.4",
 "rustversion",
 "std-shims",
 "zeroize",
 ]
 [[package]]
 name = "multimap"
 version = "0.10.1"
@@ -3321,6 +3407,20 @@ dependencies = [
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "num"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
 "num-bigint",
 "num-complex",
 "num-integer",
 "num-iter",
 "num-rational",
 "num-traits",
 ]
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -3329,6 +3429,19 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
 "num-integer",
 "num-traits",
 "rand 0.8.6",
 "serde",
 ]
 [[package]]
 name = "num-complex"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
 "num-traits",
 "rand 0.8.6",
 "serde",
 ]
 [[package]]
@@ -3346,6 +3459,29 @@ dependencies = [
 "num-traits",
 ]
 [[package]]
 name = "num-iter"
 version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
 "autocfg",
 "num-integer",
 "num-traits",
 ]
 [[package]]
 name = "num-rational"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
 "num-bigint",
 "num-integer",
 "num-traits",
 "serde",
 ]
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -4454,9 +4590,9 @@ checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
 "base16ct",
 "der 0.7.10",
- "generic-array",
+ "generic-array 0.14.7",
 "pkcs8 0.10.2",
- "serdect",
+ "serdect 0.2.0",
 "subtle",
 "zeroize",
 ]
@@ -4622,6 +4758,16 @@ dependencies = [
 "serde",
 ]
 [[package]]
 name = "serdect"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f42f67da2385b51a5f9652db9c93d78aeaf7610bf5ec366080b6de810604af53"
 dependencies = [
 "base16ct",
 "serde",
 ]
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -4787,6 +4933,12 @@ dependencies = [
 "windows-sys 0.61.2",
 ]
 [[package]]
 name = "spin"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
 [[package]]
 name = "spki"
 version = "0.7.3"
@@ -4831,6 +4983,17 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 [[package]]
 name = "std-shims"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "227c4f8561598188d0df96dbe749824576174bba278b5b6bb2eacff1066067d0"
 dependencies = [
 "hashbrown 0.16.1",
 "rustversion",
 "spin",
 ]
 [[package]]
 name = "string_morph"
 version = "0.1.0"
@@ -5574,6 +5737,27 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 [[package]]
 name = "vsss-rs"
 version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ec751bdcc8bda099e269b24cc6b4ad14f9ce8b0490c1599174070e792ecd70c"
 dependencies = [
 "crypto-bigint 0.5.5",
 "crypto-bigint 0.6.1",
 "elliptic-curve",
 "elliptic-curve-tools",
 "generic-array 1.4.1",
 "hex",
 "hybrid-array",
 "num",
 "rand_core 0.6.4",
 "serde",
 "sha3 0.10.9",
 "subtle",
 "zeroize",
 ]
 [[package]]
 name = "wait-timeout"
 version = "0.2.1"
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -12,8 +12,8 @@ base64 = "0.22.1"
 chrono = { version = "0.4.44", features = ["serde"] }
 futures = "0.3.32"
 k256 = { version = "0.13.4", features = ["ecdsa", "pkcs8"] }
-kameo = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"}
+kameo = {git = "https://github.com/hdbg/kameo.git", rev = "3e18ba2"}
-kameo_actors = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"}
+kameo_actors = {git = "https://github.com/hdbg/kameo.git", rev = "3e18ba2"}
 hmac = "0.13.0"
 miette = { version = "7.6.0", features = ["fancy", "serde"] }
 ml-dsa = { version = "0.1.0-rc.9", features = ["zeroize"] }
@@ -106,7 +106,6 @@ 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"
--- a/server/crates/arbiter-crypto/src/safecell.rs
+++ b/server/crates/arbiter-crypto/src/safecell.rs
@@ -22,7 +22,7 @@ pub trait SafeCellHandle<T> {
    fn read(&mut self) -> Self::CellRead<'_>;
    fn write(&mut self) -> Self::CellWrite<'_>;
-    fn new_inline<F>(f: F) -> Self
+    fn new_inline_default<F>(f: F) -> Self
    where
        Self: Sized,
        T: Default,
@@ -36,6 +36,14 @@ pub trait SafeCellHandle<T> {
        cell
    }
    fn new_inline<F>(f: Box<F>) -> Self
    where
        Self: Sized,
        F: for<'a> FnOnce() -> T,
    {
        Self::new(f())
    }
    #[inline(always)]
    fn read_inline<F, R>(&mut self, f: F) -> R
    where
--- a/server/crates/arbiter-server/Cargo.toml
+++ b/server/crates/arbiter-server/Cargo.toml
@@ -50,6 +50,8 @@ subtle = "2.6.1"
 x25519-dalek.workspace = true
 k256.workspace = true
 kameo_actors.workspace = true
 vsss-rs = "5.4.0"
 rand_core = "0.6"
 [dev-dependencies]
 proptest = "1.11.0"
--- a/server/crates/arbiter-server/migrations/2026-02-14-171124-0000_init/up.sql
+++ b/server/crates/arbiter-server/migrations/2026-02-14-171124-0000_init/up.sql
@@ -43,13 +43,25 @@ create table if not exists arbiter_settings (
 insert into arbiter_settings (id) values (1) on conflict do nothing;
 -- ensure singleton row exists
-create table if not exists operator_client (
+create table if not exists operator_identity (
    id integer not null primary key,
    public_key blob not null,
    created_at integer not null default(unixepoch ('now')),
    updated_at integer not null default(unixepoch ('now'))
 ) STRICT;
-create unique index if not exists uniq_operator_client_public_key on operator_client (public_key);
+create unique index if not exists uniq_operator_identity_public_key on operator_identity (public_key);
 create table if not exists operator (
    id integer primary key references operator_identity(id) on delete restrict, -- same id as operator_identity
    share blob not null,
    share_nonce blob not null,
    share_salt blob not null default (randomblob(32)),
    created_at integer not null default(unixepoch ('now')),
    updated_at integer not null default(unixepoch ('now'))
 ) STRICT;
 create table if not exists client_metadata (
    id integer not null primary key,
--- a/server/crates/arbiter-server/src/actors/bootstrap.rs
+++ b/server/crates/arbiter-server/src/actors/bootstrap.rs
@@ -48,7 +48,7 @@ impl Bootstrapper {
        let row_count: i64 = {
            let mut conn = db.get().await?;
-            schema::operator_client::table
+            schema::operator::table
                .count()
                .get_result(&mut conn)
                .await?
--- a/server/crates/arbiter-server/src/actors/evm/mod.rs
+++ b/server/crates/arbiter-server/src/actors/evm/mod.rs
@@ -3,7 +3,7 @@ use crate::{
    crypto::integrity,
    db::{
        DatabaseError, DatabasePool,
-        models::{self},
+        models::{self, EvmWalletId},
        schema,
    },
    evm::{
@@ -116,7 +116,7 @@ impl EvmActor {
    }
    #[message]
-    pub async fn list_wallets(&self) -> Result<Vec<(i32, Address)>, Error> {
+    pub async fn list_wallets(&self) -> Result<Vec<(EvmWalletId, 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())
@@ -160,29 +160,23 @@ impl EvmActor {
    }
    #[message]
-    #[expect(clippy::unused_async, reason = "reserved for impl")]
+    pub async fn operator_delete_grant(&mut self, grant_id: i32) -> Result<(), Error> {
-    pub async fn operator_delete_grant(&mut self, _grant_id: i32) -> Result<(), Error> {
+        let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
        // let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
        // let vault = self.vault.clone();
-        // diesel_async::AsyncConnection::transaction(&mut conn, |conn| {
+        let affected = diesel::update(schema::evm_basic_grant::table)
-        //     Box::pin(async move {
+            .filter(schema::evm_basic_grant::id.eq(grant_id))
-        //         diesel::update(schema::evm_basic_grant::table)
+            .set(schema::evm_basic_grant::revoked_at.eq(models::SqliteTimestamp::now()))
-        //             .filter(schema::evm_basic_grant::id.eq(grant_id))
+            .execute(&mut conn)
-        //             .set(schema::evm_basic_grant::revoked_at.eq(SqliteTimestamp::now()))
+            .await
-        //             .execute(conn)
+            .map_err(DatabaseError::from)?;
        //             .await?;
-        //         let signed = integrity::evm::load_signed_grant_by_basic_id(conn, grant_id).await?;
+        if affected == 0 {
            return Err(Error::Database(DatabaseError::from(
                diesel::result::Error::NotFound,
            )));
        }
-        //         diesel::result::QueryResult::Ok(())
+        Ok(())
        //     })
        // })
        // .await
        // .map_err(DatabaseError::from)?;
        // Ok(())
        todo!()
    }
    #[message]
--- a/server/crates/arbiter-server/src/actors/mod.rs
+++ b/server/crates/arbiter-server/src/actors/mod.rs
@@ -2,6 +2,7 @@ use crate::{
    actors::{
        bootstrap::Bootstrapper, evm::EvmActor, flow_coordinator::FlowCoordinator,
        operator_registry::OperatorRegistry, vault::Vault,
        vault_coordinator::VaultCoordinator,
    },
    db,
 };
@@ -15,6 +16,7 @@ pub mod evm;
 pub mod flow_coordinator;
 pub mod operator_registry;
 pub mod vault;
 pub mod vault_coordinator;
 #[derive(Error, Debug)]
 pub enum SpawnError {
@@ -30,6 +32,7 @@ pub enum SpawnError {
 pub struct GlobalActors {
    pub vault: ActorRef<Vault>,
    pub bootstrapper: ActorRef<Bootstrapper>,
    pub vault_coordinator: ActorRef<VaultCoordinator>,
    pub flow_coordinator: ActorRef<FlowCoordinator>,
    pub operator_registry: ActorRef<OperatorRegistry>,
    pub evm: ActorRef<EvmActor>,
@@ -47,7 +50,11 @@ impl GlobalActors {
        let operator_registry = OperatorRegistry::spawn(OperatorRegistry::default());
        Ok(Self {
            bootstrapper: Bootstrapper::spawn(Bootstrapper::new(&db).await?),
-            evm: EvmActor::spawn(EvmActor::new(key_holder.clone(), db)),
+            evm: EvmActor::spawn(EvmActor::new(key_holder.clone(), db.clone())),
            vault_coordinator: VaultCoordinator::spawn(VaultCoordinator::new(
                db,
                key_holder.clone(),
            )),
            vault: key_holder,
            flow_coordinator: FlowCoordinator::spawn(FlowCoordinator::new(
                operator_registry.clone(),
--- a/server/crates/arbiter-server/src/actors/vault/mod.rs
+++ b/server/crates/arbiter-server/src/actors/vault/mod.rs
@@ -1,13 +1,13 @@
 use crate::{
    crypto::{
-        KeyCell, derive_key,
+        KeyCell,
        encryption::v1::{self, Nonce},
        integrity::v1::HmacSha256,
    },
    db::{
        self,
-        models::{self, RootKeyHistory},
+        models::{self, RootKeyHistory, RootKeyHistoryId},
-        schema::{self},
+        schema,
    },
 };
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
@@ -25,7 +25,6 @@ use strum::{EnumDiscriminants, IntoDiscriminant};
 use tracing::{error, info};
 pub mod events {
    #[derive(Clone, Copy)]
    pub struct Bootstrapped;
@@ -64,7 +63,7 @@ pub enum Error {
 }
 struct Unsealed {
-    root_key_history_id: i32,
+    root_key_history_id: RootKeyHistoryId,
    root_key: KeyCell,
 }
@@ -73,8 +72,9 @@ struct Unsealed {
 enum State {
    #[default]
    Unbootstrapped,
    Sealed {
-        root_key_history_id: i32,
+        root_key_history_id: RootKeyHistoryId,
    },
    Unsealed(Unsealed),
 }
@@ -90,7 +90,6 @@ pub struct Vault {
    events: ActorRef<MessageBus>,
 }
 #[messages]
 impl Vault {
    pub async fn new(db: db::DatabasePool, events: ActorRef<MessageBus>) -> Result<Self, Error> {
        let state = {
@@ -113,9 +112,12 @@ impl Vault {
        Ok(Self { db, state, events })
    }
-    // Exclusive transaction to avoid race condtions if multiple vaults write
+    // Exclusive transaction to avoid race conditions if multiple vaults write
    // additional layer of protection against nonce-reuse
-    async fn get_new_nonce(pool: &db::DatabasePool, root_key_id: i32) -> Result<Nonce, Error> {
+    async fn get_new_nonce(
        pool: &db::DatabasePool,
        root_key_id: RootKeyHistoryId,
    ) -> Result<Nonce, Error> {
        let mut conn = pool.get().await?;
        let nonce = conn
@@ -128,7 +130,7 @@ impl Vault {
                let mut nonce = Nonce::try_from(current_nonce.as_slice()).map_err(|()| {
                    error!(
-                        "Broken database: invalid nonce for root key history id={}",
+                        "Broken database: invalid nonce for root key history id={:#?}",
                        root_key_id
                    );
                    Error::BrokenDatabase
@@ -155,43 +157,48 @@ impl Vault {
            State::Sealed { .. } => Err(Error::Sealed),
        }
    }
 }
 #[messages]
 impl Vault {
    #[message]
    pub async fn bootstrap(&mut self, seal_key_raw: SafeCell<Vec<u8>>) -> Result<(), Error> {
-        if !matches!(self.state, State::Unbootstrapped) {
+        if !matches!(&self.state, State::Unbootstrapped) {
            return Err(Error::AlreadyBootstrapped);
        }
-        let salt = v1::generate_salt();
+
        let mut seal_key = derive_key(seal_key_raw, &salt);
        let mut root_key = KeyCell::new_secure_random();
        let mut seal_key = KeyCell::try_from(seal_key_raw).map_err(|()| Error::InvalidKey)?;
        // Zero nonces are fine because they are one-time
        let root_key_nonce = Nonce::default();
        let data_encryption_nonce = Nonce::default();
-        let root_key_ciphertext: Vec<u8> = root_key.0.read_inline(|reader| {
+        // Generate salt (kept for schema compat)
-            let root_key_reader = reader.as_slice();
+        let root_key_salt = v1::generate_salt();
        let root_key_ciphertext: Vec<u8> = root_key.0.read_inline(|rk| {
            seal_key
-                .encrypt(&root_key_nonce, v1::ROOT_KEY_TAG, root_key_reader)
+                .encrypt(&root_key_nonce, v1::ROOT_KEY_TAG, rk.as_slice())
                .map_err(|err| {
                    error!(?err, "Fatal bootstrap error");
                    Error::Encryption(err)
                })
        })?;
        let data_encryption_nonce_bytes = data_encryption_nonce.to_vec();
        let mut conn = self.db.get().await?;
        let data_encryption_nonce_bytes = data_encryption_nonce.to_vec();
        let root_key_history_id = conn
            .transaction(async |conn| {
-                let root_key_history_id: i32 = insert_into(schema::root_key_history::table)
+                let root_key_history_id = insert_into(schema::root_key_history::table)
                    .values(&models::NewRootKeyHistory {
                        ciphertext: root_key_ciphertext.clone(),
                        tag: v1::ROOT_KEY_TAG.to_vec(),
                        root_key_encryption_nonce: root_key_nonce.to_vec(),
                        data_encryption_nonce: data_encryption_nonce_bytes.clone(),
                        schema_version: 1,
-                        salt: salt.to_vec(),
+                        salt: root_key_salt.to_vec(),
                    })
                    .returning(schema::root_key_history::id)
                    .get_result(&mut *conn)
@@ -202,7 +209,9 @@ impl Vault {
                    .execute(&mut *conn)
                    .await?;
-                Result::<_, diesel::result::Error>::Ok(root_key_history_id)
+                Result::<_, diesel::result::Error>::Ok(RootKeyHistoryId::from_raw(
                    root_key_history_id,
                ))
            })
            .await?;
@@ -225,25 +234,19 @@ impl Vault {
        else {
            return Err(Error::NotBootstrapped);
        };
        let root_key_history_id = *root_key_history_id;
-        // We don't want to hold connection while doing expensive KDF work
+        // We don't want to hold connection while doing expensive work
        let current_key = {
            let mut conn = self.db.get().await?;
            schema::root_key_history::table
-                .filter(schema::root_key_history::id.eq(*root_key_history_id))
+                .filter(schema::root_key_history::id.eq(root_key_history_id))
                .select(RootKeyHistory::as_select())
                .first(&mut conn)
                .await?
        };
-        let salt = &current_key.salt;
+        let mut seal_key = KeyCell::try_from(seal_key_raw).map_err(|()| Error::InvalidKey)?;
        let salt = v1::Salt::try_from(salt.as_slice()).map_err(|_| {
            error!("Broken database: invalid salt for root key");
            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(|()| {
@@ -251,19 +254,22 @@ impl Vault {
                Error::BrokenDatabase
            })?;
        let mut root_key_bytes = SafeCell::new(current_key.ciphertext.clone());
        seal_key
-            .decrypt_in_place(&nonce, v1::ROOT_KEY_TAG, &mut root_key)
+            .decrypt_in_place(&nonce, v1::ROOT_KEY_TAG, &mut root_key_bytes)
            .map_err(|err| {
                error!(?err, "Failed to unseal root key: invalid seal key");
                Error::InvalidKey
            })?;
        let root_key = KeyCell::try_from(root_key_bytes).map_err(|()| {
            error!("Broken database: invalid encryption key size");
            Error::BrokenDatabase
        })?;
        self.state = State::Unsealed(Unsealed {
            root_key_history_id: current_key.id,
-            root_key: KeyCell::try_from(root_key).map_err(|err| {
+            root_key,
                error!(?err, "Broken database: invalid encryption key size");
                Error::BrokenDatabase
            })?,
        });
        info!("Vault unsealed successfully");
@@ -272,6 +278,24 @@ impl Vault {
        Ok(())
    }
    #[message]
    pub async fn seal(&mut self) -> Result<(), Error> {
        let Unsealed {
            root_key_history_id,
            ..
        } = Self::expect_unsealed(&mut self.state)?;
        self.state = State::Sealed {
            root_key_history_id: *root_key_history_id,
        };
        let _ = self.events.tell(Publish(events::VaultResealed)).await;
        Ok(())
    }
 }
 // Server-side cryptographic operations
 #[messages]
 impl Vault {
    #[message]
    pub async fn decrypt(&mut self, aead_id: i32) -> Result<SafeCell<Vec<u8>>, Error> {
        let Unsealed { root_key, .. } = Self::expect_unsealed(&mut self.state)?;
@@ -340,19 +364,20 @@ impl Vault {
    }
    #[message]
-    pub fn sign_integrity(&mut self, mac_input: Vec<u8>) -> Result<(i32, Vec<u8>), Error> {
+    pub fn sign_integrity(
        &mut self,
        mac_input: Vec<u8>,
    ) -> Result<(RootKeyHistoryId, Vec<u8>), Error> {
        let Unsealed {
            root_key,
            root_key_history_id,
        } = Self::expect_unsealed(&mut self.state)?;
-        let mut hmac = root_key
+        let mut hmac = root_key.0.read_inline(|k| {
-            .0
+            HmacSha256::new_from_slice(k)
-            .read_inline(|k| match HmacSha256::new_from_slice(k) {
+                .unwrap_or_else(|_| unreachable!("HMAC accepts keys of any size"))
                Ok(v) => v,
                Err(_) => unreachable!("HMAC accepts keys of any size"),
        });
-        hmac.update(&root_key_history_id.to_be_bytes());
+        hmac.update(&root_key_history_id.to_raw().to_be_bytes());
        hmac.update(&mac_input);
        let mac = hmac.finalize().into_bytes().to_vec();
@@ -364,7 +389,7 @@ impl Vault {
        &mut self,
        mac_input: Vec<u8>,
        expected_mac: Vec<u8>,
-        key_version: i32,
+        key_version: RootKeyHistoryId,
    ) -> Result<bool, Error> {
        let Unsealed {
            root_key,
@@ -375,31 +400,15 @@ impl Vault {
            return Ok(false);
        }
-        let mut hmac = root_key
+        let mut hmac = root_key.0.read_inline(|k| {
-            .0
+            HmacSha256::new_from_slice(k)
-            .read_inline(|k| match HmacSha256::new_from_slice(k) {
+                .unwrap_or_else(|_| unreachable!("HMAC accepts keys of any size"))
                Ok(v) => v,
                Err(_) => unreachable!("HMAC accepts keys of any size"),
        });
-        hmac.update(&key_version.to_be_bytes());
+        hmac.update(&key_version.to_raw().to_be_bytes());
        hmac.update(&mac_input);
        Ok(hmac.verify_slice(&expected_mac).is_ok())
    }
    #[message]
    pub async fn seal(&mut self) -> Result<(), Error> {
        let Unsealed {
            root_key_history_id,
            ..
        } = Self::expect_unsealed(&mut self.state)?;
        self.state = State::Sealed {
            root_key_history_id: *root_key_history_id,
        };
        let _ = self.events.tell(Publish(events::VaultResealed)).await;
        Ok(())
    }
 }
 #[cfg(test)]
@@ -413,7 +422,7 @@ mod tests {
        let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
            .await
            .unwrap();
-        let seal_key = SafeCell::new(b"test-seal-key".to_vec());
+        let seal_key = SafeCell::new([0u8; 32].to_vec());
        actor.bootstrap(seal_key).await.unwrap();
        actor
    }
@@ -423,12 +432,12 @@ 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 root_key_history_id = match actor.state {
+        let State::Unsealed(Unsealed {
            State::Unsealed(Unsealed {
            root_key_history_id,
            ..
-            }) => root_key_history_id,
+        }) = actor.state
-            _ => panic!("expected unsealed state"),
+        else {
            panic!("expected unsealed state");
        };
        let n1 = Vault::get_new_nonce(&db, root_key_history_id)
@@ -440,8 +449,8 @@ mod tests {
        assert!(n2.to_vec() > n1.to_vec(), "nonce must increase");
        let mut conn = db.get().await.unwrap();
-        let root_row: models::RootKeyHistory = schema::root_key_history::table
+        let root_row: RootKeyHistory = schema::root_key_history::table
-            .select(models::RootKeyHistory::as_select())
+            .select(RootKeyHistory::as_select())
            .first(&mut conn)
            .await
            .unwrap();
--- a/server/crates/arbiter-server/src/actors/vault_coordinator/mod.rs
+++ b/server/crates/arbiter-server/src/actors/vault_coordinator/mod.rs
@@ -0,0 +1,316 @@
 use std::collections::HashMap;
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use diesel::{ExpressionMethods as _, QueryDsl};
 use diesel_async::RunQueryDsl;
 use kameo::{Actor, actor::ActorRef, messages};
 use rand_core::{OsRng, RngCore as _};
 use tracing::error;
 use crate::{
    actors::vault::{Bootstrap, TryUnseal, Vault},
    crypto::{derive_key, encryption::v1::Nonce, shamir},
    db::{self, models, schema},
 };
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
    #[error("Already coordinating a bootstrap")]
    AlreadyBootstrapping,
    #[error("Already coordinating an unseal")]
    AlreadyUnsealing,
    #[error("Bootstrap not in progress")]
    NotBootstrapping,
    #[error("Unseal not in progress")]
    NotUnsealing,
    #[error("Operator already contributed")]
    DuplicateContribution,
    #[error("Operator not found in database")]
    OperatorNotFound,
    #[error("Invalid passphrase (decryption failed)")]
    InvalidPassphrase,
    #[error("Shamir error: {0}")]
    Shamir(String),
    #[error("Database connection error: {0}")]
    DatabaseConnection(#[from] db::PoolError),
    #[error("Database query error: {0}")]
    DatabaseQuery(#[from] diesel::result::Error),
    #[error("Encryption error")]
    Encryption,
    #[error("Vault error")]
    VaultError,
    #[error("Broken database")]
    BrokenDatabase,
 }
 // Passphrases stored as plain Vec<u8> (not SafeCell) so CoordinatorState is Sync.
 // They are ephemeral and dropped immediately after use.
 enum CoordinatorState {
    Idle,
    Bootstrapping {
        declared_count: usize,
        passphrases: HashMap<i32, Vec<u8>>,
    },
    Unsealing {
        threshold: usize,
        passphrases: HashMap<i32, Vec<u8>>,
    },
 }
 #[derive(Actor)]
 pub struct VaultCoordinator {
    db: db::DatabasePool,
    vault: ActorRef<Vault>,
    state: CoordinatorState,
 }
 impl VaultCoordinator {
    pub const fn new(db: db::DatabasePool, vault: ActorRef<Vault>) -> Self {
        Self {
            db,
            vault,
            state: CoordinatorState::Idle,
        }
    }
 }
 const SHARE_AAD: &[u8] = b"arbiter/shamir-share/v1";
 const fn shamir_threshold(n: usize) -> usize {
    match n {
        0 => panic!("No operators"),
        1 => 1,
        2 => 2,
        n => n / 2 + 1,
    }
 }
 async fn finalize_bootstrap(
    db: db::DatabasePool,
    vault: ActorRef<Vault>,
    passphrases: HashMap<i32, Vec<u8>>,
 ) -> Result<(), Error> {
    let total = passphrases.len();
    let threshold = shamir_threshold(total);
    // Generate random 32-byte seal key
    let mut seal_key_bytes = vec![0u8; 32];
    OsRng.fill_bytes(&mut seal_key_bytes);
    // Split seal key into shares using Shamir (OsRng from rand_core 0.6, compatible with vsss-rs)
    let shares = shamir::split_key(threshold, total, &seal_key_bytes, OsRng)
        .map_err(|e| Error::Shamir(e.to_string()))?;
    let seal_key = SafeCell::new(seal_key_bytes);
    let mut conn = db.get().await?;
    for ((operator_id_raw, passphrase_bytes), share) in passphrases.into_iter().zip(shares) {
        // Generate a fresh share_salt for this operator
        let mut share_salt = vec![0u8; 32];
        OsRng.fill_bytes(&mut share_salt);
        // Derive share encryption key from passphrase + salt
        let mut passphrase_cell = SafeCell::new(passphrase_bytes);
        let mut share_seal_key = derive_key(&mut passphrase_cell, &share_salt);
        // Encrypt this operator's share
        let nonce = Nonce::default();
        let encrypted_share = share_seal_key
            .encrypt(&nonce, SHARE_AAD, &share)
            .map_err(|_| Error::Encryption)?;
        let nonce_bytes = nonce.to_vec();
        diesel::replace_into(schema::operator::table)
            .values((
                schema::operator::id.eq(Some(operator_id_raw)),
                schema::operator::share.eq(&encrypted_share),
                schema::operator::share_nonce.eq(&nonce_bytes),
                schema::operator::share_salt.eq(&share_salt),
                schema::operator::created_at.eq(models::SqliteTimestamp::now()),
                schema::operator::updated_at.eq(models::SqliteTimestamp::now()),
            ))
            .execute(&mut conn)
            .await?;
    }
    vault
        .ask(Bootstrap {
            seal_key_raw: seal_key,
        })
        .await
        .map_err(|err| {
            error!(?err, "Vault bootstrap failed");
            Error::VaultError
        })?;
    Ok(())
 }
 async fn finalize_unseal(
    db: db::DatabasePool,
    vault: ActorRef<Vault>,
    passphrases: HashMap<i32, Vec<u8>>,
 ) -> Result<(), Error> {
    let mut conn = db.get().await?;
    let mut shares: Vec<Vec<u8>> = Vec::new();
    for (operator_id_raw, passphrase_bytes) in passphrases {
        let (encrypted_share, share_nonce_bytes, share_salt): (Vec<u8>, Vec<u8>, Vec<u8>) =
            schema::operator::table
                .filter(schema::operator::id.eq(Some(operator_id_raw)))
                .select((
                    schema::operator::share,
                    schema::operator::share_nonce,
                    schema::operator::share_salt,
                ))
                .first(&mut conn)
                .await
                .map_err(|_| Error::OperatorNotFound)?;
        let nonce = Nonce::try_from(share_nonce_bytes.as_slice()).map_err(|()| {
            error!(operator_id = operator_id_raw, "Invalid nonce in DB");
            Error::BrokenDatabase
        })?;
        let mut passphrase_cell = SafeCell::new(passphrase_bytes);
        let mut share_seal_key = derive_key(&mut passphrase_cell, &share_salt);
        let mut share_buffer = SafeCell::new(encrypted_share);
        share_seal_key
            .decrypt_in_place(&nonce, SHARE_AAD, &mut share_buffer)
            .map_err(|_| Error::InvalidPassphrase)?;
        let decrypted_share = share_buffer.read().clone();
        shares.push(decrypted_share);
    }
    let seal_key_bytes =
        shamir::combine_shares(&shares).map_err(|e| Error::Shamir(e.to_string()))?;
    let seal_key = SafeCell::new(seal_key_bytes);
    vault
        .ask(TryUnseal {
            seal_key_raw: seal_key,
        })
        .await
        .map_err(|err| {
            error!(?err, "Vault unseal failed");
            Error::VaultError
        })?;
    Ok(())
 }
 #[messages]
 impl VaultCoordinator {
    /// Phase 1 of multi-operator bootstrap: declare the committee size.
    #[message]
    #[expect(clippy::unused_async, reason = "kameo requires messages to be async")]
    pub async fn start_bootstrap(
        &mut self,
        operator_id: i32,
        declared_count: usize,
    ) -> Result<(), Error> {
        let _ = operator_id;
        if !matches!(self.state, CoordinatorState::Idle) {
            return Err(Error::AlreadyBootstrapping);
        }
        self.state = CoordinatorState::Bootstrapping {
            declared_count,
            passphrases: HashMap::new(),
        };
        Ok(())
    }
    /// Phase 2 of multi-operator bootstrap: contribute a passphrase.
    /// Returns Ok(true) when all operators contributed and bootstrap finalized.
    #[message]
    pub async fn contribute_bootstrap(
        &mut self,
        operator_id: i32,
        mut passphrase: SafeCell<Vec<u8>>,
    ) -> Result<bool, Error> {
        let CoordinatorState::Bootstrapping {
            declared_count,
            passphrases,
        } = &mut self.state
        else {
            return Err(Error::NotBootstrapping);
        };
        if passphrases.contains_key(&operator_id) {
            return Err(Error::DuplicateContribution);
        }
        // Extract bytes immediately so state stays Sync
        let passphrase_bytes = passphrase.read().to_vec();
        passphrases.insert(operator_id, passphrase_bytes);
        if passphrases.len() < *declared_count {
            return Ok(false);
        }
        let CoordinatorState::Bootstrapping { passphrases, .. } =
            std::mem::replace(&mut self.state, CoordinatorState::Idle)
        else {
            unreachable!()
        };
        finalize_bootstrap(self.db.clone(), self.vault.clone(), passphrases).await?;
        Ok(true)
    }
    /// Contribute a passphrase for vault unseal.
    /// Returns Ok(true) when threshold reached and vault is unsealed.
    #[message]
    pub async fn contribute_unseal(
        &mut self,
        operator_id: i32,
        mut passphrase: SafeCell<Vec<u8>>,
    ) -> Result<bool, Error> {
        if matches!(self.state, CoordinatorState::Idle) {
            let mut conn = self.db.get().await?;
            let count: i64 = schema::operator::table
                .count()
                .get_result(&mut conn)
                .await?;
            let threshold = shamir_threshold(usize::try_from(count).unwrap_or_default());
            self.state = CoordinatorState::Unsealing {
                threshold,
                passphrases: HashMap::new(),
            };
        }
        let CoordinatorState::Unsealing {
            threshold,
            passphrases,
        } = &mut self.state
        else {
            return Err(Error::NotUnsealing);
        };
        if passphrases.contains_key(&operator_id) {
            return Err(Error::DuplicateContribution);
        }
        let passphrase_bytes = passphrase.read().to_vec();
        passphrases.insert(operator_id, passphrase_bytes);
        if passphrases.len() < *threshold {
            return Ok(false);
        }
        let CoordinatorState::Unsealing { passphrases, .. } =
            std::mem::replace(&mut self.state, CoordinatorState::Idle)
        else {
            unreachable!()
        };
        finalize_unseal(self.db.clone(), self.vault.clone(), passphrases).await?;
        Ok(true)
    }
 }
--- a/server/crates/arbiter-server/src/crypto/encryption/v1.rs
+++ b/server/crates/arbiter-server/src/crypto/encryption/v1.rs
@@ -61,12 +61,12 @@ mod tests {
    #[test]
    fn derive_seal_key_deterministic() {
        static PASSWORD: &[u8] = b"password";
-        let password = SafeCell::new(PASSWORD.to_vec());
+        let mut password = SafeCell::new(PASSWORD.to_vec());
-        let password2 = SafeCell::new(PASSWORD.to_vec());
+        let mut password2 = SafeCell::new(PASSWORD.to_vec());
        let salt = generate_salt();
-        let mut key1 = derive_key(password, &salt);
+        let mut key1 = derive_key(&mut password, &salt);
-        let mut key2 = derive_key(password2, &salt);
+        let mut key2 = derive_key(&mut password2, &salt);
        let key1_reader = key1.0.read();
        let key2_reader = key2.0.read();
@@ -77,10 +77,10 @@ mod tests {
    #[test]
    fn successful_derive() {
        static PASSWORD: &[u8] = b"password";
-        let password = SafeCell::new(PASSWORD.to_vec());
+        let mut password = SafeCell::new(PASSWORD.to_vec());
        let salt = generate_salt();
-        let mut key = derive_key(password, &salt);
+        let mut key = derive_key(&mut password, &salt);
        let key_reader = key.0.read();
        assert_ne!(key_reader.as_slice(), &[0u8; 32][..]);
--- a/server/crates/arbiter-server/src/crypto/mod.rs
+++ b/server/crates/arbiter-server/src/crypto/mod.rs
@@ -1,5 +1,5 @@
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
-use encryption::v1::{Nonce, Salt};
+use encryption::v1::Nonce;
 use argon2::{Algorithm, Argon2};
 use chacha20poly1305::{
@@ -13,6 +13,7 @@ use rand::{
 pub mod encryption;
 pub mod integrity;
 pub mod shamir;
 pub struct KeyCell(pub SafeCell<Key>);
 impl From<SafeCell<Key>> for KeyCell {
@@ -28,7 +29,7 @@ impl TryFrom<SafeCell<Vec<u8>>> for KeyCell {
        if value.len() != size_of::<Key>() {
            return Err(());
        }
-        let cell = SafeCell::new_inline(|cell_write: &mut Key| {
+        let cell = SafeCell::new_inline_default(|cell_write: &mut Key| {
            cell_write.copy_from_slice(&value);
        });
        Ok(Self(cell))
@@ -37,7 +38,7 @@ 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 key = SafeCell::new_inline_default(|key_buffer: &mut Key| {
            let mut rng = StdRng::try_from_rng(&mut SysRng)
                .expect("Rng failure is unrecoverable and should panic");
            rng.fill_bytes(key_buffer);
@@ -94,7 +95,7 @@ impl KeyCell {
 }
 /// Derive a fixed-length key from the password using Argon2id, which is designed for password hashing and key derivation.
-pub fn derive_key(mut password: SafeCell<Vec<u8>>, salt: &Salt) -> KeyCell {
+pub fn derive_key(password: &mut SafeCell<Vec<u8>>, salt: &[u8]) -> KeyCell {
    let params = {
        #[cfg(debug_assertions)]
        {
@@ -132,10 +133,10 @@ mod tests {
    #[test]
    fn encrypt_decrypt() {
        static PASSWORD: &[u8] = b"password";
-        let password = SafeCell::new(PASSWORD.to_vec());
+        let mut password = SafeCell::new(PASSWORD.to_vec());
        let salt = generate_salt();
-        let mut key = derive_key(password, &salt);
+        let mut key = derive_key(&mut password, &salt);
        let nonce = Nonce(*b"unique nonce 123 1231233"); // 24 bytes for XChaCha20Poly1305
        let associated_data = b"associated data";
        let mut buffer = b"secret data".to_vec();
--- a/server/crates/arbiter-server/src/crypto/shamir.rs
+++ b/server/crates/arbiter-server/src/crypto/shamir.rs
@@ -0,0 +1,27 @@
 use vsss_rs::Gf256;
 #[derive(Debug, thiserror::Error)]
 pub enum ShamirError {
    #[error("Failed to split key: {0}")]
    Split(String),
    #[error("Failed to combine shares: {0}")]
    Combine(String),
 }
 /// Split `key` into `total` shares where any `threshold` shares can reconstruct it.
 /// Each returned Vec<u8> is a share with format [`identifier_byte`, `value_bytes`...].
 pub fn split_key(
    threshold: usize,
    total: usize,
    key: &[u8],
    rng: impl rand_core::RngCore + rand_core::CryptoRng,
 ) -> Result<Vec<Vec<u8>>, ShamirError> {
    Gf256::split_array(threshold, total, key, rng)
        .map_err(|e| ShamirError::Split(format!("{e:?}")))
 }
 /// Reconstruct the secret from `threshold` or more shares.
 pub fn combine_shares(shares: &[Vec<u8>]) -> Result<Vec<u8>, ShamirError> {
    Gf256::combine_array(shares)
        .map_err(|e| ShamirError::Combine(format!("{e:?}")))
 }
--- a/server/crates/arbiter-server/src/db/models.rs
+++ b/server/crates/arbiter-server/src/db/models.rs
@@ -79,10 +79,41 @@ pub mod types {
        }
    }
-    #[derive(Debug, FromSqlRow, AsExpression, Clone)]
+    macro_rules! declare_id {
        ($name:ident) => {
            #[derive(Debug, FromSqlRow, AsExpression, Clone, Hash, Copy, PartialEq, Eq)]
            #[diesel(sql_type = Integer)]
            #[repr(transparent)] // hint compiler to optimize the wrapper struct away
-    pub struct ChainId(pub i32);
+            pub struct $name(i32);
            impl $name {
                pub const fn to_raw(self) -> i32 {
                    self.0
                }
                pub const fn from_raw(raw: i32) -> Self {
                    Self(raw)
                }
            }
            impl FromSql<Integer, Sqlite> for $name {
                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 $name {
                fn to_sql<'b>(
                    &'b self,
                    out: &mut diesel::serialize::Output<'b, '_, Sqlite>,
                ) -> diesel::serialize::Result {
                    ToSql::<Integer, Sqlite>::to_sql(&self.0, out)
                }
            }
        };
    }
    declare_id!(ChainId);
    #[expect(
        clippy::cast_sign_loss,
@@ -103,21 +134,13 @@ pub mod types {
        }
    };
-    impl FromSql<Integer, Sqlite> for ChainId {
+    declare_id!(OperatorId);
-        fn from_sql(
+    declare_id!(OperatorIdentityId);
-            bytes: <Sqlite as diesel::backend::Backend>::RawValue<'_>,
+    declare_id!(AeadEncryptedId);
-        ) -> diesel::deserialize::Result<Self> {
+    declare_id!(RootKeyHistoryId);
-            FromSql::<Integer, Sqlite>::from_sql(bytes).map(Self)
+    declare_id!(TlsHistoryId);
-        }
+    declare_id!(EvmWalletId);
-    }
+    declare_id!(ClientId);
    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)
        }
    }
 }
 pub use types::*;
@@ -130,12 +153,12 @@ pub use types::*;
 )]
 #[diesel(table_name = aead_encrypted, check_for_backend(Sqlite))]
 pub struct AeadEncrypted {
-    pub id: i32,
+    pub id: AeadEncryptedId,
    pub ciphertext: Vec<u8>,
    pub tag: Vec<u8>,
    pub current_nonce: Vec<u8>,
    pub schema_version: i32,
-    pub associated_root_key_id: i32, // references root_key_history.id
+    pub associated_root_key_id: RootKeyHistoryId,
    pub created_at: SqliteTimestamp,
 }
@@ -148,7 +171,7 @@ pub struct AeadEncrypted {
    attributes_with = "deriveless"
 )]
 pub struct RootKeyHistory {
-    pub id: i32,
+    pub id: RootKeyHistoryId,
    pub ciphertext: Vec<u8>,
    pub tag: Vec<u8>,
    pub root_key_encryption_nonce: Vec<u8>,
@@ -166,7 +189,7 @@ pub struct RootKeyHistory {
    attributes_with = "deriveless"
 )]
 pub struct TlsHistory {
-    pub id: i32,
+    pub id: TlsHistoryId,
    pub cert: String,
    pub cert_key: String, // PEM Encoded private key
    pub ca_cert: String,  // PEM Encoded certificate for cert signing
@@ -191,7 +214,7 @@ pub struct ArbiterSettings {
    attributes_with = "deriveless"
 )]
 pub struct EvmWallet {
-    pub id: i32,
+    pub id: EvmWalletId,
    pub address: Vec<u8>,
    pub aead_encrypted_id: i32,
    pub created_at: SqliteTimestamp,
@@ -213,7 +236,7 @@ pub struct EvmWallet {
 )]
 pub struct EvmWalletAccess {
    pub id: i32,
-    pub wallet_id: i32,
+    pub wallet_id: EvmWalletId,
    pub client_id: i32,
    pub created_at: SqliteTimestamp,
 }
@@ -240,7 +263,7 @@ pub struct ProgramClientMetadataHistory {
 #[derive(Models, Queryable, Debug, Insertable, Selectable)]
 #[diesel(table_name = schema::program_client, check_for_backend(Sqlite))]
 pub struct ProgramClient {
-    pub id: i32,
+    pub id: ClientId,
    pub public_key: Vec<u8>,
    pub metadata_id: i32,
    pub created_at: SqliteTimestamp,
@@ -250,12 +273,23 @@ pub struct ProgramClient {
 #[derive(Queryable, Debug)]
 #[diesel(table_name = schema::operator_client, check_for_backend(Sqlite))]
 pub struct OperatorClient {
-    pub id: i32,
+    pub id: OperatorIdentityId,
    pub public_key: Vec<u8>,
    pub created_at: SqliteTimestamp,
    pub updated_at: SqliteTimestamp,
 }
 #[derive(Queryable, Debug)]
 #[diesel(table_name = schema::operator, check_for_backend(Sqlite))]
 pub struct Operator {
    pub id: OperatorId,
    pub share: Vec<u8>,
    pub share_nonce: Vec<u8>,
    pub share_salt: Vec<u8>,
    pub created_at: SqliteTimestamp,
    pub updated_at: SqliteTimestamp,
 }
 #[derive(Models, Queryable, Debug, Insertable, Selectable)]
 #[diesel(table_name = evm_ether_transfer_limit, check_for_backend(Sqlite))]
 #[view(
@@ -399,7 +433,7 @@ pub struct IntegrityEnvelope {
    pub entity_kind: String,
    pub entity_id: Vec<u8>,
    pub payload_version: i32,
-    pub key_version: i32,
+    pub key_version: RootKeyHistoryId,
    pub mac: Vec<u8>,
    pub signed_at: SqliteTimestamp,
    pub created_at: SqliteTimestamp,
--- a/server/crates/arbiter-server/src/db/schema.rs
+++ b/server/crates/arbiter-server/src/db/schema.rs
@@ -152,6 +152,26 @@ diesel::table! {
    }
 }
 diesel::table! {
    operator (id) {
        id -> Nullable<Integer>,
        share -> Binary,
        share_nonce -> Binary,
        share_salt -> Binary,
        created_at -> Integer,
        updated_at -> Integer,
    }
 }
 diesel::table! {
    operator_identity (id) {
        id -> Integer,
        public_key -> Binary,
        created_at -> Integer,
        updated_at -> Integer,
    }
 }
 diesel::table! {
    program_client (id) {
        id -> Integer,
@@ -185,15 +205,6 @@ diesel::table! {
    }
 }
 diesel::table! {
    operator_client (id) {
        id -> Integer,
        public_key -> Binary,
        created_at -> Integer,
        updated_at -> Integer,
    }
 }
 diesel::joinable!(aead_encrypted -> root_key_history (associated_root_key_id));
 diesel::joinable!(arbiter_settings -> root_key_history (root_key_id));
 diesel::joinable!(arbiter_settings -> tls_history (tls_id));
@@ -212,6 +223,7 @@ diesel::joinable!(evm_transaction_log -> evm_wallet_access (wallet_access_id));
 diesel::joinable!(evm_wallet -> aead_encrypted (aead_encrypted_id));
 diesel::joinable!(evm_wallet_access -> evm_wallet (wallet_id));
 diesel::joinable!(evm_wallet_access -> program_client (client_id));
 diesel::joinable!(operator -> operator_identity (id));
 diesel::joinable!(program_client -> client_metadata (metadata_id));
 diesel::allow_tables_to_appear_in_same_query!(
@@ -230,8 +242,9 @@ diesel::allow_tables_to_appear_in_same_query!(
    evm_wallet,
    evm_wallet_access,
    integrity_envelope,
    operator,
    operator_identity,
    program_client,
    root_key_history,
    tls_history,
    operator_client,
 );
--- a/server/crates/arbiter-server/src/evm/mod.rs
+++ b/server/crates/arbiter-server/src/evm/mod.rs
@@ -359,7 +359,8 @@ mod tests {
    use crate::db::{
        self, DatabaseConnection,
        models::{
-            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
+            EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, NewEvmTransactionLog,
            SqliteTimestamp,
        },
        schema::{evm_basic_grant, evm_transaction_log},
    };
@@ -377,7 +378,7 @@ mod tests {
        EvalContext {
            target: EvmWalletAccess {
                id: WALLET_ACCESS_ID,
-                wallet_id: 10,
+                wallet_id: EvmWalletId::from_raw(5),
                client_id: 20,
                created_at: SqliteTimestamp(Utc::now()),
            },
--- a/server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs
+++ b/server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs
@@ -3,7 +3,8 @@ use crate::{
    db::{
        self, DatabaseConnection,
        models::{
-            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
+            EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, NewEvmTransactionLog,
            SqliteTimestamp,
        },
        schema::{evm_basic_grant, evm_transaction_log},
    },
@@ -31,7 +32,7 @@ fn ctx(to: Address, value: U256) -> EvalContext {
    EvalContext {
        target: EvmWalletAccess {
            id: WALLET_ACCESS_ID,
-            wallet_id: 10,
+            wallet_id: EvmWalletId::from_raw(10),
            client_id: 20,
            created_at: SqliteTimestamp(Utc::now()),
        },
--- a/server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs
+++ b/server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs
@@ -2,7 +2,7 @@ use super::{Settings, TokenTransfer};
 use crate::{
    db::{
        self, DatabaseConnection,
-        models::{EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, SqliteTimestamp},
+        models::{EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, SqliteTimestamp},
        schema::evm_basic_grant,
    },
    evm::{
@@ -45,7 +45,7 @@ fn ctx(to: Address, calldata: Bytes) -> EvalContext {
    EvalContext {
        target: EvmWalletAccess {
            id: WALLET_ACCESS_ID,
-            wallet_id: 10,
+            wallet_id: EvmWalletId::from_raw(10),
            client_id: 20,
            created_at: SqliteTimestamp(Utc::now()),
        },
--- a/server/crates/arbiter-server/src/evm/safe_signer.rs
+++ b/server/crates/arbiter-server/src/evm/safe_signer.rs
@@ -44,7 +44,7 @@ impl std::fmt::Debug for SafeSigner {
 /// Returns the protected key bytes and the derived Ethereum address.
 pub fn generate(rng: &mut impl rand::Rng) -> (SafeCell<[u8; 32]>, Address) {
    loop {
-        let mut cell = SafeCell::new_inline(|w: &mut [u8; 32]| {
+        let mut cell = SafeCell::new_inline_default(|w: &mut [u8; 32]| {
            rng.fill_bytes(w);
        });
--- a/server/crates/arbiter-server/src/grpc/operator/evm.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/evm.rs
@@ -90,7 +90,7 @@ async fn handle_wallet_list(
                .into_iter()
                .map(|(id, address)| WalletEntry {
                    address: address.to_vec(),
-                    id,
+                    id: id.to_raw(),
                })
                .collect(),
        }),
--- a/server/crates/arbiter-server/src/grpc/operator/inbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/inbound.rs
@@ -1,11 +1,10 @@
 use crate::{
-    db::models::{CoreEvmWalletAccess, NewEvmWalletAccess},
+    db::models::{CoreEvmWalletAccess, EvmWalletId, NewEvmWalletAccess},
    evm::policies::{
        SharedGrantSettings, SpecificGrant, TransactionRateLimit, VolumeRateLimit, ether_transfer,
        token_transfers,
    },
-    grpc::Convert,
+    grpc::{Convert, TryConvert},
    grpc::TryConvert,
 };
 use arbiter_proto::{
    proto::evm::{
@@ -150,7 +149,7 @@ impl Convert for WalletAccess {
    fn convert(self) -> Self::Output {
        NewEvmWalletAccess {
-            wallet_id: self.wallet_id,
+            wallet_id: EvmWalletId::from_raw(self.wallet_id),
            client_id: self.sdk_client_id,
        }
    }
@@ -165,7 +164,7 @@ impl TryConvert for SdkClientWalletAccess {
            return Err(Status::invalid_argument("Missing wallet access entry"));
        };
        Ok(CoreEvmWalletAccess {
-            wallet_id: access.wallet_id,
+            wallet_id: EvmWalletId::from_raw(access.wallet_id),
            client_id: access.sdk_client_id,
            id: self.id,
        })
--- a/server/crates/arbiter-server/src/grpc/operator/outbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/outbound.rs
@@ -103,7 +103,7 @@ impl Convert for EvmWalletAccess {
        Self::Output {
            id: self.id,
            access: Some(WalletAccess {
-                wallet_id: self.wallet_id,
+                wallet_id: self.wallet_id.to_raw(),
                sdk_client_id: self.client_id,
            }),
        }
--- a/server/crates/arbiter-server/src/grpc/operator/sdk_client.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/sdk_client.rs
@@ -2,7 +2,7 @@ use crate::{
    db::models::NewEvmWalletAccess,
    grpc::Convert,
    peers::operator::{
-        OutOfBand, OperatorSession,
+        OperatorSession, OutOfBand,
        session::handlers::{
            HandleGrantEvmWalletAccess, HandleListWalletAccess, HandleNewClientApprove,
            HandleRevokeEvmWalletAccess, HandleSdkClientList,
@@ -11,8 +11,8 @@ use crate::{
 };
 use arbiter_crypto::authn;
 use arbiter_proto::proto::{
    shared::ClientInfo as ProtoClientMetadata,
    operator::{
        operator_response::Payload as OperatorResponsePayload,
        sdk_client::{
            self as proto_sdk_client, ConnectionCancel as ProtoSdkClientConnectionCancel,
            ConnectionRequest as ProtoSdkClientConnectionRequest,
@@ -24,8 +24,8 @@ use arbiter_proto::proto::{
            request::Payload as SdkClientRequestPayload,
            response::Payload as SdkClientResponsePayload,
        },
        operator_response::Payload as OperatorResponsePayload,
    },
    shared::ClientInfo as ProtoClientMetadata,
 };
 use kameo::actor::ActorRef;
@@ -115,7 +115,7 @@ async fn handle_list(
            clients: clients
                .into_iter()
                .map(|(client, metadata)| ProtoSdkClientEntry {
-                    id: client.id,
+                    id: client.id.to_raw(),
                    pubkey: client.public_key.clone(),
                    info: Some(ProtoClientMetadata {
                        name: metadata.name,
--- a/server/crates/arbiter-server/src/grpc/operator/vault.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/vault.rs
@@ -3,7 +3,6 @@ use crate::{
    peers::operator::{OperatorSession, session::handlers::HandleQueryVaultState},
 };
 use arbiter_proto::{
    proto::shared::VaultState as ProtoVaultState,
    proto::operator::{
        operator_response::Payload as OperatorResponsePayload,
        vault::{
@@ -11,6 +10,7 @@ use arbiter_proto::{
            response::Payload as VaultResponsePayload,
        },
    },
    proto::shared::VaultState as ProtoVaultState,
 };
 use kameo::actor::ActorRef;
--- a/server/crates/arbiter-server/src/grpc/operator/vault_gate/inbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/vault_gate/inbound.rs
@@ -1,14 +1,16 @@
 use crate::{
    grpc::{Convert, TryConvert},
    peers::operator::vault_gate::{
-        self as vault_gate, HandleBootstrapEncryptedKey, HandleHandshake, HandleUnsealEncryptedKey,
+        self as vault_gate, HandleBootstrapEncryptedKey, HandleContributeBootstrapPassphrase,
        HandleContributeUnsealPassphrase, HandleDeclareCommittee, HandleHandshake,
        HandleUnsealEncryptedKey,
    },
 };
 use arbiter_proto::proto::operator::{
    operator_request::Payload as OperatorRequestPayload,
    vault::{
        self as proto_vault,
-        bootstrap::{self as proto_bootstrap},
+        bootstrap::{self as proto_bootstrap, request::Payload as BootstrapRequestPayload},
        request::Payload as VaultRequestPayload,
        unseal::{self as proto_unseal, request::Payload as UnsealRequestPayload},
    },
@@ -73,6 +75,13 @@ impl TryConvert for UnsealRequestPayload {
        match self {
            Self::Start(start) => start.try_convert(),
            Self::EncryptedKey(key) => Ok(key.convert()),
            Self::ContributePassphrase(cp) => Ok(
                vault_gate::Inbound::HandleContributeUnsealPassphrase(
                    HandleContributeUnsealPassphrase {
                        passphrase: cp.passphrase,
                    },
                ),
            ),
        }
    }
 }
@@ -107,12 +116,35 @@ impl TryConvert for proto_bootstrap::Request {
    type Error = Status;
    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
-        self.encrypted_key
+        self.payload
-            .ok_or_else(|| Status::invalid_argument("Missing bootstrap encrypted key"))?
+            .ok_or_else(|| Status::invalid_argument("Missing bootstrap payload"))?
            .try_convert()
    }
 }
 impl TryConvert for BootstrapRequestPayload {
    type Output = vault_gate::Inbound;
    type Error = Status;
    fn try_convert(self) -> Result<vault_gate::Inbound, Status> {
        match self {
            Self::EncryptedKey(key) => key.try_convert(),
            Self::DeclareCommittee(dc) => Ok(
                vault_gate::Inbound::HandleDeclareCommittee(HandleDeclareCommittee {
                    count: dc.count as usize,
                }),
            ),
            Self::ContributePassphrase(cp) => Ok(
                vault_gate::Inbound::HandleContributeBootstrapPassphrase(
                    HandleContributeBootstrapPassphrase {
                        passphrase: cp.passphrase,
                    },
                ),
            ),
        }
    }
 }
 impl TryConvert for proto_bootstrap::BootstrapEncryptedKey {
    type Output = vault_gate::Inbound;
    type Error = Status;
--- a/server/crates/arbiter-server/src/grpc/operator/vault_gate/outbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/vault_gate/outbound.rs
@@ -4,7 +4,6 @@ use crate::{
    peers::operator::vault_gate::{self as vault_gate},
 };
 use arbiter_proto::proto::{
    shared::VaultState as ProtoVaultState,
    operator::{
        operator_response::Payload as OperatorResponsePayload,
        vault::{
@@ -17,6 +16,7 @@ use arbiter_proto::proto::{
            },
        },
    },
    shared::VaultState as ProtoVaultState,
 };
 use tonic::Status;
@@ -110,6 +110,40 @@ impl TryConvert for vault_gate::Outbound {
                };
                Ok(wrap_bootstrap_response(proto_result))
            }
            Self::HandleDeclareCommittee(result) => {
                let proto_result = match result {
                    Ok(()) => ProtoBootstrapResult::Success,
                    Err(err) => {
                        warn!(?err, "declare committee failed");
                        return Err(Status::internal("Failed to declare committee"));
                    }
                };
                Ok(wrap_bootstrap_response(proto_result))
            }
            Self::HandleContributeBootstrapPassphrase(result) => {
                let proto_result = match result {
                    Ok(true) => ProtoBootstrapResult::Success,
                    Ok(false) => ProtoBootstrapResult::AwaitingContributions,
                    Err(err) => {
                        warn!(?err, "contribute bootstrap passphrase failed");
                        return Err(Status::internal("Failed to contribute bootstrap passphrase"));
                    }
                };
                Ok(wrap_bootstrap_response(proto_result))
            }
            Self::HandleContributeUnsealPassphrase(result) => {
                let proto_result = match result {
                    Ok(true) => ProtoUnsealResult::Success,
                    Ok(false) => ProtoUnsealResult::AwaitingContributions,
                    Err(err) => {
                        warn!(?err, "contribute unseal passphrase failed");
                        return Err(Status::internal("Failed to contribute unseal passphrase"));
                    }
                };
                Ok(wrap_unseal_response(UnsealResponsePayload::Result(
                    proto_result.into(),
                )))
            }
        }
    }
 }
--- a/server/crates/arbiter-server/src/peers/client/auth.rs
+++ b/server/crates/arbiter-server/src/peers/client/auth.rs
@@ -298,7 +298,7 @@ where
    let signature = expect_message(transport, |req: Inbound| match req {
        Inbound::AuthChallengeSolution { signature } => Some(signature),
-        _ => None,
+        Inbound::AuthChallengeRequest { .. } => None,
    })
    .await
    .map_err(|e| {
--- a/server/crates/arbiter-server/src/peers/operator/auth/state.rs
+++ b/server/crates/arbiter-server/src/peers/operator/auth/state.rs
@@ -4,7 +4,7 @@ use super::{
 };
 use crate::{
    actors::bootstrap::ConsumeToken,
-    db::{DatabasePool, schema::operator_client},
+    db::{DatabasePool, schema::operator_identity},
    peers::operator::auth::Outbound,
 };
 use arbiter_crypto::authn::{self, AuthChallenge, OPERATOR_CONTEXT};
@@ -14,19 +14,19 @@ use diesel::{ExpressionMethods as _, OptionalExtension as _, QueryDsl};
 use diesel_async::RunQueryDsl;
 use tracing::error;
-pub(super) struct ChallengeRequest {
+pub(crate) struct ChallengeRequest {
-    pub(super) pubkey: authn::PublicKey,
+    pub(crate) pubkey: authn::PublicKey,
-    pub(super) bootstrap_token: Option<String>,
+    pub(crate) bootstrap_token: Option<String>,
 }
-pub(super) struct ChallengeContext {
+pub struct ChallengeContext {
-    pub(super) challenge: AuthChallenge,
+    pub challenge: AuthChallenge,
-    pub(super) pubkey: authn::PublicKey,
+    pub pubkey: authn::PublicKey,
-    pub(super) bootstrap_token: Option<String>,
+    pub bootstrap_token: Option<String>,
 }
-pub(super) struct ChallengeSolution {
+pub(crate) struct ChallengeSolution {
-    pub(super) solution: Vec<u8>,
+    pub(crate) solution: Vec<u8>,
 }
 smlang::statemachine!(
@@ -44,9 +44,9 @@ async fn get_client_id(db: &DatabasePool, pubkey: &authn::PublicKey) -> Result<O
        Error::internal("Database unavailable")
    })?;
-    operator_client::table
+    operator_identity::table
-        .filter(operator_client::public_key.eq(pubkey.to_bytes()))
+        .filter(operator_identity::public_key.eq(pubkey.to_bytes()))
-        .select(operator_client::id)
+        .select(operator_identity::id)
        .first::<i32>(&mut conn)
        .await
        .optional()
@@ -63,9 +63,9 @@ async fn register_key(db: &DatabasePool, pubkey: &authn::PublicKey) -> Result<i3
        Error::internal("Database unavailable")
    })?;
-    let id: i32 = diesel::insert_into(operator_client::table)
+    let id: i32 = diesel::insert_into(operator_identity::table)
-        .values((operator_client::public_key.eq(pubkey_bytes),))
+        .values((operator_identity::public_key.eq(pubkey_bytes),))
-        .returning(operator_client::id)
+        .returning(operator_identity::id)
        .get_result(&mut conn)
        .await
        .map_err(|e| {
@@ -127,8 +127,6 @@ where
        })
    }
    #[allow(missing_docs)]
    #[allow(clippy::unused_unit)]
    async fn verify_solution(
        &mut self,
        ChallengeContext {
--- a/server/crates/arbiter-server/src/peers/operator/session/handlers.rs
+++ b/server/crates/arbiter-server/src/peers/operator/session/handlers.rs
@@ -1,12 +1,16 @@
 use super::{Error, OperatorSession};
 use crate::{
-    actors::evm::{
+    actors::{
-        ClientSignTransaction, Generate, ListWallets, OperatorCreateGrant, OperatorListGrants,
+        evm::{
-        SignTransactionError as EvmSignError,
+            ClientSignTransaction, Generate, ListWallets, OperatorCreateGrant, OperatorDeleteGrant,
            OperatorListGrants, SignTransactionError as EvmSignError,
        },
        flow_coordinator::client_connect_approval::ClientApprovalAnswer,
        vault::VaultState,
    },
    db::models::{
        EvmWalletAccess, EvmWalletId, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata,
    },
    actors::flow_coordinator::client_connect_approval::ClientApprovalAnswer,
    actors::vault::VaultState,
    db::models::{EvmWalletAccess, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata},
    evm::policies::{Grant, SpecificGrant},
 };
 use arbiter_crypto::authn;
@@ -70,7 +74,9 @@ impl OperatorSession {
    }
    #[message]
-    pub(crate) async fn handle_evm_wallet_list(&mut self) -> Result<Vec<(i32, Address)>, Error> {
+    pub(crate) async fn handle_evm_wallet_list(
        &mut self,
    ) -> Result<Vec<(EvmWalletId, Address)>, Error> {
        match self.props.actors.evm.ask(ListWallets {}).await {
            Ok(wallets) => Ok(wallets),
            Err(err) => {
@@ -116,22 +122,23 @@ impl OperatorSession {
    }
    #[message]
-    pub(crate) fn handle_grant_delete(&mut self, grant_id: i32) -> Result<(), GrantMutationError> {
+    pub(crate) async fn handle_grant_delete(
-        // match self
+        &mut self,
-        //     .props
+        grant_id: i32,
-        //     .actors
+    ) -> Result<(), GrantMutationError> {
-        //     .evm
+        match self
-        //     .ask(OperatorDeleteGrant { grant_id })
+            .props
-        //     .await
+            .actors
-        // {
+            .evm
-        //     Ok(()) => Ok(()),
+            .ask(OperatorDeleteGrant { grant_id })
-        //     Err(err) => {
+            .await
-        //         error!(?err, "EVM grant delete failed");
+        {
-        //         Err(GrantMutationError::Internal)
+            Ok(()) => Ok(()),
-        //     }
+            Err(err) => {
-        // }
+                error!(?err, "EVM grant delete failed");
-        let _ = grant_id;
+                Err(GrantMutationError::Internal)
-        todo!()
+            }
        }
    }
    #[message]
@@ -211,8 +218,8 @@ impl OperatorSession {
    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 mut conn = self.props.db.get().await?;
        let access_entries = evm_wallet_access::table
            .select(EvmWalletAccess::as_select())
            .load::<_>(&mut conn)
--- a/server/crates/arbiter-server/src/peers/operator/session/mod.rs
+++ b/server/crates/arbiter-server/src/peers/operator/session/mod.rs
@@ -63,7 +63,7 @@ impl OperatorSession {
        Self {
            props,
            sender,
-            pending_client_approvals: Default::default(),
+            pending_client_approvals: HashMap::default(),
        }
    }
 }
--- a/server/crates/arbiter-server/src/peers/operator/vault_gate/mod.rs
+++ b/server/crates/arbiter-server/src/peers/operator/vault_gate/mod.rs
@@ -3,6 +3,7 @@ use crate::{
    actors::{
        GlobalActors,
        vault::{self, Bootstrap, GetState, TryUnseal, VaultState, events},
        vault_coordinator::{ContributeBootstrap, ContributeUnseal, StartBootstrap},
    },
    crypto::integrity::{self},
    db::DatabasePool,
@@ -17,6 +18,9 @@ use tokio::sync::oneshot;
 use tracing::{error, info};
 use x25519_dalek::{EphemeralSecret, PublicKey, SharedSecret};
 pub use VaultGateMessage as Inbound;
 pub use VaultGateMessageReply as Outbound;
 pub mod state;
 #[derive(Debug, thiserror::Error)]
@@ -118,8 +122,7 @@ impl VaultGate {
        }
    }
 }
-
+#[messages(enum)]
 #[messages(messages = Inbound, replies = Outbound)]
 impl VaultGate {
    #[message]
    pub fn handle_handshake(
@@ -234,6 +237,52 @@ impl VaultGate {
        Ok(answer)
    }
    #[message]
    pub async fn handle_declare_committee(&mut self, count: usize) -> Result<(), Error> {
        self.actors
            .vault_coordinator
            .ask(StartBootstrap {
                operator_id: self.auth_creds.id,
                declared_count: count,
            })
            .await
            .map_err(|_| Error::internal("VaultCoordinator unavailable"))
    }
    #[message]
    pub async fn handle_contribute_bootstrap_passphrase(
        &mut self,
        passphrase: Vec<u8>,
    ) -> Result<bool, Error> {
        use arbiter_crypto::safecell::SafeCell;
        let passphrase_cell = SafeCell::new(passphrase);
        self.actors
            .vault_coordinator
            .ask(ContributeBootstrap {
                operator_id: self.auth_creds.id,
                passphrase: passphrase_cell,
            })
            .await
            .map_err(|_| Error::internal("VaultCoordinator unavailable"))
    }
    #[message]
    pub async fn handle_contribute_unseal_passphrase(
        &mut self,
        passphrase: Vec<u8>,
    ) -> Result<bool, Error> {
        use arbiter_crypto::safecell::SafeCell;
        let passphrase_cell = SafeCell::new(passphrase);
        self.actors
            .vault_coordinator
            .ask(ContributeUnseal {
                operator_id: self.auth_creds.id,
                passphrase: passphrase_cell,
            })
            .await
            .map_err(|_| Error::internal("VaultCoordinator unavailable"))
    }
 }
 impl Message<events::Bootstrapped> for VaultGate {
--- a/server/crates/arbiter-server/tests/client/auth.rs
+++ b/server/crates/arbiter-server/tests/client/auth.rs
@@ -86,8 +86,8 @@ async fn insert_bootstrap_sentinel_operator(db: &db::DatabasePool) {
        .0
        .to_vec();
-    insert_into(schema::operator_client::table)
+    insert_into(schema::operator_identity::table)
-        .values((schema::operator_client::public_key.eq(sentinel_key),))
+        .values((schema::operator_identity::public_key.eq(sentinel_key),))
        .execute(&mut conn)
        .await
        .unwrap();
--- a/server/crates/arbiter-server/tests/operator/auth.rs
+++ b/server/crates/arbiter-server/tests/operator/auth.rs
@@ -206,8 +206,8 @@ pub async fn bootstrap_token_auth() {
    task.await.unwrap().unwrap();
    let mut conn = db.get().await.unwrap();
-    let stored_pubkey: Vec<u8> = schema::operator_client::table
+    let stored_pubkey: Vec<u8> = schema::operator_identity::table
-        .select(schema::operator_client::public_key)
+        .select(schema::operator_identity::public_key)
        .first::<Vec<u8>>(&mut conn)
        .await
        .unwrap();
@@ -259,7 +259,7 @@ pub async fn bootstrap_invalid_token_auth() {
    ));
    let mut conn = db.get().await.unwrap();
-    let count: i64 = schema::operator_client::table
+    let count: i64 = schema::operator_identity::table
        .count()
        .get_result::<i64>(&mut conn)
        .await
@@ -285,9 +285,9 @@ pub async fn challenge_auth() {
    {
        let mut conn = db.get().await.unwrap();
-        let id: i32 = insert_into(schema::operator_client::table)
+        let id: i32 = insert_into(schema::operator_identity::table)
-            .values((schema::operator_client::public_key.eq(pubkey_bytes.clone()),))
+            .values((schema::operator_identity::public_key.eq(pubkey_bytes.clone()),))
-            .returning(schema::operator_client::id)
+            .returning(schema::operator_identity::id)
            .get_result(&mut conn)
            .await
            .unwrap();
@@ -371,8 +371,8 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch_when_unsealed() {
    {
        let mut conn = db.get().await.unwrap();
-        insert_into(schema::operator_client::table)
+        insert_into(schema::operator_identity::table)
-            .values((schema::operator_client::public_key.eq(pubkey_bytes.clone()),))
+            .values((schema::operator_identity::public_key.eq(pubkey_bytes.clone()),))
            .execute(&mut conn)
            .await
            .unwrap();
@@ -444,9 +444,9 @@ pub async fn challenge_auth_rejects_invalid_signature() {
    {
        let mut conn = db.get().await.unwrap();
-        let id: i32 = insert_into(schema::operator_client::table)
+        let id: i32 = insert_into(schema::operator_identity::table)
-            .values((schema::operator_client::public_key.eq(pubkey_bytes.clone()),))
+            .values((schema::operator_identity::public_key.eq(pubkey_bytes.clone()),))
-            .returning(schema::operator_client::id)
+            .returning(schema::operator_identity::id)
            .get_result(&mut conn)
            .await
            .unwrap();
Author	SHA1	Message	Date
CleverWild	0d364d1951	feat(server::grpc): wire Shamir committee bootstrap and unseal proto messages Some checks failed ci/woodpecker/pr/server-audit Pipeline was successful Details ci/woodpecker/pr/server-vet Pipeline failed Details ci/woodpecker/pr/server-lint Pipeline failed Details ci/woodpecker/pr/server-test Pipeline failed Details Adds DeclareCommittee and ContributePassphrase variants to bootstrap.proto, ContributePassphrase to unseal.proto, and AwaitingContributions result codes to both. Implements corresponding inbound converters and outbound reply mappings. VaultGate handlers delegate to VaultCoordinator.	2026-06-12 19:43:17 +02:00
CleverWild	6f65c907a3	feat(server): introduce VaultCoordinator for multi-operator Shamir bootstrap/unseal VaultCoordinator collects operator passphrases, splits the seal key into Shamir shares on bootstrap (encrypting each share with the operator's passphrase via Argon2 + XChaCha20-Poly1305), and reconstructs the seal key from threshold shares on unseal. Adds vsss-rs 5.4.0 and rand_core 0.6 dependencies.	2026-06-12 19:43:09 +02:00
CleverWild	9764b0d5ce	refactor(server::actors::vault): clean up Bootstrap/TryUnseal, remove Bootstrapping state Bootstrap and TryUnseal now accept a SafeCell<Vec<u8>> seal key directly. The Bootstrapping intermediate state is removed — multi-operator coordination is the responsibility of VaultCoordinator, which calls Bootstrap atomically once all shares are collected.	2026-06-12 19:43:02 +02:00
CleverWild	50fe18d6ce	feat(server::crypto): add Shamir secret sharing utilities Wraps vsss_rs Gf256::split_array / combine_array into thin split_key / combine_shares helpers. Also widens derive_key salt parameter from &[u8;16] to &[u8] to accommodate the 32-byte share salts.	2026-06-12 19:42:56 +02:00
CleverWild	3e5f0cb3df	feat(server::db): add share_salt column to operator table Each operator row now stores a 32-byte random salt used to derive the per-operator share encryption key from their passphrase (Argon2 KDF).	2026-06-12 19:42:49 +02:00
CleverWild	34850137df	feat(server::actors::evm): implement operator_delete_grant Sets revoked_at on the evm_basic_grant row; returns NotFound if the grant does not exist. Wires the handler in OperatorSession replacing the todo!().	2026-06-12 19:42:43 +02:00
CleverWild	d1b96c8409	fix(server::peers::operator::auth): make ChallengeContext pub for smlang state machine smlang generates a public state enum whose variants contain ChallengeContext, requiring the type itself to be fully public. Also tightens the wildcard arm in client auth to an exhaustive match.	2026-06-12 19:42:37 +02:00
Skipper	9dbb18ae82	WIP: some things Some checks failed ci/woodpecker/pr/server-audit Pipeline was successful Details ci/woodpecker/pr/server-vet Pipeline failed Details ci/woodpecker/pr/server-lint Pipeline failed Details ci/woodpecker/pr/server-test Pipeline failed Details	2026-05-20 21:04:16 +02:00
Skipper	a773255935	refactor(server::db): introduced newtype wrappers for entity id's in database	2026-05-04 19:35:27 +02:00