Compare commits
No commits in common. "302a2f87fa064519bad65bb2088623b756924da8" and "22c0fe374976d9f2323a8b7cd42f941423d45111" have entirely different histories.
302a2f87fa
...
22c0fe3749
1 changed files with 10 additions and 9 deletions
|
@ -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,12 +1774,13 @@ 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();
|
||||||
|
|
Loading…
Reference in a new issue