Add TTL Option to command line (#273)

* re-insert v2 slate

* reinstate version conversions

* rustfmt

* add and test versioning checks against 2.0.0 wallets

* rustfmt

* fix to invoice file output

* doctest fix

* remove target slate version from command line options

* add ttl option to send_tx and pay commands

* rustfmt
This commit is contained in:
Yeastplume
2019-12-04 13:04:28 +00:00
committed by GitHub
parent 86e6f511c3
commit e2ad2b3880
4 changed files with 23 additions and 1 deletions
+1 -1
View File
@@ -751,7 +751,7 @@ where
// Step 5: Cancel any transactions with an expired TTL
for tx in txs {
if let Some(e) = tx.ttl_cutoff_height {
if e >= tip.0 {
if tip.0 >= e {
wallet_lock!(wallet_inst, w);
let parent_key_id = w.parent_key_id();
tx::cancel_tx(&mut **w, keychain_mask, &parent_key_id, Some(tx.id), None)?;