From af8b138c1a4362bd3c9892ceefec8e4ca2128f58 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 10 Jul 2023 14:40:31 -0400
Subject: [PATCH] core/vm: define cancun + enable 1153 (tstore/tload) in cancun
 (#27663)

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

diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index 41a89ec6b..6f30c6514 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -83,6 +83,7 @@ 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 9b160ad18..6ea47d63a 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 newShanghaiInstructionSet(), errors.New("verkle-fork not defined yet")
+		return newCancunInstructionSet(), errors.New("verkle-fork not defined yet")
 	case rules.IsPrague:
-		return newShanghaiInstructionSet(), errors.New("prague-fork not defined yet")
+		return newCancunInstructionSet(), errors.New("prague-fork not defined yet")
 	case rules.IsCancun:
-		return newShanghaiInstructionSet(), errors.New("cancun-fork not defined yet")
+		return newCancunInstructionSet(), nil
 	case rules.IsShanghai:
 		return newShanghaiInstructionSet(), nil
 	case rules.IsMerge:
diff --git a/tests/init.go b/tests/init.go
index 869f1bfcd..a04e227dc 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -299,6 +299,25 @@ 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