Skip to content

Commit 033e9c1

Browse files
committed
f BDK: Account for enable_rbf being implicit now
1 parent 25c3523 commit 033e9c1

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

src/wallet/mod.rs

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,7 @@ where
139139
let mut locked_wallet = self.inner.lock().unwrap();
140140
let mut tx_builder = locked_wallet.build_tx();
141141

142-
tx_builder
143-
.add_recipient(output_script, amount)
144-
.fee_rate(fee_rate)
145-
.nlocktime(locktime)
146-
.enable_rbf();
142+
tx_builder.add_recipient(output_script, amount).fee_rate(fee_rate).nlocktime(locktime);
147143

148144
let mut psbt = match tx_builder.finish() {
149145
Ok(psbt) => {
@@ -255,10 +251,7 @@ where
255251
OnchainSendAmount::ExactRetainingReserve { amount_sats, .. } => {
256252
let mut tx_builder = locked_wallet.build_tx();
257253
let amount = Amount::from_sat(amount_sats);
258-
tx_builder
259-
.add_recipient(address.script_pubkey(), amount)
260-
.fee_rate(fee_rate)
261-
.enable_rbf();
254+
tx_builder.add_recipient(address.script_pubkey(), amount).fee_rate(fee_rate);
262255
tx_builder
263256
},
264257
OnchainSendAmount::AllRetainingReserve { cur_anchor_reserve_sats } => {
@@ -277,8 +270,7 @@ where
277270
change_address_info.address.script_pubkey(),
278271
Amount::from_sat(cur_anchor_reserve_sats),
279272
)
280-
.fee_rate(fee_rate)
281-
.enable_rbf();
273+
.fee_rate(fee_rate);
282274
match tmp_tx_builder.finish() {
283275
Ok(psbt) => psbt.unsigned_tx,
284276
Err(err) => {
@@ -316,17 +308,12 @@ where
316308
let mut tx_builder = locked_wallet.build_tx();
317309
tx_builder
318310
.add_recipient(address.script_pubkey(), estimated_spendable_amount)
319-
.fee_absolute(estimated_tx_fee)
320-
.enable_rbf();
311+
.fee_absolute(estimated_tx_fee);
321312
tx_builder
322313
},
323314
OnchainSendAmount::AllDrainingReserve => {
324315
let mut tx_builder = locked_wallet.build_tx();
325-
tx_builder
326-
.drain_wallet()
327-
.drain_to(address.script_pubkey())
328-
.fee_rate(fee_rate)
329-
.enable_rbf();
316+
tx_builder.drain_wallet().drain_to(address.script_pubkey()).fee_rate(fee_rate);
330317
tx_builder
331318
},
332319
};

0 commit comments

Comments
 (0)