validate parsed ErgoTree header,

check no bytes left unconsumed after ErgoTree is parsed;
ergoplatform · Feb 3, 2023 · af93336 · af93336
1 parent 2e8c645
commit af93336
Show file tree

Hide file tree

Showing 5 changed files with 344 additions and 221 deletions.
diff --git a/ergotree-ir/src/chain/ergo_box/box_id.rs b/ergotree-ir/src/chain/ergo_box/box_id.rs
@@ -56,6 +56,12 @@ impl From<BoxId> for Vec<i8> {
     }
 }
 
+impl std::fmt::Display for BoxId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
 impl SigmaSerializable for BoxId {
     fn sigma_serialize<W: SigmaByteWrite>(&self, w: &mut W) -> SigmaSerializeResult {
         self.0.scorex_serialize(w)?;

diff --git a/ergotree-ir/src/chain/json/ergo_box.rs b/ergotree-ir/src/chain/json/ergo_box.rs
@@ -86,7 +86,10 @@ impl TryFrom<ErgoBoxJson> for ErgoBox {
                 if ergo_box.box_id() == box_id {
                     Ok(ergo_box)
                 } else {
-                    Err(ErgoBoxFromJsonError::InvalidBoxId)
+                    Err(ErgoBoxFromJsonError::InvalidBoxId {
+                        json: box_id,
+                        actual: ergo_box.box_id(),
+                    })
                 }
             }
             None => Ok(ergo_box),
@@ -180,8 +183,10 @@ impl TryFrom<ErgoBoxCandidateJson> for ErgoBoxCandidate {
 #[derive(Error, PartialEq, Eq, Debug, Clone)]
 pub enum ErgoBoxFromJsonError {
     /// Box id parsed from JSON differs from calculated from box serialized bytes
-    #[error("Box id parsed from JSON differs from calculated from box serialized bytes")]
-    InvalidBoxId,
+    #[error(
+        "Box id parsed from JSON {json} differs from calculated from box serialized bytes {actual}"
+    )]
+    InvalidBoxId { json: BoxId, actual: BoxId },
     /// Box serialization failed (id calculation)
     #[error("Box serialization failed (id calculation): {0}")]
     SerializationError(#[from] SigmaSerializationError),