Skip to content

ssz assert to fix list decoding #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
turuslan wants to merge 1 commit into from
Closed

ssz assert to fix list decoding #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/modules/networking/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ namespace lean {
SSZ_CONT(finalized, head);
};

struct BlockRequest : ssz::ssz_container {
struct BlockRequest : ssz::ssz_variable_size_container {
ssz::list<BlockHash, MAX_REQUEST_BLOCKS> blocks;

SSZ_CONT(blocks);
};

struct BlockResponse : ssz::ssz_container {
struct BlockResponse : ssz::ssz_variable_size_container {
ssz::list<SignedBlock, MAX_REQUEST_BLOCKS> blocks;

SSZ_CONT(blocks);
Expand Down
2 changes: 1 addition & 1 deletion src/types/block.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "types/block_header.hpp"

namespace lean {
struct Block : ssz::ssz_container {
struct Block : ssz::ssz_variable_size_container {
uint64_t slot;
uint64_t proposer_index;
qtils::ByteArr<32> parent_root;
Expand Down
2 changes: 1 addition & 1 deletion src/types/block_body.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace lean {

struct BlockBody : ssz::ssz_container {
struct BlockBody : ssz::ssz_variable_size_container {
/// @note votes will be replaced by aggregated attestations.
ssz::list<SignedVote, VALIDATOR_REGISTRY_LIMIT> attestations;

Expand Down
2 changes: 1 addition & 1 deletion src/types/signed_block.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace lean {

struct SignedBlock : ssz::ssz_container {
struct SignedBlock : ssz::ssz_variable_size_container {
Block message;
qtils::ByteArr<32> signature;

Expand Down
2 changes: 1 addition & 1 deletion src/types/state.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "types/constants.hpp"

namespace lean {
struct State : ssz::ssz_container {
struct State : ssz::ssz_variable_size_container {
Config config;
Slot slot;
BlockHeader latest_block_header;
Expand Down
58 changes: 50 additions & 8 deletions vcpkg-overlay/sszpp/vcpkg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,52 @@ index 3174735..b086711 100644
}

diff --git a/lib/container.hpp b/lib/container.hpp
index dc31773..3e42de7 100644
index dc31773..c1e1e57 100644
--- a/lib/container.hpp
+++ b/lib/container.hpp
@@ -46,7 +46,7 @@ struct is_ssz_object<R> : std::true_type {};
@@ -31,6 +31,8 @@
namespace ssz {

struct ssz_container {
+ struct variable_size : std::false_type {};
+
constexpr auto operator<=>(const ssz_container &rhs) const noexcept = default;
constexpr bool operator==(const ssz_container &rhs) const noexcept = default;
};
@@ -43,15 +45,24 @@ template <class R>
requires std::derived_from<R, ssz_container>
struct is_ssz_object<R> : std::true_type {};

+template <typename>
+struct tuple_all_fixed_size;
+template <typename... T>
+struct tuple_all_fixed_size<std::tuple<T...>> : std::bool_constant<(ssz_object_fixed_size<T> and ...)> {};
+
// Serialization
#define SSZ_CONT(...) \
constexpr std::size_t ssz_size() const noexcept { return ssz::compute_total_length(__VA_ARGS__); } \
-#define SSZ_CONT(...) \
- constexpr std::size_t ssz_size() const noexcept { return ssz::compute_total_length(__VA_ARGS__); } \
- constexpr void serialize(ssz::ssz_iterator auto result) const { ssz::serialize(result, __VA_ARGS__); } \
- constexpr void deserialize(const std::ranges::sized_range auto &bytes) { \
- ssz::deserialize_container(bytes, __VA_ARGS__); \
- } \
- void hash_tree_root(ssz::ssz_iterator auto result, size_t cpu_count = 0) const { \
- ssz::_container_hash(result, cpu_count, __VA_ARGS__); \
+#define SSZ_CONT(...) \
+ constexpr std::size_t ssz_size() const noexcept { return ssz::compute_total_length(__VA_ARGS__); } \
+ constexpr void serialize(ssz::ssz_iterator auto result) const { ssz::serialize_container(result, __VA_ARGS__); } \
constexpr void deserialize(const std::ranges::sized_range auto &bytes) { \
ssz::deserialize_container(bytes, __VA_ARGS__); \
} \
@@ -75,7 +75,7 @@ constexpr std::uint32_t compute_total_length(const ssz_object auto &...members)
+ constexpr void deserialize(const std::ranges::sized_range auto &bytes) { \
+ ssz::deserialize_container(bytes, __VA_ARGS__); \
+ } \
+ void hash_tree_root(ssz::ssz_iterator auto result, size_t cpu_count = 0) const { \
+ ssz::_container_hash(result, cpu_count, __VA_ARGS__); \
+ } \
+ void assert_consistent_variable_size() const { \
+ auto t = std::tie(__VA_ARGS__); \
+ static_assert(variable_size::value or ssz::tuple_all_fixed_size<decltype(t)>::value); \
}
#ifdef HAVE_YAML
#define YAML_CONT(...) \
@@ -75,7 +86,7 @@ constexpr std::uint32_t compute_total_length(const ssz_object auto &...members)
return (... + size_plus_placeholder(members));
}

Expand All @@ -141,6 +174,15 @@ index dc31773..3e42de7 100644
auto fsize = compute_fixed_length(members...);
auto variable = result + fsize;
auto begin = result;
@@ -174,7 +185,7 @@ namespace _detail {
auto _decode_member = [](const YAML::Node &node, yaml_pair auto pair) {
return YAML::convert<std::remove_reference_t<decltype(pair.second)>>::decode(node[pair.first], pair.second);
};
-}
+} // namespace _detail

bool yaml_decode_container(const YAML::Node &node, yaml_pair auto... pairs) {
return (_detail::_decode_member(node, pairs), ...);
diff --git a/lib/cxx23/ranges/chunk.hpp b/lib/cxx23/ranges/chunk.hpp
new file mode 100644
index 0000000..4c73bd2
Expand Down
Loading