Merge remote-tracking branch 'upstream/master' into improve-minimum-a…

…t-height

fuzz/Cargo.toml

@@ -19,8 +19,26 @@ bitcoin = { version = "0.30.0", features = ["rand"] }
 libfuzzer-sys = "0.4"
 ord = { path = ".." }
 
+[[bin]]
+name = "runestone-decipher"
+path = "fuzz_targets/runestone_decipher.rs"
+test = false
+doc = false
+
 [[bin]]
 name = "transaction-builder"
 path = "fuzz_targets/transaction_builder.rs"
 test = false
 doc = false
+
+[[bin]]
+name = "varint-encode"
+path = "fuzz_targets/varint_encode.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "varint-decode"
+path = "fuzz_targets/varint_decode.rs"
+test = false
+doc = false

fuzz/fuzz_targets/runestone_decipher.rs

@@ -0,0 +1,36 @@
+#![no_main]
+
+use {
+  bitcoin::{
+    locktime, opcodes,
+    script::{self, PushBytes},
+    Transaction, TxOut,
+  },
+  libfuzzer_sys::fuzz_target,
+  ord::runes::Runestone,
+};
+
+fuzz_target!(|input: Vec<Vec<u8>>| {
+  let mut builder = script::Builder::new()
+    .push_opcode(opcodes::all::OP_RETURN)
+    .push_slice(b"RUNE_TEST");
+
+  for slice in input {
+    let Ok(push): Result<&PushBytes, _> = slice.as_slice().try_into() else {
+      continue;
+    };
+    builder = builder.push_slice(push);
+  }
+
+  let tx = Transaction {
+    input: Vec::new(),
+    lock_time: locktime::absolute::LockTime::ZERO,
+    output: vec![TxOut {
+      script_pubkey: builder.into_script(),
+      value: 0,
+    }],
+    version: 0,
+  };
+
+  Runestone::from_transaction(&tx);
+});

fuzz/fuzz_targets/transaction_builder.rs

@@ -7,7 +7,7 @@ use {
     Amount, OutPoint,
   },
   libfuzzer_sys::fuzz_target,
-  ord::{FeeRate, SatPoint, TransactionBuilder},
+  ord::{FeeRate, SatPoint, Target, TransactionBuilder},
   std::collections::BTreeMap,
 };
 
@@ -62,29 +62,34 @@ fuzz_target!(|input: Input| {
       .assume_checked(),
   ];
 
-  let Ok(fee_rate) = FeeRate::try_from(input.fee_rate) else { return; };
+  let Ok(fee_rate) = FeeRate::try_from(input.fee_rate) else {
+    return;
+  };
 
   match input.output_value {
     Some(output_value) => {
-      let _ = TransactionBuilder::build_transaction_with_value(
+      let _ = TransactionBuilder::new(
         satpoint,
         inscriptions,
         amounts,
         recipient,
         change,
         fee_rate,
-        Amount::from_sat(output_value),
-      );
+        Target::Value(Amount::from_sat(output_value)),
+      )
+      .build_transaction();
     }
     None => {
-      let _ = TransactionBuilder::build_transaction_with_postage(
+      let _ = TransactionBuilder::new(
         satpoint,
         inscriptions,
         amounts,
         recipient,
         change,
         fee_rate,
-      );
+        Target::Postage,
+      )
+      .build_transaction();
     }
   }
 });

fuzz/fuzz_targets/varint_decode.rs

@@ -0,0 +1,17 @@
+#![no_main]
+
+use {libfuzzer_sys::fuzz_target, ord::runes::varint};
+
+fuzz_target!(|input: &[u8]| {
+  let mut i = 0;
+
+  while i < input.len() {
+    let Ok((decoded, length)) = varint::decode(&input[i..]) else {
+      break;
+    };
+    let mut encoded = Vec::new();
+    varint::encode_to_vec(decoded, &mut encoded);
+    assert_eq!(encoded, &input[i..i + length]);
+    i += length;
+  }
+});

fuzz/fuzz_targets/varint_encode.rs

@@ -0,0 +1,11 @@
+#![no_main]
+
+use {libfuzzer_sys::fuzz_target, ord::runes::varint};
+
+fuzz_target!(|input: u128| {
+  let mut encoded = Vec::new();
+  varint::encode_to_vec(input, &mut encoded);
+  let (decoded, length) = varint::decode(&encoded).unwrap();
+  assert_eq!(length, encoded.len());
+  assert_eq!(decoded, input);
+});

justfile

@@ -68,7 +68,17 @@ profile-tests:
     | tee test-times.txt
 
 fuzz:
-  cd fuzz && cargo +nightly fuzz run transaction-builder
+  #!/usr/bin/env bash
+  set -euxo pipefail
+
+  cd fuzz
+
+  while true; do
+    cargo +nightly fuzz run transaction-builder -- -max_total_time=60
+    cargo +nightly fuzz run runestone-decipher -- -max_total_time=60
+    cargo +nightly fuzz run varint-decode -- -max_total_time=60
+    cargo +nightly fuzz run varint-encode -- -max_total_time=60
+  done
 
 open:
   open http://localhost