Merge pull request #617 from ethereum/hwwhww/fix_compute_commitment
Fix `compute_commitment`
This commit is contained in:
commit
83b67b6097
|
@ -187,8 +187,9 @@ We define two helpers:
|
|||
|
||||
```python
|
||||
def pad_to_power_of_2(values: List[bytes]) -> List[bytes]:
|
||||
zero_shard_block = b'\x00' * SHARD_BLOCK_SIZE
|
||||
while not is_power_of_two(len(values)):
|
||||
values = values + [SHARD_BLOCK_SIZE]
|
||||
values = values + [zero_shard_block]
|
||||
return values
|
||||
```
|
||||
|
||||
|
@ -202,8 +203,16 @@ We define the function for computing the commitment as follows:
|
|||
```python
|
||||
def compute_commitment(headers: List[ShardBlock], bodies: List[bytes]) -> Bytes32:
|
||||
return hash(
|
||||
merkle_root(pad_to_power_of_2([merkle_root_of_bytes(zpad(serialize(h), SHARD_BLOCK_SIZE)) for h in headers])),
|
||||
merkle_root(pad_to_power_of_2([merkle_root_of_bytes(h) for h in bodies]))
|
||||
merkle_root(
|
||||
pad_to_power_of_2([
|
||||
merkle_root_of_bytes(zpad(serialize(h), SHARD_BLOCK_SIZE)) for h in headers
|
||||
])
|
||||
) +
|
||||
merkle_root(
|
||||
pad_to_power_of_2([
|
||||
merkle_root_of_bytes(h) for h in bodies
|
||||
])
|
||||
)
|
||||
)
|
||||
```
|
||||
|
||||
|
|
Loading…
Reference in New Issue