Merge pull request #744 from silasdavis/key-removal

Ensure storing zero value removes the key rather than panics

account/state/state.go

@@ -33,7 +33,7 @@ type StorageGetter interface {
 }
 
 type StorageSetter interface {
-	// Store a 32-byte value at key for the account at address
+	// Store a 32-byte value at key for the account at address, setting to Zero256 removes the key
 	SetStorage(address acm.Address, key, value binary.Word256) error
 }
 

execution/state.go

@@ -235,7 +235,11 @@ func (s *State) GetStorage(address acm.Address, key binary.Word256) (binary.Word
 func (s *State) SetStorage(address acm.Address, key, value binary.Word256) error {
 	s.Lock()
 	defer s.Unlock()
-	s.tree.Set(prefixedKey(storagePrefix, address.Bytes(), key.Bytes()), value.Bytes())
+	if value == binary.Zero256 {
+		s.tree.Remove(key.Bytes())
+	} else {
+		s.tree.Set(prefixedKey(storagePrefix, address.Bytes(), key.Bytes()), value.Bytes())
+	}
 	return nil
 }