Skip to content

fix: enforce Core's std tx weight limit when building transactions #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tvpeter wants to merge 2 commits into
base: master
Choose a base branch
from
+243 −49
Open

fix: enforce Core's std tx weight limit when building transactions #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2230465
refactor(op_return): parse OP_RETURN data at the clap boundary
tvpeter Oct 19, 2026
aea4bcc
fix(create_tx,bump_fee): reject txs over the standard weight limit
tvpeter Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ page. See [DEVELOPMENT_CYCLE.md](DEVELOPMENT_CYCLE.md) for more details.
- Fixed `compile` silently accepting placeholder keys/hashes instead of validating them; added `--placeholders` to opt back into the old permissive behavior
- Fixed `compile` panicking instead of returning an error when a key is valid on its own but the wrong shape for the requested script type (e.g. an x-only key under `sh`/`wsh`/`sh-wsh`, or an uncompressed key under `tr`)
- Updated dependencies to resolve RUSTSEC advisories in rustls, rustls-webpki, webpki-roots, quinn-proto, h2 and zstd-sys; bumped async-hwi to 0.0.35.
- Fixed `create_tx`, `create_dns_tx`, `create_sp_tx` and `bump_fee` building transactions over Bitcoin Core's 400,000 wu (100,000 vB) standard weight limit, which no default node relays

## [4.0.0]

Expand Down
11 changes: 10 additions & 1 deletion src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bdk_wallet::bitcoin::hex::HexToBytesError;
use bdk_wallet::bitcoin::psbt::ExtractTxError;
use bdk_wallet::bitcoin::{base64, consensus};
use bdk_wallet::bitcoin::{Transaction, Weight, base64, consensus};
use thiserror::Error;

#[derive(Debug, Error)]
Expand Down Expand Up @@ -67,6 +67,15 @@ pub enum BDKCliError {
#[error("Miniscript compiler error: {0}")]
MiniscriptCompilerError(#[from] bdk_wallet::miniscript::policy::compiler::CompilerError),

#[error(
"Transaction can weigh up to {weight:#} ({} vB) once signed, over the {:#} ({} vB) \
standard limit, so Bitcoin Core nodes will not relay it",
weight.to_vbytes_ceil(),
Transaction::MAX_STANDARD_WEIGHT,
Transaction::MAX_STANDARD_WEIGHT.to_vbytes_ceil()
)]
NonStandardTxWeight { weight: Weight },

#[error("ParseError: {0}")]
ParseError(#[from] bdk_wallet::bitcoin::address::ParseError),

Expand Down
29 changes: 14 additions & 15 deletions src/handlers/dns/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ use crate::handlers::dns::dns_payment_instructions::{
};
use crate::handlers::{AppContext, AsyncAppCommand, Init, OfflineOperations};
use crate::utils::types::{PsbtResult, StatusResult};
use crate::utils::{parse_dns_recipient, parse_fee_rate, parse_outpoint, parse_recipient};
use crate::utils::{
check_standard_weight, max_signed_weight, parse_dns_recipient, parse_fee_rate,
parse_op_return_base64, parse_op_return_string, parse_outpoint, parse_recipient,
};
use bdk_wallet::KeychainKind;
use bdk_wallet::bitcoin::base64::Engine;
use bdk_wallet::bitcoin::base64::prelude::BASE64_STANDARD;
use bdk_wallet::bitcoin::script::PushBytesBuf;
use bdk_wallet::bitcoin::{Amount, FeeRate, OutPoint, ScriptBuf, Sequence};
use bdk_wallet::bitcoin::{Amount, FeeRate, OutPoint, ScriptBuf, Sequence, script::PushBytesBuf};
use clap::Parser;
use std::collections::BTreeMap;

Expand Down Expand Up @@ -67,16 +67,18 @@ pub struct CreateDnsTxCommand {
env = "ADD_STRING",
long = "add_string",
short = 's',
conflicts_with = "add_data"
conflicts_with = "add_data",
value_parser = parse_op_return_string,
)]
pub add_string: Option<String>,
pub add_string: Option<PushBytesBuf>,
#[arg(
env = "ADD_DATA",
long = "add_data",
short = 'o',
conflicts_with = "add_string"
conflicts_with = "add_string",
value_parser = parse_op_return_base64,
)]
pub add_data: Option<String>,
pub add_data: Option<PushBytesBuf>,
}

