Skip to content

Commit 4d5ad70

Browse files
authored
Merge pull request #21 from optimism-java/hash
fix: merkleize method
2 parents 1cd3152 + fd6e8c4 commit 4d5ad70

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/spec_tests/ssz_static/root.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const CommonUnion = union {
6464
// BeaconBlock: types.BeaconBlock,
6565
BeaconBlockHeader: types.BeaconBlockHeader,
6666
Checkpoint: types.Checkpoint,
67-
// Deposit: types.Deposit,
67+
Deposit: types.Deposit,
6868
DepositData: types.DepositData,
6969
DepositMessage: types.DepositMessage,
7070
Eth1Block: types.Eth1Block,

src/ssz/ssz.zig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,10 @@ pub fn merkleize(chunks: []chunk, limit: ?usize, out: *[32]u8) anyerror!void {
902902
if (size / 2 < chunks.len) {
903903
try merkleize(chunks[size / 2 ..], size / 2, &buf);
904904
hasher.update(buf[0..]);
905-
} else hasher.update(hashes_of_zero[size / 2 - 1][0..]);
905+
} else {
906+
const power = std.math.log2(size);
907+
hasher.update(hashes_of_zero[power - 1][0..]);
908+
}
906909
hasher.final(out);
907910
},
908911
}

0 commit comments

Comments
 (0)