feat(grpc): governance contract

refactor(server::db): introduced newtype wrappers for entity id's in database
housekeeping(server): deps upgrade + diesel migration to AsyncFnOnce
2026-08-26 13:01:44 +02:00 · 2026-08-26 13:01:44 +02:00 · 2026-08-26 13:01:44 +02:00 · 2026-08-26 13:01:44 +02:00 · 2026-08-26 13:01:44 +02:00 · 2026-08-26 13:01:44 +02:00
58 changed files with 797 additions and 3876 deletions
--- a/app/.dart_tool/extension_discovery/README.md
+++ b/app/.dart_tool/extension_discovery/README.md
@@ -1,31 +0,0 @@
 Extension Discovery Cache
 =========================
 This folder is used by `package:extension_discovery` to cache lists of
 packages that contains extensions for other packages.
 DO NOT USE THIS FOLDER
 ----------------------
 * Do not read (or rely) the contents of this folder.
 * Do write to this folder.
 If you're interested in the lists of extensions stored in this folder use the
 API offered by package `extension_discovery` to get this information.
 If this package doesn't work for your use-case, then don't try to read the
 contents of this folder. It may change, and will not remain stable.
 Use package `extension_discovery`
 ---------------------------------
 If you want to access information from this folder.
 Feel free to delete this folder
 -------------------------------
 Files in this folder act as a cache, and the cache is discarded if the files
 are older than the modification time of `.dart_tool/package_config.json`.
 Hence, it should never be necessary to clear this cache manually, if you find a
 need to do please file a bug.
--- a/app/.dart_tool/extension_discovery/vs_code.json
+++ b/app/.dart_tool/extension_discovery/vs_code.json
@@ -1 +0,0 @@
 {"version":2,"entries":[{"package":"app","rootUri":"../","packageUri":"lib/"}]}
--- a/app/.dart_tool/package_config.json
+++ b/app/.dart_tool/package_config.json
@@ -1,178 +0,0 @@
 {
  "configVersion": 2,
  "packages": [
    {
      "name": "async",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/async-2.13.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "boolean_selector",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "characters",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/characters-1.4.0",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "clock",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/clock-1.1.2",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "collection",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/collection-1.19.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "cupertino_icons",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.8",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "fake_async",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/fake_async-1.3.3",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "flutter",
      "rootUri": "file:///Users/kaska/.local/share/mise/installs/flutter/3.38.9-stable/packages/flutter",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_lints",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/flutter_lints-6.0.0",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "flutter_test",
      "rootUri": "file:///Users/kaska/.local/share/mise/installs/flutter/3.38.9-stable/packages/flutter_test",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "leak_tracker",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/leak_tracker-11.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_flutter_testing",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "leak_tracker_testing",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.2"
    },
    {
      "name": "lints",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/lints-6.1.0",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "matcher",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/matcher-0.12.17",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "material_color_utilities",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1",
      "packageUri": "lib/",
      "languageVersion": "2.17"
    },
    {
      "name": "meta",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/meta-1.17.0",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "path",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/path-1.9.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "sky_engine",
      "rootUri": "file:///Users/kaska/.local/share/mise/installs/flutter/3.38.9-stable/bin/cache/pkg/sky_engine",
      "packageUri": "lib/",
      "languageVersion": "3.8"
    },
    {
      "name": "source_span",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/source_span-1.10.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "stack_trace",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/stack_trace-1.12.1",
      "packageUri": "lib/",
      "languageVersion": "3.4"
    },
    {
      "name": "stream_channel",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/stream_channel-2.1.4",
      "packageUri": "lib/",
      "languageVersion": "3.3"
    },
    {
      "name": "string_scanner",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/string_scanner-1.4.1",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "term_glyph",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/term_glyph-1.2.2",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "test_api",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/test_api-0.7.7",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "vector_math",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/vector_math-2.2.0",
      "packageUri": "lib/",
      "languageVersion": "3.1"
    },
    {
      "name": "vm_service",
      "rootUri": "file:///Users/kaska/.pub-cache/hosted/pub.dev/vm_service-15.0.2",
      "packageUri": "lib/",
      "languageVersion": "3.5"
    },
    {
      "name": "app",
      "rootUri": "../",
      "packageUri": "lib/",
      "languageVersion": "3.10"
    }
  ],
  "generator": "pub",
  "generatorVersion": "3.10.8",
  "flutterRoot": "file:///Users/kaska/.local/share/mise/installs/flutter/3.38.9-stable",
  "flutterVersion": "3.38.9",
  "pubCache": "file:///Users/kaska/.pub-cache"
 }
--- a/app/.dart_tool/package_graph.json
+++ b/app/.dart_tool/package_graph.json
@@ -1,230 +0,0 @@
 {
  "roots": [
    "app"
  ],
  "packages": [
    {
      "name": "app",
      "version": "1.0.0+1",
      "dependencies": [
        "cupertino_icons",
        "flutter"
      ],
      "devDependencies": [
        "flutter_lints",
        "flutter_test"
      ]
    },
    {
      "name": "flutter_lints",
      "version": "6.0.0",
      "dependencies": [
        "lints"
      ]
    },
    {
      "name": "flutter_test",
      "version": "0.0.0",
      "dependencies": [
        "clock",
        "collection",
        "fake_async",
        "flutter",
        "leak_tracker_flutter_testing",
        "matcher",
        "meta",
        "path",
        "stack_trace",
        "stream_channel",
        "test_api",
        "vector_math"
      ]
    },
    {
      "name": "cupertino_icons",
      "version": "1.0.8",
      "dependencies": []
    },
    {
      "name": "flutter",
      "version": "0.0.0",
      "dependencies": [
        "characters",
        "collection",
        "material_color_utilities",
        "meta",
        "sky_engine",
        "vector_math"
      ]
    },
    {
      "name": "lints",
      "version": "6.1.0",
      "dependencies": []
    },
    {
      "name": "stream_channel",
      "version": "2.1.4",
      "dependencies": [
        "async"
      ]
    },
    {
      "name": "meta",
      "version": "1.17.0",
      "dependencies": []
    },
    {
      "name": "collection",
      "version": "1.19.1",
      "dependencies": []
    },
    {
      "name": "leak_tracker_flutter_testing",
      "version": "3.0.10",
      "dependencies": [
        "flutter",
        "leak_tracker",
        "leak_tracker_testing",
        "matcher",
        "meta"
      ]
    },
    {
      "name": "vector_math",
      "version": "2.2.0",
      "dependencies": []
    },
    {
      "name": "stack_trace",
      "version": "1.12.1",
      "dependencies": [
        "path"
      ]
    },
    {
      "name": "clock",
      "version": "1.1.2",
      "dependencies": []
    },
    {
      "name": "fake_async",
      "version": "1.3.3",
      "dependencies": [
        "clock",
        "collection"
      ]
    },
    {
      "name": "path",
      "version": "1.9.1",
      "dependencies": []
    },
    {
      "name": "matcher",
      "version": "0.12.17",
      "dependencies": [
        "async",
        "meta",
        "stack_trace",
        "term_glyph",
        "test_api"
      ]
    },
    {
      "name": "test_api",
      "version": "0.7.7",
      "dependencies": [
        "async",
        "boolean_selector",
        "collection",
        "meta",
        "source_span",
        "stack_trace",
        "stream_channel",
        "string_scanner",
        "term_glyph"
      ]
    },
    {
      "name": "sky_engine",
      "version": "0.0.0",
      "dependencies": []
    },
    {
      "name": "material_color_utilities",
      "version": "0.11.1",
      "dependencies": [
        "collection"
      ]
    },
    {
      "name": "characters",
      "version": "1.4.0",
      "dependencies": []
    },
    {
      "name": "async",
      "version": "2.13.0",
      "dependencies": [
        "collection",
        "meta"
      ]
    },
    {
      "name": "leak_tracker_testing",
      "version": "3.0.2",
      "dependencies": [
        "leak_tracker",
        "matcher",
        "meta"
      ]
    },
    {
      "name": "leak_tracker",
      "version": "11.0.2",
      "dependencies": [
        "clock",
        "collection",
        "meta",
        "path",
        "vm_service"
      ]
    },
    {
      "name": "term_glyph",
      "version": "1.2.2",
      "dependencies": []
    },
    {
      "name": "string_scanner",
      "version": "1.4.1",
      "dependencies": [
        "source_span"
      ]
    },
    {
      "name": "source_span",
      "version": "1.10.2",
      "dependencies": [
        "collection",
        "path",
        "term_glyph"
      ]
    },
    {
      "name": "boolean_selector",
      "version": "2.1.2",
      "dependencies": [
        "source_span",
        "string_scanner"
      ]
    },
    {
      "name": "vm_service",
      "version": "15.0.2",
      "dependencies": []
    }
  ],
  "configVersion": 1
 }
--- a/app/.dart_tool/version
+++ b/app/.dart_tool/version
@@ -1 +0,0 @@
 3.38.9
