Skip to content

Commit

Permalink
Fix proof indexes (#351)
Browse files Browse the repository at this point in the history
* Fix proof indexes

* Upd packages
  • Loading branch information
evgeny-stakewise authored and tsudmi committed Jul 6, 2024
1 parent b40b430 commit 777fab1
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 50 deletions.
84 changes: 42 additions & 42 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions src/validators/execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ async def register_multiple_validator(
register_via_vault_v2 = False

if multi_proof:
proof_indexes = calc_proof_indexes(multi_proof, tx_validators)
proof_indexes = [leaf[1] for leaf in multi_proof.leaves]

# DepositDataRegistry args
register_call_args = [
Expand Down Expand Up @@ -344,8 +344,3 @@ async def register_multiple_validator(
logger.error('Registration transaction failed')
return None
return tx_hash


def calc_proof_indexes(multi_proof: MultiProof, tx_validators: list[bytes]) -> list[int]:
sorted_tx_validators: list[bytes] = [v[0] for v in multi_proof.leaves]
return [sorted_tx_validators.index(v) for v in tx_validators]
3 changes: 1 addition & 2 deletions src/validators/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from src.validators.database import NetworkValidatorCrud
from src.validators.execution import (
NetworkValidatorsProcessor,
calc_proof_indexes,
get_latest_network_validator_public_keys,
get_validators_from_deposit_data,
get_validators_from_relayer,
Expand Down Expand Up @@ -163,7 +162,7 @@ async def register_validators(
tree=cast(DepositData, deposit_data).tree,
validators=cast(list[DepositDataValidator], validators),
)
proof_indexes = calc_proof_indexes(multi_proof, tx_validators)
proof_indexes = [leaf[1] for leaf in multi_proof.leaves]

else:
tx_validators = [
Expand Down

0 comments on commit 777fab1

Please sign in to comment.