From b6f0ab8da705d9db2b594041b9293648e7919947 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 11:15:42 -0700
Subject: [PATCH 01/13] Add CBOR metadata

---
 Cargo.lock                        |  35 +++++++++
 Cargo.toml                        |   3 +-
 docs/src/SUMMARY.md               |   1 +
 docs/src/inscriptions/metadata.md |  73 +++++++++++++++++
 src/envelope.rs                   |  16 ++++
 src/inscription.rs                |  27 +++++--
 src/lib.rs                        |   1 +
 src/subcommand/preview.rs         |   4 +-
 src/subcommand/wallet/inscribe.rs |  32 +++++++-
 src/templates.rs                  |   2 +
 src/templates/metadata.rs         | 125 ++++++++++++++++++++++++++++++
 templates/inscription.html        |   6 ++
 12 files changed, 315 insertions(+), 10 deletions(-)
 create mode 100644 docs/src/inscriptions/metadata.md
 create mode 100644 src/templates/metadata.rs

diff --git a/Cargo.lock b/Cargo.lock
index fad35c04ec..741613aa70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -661,6 +661,33 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "ciborium"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
 [[package]]
 name = "clap"
 version = "4.4.4"
@@ -1352,6 +1379,12 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -2084,6 +2117,7 @@ dependencies = [
  "bitcoin",
  "boilerplate",
  "chrono",
+ "ciborium",
  "clap",
  "ctrlc",
  "derive_more",
@@ -2846,6 +2880,7 @@ version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
+ "indexmap 2.0.0",
  "itoa",
  "ryu",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 41806b48c5..aad9e93602 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,6 +24,7 @@ bip39 = "2.0.0"
 bitcoin = { version = "0.30.0", features = ["rand"] }
 boilerplate = { version = "1.0.0", features = ["axum"] }
 chrono = "0.4.19"
+ciborium = "0.2.1"
 clap = { version = "4.4.2", features = ["derive"] }
 ctrlc = { version = "3.2.1", features = ["termination"] }
 derive_more = "0.99.17"
@@ -49,7 +50,7 @@ rust-embed = "8.0.0"
 rustls = "0.21.1"
 rustls-acme = { version = "0.7.1", features = ["axum"] }
 serde = { version = "1.0.137", features = ["derive"] }
-serde_json = { version = "1.0.81" }
+serde_json = { version = "1.0.81", features = ["preserve_order"] }
 serde_yaml = "0.9.17"
 sysinfo = "0.29.2"
 tempfile = "3.2.0"
diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index 2ed5bace41..acc5b95551 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -3,6 +3,7 @@
 - [Overview](overview.md)
 - [Digital Artifacts](digital-artifacts.md)
 - [Inscriptions](inscriptions.md)
+  - [Metadata](inscriptions/metadata.md)
   - [Provenance](inscriptions/provenance.md)
   - [Recursion](inscriptions/recursion.md)
 - [FAQ](faq.md)
diff --git a/docs/src/inscriptions/metadata.md b/docs/src/inscriptions/metadata.md
new file mode 100644
index 0000000000..fb03357fe7
--- /dev/null
+++ b/docs/src/inscriptions/metadata.md
@@ -0,0 +1,73 @@
+Metadata
+========
+
+Inscriptions may include CBOR metadata, stored as data pushes in fields with
+tag `5`. Tapscript data pushes are limited to 520 bytes. Metadata longer than
+520 bytes may be split into multiple tag `5` fields, which will then be
+concatinated before decoding.
+
+Metadata is human readable, and all metadata will be displayed to the user with
+its inscription. Inscribers are encouraged to consider how metadata will be
+displayed, and make metadata concise and attractive.
+
+Metadata is rendered to HTML for display as follows:
+
+- `null`, `true`, `false`, numbers, and strings are rendered as plain text.
+- Arrays are rendered as `<ul>` tags, with every element wrapped in `<li>`
+  tags.
+- Objects are rendered as `<dl>` tags, with every key wrapped in `<dt>` tags,
+  and every value wrapped in `<dd>` tags.
+
+Example
+-------
+
+The metadata `{"foo":"bar","baz":[null,true,false,0]}` would be included in an inscription as:
+
+```
+OP_FALSE
+OP_IF
+    ...
+    OP_PUSH 0x05 OP_PUSH '{"foo":"bar","baz":[null,true,false,0]}'
+    ...
+OP_ENDIF
+```
+
+And rendered as:
+
+```
+<dl>
+  ...
+  <dt>metadata</dt>
+  <dd>
+    <dl>
+      <dt>foo</dt>
+      <dd>bar</dd>
+      <dt>baz</dt>
+      <dd>
+        <ul>
+          <li>null</li>
+          <li>true</li>
+          <li>false</li>
+          <li>0</li>
+        </ul>
+      </dd>
+    </dl>
+  </dd>
+  ...
+</dl>
+```
+
+Metadata longer than 520 bytes must be split into multiple fields:
+
+```
+OP_FALSE
+OP_IF
+    ...
+    OP_PUSH 0x05 OP_PUSH '{"very":"long","metadata":'
+    OP_PUSH 0x05 OP_PUSH '"is","finally":"done"}'
+    ...
+OP_ENDIF
+```
+
+Which would then be concatinated into
+`{"very":"long","metadata":"is","finally":"done"}`.
diff --git a/src/envelope.rs b/src/envelope.rs
index b93d615228..6026507919 100644
--- a/src/envelope.rs
+++ b/src/envelope.rs
@@ -11,6 +11,7 @@ pub(crate) const PROTOCOL_ID: [u8; 3] = *b"ord";
 pub(crate) const BODY_TAG: [u8; 0] = [];
 pub(crate) const CONTENT_TYPE_TAG: [u8; 1] = [1];
 pub(crate) const PARENT_TAG: [u8; 1] = [3];
+pub(crate) const METADATA_TAG: [u8; 1] = [5];
 pub(crate) const METAPROTOCOL_TAG: [u8; 1] = [7];
 
 type Result<T> = std::result::Result<T, script::Error>;
@@ -34,6 +35,19 @@ fn remove_field(fields: &mut BTreeMap<&[u8], Vec<&[u8]>>, field: &[u8]) -> Optio
   }
 }
 
