poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15224 from karalabe/byzantium-block-numbers 

cmd/puppeth, params: enable Byzantium on all networks
This commit is contained in:
Péter Szilágyi 2017-10-02 15:40:54 +03:00 committed by GitHub
parent f86c4177d5 7514e8a24d
commit d347656280
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/puppeth/wizard_genesis.go
View File

@ -42,6 +42,7 @@ func (w *wizard) makeGenesis() {
EIP150Block: big.NewInt(2),
EIP155Block: big.NewInt(3),
EIP158Block: big.NewInt(3),
ByzantiumBlock: big.NewInt(4),
},
}
// Figure out which consensus engine to choose

5
params/config.go
View File

@ -18,7 +18,6 @@ package params
import (
"fmt"
"math"
"math/big"
"github.com/ethereum/go-ethereum/common"
@ -40,7 +39,7 @@ var (
EIP150Hash: common.HexToHash("0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0"),
EIP155Block: big.NewInt(2675000),
EIP158Block: big.NewInt(2675000),
ByzantiumBlock: big.NewInt(math.MaxInt64), // Don't enable yet
ByzantiumBlock: big.NewInt(4370000),
Ethash: new(EthashConfig),
}
@ -70,7 +69,7 @@ var (
EIP150Hash: common.HexToHash("0x9b095b36c15eaf13044373aef8ee0bd3a382a5abb92e402afa44b8249c3a90e9"),
EIP155Block: big.NewInt(3),
EIP158Block: big.NewInt(3),
ByzantiumBlock: big.NewInt(math.MaxInt64), // Don't enable yet
ByzantiumBlock: big.NewInt(1035301),
Clique: &CliqueConfig{
Period: 15,