From c2f4716ee2e0ed44b8f3711454314c5453125977 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Fri, 13 Jan 2017 15:30:16 +0000
Subject: [PATCH] icarus -> update, increase web timeout. (#4165)

* icarus -> update, increase web timeout.

* Fix estimate gas
---
 dapps/src/handlers/fetch.rs  | 2 +-
 ethcore/src/client/client.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dapps/src/handlers/fetch.rs b/dapps/src/handlers/fetch.rs
index 7634f1941..c3e668733 100644
--- a/dapps/src/handlers/fetch.rs
+++ b/dapps/src/handlers/fetch.rs
@@ -34,7 +34,7 @@ use endpoint::EndpointPath;
 use handlers::{ContentHandler, StreamingHandler};
 use page::{LocalPageEndpoint, PageHandlerWaiting};
 
-const FETCH_TIMEOUT: u64 = 30;
+const FETCH_TIMEOUT: u64 = 300;
 
 pub enum ValidatorResponse {
 	Local(LocalPageEndpoint),
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 20841b1fd..037106804 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -903,7 +903,7 @@ impl BlockChainClient for Client {
 
 			Executive::new(&mut state, &env_info, &*self.engine, &self.factories.vm)
 				.transact(&tx, options.clone())
-				.map(|r| r.exception.is_some())
+				.map(|r| r.exception.is_none())
 				.unwrap_or(false)
 		};