From 9b6034b216e9e52faefe4958915a6c187d5d625f Mon Sep 17 00:00:00 2001
From: Jonathan Downing <jonathan@dominantstrategies.io>
Date: Wed, 21 Aug 2024 12:19:37 -0500
Subject: [PATCH] Add suicide mechanism for accounts

---
 core/state_transition.go     | 29 +++++++++++++++++++++++++++++
 internal/quaiapi/quai_api.go |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/core/state_transition.go b/core/state_transition.go
index d32597c52c..48a56d5c8d 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -17,6 +17,7 @@
 package core
 
 import (
+	"bytes"
 	"fmt"
 	"math"
 	"math/big"
@@ -31,6 +32,7 @@ import (
 )
 
 var emptyCodeHash = crypto.Keccak256Hash(nil)
+var suicide = []byte("Suicide")
 
 /*
 The State Transitioning Model
@@ -356,6 +358,33 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 	rules := st.evm.ChainConfig().Rules(st.evm.Context.BlockNumber)
 	st.state.PrepareAccessList(msg.From(), msg.To(), vm.ActivePrecompiles(rules, st.evm.ChainConfig().Location), msg.AccessList())
 
+	if !st.msg.IsETX() && !contractCreation && len(st.data) == 27 && bytes.Equal(st.data[:7], suicide) && st.to().Equal(st.msg.From()) {
+		// Caller requests self-destruct
+		beneficiary, err := common.BytesToAddress(st.data[7:27], st.evm.ChainConfig().Location).InternalAndQuaiAddress()
+		if err != nil {
+			return nil, fmt.Errorf("Unable to self-destruct: %v", err)
+		}
+		fromInternal, err := msg.From().InternalAndQuaiAddress()
+		if err != nil {
+			return nil, fmt.Errorf("Unable to self-destruct: %v", err)
+		}
+		balance := st.evm.StateDB.GetBalance(fromInternal)
+		st.evm.StateDB.Suicide(fromInternal)
+		refund := new(big.Int).Mul(st.evm.Context.BaseFee, new(big.Int).SetUint64(params.CallNewAccountGas(st.evm.Context.QuaiStateSize)))
+		balance.Add(balance, refund)
+		st.evm.StateDB.AddBalance(beneficiary, balance)
+
+		effectiveTip := cmath.BigMin(st.gasTipCap, new(big.Int).Sub(st.gasFeeCap, st.evm.Context.BaseFee))
+		return &ExecutionResult{
+			UsedGas:      st.gasUsed(),
+			UsedState:    0,
+			Err:          nil,
+			ReturnData:   []byte{},
+			Etxs:         nil,
+			QuaiFees:     new(big.Int).Mul(new(big.Int).SetUint64(st.gasUsed()), effectiveTip),
+			ContractAddr: nil,
+		}, nil
+	}
 	var (
 		ret          []byte
 		vmerr        error // vm errors do not effect consensus and are therefore not assigned to err
diff --git a/internal/quaiapi/quai_api.go b/internal/quaiapi/quai_api.go
index ea316d8322..4216898057 100644
--- a/internal/quaiapi/quai_api.go
+++ b/internal/quaiapi/quai_api.go
@@ -19,6 +19,7 @@ package quaiapi
 import (
 	"context"
 	"errors"
+	"fmt"
 	"math/big"
 	"time"
 
@@ -910,7 +911,7 @@ func (s *PublicBlockChainQuaiAPI) CalcOrder(ctx context.Context, raw hexutil.Byt
 	}
 	_, order, err := s.b.CalcOrder(woHeader)
 	if err != nil {
-		return 0, errors.New("cannot calculate prime terminus order")
+		return 0, fmt.Errorf("cannot calculate prime terminus order: %v", err)
 	}
 	return hexutil.Uint(order), nil
 }