remove callex

ava-labs · Sep 18, 2024 · bb5b658 · bb5b658
1 parent 840012f
commit bb5b658
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/core/vm/eips.go b/core/vm/eips.go
@@ -169,12 +169,10 @@ func enable2929(jt *JumpTable) {
 func enableAP1(jt *JumpTable) {
 	jt[SSTORE].dynamicGas = gasSStoreAP1
 	jt[SELFDESTRUCT].dynamicGas = gasSelfdestructAP1
-	jt[CALLEX].dynamicGas = gasCallExpertAP1
 }
 
 func enableAP2(jt *JumpTable) {
 	jt[BALANCEMC] = &operation{execute: opUndefined, maxStack: maxStack(0, 0)}
-	jt[CALLEX] = &operation{execute: opUndefined, maxStack: maxStack(0, 0)}
 }
 
 // enable3198 applies EIP-3198 (BASEFEE Opcode)

diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
@@ -243,7 +243,6 @@ func newTangerineWhistleInstructionSet() JumpTable {
 	instructionSet[SLOAD].constantGas = params.SloadGasEIP150
 	instructionSet[EXTCODECOPY].constantGas = params.ExtcodeCopyBaseEIP150
 	instructionSet[CALL].constantGas = params.CallGasEIP150
-	instructionSet[CALLEX].constantGas = params.CallGasEIP150
 	instructionSet[CALLCODE].constantGas = params.CallGasEIP150
 	instructionSet[DELEGATECALL].constantGas = params.CallGasEIP150
 	return validate(instructionSet)
@@ -1053,14 +1052,6 @@ func newFrontierInstructionSet() JumpTable {
 			maxStack:    maxStack(7, 1),
 			memorySize:  memoryCall,
 		},
-		CALLEX: {
-			execute:     opCallExpert,
-			constantGas: params.CallGasFrontier,
-			dynamicGas:  gasCallExpert,
-			minStack:    minStack(9, 1),
-			maxStack:    maxStack(9, 1),
-			memorySize:  memoryCallExpert,
-		},
 		CALLCODE: {
 			execute:     opCallCode,
 			constantGas: params.CallGasFrontier,

diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go
@@ -219,7 +219,6 @@ const (
 
 const (
 	BALANCEMC = 0xcd
-	CALLEX    = 0xcf
 )
 
 // 0xf0 range - closures.
@@ -401,7 +400,6 @@ var opCodeToString = [256]string{
 	// 0xf0 range - closures.
 	CREATE:       "CREATE",
 	CALL:         "CALL",
-	CALLEX:       "CALLEX",
 	RETURN:       "RETURN",
 	CALLCODE:     "CALLCODE",
 	DELEGATECALL: "DELEGATECALL",
@@ -565,7 +563,6 @@ var stringToOp = map[string]OpCode{
 	"CREATE":         CREATE,
 	"CREATE2":        CREATE2,
 	"CALL":           CALL,
-	"CALLEX":         CALLEX,
 	"RETURN":         RETURN,
 	"CALLCODE":       CALLCODE,
 	"REVERT":         REVERT,