--- a/docs/superpowers/plans/2026-03-28-grant-creation-refactor.md
+++ b/docs/superpowers/plans/2026-03-28-grant-creation-refactor.md
--- a/docs/superpowers/plans/2026-03-28-grant-grid-view.md
+++ b/docs/superpowers/plans/2026-03-28-grant-grid-view.md
@@ -1,821 +0,0 @@
 # Grant Grid View Implementation Plan
 > **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
 **Goal:** Add an "EVM Grants" dashboard tab that displays all grants as enriched cards (type, chain, wallet address, client name) with per-card revoke support.
 **Architecture:** A new `walletAccessListProvider` fetches wallet accesses with their DB row IDs. The screen (`grants.dart`) watches only `evmGrantsProvider` for top-level state. Each `GrantCard` widget (its own file) watches enrichment providers (`walletAccessListProvider`, `evmProvider`, `sdkClientsProvider`) and the revoke mutation directly — keeping rebuilds scoped to the card. The screen is registered as a dashboard tab in `AdaptiveScaffold`.
 **Tech Stack:** Flutter, Riverpod (`riverpod_annotation` + `build_runner` codegen), `sizer` (adaptive sizing), `auto_route`, Protocol Buffers (Dart), `Palette` design tokens.
 ---
 ## File Map
 | File | Action | Responsibility |
 |---|---|---|
 | `operator/lib/theme/palette.dart` | Modify | Add `Palette.token` (indigo accent for token-transfer cards) |
 | `operator/lib/features/connection/evm/wallet_access.dart` | Modify | Add `listAllWalletAccesses()` function |
 | `operator/lib/providers/sdk_clients/wallet_access_list.dart` | Create | `WalletAccessListProvider` — fetches full wallet access list with IDs |
 | `operator/lib/screens/dashboard/evm/grants/widgets/grant_card.dart` | Create | `GrantCard` widget — watches enrichment providers + revoke mutation; one card per grant |
 | `operator/lib/screens/dashboard/evm/grants/grants.dart` | Create | `EvmGrantsScreen` — watches `evmGrantsProvider`; handles loading/error/empty/data states; renders `GrantCard` list |
 | `operator/lib/router.dart` | Modify | Register `EvmGrantsRoute` in dashboard children |
 | `operator/lib/screens/dashboard.dart` | Modify | Add Grants entry to `routes` list and `NavigationDestination` list |
 ---
 ## Task 1: Add `Palette.token`
 **Files:**
 - Modify: `operator/lib/theme/palette.dart`
 - [ ] **Step 1: Add the color**
 Replace the contents of `operator/lib/theme/palette.dart` with:
 ```dart
 import 'package:flutter/material.dart';
 class Palette {
  static const ink = Color(0xFF15263C);
  static const coral = Color(0xFFE26254);
  static const cream = Color(0xFFFFFAF4);
  static const line = Color(0x1A15263C);
  static const token = Color(0xFF5C6BC0);
 }
 ```
 - [ ] **Step 2: Verify**
 ```sh
 cd operator && flutter analyze lib/theme/palette.dart
 ```
 Expected: no issues.
 - [ ] **Step 3: Commit**
 ```sh
 jj describe -m "feat(theme): add Palette.token for token-transfer grant cards"
 jj new
 ```
 ---
 ## Task 2: Add `listAllWalletAccesses` feature function
 **Files:**
 - Modify: `operator/lib/features/connection/evm/wallet_access.dart`
 `readClientWalletAccess` (existing) filters the list to one client's wallet IDs and returns `Set<int>`. This new function returns the complete unfiltered list with row IDs so the grant cards can resolve wallet_access_id → wallet + client.
 - [ ] **Step 1: Append function**
 Add at the bottom of `operator/lib/features/connection/evm/wallet_access.dart`:
 ```dart
 Future<List<SdkClientWalletAccess>> listAllWalletAccesses(
  Connection connection,
 ) async {
  final response = await connection.ask(
    OperatorRequest(listWalletAccess: Empty()),
  );
  if (!response.hasListWalletAccessResponse()) {
    throw Exception(
      'Expected list wallet access response, got ${response.whichPayload()}',
    );
  }
  return response.listWalletAccessResponse.accesses.toList(growable: false);
 }
 ```
 Each returned `SdkClientWalletAccess` has:
 - `.id` — the `evm_wallet_access` row ID (same value as `wallet_access_id` in a `GrantEntry`)
 - `.access.walletId` — the EVM wallet DB ID
 - `.access.sdkClientId` — the SDK client DB ID
 - [ ] **Step 2: Verify**
 ```sh
 cd operator && flutter analyze lib/features/connection/evm/wallet_access.dart
 ```
 Expected: no issues.
 - [ ] **Step 3: Commit**
 ```sh
 jj describe -m "feat(evm): add listAllWalletAccesses feature function"
 jj new
 ```
 ---
 ## Task 3: Create `WalletAccessListProvider`
 **Files:**
 - Create: `operator/lib/providers/sdk_clients/wallet_access_list.dart`
 - Generated: `operator/lib/providers/sdk_clients/wallet_access_list.g.dart`
 Mirrors the structure of `EvmGrants` in `providers/evm/evm_grants.dart` — class-based `@riverpod` with a `refresh()` method.
 - [ ] **Step 1: Write the provider**
 Create `operator/lib/providers/sdk_clients/wallet_access_list.dart`:
 ```dart
 import 'package:arbiter/features/connection/evm/wallet_access.dart';
 import 'package:arbiter/proto/operator.pb.dart';
 import 'package:arbiter/providers/connection/connection_manager.dart';
 import 'package:mtcore/markettakers.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'wallet_access_list.g.dart';
@riverpod
 class WalletAccessList extends _$WalletAccessList {
  @override
  Future<List<SdkClientWalletAccess>?> build() async {
    final connection = await ref.watch(connectionManagerProvider.future);
    if (connection == null) {
      return null;
    }
    try {
      return await listAllWalletAccesses(connection);
    } catch (e, st) {
      talker.handle(e, st);
      rethrow;
    }
  }
  Future<void> refresh() async {
    final connection = await ref.read(connectionManagerProvider.future);
    if (connection == null) {
      state = const AsyncData(null);
      return;
    }
    state = const AsyncLoading();
    state = await AsyncValue.guard(() => listAllWalletAccesses(connection));
  }
 }
 ```
 - [ ] **Step 2: Run code generation**
 ```sh
 cd operator && dart run build_runner build --delete-conflicting-outputs
 ```
 Expected: `operator/lib/providers/sdk_clients/wallet_access_list.g.dart` created. No errors.
 - [ ] **Step 3: Verify**
 ```sh
 cd operator && flutter analyze lib/providers/sdk_clients/
 ```
 Expected: no issues.
 - [ ] **Step 4: Commit**
 ```sh
 jj describe -m "feat(providers): add WalletAccessListProvider"
 jj new
 ```
 ---
 ## Task 4: Create `GrantCard` widget
 **Files:**
 - Create: `operator/lib/screens/dashboard/evm/grants/widgets/grant_card.dart`
 This widget owns all per-card logic: enrichment lookups, revoke action, and rebuild scope. The screen only passes it a `GrantEntry` — the card fetches everything else itself.
 **Key types:**
 - `GrantEntry` (from `proto/evm.pb.dart`): `.id`, `.shared.walletAccessId`, `.shared.chainId`, `.specific.whichGrant()`
 - `SpecificGrant_Grant.etherTransfer` / `.tokenTransfer` — enum values for the oneof
 - `SdkClientWalletAccess` (from `proto/operator.pb.dart`): `.id`, `.access.walletId`, `.access.sdkClientId`
 - `WalletEntry` (from `proto/evm.pb.dart`): `.id`, `.address` (List<int>)
 - `SdkClientEntry` (from `proto/operator.pb.dart`): `.id`, `.info.name`
 - `revokeEvmGrantMutation` — `Mutation<void>` (global; all revoke buttons disable together while any revoke is in flight)
 - `executeRevokeEvmGrant(ref, grantId: int)` — `Future<void>`
 - [ ] **Step 1: Write the widget**
 Create `operator/lib/screens/dashboard/evm/grants/widgets/grant_card.dart`:
 ```dart
 import 'package:arbiter/proto/evm.pb.dart';
 import 'package:arbiter/proto/operator.pb.dart';
 import 'package:arbiter/providers/evm/evm.dart';
 import 'package:arbiter/providers/evm/evm_grants.dart';
 import 'package:arbiter/providers/sdk_clients/list.dart';
 import 'package:arbiter/providers/sdk_clients/wallet_access_list.dart';
 import 'package:arbiter/theme/palette.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/experimental/mutation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:sizer/sizer.dart';
 String _shortAddress(List<int> bytes) {
  final hex = bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join();
  return '0x${hex.substring(0, 6)}...${hex.substring(hex.length - 4)}';
 }
 String _formatError(Object error) {
  final message = error.toString();
  if (message.startsWith('Exception: ')) {
    return message.substring('Exception: '.length);
  }
  return message;
 }
 class GrantCard extends ConsumerWidget {
  const GrantCard({super.key, required this.grant});
  final GrantEntry grant;
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    // Enrichment lookups — each watch scopes rebuilds to this card only
    final walletAccesses =
        ref.watch(walletAccessListProvider).asData?.value ?? const [];
    final wallets = ref.watch(evmProvider).asData?.value ?? const [];
    final clients = ref.watch(sdkClientsProvider).asData?.value ?? const [];
    final revoking = ref.watch(revokeEvmGrantMutation) is MutationPending;
    final isEther =
        grant.specific.whichGrant() == SpecificGrant_Grant.etherTransfer;
    final accent = isEther ? Palette.coral : Palette.token;
    final typeLabel = isEther ? 'Ether' : 'Token';
    final theme = Theme.of(context);
    final muted = Palette.ink.withValues(alpha: 0.62);
    // Resolve wallet_access_id → wallet address + client name
    final accessById = <int, SdkClientWalletAccess>{
      for (final a in walletAccesses) a.id: a,
    };
    final walletById = <int, WalletEntry>{
      for (final w in wallets) w.id: w,
    };
    final clientNameById = <int, String>{
      for (final c in clients) c.id: c.info.name,
    };
    final accessId = grant.shared.walletAccessId;
    final access = accessById[accessId];
    final wallet = access != null ? walletById[access.access.walletId] : null;
    final walletLabel = wallet != null
        ? _shortAddress(wallet.address)
        : 'Access #$accessId';
    final clientLabel = () {
      if (access == null) return '';
      final name = clientNameById[access.access.sdkClientId] ?? '';
      return name.isEmpty ? 'Client #${access.access.sdkClientId}' : name;
    }();
    void showError(String message) {
      if (!context.mounted) return;
      ScaffoldMessenger.of(context).showSnackBar(
        SnackBar(content: Text(message), behavior: SnackBarBehavior.floating),
      );
    }
    Future<void> revoke() async {
      try {
        await executeRevokeEvmGrant(ref, grantId: grant.id);
      } catch (e) {
        showError(_formatError(e));
      }
    }
    return Container(
      decoration: BoxDecoration(
        borderRadius: BorderRadius.circular(24),
        color: Palette.cream.withValues(alpha: 0.92),
        border: Border.all(color: Palette.line),
      ),
      child: IntrinsicHeight(
        child: Row(
          crossAxisAlignment: CrossAxisAlignment.stretch,
          children: [
            // Accent strip
            Container(
              width: 0.8.w,
              decoration: BoxDecoration(
                color: accent,
                borderRadius: const BorderRadius.horizontal(
                  left: Radius.circular(24),
                ),
              ),
            ),
            // Card body
            Expanded(
              child: Padding(
                padding: EdgeInsets.symmetric(
                  horizontal: 1.6.w,
                  vertical: 1.4.h,
                ),
                child: Column(
                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
                    // Row 1: type badge · chain · spacer · revoke button
                    Row(
                      children: [
                        Container(
                          padding: EdgeInsets.symmetric(
                            horizontal: 1.w,
                            vertical: 0.4.h,
                          ),
                          decoration: BoxDecoration(
                            color: accent.withValues(alpha: 0.15),
                            borderRadius: BorderRadius.circular(8),
                          ),
                          child: Text(
                            typeLabel,
                            style: theme.textTheme.labelSmall?.copyWith(
                              color: accent,
                              fontWeight: FontWeight.w800,
                            ),
                          ),
                        ),
                        SizedBox(width: 1.w),
                        Container(
                          padding: EdgeInsets.symmetric(
                            horizontal: 1.w,
                            vertical: 0.4.h,
                          ),
                          decoration: BoxDecoration(
                            color: Palette.ink.withValues(alpha: 0.06),
                            borderRadius: BorderRadius.circular(8),
                          ),
                          child: Text(
                            'Chain ${grant.shared.chainId}',
                            style: theme.textTheme.labelSmall?.copyWith(
                              color: muted,
                              fontWeight: FontWeight.w700,
                            ),
                          ),
                        ),
                        const Spacer(),
                        if (revoking)
                          SizedBox(
                            width: 1.8.h,
                            height: 1.8.h,
                            child: CircularProgressIndicator(
                              strokeWidth: 2,
                              color: Palette.coral,
                            ),
                          )
                        else
                          OutlinedButton.icon(
                            onPressed: revoke,
                            style: OutlinedButton.styleFrom(
                              foregroundColor: Palette.coral,
                              side: BorderSide(
                                color: Palette.coral.withValues(alpha: 0.4),
                              ),
                              padding: EdgeInsets.symmetric(
                                horizontal: 1.w,
                                vertical: 0.6.h,
                              ),
                              shape: RoundedRectangleBorder(
                                borderRadius: BorderRadius.circular(10),
                              ),
                            ),
                            icon: const Icon(Icons.block_rounded, size: 16),
                            label: const Text('Revoke'),
                          ),
                      ],
                    ),
                    SizedBox(height: 0.8.h),
                    // Row 2: wallet address · client name
                    Row(
                      children: [
                        Text(
                          walletLabel,
                          style: theme.textTheme.bodySmall?.copyWith(
                            color: Palette.ink,
                            fontFamily: 'monospace',
                          ),
                        ),
                        Padding(
                          padding: EdgeInsets.symmetric(horizontal: 0.8.w),
                          child: Text(
                            '·',
                            style: theme.textTheme.bodySmall
                                ?.copyWith(color: muted),
                          ),
                        ),
                        Expanded(
                          child: Text(
                            clientLabel,
                            maxLines: 1,
                            overflow: TextOverflow.ellipsis,
                            style: theme.textTheme.bodySmall
                                ?.copyWith(color: muted),
                          ),
                        ),
                      ],
                    ),
                  ],
                ),
              ),
            ),
          ],
        ),
      ),
    );
  }
 }
 ```
 - [ ] **Step 2: Verify**
 ```sh
 cd operator && flutter analyze lib/screens/dashboard/evm/grants/widgets/grant_card.dart
 ```
 Expected: no issues.
 - [ ] **Step 3: Commit**
 ```sh
 jj describe -m "feat(grants): add GrantCard widget with self-contained enrichment"
 jj new
 ```
 ---
 ## Task 5: Create `EvmGrantsScreen`
 **Files:**
 - Create: `operator/lib/screens/dashboard/evm/grants/grants.dart`
 The screen watches only `evmGrantsProvider` for top-level state (loading / error / no connection / empty / data). When there is data it renders a list of `GrantCard` widgets — each card manages its own enrichment subscriptions.
 - [ ] **Step 1: Write the screen**
 Create `operator/lib/screens/dashboard/evm/grants/grants.dart`:
 ```dart
 import 'package:arbiter/proto/evm.pb.dart';
 import 'package:arbiter/providers/evm/evm_grants.dart';
 import 'package:arbiter/providers/sdk_clients/wallet_access_list.dart';
 import 'package:arbiter/router.gr.dart';
 import 'package:arbiter/screens/dashboard/evm/grants/widgets/grant_card.dart';
 import 'package:arbiter/theme/palette.dart';
 import 'package:arbiter/widgets/page_header.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:sizer/sizer.dart';
 String _formatError(Object error) {
  final message = error.toString();
  if (message.startsWith('Exception: ')) {
    return message.substring('Exception: '.length);
  }
  return message;
 }
 // ─── State panel ──────────────────────────────────────────────────────────────
 class _StatePanel extends StatelessWidget {
  const _StatePanel({
    required this.icon,
    required this.title,
    required this.body,
    this.actionLabel,
    this.onAction,
    this.busy = false,
  });
  final IconData icon;
  final String title;
  final String body;
  final String? actionLabel;
  final Future<void> Function()? onAction;
  final bool busy;
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    return Container(
      decoration: BoxDecoration(
        borderRadius: BorderRadius.circular(24),
        color: Palette.cream.withValues(alpha: 0.92),
        border: Border.all(color: Palette.line),
      ),
      child: Padding(
        padding: EdgeInsets.all(2.8.h),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
            if (busy)
              SizedBox(
                width: 2.8.h,
                height: 2.8.h,
                child: const CircularProgressIndicator(strokeWidth: 2.5),
              )
            else
              Icon(icon, size: 34, color: Palette.coral),
            SizedBox(height: 1.8.h),
            Text(
              title,
              style: theme.textTheme.headlineSmall?.copyWith(
                color: Palette.ink,
                fontWeight: FontWeight.w800,
              ),
            ),
            SizedBox(height: 1.h),
            Text(
              body,
              style: theme.textTheme.bodyLarge?.copyWith(
                color: Palette.ink.withValues(alpha: 0.72),
                height: 1.5,
              ),
            ),
            if (actionLabel != null && onAction != null) ...[
              SizedBox(height: 2.h),
              OutlinedButton.icon(
                onPressed: () => onAction!(),
                icon: const Icon(Icons.refresh),
                label: Text(actionLabel!),
              ),
            ],
          ],
        ),
      ),
    );
  }
 }
 // ─── Grant list ───────────────────────────────────────────────────────────────
 class _GrantList extends StatelessWidget {
  const _GrantList({required this.grants});
  final List<GrantEntry> grants;
  @override
  Widget build(BuildContext context) {
    return Column(
      children: [
        for (var i = 0; i < grants.length; i++)
          Padding(
            padding: EdgeInsets.only(
              bottom: i == grants.length - 1 ? 0 : 1.8.h,
            ),
            child: GrantCard(grant: grants[i]),
          ),
      ],
    );
  }
 }
 // ─── Screen ───────────────────────────────────────────────────────────────────
@RoutePage()
 class EvmGrantsScreen extends ConsumerWidget {
  const EvmGrantsScreen({super.key});
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    // Screen watches only the grant list for top-level state decisions
    final grantsAsync = ref.watch(evmGrantsProvider);
    Future<void> refresh() async {
      await Future.wait([
        ref.read(evmGrantsProvider.notifier).refresh(),
        ref.read(walletAccessListProvider.notifier).refresh(),
      ]);
    }
    void showMessage(String message) {
      if (!context.mounted) return;
      ScaffoldMessenger.of(context).showSnackBar(
        SnackBar(content: Text(message), behavior: SnackBarBehavior.floating),
      );
    }
    Future<void> safeRefresh() async {
      try {
        await refresh();
      } catch (e) {
        showMessage(_formatError(e));
      }
    }
    final grantsState = grantsAsync.asData?.value;
    final grants = grantsState?.grants;
    final content = switch (grantsAsync) {
      AsyncLoading() when grantsState == null => const _StatePanel(
        icon: Icons.hourglass_top,
        title: 'Loading grants',
        body: 'Pulling grant registry from Arbiter.',
        busy: true,
      ),
      AsyncError(:final error) => _StatePanel(
        icon: Icons.sync_problem,
        title: 'Grant registry unavailable',
        body: _formatError(error),
        actionLabel: 'Retry',
        onAction: safeRefresh,
      ),
      AsyncData(:final value) when value == null => _StatePanel(
        icon: Icons.portable_wifi_off,
        title: 'No active server connection',
        body: 'Reconnect to Arbiter to list EVM grants.',
        actionLabel: 'Refresh',
        onAction: safeRefresh,
      ),
      _ when grants != null && grants.isEmpty => _StatePanel(
        icon: Icons.policy_outlined,
        title: 'No grants yet',
        body: 'Create a grant to allow SDK clients to sign transactions.',
        actionLabel: 'Create grant',
        onAction: () => context.router.push(const CreateEvmGrantRoute()),
      ),
      _ => _GrantList(grants: grants ?? const []),
    };
    return Scaffold(
      body: SafeArea(
        child: RefreshIndicator.adaptive(
          color: Palette.ink,
          backgroundColor: Colors.white,
          onRefresh: safeRefresh,
          child: ListView(
            physics: const BouncingScrollPhysics(
              parent: AlwaysScrollableScrollPhysics(),
            ),
            padding: EdgeInsets.fromLTRB(2.4.w, 2.4.h, 2.4.w, 3.2.h),
            children: [
              PageHeader(
                title: 'EVM Grants',
                isBusy: grantsAsync.isLoading,
                actions: [
                  FilledButton.icon(
                    onPressed: () =>
                        context.router.push(const CreateEvmGrantRoute()),
                    icon: const Icon(Icons.add_rounded),
                    label: const Text('Create grant'),
                  ),
                  SizedBox(width: 1.w),
                  OutlinedButton.icon(
                    onPressed: safeRefresh,
                    style: OutlinedButton.styleFrom(
                      foregroundColor: Palette.ink,
                      side: BorderSide(color: Palette.line),
                      padding: EdgeInsets.symmetric(
                        horizontal: 1.4.w,
                        vertical: 1.2.h,
                      ),
                      shape: RoundedRectangleBorder(
                        borderRadius: BorderRadius.circular(14),
                      ),
                    ),
                    icon: const Icon(Icons.refresh, size: 18),
                    label: const Text('Refresh'),
                  ),
                ],
              ),
              SizedBox(height: 1.8.h),
              content,
            ],
          ),
        ),
      ),
    );
  }
 }
 ```
 - [ ] **Step 2: Verify**
 ```sh
 cd operator && flutter analyze lib/screens/dashboard/evm/grants/
 ```
 Expected: no issues.
 - [ ] **Step 3: Commit**
 ```sh
 jj describe -m "feat(grants): add EvmGrantsScreen"
 jj new
 ```
 ---
 ## Task 6: Wire router and dashboard tab
 **Files:**
 - Modify: `operator/lib/router.dart`
 - Modify: `operator/lib/screens/dashboard.dart`
 - Regenerated: `operator/lib/router.gr.dart`
 - [ ] **Step 1: Add route to `router.dart`**
 Replace the contents of `operator/lib/router.dart` with:
 ```dart
 import 'package:auto_route/auto_route.dart';
 import 'router.gr.dart';
@AutoRouterConfig(generateForDir: ['lib/screens'])
 class Router extends RootStackRouter {
  @override
  List<AutoRoute> get routes => [
    AutoRoute(page: Bootstrap.page, path: '/bootstrap', initial: true),
    AutoRoute(page: ServerInfoSetupRoute.page, path: '/server-info'),
    AutoRoute(page: ServerConnectionRoute.page, path: '/server-connection'),
    AutoRoute(page: VaultSetupRoute.page, path: '/vault'),
    AutoRoute(page: ClientDetailsRoute.page, path: '/clients/:clientId'),
    AutoRoute(page: CreateEvmGrantRoute.page, path: '/evm-grants/create'),
    AutoRoute(
      page: DashboardRouter.page,
      path: '/dashboard',
      children: [
        AutoRoute(page: EvmRoute.page, path: 'evm'),
        AutoRoute(page: ClientsRoute.page, path: 'clients'),
        AutoRoute(page: EvmGrantsRoute.page, path: 'grants'),
        AutoRoute(page: AboutRoute.page, path: 'about'),
      ],
    ),
  ];
 }
 ```
 - [ ] **Step 2: Update `dashboard.dart`**
 In `operator/lib/screens/dashboard.dart`, replace the `routes` constant:
 ```dart
 final routes = [
  const EvmRoute(),
  const ClientsRoute(),
  const EvmGrantsRoute(),
  const AboutRoute(),
 ];
 ```
 And replace the `destinations` list inside `AdaptiveScaffold`:
 ```dart
 destinations: const [
  NavigationDestination(
    icon: Icon(Icons.account_balance_wallet_outlined),
    selectedIcon: Icon(Icons.account_balance_wallet),
    label: 'Wallets',
  ),
  NavigationDestination(
    icon: Icon(Icons.devices_other_outlined),
    selectedIcon: Icon(Icons.devices_other),
    label: 'Clients',
  ),
  NavigationDestination(
    icon: Icon(Icons.policy_outlined),
    selectedIcon: Icon(Icons.policy),
    label: 'Grants',
  ),
  NavigationDestination(
    icon: Icon(Icons.info_outline),
    selectedIcon: Icon(Icons.info),
    label: 'About',
  ),
 ],
 ```
 - [ ] **Step 3: Regenerate router**
 ```sh
 cd operator && dart run build_runner build --delete-conflicting-outputs
 ```
 Expected: `lib/router.gr.dart` updated, `EvmGrantsRoute` now available, no errors.
 - [ ] **Step 4: Full project verify**
 ```sh
 cd operator && flutter analyze
 ```
 Expected: no issues.
 - [ ] **Step 5: Commit**
 ```sh
 jj describe -m "feat(nav): add Grants dashboard tab"
 jj new
 ```
