frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix order of BumpFeeTxBuilder parameters

Browse Source
This commit is contained in:
Steve Myers 2022-05-06 09:59:07 -07:00
parent 390d12703e
commit 0787d9c446
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib.rs
View File

@ -443,8 +443,8 @@ impl TxBuilder {
struct BumpFeeTxBuilder { struct BumpFeeTxBuilder {
txid: String, txid: String,
fee_rate: f32, fee_rate: f32,
rbf: Option<RbfValue>,
allow_shrinking: Option<String>, allow_shrinking: Option<String>,
rbf: Option<RbfValue>,
} }
impl BumpFeeTxBuilder { impl BumpFeeTxBuilder {
@ -470,8 +470,8 @@ impl BumpFeeTxBuilder {
Arc::new(Self { Arc::new(Self {
txid: self.txid.clone(), txid: self.txid.clone(),
fee_rate: self.fee_rate, fee_rate: self.fee_rate,
rbf: Some(RbfValue::Default),
allow_shrinking: self.allow_shrinking.clone(), allow_shrinking: self.allow_shrinking.clone(),
rbf: Some(RbfValue::Default),
}) })
} }
@ -479,8 +479,8 @@ impl BumpFeeTxBuilder {
Arc::new(Self { Arc::new(Self {
txid: self.txid.clone(), txid: self.txid.clone(),
fee_rate: self.fee_rate, fee_rate: self.fee_rate,
rbf: Some(RbfValue::Value(nsequence)),
allow_shrinking: self.allow_shrinking.clone(), allow_shrinking: self.allow_shrinking.clone(),
rbf: Some(RbfValue::Value(nsequence)),
}) })
} }
@ -489,6 +489,12 @@ impl BumpFeeTxBuilder {
let txid = Txid::from_str(self.txid.as_str())?; let txid = Txid::from_str(self.txid.as_str())?;
let mut tx_builder = wallet.build_fee_bump(txid)?; let mut tx_builder = wallet.build_fee_bump(txid)?;
tx_builder.fee_rate(FeeRate::from_sat_per_vb(self.fee_rate)); tx_builder.fee_rate(FeeRate::from_sat_per_vb(self.fee_rate));
if let Some(allow_shrinking) = &self.allow_shrinking {
let address =
Address::from_str(allow_shrinking).map_err(|e| Error::Generic(e.to_string()))?;
let script = address.script_pubkey();
tx_builder.allow_shrinking(script)?;
}
if let Some(rbf) = &self.rbf { if let Some(rbf) = &self.rbf {
match *rbf { match *rbf {
RbfValue::Default => { RbfValue::Default => {
@ -499,12 +505,6 @@ impl BumpFeeTxBuilder {
} }
} }
} }
if let Some(allow_shrinking) = &self.allow_shrinking {
let address =
Address::from_str(allow_shrinking).map_err(|e| Error::Generic(e.to_string()))?;
let script = address.script_pubkey();
tx_builder.allow_shrinking(script)?;
}
tx_builder tx_builder
.finish() .finish()
.map(|(psbt, _)| PartiallySignedBitcoinTransaction { .map(|(psbt, _)| PartiallySignedBitcoinTransaction {