logos-blockchain/logos-blockchain-circuits
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-circuits.git synced 2026-05-18 15:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move forward declarations to a separate file.

Browse Source
This commit is contained in:
Alejandro Cabeza Romero 2026-04-20 16:19:40 +02:00
parent 02cc519f29
commit 6cef39ba87
No known key found for this signature in database
GPG Key ID: DA3D14AE478030FD
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/circom_fwd.hpp Normal file
View File

@ -0,0 +1,30 @@
#ifndef CIRCOM_FWD_HPP
#define CIRCOM_FWD_HPP
/// Forward declarations for symbols defined in circom-generated main.cpp.
///
/// Circom compiles each circuit into a self-contained main.cpp that defines the witness generation
/// logic alongside several helper functions.
/// This header exposes those symbols so that FFI code can call into them without pulling in the full circom source.
#include <string>
#include <vector>
#include <nlohmann/json.hpp>
#include "calcwit.hpp"
#include "circom.hpp"
#include "fr.hpp"
using json = nlohmann::json;
/// Forward declaration of circom main(). Renamed via -Dmain=circom_main to avoid UB.
/// TODO: Successful path has no explicit return.
int circom_main(int argc, char* argv[]);
bool check_valid_number(std::string& s, uint base);
void json2FrElements(json val, std::vector<FrElement>& vval);
json::value_t check_type(std::string prefix, json in);
void qualify_input(std::string prefix, json& in, json& in1);
void qualify_input_list(std::string prefix, json& in, json& in1);
#endif

31
src/poq/ffi.cpp
View File

@ -1,30 +1,9 @@
#include "poq/ffi.hpp"
#include "circom_fwd.hpp"
#include <string>
#include <vector>
#include <algorithm>
#include <nlohmann/json.hpp>
#include "calcwit.hpp"
#include "circom.hpp"
#include "fr.hpp"
using json = nlohmann::json;
// ---- Forward declarations from circom-generated main.cpp ----
/// This is a forward declaration of circom main(). It's renamed due to UB when calling a main() function.
/// TODO: Successful path of the function has no explicit return.
int circom_main(int argc, char* argv[]);
bool check_valid_number(std::string& s, uint base);
void json2FrElements(json val, std::vector<FrElement>& vval);
json::value_t check_type(std::string prefix, json in);
void qualify_input(std::string prefix, json& in, json& in1);
void qualify_input_list(std::string prefix, json& in, json& in1);
// -------------------------------------------------------------
template<typename T>
static Status exceptions_into_status(T&& func) {
try {
@ -38,7 +17,7 @@ static Status exceptions_into_status(T&& func) {
}
}
static Status validate_generate_witness_from_files_input(const char* dat, const char* inputs, const char* output) {
static Status validate_generate_witness_from_files_arguments(const char* dat, const char* inputs, const char* output) {
if (dat == nullptr) {
return status_new(StatusCode_InvalidInput, "dat is null.");
}
@ -68,7 +47,7 @@ static Status generate_witness_from_files_impl(const char* dat, const char* inpu
}
extern "C" Status poq_generate_witness_from_files(const char* dat, const char* inputs, const char* output) {
const Status status = validate_generate_witness_from_files_input(dat, inputs, output); // NOLINT: if-init
const Status status = validate_generate_witness_from_files_arguments(dat, inputs, output); // NOLINT: if-init
if (status_is_error(status)) {
return status;
}
@ -80,7 +59,7 @@ extern "C" Status poq_generate_witness_from_files(const char* dat, const char* i
// ---- Memory-based entry point ----
static Status validate_witness_input(const WitnessInput* input, const Bytes* output) {
static Status validate_witness_arguments(const WitnessInput* input, const Bytes* output) {
if (input == nullptr) {
return status_new(StatusCode_InvalidInput, "input is null.");
}
@ -122,7 +101,7 @@ static Status generate_witness_impl(const WitnessInput* input, Bytes* output) {
}
extern "C" Status poq_generate_witness(const WitnessInput* input, Bytes* output) {
const Status status = validate_witness_input(input, output); // NOLINT: if-init
const Status status = validate_witness_arguments(input, output); // NOLINT: if-init
if (status_is_error(status)) {
return status;
}