Merge branch 'testnet' of github.com:oasysgames/oasys-validator into …

…testnet
oasysgames · Dec 2, 2024 · dfd6381 · dfd6381
2 parents e150fe9 + 09b8a45
commit dfd6381
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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{

diff --git a/params/version.go b/params/version.go
@@ -24,7 +24,7 @@ const (
 	VersionMajor = 1          // Major version component of the current release
 	VersionMinor = 6          // Minor version component of the current release
 	VersionPatch = 0          // Patch version component of the current release
-	VersionMeta  = "testnet0" // Version metadata to append to the version string
+	VersionMeta  = "testnet1" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.