--- a/docs/superpowers/specs/2026-03-28-grant-grid-view-design.md
+++ b/docs/superpowers/specs/2026-03-28-grant-grid-view-design.md
@@ -1,170 +0,0 @@
 # Grant Grid View — Design Spec
 **Date:** 2026-03-28
 ## Overview
 Add a "Grants" dashboard tab to the Flutter operator app that displays all EVM grants as a card-based grid. Each card shows a compact summary (type, chain, wallet address, client name) with a revoke action. The tab integrates into the existing `AdaptiveScaffold` navigation alongside Wallets, Clients, and About.
 ## Scope
 - New `walletAccessListProvider` for fetching wallet access entries with their DB row IDs
 - New `EvmGrantsScreen` as a dashboard tab
 - Grant card widget with enriched display (type, chain, wallet, client)
 - Revoke action wired to existing `executeRevokeEvmGrant` mutation
 - Dashboard tab bar and router updated
 - New token-transfer accent color added to `Palette`
 **Out of scope:** Fixing grant creation (separate task).
 ---
 ## Data Layer
 ### `walletAccessListProvider`
 **File:** `operator/lib/providers/sdk_clients/wallet_access_list.dart`
 - `@riverpod` class, watches `connectionManagerProvider.future`
 - Returns `List<SdkClientWalletAccess>?` (null when not connected)
 - Each entry: `.id` (wallet_access_id), `.access.walletId`, `.access.sdkClientId`
 - Exposes a `refresh()` method following the same pattern as `EvmGrants.refresh()`
 ### Enrichment at render time (Approach A)
 The `EvmGrantsScreen` watches four providers:
 1. `evmGrantsProvider` — the grant list
 2. `walletAccessListProvider` — to resolve wallet_access_id → (wallet_id, sdk_client_id)
 3. `evmProvider` — to resolve wallet_id → wallet address
 4. `sdkClientsProvider` — to resolve sdk_client_id → client name
 All lookups are in-memory Maps built inside the build method; no extra model class needed.
 Fallbacks:
 - Wallet address not found → `"Access #N"` where N is the wallet_access_id
 - Client name not found → `"Client #N"` where N is the sdk_client_id
 ---
 ## Route Structure
 ```
 /dashboard
  /evm          ← existing (Wallets tab)
  /clients      ← existing (Clients tab)
  /grants       ← NEW (Grants tab)
  /about        ← existing
 /evm-grants/create  ← existing push route (unchanged)
 ```
 ### Changes to `router.dart`
 Add inside dashboard children:
 ```dart
 AutoRoute(page: EvmGrantsRoute.page, path: 'grants'),
 ```
 ### Changes to `dashboard.dart`
 Add to `routes` list:
 ```dart
 const EvmGrantsRoute()
 ```
 Add `NavigationDestination`:
 ```dart
 NavigationDestination(
  icon: Icon(Icons.policy_outlined),
  selectedIcon: Icon(Icons.policy),
  label: 'Grants',
 ),
 ```
 ---
 ## Screen: `EvmGrantsScreen`
 **File:** `operator/lib/screens/dashboard/evm/grants/grants.dart`
 ```
 Scaffold
 └─ SafeArea
   └─ RefreshIndicator.adaptive (refreshes evmGrantsProvider + walletAccessListProvider)
      └─ ListView (BouncingScrollPhysics + AlwaysScrollableScrollPhysics)
         ├─ PageHeader
         │    title: 'EVM Grants'
         │    isBusy: evmGrantsProvider.isLoading
         │    actions: [CreateGrantButton, RefreshButton]
         ├─ SizedBox(height: 1.8.h)
         └─ <content>
 ```
 ### State handling
 Matches the pattern from `EvmScreen` and `ClientsScreen`:
 | State | Display |
 |---|---|
 | Loading (no data yet) | `_StatePanel` with spinner, "Loading grants" |
 | Error | `_StatePanel` with coral icon, error message, Retry button |
 | No connection | `_StatePanel`, "No active server connection" |
 | Empty list | `_StatePanel`, "No grants yet", with Create Grant shortcut |
 | Data | Column of `_GrantCard` widgets |
 ### Header actions
 **CreateGrantButton:** `FilledButton.icon` with `Icons.add_rounded`, pushes `CreateEvmGrantRoute()` via `context.router.push(...)`.
 **RefreshButton:** `OutlinedButton.icon` with `Icons.refresh`, calls `ref.read(evmGrantsProvider.notifier).refresh()`.
 ---
 ## Grant Card: `_GrantCard`
 **Layout:**
 ```
 Container (rounded 24, Palette.cream bg, Palette.line border)
 └─ IntrinsicHeight > Row
   ├─ Accent strip (0.8.w wide, full height, rounded left)
   └─ Padding > Column
        ├─ Row 1: TypeBadge + ChainChip + Spacer + RevokeButton
        └─ Row 2: WalletText + "·" + ClientText
 ```
 **Accent color by grant type:**
 - Ether transfer → `Palette.coral`
 - Token transfer → `Palette.token` (new entry in `Palette` — indigo, e.g. `Color(0xFF5C6BC0)`)
 **TypeBadge:** Small pill container with accent color background at 15% opacity, accent-colored text. Label: `'Ether'` or `'Token'`.
 **ChainChip:** Small container: `'Chain ${grant.shared.chainId}'`, muted ink color.
 **WalletText:** Short hex address (`0xabc...def`) from wallet lookup, `bodySmall`, monospace font family.
 **ClientText:** Client name from `sdkClientsProvider` lookup, or fallback string. `bodySmall`, muted ink.
 **RevokeButton:**
 - `OutlinedButton` with `Icons.block_rounded` icon, label `'Revoke'`
 - `foregroundColor: Palette.coral`, `side: BorderSide(color: Palette.coral.withValues(alpha: 0.4))`
 - Disabled (replaced with `CircularProgressIndicator`) while `revokeEvmGrantMutation` is pending — note: this is a single global mutation, so all revoke buttons disable while any revoke is in flight
 - On press: calls `executeRevokeEvmGrant(ref, grantId: grant.id)`; shows `SnackBar` on error
 ---
 ## Adaptive Sizing
 All sizing uses `sizer` units (`1.h`, `1.w`, etc.). No hardcoded pixel values.
 ---
 ## Files to Create / Modify
 | File | Action |
 |---|---|
 | `lib/theme/palette.dart` | Modify — add `Palette.token` color |
 | `lib/providers/sdk_clients/wallet_access_list.dart` | Create |
 | `lib/screens/dashboard/evm/grants/grants.dart` | Create |
 | `lib/router.dart` | Modify — add grants route to dashboard children |
 | `lib/screens/dashboard.dart` | Modify — add tab to routes list and NavigationDestinations |
--- a/mise.toml
+++ b/mise.toml
@@ -22,3 +22,5 @@ run = '''
 dart pub global activate protoc_plugin && \
 protoc --dart_out=grpc:useragent/lib/proto --proto_path=protobufs/ $(find protobufs -name '*.proto' | sort)
 '''
 [tasks.generate_schema]
--- a/protobufs/operator.proto
+++ b/protobufs/operator.proto
@@ -4,25 +4,28 @@ package arbiter.operator;
 import "operator/auth.proto";
 import "operator/evm.proto";
 import "operator/governance.proto";
 import "operator/sdk_client.proto";
 import "operator/vault/vault.proto";
 message OperatorRequest {
  int32 id = 16;
  oneof payload {
-    auth.Request auth = 1;
+    auth.Request            auth        = 1;
-    vault.Request vault = 2;
+    vault.Request           vault       = 2;
-    evm.Request evm = 3;
+    evm.Request             evm         = 3;
-    sdk_client.Request sdk_client = 4;
+    sdk_client.Request      sdk_client  = 4;
    governance.Request      governance  = 5;
  }
 }
 message OperatorResponse {
  optional int32 id = 16;
  oneof payload {
-    auth.Response auth = 1;
+    auth.Response           auth        = 1;
-    vault.Response vault = 2;
+    vault.Response          vault       = 2;
-    evm.Response evm = 3;
+    evm.Response            evm         = 3;
-    sdk_client.Response sdk_client = 4;
+    sdk_client.Response     sdk_client  = 4;
    governance.Response     governance  = 5;
  }
 }
--- a/protobufs/operator/governance.proto
+++ b/protobufs/operator/governance.proto
@@ -0,0 +1,136 @@
 syntax = "proto3";
 package arbiter.operator.governance;
 message Request {
  oneof payload {
    CreateProposalRequest create = 1;
    CastVoteRequest       vote   = 2;
    QueryPendingRequest   query  = 3;
  }
 }
 message CreateProposalRequest {
  oneof kind {
    ApproveSdkClientPayload         approve_sdk_client          = 1;
    GrantWalletAccessPayload        grant_wallet_access         = 3;
    ApproveServerUpdatePayload      approve_server_update       = 4;
    ReplaceOperatorPayload          replace_operator            = 5;
    UpdateShamirParametersPayload   update_shamir_parameters    = 6;
    ApprovePersistentGrantPayload   approve_persistent_grant    = 7;
    ApproveOneOffTransactionPayload approve_one_off_transaction = 8;
  }
  optional uint32 ttl_secs = 2;
 }
 message ReplaceOperatorPayload {
  int32 old_operator_id = 1;
  bytes new_pubkey      = 2;
 }
 message UpdateShamirParametersPayload {
  uint32 new_n = 1;
 }
 message ApproveServerUpdatePayload {}
 message ApproveSdkClientPayload {
  int32 client_id = 1;
 }
 message GrantWalletAccessPayload {
  int32 wallet_id = 1;
  int32 client_id = 2;
 }
 message CastVoteRequest {
  int32 proposal_id = 1;
  bool  approve     = 2;
  bytes signature   = 3;
 }
 message QueryPendingRequest {}
 message Response {
  oneof payload {
    CreateProposalResponse created = 1;
    VoteResponse           voted   = 2;
    QueryPendingResponse   pending = 3;
  }
 }
 message CreateProposalResponse {
  int32 proposal_id = 1;
 }
 message VoteResponse {
  VoteOutcome outcome = 1;
 }
 enum VoteOutcome {
  VOTE_OUTCOME_UNSPECIFIED = 0;
  VOTE_OUTCOME_PENDING     = 1;
  VOTE_OUTCOME_APPROVED    = 2;
  VOTE_OUTCOME_REJECTED    = 3;
 }
 message ProposalSummary {
  int32  id            = 1;
  string kind          = 2;
  int32  initiator_id  = 3;
  int64  expires_at    = 4;
  int64  approve_count = 5;
  int64  reject_count  = 6;
 }
 message QueryPendingResponse {
  repeated ProposalSummary proposals = 1;
 }
 message TransactionRateLimitProto {
  uint32 count       = 1;
  int64  window_secs = 2;
 }
 message VolumeLimitProto {
  bytes max_volume  = 1;
  int64 window_secs = 2;
 }
 message EtherTransferSpecProto {
  repeated bytes   targets = 1;
  VolumeLimitProto limit   = 2;
 }
 message TokenTransferSpecProto {
  bytes                     token_contract = 1;
  optional bytes            target         = 2;
  repeated VolumeLimitProto volume_limits  = 3;
 }
 message ApproveOneOffTransactionPayload {
  int32  client_id                = 1;
  bytes  wallet_address           = 2;
  uint64 chain_id                 = 3;
  uint64 nonce                    = 4;
  uint64 gas_limit                = 5;
  bytes  max_fee_per_gas          = 6;
  bytes  max_priority_fee_per_gas = 7;
  bytes  to                       = 8;
  bytes  value                    = 9;
  bytes  input                    = 10;
 }
 message ApprovePersistentGrantPayload {
  int32                              wallet_access_id         = 1;
  uint64                             chain_id                 = 2;
  optional int64                     valid_from_secs          = 3;
  optional int64                     valid_until_secs         = 4;
  optional bytes                     max_gas_fee_per_gas      = 5;
  optional bytes                     max_priority_fee_per_gas = 6;
  optional TransactionRateLimitProto rate_limit               = 7;
  oneof specific {
    EtherTransferSpecProto ether_transfer = 8;
    TokenTransferSpecProto token_transfer = 9;
  }
 }
