diff --git a/common/eth2_config/src/lib.rs b/common/eth2_config/src/lib.rs index b5801eb2a..197f1b34a 100644 --- a/common/eth2_config/src/lib.rs +++ b/common/eth2_config/src/lib.rs @@ -332,10 +332,10 @@ define_hardcoded_nets!( ), ( // Network name (must be unique among all networks). - pulsechain_testnet_v3, + pulsechain_testnet_v4, // The name of the directory in the `eth2_network_config/built_in_network_configs` // directory where the configuration files are located for this network. - "pulsechain-testnet-v3", + "pulsechain-testnet-v4", // Set to `true` if the genesis state can be found in the `built_in_network_configs` // directory. GenesisStateSource::IncludedBytes diff --git a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/boot_enr.yaml b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/boot_enr.yaml deleted file mode 100644 index 49e35d8b3..000000000 --- a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/boot_enr.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# PulseChain Official (aws-us-east-1) -- enr:-MK4QC37TFAfc973oOezRlVoOCygtjT-rlOoKbbuZNmrJ5dhXS-IfrsH3yhjNP0dfy3-UpyFZy2hy6lOE__ykFfj3lKGAYa95Co5h2F0dG5ldHOIAAAAAAAAAACEZXRoMpBbnJIGAAAJRP__________gmlkgnY0gmlwhAPsylWJc2VjcDI1NmsxoQOpEhsSXVShFW4yvaww_SI0A-H0pix0aJlOdYJgyIgbjYhzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A -- enr:-MK4QM1JpOXnj-zpjfPvG1GkCEvjYMg8dEk6t7VLtpFuionhBz59n2ZIwixpO2exzoNLMV4_v7jCHGQqi0zYtc-Gp3OGAYa94lhqh2F0dG5ldHOIAAAAAAAAAACEZXRoMpBbnJIGAAAJRP__________gmlkgnY0gmlwhCzKVYOJc2VjcDI1NmsxoQK24rqFwR7W3HJgLVVGDSMy8PiMculxF6VOJgAlG4wmXohzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A -- enr:-MK4QBAlroGpM1xtk7WzWP8lbKnI2UjVpoQNsKJeNRS-kVvFCswNyVRBZHwMOvfW2G3j0qaaDsUpMxXY-t9LdGAZgQGGAYa94IQmh2F0dG5ldHOIAAAAAAAAAACEZXRoMpBbnJIGAAAJRP__________gmlkgnY0gmlwhK6BYN-Jc2VjcDI1NmsxoQJNoBFGkhcAMKIbrDPHoI7dYVAY99Z832TimlqhpoYo7YhzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A diff --git a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/genesis.ssz.zip b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/genesis.ssz.zip deleted file mode 100644 index 738da5ccb..000000000 Binary files a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/genesis.ssz.zip and /dev/null differ diff --git a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/boot_enr.yaml b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/boot_enr.yaml new file mode 100644 index 000000000..1cdd8ccab --- /dev/null +++ b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/boot_enr.yaml @@ -0,0 +1,7 @@ +# PulseChain Official +# bootnode-aws-us-east-2-001 +- enr:-MK4QPzTScyPIPS7UWhaz0v4cVYKTfN2-0leb-iFKGl_xFBjDOSJenQ91BwaZ7sUXApiCPihr_Mw4L5oZJ4W5vNqffuGAYd4QZA7h2F0dG5ldHOIAAAAAAAAAACEZXRoMpB3mwAIAAAJRAEAAAAAAAAAgmlkgnY0gmlwhAOOpsuJc2VjcDI1NmsxoQNJljCY9olY73J9aYbW-9Ix72ZNzKv1AeIt6BHSqtniV4hzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A +# bootnode-aws-us-east-2-002 +- enr:-MK4QF0dJA9H3BlxJE7HEjucJD47JYdlQyJ0wbQVNrbfgM_0A-OZEb8J1jjtmiaw3ytpl-FdmofS7QPW31j1n2WImTiGAYd4QUGRh2F0dG5ldHOIAAAAAAAAAACEZXRoMpB3mwAIAAAJRAEAAAAAAAAAgmlkgnY0gmlwhBJ2vKWJc2VjcDI1NmsxoQJsvKcVWN9inS4QTW8QsPSd053XZl6MZ5zmvBXLycbONYhzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A +# bootnode-aws-us-east-2-003 +- enr:-MK4QMqHY3x4vzN1yHXY7ZCAH8ylE8dSYT3ZWSNsUBd0MJ4dIYjz94vrEUvMZGsDfJXW1aHZlpszxScBLJEQovnha6WGAYd4QUMUh2F0dG5ldHOIAAAAAAAAAACEZXRoMpB3mwAIAAAJRAEAAAAAAAAAgmlkgnY0gmlwhAOKa5CJc2VjcDI1NmsxoQIt-VoTVWzXdUTO78hhF_25-AhXgOk0k-YG3gW_dzX6YIhzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A diff --git a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/config.yaml b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/config.yaml similarity index 88% rename from common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/config.yaml rename to common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/config.yaml index 36fee66fa..d6fe4db16 100644 --- a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/config.yaml +++ b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/config.yaml @@ -1,7 +1,7 @@ -# PulseChain Testnet-V3 config +# PulseChain Testnet-V4 config # Extends the mainnet preset -CONFIG_NAME: 'pulsechain-testnet-v3' +CONFIG_NAME: 'pulsechain-testnet-v4' PRESET_BASE: 'pulsechain' # Transition @@ -14,7 +14,7 @@ MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 4096 # Jan 28 2023 00:00:00 UTC MIN_GENESIS_TIME: 1674864000 # Genesis Fork Version -GENESIS_FORK_VERSION: 0x00000942 +GENESIS_FORK_VERSION: 0x00000943 # 300 seconds GENESIS_DELAY: 300 @@ -26,10 +26,10 @@ GENESIS_DELAY: 300 # - Temporarily set to max uint64 value: 2**64 - 1 # Altair -ALTAIR_FORK_VERSION: 0x00000943 +ALTAIR_FORK_VERSION: 0x00000944 ALTAIR_FORK_EPOCH: 1 # Merge -BELLATRIX_FORK_VERSION: 0x00000944 +BELLATRIX_FORK_VERSION: 0x00000945 BELLATRIX_FORK_EPOCH: 2 # Time parameters @@ -68,6 +68,6 @@ PROPOSER_SCORE_BOOST: 40 # Deposit contract # --------------------------------------------------------------- # Ethereum PoW Mainnet -DEPOSIT_CHAIN_ID: 942 -DEPOSIT_NETWORK_ID: 942 +DEPOSIT_CHAIN_ID: 943 +DEPOSIT_NETWORK_ID: 943 DEPOSIT_CONTRACT_ADDRESS: 0x3693693693693693693693693693693693693693 diff --git a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/deploy_block.txt similarity index 100% rename from common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v3/deploy_block.txt rename to common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/deploy_block.txt diff --git a/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/genesis.ssz.zip b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/genesis.ssz.zip new file mode 100644 index 000000000..48002b5ec Binary files /dev/null and b/common/eth2_network_config/built_in_network_configs/pulsechain-testnet-v4/genesis.ssz.zip differ diff --git a/consensus/types/presets/pulsechain/phase0.yaml b/consensus/types/presets/pulsechain/phase0.yaml index 2074ca9b0..bd2c7d0fc 100644 --- a/consensus/types/presets/pulsechain/phase0.yaml +++ b/consensus/types/presets/pulsechain/phase0.yaml @@ -30,8 +30,8 @@ SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 MIN_DEPOSIT_AMOUNT: 1000000000 # 2**5 * 10**15 (= 32,000,000,000,000,000) Gwei MAX_EFFECTIVE_BALANCE: 32000000000000000 -# 2**0 * 10**9 (= 1,000,000,000) Gwei -EFFECTIVE_BALANCE_INCREMENT: 1000000000 +# 2**0 * 10**9 (= 1,000,000,000,000,000) Gwei +EFFECTIVE_BALANCE_INCREMENT: 1000000000000000 # Time parameters @@ -66,8 +66,8 @@ VALIDATOR_REGISTRY_LIMIT: 1099511627776 # Reward and penalty quotients # --------------------------------------------------------------- -# 2**6 (= 64) -BASE_REWARD_FACTOR: 64 +# 2**6 * 1e3 (= 64000) +BASE_REWARD_FACTOR: 64000 # 2**9 (= 512) WHISTLEBLOWER_REWARD_QUOTIENT: 512 # 2**3 (= 8) diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs index d5c3e48cc..d4f41d0ef 100644 --- a/consensus/types/src/chain_spec.rs +++ b/consensus/types/src/chain_spec.rs @@ -1001,6 +1001,10 @@ impl ChainSpec { pub fn pulsechain() -> Self { let mut spec = Self::mainnet(); spec.config_name = Some("pulsechain".to_string()); + spec.base_reward_factor = 64000; + spec.effective_balance_increment = + option_wrapper(|| u64::checked_pow(2, 0)?.checked_mul(u64::checked_pow(10, 15)?)) + .expect("calculation does not overflow"); spec.max_effective_balance = option_wrapper(|| u64::checked_pow(2, 5)?.checked_mul(u64::checked_pow(10, 15)?)) .expect("calculation does not overflow");