From 4835133f9760b22294e34fc906a676c9b0b50f22 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Fri, 3 Jan 2020 11:09:03 -0800 Subject: [PATCH 1/3] Add new demo configuration targeting mainnet, with 1/10th of the deposit value --- shared/params/config.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/shared/params/config.go b/shared/params/config.go index b84494faf6ef..c1ba1e7b275f 100644 --- a/shared/params/config.go +++ b/shared/params/config.go @@ -222,18 +222,17 @@ func MainnetConfig() *BeaconChainConfig { // DemoBeaconConfig retrieves the demo beacon chain config. // Notable changes from minimal config: // - Max effective balance is 3.2 ETH -// - Ejection threshold is 3.175 ETH -// - Genesis threshold is disabled (minimum date to start the chain) +// - Ejection threshold is 1.6 ETH func DemoBeaconConfig() *BeaconChainConfig { - demoConfig := MinimalSpecConfig() - demoConfig.MinDepositAmount = 100 + demoConfig := MainnetConfig() + + demoConfig.MinDepositAmount = 0.1 * 1e9 demoConfig.MaxEffectiveBalance = 3.2 * 1e9 - demoConfig.EjectionBalance = 3 * 1e9 + demoConfig.EjectionBalance = 1.6 * 1e9 demoConfig.EffectiveBalanceIncrement = 0.1 * 1e9 - demoConfig.Eth1FollowDistance = 16 // Increment this number after a full testnet tear down. - demoConfig.GenesisForkVersion = []byte{0, 0, 0, 3} + demoConfig.GenesisForkVersion = []byte{0, 0, 0, 4} return demoConfig } From 0bbb6f575e99e14882eb8ba01b9c9fd6c300c524 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Sat, 4 Jan 2020 10:08:02 -0800 Subject: [PATCH 2/3] reduce quotant by 1/10th. Use 1/10th mainnet values --- shared/params/config.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/shared/params/config.go b/shared/params/config.go index 6563e10a0cc1..19b91c580f72 100644 --- a/shared/params/config.go +++ b/shared/params/config.go @@ -225,22 +225,25 @@ func MainnetConfig() *BeaconChainConfig { return defaultBeaconConfig } -// DemoBeaconConfig retrieves the demo beacon chain config. -// Notable changes from minimal config: -// - Max effective balance is 3.2 ETH -// - Ejection threshold is 1.6 ETH +// DemoBeaconConfig retrieves the demo beacon chain config. This is mainnet config with 1/10th of +// mainnet deposit values. func DemoBeaconConfig() *BeaconChainConfig { - demoConfig := MainnetConfig() + demoConfig := *MainnetConfig() - demoConfig.MinDepositAmount = 0.1 * 1e9 - demoConfig.MaxEffectiveBalance = 3.2 * 1e9 - demoConfig.EjectionBalance = 1.6 * 1e9 - demoConfig.EffectiveBalanceIncrement = 0.1 * 1e9 + demoConfig.MinDepositAmount /= 10 + demoConfig.MaxEffectiveBalance /= 10 + demoConfig.EjectionBalance /= 10 + demoConfig.EffectiveBalanceIncrement /= 10 + + demoConfig.WhistleBlowerRewardQuotient /= 10 + demoConfig.ProposerRewardQuotient /= 10 + demoConfig.InactivityPenaltyQuotient /= 10 + demoConfig.MinSlashingPenaltyQuotient /= 10 // Increment this number after a full testnet tear down. demoConfig.GenesisForkVersion = []byte{0, 0, 0, 4} - return demoConfig + return &demoConfig } // MinimalSpecConfig retrieves the minimal config used in spec tests. From 9640eb4ab9b0b80dac7b3593c52470d92c23694c Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Sat, 4 Jan 2020 13:54:04 -0800 Subject: [PATCH 3/3] only change the inactivity quotant --- shared/params/config.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/shared/params/config.go b/shared/params/config.go index 19b91c580f72..497b88992ab7 100644 --- a/shared/params/config.go +++ b/shared/params/config.go @@ -235,10 +235,7 @@ func DemoBeaconConfig() *BeaconChainConfig { demoConfig.EjectionBalance /= 10 demoConfig.EffectiveBalanceIncrement /= 10 - demoConfig.WhistleBlowerRewardQuotient /= 10 - demoConfig.ProposerRewardQuotient /= 10 demoConfig.InactivityPenaltyQuotient /= 10 - demoConfig.MinSlashingPenaltyQuotient /= 10 // Increment this number after a full testnet tear down. demoConfig.GenesisForkVersion = []byte{0, 0, 0, 4}