Treat empty account the same as non-exist accounts in EIP-1052 (#10775)

openethereum · Jun 25, 2019 · 8560755 · 8560755
1 parent 06939d8
commit 8560755
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
@@ -314,7 +314,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>> {