+fn remove_and_concatinate_field(
+  fields: &mut BTreeMap<&[u8], Vec<&[u8]>>,
+  field: &[u8],
+) -> Option<Vec<u8>> {
+  let value = fields.remove(field)?;
+
+  if value.is_empty() {
+    None
+  } else {
+    Some(value.into_iter().flatten().cloned().collect())
+  }
+}
+
 impl From<RawEnvelope> for ParsedEnvelope {
   fn from(envelope: RawEnvelope) -> Self {
     let body = envelope
@@ -58,6 +72,7 @@ impl From<RawEnvelope> for ParsedEnvelope {
     let content_type = remove_field(&mut fields, &CONTENT_TYPE_TAG);
     let parent = remove_field(&mut fields, &PARENT_TAG);
     let metaprotocol = remove_field(&mut fields, &METAPROTOCOL_TAG);
+    let metadata = remove_and_concatinate_field(&mut fields, &METADATA_TAG);
 
     let unrecognized_even_field = fields
       .keys()
@@ -78,6 +93,7 @@ impl From<RawEnvelope> for ParsedEnvelope {
         duplicate_field,
         incomplete_field,
         metaprotocol,
+        metadata,
       },
       input: envelope.input,
       offset: envelope.offset,
diff --git a/src/inscription.rs b/src/inscription.rs
index 4c6fb00627..dc98a0d681 100644
--- a/src/inscription.rs
+++ b/src/inscription.rs
@@ -7,6 +7,7 @@ use {
     },
     ScriptBuf,
   },
+  io::Cursor,
   std::str,
 };
 
@@ -24,11 +25,12 @@ pub(crate) enum Curse {
 pub struct Inscription {
   pub body: Option<Vec<u8>>,
   pub content_type: Option<Vec<u8>>,
-  pub parent: Option<Vec<u8>>,
-  pub metaprotocol: Option<Vec<u8>>,
-  pub unrecognized_even_field: bool,
   pub duplicate_field: bool,
   pub incomplete_field: bool,
+  pub metadata: Option<Vec<u8>>,
+  pub metaprotocol: Option<Vec<u8>>,
+  pub parent: Option<Vec<u8>>,
+  pub unrecognized_even_field: bool,
 }
 
 impl Inscription {
@@ -46,6 +48,7 @@ impl Inscription {
     path: impl AsRef<Path>,
     parent: Option<InscriptionId>,
     metaprotocol: Option<String>,
+    metadata: Option<Vec<u8>>,
   ) -> Result<Self, Error> {
     let path = path.as_ref();
 
@@ -63,11 +66,12 @@ impl Inscription {
     Ok(Self {
       body: Some(body),
       content_type: Some(content_type.into()),
-      parent: parent.map(|id| id.parent_value()),
-      metaprotocol: metaprotocol.map(|metaprotocol| metaprotocol.into_bytes()),
       duplicate_field: false,
-      unrecognized_even_field: false,
       incomplete_field: false,
+      metadata,
+      metaprotocol: metaprotocol.map(|metaprotocol| metaprotocol.into_bytes()),
+      parent: parent.map(|id| id.parent_value()),
+      unrecognized_even_field: false,
     })
   }
 
@@ -98,6 +102,13 @@ impl Inscription {
         .push_slice(PushBytesBuf::try_from(parent).unwrap());
     }
 
+    if let Some(metadata) = &self.metadata {
+      for chunk in metadata.chunks(520) {
+        builder = builder.push_slice(envelope::METADATA_TAG);
+        builder = builder.push_slice(PushBytesBuf::try_from(chunk.to_vec()).unwrap());
+      }
+    }
+
     if let Some(body) = &self.body {
       builder = builder.push_slice(envelope::BODY_TAG);
       for chunk in body.chunks(520) {
@@ -140,6 +151,10 @@ impl Inscription {
     str::from_utf8(self.content_type.as_ref()?).ok()
   }
 
+  pub(crate) fn metadata(&self) -> Option<Value> {
+    ciborium::from_reader(Cursor::new(self.metadata.as_ref()?)).ok()
+  }
+
   pub(crate) fn metaprotocol(&self) -> Option<&str> {
     str::from_utf8(self.metaprotocol.as_ref()?).ok()
   }
diff --git a/src/lib.rs b/src/lib.rs
index cfeeff6164..a4a468aa0d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,6 +43,7 @@ use {
   bitcoincore_rpc::{Client, RpcApi},
   chain::Chain,
   chrono::{DateTime, TimeZone, Utc},
+  ciborium::Value,
   clap::{ArgGroup, Parser},
   derive_more::{Display, FromStr},
   html_escaper::{Escape, Trusted},
diff --git a/src/subcommand/preview.rs b/src/subcommand/preview.rs
index 3248761c5d..a493298481 100644
--- a/src/subcommand/preview.rs
+++ b/src/subcommand/preview.rs
@@ -79,16 +79,18 @@ impl Preview {
         options: options.clone(),
         subcommand: Subcommand::Wallet(super::wallet::Wallet::Inscribe(
           super::wallet::inscribe::Inscribe {
+            cbor_metadata: None,
             commit_fee_rate: None,
             destination: None,
             dry_run: false,
             fee_rate: FeeRate::try_from(1.0).unwrap(),
             file,
+            json_metadata: None,
+            metaprotocol: None,
             no_backup: true,
             no_limit: false,
             parent: None,
             postage: Some(TransactionBuilder::TARGET_POSTAGE),
-            metaprotocol: None,
             reinscribe: false,
             satpoint: None,
           },
diff --git a/src/subcommand/wallet/inscribe.rs b/src/subcommand/wallet/inscribe.rs
index 537d6a615f..737e262910 100644
--- a/src/subcommand/wallet/inscribe.rs
+++ b/src/subcommand/wallet/inscribe.rs
@@ -63,6 +63,18 @@ pub(crate) struct Inscribe {
     help = "Amount of postage to include in the inscription. Default `10000sat`."
   )]
   pub(crate) postage: Option<Amount>,
+  #[arg(
+    long,
+    help = "Include CBOR in file at <METADATA> as inscription metadata",
+    conflicts_with = "json_metadata"
+  )]
+  pub(crate) cbor_metadata: Option<PathBuf>,
+  #[arg(
+    long,
+    help = "Include JSON in file at <METADATA> convered to CBOR as inscription metadata",
+    conflicts_with = "cbor_metadata"
+  )]
+  pub(crate) json_metadata: Option<PathBuf>,
   #[clap(long, help = "Make inscription a child of <PARENT>.")]
   pub(crate) parent: Option<InscriptionId>,
   #[clap(long, help = "Allow reinscription.")]
@@ -73,8 +85,24 @@ pub(crate) struct Inscribe {
 
 impl Inscribe {
   pub(crate) fn run(self, options: Options) -> SubcommandResult {
-    let inscription =
-      Inscription::from_file(options.chain(), &self.file, self.parent, self.metaprotocol)?;
+    let metadata = if let Some(path) = self.cbor_metadata {
+      Some(fs::read(path)?)
+    } else if let Some(path) = self.json_metadata {
+      let value: serde_json::Value = serde_json::from_reader(File::open(path)?)?;
+      let mut cbor = Vec::new();
+      ciborium::into_writer(&value, &mut cbor)?;
+      Some(cbor)
+    } else {
+      None
+    };
+
+    let inscription = Inscription::from_file(
+      options.chain(),
+      &self.file,
+      self.parent,
+      self.metaprotocol,
+      metadata,
+    )?;
 
     let index = Index::open(&options)?;
     index.update()?;
diff --git a/src/templates.rs b/src/templates.rs
index 3d73d82276..bd6735b919 100644
--- a/src/templates.rs
+++ b/src/templates.rs
@@ -9,6 +9,7 @@ pub(crate) use {
   inscription::{InscriptionHtml, InscriptionJson},
   inscriptions::{InscriptionsHtml, InscriptionsJson},
   inscriptions_block::InscriptionsBlockHtml,
+  metadata::MetadataHtml,
   output::{OutputHtml, OutputJson},
   page_config::PageConfig,
   preview::{
@@ -29,6 +30,7 @@ mod input;
 pub mod inscription;
 pub mod inscriptions;
 mod inscriptions_block;
+mod metadata;
 pub mod output;
 mod preview;
 mod range;
diff --git a/src/templates/metadata.rs b/src/templates/metadata.rs
new file mode 100644
index 0000000000..ed48fe3c74
--- /dev/null
+++ b/src/templates/metadata.rs
@@ -0,0 +1,125 @@
+use super::*;
+
+pub(crate) struct MetadataHtml<'a>(pub &'a Value);
+
+impl<'a> Display for MetadataHtml<'a> {
+  fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+    match self.0 {
+      Value::Array(x) => {
+        write!(f, "<ul>")?;
+        for element in x {
+          write!(f, "<li>{}</li>", MetadataHtml(element))?;
+        }
+        write!(f, "</ul>")
+      }
+      Value::Bool(x) => write!(f, "{x}"),
+      Value::Bytes(x) => {
+        for byte in x {
+          write!(f, "{byte:02X}")?;
+        }
+        Ok(())
+      }
+      Value::Float(x) => write!(f, "{x}"),
+      Value::Integer(x) => write!(f, "{}", i128::from(*x)),
+      Value::Map(x) => {
+        write!(f, "<dl>")?;
+        for (key, value) in x {
+          write!(f, "<dt>{}</dt>", MetadataHtml(key))?;
+          write!(f, "<dd>{}</dd>", MetadataHtml(value))?;
+        }
+        write!(f, "</dl>")
+      }
+      Value::Null => write!(f, "null"),
+      Value::Tag(tag, value) => write!(f, "<sup>{tag}</sup>{}", MetadataHtml(value)),
+      Value::Text(x) => x.escape(f, false),
+      _ => write!(f, "unknown"),
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  #[test]
+  fn null() {
+    assert_eq!(MetadataHtml(&Value::Null).to_string(), "null");
+  }
+
+  #[test]
+  fn integer() {
+    assert_eq!(MetadataHtml(&Value::Integer(100.into())).to_string(), "100");
+  }
+
+  #[test]
+  fn bool() {
+    assert_eq!(MetadataHtml(&Value::Bool(false)).to_string(), "false");
+    assert_eq!(MetadataHtml(&Value::Bool(true)).to_string(), "true");
+  }
+
+  #[test]
+  fn tag() {
+    assert_eq!(
+      MetadataHtml(&Value::Tag(0, Box::new(Value::Bool(false)))).to_string(),
+      "<sup>0</sup>false"
+    );
+  }
+
+  #[test]
+  fn string() {
+    assert_eq!(
+      MetadataHtml(&Value::Text("hello".into())).to_string(),
+      "hello"
+    );
+    assert_eq!(MetadataHtml(&Value::Text("<".into())).to_string(), "&lt;");
+  }
+
+  #[test]
+  fn bytes() {
+    assert_eq!(
+      MetadataHtml(&Value::Bytes(vec![0, 1, 2, 0xFF])).to_string(),
+      "000102FF"
+    );
+  }
+
+  #[test]
+  fn array() {
+    assert_eq!(
+      MetadataHtml(&Value::Array(vec![
+        Value::Null,
+        Value::Null,
+        Value::Text("hello".to_string())
+      ]))
+      .to_string(),
+      "<ul><li>null</li><li>null</li><li>hello</li></ul>"
+    )
+  }
+
+  #[test]
+  fn map() {
+    assert_eq!(
+      MetadataHtml(&Value::Map(
+        vec![
+          (Value::Text("b".to_string()), Value::Null),
+          (
+            Value::Text("a".to_string()),
+            Value::Text("hello".to_string())
+          )
+        ]
+        .into_iter()
+        .collect()
+      ))
+      .to_string(),
+      "<dl><dt>b</dt><dd>null</dd><dt>a</dt><dd>hello</dd></dl>"
+    );
+    assert_eq!(
+      MetadataHtml(&Value::Map(
+        vec![(Value::Text("<".to_string()), Value::Null),]
+          .into_iter()
+          .collect()
+      ))
+      .to_string(),
+      "<dl><dt>&lt;</dt><dd>null</dd></dl>"
+    );
+  }
+}
diff --git a/templates/inscription.html b/templates/inscription.html
index 56b4839da1..fa8835c055 100644
--- a/templates/inscription.html
+++ b/templates/inscription.html
@@ -19,6 +19,12 @@ <h1>Inscription {{ self.inscription_number }} (unstable)</h1>
 <dl>
   <dt>id</dt>
   <dd class=monospace>{{ self.inscription_id }}</dd>
+%% if let Some(metadata) = self.inscription.metadata() {
+  <dt>metadata</dt>
+  <dd>
+    {{ Trusted(MetadataHtml(&metadata)) }}
+  </dd>
+%% }
 %% if let Some(parent) = &self.parent {
   <dt>parent</dt>
   <dd><a class=monospace href=/inscription/{{ parent }}>{{ parent }}</a></dd>

From 12cdd560c452744ce3f41a4d2593cf82ff8117b2 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 11:22:48 -0700
Subject: [PATCH 02/13] Update docs

---
 docs/src/inscriptions/metadata.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/src/inscriptions/metadata.md b/docs/src/inscriptions/metadata.md
index fb03357fe7..a35025203f 100644
--- a/docs/src/inscriptions/metadata.md
+++ b/docs/src/inscriptions/metadata.md
@@ -2,8 +2,8 @@ Metadata
 ========
 
 Inscriptions may include CBOR metadata, stored as data pushes in fields with
-tag `5`. Tapscript data pushes are limited to 520 bytes. Metadata longer than
-520 bytes may be split into multiple tag `5` fields, which will then be
+tag `5`. Since data pushes are limited to 520 bytes, metadata longer than 520
+bytes must be split into multiple tag `5` fields, which will then be
 concatinated before decoding.
 
 Metadata is human readable, and all metadata will be displayed to the user with
@@ -18,9 +18,18 @@ Metadata is rendered to HTML for display as follows:
 - Objects are rendered as `<dl>` tags, with every key wrapped in `<dt>` tags,
   and every value wrapped in `<dd>` tags.
 
+CBOR is a complex spec with many different data types, and multiple ways of
+representing the same piece of data. Exotic data types, such as tags, floats,
+and bignums, may fail to display correctly or at all. Contributions to `ord` to
+remedy this are welcome.
+
 Example
 -------
 
+Since CBOR is not human readable, in these examples it is represented as JSON.
+Keep in mind that this is *only* for these examples, and JSON metadata will
+*not* be displayed correctly.
+
 The metadata `{"foo":"bar","baz":[null,true,false,0]}` would be included in an inscription as:
 
 ```

From c67fa907c9e66d1ac964300af3aa6623f6187862 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 11:28:53 -0700
Subject: [PATCH 03/13] Sort inscribe arguments

---
 src/subcommand/wallet/inscribe.rs | 48 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/subcommand/wallet/inscribe.rs b/src/subcommand/wallet/inscribe.rs
index 737e262910..585519e94b 100644
--- a/src/subcommand/wallet/inscribe.rs
+++ b/src/subcommand/wallet/inscribe.rs
@@ -36,17 +36,33 @@ struct ParentInfo {
 
 #[derive(Debug, Parser)]
 pub(crate) struct Inscribe {
-  #[arg(long, help = "Inscribe <SATPOINT>.")]
-  pub(crate) satpoint: Option<SatPoint>,
-  #[arg(long, help = "Use fee rate of <FEE_RATE> sats/vB.")]
-  pub(crate) fee_rate: FeeRate,
+  #[arg(
+    long,
+    help = "Include CBOR in file at <METADATA> as inscription metadata",
+    conflicts_with = "json_metadata"
+  )]
+  pub(crate) cbor_metadata: Option<PathBuf>,
   #[arg(
     long,
     help = "Use <COMMIT_FEE_RATE> sats/vbyte for commit transaction.\nDefaults to <FEE_RATE> if unset."
   )]
   pub(crate) commit_fee_rate: Option<FeeRate>,
+  #[arg(long, help = "Send inscription to <DESTINATION>.")]
+  pub(crate) destination: Option<Address<NetworkUnchecked>>,
+  #[arg(long, help = "Don't sign or broadcast transactions.")]
+  pub(crate) dry_run: bool,
+  #[arg(long, help = "Use fee rate of <FEE_RATE> sats/vB.")]
+  pub(crate) fee_rate: FeeRate,
   #[arg(help = "Inscribe sat with contents of <FILE>.")]
   pub(crate) file: PathBuf,
+  #[arg(
+    long,
+    help = "Include JSON in file at <METADATA> convered to CBOR as inscription metadata",
+    conflicts_with = "cbor_metadata"
+  )]
+  pub(crate) json_metadata: Option<PathBuf>,
+  #[clap(long, help = "Set inscription metaprotocol to <METAPROTOCOL>.")]
+  pub(crate) metaprotocol: Option<String>,
   #[arg(long, help = "Do not back up recovery key.")]
   pub(crate) no_backup: bool,
   #[arg(
@@ -54,33 +70,17 @@ pub(crate) struct Inscribe {
     help = "Do not check that transactions are equal to or below the MAX_STANDARD_TX_WEIGHT of 400,000 weight units. Transactions over this limit are currently nonstandard and will not be relayed by bitcoind in its default configuration. Do not use this flag unless you understand the implications."
   )]
   pub(crate) no_limit: bool,
-  #[arg(long, help = "Don't sign or broadcast transactions.")]
-  pub(crate) dry_run: bool,
-  #[arg(long, help = "Send inscription to <DESTINATION>.")]
-  pub(crate) destination: Option<Address<NetworkUnchecked>>,
+  #[clap(long, help = "Make inscription a child of <PARENT>.")]
+  pub(crate) parent: Option<InscriptionId>,
   #[arg(
     long,
     help = "Amount of postage to include in the inscription. Default `10000sat`."
   )]
   pub(crate) postage: Option<Amount>,
-  #[arg(
-    long,
-    help = "Include CBOR in file at <METADATA> as inscription metadata",
-    conflicts_with = "json_metadata"
-  )]
-  pub(crate) cbor_metadata: Option<PathBuf>,
-  #[arg(
-    long,
-    help = "Include JSON in file at <METADATA> convered to CBOR as inscription metadata",
-    conflicts_with = "cbor_metadata"
-  )]
-  pub(crate) json_metadata: Option<PathBuf>,
-  #[clap(long, help = "Make inscription a child of <PARENT>.")]
-  pub(crate) parent: Option<InscriptionId>,
   #[clap(long, help = "Allow reinscription.")]
   pub(crate) reinscribe: bool,
-  #[clap(long, help = "Set inscription metaprotocol to <METAPROTOCOL>.")]
-  pub(crate) metaprotocol: Option<String>,
+  #[arg(long, help = "Inscribe <SATPOINT>.")]
+  pub(crate) satpoint: Option<SatPoint>,
 }
 
 impl Inscribe {

From fde83c331e27eaf173359cf7e3c6adf1c0d3ba8f Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 11:48:35 -0700
Subject: [PATCH 04/13] Add tests

---
 src/inscription.rs                | 97 ++++++++++++++++++++++++++++++-
 src/subcommand/wallet/inscribe.rs | 19 ++++++
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/inscription.rs b/src/inscription.rs
index dc98a0d681..b89820ea25 100644
--- a/src/inscription.rs
+++ b/src/inscription.rs
@@ -212,7 +212,7 @@ mod tests {
   use super::*;
 
   #[test]
-  fn reveal_script_chunks_data() {
+  fn reveal_script_chunks_body() {
     assert_eq!(
       inscription("foo", [])
         .append_reveal_script(script::Builder::new())
@@ -262,6 +262,64 @@ mod tests {
     );
   }
 
+  #[test]
+  fn reveal_script_chunks_metadata() {
+    assert_eq!(
+      Inscription {
+        metadata: None,
+        ..Default::default()
+      }
+      .append_reveal_script(script::Builder::new())
+      .instructions()
+      .count(),
+      4
+    );
+
+    assert_eq!(
+      Inscription {
+        metadata: Some(Vec::new()),
+        ..Default::default()
+      }
+      .append_reveal_script(script::Builder::new())
+      .instructions()
+      .count(),
+      4
+    );
+
+    assert_eq!(
+      Inscription {
+        metadata: Some(vec![0; 1]),
+        ..Default::default()
+      }
+      .append_reveal_script(script::Builder::new())
+      .instructions()
+      .count(),
+      6
+    );
+
+    assert_eq!(
+      Inscription {
+        metadata: Some(vec![0; 520]),
+        ..Default::default()
+      }
+      .append_reveal_script(script::Builder::new())
+      .instructions()
+      .count(),
+      6
+    );
+
+    assert_eq!(
+      Inscription {
+        metadata: Some(vec![0; 521]),
+        ..Default::default()
+      }
+      .append_reveal_script(script::Builder::new())
+      .instructions()
+      .count(),
+      8
+    );
+  }
+
   #[test]
   fn inscription_with_no_parent_field_has_no_parent() {
     assert!(Inscription {
@@ -411,4 +469,41 @@ mod tests {
       0x04030201,
     );
   }
+
+  #[test]
+  fn metadata_function_decodes_metadata() {
+    assert_eq!(
+      Inscription {
+        metadata: Some(vec![0x44, 0, 1, 2, 3]),
+        ..Default::default()
+      }
+      .metadata()
+      .unwrap(),
+      Value::Bytes(vec![0, 1, 2, 3]),
+    );
+  }
+
+  #[test]
+  fn metadata_function_returns_none_if_no_metadata() {
+    assert_eq!(
+      Inscription {
+        metadata: None,
+        ..Default::default()
+      }
+      .metadata(),
+      None,
+    );
+  }
+
+  #[test]
+  fn metadata_function_returns_none_if_metadata_fails_to_parse() {
+    assert_eq!(
+      Inscription {
+        metadata: Some(vec![0x44]),
+        ..Default::default()
+      }
+      .metadata(),
+      None,
+    );
+  }
 }
diff --git a/src/subcommand/wallet/inscribe.rs b/src/subcommand/wallet/inscribe.rs
index 585519e94b..c96d4e6c91 100644
--- a/src/subcommand/wallet/inscribe.rs
+++ b/src/subcommand/wallet/inscribe.rs
@@ -977,4 +977,23 @@ mod tests {
 
     assert!(reveal_tx.size() >= MAX_STANDARD_TX_WEIGHT as usize);
   }
+
+  #[test]
+  fn cbor_and_json_metadata_flags_conflict() {
+    assert_regex_match!(
+      Arguments::try_parse_from([
+        "ord",
+        "wallet",
+        "inscribe",
+        "--cbor-metadata",
+        "foo",
+        "--json-metadata",
+        "bar",
+        "baz",
+      ])
+      .unwrap_err()
+      .to_string(),
+      ".*--cbor-metadata.*cannot be used with.*--json-metadata.*"
+    );
+  }
 }

From f7ecd1ca0690b216c775fb23ca38adb950e05809 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 11:50:11 -0700
Subject: [PATCH 05/13] Test float metadata

---
 src/templates/metadata.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/templates/metadata.rs b/src/templates/metadata.rs
index ed48fe3c74..29245ad44a 100644
--- a/src/templates/metadata.rs
+++ b/src/templates/metadata.rs
@@ -82,6 +82,11 @@ mod tests {
     );
   }
 
+  #[test]
+  fn float() {
+    assert_eq!(MetadataHtml(&Value::Float(0.5)).to_string(), "0.5");
+  }
+
   #[test]
   fn array() {
     assert_eq!(

From 3d263547770eaf44656c86bdee230b177a762f3e Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 12:12:26 -0700
Subject: [PATCH 06/13] Add more tests

---
 src/lib.rs                        |  2 +-
 src/subcommand/wallet/inscribe.rs |  8 ++-
 tests/wallet/inscribe.rs          | 94 +++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index a4a468aa0d..8b8df73161 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -57,7 +57,7 @@ use {
     ffi::OsString,
     fmt::{self, Display, Formatter},
     fs::{self, File},
-    io,
+    io::{self, Cursor},
     net::{TcpListener, ToSocketAddrs},
     ops::{Add, AddAssign, Sub},
     path::{Path, PathBuf},
diff --git a/src/subcommand/wallet/inscribe.rs b/src/subcommand/wallet/inscribe.rs
index c96d4e6c91..85b59c2bfe 100644
--- a/src/subcommand/wallet/inscribe.rs
+++ b/src/subcommand/wallet/inscribe.rs
@@ -86,9 +86,13 @@ pub(crate) struct Inscribe {
 impl Inscribe {
   pub(crate) fn run(self, options: Options) -> SubcommandResult {
     let metadata = if let Some(path) = self.cbor_metadata {
-      Some(fs::read(path)?)
+      let cbor = fs::read(path)?;
+      let _value: Value = ciborium::from_reader(Cursor::new(cbor.clone()))
+        .context("failed to parse CBOR metadata")?;
+      Some(cbor)
     } else if let Some(path) = self.json_metadata {
-      let value: serde_json::Value = serde_json::from_reader(File::open(path)?)?;
+      let value: serde_json::Value =
+        serde_json::from_reader(File::open(path)?).context("failed to parse JSON metadata")?;
       let mut cbor = Vec::new();
       ciborium::into_writer(&value, &mut cbor)?;
       Some(cbor)
diff --git a/tests/wallet/inscribe.rs b/tests/wallet/inscribe.rs
index 4f283df1cb..e37edc5ea3 100644
--- a/tests/wallet/inscribe.rs
+++ b/tests/wallet/inscribe.rs
@@ -657,3 +657,97 @@ fn try_reinscribe_without_flag() {
   ))
   .run_and_extract_stdout();
 }
+
+#[test]
+fn no_metadata_appears_on_inscription_page_if_no_metadata_is_passed() {
+  let rpc_server = test_bitcoincore_rpc::spawn();
+  create_wallet(&rpc_server);
+  rpc_server.mine_blocks(1);
+
+  let Inscribe { inscription, .. } =
+    CommandBuilder::new("wallet inscribe --fee-rate 1 content.png")
+      .write("content.png", [1; 520])
+      .rpc_server(&rpc_server)
+      .run_and_deserialize_output();
+
+  rpc_server.mine_blocks(1);
+
+  let ord_server = TestServer::spawn_with_args(&rpc_server, &[]);
+
+  assert!(!ord_server
+    .request(format!("/inscription/{inscription}"),)
+    .text()
+    .unwrap()
+    .contains("metadata"));
+}
+
+#[test]
+fn json_metadata_appears_on_inscription_page() {
+  let rpc_server = test_bitcoincore_rpc::spawn();
+  create_wallet(&rpc_server);
+  rpc_server.mine_blocks(1);
+
+  let Inscribe { inscription, .. } =
+    CommandBuilder::new("wallet inscribe --fee-rate 1 --json-metadata metadata.json content.png")
+      .write("content.png", [1; 520])
+      .write("metadata.json", r#"{"foo": "bar", "baz": 1}"#)
+      .rpc_server(&rpc_server)
+      .run_and_deserialize_output();
+
+  rpc_server.mine_blocks(1);
+
+  let ord_server = TestServer::spawn_with_args(&rpc_server, &[]);
+
+  ord_server.assert_response_regex(
+    format!("/inscription/{inscription}"),
+    ".*<dt>metadata</dt>.*<dl><dt>foo</dt><dd>bar</dd><dt>baz</dt><dd>1</dd></dl>.*",
+  );
+}
+
+#[test]
+fn cbor_metadata_appears_on_inscription_page() {
+  let rpc_server = test_bitcoincore_rpc::spawn();
+  create_wallet(&rpc_server);
+  rpc_server.mine_blocks(1);
+
+  let Inscribe { inscription, .. } =
+    CommandBuilder::new("wallet inscribe --fee-rate 1 --cbor-metadata metadata.cbor content.png")
+      .write("content.png", [1; 520])
+      .write(
+        "metadata.cbor",
+        [
+          0xA2, 0x63, b'f', b'o', b'o', 0x63, b'b', b'a', b'r', 0x63, b'b', b'a', b'z', 0x01,
+        ],
+      )
+      .rpc_server(&rpc_server)
+      .run_and_deserialize_output();
+
+  rpc_server.mine_blocks(1);
+
+  let ord_server = TestServer::spawn_with_args(&rpc_server, &[]);
+
+  ord_server.assert_response_regex(
+    format!("/inscription/{inscription}"),
+    ".*<dt>metadata</dt>.*<dl><dt>foo</dt><dd>bar</dd><dt>baz</dt><dd>1</dd></dl>.*",
+  );
+}
+
+#[test]
+fn error_message_when_parsing_json_metadata_is_reasonable() {
+  CommandBuilder::new("wallet inscribe --fee-rate 1 --json-metadata metadata.json content.png")
+    .write("content.png", [1; 520])
+    .write("metadata.json", "{")
+    .stderr_regex(".*failed to parse JSON metadata.*")
+    .expected_exit_code(1)
+    .run_and_extract_stdout();
+}
+
+#[test]
+fn error_message_when_parsing_cbor_metadata_is_reasonable() {
+  CommandBuilder::new("wallet inscribe --fee-rate 1 --cbor-metadata metadata.cbor content.png")
+    .write("content.png", [1; 520])
+    .write("metadata.cbor", [0x61])
+    .stderr_regex(".*failed to parse CBOR metadata.*")
+    .expected_exit_code(1)
+    .run_and_extract_stdout();
+}

From ad48132f712240c0a23aae39f827ce518630b86c Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 12:16:32 -0700
Subject: [PATCH 07/13] Add more tests

---
 src/envelope.rs | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/envelope.rs b/src/envelope.rs
index 6026507919..8d865b0a5d 100644
--- a/src/envelope.rs
+++ b/src/envelope.rs
@@ -705,4 +705,35 @@ mod tests {
       }],
     );
   }
+
+  #[test]
+  fn metadata_is_parse_correctly() {
+    assert_eq!(
+      parse(&[envelope(&[b"ord", &[5], &[]])]),
+      vec![ParsedEnvelope {
+        payload: Inscription {
+          metadata: Some(vec![]),
+          ..Default::default()
+        },
+        input: 0,
+        offset: 0,
+      }]
+    );
+  }
+
+  #[test]
+  fn metadata_is_parse_correctly_from_chunks() {
+    assert_eq!(
+      parse(&[envelope(&[b"ord", &[5], &[0], &[5], &[1]])]),
+      vec![ParsedEnvelope {
+        payload: Inscription {
+          metadata: Some(vec![0, 1]),
+          duplicate_field: true,
+          ..Default::default()
+        },
+        input: 0,
+        offset: 0,
+      }]
+    );
+  }
 }

From fef1c66a16cb6f8e9d662cc552c03c2e66be6670 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 12:19:15 -0700
Subject: [PATCH 08/13] Update display info

---
 docs/src/inscriptions/metadata.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/src/inscriptions/metadata.md b/docs/src/inscriptions/metadata.md
index a35025203f..1ddca4fc1f 100644
--- a/docs/src/inscriptions/metadata.md
+++ b/docs/src/inscriptions/metadata.md
@@ -12,11 +12,15 @@ displayed, and make metadata concise and attractive.
 
 Metadata is rendered to HTML for display as follows:
 
-- `null`, `true`, `false`, numbers, and strings are rendered as plain text.
+- `null`, `true`, `false`, numbers, floats, and strings are rendered as plain
+  text.
+- Byte strings are rendered as uppercase hexadecimal.
 - Arrays are rendered as `<ul>` tags, with every element wrapped in `<li>`
   tags.
-- Objects are rendered as `<dl>` tags, with every key wrapped in `<dt>` tags,
-  and every value wrapped in `<dd>` tags.
+- Maps are rendered as `<dl>` tags, with every key wrapped in `<dt>` tags, and
+  every value wrapped in `<dd>` tags.
+- Tags are rendered as the tag , enclosed in a `<sup>` tag, followed by the
+  value.
 
 CBOR is a complex spec with many different data types, and multiple ways of
 representing the same piece of data. Exotic data types, such as tags, floats,

From 1760a1568d49fa016d458cbdc79fc4cf4386441f Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 12:20:45 -0700
Subject: [PATCH 09/13] Update spec

---
 docs/src/inscriptions/metadata.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/inscriptions/metadata.md b/docs/src/inscriptions/metadata.md
index 1ddca4fc1f..dcf9572eb7 100644
--- a/docs/src/inscriptions/metadata.md
+++ b/docs/src/inscriptions/metadata.md
@@ -23,9 +23,9 @@ Metadata is rendered to HTML for display as follows:
   value.
 
 CBOR is a complex spec with many different data types, and multiple ways of
-representing the same piece of data. Exotic data types, such as tags, floats,
-and bignums, may fail to display correctly or at all. Contributions to `ord` to
-remedy this are welcome.
+representing the same data. Exotic data types, such as tags, floats, and
+bignums, and incoding such as indefinite values, may fail to display correctly
+or at all. Contributions to `ord` to remedy this are welcome.
 
 Example
 -------

From 44fbe3522fadf483b731a767e6c0c9f189119a7e Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 12:23:07 -0700
Subject: [PATCH 10/13] Fix spelling

---
 docs/src/inscriptions/metadata.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/src/inscriptions/metadata.md b/docs/src/inscriptions/metadata.md
index dcf9572eb7..40cc122ef5 100644
--- a/docs/src/inscriptions/metadata.md
+++ b/docs/src/inscriptions/metadata.md
@@ -4,7 +4,7 @@ Metadata
 Inscriptions may include CBOR metadata, stored as data pushes in fields with
 tag `5`. Since data pushes are limited to 520 bytes, metadata longer than 520
 bytes must be split into multiple tag `5` fields, which will then be
-concatinated before decoding.
+concatenated before decoding.
 
 Metadata is human readable, and all metadata will be displayed to the user with
 its inscription. Inscribers are encouraged to consider how metadata will be
@@ -24,7 +24,7 @@ Metadata is rendered to HTML for display as follows:
 
 CBOR is a complex spec with many different data types, and multiple ways of
 representing the same data. Exotic data types, such as tags, floats, and
-bignums, and incoding such as indefinite values, may fail to display correctly
+bignums, and encoding such as indefinite values, may fail to display correctly
 or at all. Contributions to `ord` to remedy this are welcome.
 
 Example

From 6707147776078c982ca086370c5df5672e837b77 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 12:26:20 -0700
Subject: [PATCH 11/13] Fix test name

---
 src/envelope.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/envelope.rs b/src/envelope.rs
index 8d865b0a5d..7743c08fb4 100644
--- a/src/envelope.rs
+++ b/src/envelope.rs
@@ -707,7 +707,7 @@ mod tests {
   }
 
   #[test]
-  fn metadata_is_parse_correctly() {
+  fn metadata_is_parsed_correctly() {
     assert_eq!(
       parse(&[envelope(&[b"ord", &[5], &[]])]),
       vec![ParsedEnvelope {
@@ -722,7 +722,7 @@ mod tests {
   }
 
   #[test]
-  fn metadata_is_parse_correctly_from_chunks() {
+  fn metadata_is_parsed_correctly_from_chunks() {
     assert_eq!(
       parse(&[envelope(&[b"ord", &[5], &[0], &[5], &[1]])]),
       vec![ParsedEnvelope {

From 6f978c83328e32577c7f043c228942501456f7ba Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 12:35:18 -0700
Subject: [PATCH 12/13] Link cbor spec

---
 docs/src/inscriptions/metadata.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/src/inscriptions/metadata.md b/docs/src/inscriptions/metadata.md
index 40cc122ef5..758e3558a7 100644
--- a/docs/src/inscriptions/metadata.md
+++ b/docs/src/inscriptions/metadata.md
@@ -1,10 +1,10 @@
 Metadata
 ========
 
-Inscriptions may include CBOR metadata, stored as data pushes in fields with
-tag `5`. Since data pushes are limited to 520 bytes, metadata longer than 520
-bytes must be split into multiple tag `5` fields, which will then be
-concatenated before decoding.
+Inscriptions may include [CBOR](https://cbor.io/) metadata, stored as data
+pushes in fields with tag `5`. Since data pushes are limited to 520 bytes,
+metadata longer than 520 bytes must be split into multiple tag `5` fields,
+which will then be concatenated before decoding.
 
 Metadata is human readable, and all metadata will be displayed to the user with
 its inscription. Inscribers are encouraged to consider how metadata will be

From 2e55463434b0fedd51c0938facdbd8eedde7a560 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Tue, 3 Oct 2023 12:37:46 -0700
Subject: [PATCH 13/13] Fix spelling

---
 src/envelope.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/envelope.rs b/src/envelope.rs
index 7743c08fb4..3221648c2d 100644
--- a/src/envelope.rs
+++ b/src/envelope.rs
@@ -35,7 +35,7 @@ fn remove_field(fields: &mut BTreeMap<&[u8], Vec<&[u8]>>, field: &[u8]) -> Optio
   }
 }
 
-fn remove_and_concatinate_field(
+fn remove_and_concatenate_field(
   fields: &mut BTreeMap<&[u8], Vec<&[u8]>>,
   field: &[u8],
 ) -> Option<Vec<u8>> {
@@ -72,7 +72,7 @@ impl From<RawEnvelope> for ParsedEnvelope {
     let content_type = remove_field(&mut fields, &CONTENT_TYPE_TAG);
     let parent = remove_field(&mut fields, &PARENT_TAG);
     let metaprotocol = remove_field(&mut fields, &METAPROTOCOL_TAG);
-    let metadata = remove_and_concatinate_field(&mut fields, &METADATA_TAG);
+    let metadata = remove_and_concatenate_field(&mut fields, &METADATA_TAG);
 
     let unrecognized_even_field = fields
       .keys()