wallet: add derivations

BP-WG · Jul 30, 2023 · 2795f8a · 2795f8a
1 parent 653c530
commit 2795f8a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/std/src/chain.rs b/std/src/chain.rs
@@ -28,6 +28,7 @@ use crate::{Address, NormalIndex};
 
 pub type BlockHeight = NonZeroU32;
 
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct BlockInfo {
     pub header: BlockHeader,
     pub difficulty: u8,
@@ -37,19 +38,22 @@ pub struct BlockInfo {
     pub mediantime: u32,
 }
 
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct MiningInfo {
     pub height: BlockHeight,
     pub time: u64,
     pub block_hash: BlockHash,
 }
 
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub enum TxStatus {
     Mined(MiningInfo),
     Mempool,
     Channel,
     Unknown,
 }
 
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct TxInfo {
     pub txid: Txid,
     pub status: TxStatus,
@@ -62,6 +66,7 @@ pub struct TxInfo {
     pub locktime: LockTime,
 }
 
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct TxInInfo {
     pub outpoint: Outpoint,
     pub sequence: SeqNo,
@@ -71,19 +76,22 @@ pub struct TxInInfo {
     pub value: Option<Sats>,
 }
 
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct TxOutInfo {
     pub outpoint: Outpoint,
     pub value: Sats,
     pub derivation: Option<(NormalIndex, NormalIndex)>,
 }
 
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct UtxoInfo {
     pub outpoint: Outpoint,
     pub value: Sats,
     pub address: Address,
     pub derivation: (NormalIndex, NormalIndex),
 }
 
+#[derive(Clone, Eq, PartialEq, Hash, Debug)]
 pub struct AddrInfo {
     pub derivation: (NormalIndex, NormalIndex),
     pub used: u32,

diff --git a/std/src/wallet.rs b/std/src/wallet.rs
@@ -47,6 +47,7 @@ impl<D: DeriveSpk> Deref for WalletDescr<D> {
     fn deref(&self) -> &Self::Target { &self.script_pubkey }
 }
 
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct WalletData {
     pub name: String,
     pub tx_annotations: BTreeMap<Txid, String>,
@@ -56,6 +57,7 @@ pub struct WalletData {
     pub last_used: NormalIndex,
 }
 
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct WalletCache {
     tip: u32,
     headers: HashMap<NonZeroU32, BlockInfo>,
@@ -65,6 +67,7 @@ pub struct WalletCache {
     max_known: HashMap<NormalIndex, NormalIndex>,
 }
 
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct Wallet<D: DeriveSpk, L2: Default = ()> {
     descr: WalletDescr<D>,
     data: WalletData,