logos-storage/logos-storage-proofs
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-proofs.git synced 2026-01-02 13:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-add original prove for comparison

Browse Source
This commit is contained in:
Jaremy Creechley 2023-12-18 13:08:56 -07:00
parent dd115d484d
commit 7388fe82f2
No known key found for this signature in database
GPG Key ID: 4E66FB67B21D3300
2 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ffi.rs
View File

@ -163,7 +163,7 @@ pub unsafe extern "C" fn prove_mpack(
let mut _prover = &mut *prover_ptr;
_prover
.prove(
.prove_mpack(
inputs,
proof_bytes,
public_inputs_bytes,

68
src/storage_proofs.rs
View File

@ -162,8 +162,43 @@ fn decode_u256(val: &rmpv::Value) -> Result<U256, String> {
}
}
fn parse_mpack_args(builder: &mut CircomBuilder<Params256Ty>,
mut inputs: &[u8]) -> Result<(), String> {
fn parse_mpack_arrays(
builder: &mut CircomBuilder<Params256Ty>,
name: &str,
array: &Vec<rmpv::Value>
) -> Result<(), String> {
println!("deserde: array: {} size: {}", name, array.len());
if array.len() > 0 && array[0].is_array() {
println!("deserde: arrayOfArrays: {}", name);
for element in array {
match element .as_array() {
Some(element ) => {
parse_mpack_arrays(builder, name, element)?;
},
_ => {
print!("error expected array: {}", name);
return Err("expected inner array of u256".to_string())
},
}
}
} else {
println!("deserde: name: {}", name);
for val in array {
let n = decode_u256(val)?;
println!("\t{}", n);
builder.push_input(name, n);
}
println!("done: name: {}", name);
}
Ok(())
}
fn parse_mpack_args(
builder: &mut CircomBuilder<Params256Ty>,
mut inputs: &[u8]
) -> Result<(), String> {
let values: rmpv::Value = read_value(&mut inputs).map_err(|e| e.to_string())?;
let args: &Vec<(rmpv::Value, rmpv::Value)> = match values.as_map() {
Some(args) => args,
@ -178,34 +213,7 @@ fn parse_mpack_args(builder: &mut CircomBuilder<Params256Ty>,
match val {
// add a (name, Vec<u256>) or (name, Vev<Vec<u256>>) arrays
rmpv::Value::Array(vals) => {
println!("deserde: array: {} size: {}", name, vals.len());
if vals.len() > 0 && vals[0].is_array() {
println!("deserde: arrayOfArrays: {}", name);
for inner_val in vals {
match inner_val.as_array() {
Some(inner_vals) => {
println!("\tinner array: {} sz: {}", name, inner_vals.len());
for val in inner_vals {
let n = decode_u256(val)?;
println!("\tval: {} ", n);
// builder.push_input(name, n);
}
},
_ => {
print!("error expected array: {}", name);
return Err("expected inner array of u256".to_string())
},
}
}
} else {
println!("deserde: name: {}", name);
for val in vals {
let n = decode_u256(val)?;
println!("\t{}", n);
builder.push_input(name, n);
}
println!("done: name: {}", name);
}
parse_mpack_arrays(builder, name, vals)?;
},
// directly add a (name,u256) arg pair
rmpv::Value::Ext(_, _) => {