Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-02-01 08:51:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incorrect merge in previous PR (#267)

Browse source
This commit is contained in:
Yeastplume 2019-12-02 15:27:40 +00:00 committed by GitHub
parent 39db21d549
commit 43a7bfecef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libwallet/src/slate.rs
View file

@ -187,8 +187,8 @@ pub struct Slate {
/// TTL, the block height at which wallets /// TTL, the block height at which wallets
/// should refuse to process the transaction and unlock all /// should refuse to process the transaction and unlock all
/// associated outputs /// associated outputs
#[serde(with = "secp_ser::string_or_u64")] #[serde(with = "secp_ser::opt_string_or_u64")]
pub ttl_cutoff_height: u64, pub ttl_cutoff_height: Option<u64>,
/// Participant data, each participant in the transaction will /// Participant data, each participant in the transaction will
/// insert their public data here. For now, 0 is sender and 1 /// insert their public data here. For now, 0 is sender and 1
/// is receiver, though this will change for multi-party /// is receiver, though this will change for multi-party