Vergara_Tech/zcash-haskell
2
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity

Merge pull request 'Fix bug in Orchard witness calculation' (#80) from rav001 into dev040

Browse source 
Reviewed-on: #80
This commit is contained in:
pitmutt 2024-05-07 20:21:19 +00:00 committed by Vergara Technologies LLC
commit 4ca5d07d1c
Signed by: Vergara Technologies LLC
GPG key ID: 99DB473BB4715618
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
librustzcash-wrapper/src/lib.rs
View file

@ -1562,17 +1562,17 @@ pub extern "C" fn rust_wrapper_update_orchard_witness(
let n = MerkleHashOrchard::from_cmx(&orchard_note_comm.unwrap()); let n = MerkleHashOrchard::from_cmx(&orchard_note_comm.unwrap());
iw.append(n); iw.append(n);
} }
let mut out_bytes: Vec<u8> = Vec::new(); }
let result = write_incremental_witness(&iw, &mut out_bytes); let mut out_bytes: Vec<u8> = Vec::new();
match result { let result = write_incremental_witness(&iw, &mut out_bytes);
Ok(()) => { match result {
let h = Hhex { bytes: out_bytes}; Ok(()) => {
marshall_to_haskell_var(&h, out, out_len, RW); let h = Hhex { bytes: out_bytes};
}, marshall_to_haskell_var(&h, out, out_len, RW);
Err(_e) => { },
let h0 = Hhex { bytes: vec![0]}; Err(_e) => {
marshall_to_haskell_var(&h0, out, out_len, RW); let h0 = Hhex { bytes: vec![0]};
} marshall_to_haskell_var(&h0, out, out_len, RW);
} }
} }
} }