Make _impl consistent.

metacraft-labs · Mar 8, 2024 · f8517ce · f8517ce
1 parent 23d0edf
commit f8517ce
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/...lvm-metacraft-circuits/src/circuit_input_generators/serialization/serialize_attestation.h b/...lvm-metacraft-circuits/src/circuit_input_generators/serialization/serialize_attestation.h
@@ -5,7 +5,7 @@
 #include <type_traits>
 
 #include "json_serialization_utils.h"
-#include "../../circuits_impl/verify_attestation_data_imp.h"
+#include "../../circuits_impl/verify_attestation_data_impl.h"
 
 template<>
 nlohmann::json serialize(const CheckpointVariable& checkpoint) {

diff --git a/...acraft-circuits/src/circuit_input_generators/verify_attestation_data_input_generators.cpp b/...acraft-circuits/src/circuit_input_generators/verify_attestation_data_input_generators.cpp
@@ -15,7 +15,7 @@
 #include "utils/file_utils.h"
 #include "serialization/serialize_attestation.h"
 
-#include "circuits_impl/verify_attestation_data_imp.h"
+#include "circuits_impl/verify_attestation_data_impl.h"
 #include "utils/attestation_utils.h"
 
 using namespace circuit_byte_utils;

diff --git a/vendor/zkllvm-metacraft-circuits/src/circuits/verify_attestation_data.cpp b/vendor/zkllvm-metacraft-circuits/src/circuits/verify_attestation_data.cpp
@@ -1,7 +1,7 @@
-#include "../circuits_impl/verify_attestation_data_imp.h"
+#include "../circuits_impl/verify_attestation_data_impl.h"
 
 [[circuit]] base_field_type verify_attestation_data(HashType block_root, Attestation attestation,
                                                     base_field_type sigma) {
-    auto result = verify_attestation_data_imp(block_root, attestation, sigma);
+    auto result = verify_attestation_data_impl(block_root, attestation, sigma);
     return result.token;
 }
diff --git a/vendor/zkllvm-metacraft-circuits/src/circuits/weigh_justification_and_finalization.cpp b/vendor/zkllvm-metacraft-circuits/src/circuits/weigh_justification_and_finalization.cpp
@@ -1,4 +1,4 @@
-#include "../circuits_impl/weigh_justification_and_finalization.h"
+#include "../circuits_impl/weigh_justification_and_finalization_impl.h"
 
 using namespace weigh_justification_and_finalization_;
 

diff --git a/...rcuits_impl/verify_attestation_data_imp.h → ...cuits_impl/verify_attestation_data_impl.h b/...rcuits_impl/verify_attestation_data_imp.h → ...cuits_impl/verify_attestation_data_impl.h
@@ -117,14 +117,16 @@ static_vector<HashType> compute_zero_hashes(int length = 64) {
     return xs;
 }
 
-Proof fill_zero_hashes(const Proof& xs, size_t length = 0) {
+template<size_t N, bool FULL> 
+static_vector<HashType, N, FULL> fill_zero_hashes(const static_vector<HashType, N, FULL>& xs, size_t length = 0) {
+    ASSERT(length <= xs.capacity);
     const auto zero_hashes = compute_zero_hashes();
 #ifdef __ZKLLVM__
     sha256_t empty_hash = {0};
 #else
     auto empty_hash = get_empty_byte_array<32>();
 #endif
-    Proof witnesses = xs;
+    static_vector<HashType, N, FULL> witnesses = xs;
     int additions_count = length - xs.size();
 
     for (int i = 0; i < witnesses.size(); i++) {
@@ -171,14 +173,14 @@ HashType hash_validator(Bytes64 pubkey,
 }
 
 VoteToken
-    verify_attestation_data_imp(const HashType& block_root, const Attestation& attestation, base_field_type sigma) {
+    verify_attestation_data_impl(const HashType& block_root, const Attestation& attestation, base_field_type sigma) {
     assert_true(sigma != 0);
 
-    ssz_verify_proof(block_root, attestation.state_root, fill_zero_hashes(Proof(attestation.state_root_proof)), 11, 3);
+    ssz_verify_proof(block_root, attestation.state_root, fill_zero_hashes(attestation.state_root_proof), 11, 3);
 
     ssz_verify_proof(attestation.state_root,
                      attestation.validators_root,
-                     fill_zero_hashes(Proof(attestation.validators_root_proof)),
+                     fill_zero_hashes(attestation.validators_root_proof),
                      43,
                      5);
 

diff --git a/...pl/weigh_justification_and_finalization.h → ...igh_justification_and_finalization_impl.h b/...pl/weigh_justification_and_finalization.h → ...igh_justification_and_finalization_impl.h
diff --git a/...etacraft-circuits/src/tests/verify_attestation_data_test/verify_attestation_data_test.cpp b/...etacraft-circuits/src/tests/verify_attestation_data_test/verify_attestation_data_test.cpp
@@ -20,7 +20,7 @@
 #include "json/json.hpp"
 using namespace nlohmann;
 
-#include "circuits_impl/verify_attestation_data_imp.h"
+#include "circuits_impl/verify_attestation_data_impl.h"
 #include "utils/attestation_utils.h"
 
 using namespace nil::crypto3::algebra::curves;
@@ -319,7 +319,7 @@ int main(int argc, char* argv[]) {
 
         verify_attestation(attestation, json_attestation);
 
-        auto vote = verify_attestation_data_imp(
+        auto vote = verify_attestation_data_impl(
             hexToBytes<32>("d5c0418465ffab221522a6991c2d4c0041f1b8e91d01b1ea3f6b882369f689b7"), attestation, sigma);
 
         tokens.push_back(std::move(vote));

diff --git a/...s/weigh_justification_and_finalization_test/weigh_justification_and_finalization_test.cpp b/...s/weigh_justification_and_finalization_test/weigh_justification_and_finalization_test.cpp
@@ -6,7 +6,7 @@
 #include <fstream>
 #include <streambuf>
 
-#include "circuits_impl/weigh_justification_and_finalization.h"
+#include "circuits_impl/weigh_justification_and_finalization_impl.h"
 #include "utils/byte_utils.h"
 #include "utils/file_utils.h"
 

diff --git a/vendor/zkllvm-metacraft-circuits/src/utils/attestation_utils.h b/vendor/zkllvm-metacraft-circuits/src/utils/attestation_utils.h
@@ -6,7 +6,7 @@ using namespace nlohmann;
 #include "byte_utils.h"
 using namespace byte_utils;
 
-#include "circuits_impl/verify_attestation_data_imp.h"
+#include "circuits_impl/verify_attestation_data_impl.h"
 
 namespace attestation_utils {