From 7406938e1743e4351dd51806b3d60eee04d7e751 Mon Sep 17 00:00:00 2001
From: tak <re795h@gmail.com>
Date: Wed, 6 Nov 2024 13:45:57 +0800
Subject: [PATCH] fix node crash issue when solidity block.difficulity or
 block.prevrandao called

---
 core/vm/jump_table.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index fb8725832..df46b8fdf 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -91,13 +91,14 @@ func newCancunInstructionSet() JumpTable {
 }
 
 func newShanghaiInstructionSet() JumpTable {
-	instructionSet := newMergeInstructionSet()
+	instructionSet := newLondonInstructionSet()
 	enable3855(&instructionSet) // PUSH0 instruction
 	enable3860(&instructionSet) // Limit and meter initcode
 
 	return validate(instructionSet)
 }
 
+// Skip the Merge instruction set, as Oasys does not support RANDAO
 func newMergeInstructionSet() JumpTable {
 	instructionSet := newLondonInstructionSet()
 	instructionSet[PREVRANDAO] = &operation{