Handle zero transaction expirations (#2782)

* handle zero transaction expirations * add consensus rule doc Co-authored-by: teor <[email protected]> Co-authored-by: teor <[email protected]>
ZcashFoundation · Sep 22, 2021 · 825da44 · 825da44
1 parent b714b2b
commit 825da44
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/zebra-chain/src/transaction.rs b/zebra-chain/src/transaction.rs
@@ -296,9 +296,15 @@ impl Transaction {
         match self {
             Transaction::V1 { .. } => None,
             Transaction::V2 { .. } => None,
-            Transaction::V3 { expiry_height, .. } => Some(*expiry_height),
-            Transaction::V4 { expiry_height, .. } => Some(*expiry_height),
-            Transaction::V5 { expiry_height, .. } => Some(*expiry_height),
+            Transaction::V3 { expiry_height, .. }
+            | Transaction::V4 { expiry_height, .. }
+            | Transaction::V5 { expiry_height, .. } => match expiry_height {
+                // Consensus rule:
+                // > No limit: To set no limit on transactions (so that they do not expire), nExpiryHeight should be set to 0.
+                // https://zips.z.cash/zip-0203#specification
+                block::Height(0) => None,
+                block::Height(expiry_height) => Some(block::Height(*expiry_height)),
+            },
         }
     }
 

diff --git a/zebra-consensus/src/block/tests.rs b/zebra-consensus/src/block/tests.rs
@@ -391,7 +391,7 @@ fn founders_reward_validation_failure() -> Result<(), Report> {
             inputs: transaction.inputs().to_vec(),
             outputs: vec![transaction.outputs()[0].clone()],
             lock_time: transaction.lock_time(),
-            expiry_height: transaction.expiry_height().unwrap(),
+            expiry_height: Height(0),
             joinsplit_data: None,
         })
         .unwrap();