impl AsyncAppCommand<AppContext<OfflineOperations<'_>>> for CreateDnsTxCommand {
Expand Down Expand Up @@ -138,12 +140,8 @@ impl AsyncAppCommand<AppContext<OfflineOperations<'_>>> for CreateDnsTxCommand {
if let Some(unspendable) = &self.unspendable {
tx_builder.unspendable(unspendable.to_vec());
}
if let Some(base64_data) = &self.add_data {
let op_return_data = BASE64_STANDARD.decode(base64_data)?;
tx_builder.add_data(&PushBytesBuf::try_from(op_return_data)?);
} else if let Some(string_data) = &self.add_string {
let data = PushBytesBuf::try_from(string_data.as_bytes().to_vec())?;
tx_builder.add_data(&data);
if let Some(data) = self.add_data.as_ref().or(self.add_string.as_ref()) {
tx_builder.add_data(data);
}

let policies = vec![
Expand All @@ -160,6 +158,7 @@ impl AsyncAppCommand<AppContext<OfflineOperations<'_>>> for CreateDnsTxCommand {
}

let psbt = tx_builder.finish()?;
check_standard_weight(max_signed_weight(ctx.state.wallet, &psbt)?)?;
Ok(PsbtResult::new(&psbt, Some(false)))
}
}
57 changes: 30 additions & 27 deletions src/handlers/offline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ use crate::commands::OfflineWalletSubCommand;
use crate::error::BDKCliError as Error;
use crate::handlers::{AppCommand, AppContext, OfflineOperations};
use crate::utils::output::{FormatOutput, ListResult};
use crate::utils::parse_address;
use crate::utils::types::{
AddressResult, BalanceResult, KeychainPair, PsbtResult, RawPsbt, TransactionDetails,
UnspentDetails,
};
use crate::utils::{parse_fee_rate, parse_outpoint, parse_recipient};
use crate::utils::{
check_standard_weight, max_signed_weight, parse_address, parse_fee_rate,
parse_op_return_base64, parse_op_return_string, parse_outpoint, parse_recipient,
};
use bdk_wallet::bitcoin::base64::Engine;
use bdk_wallet::bitcoin::base64::prelude::BASE64_STANDARD;
use bdk_wallet::bitcoin::script::PushBytesBuf;
Expand Down Expand Up @@ -228,23 +230,26 @@ pub struct CreateTxCommand {
#[arg(env = "INT_POLICY", long = "internal_policy")]
pub internal_policy: Option<String>,

/// Optionally create an OP_RETURN output containing given String in utf8 encoding (max 80 bytes)
/// Optionally create an OP_RETURN output containing given String in utf8 encoding. The transaction must stay within Bitcoin Core's 100,000 vB standard size limit.

@vadim-anfv vadim-anfv Nov 2, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: extra empty line

#[arg(
env = "ADD_STRING",
long = "add_string",
short = 's',
conflicts_with = "add_data"
conflicts_with = "add_data",
value_parser = parse_op_return_string,
)]
pub add_string: Option<String>,
pub add_string: Option<PushBytesBuf>,

/// Optionally create an OP_RETURN output containing given base64 encoded String. (max 80 bytes)
/// Optionally create an OP_RETURN output containing given base64 encoded String. The transaction must stay within Bitcoin Core's 100,000 vB standard size limit.
#[arg(
env = "ADD_DATA",
long = "add_data",
short = 'o',
conflicts_with = "add_string"
conflicts_with = "add_string",
value_parser = parse_op_return_base64,
)]
pub add_data: Option<String>,
pub add_data: Option<PushBytesBuf>,
}

impl AppCommand<AppContext<OfflineOperations<'_>>> for CreateTxCommand {
Expand Down Expand Up @@ -293,12 +298,8 @@ impl AppCommand<AppContext<OfflineOperations<'_>>> for CreateTxCommand {
tx_builder.unspendable(unspendable.to_vec());
}

