GH-606: Initialize start_block to none to use latest block

masq/src/commands/configuration_command.rs

@@ -131,7 +131,10 @@ impl ConfigurationCommand {
  dump_parameter_line(
  stream,
  "Start block:",
- &configuration.start_block.to_string(),
+ &configuration
+ .start_block_opt
+ .map(|m| m.separate_with_commas())
+ .unwrap_or_else(|| "[Latest]".to_string()),
  );
  Self::dump_value_list(stream, "Past neighbors:", &configuration.past_neighbors);
  let payment_thresholds = Self::preprocess_combined_parameters({
@@ -333,7 +336,7 @@ mod tests {
  exit_byte_rate: 129000000,
  exit_service_rate: 160000000,
  },
-start_block: 3456,
+start_block_opt: None,
  scan_intervals: UiScanIntervals {
  pending_payable_sec: 150500,
  payable_sec: 155000,
@@ -378,7 +381,7 @@ mod tests {
 |Max block count: [Unlimited]\n\
 |Neighborhood mode: standard\n\
 |Port mapping protocol: PCP\n\
-|Start block: 3456\n\
+|Start block: [Latest]\n\
 |Past neighbors: neighbor 1\n\
 | neighbor 2\n\
 |Payment thresholds: \n\
@@ -433,7 +436,7 @@ mod tests {
  exit_byte_rate: 20,
  exit_service_rate: 30,
  },
-start_block: 3456,
+start_block_opt: Some(1234567890u64),
  scan_intervals: UiScanIntervals {
  pending_payable_sec: 1000,
  payable_sec: 1000,
@@ -476,7 +479,7 @@ mod tests {
 |Max block count: 100,000\n\
 |Neighborhood mode: zero-hop\n\
 |Port mapping protocol: PCP\n\
-|Start block: 3456\n\
+|Start block: 1,234,567,890\n\
 |Past neighbors: [?]\n\
 |Payment thresholds: \n\
 | Debt threshold: 2,500 gwei\n\

masq/src/commands/set_configuration_command.rs

@@ -7,6 +7,7 @@ use masq_lib::shared_schema::gas_price_arg;
 use masq_lib::shared_schema::min_hops_arg;
 use masq_lib::short_writeln;
 use masq_lib::utils::ExpectValue;
+use std::num::IntErrorKind;
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct SetConfigurationCommand {
@@ -35,9 +36,17 @@ impl SetConfigurationCommand {
 }
 
 fn validate_start_block(start_block: String) -> Result<(), String> {
- match start_block.parse::<u64>() {
- Ok(_) => Ok(()),
- _ => Err(start_block),
+ if "latest".eq_ignore_ascii_case(&start_block) || "none".eq_ignore_ascii_case(&start_block) {
+ Ok(())
+ } else {
+ match start_block.parse::<u64>() {
+ Ok(_) => Ok(()),
+ Err(e) if e.kind() == &IntErrorKind::PosOverflow => Err(
+ format!("Unable to parse '{}' into a starting block number or provide 'none' or 'latest' for the latest block number: digits exceed {}.",
+ start_block, u64::MAX),
+ ),
+ Err(e) => Err(format!("Unable to parse '{}' into a starting block number or provide 'none' or 'latest' for the latest block number: {}.", start_block, e))
+ }
  }
 }
 
@@ -59,7 +68,7 @@ impl Command for SetConfigurationCommand {
 const SET_CONFIGURATION_ABOUT: &str =
  "Sets Node configuration parameters being enabled for this operation when the Node is running.";
 const START_BLOCK_HELP: &str =
- "Ordinal number of the Ethereum block where scanning for transactions will start.";
+ "Ordinal number of the Ethereum block where scanning for transactions will start. Use 'latest' or 'none' for Latest block.";
 
 pub fn set_configurationify<'a>(shared_schema_arg: Arg<'a, 'a>) -> Arg<'a, 'a> {
  shared_schema_arg.takes_value(true).min_values(1)
@@ -103,7 +112,7 @@ mod tests {
  );
  assert_eq!(
  START_BLOCK_HELP,
- "Ordinal number of the Ethereum block where scanning for transactions will start."
+ "Ordinal number of the Ethereum block where scanning for transactions will start. Use 'latest' or 'none' for Latest block."
  );
  }
 
@@ -122,10 +131,28 @@ mod tests {
  assert!(result.contains("cannot be used with one or more of the other specified arguments"));
  }
 
+ #[test]
+ fn validate_start_block_catches_invalid_values() {
+ assert_eq!(validate_start_block("abc".to_string()), Err("Unable to parse 'abc' into a starting block number or provide 'none' or 'latest' for the latest block number: invalid digit found in string.".to_string()));
+ assert_eq!(validate_start_block("918446744073709551615".to_string()), Err("Unable to parse '918446744073709551615' into a starting block number or provide 'none' or 'latest' for the latest block number: digits exceed 18446744073709551615.".to_string()));
+ assert_eq!(validate_start_block("123,456,789".to_string()), Err("Unable to parse '123,456,789' into a starting block number or provide 'none' or 'latest' for the latest block number: invalid digit found in string.".to_string()));
+ assert_eq!(validate_start_block("123'456'789".to_string()), Err("Unable to parse '123'456'789' into a starting block number or provide 'none' or 'latest' for the latest block number: invalid digit found in string.".to_string()));
+ }
  #[test]
  fn validate_start_block_works() {
- assert!(validate_start_block("abc".to_string()).is_err());
- assert!(validate_start_block("1566".to_string()).is_ok());
+ assert_eq!(
+ validate_start_block("18446744073709551615".to_string()),
+ Ok(())
+ );
+ assert_eq!(validate_start_block("1566".to_string()), Ok(()));
+ assert_eq!(validate_start_block("none".to_string()), Ok(()));
+ assert_eq!(validate_start_block("None".to_string()), Ok(()));
+ assert_eq!(validate_start_block("NONE".to_string()), Ok(()));
+ assert_eq!(validate_start_block("nOnE".to_string()), Ok(()));
+ assert_eq!(validate_start_block("latest".to_string()), Ok(()));
+ assert_eq!(validate_start_block("LATEST".to_string()), Ok(()));
+ assert_eq!(validate_start_block("LaTeST".to_string()), Ok(()));
+ assert_eq!(validate_start_block("lATEst".to_string()), Ok(()));
  }
 
  #[test]

masq_lib/src/messages.rs

@@ -492,7 +492,7 @@ pub struct UiConfigurationResponse {
  #[serde(rename = "portMappingProtocol")]
  pub port_mapping_protocol_opt: Option<String>,
  #[serde(rename = "startBlock")]
- pub start_block: u64,
+ pub start_block_opt: Option<u64>,
  #[serde(rename = "consumingWalletPrivateKeyOpt")]
  pub consuming_wallet_private_key_opt: Option<String>,
  // This item is calculated from the private key, not stored in the database, so that

multinode_integration_tests/docker/blockchain/Dockerfile

@@ -1,8 +1,8 @@
 # Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
-FROM trufflesuite/ganache-cli:v6.7.0
+FROM trufflesuite/ganache-cli:v6.12.2
 
 ADD ./entrypoint.sh /app/
 
 EXPOSE 18545
 
-ENTRYPOINT /app/entrypoint.sh
+ENTRYPOINT ["/app/entrypoint.sh"]

multinode_integration_tests/docker/blockchain/entrypoint.sh

@@ -1,3 +1,8 @@
 #!/bin/sh
 
-node /app/ganache-core.docker.cli.js -p 18545 --networkId 2 --verbose --mnemonic "timber cage wide hawk phone shaft pattern movie army dizzy hen tackle lamp absent write kind term toddler sphere ripple idle dragon curious hold"
+node /app/ganache-core.docker.cli.js \
+ -h 0.0.0.0 \
+ -p 18545 \
+ --networkId 2 \
+ --verbose \
+ --mnemonic "timber cage wide hawk phone shaft pattern movie army dizzy hen tackle lamp absent write kind term toddler sphere ripple idle dragon curious hold"

multinode_integration_tests/src/main.rs

@@ -1,11 +1,10 @@
 // Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved.
 
-use self::sub_lib::utils::indicates_dead_stream;
 use masq_lib::command::{Command, StdStreams};
 use masq_lib::constants::{HIGHEST_USABLE_PORT, LOWEST_USABLE_INSECURE_PORT};
-use node_lib::sub_lib;
 use node_lib::sub_lib::framer::Framer;
 use node_lib::sub_lib::node_addr::NodeAddr;
+use node_lib::sub_lib::utils::indicates_dead_stream;
 use node_lib::test_utils::data_hunk::DataHunk;
 use node_lib::test_utils::data_hunk_framer::DataHunkFramer;
 use std::borrow::BorrowMut;
@@ -14,10 +13,9 @@ use std::env;
 use std::io;
 use std::io::Read;
 use std::io::Write;
-use std::net::Shutdown;
-use std::net::SocketAddr;
 use std::net::TcpListener;
 use std::net::TcpStream;
+use std::net::{Shutdown, SocketAddr};
 use std::process;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex, MutexGuard};
@@ -223,10 +221,10 @@ impl MockNode {
  }
 
  fn usage(stderr: &mut dyn Write) -> u8 {
- writeln!(stderr, "Usage: MockNode <IP address>:<port>/<port>/... where <IP address> is the address MockNode is running on and <port> is between {} and {}",
- LOWEST_USABLE_INSECURE_PORT,
- HIGHEST_USABLE_PORT,
- ).unwrap();
+ writeln!(stderr, "Usage: MockNode <IP address>:<port>/<port>/... where <IP address> is the address MockNode is running on and <port> is between {} and {}",
+LOWEST_USABLE_INSECURE_PORT,
+HIGHEST_USABLE_PORT,
+ ).unwrap();
  1
  }
 
@@ -369,7 +367,7 @@ mod tests {
 
  assert_eq!(result, 1);
  let stderr = holder.stderr;
- assert_eq!(stderr.get_string(), String::from("Usage: MockNode <IP address>:<port>/<port>/... where <IP address> is the address MockNode is running on and <port> is between 1025 and 65535\n\n"));
+ assert_eq!(stderr.get_string(), String::from("Usage: MockNode <IP address>:<port>/<port>/... where <IP address> is the address MockNode is running on and <port> is between 1025 and 65535\n\n"));
  }
 
  #[test]

multinode_integration_tests/src/mock_blockchain_client_server.rs

@@ -241,8 +241,10 @@ impl MockBlockchainClientServer {
  let mut requests = requests_arc.lock().unwrap();
  requests.push(body);
  }
- let response = responses.remove(0);
- Self::send_body(conn_state, response);
+ if !responses.is_empty() {
+ let response = responses.remove(0);
+ Self::send_body(conn_state, response);
+ }
  let _ = notifier_tx.send(()); // receiver doesn't exist if test didn't set it up
  }
  None => (),
@@ -437,7 +439,7 @@ mod tests {
  .response("Thank you and good night", 40)
  .start();
  let mut client = connect(port);
- client.write(b"POST /biddle HTTP/1.1\r\nContent-Length: 5\r\n\r\nfirstPOST /biddle HTTP/1.1\r\nContent-Length: 6\r\n\r\nsecond").unwrap();
+ client.write(b"POST /biddle HTTP/1.1\r\nContent-Length: 5\r\n\r\nfirstPOST /biddle HTTP/1.1\r\nContent-Length: 6\r\n\r\nsecond").unwrap();
 
  let (_, body) = receive_response(&mut client);
  assert_eq!(
@@ -567,7 +569,7 @@ mod tests {
  assert_eq!(notified.try_recv().is_err(), true);
 
  let requests = subject.requests();
- assert_eq!(requests, vec![
+ assert_eq!(requests, vec![
  "POST /biddle HTTP/1.1\r\nContent-Type: application-json\r\nContent-Length: 82\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\": \"first\", \"params\": [\"biddle\", \"de\", \"bee\"], \"id\": 40}".to_string(),
  "POST /biddle HTTP/1.1\r\nContent-Type: application-json\r\nContent-Length: 48\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\": \"second\", \"id\": 42}".to_string(),
  "POST /biddle HTTP/1.1\r\nContent-Type: application-json\r\nContent-Length: 47\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\": \"third\", \"id\": 42}".to_string(),
@@ -600,7 +602,7 @@ mod tests {
  r#"{"jsonrpc": "2.0", "result": {"name":"Billy","age":15}, "id": 42}"#
  );
  let requests = subject.requests();
- assert_eq!(requests, vec![
+ assert_eq!(requests, vec![
  "POST / HTTP/1.1\r\ncontent-type: application/json\r\nuser-agent: web3.rs\r\nhost: 172.18.0.1:32768\r\ncontent-length: 308\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"eth_getLogs\",\"params\":[{\"address\":\"0x59882e4a8f5d24643d4dda422922a870f1b3e664\",\"fromBlock\":\"0x3e8\",\"toBlock\":\"latest\",\"topics\":[\"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef\",null,\"0x00000000000000000000000027d9a2ac83b493f88ce9b4532edcf74e95b9788d\"]}],\"id\":0}".to_string()
  ])
  }
@@ -704,6 +706,6 @@ mod tests {
  body.len(),
  body
  )
- .into_bytes()
+.into_bytes()
  }
 }

multinode_integration_tests/tests/verify_bill_payment.rs

@@ -38,10 +38,7 @@ use web3::Web3;
 
 #[test]
 fn verify_bill_payment() {
- let mut cluster = match MASQNodeCluster::start() {
- Ok(cluster) => cluster,
- Err(e) => panic!("{}", e),
- };
+ let mut cluster = MASQNodeCluster::start().unwrap();
  let blockchain_server = BlockchainServer {
  name: "ganache-cli",
  };
@@ -64,7 +61,7 @@ fn verify_bill_payment() {
  assert_balances(
  &contract_owner_wallet,
  &blockchain_interface,
- "99998043204000000000",
+ "99998381140000000000",
  "472000000000000000000000000",
  );
  let payment_thresholds = PaymentThresholds {
@@ -189,7 +186,7 @@ fn verify_bill_payment() {
  assert_balances(
  &contract_owner_wallet,
  &blockchain_interface,
- "99998043204000000000",
+ "99998381140000000000",
  "472000000000000000000000000",
  );
 
@@ -235,7 +232,7 @@ fn verify_bill_payment() {
  assert_balances(
  &contract_owner_wallet,
  &blockchain_interface,
- "99997886466000000000",
+ "99998223682000000000",
  "471999999700000000000000000",
  );
 
@@ -330,7 +327,7 @@ fn assert_balances(
  assert_eq!(
  format!("{}", eth_balance),
  String::from(expected_eth_balance),
- "Actual EthBalance {} doesn't much with expected {}",
+ "Actual EthBalance {} doesn't match with expected {}",
  eth_balance,
  expected_eth_balance
  );

node/src/accountant/mod.rs

@@ -1056,6 +1056,7 @@ mod tests {
  use crate::blockchain::test_utils::{make_tx_hash, BlockchainInterfaceMock};
  use crate::database::rusqlite_wrappers::TransactionSafeWrapper;
  use crate::database::test_utils::transaction_wrapper_mock::TransactionInnerWrapperMockBuilder;
+ use crate::db_config::config_dao::ConfigDaoRecord;
  use crate::db_config::mocks::ConfigDaoMock;
  use crate::match_every_type_id;
  use crate::sub_lib::accountant::{
@@ -1373,7 +1374,11 @@ mod tests {
  config.suppress_initial_scans = true;
  let subject = AccountantBuilder::default()
  .bootstrapper_config(config)
- .config_dao(ConfigDaoMock::new().set_result(Ok(())))
+ .config_dao(
+ ConfigDaoMock::new()
+ .get_result(Ok(ConfigDaoRecord::new("start_block", None, false)))
+ .set_result(Ok(())),
+ )
  .build();
  let (ui_gateway, _, ui_gateway_recording_arc) = make_recorder();
  let subject_addr = subject.start();
@@ -1991,6 +1996,7 @@ mod tests {
  ) {
  let more_money_received_params_arc = Arc::new(Mutex::new(vec![]));
  let commit_params_arc = Arc::new(Mutex::new(vec![]));
+ let get_params_arc = Arc::new(Mutex::new(vec![]));
  let set_by_guest_transaction_params_arc = Arc::new(Mutex::new(vec![]));
  let now = SystemTime::now();
  let earning_wallet = make_wallet("earner3000");
@@ -2014,6 +2020,8 @@ mod tests {
  .more_money_received_params(&more_money_received_params_arc)
  .more_money_received_result(wrapped_transaction);
  let config_dao = ConfigDaoMock::new()
+ .get_params(&get_params_arc)
+ .get_result(Ok(ConfigDaoRecord::new("start_block", None, false)))
  .set_by_guest_transaction_params(&set_by_guest_transaction_params_arc)
  .set_by_guest_transaction_result(Ok(()));
  let accountant = AccountantBuilder::default()
@@ -2028,7 +2036,7 @@ mod tests {
  .try_send(ReceivedPayments {
  timestamp: now,
  payments: vec![expected_receivable_1.clone(), expected_receivable_2.clone()],
- new_start_block: 123456789,
+ new_start_block: 123456789u64,
  response_skeleton_opt: None,
  })
  .expect("unexpected actix error");
@@ -4774,6 +4782,7 @@ mod tests {
  let factory = Accountant::dao_factory(data_dir);
  factory.make();
  };
+
  assert_on_initialization_with_panic_on_migration(&data_dir, &act);
  }
 }