update block id spec; typo

This commit is contained in:
David Rusu 2024-02-06 20:19:30 +04:00
parent 5c3de9ab84
commit 3f681fc51f
3 changed files with 13 additions and 11 deletions

View File

@ -182,6 +182,8 @@ class BlockHeader:
h.update(self.leader_proof.commitment) h.update(self.leader_proof.commitment)
assert len(self.leader_proof.nullifier) == 32 assert len(self.leader_proof.nullifier) == 32
h.update(self.leader_proof.nullifier) h.update(self.leader_proof.nullifier)
assert len(self.leader_proof.evolved_commitment) == 32
h.update(self.leader_proof.evolved_commitment)
return h.digest() return h.digest()
@ -219,7 +221,7 @@ class LedgerState:
# set of commitments # set of commitments
commitments_spend: set[Id] = field(default_factory=set) commitments_spend: set[Id] = field(default_factory=set)
# set of commitments elligible to lead # set of commitments eligible to lead
commitments_lead: set[Id] = field(default_factory=set) commitments_lead: set[Id] = field(default_factory=set)
# set of nullified coins # set of nullified coins
@ -235,10 +237,10 @@ class LedgerState:
nullifiers=deepcopy(self.nullifiers), nullifiers=deepcopy(self.nullifiers),
) )
def verify_elligible_to_spend(self, commitment: Id) -> bool: def verify_eligible_to_spend(self, commitment: Id) -> bool:
return commitment in self.commitments_spend return commitment in self.commitments_spend
def verify_elligible_to_lead(self, commitment: Id) -> bool: def verify_eligible_to_lead(self, commitment: Id) -> bool:
return commitment in self.commitments_lead return commitment in self.commitments_lead
def verify_unspent(self, nullifier: Id) -> bool: def verify_unspent(self, nullifier: Id) -> bool:
@ -263,15 +265,15 @@ class EpochState:
# The nonce snapshot is taken 7k/f slots into the previous epoch # The nonce snapshot is taken 7k/f slots into the previous epoch
nonce_snapshot: LedgerState nonce_snapshot: LedgerState
def verify_elligible_to_lead_due_to_age(self, commitment: Id) -> bool: def verify_eligible_to_lead_due_to_age(self, commitment: Id) -> bool:
# A coin is elligible to lead if it was committed to before the the stake # A coin is eligible to lead if it was committed to before the the stake
# distribution snapshot was taken or it was produced by a leader proof since the snapshot was taken. # distribution snapshot was taken or it was produced by a leader proof since the snapshot was taken.
# #
# This verification is checking that first condition. # This verification is checking that first condition.
# #
# NOTE: `ledger_state.commitments_spend` is a super-set of `ledger_state.commitments_lead` # NOTE: `ledger_state.commitments_spend` is a super-set of `ledger_state.commitments_lead`
return self.stake_distribution_snapshot.verify_elligible_to_spend(commitment) return self.stake_distribution_snapshot.verify_eligible_to_spend(commitment)
def total_stake(self) -> int: def total_stake(self) -> int:
"""Returns the total stake that will be used to reletivize leadership proofs during this epoch""" """Returns the total stake that will be used to reletivize leadership proofs during this epoch"""
@ -308,8 +310,8 @@ class Follower:
return ( return (
proof.verify(slot) # verify slot leader proof proof.verify(slot) # verify slot leader proof
and ( and (
ledger_state.verify_elligible_to_lead(proof.commitment) ledger_state.verify_eligible_to_lead(proof.commitment)
or epoch_state.verify_elligible_to_lead_due_to_age(proof.commitment) or epoch_state.verify_eligible_to_lead_due_to_age(proof.commitment)
) )
and ledger_state.verify_unspent(proof.nullifier) and ledger_state.verify_unspent(proof.nullifier)
) )

View File

@ -9,7 +9,7 @@ CONTENT-SIZE = U32
BLOCK-DATE = BLOCK-SLOT BLOCK-DATE = BLOCK-SLOT
BLOCK-SLOT = U64 BLOCK-SLOT = U64
PARENT-ID = HEADER-ID PARENT-ID = HEADER-ID
MOCK-LEADER-PROOF = COMMITMENT NULLIFIER MOCK-LEADER-PROOF = COMMITMENT NULLIFIER COMMITMENT
; ------------ CONTENT -------------------- ; ------------ CONTENT --------------------
CONTENT = *OCTET CONTENT = *OCTET

View File

@ -157,7 +157,7 @@ class TestLedgerStateUpdate(TestCase):
assert follower.tip() == block_4 assert follower.tip() == block_4
assert follower.tip().slot.epoch(follower.config).epoch == 2 assert follower.tip().slot.epoch(follower.config).epoch == 2
def test_evolved_coin_is_elligble_for_leadership(self): def test_evolved_coin_is_eligible_for_leadership(self):
coin = Coin(sk=0, value=100) coin = Coin(sk=0, value=100)
genesis = mk_genesis_state([coin]) genesis = mk_genesis_state([coin])
@ -185,7 +185,7 @@ class TestLedgerStateUpdate(TestCase):
assert follower.tip_id() == block_1.id() assert follower.tip_id() == block_1.id()
# but the evolved coin is elligible # but the evolved coin is eligible
block_2_evolve = mk_block(slot=1, parent=block_1.id(), coin=coin.evolve()) block_2_evolve = mk_block(slot=1, parent=block_1.id(), coin=coin.evolve())
follower.on_block(block_2_evolve) follower.on_block(block_2_evolve)