From 493763e5ecf8cd28bc94392d56794fdf987893e6 Mon Sep 17 00:00:00 2001
From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com>
Date: Fri, 10 Nov 2023 12:27:53 -0600
Subject: [PATCH] Revert "core/vm: define cancun + enable 1153 (tstore/tload)
 in cancun (#27663)"

This reverts commit c8f00777a65b16a0c7159a202236c8de3e3f79ed.
---
 core/vm/jump_table.go        |  1 -
 core/vm/jump_table_export.go |  6 +++---
 tests/init.go                | 19 -------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index 6f30c65143f4c..41a89ec6b6790 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -83,7 +83,6 @@ func validate(jt JumpTable) JumpTable {
 func newCancunInstructionSet() JumpTable {
 	instructionSet := newShanghaiInstructionSet()
 	enable4844(&instructionSet) // BLOBHASH opcode
-	enable1153(&instructionSet) // EIP-1153 "Transient Storage"
 	return validate(instructionSet)
 }
 
diff --git a/core/vm/jump_table_export.go b/core/vm/jump_table_export.go
index 6ea47d63a281e..9b160ad18b466 100644
--- a/core/vm/jump_table_export.go
+++ b/core/vm/jump_table_export.go
@@ -27,11 +27,11 @@ import (
 func LookupInstructionSet(rules params.Rules) (JumpTable, error) {
 	switch {
 	case rules.IsVerkle:
-		return newCancunInstructionSet(), errors.New("verkle-fork not defined yet")
+		return newShanghaiInstructionSet(), errors.New("verkle-fork not defined yet")
 	case rules.IsPrague:
-		return newCancunInstructionSet(), errors.New("prague-fork not defined yet")
+		return newShanghaiInstructionSet(), errors.New("prague-fork not defined yet")
 	case rules.IsCancun:
-		return newCancunInstructionSet(), nil
+		return newShanghaiInstructionSet(), errors.New("cancun-fork not defined yet")
 	case rules.IsShanghai:
 		return newShanghaiInstructionSet(), nil
 	case rules.IsMerge:
diff --git a/tests/init.go b/tests/init.go
index a04e227dc7afe..869f1bfcdd677 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -299,25 +299,6 @@ var Forks = map[string]*params.ChainConfig{
 		TerminalTotalDifficulty: big.NewInt(0),
 		ShanghaiTime:            u64(15_000),
 	},
-	"Cancun": {
-		ChainID:                 big.NewInt(1),
-		HomesteadBlock:          big.NewInt(0),
-		EIP150Block:             big.NewInt(0),
-		EIP155Block:             big.NewInt(0),
-		EIP158Block:             big.NewInt(0),
-		ByzantiumBlock:          big.NewInt(0),
-		ConstantinopleBlock:     big.NewInt(0),
-		PetersburgBlock:         big.NewInt(0),
-		IstanbulBlock:           big.NewInt(0),
-		MuirGlacierBlock:        big.NewInt(0),
-		BerlinBlock:             big.NewInt(0),
-		LondonBlock:             big.NewInt(0),
-		ArrowGlacierBlock:       big.NewInt(0),
-		MergeNetsplitBlock:      big.NewInt(0),
-		TerminalTotalDifficulty: big.NewInt(0),
-		ShanghaiTime:            u64(0),
-		CancunTime:              u64(0),
-	},
 }
 
 // AvailableForks returns the set of defined fork names