fix: expose structs

Cargo.toml

@@ -65,10 +65,14 @@ serde = "1.0.159"
 serde_yaml = "0.9.19"
 
 [features]
-default = ["electrum", "log"]
 all = ["cli", "log"]
+default = ["cli", "electrum", "log"]
 electrum = ["electrum-client", "log"]
 cli = ["clap", "shellexpand", "log", "electrum"]
 
 [package.metadata.docs.rs]
 features = [ "all" ]
+
+[patch.crates-io]
+# Remove after merge and release https://github.com/RGB-WG/rgb-wallet/pull/108
+rgb-std = { git = "https://github.com/crisdut/rgb-wallet", branch = "feat/improviments" }

src/descriptor.rs

@@ -40,6 +40,7 @@ pub struct TerminalPath {
 }
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+#[derive(Serialize, Deserialize)]
 pub struct DeriveInfo {
     pub terminal: TerminalPath,
     pub tweak: Option<TapretCommitment>,

src/lib.rs

@@ -32,14 +32,14 @@ mod runtime;
 mod wallet;
 
 pub mod prelude {
-    pub use descriptor::{RgbDescr, SpkDescriptor, Tapret, TerminalPath};
+    pub use descriptor::{DeriveInfo, RgbDescr, SpkDescriptor, Tapret, TerminalPath};
     pub use rgbfs::StockFs;
     pub use rgbstd::*;
     pub use rgbwallet::*;
     pub use runtime::{Runtime, RuntimeError};
     #[cfg(feature = "electrum")]
     pub use wallet::BlockchainResolver;
-    pub use wallet::{DefaultResolver, RgbWallet};
+    pub use wallet::{DefaultResolver, MiningStatus, Resolver, RgbWallet, Utxo};
 
     pub use super::*;
 }

src/wallet.rs

@@ -28,6 +28,7 @@ use crate::descriptor::DeriveInfo;
 use crate::{RgbDescr, SpkDescriptor};
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Display)]
+#[derive(Serialize, Deserialize)]
 pub enum MiningStatus {
     #[display("~")]
     Mempool,
@@ -36,6 +37,7 @@ pub enum MiningStatus {
 }
 
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
+#[derive(Serialize, Deserialize)]
 pub struct Utxo {
     pub outpoint: Outpoint,
     pub status: MiningStatus,
@@ -50,7 +52,8 @@ pub trait Resolver {
     ) -> Result<BTreeSet<Utxo>, String>;
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Serialize, Deserialize)]
 pub struct RgbWallet {
     pub descr: RgbDescr,
     pub utxos: BTreeSet<Utxo>,
@@ -226,7 +229,7 @@ mod _electrum {
     }
 
     impl Utxo {
-        fn with(derivation: DeriveInfo, res: ListUnspentRes) -> Self {
+        pub fn with(derivation: DeriveInfo, res: ListUnspentRes) -> Self {
             Utxo {
                 status: if res.height == 0 {
                     MiningStatus::Mempool