Merge branch 'master' into issue949

Cargo.toml

@@ -63,6 +63,7 @@ serde_json = { version = "1.0.81", features = ["preserve_order"] }
 serde_with = "3.7.0"
 serde_yaml = "0.9.17"
 sha3 = "0.10.8"
+snafu = "0.8.3"
 sysinfo = "0.30.3"
 tempfile = "3.2.0"
 tokio = { version = "1.17.0", features = ["rt-multi-thread"] }

README.md

@@ -266,6 +266,13 @@ the server and show `info`-level log messages and above:
 $ RUST_LOG=info cargo run server
 ```
 
+Set the `RUST_BACKTRACE` environment variable in order to turn on full rust
+backtrace. For example, run the server and turn on debugging and full backtrace:
+
+```
+$ RUST_BACKTRACE=1 RUST_LOG=debug ord server
+```
+
 New Releases
 ------------
 

crates/mockcore/src/lib.rs

@@ -133,6 +133,7 @@ pub struct TransactionTemplate<'a> {
   pub inputs: &'a [(usize, usize, usize, Witness)],
   pub op_return: Option<ScriptBuf>,
   pub op_return_index: Option<usize>,
+  pub op_return_value: Option<u64>,
   pub output_values: &'a [u64],
   pub outputs: usize,
   pub p2tr: bool,
@@ -180,6 +181,7 @@ impl<'a> Default for TransactionTemplate<'a> {
       inputs: &[],
       op_return: None,
       op_return_index: None,
+      op_return_value: None,
       output_values: &[],
       outputs: 1,
       p2tr: false,

crates/mockcore/src/state.rs

@@ -248,7 +248,7 @@ impl State {
       tx.output.insert(
         template.op_return_index.unwrap_or(tx.output.len()),
         TxOut {
-          value: 0,
+          value: template.op_return_value.unwrap_or_default(),
           script_pubkey,
         },
       );

crates/ordinals/src/charm.rs

@@ -14,10 +14,11 @@ pub enum Charm {
   Uncommon = 9,
   Vindicated = 10,
   Mythic = 11,
+  Burned = 12,
 }
 
 impl Charm {
-  pub const ALL: [Self; 12] = [
+  pub const ALL: [Self; 13] = [
     Self::Coin,
     Self::Uncommon,
     Self::Rare,
@@ -30,6 +31,7 @@ impl Charm {
     Self::Unbound,
     Self::Lost,
     Self::Vindicated,
+    Self::Burned,
   ];
 
   fn flag(self) -> u16 {
@@ -50,18 +52,19 @@ impl Charm {
 
   pub fn icon(self) -> &'static str {
     match self {
+      Self::Burned => "🔥",
       Self::Coin => "🪙",
       Self::Cursed => "👹",
       Self::Epic => "🪻",
       Self::Legendary => "🌝",
       Self::Lost => "🤔",
       Self::Mythic => "🎃",
-      Self::Nineball => "9️⃣",
+      Self::Nineball => "\u{39}\u{fe0f}\u{20e3}",
       Self::Rare => "🧿",
       Self::Reinscription => "♻️",
       Self::Unbound => "🔓",
       Self::Uncommon => "🌱",
-      Self::Vindicated => "❤️‍🔥",
+      Self::Vindicated => "\u{2764}\u{fe0f}\u{200d}\u{1f525}",
     }
   }
 
@@ -79,6 +82,7 @@ impl Display for Charm {
       f,
       "{}",
       match self {
+        Self::Burned => "burned",
         Self::Coin => "coin",
         Self::Cursed => "cursed",
         Self::Epic => "epic",
@@ -101,6 +105,7 @@ impl FromStr for Charm {
 
   fn from_str(s: &str) -> Result<Self, Self::Err> {
     Ok(match s {
+      "burned" => Self::Burned,
       "coin" => Self::Coin,
       "cursed" => Self::Cursed,
       "epic" => Self::Epic,