fix

ethereum · May 2, 2023 · 06c795d · 06c795d
1 parent 03ca495
commit 06c795d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -478,11 +478,9 @@ func (s *StateDB) SendAll(addr common.Address) bool {
 	if stateObject == nil {
 		return false
 	}
-	stateObject.sendalled = true
-	stateObject.data.Balance = new(big.Int)
 
+	stateObject.sendalled = true
 	return true
-
 }
 
 // SetTransientState sets transient storage for a given account. It

diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -835,6 +835,7 @@ func opSelfdestruct6780(pc *uint64, interpreter *EVMInterpreter, scope *ScopeCon
 	}
 	beneficiary := scope.Stack.pop()
 	balance := interpreter.evm.StateDB.GetBalance(scope.Contract.Address())
+	interpreter.evm.StateDB.SubBalance(scope.Contract.Address(), balance)
 	interpreter.evm.StateDB.AddBalance(beneficiary.Bytes20(), balance)
 	interpreter.evm.StateDB.SendAll(scope.Contract.Address())
 	if tracer := interpreter.evm.Config.Tracer; tracer != nil {

diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go
@@ -396,7 +396,7 @@ var opCodeToString = map[OpCode]string{
 	STATICCALL:   "STATICCALL",
 	REVERT:       "REVERT",
 	INVALID:      "INVALID",
-	SELFDESTRUCT: "SELFDESTRUCT", // TODO: rename to self-destruct after EIP-4758 goes in
+	SELFDESTRUCT: "SELFDESTRUCT",
 }
 
 func (op OpCode) String() string {