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

Merge pull request 'Remove debugging' (#79) from rav001 into dev040

Browse source 
Reviewed-on: #79
This commit is contained in:
pitmutt 2024-05-07 17:17:29 +00:00 committed by Vergara Technologies LLC
commit 302a2f87fa
Signed by: Vergara Technologies LLC
GPG key ID: 99DB473BB4715618
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1656,7 +1656,7 @@ pub extern "C" fn rust_wrapper_create_transaction(
None None
} }
}; };
println!("{:?}", sap_anchor); //println!("{:?}", sap_anchor);
let orch_wit_in: Vec<u8> = marshall_from_haskell_var(orch_wit, orch_wit_len, RW); let orch_wit_in: Vec<u8> = marshall_from_haskell_var(orch_wit, orch_wit_len, RW);
let orch_wit_reader = Cursor::new(orch_wit_in); let orch_wit_reader = Cursor::new(orch_wit_in);
let orch_iw = read_commitment_tree::<MerkleHashOrchard, Cursor<Vec<u8>>, 32>(orch_wit_reader); let orch_iw = read_commitment_tree::<MerkleHashOrchard, Cursor<Vec<u8>>, 32>(orch_wit_reader);
@ -1678,7 +1678,7 @@ pub extern "C" fn rust_wrapper_create_transaction(
if net { if net {
match main_builder.add_transparent_input(k, t_in.utxo.unpack(), t_in.coin.unpack()) { match main_builder.add_transparent_input(k, t_in.utxo.unpack(), t_in.coin.unpack()) {
Ok(()) => { Ok(()) => {
println!("added t-input in main"); //println!("added t-input in main");
continue; continue;
}, },
Err(_e) => { println!("Error reading transparent input"); } Err(_e) => { println!("Error reading transparent input"); }
@ -1686,7 +1686,7 @@ pub extern "C" fn rust_wrapper_create_transaction(
} else { } else {
match test_builder.add_transparent_input(k, t_in.utxo.unpack(), t_in.coin.unpack()) { match test_builder.add_transparent_input(k, t_in.utxo.unpack(), t_in.coin.unpack()) {
Ok(()) => { Ok(()) => {
println!("added t-input in test"); //println!("added t-input in test");
continue; continue;
}, },
Err(_e) => { println!("Error reading transparent input"); } Err(_e) => { println!("Error reading transparent input"); }
@ -1774,13 +1774,12 @@ pub extern "C" fn rust_wrapper_create_transaction(
} }
}, },
4 => { 4 => {
//let sk = SpendingKey::from_bytes(output.ovk[0..32].try_into().unwrap()).unwrap(); let sk = SpendingKey::from_bytes(output.ovk[0..32].try_into().unwrap()).unwrap();
//let ovk = if output.chg { let ovk = if output.chg {
//Some(FullViewingKey::from(&sk).to_ovk(Scope::Internal)) Some(FullViewingKey::from(&sk).to_ovk(Scope::Internal))
//} else { } else {
//Some(FullViewingKey::from(&sk).to_ovk(Scope::External)) Some(FullViewingKey::from(&sk).to_ovk(Scope::External))
//}; };
let ovk = None;
let recipient = OrchardAddress::from_raw_address_bytes(&to_array(output.to)).unwrap(); let recipient = OrchardAddress::from_raw_address_bytes(&to_array(output.to)).unwrap();
let val = output.amt; let val = output.amt;
let memo = MemoBytes::from_bytes(&output.memo).unwrap(); let memo = MemoBytes::from_bytes(&output.memo).unwrap();