aboutsummaryrefslogtreecommitdiffstats
path: root/params/config.go
diff options
context:
space:
mode:
authorBJ4 <bojie@dexon.org>2018-11-09 12:08:17 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:53 +0800
commit07da8c75d1a8f9557f73eff4d6cb74e4047ea7b8 (patch)
treee045d29c9b1b9cd074a51ba8ef9eebe9a7e8c15e /params/config.go
parent39ccaa58fd25cac9d2f85823f2ea56cd65cb06b7 (diff)
downloaddexon-07da8c75d1a8f9557f73eff4d6cb74e4047ea7b8.tar
dexon-07da8c75d1a8f9557f73eff4d6cb74e4047ea7b8.tar.gz
dexon-07da8c75d1a8f9557f73eff4d6cb74e4047ea7b8.tar.bz2
dexon-07da8c75d1a8f9557f73eff4d6cb74e4047ea7b8.tar.lz
dexon-07da8c75d1a8f9557f73eff4d6cb74e4047ea7b8.tar.xz
dexon-07da8c75d1a8f9557f73eff4d6cb74e4047ea7b8.tar.zst
dexon-07da8c75d1a8f9557f73eff4d6cb74e4047ea7b8.zip
app: fix core test
Diffstat (limited to 'params/config.go')
-rw-r--r--params/config.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/params/config.go b/params/config.go
index b247b62d3..e080f1572 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 (
@@ -113,7 +113,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), 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), 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.
@@ -122,7 +122,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), 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), 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), big.NewInt(0), nil, new(EthashConfig), nil, TestnetChainConfig.Dexcon}
TestRules = TestChainConfig.Rules(new(big.Int))
)
@@ -388,6 +388,7 @@ func isForked(s, head *big.Int) bool {
if s == nil || head == nil {
return false
}
+
return s.Cmp(head) <= 0
}