feat: Include cbor probing for all known eras (#51)

pallas-primitives/src/framework.rs

@@ -20,3 +20,12 @@ where
         minicbor::decode(bytes).map_err(|e| e.into())
     }
 }
+
+#[derive(Debug, Copy, Clone)]
+pub enum Era {
+    Byron,
+    Shelley,
+    Allegra, // time-locks
+    Mary,    // multi-assets
+    Alonzo,  // smart-contracts
+}

pallas-primitives/src/probing.rs

@@ -2,33 +2,34 @@
 
 use minicbor::decode::{Token, Tokenizer};
 
-pub enum BlockInference {
-    Byron,
-    Shelley,
+use crate::Era;
+
+#[derive(Debug)]
+pub enum Outcome {
+    Matched(Era),
     Inconclusive,
 }
 
 // Executes a very lightweight inspection of the initial tokens of the CBOR
 // payload and infers with a certain degree of confidence the type of Cardano
 // structure within.
-pub fn probe_block_cbor(cbor: &[u8]) -> BlockInference {
+pub fn probe_block_cbor_era(cbor: &[u8]) -> Outcome {
     let mut tokenizer = Tokenizer::new(cbor);
 
     if !matches!(tokenizer.next(), Some(Ok(Token::Array(2)))) {
-        return BlockInference::Inconclusive;
+        return Outcome::Inconclusive;
     }
 
-    if !matches!(tokenizer.next(), Some(Ok(Token::U8(_)))) {
-        return BlockInference::Inconclusive;
-    }
-
-    //println!("{:?}", tokenizer.next());
-
     match tokenizer.next() {
-        Some(Ok(Token::Array(3))) => BlockInference::Byron,
-        Some(Ok(Token::Array(4))) => BlockInference::Shelley,
-        Some(Ok(Token::Array(5))) => BlockInference::Shelley,
-        _ => BlockInference::Inconclusive,
+        Some(Ok(Token::U8(variant))) => match variant {
+            1 => Outcome::Matched(Era::Byron),
+            2 => Outcome::Matched(Era::Shelley),
+            3 => Outcome::Matched(Era::Allegra),
+            4 => Outcome::Matched(Era::Mary),
+            5 => Outcome::Matched(Era::Alonzo),
+            _ => Outcome::Inconclusive,
+        },
+        _ => Outcome::Inconclusive,
     }
 }
 
@@ -41,18 +42,48 @@ mod tests {
         let block_str = include_str!("byron/test_data/test1.block");
         let bytes = hex::decode(block_str).unwrap();
 
-        let inference = probe_block_cbor(bytes.as_slice());
+        let inference = probe_block_cbor_era(bytes.as_slice());
 
-        assert!(matches!(inference, BlockInference::Byron));
+        assert!(matches!(inference, Outcome::Matched(Era::Byron)));
     }
 
     #[test]
     fn shelley_block_detected() {
+        let block_str = include_str!("test_data/shelley1.block");
+        let bytes = hex::decode(block_str).unwrap();
+
+        let inference = probe_block_cbor_era(bytes.as_slice());
+
+        assert!(matches!(inference, Outcome::Matched(Era::Shelley)));
+    }
+
+    #[test]
+    fn allegra_block_detected() {
+        let block_str = include_str!("test_data/allegra1.block");
+        let bytes = hex::decode(block_str).unwrap();
+
+        let inference = probe_block_cbor_era(bytes.as_slice());
+
+        assert!(matches!(inference, Outcome::Matched(Era::Allegra)));
+    }
+
+    #[test]
+    fn mary_block_detected() {
+        let block_str = include_str!("test_data/mary1.block");
+        let bytes = hex::decode(block_str).unwrap();
+
+        let inference = probe_block_cbor_era(bytes.as_slice());
+
+        assert!(matches!(inference, Outcome::Matched(Era::Mary)));
+    }
+
+    #[test]
+    fn alonzo_block_detected() {
         let block_str = include_str!("alonzo/test_data/test1.block");
         let bytes = hex::decode(block_str).unwrap();
 
-        let inference = probe_block_cbor(bytes.as_slice());
+        let inference = probe_block_cbor_era(bytes.as_slice());
 
-        assert!(matches!(inference, BlockInference::Shelley));
+        assert!(matches!(inference, Outcome::Matched(Era::Alonzo)));
     }
 }

pallas-primitives/src/test_data/shelley1.block

@@ -0,0 +1 @@
+820284828f1a004723dd1a007949425820c175f470d30216341423a98a6087175642250acec7d9f53a311cf2e0a1c9c7b258208b53207629f9a30e4b2015044f337c01735abe67243c19470c9dae8c7b732798582090561cf5fb4eada778f0564060b9b5138fbfa50c0e74fc496956c8c3507301a6825840d266d923d59fc8a1b7e964dab2b6db804b494c202586eae8e2db929ca2361d9f01154c4a78b95a2e6bf19ebe98e775f894ad53971bd1ceeee125ee8473747d60585011614e11e284d28aa303da9ca3a37bfde35f931d308ae3da36e381ac42910d36dc26d91bfa726d7b4a7ae1fb263e037e8f9e80e3411a8754863b8b5601047b9e04d0f72f00206ea616c6cffc75fc48018258405620f9239d562aed34442b72c8bc840bb9a5ef897b470132430a02cd0ce69052a6ebb17896177180c1d88afed3d7614878549c5573c0f281d5dad2f29bda5a6d5850f349597045cc5f65a9724770f971e6964e09fd85db8e36ef789f390afd4629a3f5e96b4e5ee8280ec26236a6323cbc16867a1868645566e0607d7a474fd7d06b44c3afbcd85a41098a80ba6faeb7400b190596582000ef8e1bebe7d404a910c7c467fb5aafbc7dee7fcaac94cb9693e08ea9dd7d2a5820674617ebe299bcba144026e4342e9f54c861165c1dde1373fd1206e654f985b800183758405befdeffa73bc8b4a1cd22aa2c896f189a698175e5bfc4a562e3a15b5f6580953e6fcc72a37386816031e36fdf19718351417f01af02c7314fbe9f2792b29e0c02005901c0c597caba74923b7901d5b8162f27338413b12941e411e9371b06a01375b8690aab067a42dde22db909bf77db373ca8645b751711256ba5f360e2935f64d14104cfdfb6c7865c6f4219e67af060cdcf4dc3d874ede00c394e9ecac7ba1f663b367e0f482e1bfaff08808d6567590cd6bf43c849ebacfb5fb185f4592ff3bf0a479d5a1f3f19f819b59f662cad2b6ff2187ec94b4c5fac6b8375b02d6b52d229ae24b389ff2d72b584f47f77cbc62a43f1880e486fda30ac1600f475dc4857e66090fe7399f4e3bff4929ea1c1929371846a34391473c79f9409f05f65fe8d2acb6f5eceb84474555d163db96d809aa77b9c2f80156d0356e75204ab5032e833bbacecf407038c8a28da4900c1c63a5bb32672dd345c37e1c866b15da5d2c41ab76c214bc8e3efd9e34cf092f1166edc2de2b03ccaca01b2c0261bfaf3f166f3937c21128c3ebb96ceefab6c80897da9f096a7cc113c4b9c0cd8b97fe3d29f6a2c9960005d2f1ce2e8bfeca9b1f8ebe80637f59133692e11ad9f9c557c10102472aef7f472d72920bbff7a7f4e344988c2d5f98482fbbae7a081d7f10b55b33a7c4dea90483223bea2093cb068b2db39973dd06700ea4eb65fa3210d7d53430c9c84a5008182582050eba65e73c8c5f7b09f4ea28cf15dce169f3d1c322ca3deff03725f51518bb200018182583901f53fd6f6b96f74cc90fd995afad1bfdbd49ff7d04fc9e7a2f81285b75c465cbf8c5536970e8a29bb7adcda0d663b20007d481813694c64ef1b0000021f05a734bb021a0002a389031a0079652c048183028200581c5c465cbf8c5536970e8a29bb7adcda0d663b20007d481813694c64ef581c6b5180a258275c671690c94c704f074190e90ea900ed565b4c29abe8a50081825820368f24c09763ee846f68c60f987eeca4d9a7e9cb537cea2cc593e77dd9c0ac67000181825839019a5d1ab9ca1eb592973a0d3f5ffdd006e7e4c0be6a7b43211325168932dd8b472ba9876597a01259896cdb4650a62402aa9737175d539fe81b00000045d92911df021a0002a389031a0079652c048183028200581c32dd8b472ba9876597a01259896cdb4650a62402aa9737175d539fe8581c76e80e1b3f622c7051f222453497b0667e12892f5d94ee565d17dc52a40081825820cffac1e93f583d1f272142df5b793666e613c66cea4e500b18437aded85febbc00018282581d614497e18047e5c891ead6a215b3f5dce026921a8b76c7fe27a2ba9f681a000f424082583901a76b7122a3773792b6275c9a0fb0bf4ae0c17c52363de66062eca50c13ce7fae17ab762c4390c4d77bd74f7d4651af480508ea237b1dd0b51a0086a7f3021a0002ac4d031a007950a4a400828258201c3b9c2016d9ae6b3e86e1888296e6bc180e6bcfd344711b7305651ae90f87e60182582038d2f2cf6a2ce8563cc3b84b4b0e003404363a352fe1ac7ef5a6b5bb014c3d6c07018282582b82d818582183581c5f6712df165e03b5eb5e72e50058a181777696b222c54d844944da14a0001add85ea5a1a22dad5bd82581d614db3b10bedda3b9dd3d3a8886ca9d8a581162b874a7460edaab406fb1a032fcbef021a0003447f031a0098968084a10082825820e3968f45134a774f66b011c2c463ad64a5ba7e17f4774be460d08477a07e31f458402c551fc904b8e55a58d437e744566d0307a186af8f08d51a637456e0eb8247a0b639441a4fb25807b46edd60766a9e766b19e7c33caf5eea1752fc017b840100825820590a7c4229d9aede28c43f2626fcd36bc383cc3e622a654ad962e4c49570938c584042f3ed22755c5523a66864cb644330b82ace0b7cd483f4ea4e4c4d3ff88e62785811bf6a7da08e386f218301ff50bf8d000ca3df07dd831b9160b469ac95110ca10082825820feef653d2ba57531b9a442258cc0ad12feda29141b3e2a05e4a037262c4bb34d5840def966f7d8ea6e9ceb519606a9b7076b85677b6edcebd386f42f71c5c942c6ef90cbfad2265634cf5ebae00f8b86760151c6559bc82b52c130547eed5414120b825820d91dc0521946003bc7ded1a54938a04bee80a860382c51ef7c9e4563346979345840ab999c3cbb8edd48da9b884a4dcb86a8e7b7110ee08f312264a018fa6d50e4a0635f124916be7773c38c8bec8a0fa7f2ac5058a776932ebfd557a8a263552409a100818258205ee8a66efac254382955ec4d643a9f24015d0ac1ed32480b1b7235f10e87a0e458400fc033349c1a9ecf966902e05f35b7459a642f7b3818c80003b08179631521c810a8a52e30c5211a38a88732369fdf07d96c83963564f11b14048c060a2d410ea10082825820a1ecd258e4f23d09803873e6b8a5ed21107738e12004ed7b1fe1bf89c9c49e5a5840789070b47a7d4bf6ee4d56773ace2faaed2f76905848d65e5c35bfb75339060ec9c6e904b9a8fc54cf861a6da4aa3d8f607cb325b1f1cc266e49fb8a6dc3ef01825820a1ecd258e4f23d09803873e6b8a5ed21107738e12004ed7b1fe1bf89c9c49e5a5840789070b47a7d4bf6ee4d56773ace2faaed2f76905848d65e5c35bfb75339060ec9c6e904b9a8fc54cf861a6da4aa3d8f607cb325b1f1cc266e49fb8a6dc3ef01a0