--- a/protobufs/operator/vault/bootstrap.proto
+++ b/protobufs/operator/vault/bootstrap.proto
@@ -8,15 +8,35 @@ message BootstrapEncryptedKey {
  bytes associated_data = 3;
 }
 message DeclareCommittee {
  uint32 count          = 1;
  uint32 recovery_count = 2;
 }
 message ContributePassphrase {
  bytes passphrase = 1;
 }
 message ContributeRecoveryPassphrase {
  int32 recovery_operator_id = 1;
  bytes passphrase            = 2;
 }
 enum BootstrapResult {
  BOOTSTRAP_RESULT_UNSPECIFIED = 0;
  BOOTSTRAP_RESULT_SUCCESS = 1;
  BOOTSTRAP_RESULT_ALREADY_BOOTSTRAPPED = 2;
  BOOTSTRAP_RESULT_INVALID_KEY = 3;
  BOOTSTRAP_RESULT_AWAITING_CONTRIBUTIONS = 4;
 }
 message Request {
-  BootstrapEncryptedKey encrypted_key = 2;
+  oneof payload {
    BootstrapEncryptedKey        encrypted_key                    = 2;
    DeclareCommittee             declare_committee                = 3;
    ContributePassphrase         contribute_passphrase            = 4;
    ContributeRecoveryPassphrase contribute_recovery_passphrase   = 5;
  }
 }
 message Response {
--- a/protobufs/operator/vault/rekey.proto
+++ b/protobufs/operator/vault/rekey.proto
@@ -0,0 +1,30 @@
 syntax = "proto3";
 package arbiter.operator.vault.rekey;
 message ContributePassphrase {
  bytes passphrase = 1;
 }
 message ContributeRecoveryPassphrase {
  int32 recovery_operator_id = 1;
  bytes passphrase           = 2;
 }
 enum RekeyResult {
  REKEY_RESULT_UNSPECIFIED            = 0;
  REKEY_RESULT_SUCCESS                = 1;
  REKEY_RESULT_AWAITING_CONTRIBUTIONS = 2;
  REKEY_RESULT_NOT_IN_PROGRESS        = 3;
 }
 message Request {
  oneof payload {
    ContributePassphrase         contribute_passphrase          = 1;
    ContributeRecoveryPassphrase contribute_recovery_passphrase = 2;
  }
 }
 message Response {
  RekeyResult result = 1;
 }
--- a/protobufs/operator/vault/unseal.proto
+++ b/protobufs/operator/vault/unseal.proto
@@ -15,18 +15,29 @@ message UnsealEncryptedKey {
  bytes associated_data = 3;
 }
 message ContributePassphrase {
  bytes passphrase = 1;
 }
 message ContributeRecoveryPassphrase {
  int32 recovery_operator_id = 1;
  bytes passphrase            = 2;
 }
 enum UnsealResult {
  UNSEAL_RESULT_UNSPECIFIED = 0;
  UNSEAL_RESULT_SUCCESS = 1;
  UNSEAL_RESULT_INVALID_KEY = 2;
  UNSEAL_RESULT_UNBOOTSTRAPPED = 3;
-  UNSEAL_RESULT_LOCKED_OUT = 4;
+  UNSEAL_RESULT_AWAITING_CONTRIBUTIONS = 4;
 }
 message Request {
  oneof payload {
-    UnsealStart start = 1;
+    UnsealStart                  start                          = 1;
-    UnsealEncryptedKey encrypted_key = 2;
+    UnsealEncryptedKey           encrypted_key                  = 2;
    ContributePassphrase         contribute_passphrase          = 3;
    ContributeRecoveryPassphrase contribute_recovery_passphrase = 4;
  }
 }
--- a/protobufs/operator/vault/vault.proto
+++ b/protobufs/operator/vault/vault.proto
@@ -5,20 +5,23 @@ package arbiter.operator.vault;
 import "google/protobuf/empty.proto";
 import "shared/vault.proto";
 import "operator/vault/bootstrap.proto";
 import "operator/vault/rekey.proto";
 import "operator/vault/unseal.proto";
 message Request {
  oneof payload {
    google.protobuf.Empty query_state = 1;
-    unseal.Request unseal = 2;
+    unseal.Request        unseal      = 2;
-    bootstrap.Request bootstrap = 3;
+    bootstrap.Request     bootstrap   = 3;
    rekey.Request         rekey       = 4;
  }
 }
 message Response {
  oneof payload {
-    arbiter.shared.VaultState state = 1;
+    arbiter.shared.VaultState state     = 1;
-    unseal.Response unseal = 2;
+    unseal.Response           unseal    = 2;
-    bootstrap.Response bootstrap = 3;
+    bootstrap.Response        bootstrap = 3;
    rekey.Response            rekey     = 4;
  }
 }
--- a/protobufs/shared/vault.proto
+++ b/protobufs/shared/vault.proto
@@ -5,7 +5,8 @@ package arbiter.shared;
 enum VaultState {
  VAULT_STATE_UNSPECIFIED = 0;
  VAULT_STATE_UNBOOTSTRAPPED = 1;
-  VAULT_STATE_SEALED = 2;
+  VAULT_STATE_BOOSTRAPPING = 2;
-  VAULT_STATE_UNSEALED = 3;
+  VAULT_STATE_SEALED = 3;
-  VAULT_STATE_ERROR = 4;
+  VAULT_STATE_UNSEALED = 4;
  VAULT_STATE_ERROR = 5;
 }
--- a/scripts/pycache/gen_erc20_registry.cpython-314.pyc
+++ b/scripts/pycache/gen_erc20_registry.cpython-314.pyc
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -2,6 +2,15 @@
 # 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"
@@ -762,7 +771,6 @@ dependencies = [
 "proptest",
 "prost-types",
 "rand 0.10.1",
 "rand_core 0.10.1",
 "rcgen",
 "restructed",
 "rstest",
@@ -1157,6 +1165,30 @@ 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"
@@ -2332,6 +2364,12 @@ 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"
@@ -2789,6 +2827,12 @@ 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"
@@ -3124,9 +3168,18 @@ version = "7.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7"
 dependencies = [
 "backtrace",
 "backtrace-ext",
 "cfg-if",
 "miette-derive",
- "unicode-width",
+ "owo-colors",
 "serde",
 "supports-color",
 "supports-hyperlinks",
 "supports-unicode",
 "terminal_size",
 "textwrap",
 "unicode-width 0.1.14",
 ]
 [[package]]
@@ -3348,6 +3401,15 @@ 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"
@@ -3375,6 +3437,12 @@ 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"
@@ -4178,6 +4246,12 @@ 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"
@@ -4817,6 +4891,27 @@ 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"
@@ -4890,6 +4985,16 @@ 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"
@@ -4921,6 +5026,16 @@ 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"
@@ -5360,6 +5475,12 @@ 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"
@@ -5372,6 +5493,12 @@ 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"
@@ -6134,18 +6261,18 @@ dependencies = [
 [[package]]
 name = "zeroize"
-version = "1.9.0"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 dependencies = [
 "zeroize_derive",
 ]
 [[package]]
 name = "zeroize_derive"
-version = "1.5.0"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
+checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -15,16 +15,12 @@ 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"
-# `derive` only: nothing renders a miette Report yet, so `fancy` would drag the
+miette = { version = "7.6.0", features = ["fancy", "serde"] }
 # 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"
 prost-types = { version = "0.14.3", features = ["chrono"] }
 rand = "0.10.1"
 rand_core = "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 }
@@ -80,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"
--- a/server/crates/arbiter-client/src/auth.rs
+++ b/server/crates/arbiter-client/src/auth.rs
@@ -23,7 +23,6 @@ use arbiter_proto::{
 use chrono::DateTime;
 #[derive(Debug, thiserror::Error)]
 #[non_exhaustive]
 pub enum AuthError {
    #[error("Server sent invalid auth challenge")]
    InvalidChallenge,
@@ -101,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
--- a/server/crates/arbiter-client/src/client.rs
+++ b/server/crates/arbiter-client/src/client.rs
@@ -17,7 +17,6 @@ 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,7 +4,6 @@ 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,7 +11,6 @@ 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,7 +30,6 @@ 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/Cargo.toml
+++ b/server/crates/arbiter-server/Cargo.toml
@@ -31,7 +31,6 @@ diesel_migrations = { version = "2.3.2", features = ["sqlite"] }
 async-trait.workspace = true
 tokio-stream.workspace = true
 rand.workspace = true
 rand_core.workspace = true
 rcgen.workspace = true
 chrono.workspace = true
 kameo.workspace = true
--- a/server/crates/arbiter-server/migrations/2026-02-14-171124-0000_init/up.sql
+++ b/server/crates/arbiter-server/migrations/2026-02-14-171124-0000_init/up.sql
@@ -43,13 +43,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_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 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
@@ -1,48 +1,29 @@
 use crate::db::{self, DatabasePool, schema};
 use arbiter_crypto::safecell::{SafeCell, SafeCellHandle as _};
 use arbiter_proto::{BOOTSTRAP_PATH, home_path};
 use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;
 use kameo::{Actor, messages};
-use rand::{RngExt, distr::Alphanumeric, rngs::SysRng};
+use rand::{RngExt, distr::Alphanumeric, make_rng, rngs::StdRng};
 use rand_core::UnwrapErr;
 use std::path::{Path, PathBuf};
 use subtle::ConstantTimeEq as _;
 use thiserror::Error;
 use tracing::warn;
 const TOKEN_LENGTH: usize = 64;
-async fn write_token_file(path: &Path, content: &str) -> Result<(), std::io::Error> {
+pub async fn generate_token() -> Result<String, std::io::Error> {
-    tokio::fs::write(path, content.as_bytes()).await?;
+    let rng: StdRng = make_rng();
-    #[cfg(unix)]
+    let token = rng.sample_iter(Alphanumeric).take(TOKEN_LENGTH).fold(
-    {
+        String::default(),
-        use std::os::unix::fs::PermissionsExt as _;
+        |mut accum, char| {
-        tokio::fs::set_permissions(path, std::fs::Permissions::from_mode(0o600)).await?;
+            accum += char.to_string().as_str();
-    }
+            accum
        },
    );
-    Ok(())
+    tokio::fs::write(home_path()?.join(BOOTSTRAP_PATH), token.as_str()).await?;
 }
-async fn generate_token(path: &Path) -> Result<SafeCell<[u8; TOKEN_LENGTH]>, std::io::Error> {
+    Ok(token)
    let mut cell = SafeCell::new([0u8; TOKEN_LENGTH]);
    {
        let mut buf = cell.write();
        for (slot, b) in buf
            .iter_mut()
            .zip(UnwrapErr(SysRng).sample_iter(Alphanumeric))
        {
            *slot = b;
        }
    }
    let token_str = cell.read_inline(|buf| String::from_utf8_lossy(buf.as_ref()).into_owned());
    write_token_file(path, &token_str).await?;
    Ok(cell)
 }
 #[derive(Error, Debug)]
@@ -59,8 +40,7 @@ pub enum Error {
 #[derive(Actor)]
 pub struct Bootstrapper {
-    token: Option<SafeCell<[u8; TOKEN_LENGTH]>>,
+    token: Option<String>,
    token_path: Option<PathBuf>,
 }
 impl Bootstrapper {
@@ -68,43 +48,40 @@ impl Bootstrapper {
        let row_count: i64 = {
            let mut conn = db.get().await?;
-            schema::operator_client::table
+            schema::operator::table
                .count()
                .get_result(&mut conn)
                .await?
        };
-        let (token, token_path) = if row_count == 0 {
+        let token = if row_count == 0 {
-            let path = home_path()?.join(BOOTSTRAP_PATH);
+            let token = generate_token().await?;
-            let token = generate_token(&path).await?;
+            Some(token)
            (Some(token), Some(path))
        } else {
-            (None, None)
+            None
        };
-        Ok(Self { token, token_path })
+        Ok(Self { token })
    }
 }
 impl Bootstrapper {
    fn is_correct_token(&mut self, token: &[u8]) -> bool {
        self.token.as_mut().is_some_and(|expected| {
            expected.read_inline(|exp| bool::from(exp.as_ref().ct_eq(token)))
        })
    }
 }
 #[messages]
 impl Bootstrapper {
    #[message]
-    pub async fn consume_token(&mut self, token: Vec<u8>) -> bool {
+    pub fn is_correct_token(&self, token: String) -> bool {
-        if self.is_correct_token(&token) {
+        self.token.as_ref().is_some_and(|expected| {
            let expected_bytes = expected.as_bytes();
            let token_bytes = token.as_bytes();
            let choice = expected_bytes.ct_eq(token_bytes);
            bool::from(choice)
        })
    }
    #[message]
    pub fn consume_token(&mut self, token: String) -> bool {
        if self.is_correct_token(token) {
            self.token = None;
            if let Some(path) = self.token_path.take()
                && let Err(e) = tokio::fs::remove_file(&path).await
            {
                warn!(error = ?e, path = ?path, "Failed to delete bootstrap token file after consumption");
            }
            true
        } else {
            false
@@ -115,9 +92,7 @@ impl Bootstrapper {
 #[messages]
 impl Bootstrapper {
    #[message]
-    pub fn get_token(&mut self) -> Option<String> {
+    pub fn get_token(&self) -> Option<String> {
-        self.token
+        self.token.clone()
            .as_mut()
            .map(|cell| cell.read_inline(|buf| String::from_utf8_lossy(buf.as_ref()).into_owned()))
    }
 }
--- a/server/crates/arbiter-server/src/actors/evm/mod.rs
+++ b/server/crates/arbiter-server/src/actors/evm/mod.rs
@@ -1,9 +1,9 @@
 use crate::{
    actors::vault::{CreateNew, Decrypt, Vault},
-    crypto::integrity::{self, Integrable},
+    crypto::integrity,
    db::{
        DatabaseError, DatabasePool,
-        models::{self},
+        models::{self, EvmWalletId},
        schema,
    },
    evm::{
@@ -25,35 +25,14 @@ use diesel::{
 use diesel_async::RunQueryDsl;
 use kameo::{Actor, actor::ActorRef, messages};
 use rand::{SeedableRng, rng, rngs::StdRng};
 use tracing::error;
 pub use crate::evm::safe_signer;
 /// Integrity guard that binds a wallet's encrypted key ID to its Ethereum address.
 /// Both fields are included in the HMAC — swapping `aead_encrypted_id` in the DB
 /// invalidates the envelope MAC, and the AEAD ciphertext is also bound to `address`
 /// as AAD, so decryption fails too.
 #[derive(arbiter_macros::Hashable)]
 struct EvmWalletIntegrity {
    aead_encrypted_id: i32,
    address: Address,
 }
 impl Integrable for EvmWalletIntegrity {
    const KIND: &'static str = "evm_wallet";
 }
 #[derive(Debug, thiserror::Error)]
 pub enum SignTransactionError {
    #[error("Wallet not found")]
    WalletNotFound,
    #[error("Decrypted key does not match requested wallet address")]
    KeyAddressMismatch,
    #[error("Internal signing error")]
    Internal,
    #[error("Database error: {0}")]
    Database(#[from] DatabaseError),
@@ -85,12 +64,6 @@ pub enum Error {
    Integrity(#[from] integrity::Error),
 }
 impl From<diesel::result::Error> for Error {
    fn from(e: diesel::result::Error) -> Self {
        Self::Database(DatabaseError::from(e))
    }
 }
 #[derive(Actor)]
 pub struct EvmActor {
    pub vault: ActorRef<Vault>,
@@ -124,45 +97,26 @@ impl EvmActor {
        let aead_id: i32 = self
            .vault
-            .ask(CreateNew {
+            .ask(CreateNew { plaintext })
                plaintext,
                aad: address.as_slice().to_vec(),
            })
            .await
            .map_err(|_| Error::VaultSend)?;
        let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
-        let wallet_id = conn
+        let wallet_id = insert_into(schema::evm_wallet::table)
-            .exclusive_transaction(async |conn| {
+            .values(&models::NewEvmWallet {
-                let wallet_id: i32 = insert_into(schema::evm_wallet::table)
+                address: address.as_slice().to_vec(),
-                    .values(&models::NewEvmWallet {
+                aead_encrypted_id: aead_id,
                        address: address.as_slice().to_vec(),
                        aead_encrypted_id: aead_id,
                    })
                    .returning(schema::evm_wallet::id)
                    .get_result(conn)
                    .await
                    .map_err(DatabaseError::from)
                    .map_err(Error::Database)?;
                integrity::sign_entity(
                    conn,
                    &self.vault,
                    &EvmWalletIntegrity { address, aead_encrypted_id: aead_id },
                    wallet_id,
                )
                .await
                .map_err(Error::Integrity)?;
                Ok::<i32, Error>(wallet_id)
            })
-            .await?;
+            .returning(schema::evm_wallet::id)
            .get_result(&mut conn)
            .await
            .map_err(DatabaseError::from)?;
        Ok((wallet_id, address))
    }
    #[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())
@@ -206,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]
@@ -287,51 +256,16 @@ impl EvmActor {
            .ok_or(SignTransactionError::WalletNotFound)?;
        drop(conn);
        let mut conn = self.db.get().await.map_err(DatabaseError::from)?;
        let attestation = integrity::verify_entity(
            &mut conn,
            &self.vault,
            &EvmWalletIntegrity {
                address: wallet_address,
                aead_encrypted_id: wallet.aead_encrypted_id,
            },
            wallet.id,
        )
        .await
        .map_err(|e| {
            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,
                "EVM wallet integrity unavailable; refusing to sign"
            );
            return Err(SignTransactionError::Internal);
        }
        let raw_key: SafeCell<Vec<u8>> = self
            .vault
            .ask(Decrypt {
                aead_id: wallet.aead_encrypted_id,
                aad: wallet.address.clone(),
            })
            .await
            .map_err(|_| SignTransactionError::VaultSend)?;
        let signer = safe_signer::SafeSigner::from_cell(raw_key)?;
        if signer.address() != wallet_address {
            error!(
                expected = %wallet_address,
                actual = %signer.address(),
                "Decrypted private key address does not match requested wallet"
            );
            return Err(SignTransactionError::KeyAddressMismatch);
        }
        self.engine
            .evaluate_transaction(wallet_access, transaction.clone(), RunKind::Execution)
            .await?;
--- a/server/crates/arbiter-server/src/actors/flow_coordinator/client_connect_approval.rs
+++ b/server/crates/arbiter-server/src/actors/flow_coordinator/client_connect_approval.rs
@@ -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();
        }
    }
 }
--- a/server/crates/arbiter-server/src/actors/flow_coordinator/mod.rs
+++ b/server/crates/arbiter-server/src/actors/flow_coordinator/mod.rs
@@ -20,8 +20,6 @@ pub mod client_connect_approval;
 pub struct FlowCoordinator {
    pub clients: HashMap<ActorId, ActorRef<ClientSession>>,
    /// Maps DB `client_id` → `ActorId` for fast connected-client lookup.
    client_ids: HashMap<i32, ActorId>,
    operator_registry: ActorRef<OperatorRegistry>,
 }
@@ -29,7 +27,6 @@ impl FlowCoordinator {
    pub fn new(operator_registry: ActorRef<OperatorRegistry>) -> Self {
        Self {
            clients: HashMap::default(),
            client_ids: HashMap::default(),
            operator_registry,
        }
    }
@@ -51,7 +48,6 @@ impl Actor for FlowCoordinator {
        _: ActorStopReason,
    ) -> Result<ControlFlow<ActorStopReason>, Self::Error> {
        if self.clients.remove(&id).is_some() {
            self.client_ids.retain(|_, actor_id| *actor_id != id);
            info!(
                ?id,
                actor = "FlowCoordinator",
@@ -79,28 +75,14 @@ impl FlowCoordinator {
    #[message(ctx)]
    pub async fn register_client(
        &mut self,
        client_id: i32,
        actor: ActorRef<ClientSession>,
        ctx: &mut Context<Self, ()>,
    ) {
-        info!(id = %actor.id(), client_id, actor = "FlowCoordinator", event = "client.connected");
+        info!(id = %actor.id(), actor = "FlowCoordinator", event = "client.connected");
        ctx.actor_ref().link(&actor).await;
        self.client_ids.insert(client_id, actor.id());
        self.clients.insert(actor.id(), actor);
    }
    #[message]
    pub fn is_client_connected(&self, client_id: i32) -> bool {
        self.client_ids.contains_key(&client_id)
    }
    /// Returns the DB `client_ids` of all currently connected SDK clients.
    /// Used by operator sessions on startup to seed their approved-client set.
    #[message]
    pub fn get_connected_client_ids(&self) -> Vec<i32> {
        self.client_ids.keys().copied().collect()
    }
    #[message(ctx)]
    pub async fn request_client_approval(
        &mut self,
--- 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},
+        models::{self, RootKeyHistory, RootKeyHistoryId},
        schema::{self},
    },
 };
@@ -22,10 +22,9 @@ use hmac::{KeyInit as _, Mac as _};
 use kameo::{Actor, Reply, actor::ActorRef, messages};
 use kameo_actors::message_bus::{MessageBus, Publish};
 use strum::{EnumDiscriminants, IntoDiscriminant};
-use tracing::{error, info, warn};
+use tracing::{error, info};
 pub mod events {
    #[derive(Clone, Copy)]
    pub struct Bootstrapped;
@@ -46,8 +45,6 @@ pub enum Error {
    Sealed,
    #[error("Invalid key provided")]
    InvalidKey,
    #[error("Vault locked: too many failed unseal attempts")]
    LockedOut,
    #[error("Requested aead entry not found")]
    NotFound,
@@ -63,13 +60,10 @@ pub enum Error {
    #[error("Broken database")]
    BrokenDatabase,
    #[error("Integrity key version mismatch: envelope uses key {envelope}, current key is {current}")]
    KeyVersionMismatch { envelope: i32, current: i32 },
 }
 struct Unsealed {
-    root_key_history_id: i32,
+    root_key_history_id: RootKeyHistoryId,
    root_key: KeyCell,
 }
@@ -78,14 +72,13 @@ struct Unsealed {
 enum State {
    #[default]
    Unbootstrapped,
    Sealed {
-        root_key_history_id: i32,
+        root_key_history_id: RootKeyHistoryId,
    },
    Unsealed(Unsealed),
 }
 const MAX_UNSEAL_ATTEMPTS: u32 = 5;
 /// Manages vault root key and tracks current state of the vault (bootstrapped/unbootstrapped, sealed/unsealed).
 ///
 /// Provides API for encrypting and decrypting data using the vault root key.
@@ -95,7 +88,6 @@ pub struct Vault {
    db: db::DatabasePool,
    state: State,
    events: ActorRef<MessageBus>,
    unseal_failures: u32,
 }
 #[messages]
@@ -118,12 +110,15 @@ impl Vault {
            }
        };
-        Ok(Self { db, state, events, unseal_failures: 0 })
+        Ok(Self { db, state, events })
    }
    // 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
@@ -136,7 +131,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
@@ -192,7 +187,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: i32 = insert_into(schema::root_key_history::table)
+                let root_key_history_id = insert_into(schema::root_key_history::table)
                    .values(&models::NewRootKeyHistory {
                        ciphertext: root_key_ciphertext.clone(),
                        tag: v1::ROOT_KEY_TAG.to_vec(),
@@ -210,7 +205,9 @@ impl Vault {
                    .execute(&mut *conn)
                    .await?;
-                Result::<_, diesel::result::Error>::Ok(root_key_history_id)
+                Result::<_, diesel::result::Error>::Ok(RootKeyHistoryId::from_raw(
                    root_key_history_id,
                ))
            })
            .await?;
@@ -227,10 +224,6 @@ impl Vault {
    #[message]
    pub async fn try_unseal(&mut self, seal_key_raw: SafeCell<Vec<u8>>) -> Result<(), Error> {
        if self.unseal_failures >= MAX_UNSEAL_ATTEMPTS {
            return Err(Error::LockedOut);
        }
        let State::Sealed {
            root_key_history_id,
        } = &self.state
@@ -263,27 +256,13 @@ impl Vault {
                Error::BrokenDatabase
            })?;
-        if seal_key
+        seal_key
            .decrypt_in_place(&nonce, v1::ROOT_KEY_TAG, &mut root_key)
-            .is_err()
+            .map_err(|err| {
-        {
+                error!(?err, "Failed to unseal root key: invalid seal key");
-            self.unseal_failures += 1;
+                Error::InvalidKey
-            if self.unseal_failures >= MAX_UNSEAL_ATTEMPTS {
+            })?;
                error!(
                    attempts = self.unseal_failures,
                    "Vault locked: maximum failed unseal attempts reached"
                );
            } else {
                warn!(
                    attempts = self.unseal_failures,
                    remaining = MAX_UNSEAL_ATTEMPTS - self.unseal_failures,
                    "Failed unseal attempt"
                );
            }
            return Err(Error::InvalidKey);
        }
        self.unseal_failures = 0;
        self.state = State::Unsealed(Unsealed {
            root_key_history_id: current_key.id,
            root_key: KeyCell::try_from(root_key).map_err(|err| {
@@ -298,10 +277,8 @@ impl Vault {
        Ok(())
    }
    /// Decrypts an AEAD entry. The `aad` must match the value used at encryption time;
    /// a mismatch causes authentication failure, preventing cross-wallet key swaps.
    #[message]
-    pub async fn decrypt(&mut self, aead_id: i32, aad: Vec<u8>) -> Result<SafeCell<Vec<u8>>, Error> {
+    pub async fn decrypt(&mut self, aead_id: i32) -> Result<SafeCell<Vec<u8>>, Error> {
        let Unsealed { root_key, .. } = Self::expect_unsealed(&mut self.state)?;
        let row: models::AeadEncrypted = {
@@ -323,15 +300,13 @@ impl Vault {
            Error::BrokenDatabase
        })?;
        let mut output = SafeCell::new(row.ciphertext);
-        root_key.decrypt_in_place(&nonce, &aad, &mut output)?;
+        root_key.decrypt_in_place(&nonce, v1::TAG, &mut output)?;
        Ok(output)
    }
    /// Creates a new `aead_encrypted` entry and returns its ID.
    /// The `aad` is bound into the ciphertext and must be reproduced exactly at decryption time.
    // Creates new `aead_encrypted` entry in the database and returns it's ID
    #[message]
-    pub async fn create_new(&mut self, mut plaintext: SafeCell<Vec<u8>>, aad: Vec<u8>) -> Result<i32, Error> {
+    pub async fn create_new(&mut self, mut plaintext: SafeCell<Vec<u8>>) -> Result<i32, Error> {
        let Unsealed {
            root_key,
            root_key_history_id,
@@ -343,7 +318,7 @@ impl Vault {
        let mut ciphertext_buffer = plaintext.write();
        let ciphertext_buffer: &mut Vec<u8> = ciphertext_buffer.as_mut();
-        root_key.encrypt_in_place(&nonce, &aad, &mut *ciphertext_buffer)?;
+        root_key.encrypt_in_place(&nonce, v1::TAG, &mut *ciphertext_buffer)?;
        let ciphertext = std::mem::take(ciphertext_buffer);
@@ -370,17 +345,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();
@@ -392,7 +372,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,
@@ -400,17 +380,16 @@ impl Vault {
        } = Self::expect_unsealed(&mut self.state)?;
        if *root_key_history_id != key_version {
-            return Err(Error::KeyVersionMismatch {
+            return Ok(false);
                envelope: key_version,
                current: *root_key_history_id,
            });
        }
-        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())
@@ -434,6 +413,7 @@ impl Vault {
 #[cfg(test)]
 mod tests {
    use crate::actors::GlobalActors;
    use crate::db::models::RootKeyHistory;
    use arbiter_crypto::safecell::SafeCellHandle as _;
    use super::*;
@@ -452,13 +432,12 @@ mod tests {
    async fn nonce_monotonic_even_when_nonce_allocation_interleaves() {
        let db = db::create_test_pool().await;
        let mut actor = bootstrapped_actor(&db).await;
-
+        let root_key_history_id = match actor.state {
-        let State::Unsealed(Unsealed {
+            State::Unsealed(Unsealed {
-            root_key_history_id,
+                root_key_history_id,
-            ..
+                ..
-        }) = actor.state
+            }) => root_key_history_id,
-        else {
+            _ => panic!("expected unsealed state"),
            panic!("expected unsealed state")
        };
        let n1 = Vault::get_new_nonce(&db, root_key_history_id)
@@ -478,7 +457,7 @@ mod tests {
        assert_eq!(root_row.data_encryption_nonce, n2.to_vec());
        let id = actor
-            .create_new(SafeCell::new(b"post-interleave".to_vec()), b"test-aad".to_vec())
+            .create_new(SafeCell::new(b"post-interleave".to_vec()))
            .await
            .unwrap();
        let row: models::AeadEncrypted = schema::aead_encrypted::table
--- a/server/crates/arbiter-server/src/crypto/integrity/v1.rs
+++ b/server/crates/arbiter-server/src/crypto/integrity/v1.rs
@@ -13,7 +13,6 @@ 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 {
@@ -122,10 +121,7 @@ pub async fn sign_entity<E: Integrable>(
            .await
            .map_err(|err| match err {
                SendError::HandlerError(inner) => Error::Vault(inner),
-                other => {
+                _ => Error::VaultSend,
                    error!(?other, "Vault unreachable while signing integrity envelope");
                    Error::VaultSend
                }
            })?;
    insert_into(integrity_envelope::table)
@@ -196,21 +192,13 @@ pub async fn verify_entity<E: Integrable>(
        Ok(false) => Err(Error::MacMismatch {
            entity_kind: E::KIND,
        }),
-        Err(SendError::HandlerError(
+        Err(SendError::HandlerError(vault::Error::Sealed)) => Ok(AttestationStatus::Unavailable),
-            vault::Error::Sealed | vault::Error::KeyVersionMismatch { .. },
+        Err(_) => Err(Error::VaultSend),
        )) => Ok(AttestationStatus::Unavailable),
        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(|err| {
+    let state = vault.ask(GetState).await.map_err(|_| Error::VaultSend)?;
        error!(?err, "Vault unreachable while querying signing availability");
        Error::VaultSend
    })?;
    Ok(matches!(state, vault::VaultState::Unsealed))
 }
@@ -343,47 +331,4 @@ mod tests {
            .unwrap_err();
        assert!(matches!(err, Error::MacMismatch { .. }));
    }
    #[tokio::test]
    async fn key_version_mismatch_returns_unavailable_not_mac_mismatch() {
        use crate::db::schema::integrity_envelope;
        use super::AttestationStatus;
        const ENTITY_ID: &[u8] = b"entity-id-rotation-test";
        let db = db::create_test_pool().await;
        let vault = bootstrapped_vault(&db).await;
        let mut conn = db.get().await.unwrap();
        let entity = DummyEntity {
            payload_version: 1,
            payload: b"payload-v1".to_vec(),
        };
        sign_entity(&mut conn, &vault, &entity, ENTITY_ID)
            .await
            .unwrap();
        // Simulate key rotation: update the stored key_version to a stale value.
        // After real rotation the vault's root_key_history_id would advance, but
        // here we achieve the same mismatch by back-dating the envelope's key_version.
        diesel::update(integrity_envelope::table)
            .filter(integrity_envelope::entity_kind.eq("dummy_entity"))
            .filter(integrity_envelope::entity_id.eq(ENTITY_ID))
            .set(integrity_envelope::key_version.eq(0))
            .execute(&mut conn)
            .await
            .unwrap();
        // Must NOT error — version mismatch is Unavailable, not tampered.
        let status = verify_entity(&mut conn, &vault, &entity, ENTITY_ID)
            .await
            .expect("key version mismatch must not be treated as an error");
        assert_eq!(
            status,
            AttestationStatus::Unavailable,
            "stale key_version must yield Unavailable, not MacMismatch"
        );
    }
 }
--- a/server/crates/arbiter-server/src/db/models.rs
+++ b/server/crates/arbiter-server/src/db/models.rs
@@ -79,10 +79,41 @@ pub mod types {
        }
    }
-    #[derive(Debug, FromSqlRow, AsExpression, Clone)]
+    macro_rules! declare_id {
-    #[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,
@@ -250,12 +273,22 @@ pub struct ProgramClient {
 #[derive(Queryable, Debug)]
 #[diesel(table_name = schema::operator_client, check_for_backend(Sqlite))]
 pub struct OperatorClient {
-    pub id: i32,
+    pub id: OperatorIdentityId,
    pub public_key: Vec<u8>,
    pub created_at: SqliteTimestamp,
    pub updated_at: SqliteTimestamp,
 }
 #[derive(Queryable, Debug)]
 #[diesel(table_name = schema::operator, check_for_backend(Sqlite))]
 pub struct Operator {
    pub id: OperatorId,
    pub share: Vec<u8>,
    pub share_nonce: Vec<u8>,
    pub 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,
--- a/server/crates/arbiter-server/src/db/schema.rs
+++ b/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,
 );
--- a/server/crates/arbiter-server/src/evm/mod.rs
+++ b/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;
@@ -278,151 +272,6 @@ impl Engine {
        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 +351,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 +378,7 @@ mod tests {
        EvalContext {
            target: EvmWalletAccess {
                id: WALLET_ACCESS_ID,
-                wallet_id: 10,
+                wallet_id: EvmWalletId::from_raw(5),
                client_id: 20,
                created_at: SqliteTimestamp(Utc::now()),
            },
@@ -553,7 +397,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 +605,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());
    }
 }
--- a/server/crates/arbiter-server/src/evm/policies.rs
+++ b/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))
--- a/server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs
+++ b/server/crates/arbiter-server/src/evm/policies/ether_transfer/tests.rs
@@ -3,7 +3,8 @@ use crate::{
    db::{
        self, DatabaseConnection,
        models::{
-            EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, NewEvmTransactionLog, SqliteTimestamp,
+            EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, NewEvmTransactionLog,
            SqliteTimestamp,
        },
        schema::{evm_basic_grant, evm_transaction_log},
    },
@@ -31,7 +32,7 @@ fn ctx(to: Address, value: U256) -> EvalContext {
    EvalContext {
        target: EvmWalletAccess {
            id: WALLET_ACCESS_ID,
-            wallet_id: 10,
+            wallet_id: EvmWalletId::from_raw(10),
            client_id: 20,
            created_at: SqliteTimestamp(Utc::now()),
        },
@@ -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,
--- a/server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs
+++ b/server/crates/arbiter-server/src/evm/policies/token_transfers/tests.rs
@@ -2,7 +2,7 @@ use super::{Settings, TokenTransfer};
 use crate::{
    db::{
        self, DatabaseConnection,
-        models::{EvmBasicGrant, EvmWalletAccess, NewEvmBasicGrant, SqliteTimestamp},
+        models::{EvmBasicGrant, EvmWalletAccess, EvmWalletId, NewEvmBasicGrant, SqliteTimestamp},
        schema::evm_basic_grant,
    },
    evm::{
@@ -45,7 +45,7 @@ fn ctx(to: Address, calldata: Bytes) -> EvalContext {
    EvalContext {
        target: EvmWalletAccess {
            id: WALLET_ACCESS_ID,
-            wallet_id: 10,
+            wallet_id: EvmWalletId::from_raw(10),
            client_id: 20,
            created_at: SqliteTimestamp(Utc::now()),
        },
@@ -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,
--- a/server/crates/arbiter-server/src/grpc/client/auth.rs
+++ b/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(),
                })
            }
--- a/server/crates/arbiter-server/src/grpc/operator/auth.rs
+++ b/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(),
                })
            }
@@ -171,7 +171,7 @@ impl Receiver<auth::Inbound> for AuthTransportAdapter<'_> {
                Some(auth::Inbound::AuthChallengeRequest {
                    pubkey,
-                    bootstrap_token: bootstrap_token.map(String::into_bytes),
+                    bootstrap_token,
                })
            }
            AuthRequestPayload::ChallengeSolution(ProtoAuthChallengeSolution { signature }) => {
--- a/server/crates/arbiter-server/src/grpc/operator/evm.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/evm.rs
@@ -90,7 +90,7 @@ async fn handle_wallet_list(
                .into_iter()
                .map(|(id, address)| WalletEntry {
                    address: address.to_vec(),
-                    id,
+                    id: id.to_raw(),
                })
                .collect(),
        }),
@@ -217,11 +217,6 @@ async fn handle_sign_transaction(
                result: Some(vet_error.convert()),
            }
        }
        Err(kameo::error::SendError::HandlerError(
            SessionSignTransactionError::ClientNotConnected,
        )) => {
            return Err(Status::permission_denied("client not connected"));
        }
        Err(kameo::error::SendError::HandlerError(SessionSignTransactionError::Internal)) => {
            EvmSignTransactionResponse {
                result: Some(EvmSignTransactionResult::Error(
--- a/server/crates/arbiter-server/src/grpc/operator/inbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/inbound.rs
@@ -1,11 +1,10 @@
 use crate::{
-    db::models::{CoreEvmWalletAccess, NewEvmWalletAccess},
+    db::models::{CoreEvmWalletAccess, EvmWalletId, NewEvmWalletAccess},
    evm::policies::{
        SharedGrantSettings, SpecificGrant, TransactionRateLimit, VolumeRateLimit, ether_transfer,
        token_transfers,
    },
-    grpc::Convert,
+    grpc::{Convert, TryConvert},
    grpc::TryConvert,
 };
 use arbiter_proto::{
    proto::evm::{
@@ -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,
        })
--- a/server/crates/arbiter-server/src/grpc/operator/outbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/outbound.rs
@@ -103,7 +103,7 @@ impl Convert for EvmWalletAccess {
        Self::Output {
            id: self.id,
            access: Some(WalletAccess {
-                wallet_id: self.wallet_id,
+                wallet_id: self.wallet_id.to_raw(),
                sdk_client_id: self.client_id,
            }),
        }
--- a/server/crates/arbiter-server/src/grpc/operator/sdk_client.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/sdk_client.rs
@@ -2,7 +2,7 @@ use crate::{
    db::models::NewEvmWalletAccess,
    grpc::Convert,
    peers::operator::{
-        OutOfBand, OperatorSession,
+        OperatorSession, OutOfBand,
        session::handlers::{
            HandleGrantEvmWalletAccess, HandleListWalletAccess, HandleNewClientApprove,
            HandleRevokeEvmWalletAccess, HandleSdkClientList,
@@ -11,8 +11,8 @@ use crate::{
 };
 use arbiter_crypto::authn;
 use arbiter_proto::proto::{
    shared::ClientInfo as ProtoClientMetadata,
    operator::{
        operator_response::Payload as OperatorResponsePayload,
        sdk_client::{
            self as proto_sdk_client, ConnectionCancel as ProtoSdkClientConnectionCancel,
            ConnectionRequest as ProtoSdkClientConnectionRequest,
@@ -24,8 +24,8 @@ use arbiter_proto::proto::{
            request::Payload as SdkClientRequestPayload,
            response::Payload as SdkClientResponsePayload,
        },
        operator_response::Payload as OperatorResponsePayload,
    },
    shared::ClientInfo as ProtoClientMetadata,
 };
 use kameo::actor::ActorRef;
@@ -115,7 +115,7 @@ async fn handle_list(
            clients: clients
                .into_iter()
                .map(|(client, metadata)| ProtoSdkClientEntry {
-                    id: client.id,
+                    id: client.id.to_raw(),
                    pubkey: client.public_key.clone(),
                    info: Some(ProtoClientMetadata {
                        name: metadata.name,
--- a/server/crates/arbiter-server/src/grpc/operator/vault_gate/outbound.rs
+++ b/server/crates/arbiter-server/src/grpc/operator/vault_gate/outbound.rs
@@ -87,7 +87,6 @@ impl TryConvert for vault_gate::Outbound {
                let proto_result = match result {
                    Ok(()) => ProtoUnsealResult::Success,
                    Err(vault_gate::Error::InvalidKey) => ProtoUnsealResult::InvalidKey,
                    Err(vault_gate::Error::LockedOut) => ProtoUnsealResult::LockedOut,
                    Err(err) => {
                        warn!(?err, "unseal failed");
                        return Err(Status::internal("Failed to unseal vault"));
--- a/server/crates/arbiter-server/src/peers/client/auth.rs
+++ b/server/crates/arbiter-server/src/peers/client/auth.rs
@@ -8,7 +8,7 @@ use crate::{
    crypto::integrity::{self, AttestationStatus},
    db::{
        self,
-        models::ProgramClientMetadata,
+        models::{ProgramClientMetadata, SqliteTimestamp},
        schema::program_client,
    },
 };
@@ -18,13 +18,14 @@ use arbiter_proto::{
    transport::{Bi, expect_message},
 };
 use chrono::Utc;
 use diesel::{
    ExpressionMethods as _, OptionalExtension as _, QueryDsl as _, SelectableHelper as _,
-    dsl::insert_into,
+    dsl::insert_into, update,
 };
 use diesel_async::RunQueryDsl as _;
 use kameo::{actor::ActorRef, error::SendError};
-use tracing::{error, warn};
+use tracing::error;
 #[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
 pub enum Error {
@@ -210,47 +211,71 @@ async fn insert_client(
    .await
 }
-/// Compares stored metadata against what a reconnecting client presents.
+async fn sync_client_metadata(
 /// Metadata is frozen after initial operator approval and must not be silently
 /// overwritten. Doing so would let an approved client forge its displayed
 /// identity in later approval prompts. Drift is logged and ignored.
 async fn check_metadata_drift(
    db: &db::DatabasePool,
    client_id: i32,
-    presented: &ClientMetadata,
+    metadata: &ClientMetadata,
 ) -> Result<(), Error> {
-    use crate::db::schema::client_metadata;
+    use crate::db::schema::{client_metadata, client_metadata_history};
    let now = SqliteTimestamp(Utc::now());
    let mut conn = db.get().await.map_err(|e| {
        error!(error = ?e, "Database pool error");
        Error::DatabasePoolUnavailable
    })?;
-    let current: ProgramClientMetadata = program_client::table
+    conn.exclusive_transaction(async |conn| {
-        .find(client_id)
+        let (current_metadata_id, current): (i32, ProgramClientMetadata) = program_client::table
-        .inner_join(client_metadata::table)
+            .find(client_id)
-        .select(ProgramClientMetadata::as_select())
+            .inner_join(client_metadata::table)
-        .first(&mut conn)
+            .select((
-        .await
+                program_client::metadata_id,
-        .map_err(|e| {
+                ProgramClientMetadata::as_select(),
-            error!(error = ?e, "Database error");
+            ))
-            Error::DatabaseOperationFailed
+            .first(&mut *conn)
-        })?;
+            .await?;
-    let changed = current.name != presented.name
+        let unchanged = current.name == metadata.name
-        || current.description != presented.description
+            && current.description == metadata.description
-        || current.version != presented.version;
+            && current.version == metadata.version;
        if unchanged {
            return Ok(());
        }
-    if changed {
+        insert_into(client_metadata_history::table)
-        warn!(
+            .values((
-            client_id,
+                client_metadata_history::metadata_id.eq(current_metadata_id),
-            stored_name = %current.name,
+                client_metadata_history::client_id.eq(client_id),
-            presented_name = %presented.name,
+            ))
-            "reconnecting client presented different metadata; ignoring - metadata is frozen after operator approval"
+            .execute(&mut *conn)
-        );
+            .await?;
    }
-    Ok(())
+        let metadata_id = insert_into(client_metadata::table)
            .values((
                client_metadata::name.eq(&metadata.name),
                client_metadata::description.eq(&metadata.description),
                client_metadata::version.eq(&metadata.version),
            ))
            .returning(client_metadata::id)
            .get_result::<i32>(&mut *conn)
            .await?;
        update(program_client::table.find(client_id))
            .set((
                program_client::metadata_id.eq(metadata_id),
                program_client::updated_at.eq(now),
            ))
            .execute(&mut *conn)
            .await?;
        Ok::<(), diesel::result::Error>(())
    })
    .await
    .map_err(|e| {
        error!(error = ?e, "Database error");
        Error::DatabaseOperationFailed
    })
 }
 async fn challenge_client<T>(
@@ -273,7 +298,7 @@ where
    let signature = expect_message(transport, |req: Inbound| match req {
        Inbound::AuthChallengeSolution { signature } => Some(signature),
-        Inbound::AuthChallengeRequest { .. } => None,
+        _ => None,
    })
    .await
    .map_err(|e| {
@@ -299,7 +324,6 @@ where
    let client_id = if let Some(id) = get_client_id(&props.db, &pubkey).await? {
        verify_integrity(&props.db, &props.actors.vault, &pubkey).await?;
        check_metadata_drift(&props.db, id, &metadata).await?;
        id
    } else {
        approve_new_client(
@@ -313,6 +337,8 @@ where
        insert_client(&props.db, &props.actors.vault, &pubkey, &metadata).await?
    };
    sync_client_metadata(&props.db, client_id, &metadata).await?;
    let challenge = AuthChallenge::generate(&mut rand::rng());
    challenge_client(transport, pubkey, challenge).await?;
--- a/server/crates/arbiter-server/src/peers/client/session.rs
+++ b/server/crates/arbiter-server/src/peers/client/session.rs
@@ -83,7 +83,7 @@ impl Actor for ClientSession {
        args.props
            .actors
            .flow_coordinator
-            .ask(RegisterClient { client_id: args.client_id, actor: this })
+            .ask(RegisterClient { actor: this })
            .await
            .map_err(|_| Error::ConnectionRegistrationFailed)?;
        Ok(args)
--- a/server/crates/arbiter-server/src/peers/operator/auth/mod.rs
+++ b/server/crates/arbiter-server/src/peers/operator/auth/mod.rs
@@ -14,7 +14,7 @@ mod state;
 pub enum Inbound {
    AuthChallengeRequest {
        pubkey: authn::PublicKey,
-        bootstrap_token: Option<Vec<u8>>,
+        bootstrap_token: Option<String>,
    },
    AuthChallengeSolution {
        signature: Vec<u8>,
@@ -26,22 +26,21 @@ pub enum Error {
    UnregisteredPublicKey,
    InvalidChallengeSolution,
    InvalidBootstrapToken,
-    /// Reaches the operator verbatim via `Status::internal`, so the payload is
+    Internal { details: String },
    /// `&'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 {
-    const fn internal(details: &'static str) -> Self {
+    fn internal(details: impl Into<String>) -> Self {
-        Self::Internal { details }
+        Self::Internal {
            details: details.into(),
        }
    }
 }
 impl From<diesel::result::Error> for Error {
    fn from(e: diesel::result::Error) -> Self {
-        error!(error = %crate::utils::error_chain(&e), "Database error");
+        error!(?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_client},
+    db::{DatabasePool, schema::operator_identity},
    peers::operator::auth::Outbound,
 };
 use arbiter_crypto::authn::{self, AuthChallenge, OPERATOR_CONTEXT};
@@ -16,12 +16,13 @@ use tracing::error;
 pub(super) struct ChallengeRequest {
    pub(super) pubkey: authn::PublicKey,
-    pub(super) bootstrap_token: Option<Vec<u8>>,
+    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>,
 }
 pub(super) struct ChallengeSolution {
@@ -43,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()
@@ -62,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| {
@@ -78,16 +79,11 @@ async fn register_key(db: &DatabasePool, pubkey: &authn::PublicKey) -> Result<i3
 pub(super) struct AuthContext<'a, T: ?Sized> {
    pub(super) conn: &'a mut OperatorConnection,
    pub(super) transport: &'a mut T,
    bootstrap_token: Option<Vec<u8>>,
 }
 impl<'a, T: ?Sized> AuthContext<'a, T> {
    pub(super) const fn new(conn: &'a mut OperatorConnection, transport: &'a mut T) -> Self {
-        Self {
+        Self { conn, transport }
            conn,
            transport,
            bootstrap_token: None,
        }
    }
 }
@@ -112,8 +108,6 @@ where
            }
        }
        self.bootstrap_token = bootstrap_token;
        let challenge = AuthChallenge::generate(&mut rand::rng());
        self.transport
@@ -126,12 +120,22 @@ where
                Error::Transport
            })?;
-        Ok(ChallengeContext { challenge, pubkey })
+        Ok(ChallengeContext {
            challenge,
            pubkey,
            bootstrap_token,
        })
    }
    #[allow(missing_docs)]
    #[allow(clippy::unused_unit)]
    async fn verify_solution(
        &mut self,
-        ChallengeContext { challenge, pubkey }: &ChallengeContext,
+        ChallengeContext {
            challenge,
            pubkey,
            bootstrap_token,
        }: &ChallengeContext,
        ChallengeSolution { solution }: ChallengeSolution,
    ) -> Result<Credentials, Self::Error> {
        let signature = authn::Signature::try_from(solution.as_slice()).map_err(|()| {
@@ -150,13 +154,15 @@ where
        }
        // Resolve client id: bootstrap (consume token + register) or lookup
-        let id = match self.bootstrap_token.take() {
+        let id = match bootstrap_token {
            Some(token) => {
                let token_ok: bool = self
                    .conn
                    .actors
                    .bootstrapper
-                    .ask(ConsumeToken { token })
+                    .ask(ConsumeToken {
                        token: token.clone(),
                    })
                    .await
                    .map_err(|e| {
                        error!(?e, "Failed to consume bootstrap token");
--- a/server/crates/arbiter-server/src/peers/operator/session/handlers.rs
+++ b/server/crates/arbiter-server/src/peers/operator/session/handlers.rs
@@ -1,14 +1,15 @@
 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,
    },
-    actors::flow_coordinator::{IsClientConnected, client_connect_approval::ClientApprovalAnswer},
+    db::models::{
-    actors::vault::VaultState,
+        EvmWalletAccess, EvmWalletId, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata,
    db::{
        models::{EvmWalletAccess, NewEvmWalletAccess, ProgramClient, ProgramClientMetadata},
        schema::program_client,
    },
    evm::policies::{Grant, SpecificGrant},
 };
@@ -18,16 +19,13 @@ use alloy::{consensus::TxEip1559, primitives::Address, signers::Signature};
 use diesel::{ExpressionMethods as _, QueryDsl as _, SelectableHelper};
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use kameo::{error::SendError, messages, prelude::Context};
-use tracing::{error, info, warn};
+use tracing::error;
 #[derive(Debug, Error)]
 pub enum SignTransactionError {
    #[error("Policy evaluation failed")]
    Vet(#[from] crate::evm::VetError),
    #[error("Client not connected")]
    ClientNotConnected,
    #[error("Internal signing error")]
    Internal,
 }
@@ -76,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) => {
@@ -147,30 +147,6 @@ impl OperatorSession {
        wallet_address: Address,
        transaction: TxEip1559,
    ) -> Result<Signature, SignTransactionError> {
        if !self.approved_client_ids.contains(&client_id) {
            warn!(
                client_id,
                "operator attempted to sign for client not in its approved set"
            );
            return Err(SignTransactionError::ClientNotConnected);
        }
        let connected = self
            .props
            .actors
            .flow_coordinator
            .ask(IsClientConnected { client_id })
            .await
            .unwrap_or(false);
        if !connected {
            self.approved_client_ids.remove(&client_id);
            warn!(client_id, "operator attempted to sign for disconnected client");
            return Err(SignTransactionError::ClientNotConnected);
        }
        info!(client_id, event = "sign_transaction", "operator.sign_transaction");
        match self
            .props
            .actors
@@ -226,7 +202,7 @@ impl OperatorSession {
            use crate::db::schema::evm_wallet_access;
            for entry in entries {
                diesel::delete(evm_wallet_access::table)
-                    .filter(evm_wallet_access::id.eq(entry))
+                    .filter(evm_wallet_access::wallet_id.eq(entry))
                    .execute(&mut *conn)
                    .await?;
            }
@@ -242,7 +218,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?;
@@ -279,30 +256,6 @@ impl OperatorSession {
        ctx.actor_ref().unlink(&pending_approval.controller).await;
        if approved {
            let pubkey_bytes = pending_approval.pubkey.to_bytes();
            match self.props.db.get().await {
                Ok(mut conn) => {
                    match program_client::table
                        .filter(program_client::public_key.eq(pubkey_bytes.as_slice()))
                        .select(program_client::id)
                        .first::<i32>(&mut conn)
                        .await
                    {
                        Ok(client_id) => {
                            self.approved_client_ids.insert(client_id);
                        }
                        Err(err) => {
                            error!(?err, "Failed to look up client_id for approved pubkey");
                        }
                    }
                }
                Err(err) => {
                    error!(?err, "DB pool error after client approval");
                }
            }
        }
        Ok(())
    }
@@ -325,142 +278,3 @@ impl OperatorSession {
        Ok(clients)
    }
 }
 #[cfg(test)]
 mod tests {
    use crate::db::{self, models::NewEvmWalletAccess, schema::evm_wallet_access};
    use diesel::{ExpressionMethods as _, QueryDsl as _, SelectableHelper};
    use diesel_async::{AsyncConnection, RunQueryDsl};
    /// Regression test: revocation must delete by access-entry `id`, not by `wallet_id`.
    ///
    /// Before the fix, revoking `entry_id=1` would delete all rows where `wallet_id=1`,
    /// wiping out every client's access to wallet #1.
    #[tokio::test]
    async fn revoke_deletes_by_entry_id_not_wallet_id() {
        use crate::db::models::EvmWalletAccess;
        let pool = db::create_test_pool().await;
        let mut conn = pool.get().await.expect("pool connection");
        // Insert two access entries for the same wallet but different clients.
        // entry A: id will be 1, wallet_id=1, client_id=10
        // 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: 1,
                client_id: 10,
            })
            .returning(EvmWalletAccess::as_select())
            .get_result(&mut *conn)
            .await
            .expect("insert entry A");
        let entry_b = diesel::insert_into(evm_wallet_access::table)
            .values(NewEvmWalletAccess {
                wallet_id: 1,
                client_id: 20,
            })
            .returning(EvmWalletAccess::as_select())
            .get_result(&mut *conn)
            .await
            .expect("insert entry B");
        // Revoke only entry A by its primary key id.
        conn.transaction(async |conn| {
            diesel::delete(evm_wallet_access::table)
                .filter(evm_wallet_access::id.eq(entry_a.id))
                .execute(&mut *conn)
                .await
        })
        .await
        .expect("revoke entry A");
        // Entry A must be gone.
        let gone = evm_wallet_access::table
            .filter(evm_wallet_access::id.eq(entry_a.id))
            .count()
            .get_result::<i64>(&mut *conn)
            .await
            .expect("count entry A");
        assert_eq!(gone, 0, "revoked entry must be deleted");
        // Entry B (same wallet, different client) must still exist.
        let still_there = evm_wallet_access::table
            .filter(evm_wallet_access::id.eq(entry_b.id))
            .count()
            .get_result::<i64>(&mut *conn)
            .await
            .expect("count entry B");
        assert_eq!(still_there, 1, "unrelated entry must not be deleted");
    }
    /// Regression test: when `entry_id` and `wallet_id` differ, only the correct row is removed.
    ///
    /// This specifically catches the case where `entry.id=5` and `wallet_id=1` are different values;
    /// the old bug would delete by `wallet_id`, potentially matching a completely different entry.
    #[tokio::test]
    async fn revoke_with_mismatched_wallet_and_entry_ids() {
        use crate::db::models::EvmWalletAccess;
        let pool = db::create_test_pool().await;
        let mut conn = pool.get().await.expect("pool connection");
        // Insert entries to force auto-increment IDs to diverge from wallet_ids.
        // We'll insert 5 placeholder entries first so that the real entry gets id=6.
        for i in 1_i32..=5 {
            diesel::insert_into(evm_wallet_access::table)
                .values(NewEvmWalletAccess {
                    wallet_id: 99,
                    client_id: i,
                })
                .execute(&mut *conn)
                .await
                .expect("insert placeholder");
        }
        // Real target: wallet_id=1, will get id=6.
        let target = diesel::insert_into(evm_wallet_access::table)
            .values(NewEvmWalletAccess {
                wallet_id: 1,
                client_id: 1,
            })
            .returning(EvmWalletAccess::as_select())
            .get_result(&mut *conn)
            .await
            .expect("insert target");
        // Sanity: target.id != target.wallet_id
        assert_ne!(
            target.id, target.wallet_id,
            "test prerequisite: id and wallet_id must differ"
        );
        // Revoke by entry id.
        conn.transaction(async |conn| {
            diesel::delete(evm_wallet_access::table)
                .filter(evm_wallet_access::id.eq(target.id))
                .execute(&mut *conn)
                .await
        })
        .await
        .expect("revoke target");
        let remaining = evm_wallet_access::table
            .filter(evm_wallet_access::id.eq(target.id))
            .count()
            .get_result::<i64>(&mut *conn)
            .await
            .expect("count target");
        assert_eq!(remaining, 0, "target must be deleted by its entry id");
        // Placeholders for wallet_id=99 must be untouched.
        let placeholders = evm_wallet_access::table
            .filter(evm_wallet_access::wallet_id.eq(99))
            .count()
            .get_result::<i64>(&mut *conn)
            .await
            .expect("count placeholders");
        assert_eq!(placeholders, 5, "unrelated entries must survive");
    }
 }
--- a/server/crates/arbiter-server/src/peers/operator/session/mod.rs
+++ b/server/crates/arbiter-server/src/peers/operator/session/mod.rs
@@ -1,14 +1,16 @@
 use super::{OutOfBand, OperatorConnection};
 use crate::{
    actors::{
-        flow_coordinator::{GetConnectedClientIds, client_connect_approval::{ClientApprovalAnswer, ClientApprovalController}}, operator_registry::ConnectOperator,
+        flow_coordinator::client_connect_approval::ClientApprovalController,
-    }, peers::client::ClientProfile,
+        operator_registry::ConnectOperator,
    },
    peers::client::ClientProfile,
 };
 use arbiter_crypto::authn;
 use arbiter_proto::transport::Sender;
 use kameo::{Actor, actor::ActorRef, messages};
-use std::{borrow::Cow, collections::{HashMap, HashSet}};
+use std::{borrow::Cow, collections::HashMap};
 use thiserror::Error;
 use tracing::error;
@@ -52,10 +54,6 @@ pub struct OperatorSession {
    sender: Box<dyn Sender<OutOfBand>>,
    pending_client_approvals: HashMap<Vec<u8>, PendingClientApproval>,
    /// DB `client_ids` this operator session is allowed to sign for.
    /// Seeded from currently-connected clients on start, then updated as
    /// approvals are granted or denied during the session lifetime.
    approved_client_ids: HashSet<i32>,
 }
 pub mod handlers;
@@ -65,8 +63,7 @@ impl OperatorSession {
        Self {
            props,
            sender,
-            pending_client_approvals: HashMap::default(),
+            pending_client_approvals: Default::default(),
            approved_client_ids: HashSet::default(),
        }
    }
 }
@@ -91,7 +88,6 @@ impl OperatorSession {
                actor = "operator",
                event = "failed to announce new client connection"
            );
            let _ = controller.tell(ClientApprovalAnswer { approved: false }).await;
            return;
        }
@@ -110,7 +106,7 @@ impl Actor for OperatorSession {
    type Error = Error;
-    async fn on_start(mut args: Self::Args, this: ActorRef<Self>) -> Result<Self, Self::Error> {
+    async fn on_start(args: Self::Args, this: ActorRef<Self>) -> Result<Self, Self::Error> {
        args.props
            .actors
            .operator_registry
@@ -125,16 +121,6 @@ impl Actor for OperatorSession {
                );
                Error::internal("Failed to register operator connection with operator registry")
            })?;
        // Seed approved set with clients already connected when this session starts.
        // New clients will be added via handle_new_client_approve as they are approved.
        match args.props.actors.flow_coordinator.ask(GetConnectedClientIds {}).await {
            Ok(ids) => args.approved_client_ids.extend(ids),
            Err(err) => {
                error!(?err, "Failed to fetch connected client IDs on operator session start");
            }
        }
        Ok(args)
    }
--- a/server/crates/arbiter-server/src/peers/operator/vault_gate/mod.rs
+++ b/server/crates/arbiter-server/src/peers/operator/vault_gate/mod.rs
@@ -25,17 +25,17 @@ pub enum Error {
    AlreadyBootstrapped,
    #[error("Invalid key provided")]
    InvalidKey,
    #[error("Vault locked: too many failed unseal attempts")]
    LockedOut,
    #[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(&'static str),
+    Internal(String),
 }
 impl Error {
    fn internal(message: impl Into<String>) -> Self {
        Self::Internal(message.into())
    }
 }
 pub struct HandshakeResponse {
@@ -170,14 +170,13 @@ impl VaultGate {
                Ok(())
            }
            Err(SendError::HandlerError(vault::Error::InvalidKey)) => Err(Error::InvalidKey),
            Err(SendError::HandlerError(vault::Error::LockedOut)) => Err(Error::LockedOut),
            Err(SendError::HandlerError(err)) => {
                error!(?err, "Vault failed to unseal key");
                Err(Error::InvalidKey)
            }
            Err(err) => {
                error!(?err, "Failed to send unseal request to vault");
-                Err(Error::Internal("Vault actor error"))
+                Err(Error::internal("Vault actor error"))
            }
        }
    }
@@ -219,7 +218,7 @@ impl VaultGate {
            }
            Err(err) => {
                error!(?err, "Failed to send bootstrap request to vault");
-                Err(Error::Internal("Vault error"))
+                Err(Error::internal("Vault error"))
            }
        }
    }
@@ -231,10 +230,7 @@ impl VaultGate {
            .vault
            .ask(GetState {})
            .await
-            .map_err(|err| {
+            .map_err(|_| Error::internal("failed to query vault"))?;
                error!(?err, "Failed to query vault state");
                Error::Internal("failed to query vault")
            })?;
        Ok(answer)
    }
@@ -253,10 +249,7 @@ impl Message<events::Bootstrapped> for VaultGate {
                .db
                .get()
                .await
-                .map_err(|err| {
+                .map_err(|_| Error::internal("DB unavailable"))?;
                    error!(error = %crate::utils::error_chain(&err), "DB unavailable on bootstrap");
                    Error::Internal("DB unavailable")
                })?;
            integrity::sign_entity(
                &mut conn,
                &self.actors.vault,
@@ -264,12 +257,9 @@ impl Message<events::Bootstrapped> for VaultGate {
                self.auth_creds.id,
            )
            .await
-            .map_err(|err| {
+            .map_err(|e| {
-                error!(
+                error!(?e, "Failed to sign integrity envelope on bootstrap");
-                    error = %crate::utils::error_chain(&err),
+                Error::internal("Integrity sign failed")
                    "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,47 +14,3 @@ 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_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();
@@ -266,7 +266,7 @@ pub async fn metadata_unchanged_does_not_append_history() {
 #[tokio::test]
 #[test_log::test]
-pub async fn metadata_frozen_after_approval_ignores_reconnect_changes() {
+pub async fn metadata_change_appends_history_and_repoints_binding() {
    let db = db::create_test_pool().await;
    let actors = spawn_test_actors(&db).await;
    let new_key = MlDsa87::key_gen(&mut rand::rng());
@@ -287,7 +287,6 @@ pub async fn metadata_frozen_after_approval_ignores_reconnect_changes() {
        connect_client(props, &mut server_transport).await;
    });
    // Reconnect presenting different metadata — must be silently ignored.
    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
            pubkey: verifying_key(&new_key).into(),
@@ -314,7 +313,6 @@ pub async fn metadata_frozen_after_approval_ignores_reconnect_changes() {
            client_metadata, client_metadata_history, program_client,
        };
        let mut conn = db.get().await.unwrap();
        // Metadata is frozen: no new row, no history entry.
        let metadata_count: i64 = client_metadata::table
            .count()
            .get_result(&mut conn)
@@ -340,16 +338,15 @@ pub async fn metadata_frozen_after_approval_ignores_reconnect_changes() {
            .first::<(String, Option<String>, Option<String>)>(&mut conn)
            .await
            .unwrap();
-        assert_eq!(metadata_count, 1, "frozen: no new metadata row on reconnect");
+        assert_eq!(metadata_count, 2);
-        assert_eq!(history_count, 0, "frozen: no history entry on reconnect");
+        assert_eq!(history_count, 1);
        assert_eq!(
            current,
            (
                "client".to_owned(),
-                Some("old".to_owned()),
+                Some("new".to_owned()),
-                Some("1.0.0".to_owned())
+                Some("2.0.0".to_owned())
-            ),
+            )
            "frozen: original metadata must be preserved"
        );
    }
 }
--- a/server/crates/arbiter-server/tests/operator/auth.rs
+++ b/server/crates/arbiter-server/tests/operator/auth.rs
@@ -174,7 +174,7 @@ pub async fn bootstrap_token_auth() {
    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
            pubkey: verifying_key(&new_key).into(),
-            bootstrap_token: Some(token.into_bytes()),
+            bootstrap_token: Some(token),
        })
        .await
        .unwrap();
@@ -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();
@@ -231,7 +231,7 @@ pub async fn bootstrap_invalid_token_auth() {
    test_transport
        .send(auth::Inbound::AuthChallengeRequest {
            pubkey: verifying_key(&new_key).into(),
-            bootstrap_token: Some(b"invalid_token".to_vec()),
+            bootstrap_token: Some("invalid_token".to_owned()),
        })
        .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();
--- a/server/crates/arbiter-server/tests/vault/concurrency.rs
+++ b/server/crates/arbiter-server/tests/vault/concurrency.rs
@@ -14,8 +14,6 @@ use kameo::actor::{ActorRef, Spawn as _};
 use std::collections::{HashMap, HashSet};
 use tokio::task::JoinSet;
 const TEST_AAD: &[u8] = b"test-aad";
 async fn write_concurrently(
    actor: ActorRef<Vault>,
    prefix: &'static str,
@@ -29,7 +27,6 @@ async fn write_concurrently(
            let id = actor
                .ask(CreateNew {
                    plaintext: SafeCell::new(plaintext.clone()),
                    aad: TEST_AAD.to_vec(),
                })
                .await
                .unwrap();
@@ -123,7 +120,7 @@ async fn insert_failure_does_not_create_partial_row() {
    drop(conn);
    let err = actor
-        .create_new(SafeCell::new(b"should fail".to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(b"should fail".to_vec()))
        .await
        .unwrap_err();
    assert!(matches!(err, Error::DatabaseTransaction(_)));
@@ -174,7 +171,7 @@ async fn decrypt_roundtrip_after_high_concurrency() {
        .unwrap();
    for (id, plaintext) in expected {
-        let mut decrypted = decryptor.decrypt(id, TEST_AAD.to_vec()).await.unwrap();
+        let mut decrypted = decryptor.decrypt(id).await.unwrap();
        assert_eq!(*decrypted.read(), plaintext);
    }
 }
--- a/server/crates/arbiter-server/tests/vault/lifecycle.rs
+++ b/server/crates/arbiter-server/tests/vault/lifecycle.rs
@@ -12,11 +12,9 @@ use arbiter_server::{
 use diesel::{QueryDsl, SelectableHelper};
 use diesel_async::RunQueryDsl;
 const TEST_AAD: &[u8] = b"test-aad";
 #[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
@@ -41,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;
@@ -52,14 +50,14 @@ 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
        .unwrap();
    let err = actor
-        .create_new(SafeCell::new(b"data".to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(b"data".to_vec()))
        .await
        .unwrap_err();
    assert!(matches!(err, Error::NotBootstrapped));
@@ -67,19 +65,19 @@ 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
        .unwrap();
-    let err = actor.decrypt(1, TEST_AAD.to_vec()).await.unwrap_err();
+    let err = actor.decrypt(1).await.unwrap_err();
    assert!(matches!(err, Error::NotBootstrapped));
 }
 #[tokio::test]
 #[test_log::test]
-async fn new_restores_sealed_state() {
+async fn test_new_restores_sealed_state() {
    let db = db::create_test_pool().await;
    let actor = common::bootstrapped_vault(&db).await;
    drop(actor);
@@ -87,19 +85,19 @@ async fn new_restores_sealed_state() {
    let mut actor2 = Vault::new(db, GlobalActors::spawn_message_bus())
        .await
        .unwrap();
-    let err = actor2.decrypt(1, TEST_AAD.to_vec()).await.unwrap_err();
+    let err = actor2.decrypt(1).await.unwrap_err();
    assert!(matches!(err, Error::Sealed));
 }
 #[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;
    let plaintext = b"survive a restart";
    let aead_id = actor
-        .create_new(SafeCell::new(plaintext.to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(plaintext.to_vec()))
        .await
        .unwrap();
    drop(actor);
@@ -110,19 +108,19 @@ async fn unseal_correct_password() {
    let seal_key = SafeCell::new(b"test-seal-key".to_vec());
    actor.try_unseal(seal_key).await.unwrap();
-    let mut decrypted = actor.decrypt(aead_id, TEST_AAD.to_vec()).await.unwrap();
+    let mut decrypted = actor.decrypt(aead_id).await.unwrap();
    assert_eq!(*decrypted.read(), plaintext);
 }
 #[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;
    let plaintext = b"important data";
    let aead_id = actor
-        .create_new(SafeCell::new(plaintext.to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(plaintext.to_vec()))
        .await
        .unwrap();
    drop(actor);
@@ -138,6 +136,6 @@ async fn unseal_wrong_then_correct_password() {
    let good_key = SafeCell::new(b"test-seal-key".to_vec());
    actor.try_unseal(good_key).await.unwrap();
-    let mut decrypted = actor.decrypt(aead_id, TEST_AAD.to_vec()).await.unwrap();
+    let mut decrypted = actor.decrypt(aead_id).await.unwrap();
    assert_eq!(*decrypted.read(), plaintext);
 }
--- a/server/crates/arbiter-server/tests/vault/storage.rs
+++ b/server/crates/arbiter-server/tests/vault/storage.rs
@@ -10,47 +10,45 @@ use diesel::{ExpressionMethods as _, QueryDsl, SelectableHelper, dsl::update};
 use diesel_async::RunQueryDsl;
 use std::collections::HashSet;
 const TEST_AAD: &[u8] = b"test-aad";
 #[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;
    let plaintext = b"hello arbiter";
    let aead_id = actor
-        .create_new(SafeCell::new(plaintext.to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(plaintext.to_vec()))
        .await
        .unwrap();
-    let mut decrypted = actor.decrypt(aead_id, TEST_AAD.to_vec()).await.unwrap();
+    let mut decrypted = actor.decrypt(aead_id).await.unwrap();
    assert_eq!(*decrypted.read(), plaintext);
 }
 #[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;
-    let err = actor.decrypt(9999, TEST_AAD.to_vec()).await.unwrap_err();
+    let err = actor.decrypt(9999).await.unwrap_err();
    assert!(matches!(err, Error::NotFound));
 }
 #[tokio::test]
 #[test_log::test]
-async fn ciphertext_differs_across_entries() {
+async fn test_ciphertext_differs_across_entries() {
    let db = db::create_test_pool().await;
    let mut actor = common::bootstrapped_vault(&db).await;
    let plaintext = b"same content";
    let id1 = actor
-        .create_new(SafeCell::new(plaintext.to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(plaintext.to_vec()))
        .await
        .unwrap();
    let id2 = actor
-        .create_new(SafeCell::new(plaintext.to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(plaintext.to_vec()))
        .await
        .unwrap();
@@ -70,22 +68,22 @@ async fn ciphertext_differs_across_entries() {
    assert_ne!(row1.ciphertext, row2.ciphertext);
-    let mut d1 = actor.decrypt(id1, TEST_AAD.to_vec()).await.unwrap();
+    let mut d1 = actor.decrypt(id1).await.unwrap();
-    let mut d2 = actor.decrypt(id2, TEST_AAD.to_vec()).await.unwrap();
+    let mut d2 = actor.decrypt(id2).await.unwrap();
    assert_eq!(*d1.read(), plaintext);
    assert_eq!(*d2.read(), plaintext);
 }
 #[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;
    let n = 5;
    for i in 0..n {
        actor
-            .create_new(SafeCell::new(format!("secret {i}").into_bytes()), TEST_AAD.to_vec())
+            .create_new(SafeCell::new(format!("secret {i}").into_bytes()))
            .await
            .unwrap();
    }
@@ -139,7 +137,7 @@ async fn broken_db_nonce_format_fails_closed() {
    drop(conn);
    let err = actor
-        .create_new(SafeCell::new(b"must fail".to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(b"must fail".to_vec()))
        .await
        .unwrap_err();
    assert!(matches!(err, Error::BrokenDatabase));
@@ -147,7 +145,7 @@ async fn broken_db_nonce_format_fails_closed() {
    let db = db::create_test_pool().await;
    let mut actor = common::bootstrapped_vault(&db).await;
    let id = actor
-        .create_new(SafeCell::new(b"decrypt target".to_vec()), TEST_AAD.to_vec())
+        .create_new(SafeCell::new(b"decrypt target".to_vec()))
        .await
        .unwrap();
    let mut conn = db.get().await.unwrap();
@@ -158,6 +156,6 @@ async fn broken_db_nonce_format_fails_closed() {
        .unwrap();
    drop(conn);
-    let err = actor.decrypt(id, TEST_AAD.to_vec()).await.unwrap_err();
+    let err = actor.decrypt(id).await.unwrap_err();
    assert!(matches!(err, Error::BrokenDatabase));
 }
Author	SHA1	Message	Date
Skipper	f97b8f9424	feat(grpc): governance contract	2026-08-26 13:01:44 +02:00
Skipper	9ca2c4ed64	refactor(server::db): introduced newtype wrappers for entity id's in database	2026-08-26 13:01:44 +02:00
Skipper	ab79959dce	housekeeping(server): deps upgrade + diesel migration to AsyncFnOnce	2026-08-26 13:01:44 +02:00
Skipper	853a038363	fix(server): MacOS build version	2026-08-26 13:01:44 +02:00
Skipper	a31ef99338	housekeeping(server): removed unused deps	2026-08-26 13:01:44 +02:00
Skipper	ec5a8143fb	refactor: rename to to better reflect meaning	2026-08-26 13:01:44 +02:00
Skipper	e4db36f145	docs: move to folder and update to new challenge payload	2026-08-26 13:00:40 +02:00
Skipper	602be3aa11	merge: feat-lints into main	2026-08-26 13:00:40 +02:00
CleverWild	1d15e04a6b	fix(lints): remove unstable ones	2026-08-26 13:00:40 +02:00
Stas	d8a03fcdbe	Merge pull request 'refactor-integrity-check' (#90 ) from refactor-integrity-check into main Reviewed-on: #90	2026-08-26 13:00:40 +02:00
CleverWild	d4084ded35	feat: rustc and clippy linting	2026-08-26 13:00:40 +02:00
Stas	6221debd84	Merge pull request 'housekeeping(server): dependencies upgrade' (#89 ) from push-zmvtzuwrnyyv into main Reviewed-on: #89	2026-08-26 13:00:40 +02:00
Skipper	8392f27ce4	housekeeping(server): clippy warns fix	2026-08-26 13:00:40 +02:00
Stas	96b4eb1d98	Merge pull request 'refactor(hashing): introduce Hashable derive macro and migrate server types' (#82 ) from hashing-proc-macro into main Reviewed-on: #82 Reviewed-by: Stas <business@jexter.tech>	2026-08-26 13:00:40 +02:00
Skipper	d7ca0b4fc8	housekeeping(server): dependencies upgrade	2026-08-26 13:00:40 +02:00
Skipper	e6724cb8d3	merge: refactor-integrity-check into main	2026-08-26 13:00:40 +02:00
Skipper	6b572d0c86	housekeeping(server): clean too-broad visibility markers and organize imports	2026-08-26 13:00:40 +02:00
Skipper	bf63279f73	merge: refactor-integrity-check into main	2026-08-26 13:00:40 +02:00
Skipper	539265e3b1	docs: updated to new auth challenge format and removed stale TOCTOU race condition note	2026-08-26 13:00:40 +02:00
Skipper	cddf9e02ba	fix(useragent): now using new challenge format	2026-08-26 13:00:40 +02:00
Skipper	270e843598	fix(server::tests): api surface of auth challenge changed	2026-08-26 13:00:40 +02:00
Skipper	0a48839321	refactor(server::{useragent::auth, client::auth}): use random based + timestamp nonce instead of monotonic counter in database	2026-08-26 13:00:40 +02:00
Skipper	f6151293d4	refactor(server): now keeps track of useragents, instead of	2026-08-26 13:00:40 +02:00
Skipper	3bbf713e67	refactor(server::grpc::vault_gate): standard approach using / traits	2026-08-26 13:00:40 +02:00
Skipper	810656702b	fix(server): sending fixed vault state when on stage	2026-08-26 13:00:40 +02:00
hdbg	4823a291f8	WIP: `kameo::messages` wiring for transport generalization	2026-08-26 13:00:40 +02:00
hdbg	1d9b572565	feat(user-agent): add VaultGate for sealed vault authentication	2026-08-26 13:00:40 +02:00
hdbg	af7e90dcad	fix(server::integrity): `vault` now differentias between expected/unexpected states for commands more granularly	2026-08-26 13:00:40 +02:00
hdbg	97e6b1950d	fix(useragent): unsafe, but working implementation of ml-dsa	2026-08-26 13:00:40 +02:00
hdbg	d2f41e693c	fix(server::user_agent): useragents now self-sign themselves on bootstrap	2026-08-26 13:00:40 +02:00
hdbg	9650407093	refactor(server): reorganized client/user_agent actors into separate module `peers` and added event `MessageBus`	2026-08-26 13:00:40 +02:00
Stas	100c257e95	Merge pull request 'Post-quantum crypto and better useragent security' (#80 ) from push-xrxykvkuxpsv into main Reviewed-on: #80	2026-08-26 13:00:39 +02:00
CleverWild	247cb90fbf	refactor(hashing): introduce Hashable derive macro and migrate server types	2026-08-26 13:00:39 +02:00
hdbg	13fb31f841	fix(server::bootsrapper): token compare is now constant-time	2026-08-26 13:00:39 +02:00
hdbg	a49baf7386	housekeeping(server): fixed clippy warns	2026-08-26 13:00:39 +02:00
hdbg	2df25b8641	tests(server::client::auth): integrity envelope insertion for valid paths	2026-08-26 13:00:39 +02:00
hdbg	6b814f4869	refactor(server): moved shared module crypto into `arbiter-crypto`	2026-08-26 13:00:39 +02:00
hdbg	11ad5df426	feat(server): add integrity verification for client keys	2026-08-26 13:00:39 +02:00
hdbg	97b7b483ff	docs: ml-dsa scheme everywhere	2026-08-26 13:00:39 +02:00
Stas	307822187c	Merge pull request 'fix(server): replaced postcard-based integrity fingerprint with custom trait providing order-independent hashing' (#77 ) from push-opwuyuwxknyo into main Reviewed-on: #77	2026-08-26 13:00:39 +02:00
hdbg	4c2e00b56d	refactor(server): migrated auth to `ml-dsa`	2026-08-26 13:00:39 +02:00
hdbg	dcf42b0e4e	fix(server): added `chain_id` check and covered `check_shared_constraints` with unit tests	2026-08-26 13:00:39 +02:00
hdbg	bd0a8f3907	tests(server): property-based testing for ordering independency for hash	2026-08-26 13:00:39 +02:00
hdbg	38284d84b6	tests(server): initial `cargo-mutants`	2026-08-26 13:00:39 +02:00
hdbg	d482ed37aa	fix(server): replaced `postcard`-based integrity fingerprint with custom trait providing order-independent hashing	2026-08-26 13:00:39 +02:00
hdbg	498e2e3145	fix(server): simplify hash function for `debug` profile	2026-08-26 13:00:39 +02:00
Stas	e1b32165e9	Merge pull request 'feat(server): integrity envelope engine for EVM grants with HMAC verification' (#51 ) from integrity-envelope into main Reviewed-on: #51	2026-08-26 13:00:39 +02:00
hdbg	6f33d44697	docs: add recovery operators and multi-operator details	2026-08-26 13:00:39 +02:00
hdbg	9173be2920	tests(server): fixed for new integrity checks	2026-08-26 13:00:39 +02:00
hdbg	cdf2394963	docs: add multi-operator governance section	2026-08-26 13:00:39 +02:00
hdbg	d55e9880ec	refactor(server): rework envelopes and integrity check	2026-08-26 13:00:39 +02:00
hdbg	37fa954933	merge: @main into client-integrity-verification	2026-08-26 13:00:39 +02:00
hdbg	ba7bfe9b6f	fix(server): remove stale mentions of miette	2026-08-26 13:00:39 +02:00
hdbg	5c3421de1e	housekeeping(server): fixed clippy warns	2026-08-26 13:00:39 +02:00
CleverWild	6a0c512773	chore: inline integrity proto types	2026-08-26 13:00:39 +02:00
hdbg	be23f87e67	refactor(user-agent): remove backfill pubkey integrity tags	2026-08-26 13:00:39 +02:00
CleverWild	4bd8a2df33	feat(server): integrity envelope engine for EVM grants with HMAC verification	2026-08-26 13:00:39 +02:00
hdbg	29f2174dcf	fix(server): previously, user agent auth accepted invalid signatures	2026-08-26 13:00:39 +02:00
hdbg	149035ecf5	refactor(server): separate crypto by purpose and moved outside of actor into separate module	2026-08-26 13:00:39 +02:00
CleverWild	17ea8d8dc9	feat(auth): implement attestation status verification for public keys	2026-08-26 13:00:39 +02:00
CleverWild	e9e2888e95	fix(keyholder): comment drift	2026-08-26 13:00:39 +02:00
CleverWild	0b30416a7b	refactor(keyholder): generalize derive_useragent_integrity_key and compute_useragent_pubkey_integrity_tag corespondenly to derive_integrity_key and compute_integrity_tag	2026-08-26 13:00:39 +02:00
CleverWild	e2e2c4fc07	feat(auth): add seal-key-derived pubkey integrity tags with auth enforcement and unseal backfill	2026-08-26 13:00:39 +02:00
hdbg	2b7d3257da	style(dashboard): format code and add title margin	2026-08-26 13:00:39 +02:00
hdbg	ed6e102c96	feat(grants-create): add configurable grant authorization fields	2026-08-26 13:00:39 +02:00
hdbg	a7e031faca	refactor(useragent::evm::grants): split into more files & flutter_form_builder usage	2026-08-26 13:00:39 +02:00
hdbg	8736a01e1f	fix(useragent::dashboard): screen pushed twice due to improper listen hook	2026-08-26 13:00:39 +02:00
hdbg	11c45ca4e1	refactor(grants): wrap grant list in SingleChildScrollView	2026-08-26 13:00:39 +02:00
hdbg	5323eea129	style(dashboard): remove const from _CalloutBell and add title to nav rail	2026-08-26 13:00:39 +02:00
hdbg	238a9206e1	refactor(useragent): moved shared CreamPanel and StatePanel into generic widgets	2026-08-26 13:00:39 +02:00
hdbg	0048d627eb	feat(evm): add EVM grants screen with create UI and list	2026-08-26 13:00:39 +02:00
hdbg	8aaeec078b	refactor(proto): restructure wallet access messages for improved data organization	2026-08-26 13:00:39 +02:00
hdbg	3ca2554468	refactor(server::evm): removed repetetive errors and error variants	2026-08-26 13:00:39 +02:00
hdbg	d982954a11	refactor(useragent::evm::table): broke down into more widgets	2026-08-26 13:00:39 +02:00
hdbg	3b75d146a9	refactor(useragent::evm): moved out header into general widget	2026-08-26 13:00:39 +02:00
hdbg	27230f975f	feat(useragent): vibe-coded access list	2026-08-26 13:00:39 +02:00
		`@@ -1 +0,0 @@`
			`{"version":2,"entries":[{"package":"app","rootUri":"../","packageUri":"lib/"}]}`