refactor(server::db): introduced newtype wrappers for entity id's in database

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]

server/Cargo.toml

@@ -6,7 +6,7 @@ resolver = "3"
 
 
 [workspace.dependencies]
-alloy = "2.0.4"
+alloy = "2.0.0"
 async-trait = "0.1.89"
 base64 = "0.22.1"
 chrono = { version = "0.4.44", features = ["serde"] }
@@ -16,15 +16,15 @@ kameo = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"}
 kameo_actors = {git = "https://github.com/hdbg/kameo.git", rev = "805b417"}
 hmac = "0.13.0"
 miette = { version = "7.6.0", features = ["fancy", "serde"] }
-ml-dsa = { version = "0.1.0-rc.9", features = ["zeroize"] }
+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.1"
 rcgen = { version = "0.14.7", features = [ "aws_lc_rs",  "pem", "x509-parser", "zeroize" ], default-features = false }
 rstest = "0.26.1"
-rustls = { version = "0.23.40", features = ["aws-lc-rs", "logging", "prefer-post-quantum", "std"], default-features = false }
+rustls = { version = "0.23.38", features = ["aws-lc-rs", "logging", "prefer-post-quantum", "std"], default-features = false }
-rustls-pki-types = "1.14.1"
+rustls-pki-types = "1.14.0"
 sha2 = "0.11"
 smlang = "0.8.0"
 thiserror = "2.0.18"
@@ -76,7 +76,6 @@ 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 {})
-too-many-lines = "allow" # this is a very common pattern in server code, and it's not always possible to break it down into smaller modules without hurting readability
 
 # restriction lints
 alloc_instead_of_core = "warn"
@@ -129,6 +128,7 @@ 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"

server/crates/arbiter-client/Cargo.toml

@@ -21,7 +21,7 @@ tokio.workspace = true
 tokio-stream.workspace = true
 thiserror.workspace = true
 http = "1.4.0"
-rustls-webpki = { version = "0.103.13", features = ["aws-lc-rs"] }
+rustls-webpki = { version = "0.103.12", features = ["aws-lc-rs"] }
 async-trait.workspace = true
 chrono.workspace = true
 

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

