Merge branch 'master' into philip-lightningdevkit#129-bolt4-packet-forwarding-tests

# Conflicts:
#	src/ln/channelmanager.rs

Author: philipr-za

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lightning"
-version = "0.0.6"
+version = "0.0.7"
 authors = ["Matt Corallo"]
 license = "Apache-2.0"
 repository = "https://github.com/rust-bitcoin/rust-lightning/"

README.md

@@ -1,6 +1,6 @@
 Rust-Lightning, not Rusty's Lightning!
 
-Currently somewhere near 10% towards usable, published to see if there is any
+Currently somewhere near 15% towards usable, published to see if there is any
 real interest from folks in using a lightning rust library.
 
 The goal is to provide a full-featured but also incredibly flexible lightning

fuzz/Cargo.toml

@@ -31,6 +31,10 @@ cc = "1.0"
 [workspace]
 members = ["."]
 
+[profile.release]
+lto = true
+codegen-units = 1
+
 [[bin]]
 name = "peer_crypt_target"
 path = "fuzz_targets/peer_crypt_target.rs"

src/chain/keysinterface.rs

@@ -37,19 +37,34 @@ pub enum SpendableOutputDescriptor {
 		/// The output which is referenced by the given outpoint
 		output: TxOut,
 	},
-	/// Outpoint commits to a P2WSH, should be spend by the following witness :
+	/// Outpoint commits to a P2WSH
+	/// P2WSH should be spend by the following witness :
 	/// <local_delayedsig> 0 <witnessScript>
 	/// With input nSequence set to_self_delay.
-	/// Outputs from a HTLC-Success/Timeout tx
-	DynamicOutput {
+	/// Outputs from a HTLC-Success/Timeout tx/commitment tx
+	DynamicOutputP2WSH {
 		/// Outpoint spendable by user wallet
 		outpoint: OutPoint,
-		/// local_delayedkey = delayed_payment_basepoint_secret + SHA256(per_commitment_point || delayed_payment_basepoint)
-		local_delayedkey: SecretKey,
-		/// witness redeemScript encumbering output
+		/// local_delayedkey = delayed_payment_basepoint_secret + SHA256(per_commitment_point || delayed_payment_basepoint) OR
+		key: SecretKey,
+		/// witness redeemScript encumbering output.
 		witness_script: Script,
 		/// nSequence input must commit to self_delay to satisfy script's OP_CSV
 		to_self_delay: u16,
+		/// The output which is referenced by the given outpoint
+		output: TxOut,
+	},
+	/// Outpoint commits to a P2WPKH
+	/// P2WPKH should be spend by the following witness :
+	/// <local_sig> <local_pubkey>
+	/// Outputs to_remote from a commitment tx
+	DynamicOutputP2WPKH {
+		/// Outpoint spendable by user wallet
+		outpoint: OutPoint,
+		/// localkey = payment_basepoint_secret + SHA256(per_commitment_point || payment_basepoint
+		key: SecretKey,
+		/// The output which is reference by the given outpoint
+		output: TxOut,
 	}
 }