v0.2.6-pre.016

crates/ksp-app-wallet-desk/tests/desktop_contract.rs

@@ -1,5 +1,5 @@
 // file: crates/ksp-app-wallet-desk/tests/desktop_contract.rs
-// version: 16
+// version: 17
 
 //! Desktop build, shell and Config-status contract audits for Wallet Desk.
 
@@ -98,7 +98,7 @@ fn pre_004_inventory_uses_wallet_library_and_exposes_only_locked_safe_fields() {
     let inventory = read_text(root.join("src/wallet_inventory.rs").as_path());
     let main = read_text(root.join("frontend/ts/main.ts").as_path());
     assert!(manifest.contains("ksp-wallet-lib = { path = \"../ksp-wallet-lib\" }"));
-    assert!(inventory.contains("ksp_wallet_lib::inspect_locked_wallet_file_v1"));
+    assert!(inventory.contains("ksp_wallet_lib::inspect_locked_wallet_file"));
     assert!(inventory.contains("symlink_metadata"));
     assert!(inventory.contains("WALLET_FILE_SUFFIX"));
     assert!(tauri.contains("list_wallets"));
@@ -132,7 +132,7 @@ fn pre_005_create_and_session_lifecycle_are_backend_owned() {
     let tauri = read_text(root.join("src/tauri.rs").as_path());
     let html = read_text(root.join("frontend/main.html").as_path());
     let main = read_text(root.join("frontend/ts/main.ts").as_path());
-    assert!(state.contains("ksp_wallet_lib::create_wallet_file_v1"));
+    assert!(state.contains("ksp_wallet_lib::create_wallet_file"));
     assert!(state.contains("WalletSession::Owner"));
     assert!(state.contains("WalletSession::Locked"));
     assert!(state.contains("std::mem::replace"));
@@ -157,8 +157,8 @@ fn pre_006_unlock_surface_is_explicit_backend_owned_and_supports_view_owner() {
     let tauri = read_text(root.join("src/tauri.rs").as_path());
     let html = read_text(root.join("frontend/main.html").as_path());
     let main = read_text(root.join("frontend/ts/main.ts").as_path());
-    assert!(state.contains("open_wallet_view_file_v1"));
-    assert!(state.contains("open_wallet_owner_file_v1"));
+    assert!(state.contains("open_wallet_view_file"));
+    assert!(state.contains("open_wallet_owner_file"));
     assert!(state.contains("WalletSession::PrivilegedOperation"));
     assert!(state.contains("WalletSession::View"));
     assert!(secrets.contains("environment_report"));
@@ -220,7 +220,7 @@ fn pre_008_import_uses_rust_native_picker_and_wallet_transfer_adapters() {
     assert!(tauri.contains("import_wallet"));
     assert!(import.contains("ksp_wallet_lib::inspect_wallet_transfer"));
     assert!(import.contains("zeroize::Zeroizing"));
-    assert!(state.contains("ksp_wallet_lib::import_wallet_transfer_v1"));
+    assert!(state.contains("ksp_wallet_lib::import_wallet_transfer"));
     assert!(html.contains("id=\"inspectImportSource\""));
     assert!(html.contains("id=\"importWalletForm\""));
     assert!(html.contains("id=\"importSourcePubkey\""));
@@ -384,3 +384,19 @@ fn pre_014_template_has_normalized_html_headers_light_header_and_kbot_style_spla
     assert!(splash_ts.contains("add_message"));
     assert!(!splash_ts.contains("../sass/splash.scss"));
 }
+
+#[test]
+fn pre_016_wallet_desk_uses_version_neutral_wallet_dispatch() {
+    let state = read_source("src/app_state.rs");
+    let inventory = read_source("src/wallet_inventory.rs");
+    assert!(state.contains("ksp_wallet_lib::create_wallet_file"));
+    assert!(state.contains("ksp_wallet_lib::import_wallet_transfer"));
+    assert!(state.contains("ksp_wallet_lib::open_wallet_view_file"));
+    assert!(state.contains("ksp_wallet_lib::open_wallet_owner_file"));
+    assert!(inventory.contains("ksp_wallet_lib::inspect_locked_wallet_file"));
+    assert!(!state.contains("create_wallet_file_v1"));
+    assert!(!state.contains("import_wallet_transfer_v1"));
+    assert!(!state.contains("open_wallet_view_file_v1"));
+    assert!(!state.contains("open_wallet_owner_file_v1"));
+    assert!(!inventory.contains("inspect_locked_wallet_file_v1"));
+}

crates/ksp-app-wallet-desk/tests/desktop_security.rs

@@ -1,5 +1,5 @@
 // file: crates/ksp-app-wallet-desk/tests/desktop_security.rs
-// version: 13
+// version: 14
 
 //! Static desktop security contracts for the Wallet Desk pre.002 shell.
 
@@ -172,7 +172,7 @@ fn owner_metadata_values_are_request_only_and_state_conflict_forces_reauthorizat
     assert!(!metadata.contains("derive(Clone"));
     assert!(!metadata.contains("derive(Debug"));
     assert!(state.contains("recover_owner_state_conflict"));
-    assert!(state.contains("inspect_locked_wallet_file_v1"));
+    assert!(state.contains("inspect_locked_wallet_file"));
     assert!(state.contains("ERROR_CODE_STATE_CONFLICT"));
     assert!(main.contains("isWalletStateConflict"));
     assert!(main.contains("select_wallet"));

crates/ksp-app-wallet-desk/tests/wallet_desk_devnet_smoke.rs

@@ -1,5 +1,5 @@
 // file: crates/ksp-app-wallet-desk/tests/wallet_desk_devnet_smoke.rs
-// version: 1
+// version: 2
 
 //! Opt-in live composition smoke owned by the Wallet Desk orchestration surface.
 
@@ -72,7 +72,7 @@ async fn committed_wallet_desk_composite_creates_wallet_and_reaches_devnet_balan
         std::result::Result::Err(_) => return,
     };
     let wallet_path = wallet_root.join(std::format!("wallet-desk-pre013-smoke-{}-{stamp}.kspwallet", std::process::id()));
-    let owner = ksp_wallet_lib::create_wallet_file_v1(
+    let owner = ksp_wallet_lib::create_wallet_file(
         wallet_path.as_path(),
         ksp_wallet_lib::OwnerPassword::new("ksp-pre013-devnet-owner".to_owned()),
         std::option::Option::Some(ksp_wallet_lib::ViewPassword::new("ksp-pre013-devnet-view".to_owned())),
@@ -84,13 +84,13 @@ async fn committed_wallet_desk_composite_creates_wallet_and_reaches_devnet_balan
         std::result::Result::Ok(value) => value,
         std::result::Result::Err(_) => return,
     };
-    let locked = ksp_wallet_lib::inspect_locked_wallet_file_v1(wallet_path.as_path()).await;
+    let locked = ksp_wallet_lib::inspect_locked_wallet_file(wallet_path.as_path()).await;
     assert!(locked.is_ok(), "created smoke wallet should inspect while locked");
     if let std::result::Result::Ok(locked) = locked {
-        assert_eq!(locked.format_version(), ksp_wallet_lib::KSPWALLET_FORMAT_VERSION_V1);
+        assert_eq!(locked.format_version(), ksp_wallet_lib::KSPWALLET_FORMAT_VERSION_V2);
         assert!(locked.view_enabled());
     }
-    let view = ksp_wallet_lib::open_wallet_view_file_v1(wallet_path.as_path(), ksp_wallet_lib::ViewPassword::new("ksp-pre013-devnet-view".to_owned())).await;
+    let view = ksp_wallet_lib::open_wallet_view_file(wallet_path.as_path(), ksp_wallet_lib::ViewPassword::new("ksp-pre013-devnet-view".to_owned())).await;
     assert!(view.is_ok(), "created smoke wallet should open with VIEW");
     let view = match view {
         std::result::Result::Ok(value) => value,