Merge branch 'master' into output_recursive

raphjaph · Dec 3, 2024 · f10b69e · f10b69e
2 parents 3694157 + 5749363
commit f10b69e
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 67 deletions.
diff --git a/crates/mockcore/src/lib.rs b/crates/mockcore/src/lib.rs
@@ -198,7 +198,7 @@ pub struct FundRawTransactionResult {
   pub change_position: i32,
 }
 
-impl<'a> Default for TransactionTemplate<'a> {
+impl Default for TransactionTemplate<'_> {
   fn default() -> Self {
     Self {
       fee: 0,

diff --git a/src/index/updater.rs b/src/index/updater.rs
@@ -40,7 +40,7 @@ pub(crate) struct Updater<'index> {
   pub(super) sat_ranges_since_flush: u64,
 }
 
-impl<'index> Updater<'index> {
+impl Updater<'_> {
   pub(crate) fn update_index(&mut self, mut wtx: WriteTransaction) -> Result {
     let start = Instant::now();
     let starting_height = u32::try_from(self.index.client.get_block_count()?).unwrap() + 1;

diff --git a/src/index/updater/inscription_updater.rs b/src/index/updater/inscription_updater.rs
@@ -58,7 +58,7 @@ pub(super) struct InscriptionUpdater<'a, 'tx> {
   pub(super) unbound_inscriptions: u64,
 }
 
-impl<'a, 'tx> InscriptionUpdater<'a, 'tx> {
+impl InscriptionUpdater<'_, '_> {
   pub(super) fn index_inscriptions(
     &mut self,
     tx: &Transaction,

diff --git a/src/index/updater/rune_updater.rs b/src/index/updater/rune_updater.rs
@@ -17,7 +17,7 @@ pub(super) struct RuneUpdater<'a, 'tx, 'client> {
   pub(super) transaction_id_to_rune: &'a mut Table<'tx, &'static TxidValue, u128>,
 }
 
-impl<'a, 'tx, 'client> RuneUpdater<'a, 'tx, 'client> {
+impl RuneUpdater<'_, '_, '_> {
   pub(super) fn index_runes(&mut self, tx_index: u32, tx: &Transaction, txid: Txid) -> Result<()> {
     let artifact = Runestone::decipher(tx);
 

diff --git a/src/index/utxo_entry.rs b/src/index/utxo_entry.rs
@@ -91,8 +91,15 @@ impl UtxoEntry {
 }
 
 impl redb::Value for &UtxoEntry {
-  type SelfType<'a> = &'a UtxoEntry where Self: 'a;
-  type AsBytes<'a> = &'a [u8] where Self: 'a;
+  type SelfType<'a>
+    = &'a UtxoEntry
+  where
+    Self: 'a;
+
+  type AsBytes<'a>
+    = &'a [u8]
+  where
+    Self: 'a;
 
   fn fixed_width() -> Option<usize> {
     None

diff --git a/src/subcommand/wallet/burn.rs b/src/subcommand/wallet/burn.rs
@@ -28,12 +28,6 @@ pub struct Burn {
     you understand the implications."
   )]
   no_limit: bool,
-  #[arg(
-    long,
-    help = "Target <AMOUNT> postage with sent inscriptions. [default: 10000 sat]",
-    value_name = "AMOUNT"
-  )]
-  postage: Option<Amount>,
   inscription: InscriptionId,
 }
 
@@ -47,21 +41,10 @@ impl Burn {
 
     let metadata = WalletCommand::parse_metadata(self.cbor_metadata, self.json_metadata)?;
 
-    let Some(value) = inscription_info.value else {
-      bail!("Cannot burn unbound inscription");
-    };
-
-    let value = Amount::from_sat(value);
-
-    ensure! {
-      value <= TARGET_POSTAGE,
-      "Cannot burn inscription contained in UTXO exceeding {TARGET_POSTAGE}",
-    }
-
-    ensure! {
-      self.postage.unwrap_or_default() <= TARGET_POSTAGE,
-      "Postage may not exceed {TARGET_POSTAGE}",
-    }
+    ensure!(
+      inscription_info.value.is_some(),
+      "Cannot burn unbound inscription"
+    );
 
     let mut builder = script::Builder::new().push_opcode(opcodes::all::OP_RETURN);
 
@@ -96,12 +79,14 @@ impl Burn {
       MAX_STANDARD_OP_RETURN_SIZE,
     );
 
+    let burn_amount = Amount::from_sat(1);
+
     let unsigned_transaction = Self::create_unsigned_burn_transaction(
       &wallet,
       inscription_info.satpoint,
-      self.postage,
       self.fee_rate,
       script_pubkey,
+      burn_amount,
     )?;
 
     let base_size = unsigned_transaction.base_size();
@@ -110,8 +95,11 @@ impl Burn {
       "transaction base size less than minimum standard tx nonwitness size: {base_size} < 65",
     );
 
-    let (txid, psbt, fee) =
-      wallet.sign_and_broadcast_transaction(unsigned_transaction, self.dry_run, Some(value))?;
+    let (txid, psbt, fee) = wallet.sign_and_broadcast_transaction(
+      unsigned_transaction,
+      self.dry_run,
+      Some(burn_amount),
+    )?;
 
     Ok(Some(Box::new(send::Output {
       txid,
@@ -124,9 +112,9 @@ impl Burn {
   fn create_unsigned_burn_transaction(
     wallet: &Wallet,
     satpoint: SatPoint,
-    postage: Option<Amount>,
     fee_rate: FeeRate,
     script_pubkey: ScriptBuf,
+    burn_amount: Amount,
   ) -> Result<Transaction> {
     let runic_outputs = wallet.get_runic_outputs()?;
 
@@ -137,8 +125,6 @@ impl Burn {
 
     let change = [wallet.get_change_address()?, wallet.get_change_address()?];
 
-    let postage = postage.map(Target::ExactPostage).unwrap_or(Target::Postage);
-
     Ok(
       TransactionBuilder::new(
         satpoint,
@@ -149,7 +135,7 @@ impl Burn {
         script_pubkey,
         change,
         fee_rate,
-        postage,
+        Target::ExactPostage(burn_amount),
         wallet.chain().network(),
       )
       .build_transaction()?,

diff --git a/src/templates/metadata.rs b/src/templates/metadata.rs
@@ -2,7 +2,7 @@ use super::*;
 
 pub(crate) struct MetadataHtml<'a>(pub &'a Value);
 
-impl<'a> Display for MetadataHtml<'a> {
+impl Display for MetadataHtml<'_> {
   fn fmt(&self, f: &mut Formatter) -> fmt::Result {
     match self.0 {
       Value::Array(x) => {

diff --git a/tests/server.rs b/tests/server.rs
@@ -32,6 +32,7 @@ fn run() {
   }
 
   child.kill().unwrap();
+  child.wait().unwrap();
 }
 
 #[test]
@@ -741,6 +742,7 @@ fn run_no_sync() {
   }
 
   child.kill().unwrap();
+  child.wait().unwrap();
 
   let builder = CommandBuilder::new(format!(
     "server --no-sync --address 127.0.0.1 --http-port {port}",
@@ -770,6 +772,7 @@ fn run_no_sync() {
   }
 
   child.kill().unwrap();
+  child.wait().unwrap();
 }
 
 #[test]
@@ -814,6 +817,7 @@ fn authentication() {
   assert_eq!(response.status(), 200);
 
   child.kill().unwrap();
+  child.wait().unwrap();
 }
 
 #[cfg(unix)]

diff --git a/tests/wallet/burn.rs b/tests/wallet/burn.rs
@@ -33,7 +33,7 @@ fn inscriptions_can_be_burned() {
     <span title=burned>🔥</span>
   </dd>
   <dt>value</dt>
-  <dd>9918</dd>
+  <dd>1</dd>
   .*
   <dt>content length</dt>
   <dd>3 bytes</dd>
@@ -116,7 +116,7 @@ fn runic_outputs_are_protected() {
 }
 
 #[test]
-fn cannot_burn_inscriptions_on_large_utxos() {
+fn burns_only_one_sat() {
   let core = mockcore::spawn();
 
   let ord = TestServer::spawn_with_server_args(&core, &[], &[]);
@@ -125,14 +125,45 @@ fn cannot_burn_inscriptions_on_large_utxos() {
 
   core.mine_blocks(1);
 
-  let (inscription, _) = inscribe_with_postage(&core, &ord, Some(10_001));
+  assert_eq!(
+    CommandBuilder::new("wallet balance")
+      .core(&core)
+      .ord(&ord)
+      .run_and_deserialize_output::<Balance>(),
+    Balance {
+      cardinal: 50 * COIN_VALUE,
+      ordinal: 0,
+      runic: None,
+      runes: None,
+      total: 50 * COIN_VALUE,
+    }
+  );
+
+  let (inscription, _) = inscribe_with_postage(&core, &ord, Some(100_000));
 
   CommandBuilder::new(format!("wallet burn --fee-rate 1 {inscription}",))
     .core(&core)
     .ord(&ord)
-    .expected_stderr("error: Cannot burn inscription contained in UTXO exceeding 0.00010000 BTC\n")
-    .expected_exit_code(1)
-    .run_and_extract_stdout();
+    .run_and_deserialize_output::<Send>();
+
+  core.mine_blocks(1);
+
+  // 4 block rewards - 1 burned sat
+  let expected_balance = 4 * 50 * COIN_VALUE - 1;
+
+  assert_eq!(
+    CommandBuilder::new("wallet balance")
+      .core(&core)
+      .ord(&ord)
+      .run_and_deserialize_output::<Balance>(),
+    Balance {
+      cardinal: expected_balance,
+      ordinal: 0,
+      runic: None,
+      runes: None,
+      total: expected_balance,
+    }
+  );
 }
 
 #[test]
@@ -191,30 +222,6 @@ fn cannot_burn_inscription_sharing_utxo_with_another_inscription() {
     .run_and_extract_stdout();
 }
 
-#[test]
-fn cannot_burn_with_excess_postage() {
-  let core = mockcore::spawn();
-
-  let ord = TestServer::spawn_with_server_args(&core, &[], &[]);
-
-  create_wallet(&core, &ord);
-
-  core.mine_blocks(1);
-
-  let (inscription, _) = inscribe(&core, &ord);
-
-  core.mine_blocks(1);
-
-  CommandBuilder::new(format!(
-    "wallet burn --fee-rate 1 {inscription} --postage 10001sat",
-  ))
-  .core(&core)
-  .ord(&ord)
-  .expected_stderr("error: Postage may not exceed 0.00010000 BTC\n")
-  .expected_exit_code(1)
-  .run_and_extract_stdout();
-}
-
 #[test]
 fn json_metadata_can_be_included_when_burning() {
   let core = mockcore::spawn();
@@ -258,7 +265,7 @@ fn json_metadata_can_be_included_when_burning() {
       fee: 138,
       id: inscription,
       output: Some(TxOut {
-        value: Amount::from_sat(9907),
+        value: Amount::from_sat(1),
         script_pubkey,
       }),
       height: 3,
@@ -327,7 +334,7 @@ fn cbor_metadata_can_be_included_when_burning() {
       fee: 138,
       id: inscription,
       output: Some(TxOut {
-        value: Amount::from_sat(9907),
+        value: Amount::from_sat(1),
         script_pubkey,
       }),
       height: 3,