types: deduplicate identical Move types between hashi-types and onchain::types

Previously, 10 types (UpgradeCap, ConfigValue, WithdrawalStatus,
WithdrawalRequest, PendingWithdrawal, OutputUtxo, DepositRequest,
Utxo, UtxoId, UtxoRecord) were defined identically in both
hashi-types::move_types and hashi::onchain::types, with trivial
field-by-field conversion functions bridging them.

Now `onchain::types` re-exports these from `hashi_types::move_types`
and the conversion functions are removed. The hashi-types versions
gain the additional derives (Clone, PartialEq, Hash, Serialize) that
the onchain versions previously carried, along with the small helper
methods (`WithdrawalStatus::is_approved`, `is_requested`,
`PendingWithdrawal::all_outputs`).

Author: bmwill

crates/hashi-types/src/move_types/mod.rs

@@ -258,8 +258,20 @@ pub enum WithdrawalStatus {
     Confirmed { txid: BitcoinTxid },
 }
 
+impl WithdrawalStatus {
+    /// Returns true if the status is `Approved`.
+    pub fn is_approved(&self) -> bool {
+        matches!(self, Self::Approved)
+    }
+
+    /// Returns true if the status is `Requested`.
+    pub fn is_requested(&self) -> bool {
+        matches!(self, Self::Requested)
+    }
+}
+
 /// Rust version of the Move hashi::withdrawal_queue::WithdrawalRequest type.
-#[derive(Debug, serde_derive::Deserialize)]
+#[derive(Clone, Debug, PartialEq, serde_derive::Deserialize, serde_derive::Serialize)]
 pub struct WithdrawalRequest {
     pub id: Address,
     pub sender: Address,
@@ -281,7 +293,7 @@ pub struct CommittedRequestInfo {
 }
 
 /// Rust version of the Move hashi::withdrawal_queue::PendingWithdrawal type.
-#[derive(Debug, serde_derive::Deserialize)]
+#[derive(Clone, Debug, PartialEq, serde_derive::Deserialize, serde_derive::Serialize)]
 pub struct PendingWithdrawal {
     pub id: Address,
     pub txid: BitcoinTxid,
@@ -296,16 +308,26 @@ pub struct PendingWithdrawal {
     pub epoch: u64,
 }
 
+impl PendingWithdrawal {
+    pub fn all_outputs(&self) -> Vec<OutputUtxo> {
+        let mut outputs = self.withdrawal_outputs.clone();
+        if let Some(ref change) = self.change_output {
+            outputs.push(change.clone());
+        }
+        outputs
+    }
+}
+
 /// Rust version of the Move hashi::withdrawal_queue::OutputUtxo type.
-#[derive(Debug, serde_derive::Deserialize)]
+#[derive(Clone, Debug, PartialEq, serde_derive::Deserialize, serde_derive::Serialize)]
 pub struct OutputUtxo {
     /// In satoshis
     pub amount: u64,
     pub bitcoin_address: Vec<u8>,
 }
 
 /// Rust version of the Move hashi::deposit_queue::DepositRequest type.
-#[derive(Debug, serde_derive::Deserialize)]
+#[derive(Clone, Debug, PartialEq, serde_derive::Deserialize)]
 pub struct DepositRequest {
     pub id: Address,
     pub sender: Address,
@@ -314,7 +336,7 @@ pub struct DepositRequest {
     pub utxo: Utxo,
 }
 
-#[derive(Debug, serde_derive::Deserialize)]
+#[derive(Clone, Debug, PartialEq, serde_derive::Deserialize, serde_derive::Serialize)]
 pub struct Utxo {
     pub id: UtxoId,
     // In satoshis
@@ -323,15 +345,26 @@ pub struct Utxo {
 }
 
 /// Rust version of the Move hashi::utxo_pool::UtxoRecord type.
-#[derive(Debug, serde_derive::Deserialize)]
+#[derive(Clone, Debug, serde_derive::Deserialize)]
 pub struct UtxoRecord {
     pub utxo: Utxo,
     pub produced_by: Option<Address>,
     pub locked_by: Option<Address>,
 }
 
 /// txid:vout
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, serde_derive::Deserialize)]
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Hash,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    serde_derive::Deserialize,
+    serde_derive::Serialize,
+)]
 pub struct UtxoId {
     // a 32 byte sha256 of the transaction
     pub txid: BitcoinTxid,

crates/hashi/src/leader/mod.rs

@@ -389,7 +389,7 @@ impl LeaderService {
 
         info!(deposit_request_id = %deposit_request.id, "Deposit request validated successfully");
 
-        let proto_request = deposit_request.to_proto();
+        let proto_request = deposit_request_to_proto(&deposit_request);
         let members = inner
             .onchain_state()
             .current_committee_members()
@@ -1805,21 +1805,19 @@ impl LeaderService {
     }
 }
 
-impl DepositRequest {
-    fn to_proto(&self) -> SignDepositConfirmationRequest {
-        SignDepositConfirmationRequest {
-            id: self.id.as_bytes().to_vec().into(),
-            txid: self.utxo.id.txid.as_bytes().to_vec().into(),
-            vout: self.utxo.id.vout,
-            amount: self.utxo.amount,
-            derivation_path: self
-                .utxo
-                .derivation_path
-                .map(|p| p.as_bytes().to_vec().into()),
-            timestamp_ms: self.timestamp_ms,
-            requester_address: self.sender.as_bytes().to_vec().into(),
-            sui_tx_digest: self.sui_tx_digest.as_bytes().to_vec().into(),
-        }
+fn deposit_request_to_proto(req: &DepositRequest) -> SignDepositConfirmationRequest {
+    SignDepositConfirmationRequest {
+        id: req.id.as_bytes().to_vec().into(),
+        txid: req.utxo.id.txid.as_bytes().to_vec().into(),
+        vout: req.utxo.id.vout,
+        amount: req.utxo.amount,
+        derivation_path: req
+            .utxo
+            .derivation_path
+            .map(|p| p.as_bytes().to_vec().into()),
+        timestamp_ms: req.timestamp_ms,
+        requester_address: req.sender.as_bytes().to_vec().into(),
+        sui_tx_digest: req.sui_tx_digest.as_bytes().to_vec().into(),
     }
 }