Always add backtrace to cosmwasm-crypto

Author: chipshort

packages/crypto/src/backtrace.rs

@@ -0,0 +1,26 @@
+use core::fmt::{Debug, Display, Formatter, Result};
+use std::backtrace::Backtrace;
+
+/// This wraps an actual backtrace to achieve two things:
+/// - being able to fill this with a stub implementation in `no_std` environments
+/// - being able to use this in conjunction with [`thiserror::Error`]
+pub struct BT(Backtrace);
+
+impl BT {
+    #[track_caller]
+    pub fn capture() -> Self {
+        BT(Backtrace::capture())
+    }
+}
+
+impl Debug for BT {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        Debug::fmt(&self.0, f)
+    }
+}
+
+impl Display for BT {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        Display::fmt(&self.0, f)
+    }
+}

packages/crypto/src/errors.rs

@@ -1,5 +1,4 @@
-#[cfg(feature = "backtraces")]
-use std::backtrace::Backtrace;
+use crate::BT;
 use std::fmt::Debug;
 use thiserror::Error;
 
@@ -8,81 +7,55 @@ pub type CryptoResult<T> = core::result::Result<T, CryptoError>;
 #[derive(Error, Debug)]
 pub enum CryptoError {
     #[error("Batch verify error: {msg}")]
-    BatchErr {
-        msg: String,
-        #[cfg(feature = "backtraces")]
-        backtrace: Backtrace,
-    },
+    BatchErr { msg: String, backtrace: BT },
     #[error("Crypto error: {msg}")]
-    GenericErr {
-        msg: String,
-        #[cfg(feature = "backtraces")]
-        backtrace: Backtrace,
-    },
+    GenericErr { msg: String, backtrace: BT },
     #[error("Invalid hash format")]
-    InvalidHashFormat {
-        #[cfg(feature = "backtraces")]
-        backtrace: Backtrace,
-    },
+    InvalidHashFormat { backtrace: BT },
     #[error("Invalid public key format")]
-    InvalidPubkeyFormat {
-        #[cfg(feature = "backtraces")]
-        backtrace: Backtrace,
-    },
+    InvalidPubkeyFormat { backtrace: BT },
     #[error("Invalid signature format")]
-    InvalidSignatureFormat {
-        #[cfg(feature = "backtraces")]
-        backtrace: Backtrace,
-    },
+    InvalidSignatureFormat { backtrace: BT },
     #[error("Invalid recovery parameter. Supported values: 0 and 1.")]
-    InvalidRecoveryParam {
-        #[cfg(feature = "backtraces")]
-        backtrace: Backtrace,
-    },
+    InvalidRecoveryParam { backtrace: BT },
 }
 
 impl CryptoError {
     pub fn batch_err(msg: impl Into<String>) -> Self {
         CryptoError::BatchErr {
             msg: msg.into(),
-            #[cfg(feature = "backtraces")]
-            backtrace: Backtrace::capture(),
+            backtrace: BT::capture(),
         }
     }
 
     pub fn generic_err(msg: impl Into<String>) -> Self {
         CryptoError::GenericErr {
             msg: msg.into(),
-            #[cfg(feature = "backtraces")]
-            backtrace: Backtrace::capture(),
+            backtrace: BT::capture(),
         }
     }
 
     pub fn invalid_hash_format() -> Self {
         CryptoError::InvalidHashFormat {
-            #[cfg(feature = "backtraces")]
-            backtrace: Backtrace::capture(),
+            backtrace: BT::capture(),
         }
     }
 
     pub fn invalid_pubkey_format() -> Self {
         CryptoError::InvalidPubkeyFormat {
-            #[cfg(feature = "backtraces")]
-            backtrace: Backtrace::capture(),
+            backtrace: BT::capture(),
         }
     }
 
     pub fn invalid_signature_format() -> Self {
         CryptoError::InvalidSignatureFormat {
-            #[cfg(feature = "backtraces")]
-            backtrace: Backtrace::capture(),
+            backtrace: BT::capture(),
         }
     }
 
     pub fn invalid_recovery_param() -> Self {
         CryptoError::InvalidRecoveryParam {
-            #[cfg(feature = "backtraces")]
-            backtrace: Backtrace::capture(),
+            backtrace: BT::capture(),
         }
     }
 

packages/crypto/src/lib.rs

@@ -2,9 +2,7 @@
 //! Please don't use any of these types directly, as
 //! they might change frequently, or be removed in the future.
 //! This crate does not adhere to semantic versioning.
-#![cfg_attr(feature = "backtraces", feature(error_generic_member_access))]
-#![cfg_attr(feature = "backtraces", feature(provide_any))]
-
+mod backtrace;
 mod ed25519;
 mod errors;
 mod identity_digest;
@@ -20,3 +18,4 @@ pub use crate::errors::{CryptoError, CryptoResult};
 pub use crate::secp256k1::{secp256k1_recover_pubkey, secp256k1_verify};
 #[doc(hidden)]
 pub use crate::secp256k1::{ECDSA_PUBKEY_MAX_LEN, ECDSA_SIGNATURE_LEN, MESSAGE_HASH_MAX_LEN};
+pub(crate) use backtrace::BT;