@@ -100,7 +100,7 @@ async fn send_auth_challenge_solution(
     key: &SigningKey,
     challenge: AuthChallenge,
 ) -> Result<(), AuthError> {
-    let timestamp = DateTime::from_timestamp_nanos(challenge.timestamp_nanos.cast_signed());
+    let timestamp = DateTime::from_timestamp_nanos(challenge.timestamp_nanos as i64);
     let challenge = authn::AuthChallenge {
         nonce: *challenge
             .random

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

@@ -1,49 +0,0 @@
-use crate::hashing::Hashable;
-
-/// Marks a struct as a participant in the database integrity system.
-///
-/// Implementors are protected by an HMAC-SHA256 MAC stored in the
-/// `integrity_envelope` table. The MAC is computed over:
-///
-/// ```text
-/// HMAC-SHA256(key, len(KIND) || KIND || len(entity_id) || entity_id || VERSION || SHA256(Hashable))
-/// ```
-///
-/// Both `KIND` and `VERSION` act as domain separators — they prevent a valid
-/// MAC for one entity type or schema version from being accepted for another.
-///
-/// # Deriving
-///
-/// Use `#[derive(Integrable)]` with the `#[integrable(kind = "...")]` attribute.
-/// `VERSION` is computed automatically as an FNV-1a hash of the struct's field
-/// names and types, so it changes whenever the schema changes without any manual
-/// bookkeeping.
-///
-/// ```rust,ignore
-/// #[derive(Hashable, Integrable)]
-/// #[integrable(kind = "operator_credentials")]
-/// pub struct OperatorCredentials {
-///     pub pubkey: PublicKey,
-/// }
-/// ```
-///
-/// # Upgrading schema
-///
-/// When fields are added, removed, or reordered, `VERSION` changes automatically.
-/// Existing MAC records in the database will return [`PayloadVersionMismatch`] on
-/// verification — this is the signal to re-sign all rows for this `KIND` as part
-/// of a migration.
-///
-/// [`PayloadVersionMismatch`]: crate::integrity::Integrable
-pub trait Integrable: Hashable {
-    /// Stable name of this entity type as stored in `integrity_envelope.entity_kind`.
-    ///
-    /// Must be a valid schema name: starts with a letter, contains only `[a-zA-Z0-9_]`,
-    /// and must be globally unique across all `Integrable` types in the system.
-    const KIND: &'static str;
-
-    /// FNV-1a hash of the struct's field names and types at the time the derive
-    /// macro ran. Changes automatically when the schema changes, invalidating
-    /// existing MACs and signalling that a migration is required.
-    const VERSION: i32;
-}

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

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

server/crates/arbiter-macros/Cargo.toml

@@ -14,7 +14,6 @@ syn = { version = "2.0", features = ["derive", "fold", "full", "visit-mut"] }
 
 [dev-dependencies]
 arbiter-crypto = { path = "../arbiter-crypto" }
-trybuild = { version = "1.0", features = ["diff"] }
 
 [lints]
 workspace = true

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

@@ -53,16 +53,32 @@ struct FieldAccess {
 
 fn collect_field_accesses(struct_data: &DataStruct) -> Vec<FieldAccess> {
     match &struct_data.fields {
-        Fields::Named(fields) => crate::utils::sorted_named_fields(fields)
+        Fields::Named(fields) => {
-            .into_iter()
+            // Keep deterministic alphabetical order for named fields.
-            .map(|field| {
+            // Do not remove this sort, because it keeps hash output stable regardless of source order.
-                let name = field.ident.as_ref().unwrap();
+            let mut named_fields = fields
-                FieldAccess {
+                .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()
-            .collect(),
+        }
         Fields::Unnamed(fields) => fields
             .unnamed
             .iter()

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

@@ -1,134 +0,0 @@
-use crate::utils::INTEGRABLE_TRAIT_PATH;
-use proc_macro2::TokenStream;
-use quote::quote;
-use syn::{DeriveInput, LitStr, spanned::Spanned as _};
-
-struct IntegrableAttr {
-    kind: String,
-}
-
-impl IntegrableAttr {
-    fn from_attrs(
-        attrs: &[syn::Attribute],
-        ident_span: proc_macro2::Span,
-    ) -> Result<Self, syn::Error> {
-        let mut kind: Option<String> = None;
-        let mut found = false;
-
-        for attr in attrs {
-            if !attr.path().is_ident("integrable") {
-                continue;
-            }
-            if found {
-                return Err(syn::Error::new(attr.span(), "duplicate #[integrable] attribute"));
-            }
-            found = true;
-            attr.parse_nested_meta(|meta| {
-                if meta.path.is_ident("kind") {
-                    let lit: LitStr = meta.value()?.parse()?;
-                    let v = lit.value();
-                    if v.is_empty() {
-                        return Err(syn::Error::new(lit.span(), "kind must not be empty"));
-                    }
-                    if !is_valid_kind(&v) {
-                        return Err(syn::Error::new(
-                            lit.span(),
-                            "kind must be a valid schema name: start with a letter, contain only [a-zA-Z0-9_]",
-                        ));
-                    }
-                    kind = Some(v);
-                } else {
-                    return Err(meta.error("unknown key; expected `kind`"));
-                }
-                Ok(())
-            })?;
-        }
-
-        let kind = kind.ok_or_else(|| {
-            syn::Error::new(ident_span, "#[integrable(kind = \"...\")] is required")
-        })?;
-
-        Ok(Self { kind })
-    }
-}
-
-fn is_valid_kind(s: &str) -> bool {
-    let mut chars = s.chars();
-    matches!(chars.next(), Some(c) if c.is_ascii_alphabetic())
-        && chars.all(|c| c.is_ascii_alphanumeric() || c == '_')
-}
-
-fn fnv1a(data: &[u8], mut hash: u32) -> u32 {
-    const FNV_PRIME: u32 = 16_777_619;
-    for &b in data {
-        hash ^= u32::from(b);
-        hash = hash.wrapping_mul(FNV_PRIME);
-    }
-    hash
-}
-
-// Hashes field names and types using the same alphabetical sort order as Hashable,
-// so that source-level field reordering never changes VERSION.
-fn compute_version(fields: &syn::Fields) -> i32 {
-    const FNV_OFFSET: u32 = 2_166_136_261;
-    let mut hash = FNV_OFFSET;
-
-    match fields {
-        syn::Fields::Named(named) => {
-            for field in crate::utils::sorted_named_fields(named) {
-                let name = field.ident.as_ref().unwrap().to_string();
-                let ty = &field.ty;
-                hash = fnv1a(name.as_bytes(), hash);
-                hash = fnv1a(quote!(#ty).to_string().as_bytes(), hash);
-            }
-        }
-        syn::Fields::Unnamed(unnamed) => {
-            for (i, field) in unnamed.unnamed.iter().enumerate() {
-                let ty = &field.ty;
-                hash = fnv1a(i.to_string().as_bytes(), hash);
-                hash = fnv1a(quote!(#ty).to_string().as_bytes(), hash);
-            }
-        }
-        syn::Fields::Unit => {}
-    }
-
-    // Clear sign bit to guarantee a positive i32; substitute 0 → 1.
-    let v = (hash >> 1).cast_signed();
-    if v == 0 { 1 } else { v }
-}
-
-pub(crate) fn derive(input: &DeriveInput) -> TokenStream {
-    let syn::Data::Struct(ref data) = input.data else {
-        return syn::Error::new(
-            input.ident.span(),
-            "#[derive(Integrable)] is only supported on structs",
-        )
-        .to_compile_error();
-    };
-
-    let integrable_trait = INTEGRABLE_TRAIT_PATH.to_path();
-    let hashable_trait = crate::utils::HASHABLE_TRAIT_PATH.to_path();
-    let ident = &input.ident;
-
-    let mut generics = input.generics.clone();
-    for type_param in generics.type_params_mut() {
-        type_param.bounds.push(syn::parse_quote!(#hashable_trait));
-    }
-    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
-
-    let attr = match IntegrableAttr::from_attrs(&input.attrs, input.ident.span()) {
-        Ok(a) => a,
-        Err(e) => return e.to_compile_error(),
-    };
-
-    let kind = attr.kind;
-    let version = compute_version(&data.fields);
-
-    quote! {
-        #[automatically_derived]
-        impl #impl_generics #integrable_trait for #ident #ty_generics #where_clause {
-            const KIND: &'static str = #kind;
-            const VERSION: i32 = #version;
-        }
-    }
-}

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

@@ -1,7 +1,6 @@
 use syn::{DeriveInput, parse_macro_input};
 
 mod hashable;
-mod integrable;
 mod utils;
 
 #[proc_macro_derive(Hashable)]
@@ -9,9 +8,3 @@ pub fn derive_hashable(input: proc_macro::TokenStream) -> proc_macro::TokenStrea
     let input = parse_macro_input!(input as DeriveInput);
     hashable::derive(&input).into()
 }
-
-#[proc_macro_derive(Integrable, attributes(integrable))]
-pub fn derive_integrable(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-    integrable::derive(&input).into()
-}

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

@@ -22,14 +22,3 @@ macro_rules! ensure_path {
 
 ensure_path!(::arbiter_crypto::hashing::Hashable as HASHABLE_TRAIT_PATH);
 ensure_path!(::arbiter_crypto::hashing::Digest as HMAC_DIGEST_PATH);
-ensure_path!(::arbiter_crypto::integrity::Integrable as INTEGRABLE_TRAIT_PATH);
-
-/// Returns named struct fields sorted alphabetically by name.
-/// Both `Hashable` and `Integrable` derive macros must iterate fields in the
-/// same deterministic order so that source-level reordering never changes
-/// either the runtime hash or the compile-time VERSION.
-pub(crate) fn sorted_named_fields(fields: &syn::FieldsNamed) -> Vec<&syn::Field> {
-    let mut v: Vec<&syn::Field> = fields.named.iter().collect();
-    v.sort_by_key(|f| f.ident.as_ref().unwrap().to_string());
-    v
-}

server/crates/arbiter-macros/tests/integrable.rs

@@ -1,53 +0,0 @@
-use arbiter_crypto::integrity::Integrable;
-
-#[derive(arbiter_macros::Hashable, arbiter_macros::Integrable)]
-#[integrable(kind = "test_entity")]
-struct TestEntity {
-    value: i32,
-}
-
-#[derive(arbiter_macros::Hashable, arbiter_macros::Integrable)]
-#[integrable(kind = "other_entity")]
-struct OtherEntity {
-    label: String,
-    count: u64,
-}
-
-#[test]
-fn kind_is_set_correctly() {
-    assert_eq!(<TestEntity as Integrable>::KIND, "test_entity");
-    assert_eq!(<OtherEntity as Integrable>::KIND, "other_entity");
-}
-
-#[test]
-fn version_is_positive() {
-    const {
-        assert!(<TestEntity as Integrable>::VERSION > 0);
-        assert!(<OtherEntity as Integrable>::VERSION > 0);
-    }
-}
-
-#[test]
-fn different_field_layouts_produce_different_versions() {
-    assert_ne!(
-        <TestEntity as Integrable>::VERSION,
-        <OtherEntity as Integrable>::VERSION,
-    );
-}
-
-#[derive(arbiter_macros::Hashable, arbiter_macros::Integrable)]
-#[integrable(kind = "generic_entity")]
-struct GenericEntity<T> {
-    inner: T,
-}
-
-#[test]
-fn generic_struct_derives_integrable() {
-    assert_eq!(
-        <GenericEntity<TestEntity> as Integrable>::KIND,
-        "generic_entity"
-    );
-    const {
-        assert!(<GenericEntity<TestEntity> as Integrable>::VERSION > 0);
-    }
-}

server/crates/arbiter-macros/tests/integrable_errors.rs

@@ -1,5 +0,0 @@
-#[test]
-fn integrable_compile_fail() {
-    let t = trybuild::TestCases::new();
-    t.compile_fail("tests/ui/integrable/*.rs");
-}

server/crates/arbiter-macros/tests/ui/integrable/duplicate_attr.rs

@@ -1,8 +0,0 @@
-#[derive(arbiter_macros::Hashable, arbiter_macros::Integrable)]
-#[integrable(kind = "entity_a")]
-#[integrable(kind = "entity_b")]
-struct DuplicateAttr {
-    value: i32,
-}
-
-fn main() {}

server/crates/arbiter-macros/tests/ui/integrable/duplicate_attr.stderr

@@ -1,5 +0,0 @@
-error: duplicate #[integrable] attribute
- --> tests/ui/integrable/duplicate_attr.rs:3:1
-  |
-3 | #[integrable(kind = "entity_b")]
-  | ^

server/crates/arbiter-macros/tests/ui/integrable/empty_kind.rs

@@ -1,7 +0,0 @@
-#[derive(arbiter_macros::Hashable, arbiter_macros::Integrable)]
-#[integrable(kind = "")]
-struct EmptyKind {
-    value: i32,
-}
-
-fn main() {}

server/crates/arbiter-macros/tests/ui/integrable/empty_kind.stderr

@@ -1,5 +0,0 @@
-error: kind must not be empty
- --> tests/ui/integrable/empty_kind.rs:2:21
-  |
-2 | #[integrable(kind = "")]
-  |                     ^^

server/crates/arbiter-macros/tests/ui/integrable/enum_not_supported.rs

@@ -1,8 +0,0 @@
-#[derive(arbiter_macros::Integrable)]
-#[integrable(kind = "my_enum")]
-enum MyEnum {
-    A,
-    B,
-}
-
-fn main() {}

server/crates/arbiter-macros/tests/ui/integrable/enum_not_supported.stderr

@@ -1,5 +0,0 @@
-error: #[derive(Integrable)] is only supported on structs
- --> tests/ui/integrable/enum_not_supported.rs:3:6
-  |
-3 | enum MyEnum {
-  |      ^^^^^^

server/crates/arbiter-macros/tests/ui/integrable/invalid_kind.rs

@@ -1,7 +0,0 @@
-#[derive(arbiter_macros::Hashable, arbiter_macros::Integrable)]
-#[integrable(kind = "bad kind!")]
-struct InvalidKind {
-    value: i32,
-}
-
-fn main() {}

server/crates/arbiter-macros/tests/ui/integrable/invalid_kind.stderr

@@ -1,5 +0,0 @@
-error: kind must be a valid schema name: start with a letter, contain only [a-zA-Z0-9_]
- --> tests/ui/integrable/invalid_kind.rs:2:21
-  |
-2 | #[integrable(kind = "bad kind!")]
-  |                     ^^^^^^^^^^^

server/crates/arbiter-macros/tests/ui/integrable/missing_attr.rs

@@ -1,6 +0,0 @@
-#[derive(arbiter_macros::Hashable, arbiter_macros::Integrable)]
-struct MissingAttr {
-    value: i32,
-}
-
-fn main() {}

server/crates/arbiter-macros/tests/ui/integrable/missing_attr.stderr

@@ -1,5 +0,0 @@
-error: #[integrable(kind = "...")] is required
- --> tests/ui/integrable/missing_attr.rs:2:8
-  |
-2 | struct MissingAttr {
-  |        ^^^^^^^^^^^

server/crates/arbiter-server/Cargo.toml

@@ -9,8 +9,8 @@ license = "Apache-2.0"
 workspace = true
 
 [dependencies]
-diesel = { version = "2.3.9", features = ["chrono", "returning_clauses_for_sqlite_3_35", "serde_json", "time", "uuid"] }
+diesel = { version = "2.3.7", features = ["chrono", "returning_clauses_for_sqlite_3_35", "serde_json", "time", "uuid"] }
-diesel-async = { version = "0.9.0", features = [
+diesel-async = { version = "0.8.0", features = [
     "bb8",
     "migrations",
     "sqlite",
@@ -27,7 +27,7 @@ tokio.workspace = true
 rustls.workspace = true
 smlang.workspace = true
 thiserror.workspace = true
-diesel_migrations = { version = "2.3.2", features = ["sqlite"] }
+diesel_migrations = { version = "2.3.1", features = ["sqlite"] }
 async-trait.workspace = true
 tokio-stream.workspace = true
 rand.workspace = true
@@ -50,6 +50,7 @@ subtle = "2.6.1"
 x25519-dalek.workspace = true
 k256.workspace = true
 kameo_actors.workspace = true
+blahaj = "0.6.0"
 
 [dev-dependencies]
 proptest = "1.11.0"

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

@@ -43,13 +43,24 @@ 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_client_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,
+
+    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,

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_identity::table
                 .count()
                 .get_result(&mut conn)
                 .await?

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,14 +160,29 @@ impl EvmActor {
     }
 
     #[message]
-    pub async fn useragent_delete_grant(
+    #[expect(clippy::unused_async, reason = "reserved for impl")]
-        &mut self,
+    pub async fn operator_delete_grant(&mut self, _grant_id: i32) -> Result<(), Error> {
-        grant_id: i32,
+        // let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
-    ) -> Result<(), Error> {
+        // let vault = self.vault.clone();
-        self.engine
+
-            .revoke_grant(grant_id)
+        // diesel_async::AsyncConnection::transaction(&mut conn, |conn| {
-            .await
+        //     Box::pin(async move {
-            .map_err(Error::from)
+        //         diesel::update(schema::evm_basic_grant::table)
+        //             .filter(schema::evm_basic_grant::id.eq(grant_id))
+        //             .set(schema::evm_basic_grant::revoked_at.eq(SqliteTimestamp::now()))
+        //             .execute(conn)
+        //             .await?;
+
+        //         let signed = integrity::evm::load_signed_grant_by_basic_id(conn, grant_id).await?;
+
+        //         diesel::result::QueryResult::Ok(())
+        //     })
+        // })
+        // .await
+        // .map_err(DatabaseError::from)?;
+
+        // Ok(())
+        todo!()
     }
 
     #[message]

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

@@ -11,9 +11,7 @@ use kameo::{
     prelude::{ActorId, ActorRef, ActorStopReason, Context, WeakActorRef},
     reply::ReplySender,
 };
-use std::{ops::ControlFlow, time::Duration};
+use std::ops::ControlFlow;
-
-const APPROVAL_TIMEOUT: Duration = Duration::from_secs(30);
 
 pub struct Args {
     pub client: ClientProfile,
@@ -66,14 +64,6 @@ impl Actor for ClientApprovalController {
                 .await;
         }
 
-        let weak = actor_ref.downgrade();
-        tokio::spawn(async move {
-            tokio::time::sleep(APPROVAL_TIMEOUT).await;
-            if let Some(r) = weak.upgrade() {
-                let _ = r.tell(OnApprovalTimeout {}).await;
-            }
-        });
-
         Ok(this)
     }
 
@@ -114,14 +104,4 @@ impl ClientApprovalController {
             ctx.stop();
         }
     }
-
-    /// Fired after `APPROVAL_TIMEOUT` elapses. Any operator that hasn't responded
-    /// by then is treated as a denial to prevent zombie sessions from blocking the flow.
-    #[message(ctx)]
-    pub fn on_approval_timeout(&mut self, ctx: &mut Context<Self, ()>) {
-        if self.pending > 0 {
-            self.send_reply(Ok(false));
-            ctx.stop();
-        }
-    }
 }

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

@@ -6,7 +6,7 @@ use crate::{
     },
     db::{
         self,
-        models::{self, RootKeyHistory},
+        models::{self, RootKeyHistory, RootKeyHistoryId},
         schema::{self},
     },
 };
@@ -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),
 }
@@ -115,33 +115,38 @@ impl Vault {
 
     // Exclusive transaction to avoid race condtions if multiple vaults write
     // additional layer of protection against nonce-reuse
-    async fn get_new_nonce(pool: &db::DatabasePool, root_key_id: i32) -> Result<Nonce, Error> {
+    async fn get_new_nonce(
+        pool: &db::DatabasePool,
+        root_key_id: RootKeyHistoryId,
+    ) -> Result<Nonce, Error> {
         let mut conn = pool.get().await?;
 
         let nonce = conn
-            .exclusive_transaction(async |conn| {
+            .exclusive_transaction(|conn| {
-                let current_nonce: Vec<u8> = schema::root_key_history::table
+                Box::pin(async move {
-                    .filter(schema::root_key_history::id.eq(root_key_id))
+                    let current_nonce: Vec<u8> = schema::root_key_history::table
-                    .select(schema::root_key_history::data_encryption_nonce)
+                        .filter(schema::root_key_history::id.eq(root_key_id))
-                    .first(&mut *conn)
+                        .select(schema::root_key_history::data_encryption_nonce)
-                    .await?;
+                        .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!(
+                        error!(
-                        "Broken database: invalid nonce for root key history id={}",
+                            "Broken database: invalid nonce for root key history id={:#?}",
-                        root_key_id
+                            root_key_id
-                    );
+                        );
-                    Error::BrokenDatabase
+                        Error::BrokenDatabase
-                })?;
+                    })?;
-                nonce.increment();
+                    nonce.increment();
 
-                update(schema::root_key_history::table)
+                    update(schema::root_key_history::table)
-                    .filter(schema::root_key_history::id.eq(root_key_id))
+                        .filter(schema::root_key_history::id.eq(root_key_id))
-                    .set(schema::root_key_history::data_encryption_nonce.eq(nonce.to_vec()))
+                        .set(schema::root_key_history::data_encryption_nonce.eq(nonce.to_vec()))
-                    .execute(&mut *conn)
+                        .execute(conn)
-                    .await?;
+                        .await?;
 
-                Result::<_, Error>::Ok(nonce)
+                    Result::<_, Error>::Ok(nonce)
+                })
             })
             .await?;
 
@@ -183,26 +188,29 @@ impl Vault {
 
         let data_encryption_nonce_bytes = data_encryption_nonce.to_vec();
         let root_key_history_id = conn
-            .transaction(async |conn| {
+            .transaction(|conn| {
-                let root_key_history_id: i32 = insert_into(schema::root_key_history::table)
+                Box::pin(async move {
-                    .values(&models::NewRootKeyHistory {
+                    let root_key_history_id: RootKeyHistoryId =
-                        ciphertext: root_key_ciphertext.clone(),
+                        insert_into(schema::root_key_history::table)
-                        tag: v1::ROOT_KEY_TAG.to_vec(),
+                            .values(&models::NewRootKeyHistory {
-                        root_key_encryption_nonce: root_key_nonce.to_vec(),
+                                ciphertext: root_key_ciphertext,
-                        data_encryption_nonce: data_encryption_nonce_bytes.clone(),
+                                tag: v1::ROOT_KEY_TAG.to_vec(),
-                        schema_version: 1,
+                                root_key_encryption_nonce: root_key_nonce.to_vec(),
-                        salt: salt.to_vec(),
+                                data_encryption_nonce: data_encryption_nonce_bytes,
-                    })
+                                schema_version: 1,
-                    .returning(schema::root_key_history::id)
+                                salt: salt.to_vec(),
-                    .get_result(&mut *conn)
+                            })
-                    .await?;
+                            .returning(schema::root_key_history::id)
+                            .get_result(conn)
+                            .await?;
 
-                update(schema::arbiter_settings::table)
+                    update(schema::arbiter_settings::table)
-                    .set(schema::arbiter_settings::root_key_id.eq(root_key_history_id))
+                        .set(schema::arbiter_settings::root_key_id.eq(root_key_history_id))
-                    .execute(&mut *conn)
+                        .execute(conn)
-                    .await?;
+                        .await?;
 
-                Result::<_, diesel::result::Error>::Ok(root_key_history_id)
+                    Result::<_, diesel::result::Error>::Ok(root_key_history_id)
+                })
             })
             .await?;
 
@@ -340,17 +348,22 @@ 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.0.read_inline(|k| {
+        let mut hmac = root_key
-            HmacSha256::new_from_slice(k)
+            .0
-                .unwrap_or_else(|_| unreachable!("HMAC accepts keys of any size"))
+            .read_inline(|k| match HmacSha256::new_from_slice(k) {
-        });
+                Ok(v) => v,
-        hmac.update(&root_key_history_id.to_be_bytes());
+                Err(_) => unreachable!("HMAC accepts keys of any size"),
+            });
+        hmac.update(&root_key_history_id.to_raw().to_be_bytes());
         hmac.update(&mac_input);
 
         let mac = hmac.finalize().into_bytes().to_vec();
@@ -362,7 +375,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,
@@ -373,11 +386,13 @@ impl Vault {
             return Ok(false);
         }
 
-        let mut hmac = root_key.0.read_inline(|k| {
+        let mut hmac = root_key
-            HmacSha256::new_from_slice(k)
+            .0
-                .unwrap_or_else(|_| unreachable!("HMAC accepts keys of any size"))
+            .read_inline(|k| match HmacSha256::new_from_slice(k) {
-        });
+                Ok(v) => v,
-        hmac.update(&key_version.to_be_bytes());
+                Err(_) => unreachable!("HMAC accepts keys of any size"),
+            });
+        hmac.update(&key_version.to_raw().to_be_bytes());
         hmac.update(&mac_input);
 
         Ok(hmac.verify_slice(&expected_mac).is_ok())
@@ -400,7 +415,7 @@ impl Vault {
 
 #[cfg(test)]
 mod tests {
-    use crate::actors::GlobalActors;
+    use crate::{actors::GlobalActors, db::models::RootKeyHistory};
     use arbiter_crypto::safecell::SafeCellHandle as _;
 
     use super::*;
@@ -419,13 +434,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
+            }) => root_key_history_id,
-        else {
+            _ => panic!("expected unsealed state"),
-            panic!("expected unsealed state")
         };
 
         let n1 = Vault::get_new_nonce(&db, root_key_history_id)

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

@@ -174,26 +174,28 @@ impl TlsManager {
 
         {
             let mut conn = db.get().await?;
-            conn.transaction(async |conn| {
+            conn.transaction(|conn| {
-                let new_tls_history = NewTlsHistory {
+                Box::pin(async {
-                    cert: new_cert.cert.pem(),
+                    let new_tls_history = NewTlsHistory {
-                    cert_key: new_cert.cert_key.serialize_pem(),
+                        cert: new_cert.cert.pem(),
-                    ca_cert: encode_cert_to_pem(&ca.cert),
+                        cert_key: new_cert.cert_key.serialize_pem(),
-                    ca_key: ca.issuer.key().serialize_pem(),
+                        ca_cert: encode_cert_to_pem(&ca.cert),
-                };
+                        ca_key: ca.issuer.key().serialize_pem(),
+                    };
 
-                let inserted_tls_history: i32 = diesel::insert_into(tls_history::table)
+                    let inserted_tls_history: i32 = diesel::insert_into(tls_history::table)
-                    .values(&new_tls_history)
+                        .values(&new_tls_history)
-                    .returning(tls_history::id)
+                        .returning(tls_history::id)
-                    .get_result(&mut *conn)
+                        .get_result(conn)
-                    .await?;
+                        .await?;
 
-                diesel::update(arbiter_settings::table)
+                    diesel::update(arbiter_settings::table)
-                    .set(arbiter_settings::tls_id.eq(inserted_tls_history))
+                        .set(arbiter_settings::tls_id.eq(inserted_tls_history))
-                    .execute(&mut *conn)
+                        .execute(conn)
-                    .await?;
+                        .await?;
 
-                Result::<_, diesel::result::Error>::Ok(())
+                    Result::<_, diesel::result::Error>::Ok(())
+                })
             })
             .await?;
         }

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

@@ -52,7 +52,10 @@ pub const INTEGRITY_SUBKEY_TAG: &[u8] = b"arbiter/db-integrity-key/v1";
 
 pub type HmacSha256 = Hmac<Sha256>;
 
-pub use arbiter_crypto::integrity::Integrable;
+pub trait Integrable: Hashable {
+    const KIND: &'static str;
+    const VERSION: i32 = 1;
+}
 
 fn payload_hash(payload: &impl Hashable) -> [u8; 32] {
     let mut hasher = Sha256::new();
@@ -214,13 +217,15 @@ mod tests {
     };
     use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 
-    use super::{Error, sign_entity, verify_entity};
+    use super::{Error, Integrable, sign_entity, verify_entity};
-    #[derive(Clone, arbiter_macros::Hashable, arbiter_macros::Integrable)]
+    #[derive(Clone, arbiter_macros::Hashable)]
-    #[integrable(kind = "dummy_entity")]
     struct DummyEntity {
         payload_version: i32,
         payload: Vec<u8>,
     }
+    impl Integrable for DummyEntity {
+        const KIND: &'static str = "dummy_entity";
+    }
 
     async fn bootstrapped_vault(db: &db::DatabasePool) -> ActorRef<Vault> {
         let actor = Vault::spawn(

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

@@ -79,10 +79,41 @@ pub mod types {
         }
     }
 
-    #[derive(Debug, FromSqlRow, AsExpression, Clone)]
+    macro_rules! declare_id {
-    #[diesel(sql_type = Integer)]
+        ($name:ident) => {
-    #[repr(transparent)] // hint compiler to optimize the wrapper struct away
+            #[derive(Debug, FromSqlRow, AsExpression, Clone, Hash, Copy, PartialEq, Eq)]
-    pub struct ChainId(pub i32);
+            #[diesel(sql_type = Integer)]
+            #[repr(transparent)] // hint compiler to optimize the wrapper struct away
+            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,
@@ -248,14 +271,24 @@ pub struct ProgramClient {
 }
 
 #[derive(Queryable, Debug)]
-#[diesel(table_name = schema::operator_client, check_for_backend(Sqlite))]
+#[diesel(table_name = schema::operator_identity, check_for_backend(Sqlite))]
-pub struct OperatorClient {
+pub struct OperatorIdentity {
-    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 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 +432,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,

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

@@ -152,6 +152,25 @@ diesel::table! {
     }
 }
 
+diesel::table! {
+    operator (id) {
+        id -> Nullable<Integer>,
+        share -> Binary,
+        share_nonce -> 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 +204,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 +222,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 +241,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,
 );

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

@@ -1,34 +1,28 @@
-use diesel_async::{AsyncConnection, RunQueryDsl};
-use kameo::actor::ActorRef;
-
 use crate::{
     actors::vault::Vault,
     crypto::integrity,
     db::{
         self, DatabaseError,
         models::{
-            EvmBasicGrant, EvmEtherTransferGrant, EvmEtherTransferGrantTarget,
+            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
-            EvmEtherTransferLimit, EvmTokenTransferGrant, EvmTokenTransferVolumeLimit,
-            EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
         },
         schema::{self, evm_transaction_log},
     },
     evm::policies::{
         CombinedSettings, DatabaseID, EvalContext, EvalViolation, Grant, Policy,
-        SharedGrantSettings, SpecificGrant, SpecificMeaning, VolumeRateLimit,
+        SharedGrantSettings, SpecificGrant, SpecificMeaning, ether_transfer::EtherTransfer,
-        ether_transfer::EtherTransfer, token_transfers::TokenTransfer,
+        token_transfers::TokenTransfer,
     },
 };
 
 use alloy::{
     consensus::TxEip1559,
-    primitives::{Address, TxKind, U256},
+    primitives::{TxKind, U256},
 };
 use chrono::Utc;
-use diesel::{
+use diesel::{ExpressionMethods as _, QueryDsl as _, QueryResult, insert_into, sqlite::Sqlite};
-    ExpressionMethods as _, OptionalExtension, QueryDsl as _, QueryResult, SelectableHelper,
+use diesel_async::{AsyncConnection, RunQueryDsl};
-    insert_into, sqlite::Sqlite, update,
+use kameo::actor::ActorRef;
-};
 
 pub mod abi;
 pub mod safe_signer;
@@ -185,22 +179,24 @@ impl Engine {
         }
 
         if run_kind == RunKind::Execution {
-            conn.transaction(async |conn| {
+            conn.transaction(|conn| {
-                let log_id: i32 = insert_into(evm_transaction_log::table)
+                Box::pin(async move {
-                    .values(&NewEvmTransactionLog {
+                    let log_id: i32 = insert_into(evm_transaction_log::table)
-                        grant_id: grant.common_settings_id,
+                        .values(&NewEvmTransactionLog {
-                        wallet_access_id: context.target.id,
+                            grant_id: grant.common_settings_id,
-                        chain_id: context.chain.into(),
+                            wallet_access_id: context.target.id,
-                        eth_value: utils::u256_to_bytes(context.value).to_vec(),
+                            chain_id: context.chain.into(),
-                        signed_at: Utc::now().into(),
+                            eth_value: utils::u256_to_bytes(context.value).to_vec(),
-                    })
+                            signed_at: Utc::now().into(),
-                    .returning(evm_transaction_log::id)
+                        })
-                    .get_result(&mut *conn)
+                        .returning(evm_transaction_log::id)
-                    .await?;
+                        .get_result(conn)
+                        .await?;
 
-                P::record_transaction(&context, meaning, log_id, &grant, &mut *conn).await?;
+                    P::record_transaction(&context, meaning, log_id, &grant, conn).await?;
 
-                QueryResult::Ok(())
+                    QueryResult::Ok(())
+                })
             })
             .await
             .map_err(DatabaseError::from)?;
@@ -226,203 +222,60 @@ impl Engine {
         let vault = self.vault.clone();
 
         let id = conn
-            .transaction(async |conn| {
+            .transaction(|conn| {
-                use schema::evm_basic_grant;
+                Box::pin(async move {
+                    use schema::evm_basic_grant;
 
-                #[expect(
+                    #[expect(
-                    clippy::cast_possible_truncation,
+                        clippy::cast_possible_truncation,
-                    clippy::cast_possible_wrap,
+                        clippy::cast_possible_wrap,
-                    clippy::as_conversions,
+                        clippy::as_conversions,
-                    reason = "fixme! #86"
+                        reason = "fixme! #86"
-                )]
+                    )]
-                let basic_grant: EvmBasicGrant = insert_into(evm_basic_grant::table)
+                    let basic_grant: EvmBasicGrant = insert_into(evm_basic_grant::table)
-                    .values(&NewEvmBasicGrant {
+                        .values(&NewEvmBasicGrant {
-                        chain_id: full_grant.shared.chain.into(),
+                            chain_id: full_grant.shared.chain.into(),
-                        wallet_access_id: full_grant.shared.wallet_access_id,
+                            wallet_access_id: full_grant.shared.wallet_access_id,
-                        valid_from: full_grant.shared.valid_from.map(SqliteTimestamp),
+                            valid_from: full_grant.shared.valid_from.map(SqliteTimestamp),
-                        valid_until: full_grant.shared.valid_until.map(SqliteTimestamp),
+                            valid_until: full_grant.shared.valid_until.map(SqliteTimestamp),
-                        max_gas_fee_per_gas: full_grant
+                            max_gas_fee_per_gas: full_grant
-                            .shared
+                                .shared
-                            .max_gas_fee_per_gas
+                                .max_gas_fee_per_gas
-                            .map(|fee| utils::u256_to_bytes(fee).to_vec()),
+                                .map(|fee| utils::u256_to_bytes(fee).to_vec()),
-                        max_priority_fee_per_gas: full_grant
+                            max_priority_fee_per_gas: full_grant
-                            .shared
+                                .shared
-                            .max_priority_fee_per_gas
+                                .max_priority_fee_per_gas
-                            .map(|fee| utils::u256_to_bytes(fee).to_vec()),
+                                .map(|fee| utils::u256_to_bytes(fee).to_vec()),
-                        rate_limit_count: full_grant
+                            rate_limit_count: full_grant
-                            .shared
+                                .shared
-                            .rate_limit
+                                .rate_limit
-                            .as_ref()
+                                .as_ref()
-                            .map(|rl| rl.count as i32),
+                                .map(|rl| rl.count as i32),
-                        rate_limit_window_secs: full_grant
+                            rate_limit_window_secs: full_grant
-                            .shared
+                                .shared
-                            .rate_limit
+                                .rate_limit
-                            .as_ref()
+                                .as_ref()
-                            .map(|rl| rl.window.num_seconds() as i32),
+                                .map(|rl| rl.window.num_seconds() as i32),
-                        revoked_at: None,
+                            revoked_at: None,
-                    })
+                        })
-                    .returning(evm_basic_grant::all_columns)
+                        .returning(evm_basic_grant::all_columns)
-                    .get_result(&mut *conn)
+                        .get_result(conn)
-                    .await?;
+                        .await?;
 
-                P::create_grant(&basic_grant, &full_grant.specific, &mut *conn).await?;
+                    P::create_grant(&basic_grant, &full_grant.specific, conn).await?;
 
-                integrity::sign_entity(&mut *conn, &vault, &full_grant, basic_grant.id)
+                    integrity::sign_entity(conn, &vault, &full_grant, basic_grant.id)
-                    .await
+                        .await
-                    .map_err(|_| diesel::result::Error::RollbackTransaction)?;
+                        .map_err(|_| diesel::result::Error::RollbackTransaction)?;
 
-                QueryResult::Ok(basic_grant.id)
+                    QueryResult::Ok(basic_grant.id)
+                })
             })
             .await?;
 
         Ok(id)
     }
 
-    pub async fn revoke_grant(
-        &self,
-        basic_grant_id: i32,
-    ) -> Result<(), DatabaseError> {
-        let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
-        let vault = self.vault.clone();
-
-        conn.transaction(async move |conn| {
-            use crate::db::schema::{
-                evm_basic_grant, evm_ether_transfer_grant, evm_ether_transfer_grant_target,
-                evm_ether_transfer_limit, evm_token_transfer_grant,
-                evm_token_transfer_volume_limit,
-            };
-
-            update(evm_basic_grant::table)
-                .filter(evm_basic_grant::id.eq(basic_grant_id))
-                .set(evm_basic_grant::revoked_at.eq(SqliteTimestamp(Utc::now())))
-                .execute(&mut *conn)
-                .await?;
-
-            let basic_grant: EvmBasicGrant = evm_basic_grant::table
-                .filter(evm_basic_grant::id.eq(basic_grant_id))
-                .select(EvmBasicGrant::as_select())
-                .first(&mut *conn)
-                .await?;
-
-            let shared = SharedGrantSettings::try_from_model(basic_grant)?;
-
-            if let Some(ether_grant) = evm_ether_transfer_grant::table
-                .filter(evm_ether_transfer_grant::basic_grant_id.eq(basic_grant_id))
-                .select(EvmEtherTransferGrant::as_select())
-                .first(&mut *conn)
-                .await
-                .optional()?
-            {
-                let target_rows: Vec<EvmEtherTransferGrantTarget> =
-                    evm_ether_transfer_grant_target::table
-                        .filter(evm_ether_transfer_grant_target::grant_id.eq(ether_grant.id))
-                        .select(EvmEtherTransferGrantTarget::as_select())
-                        .load(&mut *conn)
-                        .await?;
-                let targets: Vec<Address> = target_rows
-                    .into_iter()
-                    .filter_map(|target| {
-                        let arr: [u8; 20] = target.address.try_into().ok()?;
-                        Some(Address::from(arr))
-                    })
-                    .collect();
-
-                let limit: EvmEtherTransferLimit = evm_ether_transfer_limit::table
-                    .filter(evm_ether_transfer_limit::id.eq(ether_grant.limit_id))
-                    .select(EvmEtherTransferLimit::as_select())
-                    .first(&mut *conn)
-                    .await?;
-
-                let settings = CombinedSettings {
-                    shared: shared.clone(),
-                    specific: policies::ether_transfer::Settings {
-                        target: targets,
-                        limit: VolumeRateLimit {
-                            max_volume: utils::try_bytes_to_u256(&limit.max_volume).map_err(
-                                |err| {
-                                    diesel::result::Error::DeserializationError(Box::new(err))
-                                },
-                            )?,
-                            window: chrono::Duration::seconds(limit.window_secs.into()),
-                        },
-                    },
-                };
-
-                integrity::sign_entity(&mut *conn, &vault, &settings, basic_grant_id)
-                    .await
-                    .map_err(|_| diesel::result::Error::RollbackTransaction)?;
-
-                return QueryResult::Ok(());
-            }
-
-            if let Some(token_grant) = evm_token_transfer_grant::table
-                .filter(evm_token_transfer_grant::basic_grant_id.eq(basic_grant_id))
-                .select(EvmTokenTransferGrant::as_select())
-                .first(&mut *conn)
-                .await
-                .optional()?
-            {
-                let volume_limit_rows: Vec<EvmTokenTransferVolumeLimit> =
-                    evm_token_transfer_volume_limit::table
-                        .filter(evm_token_transfer_volume_limit::grant_id.eq(token_grant.id))
-                        .select(EvmTokenTransferVolumeLimit::as_select())
-                        .load(&mut *conn)
-                        .await?;
-                let volume_limits: Vec<VolumeRateLimit> = volume_limit_rows
-                    .into_iter()
-                    .map(|row| {
-                        Ok(VolumeRateLimit {
-                            max_volume: utils::try_bytes_to_u256(&row.max_volume).map_err(
-                                |err| {
-                                    diesel::result::Error::DeserializationError(Box::new(err))
-                                },
-                            )?,
-                            window: chrono::Duration::seconds(row.window_secs.into()),
-                        })
-                    })
-                    .collect::<QueryResult<Vec<_>>>()?;
-
-                let target: Option<Address> = match token_grant.receiver {
-                    None => None,
-                    Some(bytes) => {
-                        let arr: [u8; 20] = bytes.try_into().map_err(|_| {
-                            diesel::result::Error::DeserializationError(
-                                "Invalid receiver address length".into(),
-                            )
-                        })?;
-                        Some(Address::from(arr))
-                    }
-                };
-
-                let token_contract: [u8; 20] =
-                    token_grant.token_contract.clone().try_into().map_err(|_| {
-                        diesel::result::Error::DeserializationError(
-                            "Invalid token contract address length".into(),
-                        )
-                    })?;
-
-                let settings = CombinedSettings {
-                    shared,
-                    specific: policies::token_transfers::Settings {
-                        token_contract: Address::from(token_contract),
-                        target,
-                        volume_limits,
-                    },
-                };
-
-                integrity::sign_entity(&mut *conn, &vault, &settings, basic_grant_id)
-                    .await
-                    .map_err(|_| diesel::result::Error::RollbackTransaction)?;
-
-                return QueryResult::Ok(());
-            }
-
-            Err(diesel::result::Error::NotFound)
-        })
-        .await
-        .map_err(DatabaseError::from)
-    }
-
     async fn list_one_kind<Kind: Policy, Y>(
         &self,
         conn: &mut impl AsyncConnection<Backend = Sqlite>,
@@ -502,26 +355,21 @@ impl Engine {
 #[cfg(test)]
 mod tests {
     use alloy::primitives::{Address, Bytes, U256, address};
-    use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
     use chrono::{Duration, Utc};
     use diesel::{SelectableHelper, insert_into};
     use diesel_async::RunQueryDsl;
-    use kameo::{actor::ActorRef, prelude::Spawn};
     use rstest::rstest;
 
-    use crate::actors::{GlobalActors, vault::{Bootstrap, Vault}};
-    use crate::crypto::integrity;
     use crate::db::{
         self, DatabaseConnection,
         models::{
-            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
+            EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, NewEvmTransactionLog,
+            SqliteTimestamp,
         },
         schema::{evm_basic_grant, evm_transaction_log},
     };
-    use crate::evm::policies::ether_transfer::EtherTransfer;
     use crate::evm::policies::{
-        CombinedSettings, EvalContext, EvalViolation, Policy, SharedGrantSettings,
+        EvalContext, EvalViolation, SharedGrantSettings, TransactionRateLimit,
-        TransactionRateLimit, VolumeRateLimit,
     };
 
     use super::check_shared_constraints;
@@ -534,7 +382,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()),
             },
@@ -553,7 +401,6 @@ mod tests {
             chain: CHAIN_ID,
             valid_from: None,
             valid_until: None,
-            revoked_at: None,
             max_gas_fee_per_gas: None,
             max_priority_fee_per_gas: None,
             rate_limit: None,
@@ -762,115 +609,4 @@ mod tests {
             assert!(violations.is_empty());
         }
     }
-
-    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()),
-            })
-            .await
-            .unwrap();
-        actor
-    }
-
-    #[tokio::test]
-    async fn revoke_grant_preserves_revoked_integrity() {
-        use crate::db::schema::evm_basic_grant;
-        use diesel::ExpressionMethods as _;
-
-        let db = db::create_test_pool().await;
-        let vault = bootstrapped_vault(&db).await;
-        let engine = super::Engine::new(db.clone(), vault.clone());
-
-        let full_grant = CombinedSettings {
-            shared: SharedGrantSettings {
-                wallet_access_id: WALLET_ACCESS_ID,
-                chain: CHAIN_ID,
-                valid_from: None,
-                valid_until: None,
-                revoked_at: None,
-                max_gas_fee_per_gas: None,
-                max_priority_fee_per_gas: None,
-                rate_limit: None,
-            },
-            specific: super::policies::ether_transfer::Settings {
-                target: vec![RECIPIENT],
-                limit: VolumeRateLimit {
-                    max_volume: U256::from(100u64),
-                    window: Duration::hours(1),
-                },
-            },
-        };
-
-        let grant_id = engine
-            .create_grant::<EtherTransfer>(full_grant)
-            .await
-            .unwrap();
-
-        engine.revoke_grant(grant_id).await.unwrap();
-
-        let mut conn = db.get().await.unwrap();
-        diesel::update(evm_basic_grant::table)
-            .filter(evm_basic_grant::id.eq(grant_id))
-            .set(evm_basic_grant::revoked_at.eq::<Option<SqliteTimestamp>>(None))
-            .execute(&mut conn)
-            .await
-            .unwrap();
-
-        let wallet_access = EvmWalletAccess {
-            id: WALLET_ACCESS_ID,
-            wallet_id: 10,
-            client_id: 20,
-            created_at: SqliteTimestamp(Utc::now()),
-        };
-        let context = EvalContext {
-            target: wallet_access,
-            chain: CHAIN_ID,
-            to: RECIPIENT,
-            value: U256::ONE,
-            calldata: Bytes::new(),
-            max_fee_per_gas: 1,
-            max_priority_fee_per_gas: 1,
-        };
-
-        let grant = EtherTransfer::try_find_grant(
-            &context, &mut conn,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-
-        let result =
-            integrity::verify_entity(&mut conn, &vault, &grant.settings, grant.id).await;
-
-        assert!(matches!(
-            result,
-            Err(integrity::Error::MacMismatch { .. })
-        ));
-    }
-
-    #[test]
-    fn shared_settings_hash_changes_when_revoked_at_changes() {
-        use arbiter_crypto::hashing::Hashable;
-        use sha2::Digest;
-
-        let active = shared_settings();
-        let revoked = SharedGrantSettings {
-            revoked_at: Some(Utc::now()),
-            ..shared_settings()
-        };
-
-        let mut active_hash = sha2::Sha256::new();
-        active.hash(&mut active_hash);
-
-        let mut revoked_hash = sha2::Sha256::new();
-        revoked.hash(&mut revoked_hash);
-
-        assert_ne!(active_hash.finalize(), revoked_hash.finalize());
-    }
 }

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

@@ -144,7 +144,6 @@ pub struct SharedGrantSettings {
 
     pub valid_from: Option<DateTime<Utc>>,
     pub valid_until: Option<DateTime<Utc>>,
-    pub revoked_at: Option<DateTime<Utc>>,
 
     pub max_gas_fee_per_gas: Option<U256>,
     pub max_priority_fee_per_gas: Option<U256>,
@@ -159,7 +158,6 @@ impl SharedGrantSettings {
             chain: model.chain_id.into(),
             valid_from: model.valid_from.map(Into::into),
             valid_until: model.valid_until.map(Into::into),
-            revoked_at: model.revoked_at.map(Into::into),
             max_gas_fee_per_gas: model
                 .max_gas_fee_per_gas
                 .map(|b| utils::try_bytes_to_u256(&b))

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

@@ -1,5 +1,6 @@
 use super::{DatabaseID, EvalContext, EvalViolation};
 use crate::{
+    crypto::integrity::v1::Integrable,
     db::models::{
         EvmBasicGrant, EvmEtherTransferGrant, EvmEtherTransferGrantTarget, EvmEtherTransferLimit,
         NewEvmEtherTransferLimit, SqliteTimestamp,
@@ -51,12 +52,14 @@ impl From<Meaning> for SpecificMeaning {
 }
 
 // A grant for ether transfers, which can be scoped to specific target addresses and volume limits
-#[derive(Debug, Clone, arbiter_macros::Hashable, arbiter_macros::Integrable)]
+#[derive(Debug, Clone, arbiter_macros::Hashable)]
-#[integrable(kind = "EtherTransfer")]
 pub struct Settings {
     pub target: Vec<Address>,
     pub limit: VolumeRateLimit,
 }
+impl Integrable for Settings {
+    const KIND: &'static str = "EtherTransfer";
+}
 
 impl From<Settings> for SpecificGrant {
     fn from(val: Settings) -> Self {

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()),
         },
@@ -79,7 +80,6 @@ fn shared() -> SharedGrantSettings {
         chain: CHAIN_ID,
         valid_from: None,
         valid_until: None,
-        revoked_at: None,
         max_gas_fee_per_gas: None,
         max_priority_fee_per_gas: None,
         rate_limit: None,

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

@@ -1,5 +1,6 @@
 use super::{DatabaseID, EvalContext, EvalViolation};
 use crate::{
+    crypto::integrity::Integrable,
     db::models::{
         EvmBasicGrant, EvmTokenTransferGrant, EvmTokenTransferVolumeLimit,
         NewEvmTokenTransferGrant, NewEvmTokenTransferLog, NewEvmTokenTransferVolumeLimit,
@@ -62,13 +63,15 @@ impl From<Meaning> for SpecificMeaning {
 }
 
 // A grant for token transfers, which can be scoped to specific target addresses and volume limits
-#[derive(Debug, Clone, arbiter_macros::Hashable, arbiter_macros::Integrable)]
+#[derive(Debug, Clone, arbiter_macros::Hashable)]
-#[integrable(kind = "TokenTransfer")]
 pub struct Settings {
     pub token_contract: Address,
     pub target: Option<Address>,
     pub volume_limits: Vec<VolumeRateLimit>,
 }
+impl Integrable for Settings {
+    const KIND: &'static str = "TokenTransfer";
+}
 
 impl From<Settings> for SpecificGrant {
     fn from(val: Settings) -> Self {

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()),
         },
@@ -98,7 +98,6 @@ fn shared() -> SharedGrantSettings {
         chain: CHAIN_ID,
         valid_from: None,
         valid_until: None,
-        revoked_at: None,
         max_gas_fee_per_gas: None,
         max_priority_fee_per_gas: None,
         rate_limit: None,

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

@@ -200,7 +200,7 @@ impl Convert for auth::Outbound {
                         .timestamp
                         .timestamp_nanos_opt()
                         .expect("timestamp within range")
-                        .cast_unsigned(),
+                        as u64,
                     random: challenge.nonce.to_vec(),
                 })
             }

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

@@ -80,7 +80,7 @@ impl Sender<Result<auth::Outbound, auth::Error>> for AuthTransportAdapter<'_> {
                         .timestamp
                         .timestamp_nanos_opt()
                         .expect("timestamp within range")
-                        .cast_unsigned(),
+                        as u64,
                     random: challenge.nonce.to_vec(),
                 })
             }

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(),
         }),

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::{
@@ -87,7 +86,6 @@ impl TryConvert for ProtoSharedSettings {
                 .valid_until
                 .map(ProtoTimestamp::try_convert)
                 .transpose()?,
-            revoked_at: None,
             max_gas_fee_per_gas: self
                 .max_gas_fee_per_gas
                 .as_deref()
@@ -151,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,
         }
     }
@@ -166,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,
         })

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

@@ -1,5 +1,5 @@
 use crate::{
-    db::models::EvmWalletAccess,
+    db::models::{EvmWalletAccess, EvmWalletId},
     evm::policies::{SharedGrantSettings, SpecificGrant, TransactionRateLimit, VolumeRateLimit},
     grpc::Convert,
 };
@@ -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,
             }),
         }

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

@@ -1,8 +1,8 @@
 use crate::{
-    db::models::NewEvmWalletAccess,
+    db::models::{ClientId, 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,

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

@@ -171,42 +171,46 @@ async fn insert_client(
         Error::DatabasePoolUnavailable
     })?;
 
-    conn.exclusive_transaction(async |conn| {
+    conn.exclusive_transaction(|conn| {
-        let metadata_id = insert_into(client_metadata::table)
+        let vault = vault.clone();
-            .values((
+        let pubkey = pubkey.clone();
-                client_metadata::name.eq(&metadata.name),
+        Box::pin(async move {
-                client_metadata::description.eq(&metadata.description),
+            let metadata_id = insert_into(client_metadata::table)
-                client_metadata::version.eq(&metadata.version),
+                .values((
-            ))
+                    client_metadata::name.eq(&metadata.name),
-            .returning(client_metadata::id)
+                    client_metadata::description.eq(&metadata.description),
-            .get_result::<i32>(&mut *conn)
+                    client_metadata::version.eq(&metadata.version),
-            .await?;
+                ))
+                .returning(client_metadata::id)
+                .get_result::<i32>(conn)
+                .await?;
 
-        let client_id = insert_into(program_client::table)
+            let client_id = insert_into(program_client::table)
-            .values((
+                .values((
-                program_client::public_key.eq(pubkey.to_bytes()),
+                    program_client::public_key.eq(pubkey.to_bytes()),
-                program_client::metadata_id.eq(metadata_id),
+                    program_client::metadata_id.eq(metadata_id),
-            ))
+                ))
-            .on_conflict_do_nothing()
+                .on_conflict_do_nothing()
-            .returning(program_client::id)
+                .returning(program_client::id)
-            .get_result::<i32>(&mut *conn)
+                .get_result::<i32>(conn)
-            .await?;
+                .await?;
 
-        integrity::sign_entity(
+            integrity::sign_entity(
-            &mut *conn,
+                conn,
-            vault,
+                &vault,
-            &ClientCredentials {
+                &ClientCredentials {
-                pubkey: pubkey.clone(),
+                    pubkey: pubkey.clone(),
-            },
+                },
-            client_id,
+                client_id,
-        )
+            )
-        .await
+            .await
-        .map_err(|e| {
+            .map_err(|e| {
-            error!(error = ?e, "Failed to sign integrity tag for new client key");
+                error!(error = ?e, "Failed to sign integrity tag for new client key");
-            Error::DatabaseOperationFailed
+                Error::DatabaseOperationFailed
-        })?;
+            })?;
 
-        Ok(client_id)
+            Ok(client_id)
+        })
     })
     .await
 }
@@ -225,51 +229,55 @@ async fn sync_client_metadata(
         Error::DatabasePoolUnavailable
     })?;
 
-    conn.exclusive_transaction(async |conn| {
+    conn.exclusive_transaction(|conn| {
-        let (current_metadata_id, current): (i32, ProgramClientMetadata) = program_client::table
+        let metadata = metadata.clone();
-            .find(client_id)
+        Box::pin(async move {
-            .inner_join(client_metadata::table)
+            let (current_metadata_id, current): (i32, ProgramClientMetadata) =
-            .select((
+                program_client::table
-                program_client::metadata_id,
+                    .find(client_id)
-                ProgramClientMetadata::as_select(),
+                    .inner_join(client_metadata::table)
-            ))
+                    .select((
-            .first(&mut *conn)
+                        program_client::metadata_id,
-            .await?;
+                        ProgramClientMetadata::as_select(),
+                    ))
+                    .first(conn)
+                    .await?;
 
-        let unchanged = current.name == metadata.name
+            let unchanged = current.name == metadata.name
-            && current.description == metadata.description
+                && current.description == metadata.description
-            && current.version == metadata.version;
+                && current.version == metadata.version;
-        if unchanged {
+            if unchanged {
-            return Ok(());
+                return Ok(());
-        }
+            }
 
-        insert_into(client_metadata_history::table)
+            insert_into(client_metadata_history::table)
-            .values((
+                .values((
-                client_metadata_history::metadata_id.eq(current_metadata_id),
+                    client_metadata_history::metadata_id.eq(current_metadata_id),
-                client_metadata_history::client_id.eq(client_id),
+                    client_metadata_history::client_id.eq(client_id),
-            ))
+                ))
-            .execute(&mut *conn)
+                .execute(conn)
-            .await?;
+                .await?;
 
-        let metadata_id = insert_into(client_metadata::table)
+            let metadata_id = insert_into(client_metadata::table)
-            .values((
+                .values((
-                client_metadata::name.eq(&metadata.name),
+                    client_metadata::name.eq(&metadata.name),
-                client_metadata::description.eq(&metadata.description),
+                    client_metadata::description.eq(&metadata.description),
-                client_metadata::version.eq(&metadata.version),
+                    client_metadata::version.eq(&metadata.version),
-            ))
+                ))
-            .returning(client_metadata::id)
+                .returning(client_metadata::id)
-            .get_result::<i32>(&mut *conn)
+                .get_result::<i32>(conn)
-            .await?;
+                .await?;
 
-        update(program_client::table.find(client_id))
+            update(program_client::table.find(client_id))
-            .set((
+                .set((
-                program_client::metadata_id.eq(metadata_id),
+                    program_client::metadata_id.eq(metadata_id),
-                program_client::updated_at.eq(now),
+                    program_client::updated_at.eq(now),
-            ))
+                ))
-            .execute(&mut *conn)
+                .execute(conn)
-            .await?;
+                .await?;
 
-        Ok::<(), diesel::result::Error>(())
+            Ok::<(), diesel::result::Error>(())
+        })
     })
     .await
     .map_err(|e| {
@@ -298,7 +306,7 @@ where
 
     let signature = expect_message(transport, |req: Inbound| match req {
         Inbound::AuthChallengeSolution { signature } => Some(signature),
-        Inbound::AuthChallengeRequest { .. } => None,
+        _ => None,
     })
     .await
     .map_err(|e| {

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

@@ -1,5 +1,5 @@
 use crate::{
-    actors::GlobalActors, db, peers::client::session::ClientSession,
+    actors::GlobalActors, crypto::integrity::Integrable, db, peers::client::session::ClientSession,
 };
 use arbiter_crypto::authn;
 use arbiter_macros::Hashable;
@@ -14,12 +14,15 @@ pub struct ClientProfile {
     pub metadata: ClientMetadata,
 }
 
-#[derive(Hashable, arbiter_macros::Integrable)]
+#[derive(Hashable)]
-#[integrable(kind = "client_credentials")]
 pub struct ClientCredentials {
     pub pubkey: authn::PublicKey,
 }
 
+impl Integrable for ClientCredentials {
+    const KIND: &'static str = "client_credentials";
+}
+
 pub struct ClientConnection {
     pub(crate) db: db::DatabasePool,
     pub(crate) actors: GlobalActors,

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};
@@ -19,7 +19,7 @@ pub(super) struct ChallengeRequest {
     pub(super) bootstrap_token: Option<String>,
 }
 
-pub struct ChallengeContext {
+pub(super) struct ChallengeContext {
     pub(super) challenge: AuthChallenge,
     pub(super) pubkey: authn::PublicKey,
     pub(super) bootstrap_token: Option<String>,
@@ -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,6 +127,8 @@ where
         })
     }
 
+    #[allow(missing_docs)]
+    #[allow(clippy::unused_unit)]
     async fn verify_solution(
         &mut self,
         ChallengeContext {

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

@@ -3,7 +3,7 @@ use crate::{
         GlobalActors,
         vault::{GetState, Vault},
     },
-    crypto::integrity::{self, AttestationStatus},
+    crypto::integrity::{self, AttestationStatus, Integrable},
     db::{DatabaseError, DatabasePool},
     peers::client::ClientProfile,
 };
@@ -23,13 +23,16 @@ pub mod auth;
 pub mod session;
 pub mod vault_gate;
 
-#[derive(Debug, Clone, Hashable, arbiter_macros::Integrable)]
+#[derive(Debug, Clone, Hashable)]
-#[integrable(kind = "operator_credentials")]
 pub struct Credentials {
     pub id: i32,
     pub pubkey: authn::PublicKey,
 }
 
+impl Integrable for Credentials {
+    const KIND: &'static str = "operator_credentials";
+}
+
 // Messages, sent by operator to connection client without having a request
 #[derive(Debug)]
 pub enum OutOfBand {

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, 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) => {
@@ -169,18 +175,20 @@ impl OperatorSession {
         entries: Vec<NewEvmWalletAccess>,
     ) -> Result<(), Error> {
         let mut conn = self.props.db.get().await?;
-        conn.transaction(async |conn| {
+        conn.transaction(|conn| {
-            use crate::db::schema::evm_wallet_access;
+            Box::pin(async move {
+                use crate::db::schema::evm_wallet_access;
 
-            for entry in entries {
+                for entry in entries {
-                diesel::insert_into(evm_wallet_access::table)
+                    diesel::insert_into(evm_wallet_access::table)
-                    .values(&entry)
+                        .values(&entry)
-                    .on_conflict_do_nothing()
+                        .on_conflict_do_nothing()
-                    .execute(&mut *conn)
+                        .execute(conn)
-                    .await?;
+                        .await?;
-            }
+                }
 
-            Result::<_, Error>::Ok(())
+                Result::<_, Error>::Ok(())
+            })
         })
         .await?;
         Ok(())
@@ -192,16 +200,18 @@ impl OperatorSession {
         entries: Vec<i32>,
     ) -> Result<(), Error> {
         let mut conn = self.props.db.get().await?;
-        conn.transaction(async |conn| {
+        conn.transaction(|conn| {
-            use crate::db::schema::evm_wallet_access;
+            Box::pin(async move {
-            for entry in entries {
+                use crate::db::schema::evm_wallet_access;
-                diesel::delete(evm_wallet_access::table)
+                for entry in entries {
-                    .filter(evm_wallet_access::wallet_id.eq(entry))
+                    diesel::delete(evm_wallet_access::table)
-                    .execute(&mut *conn)
+                        .filter(evm_wallet_access::wallet_id.eq(entry))
-                    .await?;
+                        .execute(conn)
-            }
+                        .await?;
+                }
 
-            Result::<_, Error>::Ok(())
+                Result::<_, Error>::Ok(())
+            })
         })
         .await?;
         Ok(())
@@ -212,7 +222,8 @@ impl OperatorSession {
         &mut self,
     ) -> Result<Vec<EvmWalletAccess>, Error> {
         let mut conn = self.props.db.get().await?;
-        let access_entries = crate::db::schema::evm_wallet_access::table
+        use crate::db::schema::evm_wallet_access;
+        let access_entries = evm_wallet_access::table
             .select(EvmWalletAccess::as_select())
             .load::<_>(&mut conn)
             .await?;

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

@@ -1,7 +1,7 @@
 use super::{OutOfBand, OperatorConnection};
 use crate::{
     actors::{
-        flow_coordinator::client_connect_approval::{ClientApprovalAnswer, ClientApprovalController},
+        flow_coordinator::client_connect_approval::ClientApprovalController,
         operator_registry::ConnectOperator,
     },
     peers::client::ClientProfile,
@@ -63,7 +63,7 @@ impl OperatorSession {
         Self {
             props,
             sender,
-            pending_client_approvals: HashMap::default(),
+            pending_client_approvals: Default::default(),
         }
     }
 }
@@ -88,7 +88,6 @@ impl OperatorSession {
                 actor = "operator",
                 event = "failed to announce new client connection"
             );
-            let _ = controller.tell(ClientApprovalAnswer { approved: false }).await;
             return;
         }
 

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();

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();
@@ -400,7 +400,7 @@ pub async fn challenge_auth_rejects_integrity_tag_mismatch_when_unsealed() {
     let challenge = match response {
         Ok(resp) => match resp {
             auth::Outbound::AuthChallenge { challenge } => challenge,
-            other @ auth::Outbound::AuthSuccess => panic!("Expected AuthChallenge, got {other:?}"),
+            other => panic!("Expected AuthChallenge, got {other:?}"),
         },
         Err(err) => panic!("Expected Ok response, got Err({err:?})"),
     };
@@ -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();

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

@@ -14,7 +14,7 @@ use diesel_async::RunQueryDsl;
 
 #[tokio::test]
 #[test_log::test]
-async fn bootstrap() {
+async fn test_bootstrap() {
     let db = db::create_test_pool().await;
     let mut actor = Vault::new(db.clone(), GlobalActors::spawn_message_bus())
         .await
@@ -39,7 +39,7 @@ 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_vault(&db).await;
 
@@ -50,7 +50,7 @@ async fn bootstrap_rejects_double() {
 
 #[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 = Vault::new(db, GlobalActors::spawn_message_bus())
         .await
@@ -65,7 +65,7 @@ async fn create_new_before_bootstrap_fails() {
 
 #[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 = Vault::new(db, GlobalActors::spawn_message_bus())
         .await
@@ -77,7 +77,7 @@ async fn decrypt_before_bootstrap_fails() {
 
 #[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_vault(&db).await;
     drop(actor);
@@ -91,7 +91,7 @@ async fn new_restores_sealed_state() {
 
 #[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_vault(&db).await;
 
@@ -114,7 +114,7 @@ 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_vault(&db).await;
 

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

@@ -12,7 +12,7 @@ use std::collections::HashSet;
 
 #[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_vault(&db).await;
 
@@ -28,7 +28,7 @@ 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_vault(&db).await;
 
@@ -38,7 +38,7 @@ async fn decrypt_nonexistent_returns_not_found() {
 
 #[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_vault(&db).await;
 
@@ -76,7 +76,7 @@ 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_vault(&db).await;