Filling-in optional fields of TransactionRequest...

parity/rpc_apis.rs

@@ -147,7 +147,7 @@ pub fn setup_rpc<T: Extendable>(server: T, deps: Arc<Dependencies>, apis: ApiSet
 				server.add_delegate(EthFilterClient::new(&deps.client, &deps.miner).to_delegate());
 
 				if deps.signer_port.is_some() {
-					server.add_delegate(EthSigningQueueClient::new(&deps.signer_queue).to_delegate());
+					server.add_delegate(EthSigningQueueClient::new(&deps.signer_queue, &deps.miner).to_delegate());
 				} else {
 					server.add_delegate(EthSigningUnsafeClient::new(&deps.client, &deps.secret_store, &deps.miner).to_delegate());
 				}

rpc/src/v1/impls/eth_signing.rs

@@ -24,25 +24,40 @@ use util::numbers::*;
 use util::keys::store::AccountProvider;
 use v1::helpers::{SigningQueue, ConfirmationsQueue};
 use v1::traits::EthSigning;
-use v1::types::TransactionRequest;
+use v1::types::{TransactionRequest, Bytes};
 use v1::impls::{sign_and_dispatch, error_codes};
 
 
 /// Implementation of functions that require signing when no trusted signer is used.
-pub struct EthSigningQueueClient {
+pub struct EthSigningQueueClient<M: MinerService> {
 	queue: Weak<ConfirmationsQueue>,
+	miner: Weak<M>,
 }
 
-impl EthSigningQueueClient {
+impl<M: MinerService> EthSigningQueueClient<M> {
 	/// Creates a new signing queue client given shared signing queue.
-	pub fn new(queue: &Arc<ConfirmationsQueue>) -> Self {
+	pub fn new(queue: &Arc<ConfirmationsQueue>, miner: &Arc<M>) -> Self {
 		EthSigningQueueClient {
 			queue: Arc::downgrade(queue),
+			miner: Arc::downgrade(miner),
+		}
+	}
+
+	fn fill_optional_fields(&self, miner: Arc<M>, mut request: TransactionRequest) -> TransactionRequest {
+		if let None = request.gas {
+			request.gas = Some(miner.sensible_gas_limit());
+		}
+		if let None = request.gas_price {
+			request.gas_price = Some(miner.sensible_gas_price());
+		}
+		if let None = request.data {
+			request.data = Some(Bytes::new(Vec::new()));
 		}
+		request
 	}
 }
 
-impl EthSigning for EthSigningQueueClient  {
+impl<M: MinerService + 'static> EthSigning for EthSigningQueueClient<M>  {
 
 	fn sign(&self, _params: Params) -> Result<Value, Error> {
 		warn!("Invoking eth_sign is not yet supported with signer enabled.");
@@ -54,6 +69,8 @@ impl EthSigning for EthSigningQueueClient  {
 		from_params::<(TransactionRequest, )>(params)
 			.and_then(|(request, )| {
 				let queue = take_weak!(self.queue);
+				let miner = take_weak!(self.miner);
+				let request = self.fill_optional_fields(miner, request);
 				let id = queue.add_request(request);
 				let result = id.wait_with_timeout();
 				result.unwrap_or_else(|| to_value(&H256::new()))

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

@@ -19,21 +19,25 @@ use jsonrpc_core::IoHandler;
 use v1::impls::EthSigningQueueClient;
 use v1::traits::EthSigning;
 use v1::helpers::{ConfirmationsQueue, SigningQueue};
+use v1::tests::helpers::TestMinerService;
 use util::keys::TestAccount;
 
 struct EthSigningTester {
 	pub queue: Arc<ConfirmationsQueue>,
+	pub miner: Arc<TestMinerService>,
 	pub io: IoHandler,
 }
 
 impl Default for EthSigningTester {
 	fn default() -> Self {
 		let queue = Arc::new(ConfirmationsQueue::default());
+		let miner = Arc::new(TestMinerService::default());
 		let io = IoHandler::new();
-		io.add_delegate(EthSigningQueueClient::new(&queue).to_delegate());
+		io.add_delegate(EthSigningQueueClient::new(&queue, &miner).to_delegate());
 
 		EthSigningTester {
 			queue: queue,
+			miner: miner,
 			io: io,
 		}
 	}

sync/src/chain.rs

@@ -458,12 +458,12 @@ impl ChainSync {
 		// Disable the peer for this syncing round if it gives invalid chain
 		if !valid_response {
 			trace!(target: "sync", "{} Deactivated for invalid headers response", peer_id);
-			self.deactivate_peer(io, peer_id); 
+			self.deactivate_peer(io, peer_id);
 		}
 		if headers.is_empty() {
 			// Peer does not have any new subchain heads, deactivate it nd try with another
 			trace!(target: "sync", "{} Deactivated for no data", peer_id);
-			self.deactivate_peer(io, peer_id); 
+			self.deactivate_peer(io, peer_id);
 		}
 		match self.state {
 			SyncState::ChainHead => {