if let Some(base64_data) = &self.add_data {
let op_return_data = BASE64_STANDARD.decode(base64_data)?;
tx_builder.add_data(&PushBytesBuf::try_from(op_return_data)?);
} else if let Some(string_data) = &self.add_string {
let data = PushBytesBuf::try_from(string_data.as_bytes().to_vec())?;
tx_builder.add_data(&data);
if let Some(data) = self.add_data.as_ref().or(self.add_string.as_ref()) {
tx_builder.add_data(data);
}

let policies = vec![
Expand All @@ -317,6 +318,8 @@ impl AppCommand<AppContext<OfflineOperations<'_>>> for CreateTxCommand {

let psbt = tx_builder.finish()?;

check_standard_weight(max_signed_weight(ctx.state.wallet, &psbt)?)?;

Ok(PsbtResult::new(&psbt, Some(false)))
}
}
Expand Down Expand Up @@ -353,22 +356,24 @@ pub struct CreateSpTxCommand {
/// Selects which policy should be used to satisfy the internal descriptor.
#[arg(env = "INT_POLICY", long = "internal_policy")]
pub internal_policy: Option<String>,
/// Optionally create an OP_RETURN output containing given String in utf8 encoding (max 80 bytes)
/// Optionally create an OP_RETURN output containing given String in utf8 encoding. The transaction must stay within Bitcoin Core's 100,000 vB standard size limit.
#[arg(
env = "ADD_STRING",
long = "add_string",
short = 's',
conflicts_with = "add_data"
conflicts_with = "add_data",
value_parser = parse_op_return_string,
)]
pub add_string: Option<String>,
/// Optionally create an OP_RETURN output containing given base64 encoded String. (max 80 bytes)
pub add_string: Option<PushBytesBuf>,
/// Optionally create an OP_RETURN output containing given base64 encoded String. The transaction must stay within Bitcoin Core's 100,000 vB standard size limit.
#[arg(
env = "ADD_DATA",
long = "add_data",
short = 'o',
conflicts_with = "add_string"
conflicts_with = "add_string",
value_parser = parse_op_return_base64,
)]
pub add_data: Option<String>, //base 64 econding
pub add_data: Option<PushBytesBuf>,
}

#[cfg(feature = "silent-payments")]
Expand Down Expand Up @@ -444,12 +449,8 @@ impl AppCommand<AppContext<OfflineOperations<'_>>> for CreateSpTxCommand {
tx_builder.unspendable(unspendable.to_vec());
}

if let Some(base64_data) = &self.add_data {
let op_return_data = BASE64_STANDARD.decode(base64_data)?;
tx_builder.add_data(&PushBytesBuf::try_from(op_return_data)?);
} else if let Some(string_data) = &self.add_string {
let data = PushBytesBuf::try_from(string_data.as_bytes().to_vec())?;
tx_builder.add_data(&data);
if let Some(data) = self.add_data.as_ref().or(self.add_string.as_ref()) {
tx_builder.add_data(data);
}

let policies = vec![
Expand Down Expand Up @@ -528,6 +529,8 @@ impl AppCommand<AppContext<OfflineOperations<'_>>> for CreateSpTxCommand {

let raw_tx = psbt.extract_tx()?;

check_standard_weight(raw_tx.weight())?;

@vadim-anfv vadim-anfv Nov 2, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

create_sp_tx is the only one of the four with an exact weight: the transaction is already signed by the time this runs, so raw_tx.weight() is a fact rather than a bound. NonStandardTxWeight says "can weigh up to {weight} ... once signed", which is wrong on both counts here. Worth either a second variant or wording that holds for both paths.


Ok(RawPsbt::new(&raw_tx))
}
}
Expand Down Expand Up @@ -593,7 +596,7 @@ impl AppCommand<AppContext<OfflineOperations<'_>>> for BumpFeeCommand {

let psbt = tx_builder.finish()?;

// let psbt_base64 = BASE64_STANDARD.encode(psbt.serialize());
check_standard_weight(max_signed_weight(wallet, &psbt)?)?;

Ok(PsbtResult::new(&psbt, Some(false)))
}
Expand Down
Loading
Loading