From 55ec7f9fe9ddb4d31ec071926d7731650ce1ab15 Mon Sep 17 00:00:00 2001
From: Rob Walker <rob@solana.com>
Date: Mon, 25 Jun 2018 23:28:41 -0700
Subject: [PATCH] add entry.has_more

 * quick fix for really big genesis
 * longer term fix for possible parallel verification over multiple
      Blobs/Entries
---
 src/bank.rs     |  7 ++++++-
 src/entry.rs    | 24 ++++++++++++++++++++----
 src/ledger.rs   |  5 +++--
 src/mint.rs     |  4 ++--
 src/recorder.rs |  1 +
 src/tvu.rs      |  4 ++--
 6 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/bank.rs b/src/bank.rs
index 7358b69a1d..3da9d367df 100644
--- a/src/bank.rs
+++ b/src/bank.rs
@@ -314,7 +314,12 @@ impl Bank {
                     result?;
                 }
             }
-            self.register_entry_id(&entry.id);
+            // TODO: verify this is ok in cases like:
+            //  1. an untrusted genesis or tx-<DATE>.log
+            //  2. a crazy leader..
+            if !entry.has_more {
+                self.register_entry_id(&entry.id);
+            }
         }
         Ok(self.entry_count())
     }
diff --git a/src/entry.rs b/src/entry.rs
index 44382cacf4..c3691b9b71 100644
--- a/src/entry.rs
+++ b/src/entry.rs
@@ -35,17 +35,30 @@ pub struct Entry {
     /// generated. The may have been observed before a previous Entry ID but were
     /// pushed back into this list to ensure deterministic interpretation of the ledger.
     pub transactions: Vec<Transaction>,
+
+    /// Indication that:
+    ///  1. the next Entry in the ledger has transactions that can potentially
+    ///       be verified in parallel with these transactions
+    ///  2. this Entry can be left out of the bank's entry_id cache for
+    ///       purposes of duplicate rejection
+    pub has_more: bool,
 }
 
 impl Entry {
     /// Creates the next Entry `num_hashes` after `start_hash`.
-    pub fn new(start_hash: &Hash, cur_hashes: u64, transactions: Vec<Transaction>) -> Self {
+    pub fn new(
+        start_hash: &Hash,
+        cur_hashes: u64,
+        transactions: Vec<Transaction>,
+        has_more: bool,
+    ) -> Self {
         let num_hashes = cur_hashes + if transactions.is_empty() { 0 } else { 1 };
         let id = next_hash(start_hash, 0, &transactions);
         let entry = Entry {
             num_hashes,
             id,
             transactions,
+            has_more,
         };
         assert!(serialized_size(&entry).unwrap() <= BLOB_DATA_SIZE as u64);
         entry
@@ -56,8 +69,9 @@ impl Entry {
         start_hash: &mut Hash,
         cur_hashes: &mut u64,
         transactions: Vec<Transaction>,
+        has_more: bool,
     ) -> Self {
-        let entry = Self::new(start_hash, *cur_hashes, transactions);
+        let entry = Self::new(start_hash, *cur_hashes, transactions, has_more);
         *start_hash = entry.id;
         *cur_hashes = 0;
         assert!(serialized_size(&entry).unwrap() <= BLOB_DATA_SIZE as u64);
@@ -71,6 +85,7 @@ impl Entry {
             num_hashes,
             id: *id,
             transactions: vec![],
+            has_more: false,
         }
     }
 
@@ -119,6 +134,7 @@ pub fn next_entry(start_hash: &Hash, num_hashes: u64, transactions: Vec<Transact
         num_hashes,
         id: next_hash(start_hash, num_hashes, &transactions),
         transactions,
+        has_more: false,
     }
 }
 
@@ -149,7 +165,7 @@ mod tests {
         let keypair = KeyPair::new();
         let tx0 = Transaction::new(&keypair, keypair.pubkey(), 0, zero);
         let tx1 = Transaction::new(&keypair, keypair.pubkey(), 1, zero);
-        let mut e0 = Entry::new(&zero, 0, vec![tx0.clone(), tx1.clone()]);
+        let mut e0 = Entry::new(&zero, 0, vec![tx0.clone(), tx1.clone()], false);
         assert!(e0.verify(&zero));
 
         // Next, swap two transactions and ensure verification fails.
@@ -166,7 +182,7 @@ mod tests {
         let keypair = KeyPair::new();
         let tx0 = Transaction::new_timestamp(&keypair, Utc::now(), zero);
         let tx1 = Transaction::new_signature(&keypair, Default::default(), zero);
-        let mut e0 = Entry::new(&zero, 0, vec![tx0.clone(), tx1.clone()]);
+        let mut e0 = Entry::new(&zero, 0, vec![tx0.clone(), tx1.clone()], false);
         assert!(e0.verify(&zero));
 
         // Next, swap two witness transactions and ensure verification fails.
diff --git a/src/ledger.rs b/src/ledger.rs
index 22b0e729ab..3f83717762 100644
--- a/src/ledger.rs
+++ b/src/ledger.rs
@@ -73,7 +73,7 @@ pub fn next_entries_mut(
     transactions: Vec<Transaction>,
 ) -> Vec<Entry> {
     if transactions.is_empty() {
-        vec![Entry::new_mut(start_hash, cur_hashes, transactions)]
+        vec![Entry::new_mut(start_hash, cur_hashes, transactions, false)]
     } else {
         let mut chunk_len = transactions.len();
 
@@ -82,6 +82,7 @@ pub fn next_entries_mut(
             num_hashes: 0,
             id: Hash::default(),
             transactions: transactions[0..chunk_len].to_vec(),
+            has_more: false,
         }).unwrap() > BLOB_DATA_SIZE as u64
         {
             chunk_len /= 2;
@@ -90,7 +91,7 @@ pub fn next_entries_mut(
         let mut entries = Vec::with_capacity(transactions.len() / chunk_len + 1);
 
         for chunk in transactions.chunks(chunk_len) {
-            entries.push(Entry::new_mut(start_hash, cur_hashes, chunk.to_vec()));
+            entries.push(Entry::new_mut(start_hash, cur_hashes, chunk.to_vec(), true));
         }
         entries
     }
diff --git a/src/mint.rs b/src/mint.rs
index 46c5a03153..a08de36e16 100644
--- a/src/mint.rs
+++ b/src/mint.rs
@@ -53,8 +53,8 @@ impl Mint {
     }
 
     pub fn create_entries(&self) -> Vec<Entry> {
-        let e0 = Entry::new(&self.seed(), 0, vec![]);
-        let e1 = Entry::new(&e0.id, 0, self.create_transactions());
+        let e0 = Entry::new(&self.seed(), 0, vec![], false);
+        let e1 = Entry::new(&e0.id, 0, self.create_transactions(), false);
         vec![e0, e1]
     }
 }
diff --git a/src/recorder.rs b/src/recorder.rs
index 1056cab3c3..68293a3d75 100644
--- a/src/recorder.rs
+++ b/src/recorder.rs
@@ -39,6 +39,7 @@ impl Recorder {
                 &mut self.last_hash,
                 &mut self.num_hashes,
                 vec![],
+                false,
             ))
         } else {
             None
diff --git a/src/tvu.rs b/src/tvu.rs
index 014beb06ec..784e2621a2 100644
--- a/src/tvu.rs
+++ b/src/tvu.rs
@@ -210,7 +210,7 @@ pub mod tests {
         let transfer_amount = 501;
         let bob_keypair = KeyPair::new();
         for i in 0..num_transfers {
-            let entry0 = Entry::new(&cur_hash, i, vec![]);
+            let entry0 = Entry::new(&cur_hash, i, vec![], false);
             bank.register_entry_id(&cur_hash);
             cur_hash = hash(&cur_hash);
 
@@ -222,7 +222,7 @@ pub mod tests {
             );
             bank.register_entry_id(&cur_hash);
             cur_hash = hash(&cur_hash);
-            let entry1 = Entry::new(&cur_hash, i + num_transfers, vec![tx0]);
+            let entry1 = Entry::new(&cur_hash, i + num_transfers, vec![tx0], false);
             bank.register_entry_id(&cur_hash);
             cur_hash = hash(&cur_hash);