From d0d336c3413fc9c0f9befce08fdd6d95a8b2d319 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Wed, 19 Sep 2018 16:55:18 +1000
Subject: [PATCH] Update AttestationRecord fields

---
 lighthouse/state/attestation_record.rs | 39 ++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/lighthouse/state/attestation_record.rs b/lighthouse/state/attestation_record.rs
index 35d61f5837..25abbd3f3a 100644
--- a/lighthouse/state/attestation_record.rs
+++ b/lighthouse/state/attestation_record.rs
@@ -3,14 +3,14 @@ use super::utils::bls::{ AggregateSignature };
 use super::ssz::{ Encodable, SszStream };
 
 pub const MIN_SSZ_ATTESTION_RECORD_LENGTH: usize = {
-    8 +     // slot
-    2 +     // shard_id
-    4 +     // oblique_parent_hashes (empty list)
-    32 +    // shard_block_hash
-    5 +     // attester_bitfield (assuming 1 byte of bitfield)
-    8 +     // justified_slot
-    32 +    // justified_block_hash
-    2 * 32  // aggregate sig (two 256 bit points)
+    8 +             // slot
+    2 +             // shard_id
+    4 +             // oblique_parent_hashes (empty list)
+    4 + 32 +        // shard_block_hash
+    5 +             // attester_bitfield (assuming 1 byte of bitfield)
+    8 +             // justified_slot
+    4 + 32 +        // justified_block_hash
+    4 + (2 * 32)    // aggregate sig (two 256 bit points)
 };
 
 pub struct AttestationRecord {
@@ -19,6 +19,8 @@ pub struct AttestationRecord {
     pub oblique_parent_hashes: Vec<Hash256>,
     pub shard_block_hash: Hash256,
     pub attester_bitfield: Bitfield,
+    pub justified_slot: u64,
+    pub justified_block_hash: Hash256,
     pub aggregate_sig: Option<AggregateSignature>,
 }
 
@@ -29,6 +31,8 @@ impl Encodable for AttestationRecord {
         s.append_vec(&self.oblique_parent_hashes);
         s.append(&self.shard_block_hash);
         s.append_vec(&self.attester_bitfield.to_be_vec());
+        s.append(&self.justified_slot);
+        s.append(&self.justified_block_hash);
         // TODO: encode the aggregate sig correctly
         s.append_vec(&vec![0_u8; 64])
     }
@@ -42,7 +46,26 @@ impl AttestationRecord {
             oblique_parent_hashes: vec![],
             shard_block_hash: Hash256::zero(),
             attester_bitfield: Bitfield::new(),
+            justified_slot: 0,
+            justified_block_hash: Hash256::zero(),
             aggregate_sig: None,
         }
     }
 }
+
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use super::super::ssz::SszStream;
+
+    #[test]
+    pub fn test_attestation_record_min_ssz_length() {
+        let ar = AttestationRecord::zero();
+        let mut ssz_stream = SszStream::new();
+        ssz_stream.append(&ar);
+        let ssz = ssz_stream.drain();
+
+        assert_eq!(ssz.len(), MIN_SSZ_ATTESTION_RECORD_LENGTH);
+    }
+}