From fcf37895ba959a7dd9d6bff8ca56eab06a1c0e78 Mon Sep 17 00:00:00 2001 From: protolambda Date: Tue, 18 May 2021 00:48:59 +0200 Subject: [PATCH] remove duplicate sharding config var, fix minimal-sharding-config fork epoch name --- configs/mainnet/sharding.yaml | 5 ----- configs/minimal/sharding.yaml | 7 +------ specs/sharding/beacon-chain.md | 7 ------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/configs/mainnet/sharding.yaml b/configs/mainnet/sharding.yaml index b3c22c354..af7e94f00 100644 --- a/configs/mainnet/sharding.yaml +++ b/configs/mainnet/sharding.yaml @@ -34,11 +34,6 @@ MAX_GASPRICE: 8589934592 # 2**3 (= 8) Gwei MIN_GASPRICE: 8 -# Time parameters -# --------------------------------------------------------------- -# 2**8 (= 256) | epochs -SHARD_COMMITTEE_PERIOD: 256 - # Signature domains # --------------------------------------------------------------- DOMAIN_SHARD_PROPOSER: 0x80000000 diff --git a/configs/minimal/sharding.yaml b/configs/minimal/sharding.yaml index c6ca8b560..2db2acffa 100644 --- a/configs/minimal/sharding.yaml +++ b/configs/minimal/sharding.yaml @@ -4,7 +4,7 @@ # --------------------------------------------------------------- SHARDING_FORK_VERSION: 0x03000001 # TBD, temporarily max uint64 value: 2**64 - 1 -MERGE_FORK_EPOCH: 18446744073709551615 +SHARDING_FORK_EPOCH: 18446744073709551615 # Beacon-chain @@ -34,11 +34,6 @@ MAX_GASPRICE: 8589934592 # 2**3 (= 8) Gwei MIN_GASPRICE: 8 -# Time parameters -# --------------------------------------------------------------- -# 2**8 (= 256) | epochs -SHARD_COMMITTEE_PERIOD: 256 - # Signature domains # --------------------------------------------------------------- DOMAIN_SHARD_PROPOSER: 0x80000000 diff --git a/specs/sharding/beacon-chain.md b/specs/sharding/beacon-chain.md index 775e1f551..d7fd42f22 100644 --- a/specs/sharding/beacon-chain.md +++ b/specs/sharding/beacon-chain.md @@ -16,7 +16,6 @@ - [Shard block configs](#shard-block-configs) - [Precomputed size verification points](#precomputed-size-verification-points) - [Gwei values](#gwei-values) - - [Time parameters](#time-parameters) - [Domain types](#domain-types) - [Updated containers](#updated-containers) - [`AttestationData`](#attestationdata) @@ -123,12 +122,6 @@ The following values are (non-configurable) constants used throughout the specif | `MAX_GASPRICE` | `Gwei(2**33)` (= 8,589,934,592) | Gwei | Max gasprice charged for a TARGET-sized shard block | | `MIN_GASPRICE` | `Gwei(2**3)` (= 8) | Gwei | Min gasprice charged for a TARGET-sized shard block | -### Time parameters - -| Name | Value | Unit | Duration | -| - | - | :-: | :-: | -| `SHARD_COMMITTEE_PERIOD` | `Epoch(2**8)` (= 256) | epochs | ~27 hours | - ### Domain types | Name | Value |