aboutsummaryrefslogtreecommitdiffstats
path: root/params
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-10-24 18:40:42 +0800
committerGitHub <noreply@github.com>2017-10-24 18:40:42 +0800
commit6d6a5a93370371a33fb815d7ae47b60c7021c86a (patch)
treeaa73dff1db3aa2566c2e74cf9ac37f13878fae80 /params
parentea5f2da39ad198e58107a79214419e31988c5e5a (diff)
downloaddexon-6d6a5a93370371a33fb815d7ae47b60c7021c86a.tar
dexon-6d6a5a93370371a33fb815d7ae47b60c7021c86a.tar.gz
dexon-6d6a5a93370371a33fb815d7ae47b60c7021c86a.tar.bz2
dexon-6d6a5a93370371a33fb815d7ae47b60c7021c86a.tar.lz
dexon-6d6a5a93370371a33fb815d7ae47b60c7021c86a.tar.xz
dexon-6d6a5a93370371a33fb815d7ae47b60c7021c86a.tar.zst
dexon-6d6a5a93370371a33fb815d7ae47b60c7021c86a.zip
cmd, consensus, core, miner: instatx clique for --dev (#15323)
* cmd, consensus, core, miner: instatx clique for --dev * cmd, consensus, clique: support configurable --dev block times * cmd, core: allow --dev to use persistent storage too
Diffstat (limited to 'params')
-rw-r--r--params/config.go25
-rw-r--r--params/config_test.go8
2 files changed, 19 insertions, 14 deletions
diff --git a/params/config.go b/params/config.go
index 18579666b..345f6394a 100644
--- a/params/config.go
+++ b/params/config.go
@@ -77,17 +77,22 @@ var (
},
}
- // AllProtocolChanges contains every protocol change (EIPs)
- // introduced and accepted by the Ethereum core developers.
+ // AllEthashProtocolChanges contains every protocol change (EIPs) introduced
+ // and accepted by the Ethereum core developers into the Ethash consensus.
//
- // This configuration is intentionally not using keyed fields.
- // This configuration must *always* have all forks enabled, which
- // means that all fields must be set at all times. This forces
- // anyone adding flags to the config to also have to set these
- // fields.
- AllProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), 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), new(EthashConfig), nil}
- TestRules = TestChainConfig.Rules(new(big.Int))
+ // 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), 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), 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), new(EthashConfig), nil}
+ TestRules = TestChainConfig.Rules(new(big.Int))
)
// ChainConfig is the core config which determines the blockchain settings.
diff --git a/params/config_test.go b/params/config_test.go
index 487dc380c..02c5fe291 100644
--- a/params/config_test.go
+++ b/params/config_test.go
@@ -29,8 +29,8 @@ func TestCheckCompatible(t *testing.T) {
wantErr *ConfigCompatError
}
tests := []test{
- {stored: AllProtocolChanges, new: AllProtocolChanges, head: 0, wantErr: nil},
- {stored: AllProtocolChanges, new: AllProtocolChanges, head: 100, wantErr: nil},
+ {stored: AllEthashProtocolChanges, new: AllEthashProtocolChanges, head: 0, wantErr: nil},
+ {stored: AllEthashProtocolChanges, new: AllEthashProtocolChanges, head: 100, wantErr: nil},
{
stored: &ChainConfig{EIP150Block: big.NewInt(10)},
new: &ChainConfig{EIP150Block: big.NewInt(20)},
@@ -38,7 +38,7 @@ func TestCheckCompatible(t *testing.T) {
wantErr: nil,
},
{
- stored: AllProtocolChanges,
+ stored: AllEthashProtocolChanges,
new: &ChainConfig{HomesteadBlock: nil},
head: 3,
wantErr: &ConfigCompatError{
@@ -49,7 +49,7 @@ func TestCheckCompatible(t *testing.T) {
},
},
{
- stored: AllProtocolChanges,
+ stored: AllEthashProtocolChanges,
new: &ChainConfig{HomesteadBlock: big.NewInt(1)},
head: 3,
wantErr: &ConfigCompatError{