diff --git a/types/src/model/wallet.rs b/types/src/model/wallet.rs index e5750caa..2cddf823 100644 --- a/types/src/model/wallet.rs +++ b/types/src/model/wallet.rs @@ -682,8 +682,7 @@ pub struct ListUnspentItem { /// The script key. pub script_pubkey: ScriptBuf, /// The transaction amount. - #[serde(default, with = "bitcoin::amount::serde::as_btc")] - pub amount: SignedAmount, + pub amount: Amount, /// The number of confirmations. pub confirmations: u32, // Docs do not indicate what negative value means? /// The redeemScript if scriptPubKey is P2SH. diff --git a/types/src/v17/wallet/into.rs b/types/src/v17/wallet/into.rs index ec8d5ab4..660805b1 100644 --- a/types/src/v17/wallet/into.rs +++ b/types/src/v17/wallet/into.rs @@ -660,7 +660,7 @@ impl ListUnspentItem { let address = self.address.parse::>().map_err(E::Address)?; let script_pubkey = ScriptBuf::from_hex(&self.script_pubkey).map_err(E::ScriptPubkey)?; - let amount = SignedAmount::from_btc(self.amount).map_err(E::Amount)?; + let amount = Amount::from_btc(self.amount).map_err(E::Amount)?; let confirmations = crate::to_u32(self.confirmations, "confirmations")?; let redeem_script = self .redeem_script diff --git a/types/src/v18/wallet/into.rs b/types/src/v18/wallet/into.rs index c985ce05..b732fb1b 100644 --- a/types/src/v18/wallet/into.rs +++ b/types/src/v18/wallet/into.rs @@ -4,9 +4,7 @@ use bitcoin::amount::ParseAmountError; use bitcoin::hashes::hash160; use bitcoin::hex::FromHex; use bitcoin::key::PublicKey; -use bitcoin::{ - bip32, Address, Amount, ScriptBuf, SignedAmount, Txid, WitnessProgram, WitnessVersion, -}; +use bitcoin::{bip32, Address, Amount, ScriptBuf, Txid, WitnessProgram, WitnessVersion}; use super::{ GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, @@ -304,7 +302,7 @@ impl ListUnspentItem { let address = self.address.parse::>().map_err(E::Address)?; let script_pubkey = ScriptBuf::from_hex(&self.script_pubkey).map_err(E::ScriptPubkey)?; - let amount = SignedAmount::from_btc(self.amount).map_err(E::Amount)?; + let amount = Amount::from_btc(self.amount).map_err(E::Amount)?; let confirmations = crate::to_u32(self.confirmations, "confirmations")?; let redeem_script = self .redeem_script diff --git a/types/src/v24/wallet/into.rs b/types/src/v24/wallet/into.rs index b6ada363..b602598f 100644 --- a/types/src/v24/wallet/into.rs +++ b/types/src/v24/wallet/into.rs @@ -2,7 +2,7 @@ use bitcoin::amount::ParseAmountError; use bitcoin::consensus::encode; -use bitcoin::{Address, BlockHash, ScriptBuf, SignedAmount, Transaction, Txid}; +use bitcoin::{Address, Amount, BlockHash, ScriptBuf, SignedAmount, Transaction, Txid}; use super::{ GetTransaction, GetTransactionDetail, GetTransactionDetailError, GetTransactionError, @@ -218,7 +218,7 @@ impl ListUnspentItem { let script_pubkey = ScriptBuf::from_hex(&self.script_pubkey).map_err(E::ScriptPubkey)?; let label = self.label.unwrap_or_default(); - let amount = SignedAmount::from_btc(self.amount).map_err(E::Amount)?; + let amount = Amount::from_btc(self.amount).map_err(E::Amount)?; let confirmations = crate::to_u32(self.confirmations, "confirmations")?; let redeem_script = self .redeem_script