fix: v2, use decoded blobs

Author: elmurci

src/main.rs

@@ -26,7 +26,7 @@ async fn main() -> Result<()> {
 
             let vl = load_vl(url_or_file).await?;
             let verified_vl = verify_vl(vl)?;
-  
+
             if verified_vl.version == 1 {
                 // UNL Summary
                 let decoded_blob = verified_vl.decoded_blob.clone().unwrap();
@@ -35,7 +35,7 @@ async fn main() -> Result<()> {
                 // Validators
                 let _ = print_validators_summary(decoded_blob.validators);
             } else {
-                let decoded_blobs_v2 = verified_vl.blobs_v2.clone().expect("Could not get decoded blobs v2");
+                let decoded_blobs_v2 = verified_vl.decoded_blobs_v2.clone().expect("Could not get decoded blobs v2");
                 // Summary
                 println!("\nThere are {} UNL's in this Validators List | Version 2 | Manifest Signature: {}\n", decoded_blobs_v2.len(), get_tick_or_cross(verified_vl.manifest.verification));
                 for (index, blob_v2) in decoded_blobs_v2.iter().enumerate() {

tests/data/vl_v2_2.json

@@ -0,0 +1 @@
+{"public_key":"ED4D599ACD40672FEE1A9D3BE56EB52532E27D4B9CB03630E0C9241AF1AF3D1F70","manifest":"JAAAAAFxIe1NWZrNQGcv7hqdO+VutSUy4n1LnLA2MODJJBrxrz0fcHMhAkWhek9PSMZhFik8M+Xjp78yUA4CBG588XjqEgjUGN3idkYwRAIgevLigsRwT6Gswj9gaX06eDwwS4xBfrfnftxKqutvG4oCIBQi95V6KIjKpdaXUn+SPsDpGRU2YNUQgTjqgh39qJPpcBJAr78avNH5e3BoYgFP7Xx7PqFNf/I3jFfoMMqCnKZJUyPxk4xeQkRy3el03CqUzjWzfzkxv6jxi5G/Gz7wu7RDCQ==","blobs_v2":[{"signature":"304402205D1D0A5F2ABA9EFBBF370ECF6826D3A4D877F85BC6F29D37FAA55538DA3011EA02206EB4C3578EE8B13717F67E6F41A11AFB5BFCCBBA6543ECC137775D51F96C5148","blob":"eyJzZXF1ZW5jZSI6MiwiZXhwaXJhdGlvbiI6ODIwNzY4NjY3LCJlZmZlY3RpdmUiOjc4OTI5NjQwMCwidmFsaWRhdG9ycyI6W3sidmFsaWRhdGlvbl9wdWJsaWNfa2V5IjoiRUQ2NDQ4QkFFMEUyMzc5MDI0Mjg3NzQwNDdGQjU0QjA3NTBBMUI1MUQ0QURDMTQ1NkE4MDcyQzE5MDFBOTZGN0U4IiwibWFuaWZlc3QiOiJKQUFBQUFGeEllMWtTTHJnNGplUUpDaDNRRWY3VkxCMUNodFIxSzNCUldxQWNzR1FHcGIzNkhNaEEyc25zajNPZDF3Y2t6VCt5T0FHSUFLYVgvQThXL1NUNSt1Zm9lUHNIK01aZGtZd1JBSWdhKzNXSE5oOGgzeFErL2ZqRVgxdkdaZmN5WHlDNnpISUtuWWJGYlRTVG1rQ0lBbmFUUWFIQ0VDdEUxUE1JcEU0U3MxdHFpOFJCV3lIUzFUUVMwYzlLZ1lQY0JKQU43cUcxRWNPRzRjMkNNZFhyYVVmemhtMnpUUmZhekxoTWdUalpIVzBrQitwVFVkY0I3MmRhT2NBQ2dPVWI5WjFmSGVKNXg1YWRDWUNUZDFsNlU4TEJ3PT0ifSx7InZhbGlkYXRpb25fcHVibGljX2tleSI6IkVENDYzM0RBRUU0RjFGMzk1NDlBODQxRkJGQzVDQzU3MjNERjQ1MjkyNzQyQjdCQTczRUE3OTc4NjQ1QjYxN0UwQiIsIm1hbmlmZXN0IjoiSkFBQUFBRnhJZTFHTTlydVR4ODVWSnFFSDcvRnpGY2ozMFVwSjBLM3VuUHFlWGhrVzJGK0MzTWhBL01jcVZSRVFLR1ZtMlpHYTZFUmYwRkpUTnlZb1hFUzBBa1h4V1F0VnZ1Z2RrWXdSQUlnS0VwWGJXOCtaT3FOYUsyZUVnRytZbWdtMDF0anJvbW0vSERlQVFPbHNyNENJRHJwL3lWUFNkTGdCREp6OGpabG1URGVOMGZtMnBJN1g3cGs5OVhFTEY1L2NCSkF5eGNIM1l4MHQwb3RJUy9hSCtLUmRZU1VnR3BEOVJVb1NnYk00UkR6b2c1TkQrRkdBUFVmaW9IeW1NYWFnb28vMmpwSVdLK3A4Z3F5dllBUXlJQW9DUT09In0seyJ2YWxpZGF0aW9uX3B1YmxpY19rZXkiOiJFREI5MEJCRTlDMjBBODczQjY5Mjg1REU0QkM1NENGNzdFNUZGQzdEMkRFMDA5NDBEN0U2NEQ5OUMyM0MxRkEwNEYiLCJtYW5pZmVzdCI6IkpBQUFBQUZ4SWUyNUM3NmNJS2h6dHBLRjNrdkZUUGQrWC94OUxlQUpRTmZtVFpuQ1BCK2dUM01oQTI3QU94NjlOQ2dmbHdBdnBuYndickpma0kzNnZHdmlOWTNMNy9pWnk1Unhka1l3UkFJZ0I0UmtOU2NOaHFYamp5UElCd2h4ZGxsMk92TkVNcmJLQk1kM2lqaG5vVklDSUVZd1BFS09SSE1qWVAraWNoeUUyNUViZmRjWWdRaFRxVmNvT2pMSmtyRGNjQkpBcUF3YUZlRGUwdTREQ1AzdjAyQXdQdkVvcE5Jckw1TE81SzRVdXpXclZKQUNyaE1sQnNoc1RDckFRMk5FWEZ2Sm9QT3RhS3g0aEVmR3BmUjY1d3FHQUE9PSJ9XX0="},{"signature":"3045022100F14AEBA5285B26E721DB43C45A33E88865B244ACAB30954E80F107A0F2C2DB47022010F874AFA871CFB05B2B1AE41699E7D143A9DDFC2226D1DBE37BC92C1844CDAB","blob":"eyJzZXF1ZW5jZSI6MywiZXhwaXJhdGlvbiI6ODIxMDE4MjcyLCJlZmZlY3RpdmUiOjc4OTU1NTYwMCwidmFsaWRhdG9ycyI6W3sidmFsaWRhdGlvbl9wdWJsaWNfa2V5IjoiRUQ2NDQ4QkFFMEUyMzc5MDI0Mjg3NzQwNDdGQjU0QjA3NTBBMUI1MUQ0QURDMTQ1NkE4MDcyQzE5MDFBOTZGN0U4IiwibWFuaWZlc3QiOiJKQUFBQUFGeEllMWtTTHJnNGplUUpDaDNRRWY3VkxCMUNodFIxSzNCUldxQWNzR1FHcGIzNkhNaEEyc25zajNPZDF3Y2t6VCt5T0FHSUFLYVgvQThXL1NUNSt1Zm9lUHNIK01aZGtZd1JBSWdhKzNXSE5oOGgzeFErL2ZqRVgxdkdaZmN5WHlDNnpISUtuWWJGYlRTVG1rQ0lBbmFUUWFIQ0VDdEUxUE1JcEU0U3MxdHFpOFJCV3lIUzFUUVMwYzlLZ1lQY0JKQU43cUcxRWNPRzRjMkNNZFhyYVVmemhtMnpUUmZhekxoTWdUalpIVzBrQitwVFVkY0I3MmRhT2NBQ2dPVWI5WjFmSGVKNXg1YWRDWUNUZDFsNlU4TEJ3PT0ifSx7InZhbGlkYXRpb25fcHVibGljX2tleSI6IkVENDYzM0RBRUU0RjFGMzk1NDlBODQxRkJGQzVDQzU3MjNERjQ1MjkyNzQyQjdCQTczRUE3OTc4NjQ1QjYxN0UwQiIsIm1hbmlmZXN0IjoiSkFBQUFBRnhJZTFHTTlydVR4ODVWSnFFSDcvRnpGY2ozMFVwSjBLM3VuUHFlWGhrVzJGK0MzTWhBL01jcVZSRVFLR1ZtMlpHYTZFUmYwRkpUTnlZb1hFUzBBa1h4V1F0VnZ1Z2RrWXdSQUlnS0VwWGJXOCtaT3FOYUsyZUVnRytZbWdtMDF0anJvbW0vSERlQVFPbHNyNENJRHJwL3lWUFNkTGdCREp6OGpabG1URGVOMGZtMnBJN1g3cGs5OVhFTEY1L2NCSkF5eGNIM1l4MHQwb3RJUy9hSCtLUmRZU1VnR3BEOVJVb1NnYk00UkR6b2c1TkQrRkdBUFVmaW9IeW1NYWFnb28vMmpwSVdLK3A4Z3F5dllBUXlJQW9DUT09In0seyJ2YWxpZGF0aW9uX3B1YmxpY19rZXkiOiJFREI5MEJCRTlDMjBBODczQjY5Mjg1REU0QkM1NENGNzdFNUZGQzdEMkRFMDA5NDBEN0U2NEQ5OUMyM0MxRkEwNEYiLCJtYW5pZmVzdCI6IkpBQUFBQUZ4SWUyNUM3NmNJS2h6dHBLRjNrdkZUUGQrWC94OUxlQUpRTmZtVFpuQ1BCK2dUM01oQTI3QU94NjlOQ2dmbHdBdnBuYndickpma0kzNnZHdmlOWTNMNy9pWnk1Unhka1l3UkFJZ0I0UmtOU2NOaHFYamp5UElCd2h4ZGxsMk92TkVNcmJLQk1kM2lqaG5vVklDSUVZd1BFS09SSE1qWVAraWNoeUUyNUViZmRjWWdRaFRxVmNvT2pMSmtyRGNjQkpBcUF3YUZlRGUwdTREQ1AzdjAyQXdQdkVvcE5Jckw1TE81SzRVdXpXclZKQUNyaE1sQnNoc1RDckFRMk5FWEZ2Sm9QT3RhS3g0aEVmR3BmUjY1d3FHQUE9PSJ9XX0="}],"version":2}

tests/vl_integration_tests.rs

@@ -157,6 +157,23 @@ mod test {
         assert!(verified_vl.manifest.verification == true);
     }
 
+    #[tokio::test]
+    async fn should_load_v2_valid_vl() {
+        let vl = load_vl("tests/data/vl_v2_2.json").await.unwrap();
+        let verified_vl = verify_vl(vl.clone()).unwrap();
+        assert!(verified_vl.version == 2);
+        assert!(verified_vl.blobs_v2.clone().unwrap().len() == 2);
+        assert!(verified_vl.blob.is_none());
+        assert!(verified_vl.signature.is_none());
+        for blob_v2 in verified_vl.decoded_blobs_v2.unwrap() {
+            assert!(blob_v2.blob_verification.unwrap() == true);
+            for validator in blob_v2.decoded_blob.unwrap().validators {
+                assert!(validator.decoded_manifest.unwrap().verification == true);
+            }
+        }
+        assert!(verified_vl.manifest.verification == true);
+    }
+
     #[tokio::test]
     async fn should_load_v2_valid_vl_from_scratch_secp256k1() {
         let signed_vl = test_sign_vl(