From c3b7678cccee94e46e4219c1508752e6b6d28cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= <peter@scroll.io>
Date: Thu, 2 May 2024 17:46:11 +0800
Subject: [PATCH] fix: temporarily disable string encoding for new opcodes
 (#737)

feat: temporarily disable string encoding for new opcodes
---
 core/vm/opcodes.go | 19 ++++++++++++++-----
 params/version.go  |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go
index c4ced9ad55..45bc7f4a7f 100644
--- a/core/vm/opcodes.go
+++ b/core/vm/opcodes.go
@@ -288,7 +288,11 @@ var opCodeToString = map[OpCode]string{
 	GASLIMIT:    "GASLIMIT",
 	CHAINID:     "CHAINID",
 	SELFBALANCE: "SELFBALANCE",
-	BASEFEE:     "BASEFEE",
+
+	// we temporarily comment this out, since ccc expects
+	// the "opcode 0x%x not defined" string in the traces,
+	// should uncomment once ccc supports the string version.
+	// BASEFEE:     "BASEFEE",
 
 	// 0x50 range - 'storage' and execution.
 	POP: "POP",
@@ -305,10 +309,15 @@ var opCodeToString = map[OpCode]string{
 	MSIZE:    "MSIZE",
 	GAS:      "GAS",
 	JUMPDEST: "JUMPDEST",
-	TLOAD:    "TLOAD",
-	TSTORE:   "TSTORE",
-	MCOPY:    "MCOPY",
-	PUSH0:    "PUSH0",
+
+	// we temporarily comment these out, since ccc expects
+	// the "opcode 0x%x not defined" string in the traces,
+	// should uncomment once ccc supports the string version.
+	// TLOAD:    "TLOAD",
+	// TSTORE:   "TSTORE",
+	// MCOPY:    "MCOPY",
+
+	PUSH0: "PUSH0",
 
 	// 0x60 range - push.
 	PUSH1:  "PUSH1",
diff --git a/params/version.go b/params/version.go
index 6630c7d011..cfdc330f8c 100644
--- a/params/version.go
+++ b/params/version.go
@@ -24,7 +24,7 @@ import (
 const (
 	VersionMajor = 5         // Major version component of the current release
 	VersionMinor = 3         // Minor version component of the current release
-	VersionPatch = 9         // Patch version component of the current release
+	VersionPatch = 10        // Patch version component of the current release
 	VersionMeta  = "mainnet" // Version metadata to append to the version string
 )