diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-09-19 15:47:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-19 15:47:50 +0800 |
| commit | a6a14f6b712efbfb91a4c0a05eb42998e8dda2ea (patch) | |
| tree | 0d5c695ef01d0cb9590b57c24564ef39c5fe72cc /params/config.go | |
| parent | 03c7d8fb3139f3fee8ddcf8a35b6a908f582621f (diff) | |
| parent | f9eb3072167603e70b018c295e305d71b69756e3 (diff) | |
| download | go-tangerine-a6a14f6b712efbfb91a4c0a05eb42998e8dda2ea.tar go-tangerine-a6a14f6b712efbfb91a4c0a05eb42998e8dda2ea.tar.gz go-tangerine-a6a14f6b712efbfb91a4c0a05eb42998e8dda2ea.tar.bz2 go-tangerine-a6a14f6b712efbfb91a4c0a05eb42998e8dda2ea.tar.lz go-tangerine-a6a14f6b712efbfb91a4c0a05eb42998e8dda2ea.tar.xz go-tangerine-a6a14f6b712efbfb91a4c0a05eb42998e8dda2ea.tar.zst go-tangerine-a6a14f6b712efbfb91a4c0a05eb42998e8dda2ea.zip | |
Merge pull request #20090 from soc1c/s1-testnet-istanbul
params: activate Istanbul on Ropsten, Rinkeby and Görli
Diffstat (limited to 'params/config.go')
| -rw-r--r-- | params/config.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/params/config.go b/params/config.go index d74b81159..a40048524 100644 --- a/params/config.go +++ b/params/config.go @@ -103,7 +103,7 @@ var ( ByzantiumBlock: big.NewInt(1700000), ConstantinopleBlock: big.NewInt(4230000), PetersburgBlock: big.NewInt(4939394), - IstanbulBlock: nil, + IstanbulBlock: big.NewInt(6485846), Ethash: new(EthashConfig), } @@ -141,7 +141,7 @@ var ( ByzantiumBlock: big.NewInt(1035301), ConstantinopleBlock: big.NewInt(3660663), PetersburgBlock: big.NewInt(4321234), - IstanbulBlock: nil, + IstanbulBlock: big.NewInt(5435345), Clique: &CliqueConfig{ Period: 15, Epoch: 30000, @@ -180,7 +180,7 @@ var ( ByzantiumBlock: big.NewInt(0), ConstantinopleBlock: big.NewInt(0), PetersburgBlock: big.NewInt(0), - IstanbulBlock: nil, + IstanbulBlock: big.NewInt(1561651), Clique: &CliqueConfig{ Period: 15, Epoch: 30000, @@ -213,16 +213,16 @@ var ( // // This configuration is intentionally not using keyed fields to force anyone // adding flags to the config to also have to set these fields. - AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil} + AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, new(EthashConfig), nil} // AllCliqueProtocolChanges contains every protocol change (EIPs) introduced // and accepted by the Ethereum core developers into the Clique consensus. // // This configuration is intentionally not using keyed fields to force anyone // adding flags to the config to also have to set these fields. - AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}} + AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}} - TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil} + TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, new(EthashConfig), nil} TestRules = TestChainConfig.Rules(new(big.Int)) ) |