mirror of
https://github.com/jwinterm/grin-wallet.git
synced 2026-10-24 18:38:32 +02:00
TTL Implementation (#261)
* refactor address generation code into libwallet, bool to flag whether to include proof, add sender address in init_send_tx * rustfmt * require payment proof addr as part of init_tx * rustfmt * store payment proof on sender transaction side * rustfmt * change sig to ed25519 sig * rustfmt * add message creation and signature * rustfmt * add payment proof verification function * rustfmt * validate proof on sender side, store proof * rustfmt * fix json tests * fixes and updates to tests * added API functions for converting and retrieving proof addresses * rustfmt * add payment proof to init_send_tx example * rustfmt * incorrect comment * add commands for requesting payment proofs * rustfmt * wire up payment proofs into command line * rustfmt * add address command * rustfmt * added tor sending from owner api * rustfmt * add TTL to slate, transaction log * ttl cutoff tests * add ttl check to recieve functions, add tests, modify doctests * rustfmt * fixes from upstream changes and test fixes * rustfmt * remove unnecessary block header version check
This commit is contained in:
@@ -225,14 +225,24 @@ where
|
||||
let w = w_lock.lc_provider()?.wallet_inst()?;
|
||||
let mask = wallet.2.clone();
|
||||
// receive tx
|
||||
foreign::receive_tx(
|
||||
match foreign::receive_tx(
|
||||
&mut **w,
|
||||
(&mask).as_ref(),
|
||||
&Slate::from(slate),
|
||||
None,
|
||||
None,
|
||||
false,
|
||||
)?
|
||||
) {
|
||||
Err(e) => {
|
||||
return Ok(WalletProxyMessage {
|
||||
sender_id: m.dest,
|
||||
dest: m.sender_id,
|
||||
method: m.method,
|
||||
body: serde_json::to_string(&format!("Error: {}", e)).unwrap(),
|
||||
})
|
||||
}
|
||||
Ok(s) => s,
|
||||
}
|
||||
};
|
||||
|
||||
Ok(WalletProxyMessage {
|
||||
|
||||
Reference in New Issue
Block a user