Require users manually specify a --fee-rate for wallet send (ordi…

…nals#1755)

NB `wallet send <AMOUNT>` still uses fee-rate estimation from `bitcoind`.

See ordinals#1432 for more details.

docs/src/guides/inscriptions.md

@@ -205,7 +205,7 @@ ord wallet receive
 Send the inscription by running:
 
 ```
-ord wallet send ADDRESS INSCRIPTION_ID
+ord wallet send --fee-rate <FEE_RATE> <ADDRESS> <INSCRIPTION_ID>
 ```
 
 See the pending transaction with:

src/subcommand/wallet/inscribe.rs

@@ -133,7 +133,8 @@ impl Inscribe {
  .iter()
  .map(|txin| utxos.get(&txin.previous_output).unwrap().to_sat())
  .sum::<u64>()
- - tx.output.iter().map(|txout| txout.value).sum::<u64>()
+ .checked_sub(tx.output.iter().map(|txout| txout.value).sum::<u64>())
+ .unwrap()
  }
 
  fn create_inscription_transactions(

src/subcommand/wallet/send.rs

@@ -4,11 +4,7 @@ use {super::*, crate::wallet::Wallet};
 pub(crate) struct Send {
  address: Address,
  outgoing: Outgoing,
- #[clap(
- long,
- default_value = "1.0",
- help = "Use fee rate of <FEE_RATE> sats/vB"
- )]
+ #[clap(long, help = "Use fee rate of <FEE_RATE> sats/vB")]
  fee_rate: FeeRate,
 }
 

tests/server.rs

@@ -144,7 +144,7 @@ fn inscription_page_after_send() {
  );
 
  let txid = CommandBuilder::new(format!(
- "wallet send bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {inscription}"
+ "wallet send --fee-rate 1 bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {inscription}"
  ))
  .rpc_server(&rpc_server)
  .stdout_regex(".*")

tests/wallet/inscriptions.rs

