Add --force-input to wallet inscribe and wallet send.

src/subcommand/preview.rs

@@ -89,6 +89,7 @@ impl Preview {
  destination: None,
  dry_run: false,
  fee_rate: FeeRate::try_from(1.0).unwrap(),
+ force_input: Vec::new(),
  file: Some(file),
  json_metadata: None,
  metaprotocol: None,

src/subcommand/wallet/inscribe.rs

@@ -137,6 +137,8 @@ pub(crate) struct Inscribe {
  pub(crate) dump: bool,
  #[clap(long, help = "Do not broadcast any transactions. Implies --dump.")]
  pub(crate) no_broadcast: bool,
+ #[clap(long, help = "Require this utxo to be spent. Useful for forcing CPFP.")]
+ pub(crate) force_input: Vec<OutPoint>,
 }
 
 impl Inscribe {
@@ -286,7 +288,7 @@ impl Inscribe {
  reveal_input: self.reveal_input,
  satpoint: self.satpoint,
  }
- .inscribe(chain, &index, &client, &locked_utxos, &utxos)
+ .inscribe(chain, &index, &client, &locked_utxos, &utxos, self.force_input)
  }
 
  fn parse_metadata(cbor: Option<PathBuf>, json: Option<PathBuf>) -> Result<Option<Vec<u8>>> {

src/subcommand/wallet/inscribe/batch.rs

@@ -58,6 +58,7 @@ impl Batch {
  client: &Client,
  locked_utxos: &BTreeSet<OutPoint>,
  utxos: &BTreeMap<OutPoint, Amount>,
+ force_input: Vec<OutPoint>,
  ) -> SubcommandResult {
  let wallet_inscriptions = index.get_inscriptions(utxos)?;
 
@@ -74,6 +75,7 @@ impl Batch {
  locked_utxos.clone(),
  utxos.clone(),
  commit_tx_change,
+ force_input,
  )?;
 
  if self.dry_run {
@@ -254,6 +256,7 @@ impl Batch {
  locked_utxos: BTreeSet<OutPoint>,
  mut utxos: BTreeMap<OutPoint, Amount>,
  change: [Address; 2],
+ force_input: Vec<OutPoint>,
  ) -> Result<(Transaction, Transaction, TweakedKeyPair, u64)> {
  if let Some(parent_info) = &self.parent_info {
  assert!(self
@@ -456,6 +459,7 @@ impl Batch {
  } else {
  Target::Value(reveal_fee + total_postage)
  },
+ force_input,
  )
  .build_transaction()?
  };

src/subcommand/wallet/send.rs

@@ -21,6 +21,8 @@ pub(crate) struct Send {
  help = "Target amount of postage to include with sent inscriptions. Default `10000sat`"
  )]
  pub(crate) postage: Option<Amount>,
+ #[clap(long, help = "Require this utxo to be spent. Useful for forcing CPFP.")]
+ pub(crate) force_input: Vec<OutPoint>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -107,6 +109,7 @@ impl Send {
  change,
  self.fee_rate,
  postage,
+ self.force_input,
  )
  .build_transaction()?;
 

src/subcommand/wallet/transaction_builder.rs

@@ -103,6 +103,7 @@ pub struct TransactionBuilder {
  amounts: BTreeMap<OutPoint, Amount>,
  change_addresses: BTreeSet<Address>,
  fee_rate: FeeRate,
+ force_input: Vec<OutPoint>,
  inputs: Vec<OutPoint>,
  inscriptions: BTreeMap<SatPoint, InscriptionId>,
  outgoing: SatPoint,
@@ -132,6 +133,7 @@ impl TransactionBuilder {
  change: [Address; 2],
  fee_rate: FeeRate,
  target: Target,
+ force_input: Vec<OutPoint>,
  ) -> Self {
  Self {
  utxos: amounts.keys().cloned().collect(),
@@ -140,6 +142,7 @@ impl TransactionBuilder {
  change_addresses: change.iter().cloned().collect(),
  fee_rate,
  inputs: Vec::new(),
+ force_input: force_input,
  inscriptions,
  outgoing,
  outputs: Vec::new(),
@@ -206,7 +209,7 @@ impl TransactionBuilder {
  }
  }
 
- let amount = *self
+ let mut amount = *self
  .amounts
  .get(&self.outgoing.outpoint)
  .ok_or(Error::NotInWallet(self.outgoing))?;
@@ -217,6 +220,11 @@ impl TransactionBuilder {
 
  self.utxos.remove(&self.outgoing.outpoint);
  self.inputs.push(self.outgoing.outpoint);
+ for input in &self.force_input {
+ self.inputs.push(*input);
+ amount += *self.amounts.get(&input).unwrap();
+ self.utxos.remove(&input);
+ }
  self.outputs.push((self.recipient.clone(), amount));
 
  tprintln!(