fix: merge fix

Cargo.lock

@@ -3026,6 +3026,7 @@ version = "0.1.0"
 dependencies = [
  "clap",
  "nssa",
+ "nssa_core",
  "tokio",
  "wallet",
 ]
@@ -4755,6 +4756,7 @@ dependencies = [
  "nssa",
  "nssa_core",
  "rand 0.8.5",
+ "risc0-zkvm",
  "serde",
  "serde_json",
  "sha2",

examples/program_deployment/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2024"
 
 [dependencies]
 nssa.workspace = true
+nssa_core.workspace = true
 wallet.workspace = true
 
 tokio = { workspace = true, features = ["macros"] }

nssa/core/Cargo.toml

@@ -9,7 +9,7 @@ borsh.workspace = true
 serde = { workspace = true }
 thiserror.workspace = true
 chacha20 = { version = "0.9", default-features = false }
-bytemuck = { workspace = true, optional = true }
+bytemuck = { workspace = true }
 k256 = { workspace = true, optional = true }
 base58 = { workspace = true, optional = true }
 anyhow = { workspace = true, optional = true }

nssa/core/src/account.rs

@@ -45,9 +45,18 @@ impl AccountWithMetadata {
 }
 
 #[derive(
-    Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, BorshSerialize, BorshDeserialize,
+    Copy,
+    Clone,
+    Serialize,
+    Deserialize,
+    PartialEq,
+    Eq,
+    Hash,
+    BorshSerialize,
+    BorshDeserialize,
+    Default,
 )]
-#[cfg_attr(any(feature = "host", test), derive(Debug, PartialOrd, Ord, Default))]
+#[cfg_attr(any(feature = "host", test), derive(Debug, PartialOrd, Ord))]
 pub struct AccountId {
     value: [u8; 32],
 }

wallet/Cargo.toml

@@ -27,3 +27,4 @@ sha2.workspace = true
 futures.workspace = true
 async-stream = "0.3.6"
 indicatif = { version = "0.18.3", features = ["improved_unicode"] }
+risc0-zkvm.workspace = true