New AA Work

core/vm/contract.go

@@ -58,6 +58,8 @@ type Contract struct {
 	CodeAddr *common.Address
 	Input    []byte
 
+	Indestructible bool
+
 	Gas   uint64
 	value *big.Int
 }

core/vm/eips.go

@@ -30,6 +30,7 @@ var activators = map[int]func(*JumpTable){
 	1884: enable1884,
 	1344: enable1344,
 	2315: enable2315,
+	2937: enable2937,
 }
 
 // EnableEIP enables the given EIP on the config.
@@ -44,10 +45,13 @@ func EnableEIP(eipNum int, jt *JumpTable) error {
 	return nil
 }
 
+// ValidEip checks if an eip is in the activators table
 func ValidEip(eipNum int) bool {
 	_, ok := activators[eipNum]
 	return ok
 }
+
+// ActivateableEips returns the available activatble eips
 func ActivateableEips() []string {
 	var nums []string
 	for k := range activators {
@@ -83,8 +87,20 @@ func opSelfBalance(pc *uint64, interpreter *EVMInterpreter, callContext *callCtx
 	return nil, nil
 }
 
+// enable2937 applies EIP-2937 (SET_INDESRUCTIBLE Opcode)
+// - Adds an opcode that prevents contract from calling SELFDESTRUCT (0xFF)
+func enable2937(jt *JumpTable) {
+	// New opcode
+	jt[SETINDESTRUCTIBLE] = &operation{
+		execute:     opSetIndestructible,
+		constantGas: GasQuickStep,
+		minStack:    minStack(0, 1),
+		maxStack:    maxStack(0, 1),
+	}
+}
+
 // enable1344 applies EIP-1344 (ChainID Opcode)
-// - Adds an opcode that returns the current chain’s EIP-155 unique identifier
+// - Adds an opcode that returns the current chain's EIP-155 unique identifier
 func enable1344(jt *JumpTable) {
 	// New opcode
 	jt[CHAINID] = &operation{
@@ -95,10 +111,16 @@ func enable1344(jt *JumpTable) {
 	}
 }
 
+// opSetIndestructible implements forbidding a contract from calling SELFDESTRUCT
+func opSetIndestructible(pc *uint64, interpreter *EVMInterpreter, callContext *callCtx) ([]byte, error) {
+	callContext.contract.Indestructible = true
+	return nil, nil
+}
+
 // opChainID implements CHAINID opcode
 func opChainID(pc *uint64, interpreter *EVMInterpreter, callContext *callCtx) ([]byte, error) {
-	chainId, _ := uint256.FromBig(interpreter.evm.chainConfig.ChainID)
-	callContext.stack.push(chainId)
+	chainID, _ := uint256.FromBig(interpreter.evm.chainConfig.ChainID)
+	callContext.stack.push(chainID)
 	return nil, nil
 }
 

core/vm/errors.go

@@ -39,6 +39,7 @@ var (
 	ErrGasUintOverflow          = errors.New("gas uint64 overflow")
 	ErrInvalidRetsub            = errors.New("invalid retsub")
 	ErrReturnStackExceeded      = errors.New("return stack limit reached")
+	ErrContractIndestructible   = errors.New("contract is indestructible")
 )
 
 // ErrStackUnderflow wraps an evm error when the items on the stack less

core/vm/instructions.go

@@ -815,11 +815,14 @@ func opStop(pc *uint64, interpreter *EVMInterpreter, callContext *callCtx) ([]by
 }
 
 func opSuicide(pc *uint64, interpreter *EVMInterpreter, callContext *callCtx) ([]byte, error) {
-	beneficiary := callContext.stack.pop()
-	balance := interpreter.evm.StateDB.GetBalance(callContext.contract.Address())
-	interpreter.evm.StateDB.AddBalance(common.Address(beneficiary.Bytes20()), balance)
-	interpreter.evm.StateDB.Suicide(callContext.contract.Address())
-	return nil, nil
+	if !callContext.contract.Indestructible {
+		beneficiary := callContext.stack.pop()
+		balance := interpreter.evm.StateDB.GetBalance(callContext.contract.Address())
+		interpreter.evm.StateDB.AddBalance(common.Address(beneficiary.Bytes20()), balance)
+		interpreter.evm.StateDB.Suicide(callContext.contract.Address())
+		return nil, nil
+	}
+	return nil, ErrContractIndestructible
 }
 
 // following functions are used by the instruction jump  table
@@ -855,7 +858,7 @@ func opPush1(pc *uint64, interpreter *EVMInterpreter, callContext *callCtx) ([]b
 		codeLen = uint64(len(callContext.contract.Code))
 		integer = new(uint256.Int)
 	)
-	*pc += 1
+	*pc++
 	if *pc < codeLen {
 		callContext.stack.push(integer.SetUint64(uint64(callContext.contract.Code[*pc])))
 	} else {

core/vm/jump_table.go

@@ -57,11 +57,20 @@ var (
 	constantinopleInstructionSet   = newConstantinopleInstructionSet()
 	istanbulInstructionSet         = newIstanbulInstructionSet()
 	yoloV2InstructionSet           = newYoloV2InstructionSet()
+	bastanchuryInstructionSet      = newBastanchuryInstructionSet()
 )
 
 // JumpTable contains the EVM opcodes supported at a given fork.
 type JumpTable [256]*operation
 
+// newBastanchuryInstructionSet returns the instruction set containing
+// - "EIP-2937: SET_INDESTRUCTIBLE opcode"
+func newBastanchuryInstructionSet() JumpTable {
+	instructionSet := newYoloV2InstructionSet()
+	enable2937(&instructionSet)
+	return instructionSet
+}
+
 // newYoloV2InstructionSet creates an instructionset containing
 // - "EIP-2315: Simple Subroutines"
 // - "EIP-2929: Gas cost increases for state access opcodes"