Skip to content

Commit

Permalink
Fix incorrect merge in previous PR (mimblewimble#267)
Browse files Browse the repository at this point in the history
  • Loading branch information
yeastplume authored Dec 2, 2019
1 parent 39db21d commit 43a7bfe
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libwallet/src/slate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ pub struct Slate {
/// TTL, the block height at which wallets
/// should refuse to process the transaction and unlock all
/// associated outputs
#[serde(with = "secp_ser::string_or_u64")]
pub ttl_cutoff_height: u64,
#[serde(with = "secp_ser::opt_string_or_u64")]
pub ttl_cutoff_height: Option<u64>,
/// Participant data, each participant in the transaction will
/// insert their public data here. For now, 0 is sender and 1
/// is receiver, though this will change for multi-party
Expand Down

0 comments on commit 43a7bfe

Please sign in to comment.