diff --git a/books/architecture/src/appendix/crates.md b/books/architecture/src/appendix/crates.md
index d63576ab..580074c1 100644
--- a/books/architecture/src/appendix/crates.md
+++ b/books/architecture/src/appendix/crates.md
@@ -50,7 +50,7 @@ cargo doc --open --package cuprate-blockchain
 |-------|--------------|---------|
 | [`cuprate-types`](https://doc.cuprate.org/cuprate_types) | [`types/types/`](https://github.com/Cuprate/cuprate/tree/main/types/types) | General types used throughout Cuprate |
 | [`cuprate-hex`](https://doc.cuprate.org/cuprate_hex) | [`types/hex/`](https://github.com/Cuprate/cuprate/tree/main/types/hex) | Hexadecimal data types |
-| [`cuprate-fixed-bytes`](https://doc.cuprate.org/cuprate_fixed_bytes) | [`net/fixed-bytes/`](https://github.com/Cuprate/cuprate/tree/main/net/fixed-bytes) | Fixed byte containers backed by `byte::Byte`
+| [`cuprate-fixed-bytes`](https://doc.cuprate.org/cuprate_fixed_bytes) | [`types/fixed-bytes/`](https://github.com/Cuprate/cuprate/tree/main/net/fixed-bytes) | Fixed byte containers backed by `byte::Byte`
 
 ## RPC
 | Crate | In-tree path | Purpose |
diff --git a/rpc/types/src/defaults.rs b/rpc/types/src/defaults.rs
index 8badde73..def5df44 100644
--- a/rpc/types/src/defaults.rs
+++ b/rpc/types/src/defaults.rs
@@ -8,7 +8,6 @@
 //! `height`, it will use [`default_height`] to fill that in.
 
 //---------------------------------------------------------------------------------------------------- Import
-// use cuprate_types::hex::Hex;
 
 //---------------------------------------------------------------------------------------------------- TODO
 /// Default [`bool`] type used in request/response types, `false`.
@@ -29,12 +28,6 @@ pub(crate) const fn default_string() -> String {
     String::new()
 }
 
-// /// Default [`Hex`] type used in request/response types.
-// #[inline]
-// pub(crate) const fn default_hex<const N: usize>() -> Hex<N> {
-//     Hex([0; N])
-// }
-
 /// Default block height used in request/response types.
 #[inline]
 pub(crate) const fn default_height() -> u64 {
diff --git a/types/types/src/json/block.rs b/types/types/src/json/block.rs
index e9b325be..1871b69b 100644
--- a/types/types/src/json/block.rs
+++ b/types/types/src/json/block.rs
@@ -32,13 +32,13 @@ impl From<block::Block> for Block {
             unreachable!("input is a miner tx, this should never fail");
         };
 
-        let tx_hashes = b.transactions.into_iter().map(Hex::<32>).collect();
+        let tx_hashes = b.transactions.into_iter().map(Hex).collect();
 
         Self {
             major_version: b.header.hardfork_version,
             minor_version: b.header.hardfork_signal,
             timestamp: b.header.timestamp,
-            prev_id: Hex::<32>(b.header.previous),
+            prev_id: Hex(b.header.previous),
             nonce: b.header.nonce,
             miner_tx,
             tx_hashes,
@@ -99,15 +99,13 @@ impl TryFrom<transaction::Transaction> for MinerTransaction {
                     let target = match o.view_tag {
                         Some(view_tag) => {
                             let tagged_key = TaggedKey {
-                                key: Hex::<32>(o.key.0),
-                                view_tag: Hex::<1>([view_tag]),
+                                key: Hex(o.key.0),
+                                view_tag: Hex([view_tag]),
                             };
 
                             Target::TaggedKey { tagged_key }
                         }
-                        None => Target::Key {
-                            key: Hex::<32>(o.key.0),
-                        },
+                        None => Target::Key { key: Hex(o.key.0) },
                     };
 
                     Output { amount, target }
@@ -220,7 +218,7 @@ mod test {
             major_version: 1,
             minor_version: 0,
             timestamp: 1415690591,
-            prev_id: Hex::<32>(hex!(
+            prev_id: Hex(hex!(
                 "e97a0ab6307de9b9f9a9872263ef3e957976fb227eb9422c6854e989e5d5d34c"
             )),
             nonce: 2147484616,
@@ -235,25 +233,25 @@ mod test {
                       Output {
                         amount: 47019296802,
                         target: Target::Key {
-                          key: Hex::<32>(hex!("3c1dcbf5b485987ecef4596bb700e32cbc7bd05964e3888ffc05f8a46bf5fc33")),
+                          key: Hex(hex!("3c1dcbf5b485987ecef4596bb700e32cbc7bd05964e3888ffc05f8a46bf5fc33")),
                         }
                       },
                       Output {
                         amount: 200000000000,
                         target: Target::Key {
-                          key: Hex::<32>(hex!("5810afc7a1b01a1c913eb6aab15d4a851cbc4a8cf0adf90bb80ac1a7ca9928aa")),
+                          key: Hex(hex!("5810afc7a1b01a1c913eb6aab15d4a851cbc4a8cf0adf90bb80ac1a7ca9928aa")),
                         }
                       },
                       Output {
                         amount: 3000000000000,
                         target: Target::Key {
-                          key: Hex::<32>(hex!("520f49c5f2ce8456dc1a565f35ed3a5ccfff3a1210b340870a57d2749a81a2df")),
+                          key: Hex(hex!("520f49c5f2ce8456dc1a565f35ed3a5ccfff3a1210b340870a57d2749a81a2df")),
                         }
                       },
                       Output {
                         amount: 10000000000000,
                         target: Target::Key {
-                          key: Hex::<32>(hex!("44d7705e62c76c2e349a474df6724aa1d9932092002b03a94f9c19d9d12b9427")),
+                          key: Hex(hex!("44d7705e62c76c2e349a474df6724aa1d9932092002b03a94f9c19d9d12b9427")),
                         }
                       }
                     ],
@@ -279,7 +277,7 @@ mod test {
             major_version: 16,
             minor_version: 16,
             timestamp: 1727293028,
-            prev_id: Hex::<32>(hex!(
+            prev_id: Hex(hex!(
                 "41b56c273d69def3294e56179de71c61808042d54c1e085078d21dbe99e81b6f"
             )),
             nonce: 311,
@@ -294,10 +292,10 @@ mod test {
                         amount: 601012280000,
                         target: Target::TaggedKey {
                             tagged_key: TaggedKey {
-                                key: Hex::<32>(hex!(
+                                key: Hex(hex!(
                                 "8c0b16c6df02b9944b49f375d96a958a0fc5431c048879bb5bf25f64a1163b9e"
                             )),
-                                view_tag: Hex::<1>(hex!("88")),
+                                view_tag: Hex(hex!("88")),
                             },
                         },
                     }],
@@ -310,43 +308,43 @@ mod test {
                 rct_signatures: MinerTransactionRctSignatures { r#type: 0 },
             },
             tx_hashes: vec![
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "eab76986a0cbcae690d8499f0f616f783fd2c89c6f611417f18011950dbdab2e"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "57b19aa8c2cdbb6836cf13dd1e321a67860965c12e4418f3c30f58c8899a851e"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "5340185432ab6b74fb21379f7e8d8f0e37f0882b2a7121fd7c08736f079e2edc"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "01dc6d31db56d68116f5294c1b4f80b33b048b5cdfefcd904f23e6c0de3daff5"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "c9fb6a2730678203948fef2a49fa155b63f35a3649f3d32ed405a6806f3bbd56"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "af965cdd2a2315baf1d4a3d242f44fe07b1fd606d5f4853c9ff546ca6c12a5af"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "97bc9e047d25fae8c14ce6ec882224e7b722f5e79b62a2602a6bacebdac8547b"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "28c46992eaf10dc0cceb313c30572d023432b7bd26e85e679bc8fe419533a7bf"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "c32e3acde2ff2885c9cc87253b40d6827d167dfcc3022c72f27084fd98788062"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "19e66a47f075c7cccde8a7b52803119e089e33e3a4847cace0bd1d17b0d22bab"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "8e8ac560e77a1ee72e82a5eb6887adbe5979a10cd29cb2c2a3720ce87db43a70"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "b7ff5141524b5cca24de6780a5dbfdf71e7de1e062fd85f557fb3b43b8e285dc"
                 )),
-                Hex::<32>(hex!(
+                Hex(hex!(
                     "f09df0f113763ef9b9a2752ac293b478102f7cab03ef803a3d9db7585aea8912"
                 )),
             ],
diff --git a/types/types/src/json/tx.rs b/types/types/src/json/tx.rs
index 8d80f5c7..cd758f18 100644
--- a/types/types/src/json/tx.rs
+++ b/types/types/src/json/tx.rs
@@ -109,7 +109,7 @@ impl From<transaction::Transaction> for Transaction {
                         let key = Key {
                             amount: amount.unwrap_or(0),
                             key_offsets,
-                            k_image: Hex::<32>(key_image.compress().0),
+                            k_image: Hex(key_image.compress().0),
                         };
 
                         Some(Input { key })
@@ -130,15 +130,13 @@ impl From<transaction::Transaction> for Transaction {
                     let target = match o.view_tag {
                         Some(view_tag) => {
                             let tagged_key = TaggedKey {
-                                key: Hex::<32>(o.key.0),
-                                view_tag: Hex::<1>([view_tag]),
+                                key: Hex(o.key.0),
+                                view_tag: Hex([view_tag]),
                             };
 
                             Target::TaggedKey { tagged_key }
                         }
-                        None => Target::Key {
-                            key: Hex::<32>(o.key.0),
-                        },
+                        None => Target::Key { key: Hex(o.key.0) },
                     };
 
                     Output { amount, target }
@@ -207,7 +205,7 @@ impl From<transaction::Transaction> for Transaction {
                     .base
                     .commitments
                     .into_iter()
-                    .map(|point| Hex::<32>(point.compress().0))
+                    .map(|point| Hex(point.compress().0))
                     .collect();
 
                 let rct_signatures = RctSignatures::NonCoinbase {
@@ -420,11 +418,11 @@ impl From<ringct::EncryptedAmount> for EcdhInfo {
     fn from(ea: ringct::EncryptedAmount) -> Self {
         match ea {
             ringct::EncryptedAmount::Original { amount, mask } => Self::Original {
-                amount: Hex::<32>(amount),
-                mask: Hex::<32>(mask),
+                amount: Hex(amount),
+                mask: Hex(mask),
             },
             ringct::EncryptedAmount::Compact { amount } => Self::Compact {
-                amount: Hex::<8>(amount),
+                amount: Hex(amount),
             },
         }
     }
@@ -474,7 +472,7 @@ mod test {
                         key: Key {
                             amount: 2865950000,
                             key_offsets: vec![0],
-                            k_image: Hex::<32>(hex!(
+                            k_image: Hex(hex!(
                                 "f1b0eeff62493ea78b2b7e843c278d6d5a7b09adf0cbc83560380d1fe397d6f3"
                             )),
                         },
@@ -483,7 +481,7 @@ mod test {
                         key: Key {
                             amount: 6000000000000,
                             key_offsets: vec![75146],
-                            k_image: Hex::<32>(hex!(
+                            k_image: Hex(hex!(
                                 "3d289ab83c06e0948a460e836699a33fe9c300b2448c0f2de0e3b40c13d9bd78"
                             )),
                         },
@@ -492,7 +490,7 @@ mod test {
                         key: Key {
                             amount: 3000000000000,
                             key_offsets: vec![49742],
-                            k_image: Hex::<32>(hex!(
+                            k_image: Hex(hex!(
                                 "52a32e6ecadcce76c11262eda8f7265c098b3da1f6e27ae8c9656636faf51ae4"
                             )),
                         },
@@ -502,7 +500,7 @@ mod test {
                     Output {
                         amount: 29220020000,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "f9da453f7cd5248e109de3216208eb9ec8617b0739450405de582f09b7e3fc47"
                             )),
                         },
@@ -510,7 +508,7 @@ mod test {
                     Output {
                         amount: 400000000000,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "c31ce6d52fae900ffab9f30b036bbdea0b9442b589cbe24c2e071ddb8291da14"
                             )),
                         },
@@ -518,7 +516,7 @@ mod test {
                     Output {
                         amount: 400000000000,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "bd570e3805c0198c92f9a24d8f12e9dbe88570196efd176b7f186ade904803f4"
                             )),
                         },
@@ -526,7 +524,7 @@ mod test {
                     Output {
                         amount: 1000000000000,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "84d1ba528dfc2e2ff29b3840fc3ae1c87ae5f750e582b78c4161a6bdb6a4717a"
                             )),
                         },
@@ -534,7 +532,7 @@ mod test {
                     Output {
                         amount: 7000000000000,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "993fd478527fd3e790fd3f5a0d9a3a39bebe72598cc81cb9936e08dea7e5fb0f"
                             )),
                         },
@@ -548,9 +546,9 @@ mod test {
                 ],
             },
             signatures: vec![
-              Hex::<64>(hex!("318755c67c5d3379b0958a047f5439cf43dd251f64b6314c84b2edbf240d950abbeaad13233700e6b6c59bea178c6fbaa246b8fd84b5caf94d1affd520e6770b")),
-              Hex::<64>(hex!("a47e6a65e907e49442828db46475ecdf27f3c472f24688423ac97f0efbd8b90b164ed52c070f7a2a95b95398814b19c0befd14a4aab5520963daf3482604df01")),
-              Hex::<64>(hex!("fa6981c969c2a1b9d330a8901d2ef7def7f3ade8d9fba444e18e7e349e286a035ae1729a76e01bbbb3ccd010502af6c77049e3167cf108be69706a8674b0c508"))
+              Hex(hex!("318755c67c5d3379b0958a047f5439cf43dd251f64b6314c84b2edbf240d950abbeaad13233700e6b6c59bea178c6fbaa246b8fd84b5caf94d1affd520e6770b")),
+              Hex(hex!("a47e6a65e907e49442828db46475ecdf27f3c472f24688423ac97f0efbd8b90b164ed52c070f7a2a95b95398814b19c0befd14a4aab5520963daf3482604df01")),
+              Hex(hex!("fa6981c969c2a1b9d330a8901d2ef7def7f3ade8d9fba444e18e7e349e286a035ae1729a76e01bbbb3ccd010502af6c77049e3167cf108be69706a8674b0c508"))
             ],
         };
 
@@ -571,7 +569,7 @@ mod test {
                         key_offsets: vec![
                             8608351, 301575, 15985, 56460, 28593, 9238, 1709, 170, 369, 1874, 681,
                         ],
-                        k_image: Hex::<32>(hex!(
+                        k_image: Hex(hex!(
                             "86e1cc68d3970757c4a265a7c28c3a39fe230851f2d8a14c5916a6aa60dbc892"
                         )),
                     },
@@ -580,7 +578,7 @@ mod test {
                     Output {
                         amount: 0,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "f21fd68e011df2e544a3d33221172baf921a121c85d1a2190c42e81d5dd1830e"
                             )),
                         },
@@ -588,7 +586,7 @@ mod test {
                     Output {
                         amount: 0,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "64a3e54d80a729f69ae04f85db06dd26a96f3b05674f6927337a755a9cdaefeb"
                             )),
                         },
@@ -596,7 +594,7 @@ mod test {
                     Output {
                         amount: 0,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "ad2ccf74d2c99946af10cedc922a87c30a4b1c0d7a13143e71d31cd788b0c171"
                             )),
                         },
@@ -604,7 +602,7 @@ mod test {
                     Output {
                         amount: 0,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "e03d9b552a50734487ed0da40ba977f718c91a782fe85899debfd2c56ea3e551"
                             )),
                         },
@@ -612,7 +610,7 @@ mod test {
                     Output {
                         amount: 0,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "b312d502c1b71a10d9483fb816e17d27d0508b5b74c462e14dca52395a14a155"
                             )),
                         },
@@ -638,60 +636,60 @@ mod test {
                 txnFee: 86000000,
                 ecdhInfo: vec![
                     EcdhInfo::Original {
-                        mask: Hex::<32>(hex!(
+                        mask: Hex(hex!(
                             "95f1dcd5076d92d9592f1ad5d2e60e8b353c0048da1833db3d11634a9deff50f"
                         )),
-                        amount: Hex::<32>(hex!(
+                        amount: Hex(hex!(
                             "9386f5401e2577e66dea290aae981a85f75ab81d21cd8060b6a2070c0c3d4209"
                         )),
                     },
                     EcdhInfo::Original {
-                        mask: Hex::<32>(hex!(
+                        mask: Hex(hex!(
                             "9a3015d73ee53f40c4a194c725aa5cea4822b99442ddb94223a52e365e02f70b"
                         )),
-                        amount: Hex::<32>(hex!(
+                        amount: Hex(hex!(
                             "40b471293514f4399782abfe2968f5bb297a77b16b58261df7cffc60b68a5b04"
                         )),
                     },
                     EcdhInfo::Original {
-                        mask: Hex::<32>(hex!(
+                        mask: Hex(hex!(
                             "64b2b70d2e61fd4ac5c6d92f61d85dda1daf948853cc303a3a39baeeece41e08"
                         )),
-                        amount: Hex::<32>(hex!(
+                        amount: Hex(hex!(
                             "b388bdce5bd31493dae245af4dbfc8486d959ef28af4ad1c1338f43dd3bd5a01"
                         )),
                     },
                     EcdhInfo::Original {
-                        mask: Hex::<32>(hex!(
+                        mask: Hex(hex!(
                             "e8d8b9380c446cace527ea1864d69f524b2c6b8eaf08f0f6c36621e73de49d0a"
                         )),
-                        amount: Hex::<32>(hex!(
+                        amount: Hex(hex!(
                             "c74b47b823b7e5f2744e9643e4490f236eb9de006acd7bb8a32cca2f56223b06"
                         )),
                     },
                     EcdhInfo::Original {
-                        mask: Hex::<32>(hex!(
+                        mask: Hex(hex!(
                             "1ec895cc03e6831311a3ab6f86745312feec53de5aef1e1f204a984f082bff0c"
                         )),
-                        amount: Hex::<32>(hex!(
+                        amount: Hex(hex!(
                             "d16c02a92488cd7d5fdf3c461ff8f4f7e75a18644e810ddd55a153e79464af0a"
                         )),
                     },
                 ],
                 outPk: vec![
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "ff1a463fcb285d747df43612cc3bc925d4d27bebb08537b177a0dba960f90131"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "6b62f6ed7338cbf9b2639620400690676fa9d43aca93da4a9dc56d665a72b506"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "9363af049e5b0530fd77f884e84838efcabebf5fff57e2f00b49148c6415eafc"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "2fc11a581752a6465d59217e6a5841170de3ba96e27d2744ad280b5242efa9e7"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "56b6c2ca082d95600584ca429e6723816d4496cbf6f586cf1cfe2e0319224451"
                     )),
                 ],
@@ -699,188 +697,188 @@ mod test {
             rctsig_prunable: Some(RctSigPrunable::MlsagBulletproofs {
                 nbp: 1,
                 bp: vec![Bulletproof {
-                    A: Hex::<32>(hex!(
+                    A: Hex(hex!(
                         "4e3433b32bd6d349774eac4ad467e698125d9e0402d216609ff0f4cfc216c50c"
                     )),
-                    S: Hex::<32>(hex!(
+                    S: Hex(hex!(
                         "7f6d8c127e4138c6153954836b127694786b890a138bae684eb951fb0fbf9be4"
                     )),
-                    T1: Hex::<32>(hex!(
+                    T1: Hex(hex!(
                         "40ee0b2925d7555c17dd38bb69b80e1cfc05aa8b9dc2bd088c1361321a09d4f4"
                     )),
-                    T2: Hex::<32>(hex!(
+                    T2: Hex(hex!(
                         "1488d918c2acdd6ff9e8d5bf82a08599733b9084cdfb0f891c9254742f2ea258"
                     )),
-                    taux: Hex::<32>(hex!(
+                    taux: Hex(hex!(
                         "9b26002cff6e74e3da8ce59cadea4c8a0d93b9d4d94e6764031c21ecbac5f600"
                     )),
-                    mu: Hex::<32>(hex!(
+                    mu: Hex(hex!(
                         "a414b36b00a290c62a443282295f50f381a44197af5db74f518a1b77dd8c120a"
                     )),
                     L: vec![
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "d4c3360932332dd3cc407d857c6e759d7c29d10deede96a0649bba89fbdb0e04"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "33d7311748c6ee1fa92311513a3f32acf0bbcbd1c507e4378db19f108914f6c1"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "aeedddc3feaa374880a388a992e38027d97c8e0e3728fd536fb2f0a560f5f481"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "662e94760e3d51cf89a39db06c8f95e08b923ed97e883e9144d15f21e1639011"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "c07d35cb78309eec01052227df1967c0e0d553f6ca5d592f34bbeebcecdc78a8"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "9954f3a6c818fd5aed6fd7c94fdaf4f49d2159c47e31b953c3e44e11aa4c9943"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "a22d2b47f1a051daece177803252b976c33ac5e2a8c487afd89d61f3a08180f0"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "3ce357034185a6f540d00b2ab8229e64d2d6cad27a2b141d6f6e202307d959ae"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "5906da535fbd816292692880fe4630e9ed1dd2dc94495a4f7db080e18fd4a8e0"
                         )),
                     ],
                     R: vec![
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "0b40204226678fee886140e7c20e809165a58e1355101a2c5bdf7c797811ac21"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "94a1da201d9e85ad6ac564fe2e6a1fa62873d78e33a5931fd143ed165b360eba"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "fc458a6c42264f6c8890a386b7a68543a952ecc2b6239138b548c25d6bfa6c68"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "052da59d062001df5d95d3117deecb9b3175ed59a44aba9b92f84add748c1698"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "5aa7cf7545d4859a62903b29500449813a231a0c25cdb133a4780a9b0a411cd0"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "5366ad21b6b33b8f43aecfda087f0aee9cfdc2836e59f7721856058685965b39"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "960c4764aea3c0dff74c88728514da160bd79712cd50a948bd8b52d9569e69b1"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "6db5c54be77c08460e4581ee7709c0179108b46a55c3858e0897bd4f12e3e913"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "ffb4d75cab91763dc3e556fce046413382c84abe24615ada0605a43f8de88309"
                         )),
                     ],
-                    a: Hex::<32>(hex!(
+                    a: Hex(hex!(
                         "43bf84ef0f596d1d76990c5202261f0963dade1affc1eee92a0508f5ce8d2900"
                     )),
-                    b: Hex::<32>(hex!(
+                    b: Hex(hex!(
                         "747be0d98f642649d2925a459238ed13f65bd6f12019683d4ede505394341604"
                     )),
-                    t: Hex::<32>(hex!(
+                    t: Hex(hex!(
                         "8592adba69d884c48e52135909a9738eafae80e590ae245b1a9ca65eea3a8b0f"
                     )),
                 }],
                 MGs: vec![Mg {
                     ss: vec![
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "8a8838d965aa1bb49448c12ea1aabb680b393f5bf02e3b73874aa545cde6dc04"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "e16bf1d0c4c2639af6bed0c0205181b2a03bc5cdc22207906aac710acdd5170e"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "208d25cad34bcc9c49a5516102990814c75e0bbe2335b601880d9c6ce4fb400a"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "279a89826548b8b15ea342d892ca6f8bf9e6a5a14077a57edaa4fd676b0b9f0f"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "9edbd1d2082bad9dd9ca98baf82b4d70014dee720c758ed0944a9fb82ae55206"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "3314001eeec40a2e0ca83f48af1ade8b4139418da49e2c6d95aa3a1d4427de07"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "1837f42c1a4bd0747ed86c1e99bfe058031858c47ff4f066cfcdaf107499bf0f"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "963bd0ed98a01be7c847b393ad0c2c25c3052148d67126c12b25ec2239373005"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "e41e7dd0430ccbc17f717db7fa1720241ab4de24249c607b9f882143d266ff0e"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "95c4a4ec2756ec57caacb64f17a7e5306103f030dfb12dd53b42c72e68b6e60b"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "8ecfab987a8697c58f4b183620b2fa0e11972fa666b71c138e067621ab5d1703"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "2e070ae83ab7f01f91766c2fd6de425dc0f18ae4e34fdcb3ac18db4dfec77a0c"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "187cd1a318666e9f7a9f2f9d4eaf7c662c6162c5bc2be94219992f261f46b90b"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "97ca174ff4bcf1e5d139bf0ad85577b9c6247f9e4782cd69100e683bf2e3f80b"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "28eb6f60cfa35b52cbf74b7e68ce795ebfa0d3db6f00e69677fc98aef963bf05"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "6662186aa949465b7b2174d6da077ab8ffdddb710bdab42386e7d8ae20f1890d"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "577c9cf99480b0633121737756bcc7f4887fc7fdf3a9344c84578886e60d1404"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "2d241b48e63acc39c8c899f7c009fcbc09025ea1211930a338e193d17aed890a"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "7a3f489532743f117999a1b375789cd0863541cae0b8633e8cd4c7dedc740305"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "500c1033ca2b4b47c39e70a1c563553571e0e25a2e1fa984cb5ba08546bc4907"
                             )),
                         ],
                         [
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "82efb453a98454e07e8f4b367ee0db2f957e6222e720a69354fdf910fe5fe803"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "1c3204cf63c8ba3ebd817d603a4e5cadfa6a9af5999648eabff7605b5de8b306"
                             )),
                         ],
                     ],
-                    cc: Hex::<32>(hex!(
+                    cc: Hex(hex!(
                         "8b579f973b9395a175fb2fc1df7d66511166c606903a3c082b63fa831e833b00"
                     )),
                 }],
-                pseudoOuts: vec![Hex::<32>(hex!(
+                pseudoOuts: vec![Hex(hex!(
                     "bd6260cafa1afbe44d24cf7c42ac9e2b451424472eb1334b3c042e82196be0d7"
                 ))],
             }),
@@ -904,7 +902,7 @@ mod test {
                             21656060, 186727, 69935, 9151, 6868, 5611, 37323, 11548, 1080, 2867,
                             1193,
                         ],
-                        k_image: Hex::<32>(hex!(
+                        k_image: Hex(hex!(
                             "2969fedfe8eff9fe1aa29c73ea55e8a9080c25dc565d2703e4d2776991a158bd"
                         )),
                     },
@@ -913,7 +911,7 @@ mod test {
                     Output {
                         amount: 0,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "4a46669165c842dcc4529cb0ca7e34b47073a96d5b29862c9f052a6113ac4db6"
                             )),
                         },
@@ -921,7 +919,7 @@ mod test {
                     Output {
                         amount: 0,
                         target: Target::Key {
-                            key: Hex::<32>(hex!(
+                            key: Hex(hex!(
                                 "264b1dcf7eebde1f4eb9ec87eca25dd963d7281ab5efaa5cfa994a4265fd9b4c"
                             )),
                         },
@@ -938,17 +936,17 @@ mod test {
                 txnFee: 13210000,
                 ecdhInfo: vec![
                     EcdhInfo::Compact {
-                        amount: Hex::<8>(hex!("5db75ce558a47531")),
+                        amount: Hex(hex!("5db75ce558a47531")),
                     },
                     EcdhInfo::Compact {
-                        amount: Hex::<8>(hex!("0499d909aafd0109")),
+                        amount: Hex(hex!("0499d909aafd0109")),
                     },
                 ],
                 outPk: vec![
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "70cbcd5105fcb33f29c8f58b7515f98cfdfcbc425239f65eac3804fbee069995"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "0aba72c6895d733b7cf59d2cf9c4cd7c82dedf23f9424148d63f138291e6b142"
                     )),
                 ],
@@ -956,124 +954,124 @@ mod test {
             rctsig_prunable: Some(RctSigPrunable::ClsagBulletproofs {
                 nbp: 1,
                 bp: vec![Bulletproof {
-                    A: Hex::<32>(hex!(
+                    A: Hex(hex!(
                         "86765eb65aac879a755822a69a54dbf69d2d3495439eff917dc01667b72d30f8"
                     )),
-                    S: Hex::<32>(hex!(
+                    S: Hex(hex!(
                         "1a1e62a9ca8142cafdd8a8b74517d17f2e883d3495b7722e27750fa3fed44d84"
                     )),
-                    T1: Hex::<32>(hex!(
+                    T1: Hex(hex!(
                         "a6513e0191d0561c16f06dda675e9d21a6f7a074dbf1af498530711a4c0a3b8e"
                     )),
-                    T2: Hex::<32>(hex!(
+                    T2: Hex(hex!(
                         "47a1197d264c8becf36fe2e45bebbe9ff86ab7c141dd99db218ba691a412190b"
                     )),
-                    taux: Hex::<32>(hex!(
+                    taux: Hex(hex!(
                         "cc5aa963d74e48c673f5079b0968060db5c408d8ef50ca8cba9fc58f5e11ff06"
                     )),
-                    mu: Hex::<32>(hex!(
+                    mu: Hex(hex!(
                         "869813119eb1c88103d3b396bb1ee604df3c2ecfd7fab9a70da41f9cb95b2309"
                     )),
                     L: vec![
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "34d1b4db37ad7d522d273c134a80d08eb6a22c1e009d3ab7db950090d35accdf"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "e7b41adc55ec0887b1a982f25c11d50a6191aa0e3de7f92ba944b0967b7b0cd5"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "343b5ad8c7abe7753ddba2fadb3cef36de91a2757167c102c4bb95c3e6778028"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "c132bb4bab3e60b86637ce2a3a563ecf92635b4a972083adacf6ede475467eb6"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "3303f34042776e60631352f687a4508b6e0e96ba58e05da825649c0b342527a8"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "c927d1a85fab1d83e1d3312e4f136e58f13853e529e3d2738d69e7885713a402"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "8a440a513f9e71d1a1a6357954b9a90123da3cfde7ed50b9cb389f6963090e49"
                         )),
                     ],
                     R: vec![
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "60cec37d53635e0f7cfddf7ab7bd4fc092ac69444aa8ebe1029cdac3505e028d"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "4b4c26bae4ee65f66246f45a83d8f2b4aca580d3ec53bfb62ed0d33e3e80ea60"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "f1e6aa90b3ae9e72ce487c1728f73a550b5dc41d971a85a90785b922760b0dcd"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "66e773ab75baa86936bd6653102be3518470f98b1357abb3251da54f273b0e40"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "792e4c055a4483088698a828e6b35447a4f890ad590d9e37709e53b7a8d63d0e"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "f6a43739cc3895d297c42179c9cacc31715f675b332a269f7fdf7c3c645f47c3"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "483a9954d40d1a9ce9082a7e10b8c06fd6e5e925d87dea0d04c4b05c6e74eda7"
                         )),
                     ],
-                    a: Hex::<32>(hex!(
+                    a: Hex(hex!(
                         "65b1099198e6b20e5d810147bb0f9b4de297da33fb8ffbde3721a600b91ab504"
                     )),
-                    b: Hex::<32>(hex!(
+                    b: Hex(hex!(
                         "40280b8a652159007d7e36d2a3d4872ae3b7e25617f486a8eeca993d1146c002"
                     )),
-                    t: Hex::<32>(hex!(
+                    t: Hex(hex!(
                         "aa7d0c7b795de8736e1881fe4b9457cca1e370352c9a2f791d8902292d67de0d"
                     )),
                 }],
                 CLSAGs: vec![Clsag {
                     s: vec![
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "27c6ca7f8cbdb7d8e6a1e0d3cc0805e48a809b827ccb70a9b297b7e9fd506f04"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "25212da093e8a866fe693e31022f8f37547cb38643f0a8373ad20032c0d0970a"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "c41751c335a147960f4daf5d4f18544eab8661e4509e1def78e3c2a08800ab0e"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "7a82c4e2e693ad5cf288b369ed647847e2b3ada1faab0727331aebce7e026507"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "690685c5ecab57799fed9067c88c172c466f1ca2ce6768900af0d7d46d474f0a"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "1891173b4f269dbeb1e13eecd8deecf3ee9bb864476b85a5639257cf6e9f8402"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "737980e8606d2da628368934c5c05fd2b6c2d43a2b56c5c6c2163b70c0836b06"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "274a23f3b8baabb020c4e5315174d12049409cae36af0016a0993cdf97957809"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "de2f2b04ac951975fda136268e60126a6ca53e7cd6cbbff0c9515256d5a1c50f"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "d5747b07bc733144c8ef9574213731a30d1239596467e25b6aac4427647b1d0c"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "5fd4c201cfd87e8fb155c1975e02c06c8de1ab49c84c7948e429798a90d52101"
                         )),
                     ],
-                    c1: Hex::<32>(hex!(
+                    c1: Hex(hex!(
                         "0e118c43701bf377e13d9693f6783963d1e6e2a7bff9d75640eb9e1684c26205"
                     )),
-                    D: Hex::<32>(hex!(
+                    D: Hex(hex!(
                         "deb55a8e4de5b9c84b8d94d63988ce04048497f91bdd3e3878a3f9e7c313e01c"
                     )),
                 }],
-                pseudoOuts: vec![Hex::<32>(hex!(
+                pseudoOuts: vec![Hex(hex!(
                     "48604572eb550295c16f5fe4282131ed4fc5de297611f813b12e752b6b67865f"
                 ))],
             }),
@@ -1098,7 +1096,7 @@ mod test {
                                 56619444, 517411, 383964, 1514827, 38358, 263974, 91303, 3018,
                                 14681, 34540, 7767, 8131, 20234, 16575, 18300, 3587,
                             ],
-                            k_image: Hex::<32>(hex!(
+                            k_image: Hex(hex!(
                                 "ec1636db12f12cffa66e8e3286d8216ad7900128c996ffcc96196856daf10585"
                             )),
                         },
@@ -1110,7 +1108,7 @@ mod test {
                                 49738606, 2766321, 6291275, 92656, 166783, 91733, 286477, 1130,
                                 5724, 9633, 44284, 24605, 8133, 20600, 9906, 2115,
                             ],
-                            k_image: Hex::<32>(hex!(
+                            k_image: Hex(hex!(
                                 "953c1d93684671eb658284061b6f7724f37c68c3bc24732fb81a09f7056426d0"
                             )),
                         },
@@ -1122,7 +1120,7 @@ mod test {
                                 2971790, 44215494, 8487702, 3226387, 861, 158991, 281736, 74021,
                                 24277, 10705, 51824, 25824, 4951, 1235, 7824, 15715,
                             ],
-                            k_image: Hex::<32>(hex!(
+                            k_image: Hex(hex!(
                                 "41a34e8637c3974c9a0444f9c45b361775cc178e4d7d8e07e7d4afdc8e591675"
                             )),
                         },
@@ -1134,7 +1132,7 @@ mod test {
                                 57701146, 641169, 170653, 321459, 625073, 40514, 6448, 5687, 13246,
                                 14743, 7359, 1788, 1054, 1061, 4460, 4059,
                             ],
-                            k_image: Hex::<32>(hex!(
+                            k_image: Hex(hex!(
                                 "2d57a890ff948dd7f0ba17940b6b76db2c87163322f0bd5aca29462f9224c777"
                             )),
                         },
@@ -1145,10 +1143,10 @@ mod test {
                         amount: 0,
                         target: Target::TaggedKey {
                             tagged_key: TaggedKey {
-                                key: Hex::<32>(hex!(
+                                key: Hex(hex!(
                                 "570482299e724f78b8441d700aa63388a842c7f5dbcbe5fa859c2c0abad96b30"
                             )),
-                                view_tag: Hex::<1>(hex!("9f")),
+                                view_tag: Hex(hex!("9f")),
                             },
                         },
                     },
@@ -1156,10 +1154,10 @@ mod test {
                         amount: 0,
                         target: Target::TaggedKey {
                             tagged_key: TaggedKey {
-                                key: Hex::<32>(hex!(
+                                key: Hex(hex!(
                                 "50c1a24ef57aeba07beecd8ddbf294e2501d6fa90ad9712829c00b7293eead96"
                             )),
-                                view_tag: Hex::<1>(hex!("06")),
+                                view_tag: Hex(hex!("06")),
                             },
                         },
                     },
@@ -1175,17 +1173,17 @@ mod test {
                 txnFee: 71860000,
                 ecdhInfo: vec![
                     EcdhInfo::Compact {
-                        amount: Hex::<8>(hex!("b0af37c16a8f08a0")),
+                        amount: Hex(hex!("b0af37c16a8f08a0")),
                     },
                     EcdhInfo::Compact {
-                        amount: Hex::<8>(hex!("4cc0843dec9af6b4")),
+                        amount: Hex(hex!("4cc0843dec9af6b4")),
                     },
                 ],
                 outPk: vec![
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "3c51d83c816a0cb8585641a165e866e0215302af9b498db762db27141e673e15"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "96eba06bfd2781e65e9a1b1506abfd9ae29dc60fcd29007cd6ad94a8abbf1ecc"
                     )),
                 ],
@@ -1193,67 +1191,67 @@ mod test {
             rctsig_prunable: Some(RctSigPrunable::ClsagBulletproofsPlus {
                 nbp: 1,
                 bpp: vec![BulletproofPlus {
-                    A: Hex::<32>(hex!(
+                    A: Hex(hex!(
                         "28197d8ac07948082b50274fb8d5bea0f81561d02c88981e0d9b5ffd6e5ee169"
                     )),
-                    A1: Hex::<32>(hex!(
+                    A1: Hex(hex!(
                         "efe6eda671d68a894e1b8aff4a1992f85c4269e17196916cfcdf8519cc94d35e"
                     )),
-                    B: Hex::<32>(hex!(
+                    B: Hex(hex!(
                         "7e374ac72276298148217d99568c3d4e09f2442864b5be228cd2d01328abe2d2"
                     )),
-                    r1: Hex::<32>(hex!(
+                    r1: Hex(hex!(
                         "a2e06c25825774e5a130944c6c3eaa3c8afea2ca7d2c09e024615ff700be240a"
                     )),
-                    s1: Hex::<32>(hex!(
+                    s1: Hex(hex!(
                         "6ee7e6624941d1e9ea18024f39a9a694ac798fb69084e10bf982d6a58d416c0a"
                     )),
-                    d1: Hex::<32>(hex!(
+                    d1: Hex(hex!(
                         "d30bea1ffb8e79d0fe37d60c55f6e654d1ca388b102b29a6b28c48c2c617b70f"
                     )),
                     L: vec![
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "cf6e067c87b9161c424620e83645f13284e64c803b9d7af729d0550d475d2199"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "159a03db0d038f6691816d9c31b52a325ad13941222ce1791a0285ca0cf0169d"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "f0276445ea2ec07957fa58675c89aec4dab57d163290e95845dccd484c3e1790"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "40c19df50385f55b4d53fc101c8eef7d411b76c8b94eadbf464d1401d171ea0a"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "6b9a8da4219da8f3e944351825eaf66e99ea954ed0e3b4eed0782379f8fd5509"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "567d12ccd952444055c9a595024f1229a8e0d3ad816f6fd28a448f021603bcc1"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "44616a4203c430653b12e5a2504e79ea390719a1d6a9557eeb55067ba7efc9d3"
                         )),
                     ],
                     R: vec![
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "a7dd6caebda761e8c2ca07e65f9f5b5868777bdc9a4af810d55c691ee62922aa"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "e8db14727596359e8b2e52bd55ceea81e102028d979f79d464d8afe3fd183de3"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "0f808f768cec8fe9f5e41d5925eb5c4955a2c16f650ba26e8cf7be2246b4e559"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "4931dd8eb664e60d86ff259b0e8af24329aefd550170683c324bf8e68ca97169"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "ce05c6ddb73f36dcd5d94cd6a92220c5c42df15f649d4029c9046fb8a8bf4003"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "ae2d51efb12a81062c7a6c9d2c4cdb4b6d7561f76e6f8aa554d98717716b8dda"
                         )),
-                        Hex::<32>(hex!(
+                        Hex(hex!(
                             "ab4a29f9efa41472ae9dfb13d80c929d904a2fbc72a9d2bce063b19baf3bbdbe"
                         )),
                     ],
@@ -1261,248 +1259,248 @@ mod test {
                 CLSAGs: vec![
                     Clsag {
                         s: vec![
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "fa3c832924a4716bac410b9708ac11ed35d9cb01f3e0c1d3958e77791f9ce905"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "6b4dfe306de3f55c5507d802347f4c94ae55e0db4f3bf25e1af3ba1ecd993e0d"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "71c7c612a3dd9d123609df658aaff494787b5cabb5624d5c5d519120f29f5407"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "d72c30a667f22dbc5bbc8479a4e70094bff1980eb962f3f5ce43954da9a5b009"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "869470794715faa72ec2cbbb78743448f9dc5bb6383ac2030484adbb760e7a09"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "6247f181b491a4da82cadbca6272b58365e9160030ed92a1ac5641f9d4163b06"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "9269814384a16ff2bd297fbce5a614ed67529551ba0c21a26abdaff55c96870a"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "b10aeaac7f08f1782a2eb4094864f26fcb6c43559b7610ccd7809b90b1c4f003"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "f38ce2ac13fcdee7be79d0bd98bc17f3df4b1c266a45e1fede7582b12e3a3c0d"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "1b9f3aee12c9fd4e5aae9cf64bd65f0ad20dbc779f472db0bd338229638a6401"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "a04b7e6791b7ea10af2a8b0ff2dbfe63fb6036beed0bd09e9319d4728e33130b"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "a0cd570e0cb80e0fc111468add13b0fc0d8eb4df6942ce3caafedb6c9eee0f07"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "14b38cbfb7012d1c96a25ea5dcb9bfdfb1a92ffe727dd7a1cb332a9bd630d10f"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "5f9be3bc2f667e41baaad111e34ac14eefa493b565c4be4ab6eeab286903870b"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "549bc3275bafd26ab4b89ba14b43976dd317d8d344e37ccbd5a20351a084e005"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "a93847d26171a9194cfa5a94d7f40576b2e808b4bde927e3398bb0a6e9ad0f0e"
                             )),
                         ],
-                        c1: Hex::<32>(hex!(
+                        c1: Hex(hex!(
                             "794f4e50841235043b39fbcb5b50babf5c4b98339fec9538c2538644ac104f01"
                         )),
-                        D: Hex::<32>(hex!(
+                        D: Hex(hex!(
                             "6d50f7b691c0bc174aa11d9953b3452b0f249aa4e7edd560ff1e5772f592a618"
                         )),
                     },
                     Clsag {
                         s: vec![
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "e8140f6e69981917d78656f0b1572ff748771f3106f6134cca77ae83bc2ff201"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "7970c1856b630f213e52c825c507f331145c55104611a908c91998dcc76dd40f"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "8b6899f8eef5bb4c0c830fbb53e34b6089215e0c18b174648fe482675eb0740e"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "8ff4173d836bddc7fd430b0e2cd7d377f9a81025ebdee6030c19114b7964dc05"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "8f14171c429fbf9bd4aa5fe67d180e99a6092f8a7e27a97e6fd85c02613a0209"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "9208e8cc2fd66d6c154202c42bde24f14917b79ccc1b2f31d54880fa14c51202"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "11da8c69a612d2090b375efb61f9be10a16d6ac3d95e8777cb4d3b0cce028509"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "f0b097956d07aaf27a4d19463b63bed427b4945321f203be856a1c45e058ed0e"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "0ad2af34567c40ea4166cd49c368a9ac3bac132c2507f444657de8152465ff0c"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "ded4f3f699c692d01999b858cb752bb6691418393543fa0b1805115847be8f04"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "6ef1fa94a6448488fdc4fdc629813940f78706f9045f48b8d69ce717510b7b0e"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "fbc95294de167bb8a431ff2eacec66637a49927eb15bb443f0ec7c909e301a06"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "03eec8ccae4fd9942376e3df671ed3de9743b03331ee518a69e0f8fb09644e0e"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "861c4a794793dd3eaedd1770263124530035378121bde995b27cbf50bfeb0d08"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "043d02997ff017b110590482dba8a69d2a97092ef7640b8cba5d4271ffc67e04"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "23f12cabd4d7d69a1c6c6cb960b82a427a0ad2df276786312e2b1c60cb17de06"
                             )),
                         ],
-                        c1: Hex::<32>(hex!(
+                        c1: Hex(hex!(
                             "c0f8e42ef1b220d60fa76532b84dd5def896a25b62eec08691ca438c6abcc40d"
                         )),
-                        D: Hex::<32>(hex!(
+                        D: Hex(hex!(
                             "9d0844d4ac7c5988e336514ba17841a3bd1aefd5fa024b692ccd6ef6e9364e34"
                         )),
                     },
                     Clsag {
                         s: vec![
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "bf3a319fd83070d2c97049e1e2d4636f498a5c0547e5e0144f9eb58247f9a50d"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "70b626b51f5e934fad8f6df0db79c3d2af88b6a93e3fcf872d64e89d1909b10b"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "71b200df8b8c5132ba533f1f18924114d451d2b9cca454ea36b7e4b559962307"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "99cc6995a942ad4e9f993d980a077113d46da70f003539190c5bb9ffb4f6310f"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "4dac904bc896e0f8690353924bc98f0baf2d3a2e39da272fd34444664eede404"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "158c1087ae06422bd71a0b59ff7e8f2caa6bbc651b4d0e105551bf91a51f2002"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "e4d119f8c6d39a02b06aca1627078c37b962463d733a4b25d3b6410bdaad6f0f"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "16d5e70dc9bd9f8e9d8d74d75db0bf3a144952d7eaab3abc78ce7c66cb958d06"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "3a0ee94b516a8596bd718ffd87efb76e10b61904033fd0225543680064c5120e"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "354d44ea658710784c4b3389d4048399302e4d7bfa676ea3de53feba2012e30b"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "ce00bbc38aa3e018f1231972232a076f42d38e6d75dececee6561c6336c4be00"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "85094c21f620b87e976f42b742449a048eb303597b1ef362c1a44f76f8d9fa08"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "8e88e960c771bdd2b3df0e0fddbc0cd0a692807d8432c54d6b6ad2114007d10f"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "976274603af385a4079a970a5ddba77a01ac7411e9b2303e76207b288830a107"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "a7f760605b4dffb5b76943e8097b11fb4f2db2fea6354cffc2b96c21aef7a300"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "7e378e64b7a3ece77d88d966e386e939f56976109ad395b4712cf916f50b4c01"
                             )),
                         ],
-                        c1: Hex::<32>(hex!(
+                        c1: Hex(hex!(
                             "edecc915049e5ead7e5fe36dd70c558ace09f4d3a0c6216be148a51e3a72e302"
                         )),
-                        D: Hex::<32>(hex!(
+                        D: Hex(hex!(
                             "197665d3b405f42a2053f9e946483435e75d6c4e801427bfeb66cc58c72e2670"
                         )),
                     },
                     Clsag {
                         s: vec![
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "20c7f0d492ecf79f1d29305f4e8387238a5927fe676674fe479c129431841607"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "b9b98379560d7e22a09fcc72db5b1d05870ffdbded5cf560fcaf5303033f7d04"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "8fc79c2b767ea73f7f552f48d0603b5ee369cdd9535ca06f03fd11e16f08ea0b"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "7e2bdb348f8a719ffed9d995a35d83ae93a63abe1090fae68a3d23ae47c64402"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "aa0f6221cc1454b4dbf84b7f8c6e7b89a1c2a3d0f56a2d6302106e47b6b1b50d"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "08a9283d8b34426eb7b7547fa8fb1573430b99f1c119f2ff9612e82acee98e03"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "250d2ac44e26782f293eca3deb70fc5c52cb942166b1efb2f78ec32640e02d06"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "1bc1bcc3de357a4652c03815e59e14cb13668946366746dca3dad2f4c44c9000"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "9f8b446e373e3e19871f22b9bc95017d4411e555477afb34114b428c8296470a"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "e49d0313e969fb8c4e451388309280a96b8e3216fa1e28ab2efab49f38e86f07"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "0cee07c99293507ad558838f2fa07af1c4ddc86886658c6207c1f25f343afb06"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "39bd17be3aaaeda4fb8aa8dafcf5748581f7bb8b92b0dfe3add14a8481570003"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "0048e1ca905806551cd210c40356cc80935a98f63163a087ea89585915e8770d"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "3c46eea5308dbdff7376d89378998376cb722d08604d6ecb2b3cb795f91dc607"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "7d13be56b2e858d2fca81b3a6b0312943d33e501b4e09814818edb96fb28aa0c"
                             )),
-                            Hex::<32>(hex!(
+                            Hex(hex!(
                                 "313a2021350abd25bd79c22ea33fe071367da2e208913d788d50101c90f0e702"
                             )),
                         ],
-                        c1: Hex::<32>(hex!(
+                        c1: Hex(hex!(
                             "9d96220cd0d49340e06b915f7204cd1f68c4c2069389bf4c011b4fa6c24c0d02"
                         )),
-                        D: Hex::<32>(hex!(
+                        D: Hex(hex!(
                             "91d00727ba3655729ce88981e803967946403e970f0a6749625f59d4e6d7ebc9"
                         )),
                     },
                 ],
                 pseudoOuts: vec![
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "a6785a3aca529db1da40944bb1826519d7caaa31f4549e6854cb97e5234d3e8e"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "f5cda4db5f83f1c1edea0b66461d1848daf01054c24a690e1438add59dc4f206"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "dff30968b66355b9c7890db508692e9620c999e0025ca9395fa53732e6432606"
                     )),
-                    Hex::<32>(hex!(
+                    Hex(hex!(
                         "6b78d37b63714ebe1d09981766c61a07bf0bfbc9fc7f7a8998396aa99d43e0cc"
                     )),
                 ],
diff --git a/types/types/src/rpc/types.rs b/types/types/src/rpc/types.rs
index db19c517..55157312 100644
--- a/types/types/src/rpc/types.rs
+++ b/types/types/src/rpc/types.rs
@@ -22,7 +22,7 @@ macro_rules! monero_definition_link {
     ) => {
         concat!(
             "[Definition](https://github.com/monero-project/monero/blob/",
-            stringify!($commit),
+            $commit,
             "/src/",
             $file_path,
             "#L",