status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix `build_deposit`

This commit is contained in:
Hsiao-Wei Wang 2019-06-29 02:51:24 +08:00
parent cb2bfd67dc
commit 7bc6a46eaa
No known key found for this signature in database
GPG Key ID: 95B070122902DEA4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test_libs/pyspec/eth2spec/test/helpers/deposits.py
View File

@ -48,20 +48,20 @@ def build_deposit(spec,
item = deposit_data.hash_tree_root() item = deposit_data.hash_tree_root()
index = len(deposit_data_leaves) index = len(deposit_data_leaves)
deposit_data_leaves.append(item) deposit_data_leaves.append(item)
tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves)) tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves), spec.DEPOSIT_CONTRACT_TREE_DEPTH)
root = get_merkle_root((tuple(deposit_data_leaves))) root = get_merkle_root((tuple(deposit_data_leaves)), 2**spec.DEPOSIT_CONTRACT_TREE_DEPTH)
proof = list(get_merkle_proof(tree, item_index=index)) proof = list(get_merkle_proof(tree, item_index=index))
deposit = spec.Deposit( deposit = spec.Deposit(
proof=list(proof), proof=list(proof),
index=index, index=index,
data=deposit_data, data=deposit_data,
) )
assert spec.verify_merkle_branch(item, proof, spec.DEPOSIT_CONTRACT_TREE_DEPTH, index, root)
return deposit, root, deposit_data_leaves return deposit, root, deposit_data_leaves
def prepare_genesis_deposits(spec, genesis_validator_count, amount, signed=False): def prepare_genesis_deposits(spec, genesis_validator_count, amount, signed=False):
genesis_deposit_data_list = []
deposit_data_leaves = [] deposit_data_leaves = []
genesis_deposits = [] genesis_deposits = []
for validator_index in range(genesis_validator_count): for validator_index in range(genesis_validator_count):
@ -78,10 +78,9 @@ def prepare_genesis_deposits(spec, genesis_validator_count, amount, signed=False
sign_deposit_data(spec, deposit_data, privkey) # state=None sign_deposit_data(spec, deposit_data, privkey) # state=None
item = deposit_data.hash_tree_root() item = deposit_data.hash_tree_root()
deposit_data_leaves.append(item) deposit_data_leaves.append(item)
genesis_deposit_data_list.append(deposit_data)
tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves)) tree = calc_merkle_tree_from_leaves(tuple(deposit_data_leaves), spec.DEPOSIT_CONTRACT_TREE_DEPTH)
root = get_merkle_root((tuple(deposit_data_leaves)), 2**32) root = get_merkle_root((tuple(deposit_data_leaves)), 2**spec.DEPOSIT_CONTRACT_TREE_DEPTH)
genesis_deposits.append( genesis_deposits.append(
spec.Deposit(proof=list(get_merkle_proof(tree, item_index=validator_index)), data=deposit_data) spec.Deposit(proof=list(get_merkle_proof(tree, item_index=validator_index)), data=deposit_data)
) )