Merge pull request #15 from poanetwork/afck-block-num

Add an option for earliest block number.

Cargo.lock

@@ -661,7 +661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "poa-ballot-stats"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",

README.md

@@ -16,7 +16,7 @@ The `-c` option takes a map with the POA contracts' addresses in JSON format. Yo
 current maps for the main and test network the `contracts` folder. By default, it uses `core.json`,
 for the main network.
 
-The `-p` option takes a time interval in hours, days, months, etc. E.g. `-p "10 weeks"` will only count participation in ballots that were created within the last 10 weeks.
+The `-p` option takes a time interval in hours, days, months, etc. E.g. `-p "10 weeks"` will only count participation in ballots that were created within the last 10 weeks. Alternatively, instead of a _time_, you can specify the earliest block _number_ as a decimal integer with the `-b` option.
 
 Examples:
 

src/cli.rs

@@ -37,5 +37,12 @@ pub fn get_matches() -> ArgMatches<'static> {
                 .help("The period in which votes should be counted, e.g. '5 days', '2 months'.")
                 .takes_value(true),
         )
+        .arg(
+            Arg::with_name("block")
+                .short("b")
+                .long("block")
+                .help("The earliest block in which votes should be counted.")
+                .takes_value(true),
+        )
         .get_matches()
 }

src/main.rs

@@ -20,6 +20,7 @@ mod stats;
 mod util;
 mod validator;
 
+use colored::Colorize;
 use error::{Error, ErrorKind};
 use ethabi::Address;
 use stats::Stats;
@@ -91,6 +92,7 @@ fn count_votes(
     verbose: bool,
     contract_addrs: &ContractAddresses,
     start: SystemTime,
+    start_block: u64,
 ) -> Result<Stats, Error> {
     // Calls `println!` if `verbose` is `true`.
     macro_rules! vprintln { ($($arg:tt)*) => { if verbose { println!($($arg)*); } } }
@@ -131,17 +133,23 @@ fn count_votes(
     // Iterate over all ballot and voter change events.
     for log in ballot_or_change_filter.logs(&web3)? {
         event_found = true;
+        let block_num = log
+            .block_number
+            .expect("event is missing block number")
+            .into();
         if let Ok(change) = change_event.parse_log(log.clone().into_raw()) {
             // If it is a `ChangeFinalized`, update the current set of voters.
             vprintln!(
-                "• ChangeFinalized {{ new_set: {} }}",
+                "• {} ChangeFinalized {{ new_set: {} }}",
+                format!("#{}", block_num).bold(),
                 HexList(&change.new_set)
             );
             voters = change.new_set;
         } else if let Ok(init_change) = init_change_event.parse_log(log.clone().into_raw()) {
             // If it is an `InitiateChange`, update the current set of voters.
             vprintln!(
-                "• InitiateChange {{ parent_hash: {}, new_set: {} }}",
+                "• {} InitiateChange {{ parent_hash: {}, new_set: {} }}",
+                format!("#{}", block_num).bold(),
                 HexBytes(&init_change.parent_hash),
                 HexList(&init_change.new_set)
             );
@@ -158,17 +166,17 @@ fn count_votes(
             }
             prev_init_change = Some(init_change);
         } else if let Ok(ballot) = ballot_event.parse_log(log.clone().into_raw()) {
-            let block_number = web3::types::BlockNumber::Number(
-                log.block_number
-                    .expect("ballot event is missing block number")
-                    .into(),
-            );
-            if is_block_older_than(&web3, block_number, &start) {
-                vprintln!("• Ballot event too old; skipping: {:?}", ballot);
+            let block_number = web3::types::BlockNumber::Number(block_num);
+            if block_num < start_block || is_block_older_than(&web3, block_number, &start) {
+                vprintln!(
+                    "• {} Ballot event too old; skipping: {:?}",
+                    format!("#{}", block_num).bold(),
+                    ballot
+                );
                 continue;
             }
             // If it is a `BallotCreated`, find the corresponding votes and update the stats.
-            vprintln!("• {:?}", ballot);
+            vprintln!("• {} {:?}", format!("#{}", block_num).bold(), ballot);
             let votes = vote_event
                 .create_filter(ballot.id, None)
                 .logs(&web3)?
@@ -229,6 +237,12 @@ fn main() {
             SystemTime::now() - duration
         })
         .unwrap_or(UNIX_EPOCH);
-    let stats = count_votes(url, verbose, &contract_addrs, start).expect("count votes");
+    let start_block = matches.value_of("block").map_or(0, |block| {
+        block
+            .parse()
+            .expect("block number must be a non-negative integer")
+    });
+    let stats =
+        count_votes(url, verbose, &contract_addrs, start, start_block).expect("count votes");
     println!("{}", stats);
 }