mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 14:46:42 +00:00
Merge pull request #1067 from maticnetwork/shivam/prevrandao-hotfix
rm : prevrandao
This commit is contained in:
commit
b3f4b0b982
8 changed files with 16 additions and 13 deletions
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: bor
|
||||
Version: 1.1.0-beta3
|
||||
Version: 1.1.0-beta4
|
||||
Section: develop
|
||||
Priority: standard
|
||||
Maintainer: Polygon <release-team@polygon.technology>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: bor
|
||||
Version: 1.1.0-beta3
|
||||
Version: 1.1.0-beta4
|
||||
Section: develop
|
||||
Priority: standard
|
||||
Maintainer: Polygon <release-team@polygon.technology>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: bor-profile
|
||||
Version: 1.1.0-beta3
|
||||
Version: 1.1.0-beta4
|
||||
Section: develop
|
||||
Priority: standard
|
||||
Maintainer: Polygon <release-team@polygon.technology>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: bor-profile
|
||||
Version: 1.1.0-beta3
|
||||
Version: 1.1.0-beta4
|
||||
Section: develop
|
||||
Priority: standard
|
||||
Maintainer: Polygon <release-team@polygon.technology>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: bor-profile
|
||||
Version: 1.1.0-beta3
|
||||
Version: 1.1.0-beta4
|
||||
Section: develop
|
||||
Priority: standard
|
||||
Maintainer: Polygon <release-team@polygon.technology>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: bor-profile
|
||||
Version: 1.1.0-beta3
|
||||
Version: 1.1.0-beta4
|
||||
Section: develop
|
||||
Priority: standard
|
||||
Maintainer: Polygon <release-team@polygon.technology>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue