Bump curdleproofs to fix upstream types
This commit is contained in:
parent
ccd8026b10
commit
07ab00431d
2
setup.py
2
setup.py
|
@ -534,6 +534,6 @@ setup(
|
|||
"lru-dict==1.2.0",
|
||||
MARKO_VERSION,
|
||||
"py_arkworks_bls12381==0.3.4",
|
||||
"curdleproofs @ git+https://github.com/nalinbhardwaj/curdleproofs.pie@f27d630c44c5c1d5a568a4b0026aa7115904a469#egg=curdleproofs&subdirectory=curdleproofs",
|
||||
"curdleproofs @ git+https://github.com/nalinbhardwaj/curdleproofs.pie@bc4bb34961a896af6bcf4a5ff4867bb2971742c8#egg=curdleproofs&subdirectory=curdleproofs",
|
||||
]
|
||||
)
|
||||
|
|
|
@ -7,9 +7,7 @@ from eth2spec.utils.ssz.ssz_impl import hash_tree_root
|
|||
from curdleproofs import (
|
||||
GenerateWhiskTrackerProof,
|
||||
WhiskTracker,
|
||||
IsValidWhiskOpeningProof,
|
||||
GenerateWhiskShuffleProof,
|
||||
IsValidWhiskShuffleProof
|
||||
)
|
||||
from py_ecc.optimized_bls12_381.optimized_curve import G1, multiply
|
||||
from py_ecc.typing import Optimized_Field, Optimized_Point3D
|
||||
|
@ -141,13 +139,6 @@ def build_empty_block(spec, state, slot=None, proposer_index=None):
|
|||
raise Exception("k proposer_index does not match proposer_tracker")
|
||||
|
||||
empty_block.body.whisk_opening_proof = GenerateWhiskTrackerProof(proposer_tracker, Scalar(k_initial))
|
||||
if not IsValidWhiskOpeningProof(proposer_tracker, proposer_k_commitment, empty_block.body.whisk_opening_proof):
|
||||
raise Exception(
|
||||
"produced opening proof is not valid",
|
||||
proposer_tracker,
|
||||
proposer_k_commitment,
|
||||
empty_block.body.whisk_opening_proof
|
||||
)
|
||||
|
||||
# Whisk shuffle proof
|
||||
#######
|
||||
|
@ -159,19 +150,6 @@ def build_empty_block(spec, state, slot=None, proposer_index=None):
|
|||
empty_block.body.whisk_post_shuffle_trackers = post_trackers
|
||||
empty_block.body.whisk_shuffle_proof = shuffle_proof
|
||||
|
||||
if not IsValidWhiskShuffleProof(
|
||||
spec.CURDLEPROOFS_CRS,
|
||||
pre_shuffle_trackers,
|
||||
empty_block.body.whisk_post_shuffle_trackers,
|
||||
empty_block.body.whisk_shuffle_proof,
|
||||
):
|
||||
raise Exception(
|
||||
"produced shuffle proof is not valid",
|
||||
pre_shuffle_trackers,
|
||||
empty_block.body.whisk_post_shuffle_trackers,
|
||||
empty_block.body.whisk_shuffle_proof,
|
||||
)
|
||||
|
||||
# Whisk registration proof
|
||||
#######
|
||||
|
||||
|
|
Loading…
Reference in New Issue