fix(errors)!: forbid interpolated details in wire-facing internal errors

2026-08-09 00:11:03 +02:00
29 changed files with 205 additions and 337 deletions
--- a/mise.toml
+++ b/mise.toml
@@ -22,5 +22,3 @@ run = '''
 dart pub global activate protoc_plugin && \
 protoc --dart_out=grpc:useragent/lib/proto --proto_path=protobufs/ $(find protobufs -name '*.proto' | sort)
 '''
-
-[tasks.generate_schema]
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 4

-[[package]]
-name = "addr2line"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler2"
 version = "2.0.1"
@@ -1166,30 +1157,6 @@ dependencies = [
 "tower-service",
 ]

-[[package]]
-name = "backtrace"
-version = "0.3.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-link",
-]
-
-[[package]]
-name = "backtrace-ext"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50"
-dependencies = [
- "backtrace",
-]
-
 [[package]]
 name = "base16ct"
 version = "0.2.0"
@@ -2365,12 +2332,6 @@ dependencies = [
 "wasip3",
 ]

-[[package]]
-name = "gimli"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
-
 [[package]]
 name = "glob"
 version = "0.3.3"
@@ -2828,12 +2789,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "is_ci"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -3169,18 +3124,9 @@ version = "7.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7"
 dependencies = [
- "backtrace",
- "backtrace-ext",
 "cfg-if",
 "miette-derive",
- "owo-colors",
- "serde",
- "supports-color",
- "supports-hyperlinks",
- "supports-unicode",
- "terminal_size",
- "textwrap",
- "unicode-width 0.1.14",
+ "unicode-width",
 ]

 [[package]]
@@ -3402,15 +3348,6 @@ dependencies = [
 "smallvec",
 ]

-[[package]]
-name = "object"
-version = "0.37.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.8.1"
@@ -3438,12 +3375,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"

-[[package]]
-name = "owo-colors"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d"
-
 [[package]]
 name = "parity-scale-codec"
 version = "3.7.5"
@@ -4247,12 +4178,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"

-[[package]]
-name = "rustc-demangle"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -4892,27 +4817,6 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"

-[[package]]
-name = "supports-color"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6"
-dependencies = [
- "is_ci",
-]
-
-[[package]]
-name = "supports-hyperlinks"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e396b6523b11ccb83120b115a0b7366de372751aa6edf19844dfb13a6af97e91"
-
-[[package]]
-name = "supports-unicode"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2"
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -4986,16 +4890,6 @@ dependencies = [
 "windows-sys 0.61.2",
 ]

