X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fpackage.rs;h=7ea61dc244976c2257087b91ade479d5aa758832;hb=3a643df99797ee2dd5cc19a6f9d090212b1c7963;hp=b3f6f50ed1d17fb390c04a2995eb98e9ef3fd558;hpb=db123f74be168e6f5432fb337dbe45bd7db0bde9;p=rust-lightning

diff --git a/lightning/src/chain/package.rs b/lightning/src/chain/package.rs
index b3f6f50e..7ea61dc2 100644
--- a/lightning/src/chain/package.rs
+++ b/lightning/src/chain/package.rs
@@ -460,13 +460,13 @@ impl PackageSolvingData {
 		}
 	}
 	fn absolute_tx_timelock(&self, current_height: u32) -> u32 {
-		// We use `current_height + 1` as our default locktime to discourage fee sniping and because
+		// We use `current_height` as our default locktime to discourage fee sniping and because
 		// transactions with it always propagate.
 		let absolute_timelock = match self {
-			PackageSolvingData::RevokedOutput(_) => current_height + 1,
-			PackageSolvingData::RevokedHTLCOutput(_) => current_height + 1,
-			PackageSolvingData::CounterpartyOfferedHTLCOutput(_) => current_height + 1,
-			PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => cmp::max(outp.htlc.cltv_expiry, current_height + 1),
+			PackageSolvingData::RevokedOutput(_) => current_height,
+			PackageSolvingData::RevokedHTLCOutput(_) => current_height,
+			PackageSolvingData::CounterpartyOfferedHTLCOutput(_) => current_height,
+			PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => cmp::max(outp.htlc.cltv_expiry, current_height),
 			// HTLC timeout/success transactions rely on a fixed timelock due to the counterparty's
 			// signature.
 			PackageSolvingData::HolderHTLCOutput(ref outp) => {
@@ -475,7 +475,7 @@ impl PackageSolvingData {
 				}
 				outp.cltv_expiry
 			},
-			PackageSolvingData::HolderFundingOutput(_) => current_height + 1,
+			PackageSolvingData::HolderFundingOutput(_) => current_height,
 		};
 		absolute_timelock
 	}