Moved 0 check to state object for now

1 files changed, 7 insertions, 0 deletions

diff --git a/ethchain/state_object.go b/ethchain/state_object.go
index 5b64c3b37..17391963f 100644
--- a/ethchain/state_object.go
+++ b/ethchain/state_object.go
@@ -90,6 +90,13 @@ func (c *StateObject) SetAddr(addr []byte, value interface{}) {
 
 func (c *StateObject) SetStorage(num *big.Int, val *ethutil.Value) {
 	addr := ethutil.BigToBytes(num, 256)
+
+	// FIXME This should be handled in the Trie it self
+	if val.BigInt().Cmp(ethutil.Big0) == 0 {
+		c.state.trie.Delete(string(addr))
+		return
+	}
+
 	//fmt.Printf("sstore %x => %v\n", addr, val)
 	c.SetAddr(addr, val)
 }