-[[package]]
-name = "terminal_size"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874"
-dependencies = [
- "rustix",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "test-log"
 version = "0.2.20"
@@ -5027,16 +4921,6 @@ dependencies = [
 "test-log-core",
 ]

-[[package]]
-name = "textwrap"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
-dependencies = [
- "unicode-linebreak",
- "unicode-width 0.2.2",
-]
-
 [[package]]
 name = "thiserror"
 version = "2.0.18"
@@ -5476,12 +5360,6 @@ version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"

-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.13.2"
@@ -5494,12 +5372,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"

-[[package]]
-name = "unicode-width"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -15,7 +15,10 @@ k256 = { version = "0.13.4", features = ["ecdsa", "pkcs8"] }
 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"] }
+# `derive` only: nothing renders a miette Report yet, so `fancy` would drag the
+# terminal-formatting stack (owo-colors, supports-color, textwrap, terminal_size)
+# into the headless daemon. A CLI that wants pretty output enables `fancy` itself.
+miette = "7.6.0"
 ml-dsa = { version = "0.1.0-rc.9", features = ["zeroize"] }
 mutants = "0.0.4"
 prost = "0.14.3"
--- a/server/crates/arbiter-client/src/auth.rs
+++ b/server/crates/arbiter-client/src/auth.rs
@@ -23,6 +23,7 @@ use arbiter_proto::{
 use chrono::DateTime;

 #[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
 pub enum AuthError {
    #[error("Server sent invalid auth challenge")]
    InvalidChallenge,
--- a/server/crates/arbiter-client/src/client.rs
+++ b/server/crates/arbiter-client/src/client.rs
@@ -17,6 +17,7 @@ use tokio_stream::wrappers::ReceiverStream;
 use tonic::transport::ClientTlsConfig;

 #[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
 pub enum ArbiterClientError {
    #[error("Authentication error")]
    Authentication(#[from] AuthError),
--- a/server/crates/arbiter-client/src/storage.rs
+++ b/server/crates/arbiter-client/src/storage.rs
@@ -4,6 +4,7 @@ use arbiter_proto::home_path;
 use std::path::{Path, PathBuf};

 #[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
 pub enum StorageError {
    #[error("Invalid signing key length in storage: expected {expected} bytes, got {actual} bytes")]
    InvalidKeyLength { expected: usize, actual: usize },
--- a/server/crates/arbiter-client/src/transport.rs
+++ b/server/crates/arbiter-client/src/transport.rs
@@ -11,6 +11,7 @@ pub fn next_request_id() -> i32 {
 }

 #[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
 pub enum ClientSignError {
    #[error("Transport channel closed")]
    ChannelClosed,
--- a/server/crates/arbiter-proto/src/url.rs
+++ b/server/crates/arbiter-proto/src/url.rs
@@ -30,6 +30,7 @@ impl Display for ArbiterUrl {
 }

 #[derive(Debug, thiserror::Error, miette::Diagnostic)]
+#[non_exhaustive]
 pub enum Error {
    #[error("Invalid URL scheme, expected '{ARBITER_URL_SCHEME}://'")]
    #[diagnostic(
--- a/server/crates/arbiter-server/migrations/2026-02-14-171124-0000_init/up.sql
+++ b/server/crates/arbiter-server/migrations/2026-02-14-171124-0000_init/up.sql
@@ -43,24 +43,13 @@ 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_identity (
+create table if not exists operator_client (
    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_identity_public_key on operator_identity (public_key);
-
-create table if not exists operator (
-    id integer primary key references operator_identity(id) on delete restrict, -- same id as operator_identity
-
-    share blob not null,
-    share_nonce blob not null,
-
-    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 table if not exists client_metadata (
    id integer not null primary key,
--- a/server/crates/arbiter-server/src/actors/bootstrap.rs
+++ b/server/crates/arbiter-server/src/actors/bootstrap.rs
@@ -68,7 +68,7 @@ impl Bootstrapper {
        let row_count: i64 = {
            let mut conn = db.get().await?;

-            schema::operator::table
+            schema::operator_client::table
                .count()
                .get_result(&mut conn)
                .await?
--- a/server/crates/arbiter-server/src/actors/evm/mod.rs
+++ b/server/crates/arbiter-server/src/actors/evm/mod.rs
@@ -3,7 +3,7 @@ use crate::{
    crypto::integrity::{self, Integrable},
    db::{
        DatabaseError, DatabasePool,
-        models::{self, EvmWalletId},
+        models::{self},
        schema,
    },
    evm::{
@@ -162,7 +162,7 @@ impl EvmActor {
    }

    #[message]
-    pub async fn list_wallets(&self) -> Result<Vec<(EvmWalletId, Address)>, Error> {
+    pub async fn list_wallets(&self) -> Result<Vec<(i32, Address)>, Error> {
        let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
        let rows: Vec<models::EvmWallet> = schema::evm_wallet::table
            .select(models::EvmWallet::as_select())
@@ -295,18 +295,18 @@ impl EvmActor {
                address: wallet_address,
                aead_encrypted_id: wallet.aead_encrypted_id,
            },
-            wallet.id.to_raw(),
+            wallet.id,
        )
        .await
        .map_err(|e| {
-            error!(?e, ?wallet.id, "EVM wallet integrity check failed");
+            error!(?e, wallet_id = wallet.id, "EVM wallet integrity check failed");
            SignTransactionError::Internal
        })?;
        drop(conn);

        if attestation != integrity::AttestationStatus::Attested {
            error!(
-                ?wallet.id,
+                wallet_id = wallet.id,
                "EVM wallet integrity unavailable; refusing to sign"
            );
            return Err(SignTransactionError::Internal);
--- a/server/crates/arbiter-server/src/actors/vault/mod.rs
+++ b/server/crates/arbiter-server/src/actors/vault/mod.rs
@@ -6,7 +6,7 @@ use crate::{
    },
    db::{
        self,
-        models::{self, RootKeyHistory, RootKeyHistoryId},
+        models::{self, RootKeyHistory},
        schema::{self},
    },
 };
@@ -25,6 +25,7 @@ use strum::{EnumDiscriminants, IntoDiscriminant};
 use tracing::{error, info, warn};

 pub mod events {
+
    #[derive(Clone, Copy)]
    pub struct Bootstrapped;

@@ -63,12 +64,12 @@ pub enum Error {
    #[error("Broken database")]
    BrokenDatabase,

-    #[error("Integrity key version mismatch: envelope uses key {envelope:?}, current key is {current:?}")]
-    KeyVersionMismatch { envelope: RootKeyHistoryId, current: RootKeyHistoryId },
+    #[error("Integrity key version mismatch: envelope uses key {envelope}, current key is {current}")]
+    KeyVersionMismatch { envelope: i32, current: i32 },
 }

 struct Unsealed {
-    root_key_history_id: RootKeyHistoryId,
+    root_key_history_id: i32,
    root_key: KeyCell,
 }

@@ -77,9 +78,8 @@ struct Unsealed {
 enum State {
    #[default]
    Unbootstrapped,
-
    Sealed {
-        root_key_history_id: RootKeyHistoryId,
+        root_key_history_id: i32,
    },
    Unsealed(Unsealed),
 }
@@ -123,10 +123,7 @@ 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: RootKeyHistoryId,
-    ) -> Result<Nonce, Error> {
+    async fn get_new_nonce(pool: &db::DatabasePool, root_key_id: i32) -> Result<Nonce, Error> {
        let mut conn = pool.get().await?;

        let nonce = conn
@@ -139,7 +136,7 @@ impl Vault {

                let mut nonce = Nonce::try_from(current_nonce.as_slice()).map_err(|()| {
                    error!(
-                        "Broken database: invalid nonce for root key history id={:#?}",
+                        "Broken database: invalid nonce for root key history id={}",
                        root_key_id
                    );
                    Error::BrokenDatabase
@@ -195,7 +192,7 @@ impl Vault {
        let data_encryption_nonce_bytes = data_encryption_nonce.to_vec();
        let root_key_history_id = conn
            .transaction(async |conn| {
-                let root_key_history_id = insert_into(schema::root_key_history::table)
+                let root_key_history_id: i32 = insert_into(schema::root_key_history::table)
                    .values(&models::NewRootKeyHistory {
                        ciphertext: root_key_ciphertext.clone(),
                        tag: v1::ROOT_KEY_TAG.to_vec(),
@@ -213,9 +210,7 @@ impl Vault {
                    .execute(&mut *conn)
                    .await?;

-                Result::<_, diesel::result::Error>::Ok(RootKeyHistoryId::from_raw(
-                    root_key_history_id,
-                ))
+                Result::<_, diesel::result::Error>::Ok(root_key_history_id)
            })
            .await?;

@@ -375,10 +370,7 @@ impl Vault {
    }

    #[message]
-    pub fn sign_integrity(
-        &mut self,
-        mac_input: Vec<u8>,
-    ) -> Result<(RootKeyHistoryId, Vec<u8>), Error> {
+    pub fn sign_integrity(&mut self, mac_input: Vec<u8>) -> Result<(i32, Vec<u8>), Error> {
        let Unsealed {
            root_key,
            root_key_history_id,
@@ -388,7 +380,7 @@ impl Vault {
            HmacSha256::new_from_slice(k)
                .unwrap_or_else(|_| unreachable!("HMAC accepts keys of any size"))
        });
-        hmac.update(&root_key_history_id.to_raw().to_be_bytes());
+        hmac.update(&root_key_history_id.to_be_bytes());
        hmac.update(&mac_input);

        let mac = hmac.finalize().into_bytes().to_vec();
@@ -400,7 +392,7 @@ impl Vault {
        &mut self,
        mac_input: Vec<u8>,
        expected_mac: Vec<u8>,
-        key_version: RootKeyHistoryId,
+        key_version: i32,
    ) -> Result<bool, Error> {
        let Unsealed {
            root_key,
@@ -418,7 +410,7 @@ impl Vault {
            HmacSha256::new_from_slice(k)
                .unwrap_or_else(|_| unreachable!("HMAC accepts keys of any size"))
        });
-        hmac.update(&key_version.to_raw().to_be_bytes());
+        hmac.update(&key_version.to_be_bytes());
        hmac.update(&mac_input);

        Ok(hmac.verify_slice(&expected_mac).is_ok())
@@ -442,7 +434,6 @@ impl Vault {
 #[cfg(test)]
 mod tests {
    use crate::actors::GlobalActors;
-    use crate::db::models::RootKeyHistory;
    use arbiter_crypto::safecell::SafeCellHandle as _;

    use super::*;
--- a/server/crates/arbiter-server/src/crypto/integrity/v1.rs
+++ b/server/crates/arbiter-server/src/crypto/integrity/v1.rs
@@ -13,6 +13,7 @@ use diesel_async::{AsyncConnection, RunQueryDsl};
 use hmac::Hmac;
 use kameo::{actor::ActorRef, error::SendError};
 use sha2::{Digest as _, Sha256};
+use tracing::error;

 #[derive(Debug, thiserror::Error)]
 pub enum Error {
@@ -121,7 +122,10 @@ pub async fn sign_entity<E: Integrable>(
            .await
            .map_err(|err| match err {
                SendError::HandlerError(inner) => Error::Vault(inner),
-                _ => Error::VaultSend,
+                other => {
+                    error!(?other, "Vault unreachable while signing integrity envelope");
+                    Error::VaultSend
+                }
            })?;

    insert_into(integrity_envelope::table)
@@ -195,12 +199,18 @@ pub async fn verify_entity<E: Integrable>(
        Err(SendError::HandlerError(
            vault::Error::Sealed | vault::Error::KeyVersionMismatch { .. },
        )) => Ok(AttestationStatus::Unavailable),
-        Err(_) => Err(Error::VaultSend),
+        Err(other) => {
+            error!(?other, "Vault unreachable while verifying integrity envelope");
+            Err(Error::VaultSend)
+        }
    }
 }

 pub async fn is_signing_available(vault: &ActorRef<Vault>) -> Result<bool, Error> {
-    let state = vault.ask(GetState).await.map_err(|_| Error::VaultSend)?;
+    let state = vault.ask(GetState).await.map_err(|err| {
+        error!(?err, "Vault unreachable while querying signing availability");
+        Error::VaultSend
+    })?;
    Ok(matches!(state, vault::VaultState::Unsealed))
 }

--- a/server/crates/arbiter-server/src/db/models.rs
+++ b/server/crates/arbiter-server/src/db/models.rs
@@ -79,41 +79,10 @@ pub mod types {
        }
    }

-    macro_rules! declare_id {
-        ($name:ident) => {
-            #[derive(Debug, FromSqlRow, AsExpression, Clone, Hash, Copy, PartialEq, Eq)]
+    #[derive(Debug, FromSqlRow, AsExpression, Clone)]
    #[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);
+    pub struct ChainId(pub i32);

    #[expect(
        clippy::cast_sign_loss,
@@ -134,13 +103,21 @@ pub mod types {
        }
    };

-    declare_id!(OperatorId);
-    declare_id!(OperatorIdentityId);
-    declare_id!(AeadEncryptedId);
-    declare_id!(RootKeyHistoryId);
-    declare_id!(TlsHistoryId);
-    declare_id!(EvmWalletId);
-    declare_id!(ClientId);
+    impl FromSql<Integer, Sqlite> for ChainId {
+        fn from_sql(
+            bytes: <Sqlite as diesel::backend::Backend>::RawValue<'_>,
+        ) -> diesel::deserialize::Result<Self> {
+            FromSql::<Integer, Sqlite>::from_sql(bytes).map(Self)
+        }
+    }
+    impl ToSql<Integer, Sqlite> for ChainId {
+        fn to_sql<'b>(
+            &'b self,
+            out: &mut diesel::serialize::Output<'b, '_, Sqlite>,
+        ) -> diesel::serialize::Result {
+            ToSql::<Integer, Sqlite>::to_sql(&self.0, out)
+        }
+    }
 }
 pub use types::*;

@@ -153,12 +130,12 @@ pub use types::*;
 )]
 #[diesel(table_name = aead_encrypted, check_for_backend(Sqlite))]
 pub struct AeadEncrypted {
-    pub id: AeadEncryptedId,
+    pub id: i32,
    pub ciphertext: Vec<u8>,
    pub tag: Vec<u8>,
    pub current_nonce: Vec<u8>,
    pub schema_version: i32,
-    pub associated_root_key_id: RootKeyHistoryId,
+    pub associated_root_key_id: i32, // references root_key_history.id
    pub created_at: SqliteTimestamp,
 }

@@ -171,7 +148,7 @@ pub struct AeadEncrypted {
    attributes_with = "deriveless"
 )]
 pub struct RootKeyHistory {
-    pub id: RootKeyHistoryId,
+    pub id: i32,
    pub ciphertext: Vec<u8>,
    pub tag: Vec<u8>,
    pub root_key_encryption_nonce: Vec<u8>,
@@ -189,7 +166,7 @@ pub struct RootKeyHistory {
    attributes_with = "deriveless"
 )]
 pub struct TlsHistory {
-    pub id: TlsHistoryId,
+    pub id: i32,
    pub cert: String,
    pub cert_key: String, // PEM Encoded private key
    pub ca_cert: String,  // PEM Encoded certificate for cert signing
@@ -214,7 +191,7 @@ pub struct ArbiterSettings {
    attributes_with = "deriveless"
 )]
 pub struct EvmWallet {
-    pub id: EvmWalletId,
+    pub id: i32,
    pub address: Vec<u8>,
    pub aead_encrypted_id: i32,
    pub created_at: SqliteTimestamp,
@@ -236,7 +213,7 @@ pub struct EvmWallet {
 )]
 pub struct EvmWalletAccess {
    pub id: i32,
-    pub wallet_id: EvmWalletId,
+    pub wallet_id: i32,
    pub client_id: i32,
    pub created_at: SqliteTimestamp,
 }
@@ -263,7 +240,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: ClientId,
+    pub id: i32,
    pub public_key: Vec<u8>,
    pub metadata_id: i32,
    pub created_at: SqliteTimestamp,
@@ -273,22 +250,12 @@ pub struct ProgramClient {
 #[derive(Queryable, Debug)]
 #[diesel(table_name = schema::operator_client, check_for_backend(Sqlite))]
 pub struct OperatorClient {
-    pub id: OperatorIdentityId,
+    pub id: i32,
    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(
@@ -432,7 +399,7 @@ pub struct IntegrityEnvelope {
    pub entity_kind: String,
    pub entity_id: Vec<u8>,
    pub payload_version: i32,
-    pub key_version: RootKeyHistoryId,
+    pub key_version: i32,
    pub mac: Vec<u8>,
    pub signed_at: SqliteTimestamp,
    pub created_at: SqliteTimestamp,
--- a/server/crates/arbiter-server/src/db/schema.rs
+++ b/server/crates/arbiter-server/src/db/schema.rs
@@ -152,25 +152,6 @@ 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,
@@ -204,6 +185,15 @@ 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));
@@ -222,7 +212,6 @@ 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!(
@@ -241,9 +230,8 @@ diesel::allow_tables_to_appear_in_same_query!(
    evm_wallet,
    evm_wallet_access,
    integrity_envelope,
-    operator,
-    operator_identity,
    program_client,
    root_key_history,
    tls_history,
+    operator_client,
 );
--- a/server/crates/arbiter-server/src/evm/mod.rs
+++ b/server/crates/arbiter-server/src/evm/mod.rs
@@ -514,8 +514,7 @@ mod tests {
    use crate::db::{
        self, DatabaseConnection,
        models::{
-            EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, NewEvmTransactionLog,
-            SqliteTimestamp,
+            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
        },
        schema::{evm_basic_grant, evm_transaction_log},
    };
@@ -535,7 +534,7 @@ mod tests {
        EvalContext {
            target: EvmWalletAccess {
                id: WALLET_ACCESS_ID,
-                wallet_id: EvmWalletId::from_raw(5),
+                wallet_id: 10,
                client_id: 20,
                created_at: SqliteTimestamp(Utc::now()),
            },
@@ -825,7 +824,7 @@ mod tests {

        let wallet_access = EvmWalletAccess {
            id: WALLET_ACCESS_ID,
-            wallet_id: EvmWalletId::from_raw(10),
+            wallet_id: 10,
            client_id: 20,
            created_at: SqliteTimestamp(Utc::now()),
        };
--- a/server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs
+++ b/server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs
@@ -3,8 +3,7 @@ use crate::{
    db::{
        self, DatabaseConnection,
        models::{
-            EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, NewEvmTransactionLog,
-            SqliteTimestamp,
+            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
        },
        schema::{evm_basic_grant, evm_transaction_log},
    },
@@ -32,7 +31,7 @@ fn ctx(to: Address, value: U256) -> EvalContext {
    EvalContext {
        target: EvmWalletAccess {
            id: WALLET_ACCESS_ID,
-            wallet_id: EvmWalletId::from_raw(10),
+            wallet_id: 10,
            client_id: 20,
            created_at: SqliteTimestamp(Utc::now()),
        },
--- a/server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs
+++ b/server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs
@@ -2,7 +2,7 @@ use super::{Settings, TokenTransfer};
 use crate::{
    db::{
        self, DatabaseConnection,
-        models::{EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, SqliteTimestamp},
+        models::{EvmBasicGrant, EvmWalletAccess, 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: EvmWalletId::from_raw(10),
+            wallet_id: 10,
            client_id: 20,
            created_at: SqliteTimestamp(Utc::now()),
        },
--- a/server/crates/arbiter-server/src/grpc/operator/evm.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/evm.rs
@@ -90,7 +90,7 @@ async fn handle_wallet_list(
                .into_iter()
                .map(|(id, address)| WalletEntry {
                    address: address.to_vec(),
-                    id: id.to_raw(),
+                    id,
                })
                .collect(),
        }),
--- a/server/crates/arbiter-server/src/grpc/operator/inbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/inbound.rs
@@ -1,10 +1,11 @@
 use crate::{
-    db::models::{CoreEvmWalletAccess, EvmWalletId, NewEvmWalletAccess},
+    db::models::{CoreEvmWalletAccess, NewEvmWalletAccess},
    evm::policies::{
        SharedGrantSettings, SpecificGrant, TransactionRateLimit, VolumeRateLimit, ether_transfer,
        token_transfers,
    },
-    grpc::{Convert, TryConvert},
+    grpc::Convert,
+    grpc::TryConvert,
 };
 use arbiter_proto::{
    proto::evm::{
@@ -150,7 +151,7 @@ impl Convert for WalletAccess {

    fn convert(self) -> Self::Output {
        NewEvmWalletAccess {
-            wallet_id: EvmWalletId::from_raw(self.wallet_id),
+            wallet_id: self.wallet_id,
            client_id: self.sdk_client_id,
        }
    }
@@ -165,7 +166,7 @@ impl TryConvert for SdkClientWalletAccess {
            return Err(Status::invalid_argument("Missing wallet access entry"));
        };
        Ok(CoreEvmWalletAccess {
-            wallet_id: EvmWalletId::from_raw(access.wallet_id),
+            wallet_id: access.wallet_id,
            client_id: access.sdk_client_id,
            id: self.id,
        })
--- a/server/crates/arbiter-server/src/grpc/operator/outbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/outbound.rs
@@ -103,7 +103,7 @@ impl Convert for EvmWalletAccess {
        Self::Output {
            id: self.id,
            access: Some(WalletAccess {
-                wallet_id: self.wallet_id.to_raw(),
+                wallet_id: self.wallet_id,
                sdk_client_id: self.client_id,
            }),
        }
--- a/server/crates/arbiter-server/src/grpc/operator/sdk_client.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/sdk_client.rs
@@ -2,7 +2,7 @@ use crate::{
    db::models::NewEvmWalletAccess,
    grpc::Convert,
    peers::operator::{
-        OperatorSession, OutOfBand,
+        OutOfBand, OperatorSession,
        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.to_raw(),
+                    id: client.id,
                    pubkey: client.public_key.clone(),
                    info: Some(ProtoClientMetadata {
                        name: metadata.name,
--- a/server/crates/arbiter-server/src/peers/operator/auth/mod.rs
+++ b/server/crates/arbiter-server/src/peers/operator/auth/mod.rs
@@ -26,21 +26,22 @@ pub enum Error {
    UnregisteredPublicKey,
    InvalidChallengeSolution,
    InvalidBootstrapToken,
-    Internal { details: String },
+    /// Reaches the operator verbatim via `Status::internal`, so the payload is
+    /// `&'static str`: the type makes it impossible to interpolate an inner
+    /// error. Log the cause, send the constant.
+    Internal { details: &'static str },
    Transport,
 }

 impl Error {
-    fn internal(details: impl Into<String>) -> Self {
-        Self::Internal {
-            details: details.into(),
-        }
+    const fn internal(details: &'static str) -> Self {
+        Self::Internal { details }
    }
 }

 impl From<diesel::result::Error> for Error {
    fn from(e: diesel::result::Error) -> Self {
-        error!(?e, "Database error");
+        error!(error = %crate::utils::error_chain(&e), "Database error");
        Self::internal("Database error")
    }
 }
--- a/server/crates/arbiter-server/src/peers/operator/auth/state.rs
+++ b/server/crates/arbiter-server/src/peers/operator/auth/state.rs
@@ -4,7 +4,7 @@ use super::{
 };
 use crate::{
    actors::bootstrap::ConsumeToken,
-    db::{DatabasePool, schema::operator_identity},
+    db::{DatabasePool, schema::operator_client},
    peers::operator::auth::Outbound,
 };
 use arbiter_crypto::authn::{self, AuthChallenge, OPERATOR_CONTEXT};
@@ -43,9 +43,9 @@ async fn get_client_id(db: &DatabasePool, pubkey: &authn::PublicKey) -> Result<O
        Error::internal("Database unavailable")
    })?;

-    operator_identity::table
-        .filter(operator_identity::public_key.eq(pubkey.to_bytes()))
-        .select(operator_identity::id)
+    operator_client::table
+        .filter(operator_client::public_key.eq(pubkey.to_bytes()))
+        .select(operator_client::id)
        .first::<i32>(&mut conn)
        .await
        .optional()
@@ -62,9 +62,9 @@ async fn register_key(db: &DatabasePool, pubkey: &authn::PublicKey) -> Result<i3
        Error::internal("Database unavailable")
    })?;

-    let id: i32 = diesel::insert_into(operator_identity::table)
-        .values((operator_identity::public_key.eq(pubkey_bytes),))
-        .returning(operator_identity::id)
+    let id: i32 = diesel::insert_into(operator_client::table)
+        .values((operator_client::public_key.eq(pubkey_bytes),))
+        .returning(operator_client::id)
        .get_result(&mut conn)
        .await
        .map_err(|e| {
--- a/server/crates/arbiter-server/src/peers/operator/session/handlers.rs
+++ b/server/crates/arbiter-server/src/peers/operator/session/handlers.rs
@@ -1,17 +1,13 @@
 use super::{Error, OperatorSession};
 use crate::{
-    actors::{
-        evm::{
+    actors::evm::{
        ClientSignTransaction, Generate, ListWallets, OperatorCreateGrant, OperatorListGrants,
        SignTransactionError as EvmSignError,
    },
-        flow_coordinator::{IsClientConnected, client_connect_approval::ClientApprovalAnswer},
-        vault::VaultState,
-    },
+    actors::flow_coordinator::{IsClientConnected, client_connect_approval::ClientApprovalAnswer},
+    actors::vault::VaultState,
    db::{
-        models::{
-            EvmWalletAccess, EvmWalletId, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata,
-        },
+        models::{EvmWalletAccess, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata},
        schema::program_client,
    },
    evm::policies::{Grant, SpecificGrant},
@@ -80,9 +76,7 @@ impl OperatorSession {
    }

    #[message]
-    pub(crate) async fn handle_evm_wallet_list(
-        &mut self,
-    ) -> Result<Vec<(EvmWalletId, Address)>, Error> {
+    pub(crate) async fn handle_evm_wallet_list(&mut self) -> Result<Vec<(i32, Address)>, Error> {
        match self.props.actors.evm.ask(ListWallets {}).await {
            Ok(wallets) => Ok(wallets),
            Err(err) => {
@@ -334,7 +328,7 @@ impl OperatorSession {

 #[cfg(test)]
 mod tests {
-    use crate::db::{self, models::{EvmWalletId, NewEvmWalletAccess}, schema::evm_wallet_access};
+    use crate::db::{self, models::NewEvmWalletAccess, schema::evm_wallet_access};
    use diesel::{ExpressionMethods as _, QueryDsl as _, SelectableHelper};
    use diesel_async::{AsyncConnection, RunQueryDsl};

@@ -354,7 +348,7 @@ mod tests {
        // entry B: id will be 2, wallet_id=1, client_id=20
        let entry_a = diesel::insert_into(evm_wallet_access::table)
            .values(NewEvmWalletAccess {
-                wallet_id: EvmWalletId::from_raw(1),
+                wallet_id: 1,
                client_id: 10,
            })
            .returning(EvmWalletAccess::as_select())
@@ -364,7 +358,7 @@ mod tests {

        let entry_b = diesel::insert_into(evm_wallet_access::table)
            .values(NewEvmWalletAccess {
-                wallet_id: EvmWalletId::from_raw(1),
+                wallet_id: 1,
                client_id: 20,
            })
            .returning(EvmWalletAccess::as_select())
@@ -417,7 +411,7 @@ mod tests {
        for i in 1_i32..=5 {
            diesel::insert_into(evm_wallet_access::table)
                .values(NewEvmWalletAccess {
-                    wallet_id: EvmWalletId::from_raw(99),
+                    wallet_id: 99,
                    client_id: i,
                })
                .execute(&mut *conn)
@@ -428,7 +422,7 @@ mod tests {
        // Real target: wallet_id=1, will get id=6.
        let target = diesel::insert_into(evm_wallet_access::table)
            .values(NewEvmWalletAccess {
-                wallet_id: EvmWalletId::from_raw(1),
+                wallet_id: 1,
                client_id: 1,
            })
            .returning(EvmWalletAccess::as_select())
@@ -438,7 +432,7 @@ mod tests {

        // Sanity: target.id != target.wallet_id
        assert_ne!(
-            target.id, target.wallet_id.to_raw(),
+            target.id, target.wallet_id,
            "test prerequisite: id and wallet_id must differ"
        );

--- a/server/crates/arbiter-server/src/peers/operator/vault_gate/mod.rs
+++ b/server/crates/arbiter-server/src/peers/operator/vault_gate/mod.rs
@@ -31,13 +31,11 @@ pub enum Error {
    #[error("State transition failed")]
    State,

+    /// Reaches the operator verbatim via `Status::internal`, so the payload is
+    /// `&'static str`: the type makes it impossible to interpolate an inner
+    /// error. Log the cause, send the constant.
    #[error("Internal error: {0}")]
-    Internal(String),
-}
-impl Error {
-    fn internal(message: impl Into<String>) -> Self {
-        Self::Internal(message.into())
-    }
+    Internal(&'static str),
 }

 pub struct HandshakeResponse {
@@ -179,7 +177,7 @@ impl VaultGate {
            }
            Err(err) => {
                error!(?err, "Failed to send unseal request to vault");
-                Err(Error::internal("Vault actor error"))
+                Err(Error::Internal("Vault actor error"))
            }
        }
    }
@@ -221,7 +219,7 @@ impl VaultGate {
            }
            Err(err) => {
                error!(?err, "Failed to send bootstrap request to vault");
-                Err(Error::internal("Vault error"))
+                Err(Error::Internal("Vault error"))
            }
        }
    }
@@ -233,7 +231,10 @@ impl VaultGate {
            .vault
            .ask(GetState {})
            .await
-            .map_err(|_| Error::internal("failed to query vault"))?;
+            .map_err(|err| {
+                error!(?err, "Failed to query vault state");
+                Error::Internal("failed to query vault")
+            })?;

        Ok(answer)
    }
@@ -252,7 +253,10 @@ impl Message<events::Bootstrapped> for VaultGate {
                .db
                .get()
                .await
-                .map_err(|_| Error::internal("DB unavailable"))?;
+                .map_err(|err| {
+                    error!(error = %crate::utils::error_chain(&err), "DB unavailable on bootstrap");
+                    Error::Internal("DB unavailable")
+                })?;
            integrity::sign_entity(
                &mut conn,
                &self.actors.vault,
@@ -260,9 +264,12 @@ impl Message<events::Bootstrapped> for VaultGate {
                self.auth_creds.id,
            )
            .await
-            .map_err(|e| {
-                error!(?e, "Failed to sign integrity envelope on bootstrap");
-                Error::internal("Integrity sign failed")
+            .map_err(|err| {
+                error!(
+                    error = %crate::utils::error_chain(&err),
+                    "Failed to sign integrity envelope on bootstrap"
+                );
+                Error::Internal("Integrity sign failed")
            })?;
            Ok(())
        }
--- a/server/crates/arbiter-server/src/utils.rs
+++ b/server/crates/arbiter-server/src/utils.rs
@@ -14,3 +14,47 @@ impl<F: FnOnce()> Drop for DeferClosure<F> {
 pub fn defer<F: FnOnce()>(f: F) -> impl Drop + Sized {
    DeferClosure { f: Some(f) }
 }
+
+/// Renders an error together with its full `source` chain as `outer: inner: root`.
+///
+/// Error variants in this crate deliberately keep `Display` terse so that no
+/// internal detail can leak across the gRPC boundary. That same terseness would
+/// hide the cause in the logs, so use this for `tracing` fields, never in a
+/// wire payload.
+pub fn error_chain(err: &dyn core::error::Error) -> String {
+    let mut out = err.to_string();
+    let mut current = err.source();
+    while let Some(source) = current {
+        out.push_str(": ");
+        out.push_str(&source.to_string());
+        current = source.source();
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::error_chain;
+
+    #[derive(Debug, thiserror::Error)]
+    #[error("root")]
+    struct Root;
+
+    #[derive(Debug, thiserror::Error)]
+    #[error("middle")]
+    struct Middle(#[source] Root);
+
+    #[derive(Debug, thiserror::Error)]
+    #[error("outer")]
+    struct Outer(#[source] Middle);
+
+    #[test]
+    fn walks_the_whole_source_chain() {
+        assert_eq!(error_chain(&Root), "root", "a leaf error renders alone");
+        assert_eq!(
+            error_chain(&Outer(Middle(Root))),
+            "outer: middle: root",
+            "every source link must appear, in order"
+        );
+    }
+}
--- a/server/crates/arbiter-server/tests/client/auth.rs
+++ b/server/crates/arbiter-server/tests/client/auth.rs
@@ -86,8 +86,8 @@ async fn insert_bootstrap_sentinel_operator(db: &db::DatabasePool) {
        .0
        .to_vec();

-    insert_into(schema::operator_identity::table)
-        .values((schema::operator_identity::public_key.eq(sentinel_key),))
+    insert_into(schema::operator_client::table)
+        .values((schema::operator_client::public_key.eq(sentinel_key),))
        .execute(&mut conn)
        .await
        .unwrap();
--- a/server/crates/arbiter-server/tests/operator/auth.rs
+++ b/server/crates/arbiter-server/tests/operator/auth.rs
@@ -206,8 +206,8 @@ pub async fn bootstrap_token_auth() {
    task.await.unwrap().unwrap();

    let mut conn = db.get().await.unwrap();
-    let stored_pubkey: Vec<u8> = schema::operator_identity::table
-        .select(schema::operator_identity::public_key)
+    let stored_pubkey: Vec<u8> = schema::operator_client::table
+        .select(schema::operator_client::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_identity::table
+    let count: i64 = schema::operator_client::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_identity::table)
-            .values((schema::operator_identity::public_key.eq(pubkey_bytes.clone()),))
-            .returning(schema::operator_identity::id)
+        let id: i32 = insert_into(schema::operator_client::table)
+            .values((schema::operator_client::public_key.eq(pubkey_bytes.clone()),))
+            .returning(schema::operator_client::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_identity::table)
-            .values((schema::operator_identity::public_key.eq(pubkey_bytes.clone()),))
+        insert_into(schema::operator_client::table)
+            .values((schema::operator_client::public_key.eq(pubkey_bytes.clone()),))
            .execute(&mut conn)
            .await
            .unwrap();
@@ -444,9 +444,9 @@ pub async fn challenge_auth_rejects_invalid_signature() {

    {
        let mut conn = db.get().await.unwrap();
-        let id: i32 = insert_into(schema::operator_identity::table)
-            .values((schema::operator_identity::public_key.eq(pubkey_bytes.clone()),))
-            .returning(schema::operator_identity::id)
+        let id: i32 = insert_into(schema::operator_client::table)
+            .values((schema::operator_client::public_key.eq(pubkey_bytes.clone()),))
+            .returning(schema::operator_client::id)
            .get_result(&mut conn)
            .await
            .unwrap();