Merge pull request #1067 from maticnetwork/shivam/prevrandao-hotfix

rm : prevrandao
maticnetwork · Oct 31, 2023 · b3f4b0b · b3f4b0b
2 parents 4896ab2 + 953039d
commit b3f4b0b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
@@ -90,12 +90,15 @@ func newShanghaiInstructionSet() JumpTable {
 
 func newMergeInstructionSet() JumpTable {
 	instructionSet := newLondonInstructionSet()
-	instructionSet[PREVRANDAO] = &operation{
-		execute:     opRandom,
-		constantGas: GasQuickStep,
-		minStack:    minStack(0, 1),
-		maxStack:    maxStack(0, 1),
-	}
+
+	// disabling in pos due to incompatibility with prevrandao
+
+	// instructionSet[PREVRANDAO] = &operation{
+	// 	execute:     opRandom,
+	// 	constantGas: GasQuickStep,
+	// 	minStack:    minStack(0, 1),
+	// 	maxStack:    maxStack(0, 1),
+	// }
 
 	return validate(instructionSet)
 }

diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.1.0-beta3
+Version: 1.1.0-beta4
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.1.0-beta3
+Version: 1.1.0-beta4
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta3
+Version: 1.1.0-beta4
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta3
+Version: 1.1.0-beta4
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta3
+Version: 1.1.0-beta4
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta3
+Version: 1.1.0-beta4
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

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 = 1       // Minor version component of the current release
 	VersionPatch = 0       // Patch version component of the current release
-	VersionMeta  = "beta3" // Version metadata to append to the version string
+	VersionMeta  = "beta4" // Version metadata to append to the version string
 )
 
 var GitCommit string