Skip to content

Commit 4f1b5e5

Browse files
authored
Update merklecpp to from 1.1.0 to 1.1.1 (#7144)
1 parent 845fa4f commit 4f1b5e5

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

3rdparty/exported/merklecpp/merklecpp.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,14 @@ namespace merkle
424424
/// @brief The size of the serialised path in number of bytes
425425
size_t serialised_size() const
426426
{
427-
return sizeof(_leaf) + elements.size() * sizeof(Element);
427+
return sizeof(_leaf) +
428+
sizeof(uint64_t) + // leaf index
429+
sizeof(uint64_t) + // max index
430+
sizeof(uint64_t) + // number of elements
431+
elements.size() * (
432+
sizeof(Element::hash) + // hash
433+
sizeof(uint8_t) // direction
434+
);
428435
}
429436

430437
/// @brief Index of the leaf of the path

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
"type": "git",
9595
"git": {
9696
"repositoryUrl": "https://github.com/microsoft/merklecpp",
97-
"commitHash": "1a8a3a000c16fee62bc55d2efdb10d2ebd2b0173",
98-
"tag": "v1.1.0"
97+
"commitHash": "30d1dc7dc3b46b7da71124fb8df385a8b67ef59b",
98+
"tag": "v1.1.1"
9999
}
100100
}
101101
},

0 commit comments

Comments
 (0)