From 4ddaff5a7753e875b12385b082d62b11f55255c1 Mon Sep 17 00:00:00 2001 From: Justin Traglia <95511699+jtraglia@users.noreply.github.com> Date: Sat, 15 Jul 2023 13:58:04 +0200 Subject: [PATCH 1/5] Fix links to curdleproofs.pie repo --- specs/_features/whisk/beacon-chain.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specs/_features/whisk/beacon-chain.md b/specs/_features/whisk/beacon-chain.md index f2a51e622..d0e16868a 100644 --- a/specs/_features/whisk/beacon-chain.md +++ b/specs/_features/whisk/beacon-chain.md @@ -94,7 +94,7 @@ def bytes_to_bls_field(b: Bytes32) -> BLSFieldElement: ### Curdleproofs and opening proofs -Note that Curdleproofs (Whisk Shuffle Proofs), the tracker opening proofs and all related data structures and verifier code (along with tests) is specified in [curdleproofs.pie](https://github.com/nalinbhardwaj/curdleproofs.pie/tree/verifier-only) repository. +Note that Curdleproofs (Whisk Shuffle Proofs), the tracker opening proofs and all related data structures and verifier code (along with tests) is specified in [curdleproofs.pie](https://github.com/nalinbhardwaj/curdleproofs.pie/) repository. ```python def IsValidWhiskShuffleProof(pre_shuffle_trackers: Sequence[WhiskTracker], @@ -103,7 +103,7 @@ def IsValidWhiskShuffleProof(pre_shuffle_trackers: Sequence[WhiskTracker], shuffle_proof: WhiskShuffleProof) -> bool: """ Verify `post_shuffle_trackers` is a permutation of `pre_shuffle_trackers`. - Defined in https://github.com/nalinbhardwaj/curdleproofs.pie/tree/verifier-only. + Defined in https://github.com/nalinbhardwaj/curdleproofs.pie/blob/master/curdleproofs/curdleproofs/whisk_interface.py. """ # pylint: disable=unused-argument return True @@ -115,7 +115,7 @@ def IsValidWhiskOpeningProof(tracker: WhiskTracker, tracker_proof: WhiskTrackerProof) -> bool: """ Verify knowledge of `k` such that `tracker.k_r_G == k * tracker.r_G` and `k_commitment == k * BLS_G1_GENERATOR`. - Defined in https://github.com/nalinbhardwaj/curdleproofs.pie/tree/verifier-only. + Defined in https://github.com/nalinbhardwaj/curdleproofs.pie/blob/master/curdleproofs/curdleproofs/whisk_interface.py. """ # pylint: disable=unused-argument return True From 86a147a740885723297b1dd92a9947d4ee4115fc Mon Sep 17 00:00:00 2001 From: Justin Traglia <95511699+jtraglia@users.noreply.github.com> Date: Sat, 15 Jul 2023 14:13:07 +0200 Subject: [PATCH 2/5] Link to dev branch instead of master --- specs/_features/whisk/beacon-chain.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specs/_features/whisk/beacon-chain.md b/specs/_features/whisk/beacon-chain.md index d0e16868a..dee61ede6 100644 --- a/specs/_features/whisk/beacon-chain.md +++ b/specs/_features/whisk/beacon-chain.md @@ -94,7 +94,7 @@ def bytes_to_bls_field(b: Bytes32) -> BLSFieldElement: ### Curdleproofs and opening proofs -Note that Curdleproofs (Whisk Shuffle Proofs), the tracker opening proofs and all related data structures and verifier code (along with tests) is specified in [curdleproofs.pie](https://github.com/nalinbhardwaj/curdleproofs.pie/) repository. +Note that Curdleproofs (Whisk Shuffle Proofs), the tracker opening proofs and all related data structures and verifier code (along with tests) is specified in [curdleproofs.pie](https://github.com/nalinbhardwaj/curdleproofs.pie/tree/dev) repository. ```python def IsValidWhiskShuffleProof(pre_shuffle_trackers: Sequence[WhiskTracker], @@ -103,7 +103,7 @@ def IsValidWhiskShuffleProof(pre_shuffle_trackers: Sequence[WhiskTracker], shuffle_proof: WhiskShuffleProof) -> bool: """ Verify `post_shuffle_trackers` is a permutation of `pre_shuffle_trackers`. - Defined in https://github.com/nalinbhardwaj/curdleproofs.pie/blob/master/curdleproofs/curdleproofs/whisk_interface.py. + Defined in https://github.com/nalinbhardwaj/curdleproofs.pie/blob/dev/curdleproofs/curdleproofs/whisk_interface.py. """ # pylint: disable=unused-argument return True @@ -115,7 +115,7 @@ def IsValidWhiskOpeningProof(tracker: WhiskTracker, tracker_proof: WhiskTrackerProof) -> bool: """ Verify knowledge of `k` such that `tracker.k_r_G == k * tracker.r_G` and `k_commitment == k * BLS_G1_GENERATOR`. - Defined in https://github.com/nalinbhardwaj/curdleproofs.pie/blob/master/curdleproofs/curdleproofs/whisk_interface.py. + Defined in https://github.com/nalinbhardwaj/curdleproofs.pie/blob/dev/curdleproofs/curdleproofs/whisk_interface.py. """ # pylint: disable=unused-argument return True From 3f3d4123f6b8b6f312414ef489961d2815243d33 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Sat, 15 Jul 2023 17:09:06 +0200 Subject: [PATCH 3/5] Unmark validators field as modified --- specs/_features/whisk/beacon-chain.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specs/_features/whisk/beacon-chain.md b/specs/_features/whisk/beacon-chain.md index dee61ede6..a1b1847e5 100644 --- a/specs/_features/whisk/beacon-chain.md +++ b/specs/_features/whisk/beacon-chain.md @@ -31,7 +31,7 @@ ## Introduction -This document details the beacon chain additions and changes of to support the Whisk SSLE, +This document details the beacon chain additions and changes of to support the Whisk SSLE. *Note:* This specification is built upon [Capella](../../capella/beacon-chain.md) and is under active development. @@ -150,7 +150,7 @@ class BeaconState(Container): eth1_data_votes: List[Eth1Data, EPOCHS_PER_ETH1_VOTING_PERIOD * SLOTS_PER_EPOCH] eth1_deposit_index: uint64 # Registry - validators: List[Validator, VALIDATOR_REGISTRY_LIMIT] # [Modified in Whisk] + validators: List[Validator, VALIDATOR_REGISTRY_LIMIT] balances: List[Gwei, VALIDATOR_REGISTRY_LIMIT] # Randomness randao_mixes: Vector[Bytes32, EPOCHS_PER_HISTORICAL_VECTOR] From fafd48f06a51f0c3c816a9aa9af703ca49d05f50 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Sat, 15 Jul 2023 17:30:08 +0200 Subject: [PATCH 4/5] Fix comment --- specs/_features/whisk/beacon-chain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/_features/whisk/beacon-chain.md b/specs/_features/whisk/beacon-chain.md index a1b1847e5..1322ec85b 100644 --- a/specs/_features/whisk/beacon-chain.md +++ b/specs/_features/whisk/beacon-chain.md @@ -461,7 +461,7 @@ def get_beacon_proposer_index(state: BeaconState) -> ValidatorIndex: ## Testing -*Note*: The function `initialize_beacon_state_from_eth1` is modified for pure Whisk testing only. +*Note*: The function `initialize_beacon_state_from_eth1` is modified purely for Whisk testing. ```python def initialize_beacon_state_from_eth1(eth1_block_hash: Hash32, From 16b1afb1efb25b6fbe674fa3a7f0e5a8a874b4d4 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Sat, 15 Jul 2023 17:53:10 +0200 Subject: [PATCH 5/5] Add punctuation to docstring --- specs/_features/whisk/beacon-chain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/_features/whisk/beacon-chain.md b/specs/_features/whisk/beacon-chain.md index 1322ec85b..c95558590 100644 --- a/specs/_features/whisk/beacon-chain.md +++ b/specs/_features/whisk/beacon-chain.md @@ -304,7 +304,7 @@ class BeaconBlockBody(capella.BeaconBlockBody): ```python def get_shuffle_indices(randao_reveal: BLSSignature) -> Sequence[uint64]: """ - Given a `randao_reveal` return the list of indices that got shuffled from the entire candidate set + Given a `randao_reveal` return the list of indices that got shuffled from the entire candidate set. """ indices = [] for i in range(0, WHISK_VALIDATORS_PER_SHUFFLE):