Merge pull request ethereum#5 from zama-ai/petar/protected-storage-su…

…icide Destruct protected storage on `selfdestruct()`
sbellem · Dec 5, 2022 · cebcc47 · cebcc47
2 parents d053296 + 505c3b7
commit cebcc47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -973,10 +973,13 @@ func opSelfdestruct(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext
 	if interpreter.readOnly {
 		return nil, ErrWriteProtection
 	}
+	protectedStorage := crypto.CreateProtectedStorageContractAddress(scope.Contract.Address())
 	beneficiary := scope.Stack.pop()
 	balance := interpreter.evm.StateDB.GetBalance(scope.Contract.Address())
+	balance.Add(balance, interpreter.evm.StateDB.GetBalance(protectedStorage))
 	interpreter.evm.StateDB.AddBalance(beneficiary.Bytes20(), balance)
 	interpreter.evm.StateDB.Suicide(scope.Contract.Address())
+	interpreter.evm.StateDB.Suicide(protectedStorage)
 	if interpreter.cfg.Debug {
 		interpreter.cfg.Tracer.CaptureEnter(SELFDESTRUCT, scope.Contract.Address(), beneficiary.Bytes20(), []byte{}, 0, balance)
 		interpreter.cfg.Tracer.CaptureExit([]byte{}, 0, nil)

diff --git a/tests/solidity/zama/handles.sol b/tests/solidity/zama/handles.sol
@@ -43,9 +43,11 @@ contract HandleOwner is Precompiles {
     uint256 public handle;
     uint256 public bogus_handle = 42;
     Callee callee;
+    address payable owner;
 
     constructor(address callee_addr) {
         callee = Callee(callee_addr);
+        owner = payable(msg.sender);
     }
 
     function store(bytes memory ciphertext) public {
@@ -89,6 +91,11 @@ contract HandleOwner is Precompiles {
         uint256 h = handle + 1;
         return h;
     }
+
+    function destruct() public {
+        require(msg.sender == owner);
+        selfdestruct(owner);
+    }
 }
 
 contract Callee is Precompiles {