@@ -32,7 +32,7 @@ fn inscriptions() {
  .output::<receive::Output>()
  .address;
 
- let stdout = CommandBuilder::new(format!("wallet send {address} {inscription}"))
+ let stdout = CommandBuilder::new(format!("wallet send --fee-rate 1 {address} {inscription}"))
  .rpc_server(&rpc_server)
  .expected_exit_code(0)
  .stdout_regex(".*")

tests/wallet/send.rs

@@ -11,7 +11,7 @@ fn inscriptions_can_be_sent() {
  rpc_server.mine_blocks(1);
 
  let stdout = CommandBuilder::new(format!(
- "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {inscription}",
+ "wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {inscription}",
  ))
  .rpc_server(&rpc_server)
  .stdout_regex(r".*")
@@ -51,7 +51,7 @@ fn send_unknown_inscription() {
  let txid = rpc_server.mine_blocks(1)[0].txdata[0].txid();
 
  CommandBuilder::new(format!(
- "wallet send bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {txid}i0"
+ "wallet send --fee-rate 1 bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {txid}i0"
  ))
  .rpc_server(&rpc_server)
  .expected_stderr(format!("error: Inscription {txid}i0 not found\n"))
@@ -70,7 +70,7 @@ fn send_inscribed_sat() {
  rpc_server.mine_blocks(1);
 
  let stdout = CommandBuilder::new(format!(
- "wallet send bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {inscription}",
+ "wallet send --fee-rate 1 bc1qcqgs2pps4u4yedfyl5pysdjjncs8et5utseepv {inscription}",
  ))
  .rpc_server(&rpc_server)
  .stdout_regex("[[:xdigit:]]{64}\n")
@@ -99,7 +99,7 @@ fn send_on_mainnnet_works_with_wallet_named_foo() {
  .output::<Create>();
 
  CommandBuilder::new(format!(
- "--wallet foo wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {txid}:0:0"
+ "--wallet foo wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {txid}:0:0"
  ))
  .rpc_server(&rpc_server)
  .stdout_regex(r"[[:xdigit:]]{64}\n")
@@ -113,7 +113,7 @@ fn send_addresses_must_be_valid_for_network() {
  create_wallet(&rpc_server);
 
  CommandBuilder::new(format!(
- "wallet send tb1q6en7qjxgw4ev8xwx94pzdry6a6ky7wlfeqzunz {txid}:0:0"
+ "wallet send --fee-rate 1 tb1q6en7qjxgw4ev8xwx94pzdry6a6ky7wlfeqzunz {txid}:0:0"
  ))
  .rpc_server(&rpc_server)
  .expected_stderr(
@@ -130,7 +130,7 @@ fn send_on_mainnnet_works_with_wallet_named_ord() {
  create_wallet(&rpc_server);
 
  let stdout = CommandBuilder::new(format!(
- "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {txid}:0:0"
+ "wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {txid}:0:0"
  ))
  .rpc_server(&rpc_server)
  .stdout_regex(r".*")
@@ -155,7 +155,7 @@ fn send_does_not_use_inscribed_sats_as_cardinal_utxos() {
 
  let txid = rpc_server.mine_blocks_with_subsidy(1, 100)[0].txdata[0].txid();
  CommandBuilder::new(format!(
- "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {txid}:0:0"
+ "wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {txid}:0:0"
  ))
  .rpc_server(&rpc_server)
  .expected_exit_code(1)
@@ -182,7 +182,7 @@ fn do_not_accidentally_send_an_inscription() {
  };
 
  CommandBuilder::new(format!(
- "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {output}:55"
+ "wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {output}:55"
  ))
  .rpc_server(&rpc_server)
  .expected_exit_code(1)
@@ -202,7 +202,7 @@ fn inscriptions_cannot_be_sent_by_satpoint() {
  rpc_server.mine_blocks(1);
 
  CommandBuilder::new(format!(
- "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {reveal}:0:0"
+ "wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {reveal}:0:0"
  ))
  .rpc_server(&rpc_server)
  .expected_stderr("error: inscriptions must be sent by inscription ID\n")
@@ -217,9 +217,10 @@ fn send_btc() {
 
  rpc_server.mine_blocks(1);
 
- let output = CommandBuilder::new("wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 1btc")
- .rpc_server(&rpc_server)
- .output::<Output>();
+ let output =
+ CommandBuilder::new("wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 1btc")
+ .rpc_server(&rpc_server)
+ .output::<Output>();
 
  assert_eq!(
  output.transaction,
@@ -249,9 +250,10 @@ fn send_btc_locks_inscriptions() {
 
  let Inscribe { reveal, .. } = inscribe(&rpc_server);
 
- let output = CommandBuilder::new("wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 1btc")
- .rpc_server(&rpc_server)
- .output::<Output>();
+ let output =
+ CommandBuilder::new("wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 1btc")
+ .rpc_server(&rpc_server)
+ .output::<Output>();
 
  assert_eq!(
  output.transaction,
@@ -284,7 +286,7 @@ fn send_btc_fails_if_lock_unspent_fails() {
 
  rpc_server.mine_blocks(1);
 
- CommandBuilder::new("wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 1btc")
+ CommandBuilder::new("wallet send --fee-rate 1 bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 1btc")
  .rpc_server(&rpc_server)
  .expected_stderr("error: failed to lock ordinal UTXOs\n")
  .expected_exit_code(1)
@@ -322,3 +324,23 @@ fn wallet_send_with_fee_rate() {
 
  pretty_assert_eq!(fee_rate, 2.0);
 }
+
+#[test]
+fn user_must_provide_fee_rate_to_send() {
+ let rpc_server = test_bitcoincore_rpc::spawn();
+ create_wallet(&rpc_server);
+ rpc_server.mine_blocks(1);
+
+ let Inscribe { inscription, .. } = inscribe(&rpc_server);
+
+ CommandBuilder::new(format!(
+ "wallet send bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4 {inscription}"
+ ))
+ .rpc_server(&rpc_server)
+ .expected_exit_code(2)
+ .stderr_regex(
+ ".*error: The following required arguments were not provided:
+.*--fee-rate <FEE_RATE>.*",
+ )
+ .run();
+}