Expose marginally more in bindings (#29)

Co-authored-by: Matt Corallo <git+macbook@bluematt.me>

Author: TheBlueMatt-macbook

orange-sdk/src/ffi/orange/error.rs

@@ -36,7 +36,7 @@ pub enum InitFailure {
 	/// Failure to start the LDK node.
 	LdkNodeStartFailure(String),
 	/// Failure in the trusted wallet implementation.
-	TrustedFailure,
+	TrustedFailure(String),
 }
 
 impl Display for InitFailure {
@@ -46,7 +46,7 @@ impl Display for InitFailure {
 			InitFailure::ConfigError(e) => write!(f, "Config error: {e}"),
 			InitFailure::LdkNodeBuildFailure(e) => write!(f, "Failed to build the LDK node: {e}"),
 			InitFailure::LdkNodeStartFailure(e) => write!(f, "Failed to start the LDK node: {e}"),
-			InitFailure::TrustedFailure => write!(f, "Failed to create the trusted wallet"),
+			InitFailure::TrustedFailure(e) => write!(f, "Failed to create the trusted wallet: {e}"),
 		}
 	}
 }
@@ -67,7 +67,7 @@ impl From<OrangeInitFailure> for InitFailure {
 			OrangeInitFailure::LdkNodeStartFailure(e) => {
 				InitFailure::LdkNodeStartFailure(e.to_string())
 			},
-			OrangeInitFailure::TrustedFailure(_e) => InitFailure::TrustedFailure,
+			OrangeInitFailure::TrustedFailure(e) => InitFailure::TrustedFailure(e.to_string()),
 		}
 	}
 }
@@ -84,7 +84,7 @@ pub enum WalletError {
 	/// Failure in the LDK node.
 	LdkNodeFailure(String),
 	/// Failure in the trusted wallet implementation.
-	TrustedFailure,
+	TrustedFailure(String),
 	/// Failure to parse payment instructions.
 	PaymentInstructionsParseError,
 	/// Failure to build payment info.
@@ -95,7 +95,7 @@ impl Display for WalletError {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {
 			WalletError::LdkNodeFailure(e) => write!(f, "Failure from LDK node: {e}"),
-			WalletError::TrustedFailure => write!(f, "Failure from trusted wallet"),
+			WalletError::TrustedFailure(e) => write!(f, "Failure from trusted wallet: {e}"),
 			WalletError::PaymentInstructionsParseError => {
 				write!(f, "Failure to parse payment instructions")
 			},
@@ -108,7 +108,7 @@ impl From<OrangeWalletError> for WalletError {
 	fn from(e: OrangeWalletError) -> Self {
 		match e {
 			OrangeWalletError::LdkNodeFailure(e) => WalletError::LdkNodeFailure(e.to_string()),
-			OrangeWalletError::TrustedFailure(_e) => WalletError::TrustedFailure,
+			OrangeWalletError::TrustedFailure(e) => WalletError::TrustedFailure(e.to_string()),
 		}
 	}
 }

orange-sdk/src/ffi/orange/mod.rs

@@ -5,6 +5,7 @@ use crate::{
 };
 use crate::{impl_from_core_type, impl_into_core_type};
 use std::sync::Arc;
+use ldk_node::bitcoin::hex::DisplayHex;
 
 pub mod config;
 pub mod error;
@@ -63,19 +64,27 @@ impl Transaction {
 /// the payment to the user.
 #[derive(Debug, Clone, Hash, PartialEq, Eq, uniffi::Object)]
 pub enum PaymentId {
-	Lightning(Vec<u8>),
-	Trusted(Vec<u8>),
+	Lightning(String),
+	Trusted(String),
 }
 
 impl From<OrangePaymentId> for PaymentId {
 	fn from(id: OrangePaymentId) -> Self {
 		match id {
-			OrangePaymentId::SelfCustodial(hash) => Self::Lightning(hash.to_vec()),
-			OrangePaymentId::Trusted(hash) => Self::Trusted(hash.to_vec()),
+			OrangePaymentId::SelfCustodial(hash) => Self::Lightning(hash.to_lower_hex_string()),
+			OrangePaymentId::Trusted(hash) => Self::Trusted(hash.to_lower_hex_string()),
 		}
 	}
 }
 
+#[uniffi::export]
+impl PaymentId {
+	/// Gets a string representation of this PaymentId
+	pub fn to_string(&self) -> String {
+		format!("{self:?}")
+	}
+}
+
 /// The status of a transaction. This is used to track the state of a transaction
 #[derive(Debug, Clone, Copy, PartialEq, Eq, uniffi::Enum)]
 pub enum TxStatus {

orange-sdk/src/trusted_wallet/mod.rs

@@ -173,6 +173,10 @@ pub enum TrustedError {
 	Other(String),
 }
 
+impl core::fmt::Display for TrustedError {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> { write!(f, "{self:?}") }
+}
+
 impl From<ldk_node::lightning::io::Error> for TrustedError {
 	fn from(e: ldk_node::lightning::io::Error) -> Self {
 		TrustedError::IOError(e)