Merge branch 'master' into fix-rewinding

Author: magicxyyz

core/tracing/hooks.go

@@ -303,6 +303,7 @@ const (
 	BalanceChangeEscrowTransfer
 	BalanceChangeTransferBatchposterReward
 	BalanceChangeTransferBatchposterRefund
+	BalanceChangeTransferRetryableExcessRefund
 	// Stylus
 	BalanceChangeTransferActivationFee
 	BalanceChangeTransferActivationReimburse
@@ -335,7 +336,7 @@ func (b BalanceChangeReason) Str() string {
 		return "undoRefund"
 	case BalanceChangeEscrowTransfer:
 		return "escrow"
-	case BalanceChangeTransferInfraRefund, BalanceChangeTransferNetworkRefund:
+	case BalanceChangeTransferInfraRefund, BalanceChangeTransferNetworkRefund, BalanceChangeTransferRetryableExcessRefund:
 		return "refund"
 	// Batchposter
 	case BalanceChangeTransferBatchposterReward:

core/vm/instructions.go

@@ -942,8 +942,12 @@ func opSelfdestruct6780(pc *uint64, interpreter *EVMInterpreter, scope *ScopeCon
 	interpreter.evm.StateDB.AddBalance(beneficiary.Bytes20(), balance, tracing.BalanceIncreaseSelfdestruct)
 	interpreter.evm.StateDB.SelfDestruct6780(scope.Contract.Address())
 	if beneficiary.Bytes20() == scope.Contract.Address() {
-		// Arbitrum: calling selfdestruct(this) burns the balance
-		interpreter.evm.StateDB.ExpectBalanceBurn(balance.ToBig())
+		// SelfDestruct6780 only destructs the contract if selfdestructing in the same transaction as contract creation
+		// So we only account for the balance burn if the contract is actually destructed by checking if the balance is zero.
+		if interpreter.evm.StateDB.GetBalance(scope.Contract.Address()).Sign() == 0 {
+			// Arbitrum: calling selfdestruct(this) burns the balance
+			interpreter.evm.StateDB.ExpectBalanceBurn(balance.ToBig())
+		}
 	}
 	if tracer := interpreter.evm.Config.Tracer; tracer != nil {
 		if tracer.OnEnter != nil {