Fix RPC errors. Implement geth-compatibility option to return correct pending nonce. (#4837)

rpc/src/v1/tests/helpers/miner_service.rs

@@ -16,6 +16,7 @@
 
 //! Test implementation of miner service.
 
+use std::collections::hash_map::Entry;
 use util::{Address, H256, Bytes, U256, FixedHash, Uint};
 use util::standard::*;
 use ethcore::error::{Error, CallError};
@@ -72,6 +73,22 @@ impl Default for TestMinerService {
 	}
 }
 
+impl TestMinerService {
+	/// Increments last nonce for given address.
+	pub fn increment_last_nonce(&self, address: Address) {
+		let mut last_nonces = self.last_nonces.write();
+		match last_nonces.entry(address) {
+			Entry::Occupied(mut occupied) => {
+				let val = *occupied.get();
+				*occupied.get_mut() = val + 1.into();
+			},
+			Entry::Vacant(vacant) => {
+				vacant.insert(0.into());
+			},
+		}
+	}
+}
+
 impl MinerService for TestMinerService {
 
 	/// Returns miner's status.

rpc/src/v1/tests/mocked/eth.rs

@@ -468,6 +468,32 @@ fn rpc_eth_transaction_count() {
 	assert_eq!(EthTester::default().io.handle_request_sync(request), Some(response.to_owned()));
 }
 
+#[test]
+fn rpc_eth_transaction_count_next_nonce() {
+	let tester = EthTester::new_with_options(EthClientOptions::with(|mut options| {
+		options.pending_nonce_from_queue = true;
+	}));
+	tester.miner.increment_last_nonce(1.into());
+
+	let request1 = r#"{
+		"jsonrpc": "2.0",
+		"method": "eth_getTransactionCount",
+		"params": ["0x0000000000000000000000000000000000000001", "pending"],
+		"id": 1
+	}"#;
+	let response1 = r#"{"jsonrpc":"2.0","result":"0x1","id":1}"#;
+	assert_eq!(tester.io.handle_request_sync(request1), Some(response1.to_owned()));
+
+	let request2 = r#"{
+		"jsonrpc": "2.0",
+		"method": "eth_getTransactionCount",
+		"params": ["0x0000000000000000000000000000000000000002", "pending"],
+		"id": 1
+	}"#;
+	let response2 = r#"{"jsonrpc":"2.0","result":"0x0","id":1}"#;
+	assert_eq!(tester.io.handle_request_sync(request2), Some(response2.to_owned()));
+}
+
 #[test]
 fn rpc_eth_block_transaction_count_by_hash() {
 	let request = r#"{
@@ -1076,10 +1102,9 @@ fn rpc_get_work_returns_correct_work_package() {
 
 #[test]
 fn rpc_get_work_should_not_return_block_number() {
-	let eth_tester = EthTester::new_with_options(EthClientOptions {
-		allow_pending_receipt_query: true,
-		send_block_number_in_get_work: false,
-	});
+	let eth_tester = EthTester::new_with_options(EthClientOptions::with(|mut options| {
+		options.send_block_number_in_get_work = false;
+	}));
 	eth_tester.miner.set_author(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap());
 
 	let request = r#"{"jsonrpc": "2.0", "method": "eth_getWork", "params": [], "id": 1}"#;