From d743df549bfbcceed223b25097ee117a9005b71c Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Tue, 25 Jun 2019 09:14:16 +0200
Subject: [PATCH] Treat empty account the same as non-exist accounts in
 EIP-1052 (#10775)

---
 ethcore/src/externalities.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
index 54c913c73..2d831290a 100644
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
@@ -315,7 +315,11 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 	}
 
 	fn extcodehash(&self, address: &Address) -> vm::Result<Option<H256>> {
-		Ok(self.state.code_hash(address)?)
+		if self.state.exists_and_not_null(address)? {
+			Ok(self.state.code_hash(address)?)
+		} else {
+			Ok(None)
+		}
 	}
 
 	fn extcodesize(&self, address: &Address) -> vm::Result<Option<usize>> {