revert errors

Author: ananas-block

Cargo.lock

@@ -68,7 +68,6 @@ impl From<AccountError> for solana_program_error::ProgramError {
     }
 }
 
-// Error conversions for unified error handling
 #[cfg(feature = "pinocchio")]
 impl From<pinocchio::program_error::ProgramError> for AccountError {
     fn from(_: pinocchio::program_error::ProgramError) -> Self {

program-libs/account-checks/src/error.rs

@@ -3,5 +3,4 @@ pub mod checks;
 pub mod discriminator;
 pub mod error;
 
-// Re-export the trait for convenience
 pub use account_info::account_info_trait::AccountInfoTrait;

program-libs/account-checks/src/lib.rs

@@ -13,16 +13,4 @@ pub mod rollover_state_tree;
 
 // Use the appropriate BorshDeserialize and BorshSerialize based on feature
 use borsh::{BorshDeserialize, BorshSerialize};
-// // Pinocchio imports when pinocchio feature is enabled
-// #[cfg(feature = "pinocchio")]
-// use pinocchio::{msg, sysvars::rent::Rent, sysvars::Sysvar};
-// // Solana program imports for non-pinocchio builds (default)
-// #[cfg(not(feature = "pinocchio"))]
-// pub(crate) use {
-//     solana_account_info::AccountInfo,
-//     solana_msg::msg,
-//     solana_sysvar::{rent::Rent, Sysvar},
-// };
-
-// Import the comprehensive AccountInfoTrait from light-account-checks
 pub use light_account_checks::AccountInfoTrait;

program-libs/batched-merkle-tree/src/lib.rs

@@ -8,9 +8,9 @@ edition = "2021"
 
 [features]
 default = []
-solana = ["dep:solana-pubkey"]
+solana = ["dep:solana-pubkey", "dep:solana-program-error"]
 anchor = ["anchor-lang"]
-pinocchio = []
+pinocchio = ["dep:pinocchio"]
 bytemuck-des = ["bytemuck"]
 new-unique = ["dep:solana-pubkey"]
 
@@ -20,6 +20,8 @@ zerocopy = { workspace = true, features = ["derive"] }
 light-hasher = { workspace = true }
 light-zero-copy = { workspace = true, features = ["std"] }
 light-macros = { workspace = true }
+pinocchio = { workspace = true, optional = true }
+solana-program-error = { workspace = true, optional = true }
 
 # Feature-gated dependencies
 anchor-lang = { workspace = true, optional = true }

program-libs/compressed-account/Cargo.toml

@@ -40,42 +40,3 @@ impl<'a> Deserialize<'a> for CompressedProof {
         Ok(Ref::<&[u8], CompressedProof>::from_prefix(bytes)?)
     }
 }
-
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, AnchorDeserialize, AnchorSerialize)]
-pub struct ValidityProof(pub Option<CompressedProof>);
-
-impl ValidityProof {
-    pub fn new(proof: Option<CompressedProof>) -> Self {
-        Self(proof)
-    }
-}
-
-impl From<CompressedProof> for ValidityProof {
-    fn from(proof: CompressedProof) -> Self {
-        Self(Some(proof))
-    }
-}
-
-impl From<Option<CompressedProof>> for ValidityProof {
-    fn from(proof: Option<CompressedProof>) -> Self {
-        Self(proof)
-    }
-}
-impl From<&CompressedProof> for ValidityProof {
-    fn from(proof: &CompressedProof) -> Self {
-        Self(Some(*proof))
-    }
-}
-
-impl From<&Option<CompressedProof>> for ValidityProof {
-    fn from(proof: &Option<CompressedProof>) -> Self {
-        Self(*proof)
-    }
-}
-
-#[allow(clippy::from_over_into)]
-impl Into<Option<CompressedProof>> for ValidityProof {
-    fn into(self) -> Option<CompressedProof> {
-        self.0
-    }
-}

program-libs/compressed-account/src/instruction_data/compressed_proof.rs

@@ -79,6 +79,20 @@ impl From<CompressedAccountError> for u32 {
     }
 }
 
+#[cfg(feature = "solana")]
+impl From<CompressedAccountError> for solana_program_error::ProgramError {
+    fn from(e: CompressedAccountError) -> Self {
+        solana_program_error::ProgramError::Custom(e.into())
+    }
+}
+
+#[cfg(feature = "pinocchio")]
+impl From<CompressedAccountError> for pinocchio::program_error::ProgramError {
+    fn from(e: CompressedAccountError) -> Self {
+        pinocchio::program_error::ProgramError::Custom(e.into())
+    }
+}
+
 pub const NULLIFIER_QUEUE_TYPE_V1: u64 = 1;
 pub const ADDRESS_QUEUE_TYPE_V1: u64 = 2;
 pub const INPUT_STATE_QUEUE_TYPE_V2: u64 = 3;

program-libs/compressed-account/src/lib.rs

@@ -44,3 +44,17 @@ impl From<HasherError> for u32 {
         }
     }
 }
+
+#[cfg(feature = "solana")]
+impl From<HasherError> for solana_program_error::ProgramError {
+    fn from(e: HasherError) -> Self {
+        solana_program_error::ProgramError::Custom(e.into())
+    }
+}
+
+#[cfg(feature = "pinocchio")]
+impl From<HasherError> for pinocchio::program_error::ProgramError {
+    fn from(e: HasherError) -> Self {
+        pinocchio::program_error::ProgramError::Custom(e.into())
+    }
+}

program-libs/hasher/src/errors.rs

@@ -11,15 +11,13 @@ default = []
 solana = [
     "dep:solana-msg",
     "dep:solana-sysvar",
+    "solana-program-error",
     "solana-sysvar/bincode",
     "light-compressed-account/solana",
     "light-compressed-account/bytemuck-des",
 ]
 anchor = ["solana", "anchor-lang"]
-pinocchio = [
-    "dep:pinocchio", 
-    "light-compressed-account/bytemuck-des",
-]
+pinocchio = ["dep:pinocchio", "light-compressed-account/bytemuck-des"]
 
 [dependencies]
 thiserror = { workspace = true }
@@ -28,6 +26,7 @@ zerocopy = { workspace = true, features = ["derive"] }
 light-compressed-account = { workspace = true, features = ["bytemuck-des"] }
 solana-msg = { workspace = true, optional = true }
 solana-sysvar = { workspace = true, optional = true }
+solana-program-error = { workspace = true, optional = true }
 anchor-lang = { workspace = true, optional = true }
 pinocchio = { workspace = true, optional = true }
 borsh = { workspace = true }

program-libs/merkle-tree-metadata/Cargo.toml

@@ -37,3 +37,17 @@ impl From<MerkleTreeMetadataError> for u32 {
         }
     }
 }
+
+#[cfg(feature = "solana")]
+impl From<MerkleTreeMetadataError> for solana_program_error::ProgramError {
+    fn from(e: MerkleTreeMetadataError) -> Self {
+        solana_program_error::ProgramError::Custom(e.into())
+    }
+}
+
+#[cfg(feature = "pinocchio")]
+impl From<MerkleTreeMetadataError> for pinocchio::program_error::ProgramError {
+    fn from(e: MerkleTreeMetadataError) -> Self {
+        pinocchio::program_error::ProgramError::Custom(e.into())
+    }
+}