From 78c00d336105f028879e916d3b4439b12e6fad08 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Fri, 25 Jan 2019 16:54:19 +1100
Subject: [PATCH] Move back to using `proposer_slots`

---
 beacon_node/beacon_chain/src/state_transition.rs |  6 +-----
 eth2/block_producer/src/lib.rs                   | 11 ++---------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/beacon_node/beacon_chain/src/state_transition.rs b/beacon_node/beacon_chain/src/state_transition.rs
index fe2b0e7b1a..1c4ca83708 100644
--- a/beacon_node/beacon_chain/src/state_transition.rs
+++ b/beacon_node/beacon_chain/src/state_transition.rs
@@ -117,14 +117,10 @@ where
          * RANDAO
          */
 
-        println!("proposer pubkey: {:?}", &block_proposer.pubkey);
         ensure!(
             bls_verify(
                 &block_proposer.pubkey,
-                // TODO: https://github.com/ethereum/eth2.0-specs/pull/496
-                //
-                // &ssz_encode(&block_proposer.proposer_slots),
-                &ssz_encode(&block.slot),
+                &ssz_encode(&block_proposer.proposer_slots),
                 &block.randao_reveal,
                 get_domain(&state.fork_data, state.slot, DOMAIN_RANDAO)
             ),
diff --git a/eth2/block_producer/src/lib.rs b/eth2/block_producer/src/lib.rs
index d1b1f4e7c8..bb62be960d 100644
--- a/eth2/block_producer/src/lib.rs
+++ b/eth2/block_producer/src/lib.rs
@@ -134,23 +134,16 @@ impl<T: SlotClock, U: BeaconNode, V: DutiesReader, W: Signer> BlockProducer<T, U
     /// slashing.
     fn produce_block(&mut self, slot: u64) -> Result<PollOutcome, Error> {
         let randao_reveal = {
-            /*
-             * TODO:
-             * https://github.com/ethereum/eth2.0-specs/pull/496
-             *
             let producer_nonce = self.beacon_node.proposer_nonce(&self.pubkey)?;
+
             // TODO: add domain, etc to this message.
             let message = ssz_encode(&producer_nonce);
-            */
-            // TODO: add domain, etc to this message.
-            let message = ssz_encode(&slot);
-            println!("validator randao: {:?}", &message);
+
             match self.signer.bls_sign(&message) {
                 None => return Ok(PollOutcome::SignerRejection(slot)),
                 Some(signature) => signature,
             }
         };
-        println!("validator pubkey: {:?}", &self.pubkey);
 
         if let Some(block) = self
             .beacon_node