diff options
| author | BJ4 <bojie@dexon.org> | 2018-11-09 12:08:17 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
| commit | 2bc760c1e23e18bfe3807e3e4d0b9cb6c028cf89 (patch) | |
| tree | f9711f1d34062c5a047c1bec291cf02539521b93 /params/config.go | |
| parent | 9705ed77f413fcd64a8024095c91b28fb5f3d20e (diff) | |
| download | dexon-2bc760c1e23e18bfe3807e3e4d0b9cb6c028cf89.tar.gz dexon-2bc760c1e23e18bfe3807e3e4d0b9cb6c028cf89.tar.zst dexon-2bc760c1e23e18bfe3807e3e4d0b9cb6c028cf89.zip | |
app: fix core test
Diffstat (limited to 'params/config.go')
| -rw-r--r-- | params/config.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/params/config.go b/params/config.go index 7109ec0d3..f59e01a84 100644 --- a/params/config.go +++ b/params/config.go @@ -26,8 +26,8 @@ import ( // Genesis hashes to enforce below configs on. var ( - MainnetGenesisHash = common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3") - TestnetGenesisHash = common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d") + MainnetGenesisHash = common.HexToHash("0xc333fc9bcbb59ad2646fff9fd253559b144340bd27a3851cc7737ff73e405e91") + TestnetGenesisHash = common.HexToHash("0x744c925a373bbbc4b46adf0e925f1cd06d587e89bc9db8260b2163238cd980ef") ) var ( @@ -111,7 +111,7 @@ 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), nil, new(EthashConfig), nil, 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), nil, new(EthashConfig), nil, new(DexconConfig)} // AllCliqueProtocolChanges contains every protocol change (EIPs) introduced // and accepted by the Ethereum core developers into the Clique consensus. @@ -120,7 +120,7 @@ var ( // 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), nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}, 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), nil, new(EthashConfig), nil, &DexconConfig{}} + 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), nil, new(EthashConfig), nil, TestnetChainConfig.Dexcon} TestRules = TestChainConfig.Rules(new(big.Int)) ) @@ -374,6 +374,7 @@ func isForked(s, head *big.Int) bool { if s == nil || head == nil { return false } + return s.Cmp(head) <= 0 } |