X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fscript.rs;h=1909eb0c5f7df5f347ea0484bfbdd08fa8a239f8;hb=3a9fe209e104e048921ad50be77a80b18a98b45c;hp=09363b6b51749f033bb482db1ac7b50b28ffaaf2;hpb=ca76d0675b5e3b123a92e19937d2f64b91355773;p=rust-lightning

diff --git a/lightning/src/ln/script.rs b/lightning/src/ln/script.rs
index 09363b6b..1909eb0c 100644
--- a/lightning/src/ln/script.rs
+++ b/lightning/src/ln/script.rs
@@ -1,53 +1,51 @@
 //! Abstractions for scripts used in the Lightning Network.
 
 use bitcoin::blockdata::opcodes::all::OP_PUSHBYTES_0 as SEGWIT_V0;
-use bitcoin::blockdata::script::{Builder, Script};
+use bitcoin::blockdata::script::{Script, ScriptBuf};
 use bitcoin::hashes::Hash;
 use bitcoin::hash_types::{WPubkeyHash, WScriptHash};
 use bitcoin::secp256k1::PublicKey;
-use bitcoin::util::address::WitnessVersion;
+use bitcoin::address::WitnessProgram;
 
-use ln::channelmanager;
-use ln::features::InitFeatures;
-use ln::msgs::DecodeError;
-use util::ser::{Readable, Writeable, Writer};
+use crate::ln::channelmanager;
+use crate::ln::features::InitFeatures;
+use crate::ln::msgs::DecodeError;
+use crate::util::ser::{Readable, Writeable, Writer};
 
-use core::convert::TryFrom;
-use io;
+use crate::io;
+
+#[allow(unused_imports)]
+use crate::prelude::*;
 
 /// A script pubkey for shutting down a channel as defined by [BOLT #2].
 ///
 /// [BOLT #2]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, Eq)]
 pub struct ShutdownScript(ShutdownScriptImpl);
 
-/// An error occurring when converting from [`Script`] to [`ShutdownScript`].
+/// An error occurring when converting from [`ScriptBuf`] to [`ShutdownScript`].
 #[derive(Clone, Debug)]
 pub struct InvalidShutdownScript {
 	/// The script that did not meet the requirements from [BOLT #2].
 	///
 	/// [BOLT #2]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md
-	pub script: Script
+	pub script: ScriptBuf
 }
 
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, Eq)]
 enum ShutdownScriptImpl {
 	/// [`PublicKey`] used to form a P2WPKH script pubkey. Used to support backward-compatible
 	/// serialization.
 	Legacy(PublicKey),
 
-	/// [`Script`] adhering to a script pubkey format specified in BOLT #2.
-	Bolt2(Script),
+	/// [`ScriptBuf`] adhering to a script pubkey format specified in BOLT #2.
+	Bolt2(ScriptBuf),
 }
 
 impl Writeable for ShutdownScript {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		self.0.write(w)
 	}
-
-	fn serialized_length(&self) -> usize {
-		self.0.serialized_length()
-	}
 }
 
 impl Readable for ShutdownScript {
@@ -69,12 +67,12 @@ impl ShutdownScript {
 
 	/// Generates a P2WPKH script pubkey from the given [`WPubkeyHash`].
 	pub fn new_p2wpkh(pubkey_hash: &WPubkeyHash) -> Self {
-		Self(ShutdownScriptImpl::Bolt2(Script::new_v0_p2wpkh(pubkey_hash)))
+		Self(ShutdownScriptImpl::Bolt2(ScriptBuf::new_v0_p2wpkh(pubkey_hash)))
 	}
 
 	/// Generates a P2WSH script pubkey from the given [`WScriptHash`].
 	pub fn new_p2wsh(script_hash: &WScriptHash) -> Self {
-		Self(ShutdownScriptImpl::Bolt2(Script::new_v0_p2wsh(script_hash)))
+		Self(ShutdownScriptImpl::Bolt2(ScriptBuf::new_v0_p2wsh(script_hash)))
 	}
 
 	/// Generates a witness script pubkey from the given segwit version and program.
@@ -85,16 +83,12 @@ impl ShutdownScript {
 	/// # Errors
 	///
 	/// This function may return an error if `program` is invalid for the segwit `version`.
-	pub fn new_witness_program(version: WitnessVersion, program: &[u8]) -> Result<Self, InvalidShutdownScript> {
-		let script = Builder::new()
-			.push_int(version as i64)
-			.push_slice(&program)
-			.into_script();
-		Self::try_from(script)
+	pub fn new_witness_program(witness_program: &WitnessProgram) -> Result<Self, InvalidShutdownScript> {
+		Self::try_from(ScriptBuf::new_witness_program(witness_program))
 	}
 
-	/// Converts the shutdown script into the underlying [`Script`].
-	pub fn into_inner(self) -> Script {
+	/// Converts the shutdown script into the underlying [`ScriptBuf`].
+	pub fn into_inner(self) -> ScriptBuf {
 		self.into()
 	}
 
@@ -131,20 +125,20 @@ pub(crate) fn is_bolt2_compliant(script: &Script, features: &InitFeatures) -> bo
 
 // Note that this is only for our own shutdown scripts. Counterparties are still allowed to send us
 // non-witness shutdown scripts which this rejects.
-impl TryFrom<Script> for ShutdownScript {
+impl TryFrom<ScriptBuf> for ShutdownScript {
 	type Error = InvalidShutdownScript;
 
-	fn try_from(script: Script) -> Result<Self, Self::Error> {
-		Self::try_from((script, &channelmanager::provided_init_features()))
+	fn try_from(script: ScriptBuf) -> Result<Self, Self::Error> {
+		Self::try_from((script, &channelmanager::provided_init_features(&crate::util::config::UserConfig::default())))
 	}
 }
 
 // Note that this is only for our own shutdown scripts. Counterparties are still allowed to send us
 // non-witness shutdown scripts which this rejects.
-impl TryFrom<(Script, &InitFeatures)> for ShutdownScript {
+impl TryFrom<(ScriptBuf, &InitFeatures)> for ShutdownScript {
 	type Error = InvalidShutdownScript;
 
-	fn try_from((script, features): (Script, &InitFeatures)) -> Result<Self, Self::Error> {
+	fn try_from((script, features): (ScriptBuf, &InitFeatures)) -> Result<Self, Self::Error> {
 		if is_bolt2_compliant(&script, features) && script.is_witness_program() {
 			Ok(Self(ShutdownScriptImpl::Bolt2(script)))
 		} else {
@@ -153,11 +147,11 @@ impl TryFrom<(Script, &InitFeatures)> for ShutdownScript {
 	}
 }
 
-impl Into<Script> for ShutdownScript {
-	fn into(self) -> Script {
+impl Into<ScriptBuf> for ShutdownScript {
+	fn into(self) -> ScriptBuf {
 		match self.0 {
 			ShutdownScriptImpl::Legacy(pubkey) =>
-				Script::new_v0_p2wpkh(&WPubkeyHash::hash(&pubkey.serialize())),
+				ScriptBuf::new_v0_p2wpkh(&WPubkeyHash::hash(&pubkey.serialize())),
 			ShutdownScriptImpl::Bolt2(script_pubkey) => script_pubkey,
 		}
 	}
@@ -175,21 +169,23 @@ impl core::fmt::Display for ShutdownScript{
 #[cfg(test)]
 mod shutdown_script_tests {
 	use super::ShutdownScript;
+
+	use bitcoin::address::{WitnessProgram, WitnessVersion};
 	use bitcoin::blockdata::opcodes;
-	use bitcoin::blockdata::script::{Builder, Script};
+	use bitcoin::blockdata::script::{Builder, ScriptBuf};
 	use bitcoin::secp256k1::Secp256k1;
 	use bitcoin::secp256k1::{PublicKey, SecretKey};
-	use ln::features::InitFeatures;
-	use core::convert::TryFrom;
-	use bitcoin::util::address::WitnessVersion;
 
-	fn pubkey() -> bitcoin::util::key::PublicKey {
+	use crate::ln::features::InitFeatures;
+	use crate::prelude::*;
+
+	fn pubkey() -> bitcoin::key::PublicKey {
 		let secp_ctx = Secp256k1::signing_only();
 		let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
-		bitcoin::util::key::PublicKey::new(PublicKey::from_secret_key(&secp_ctx, &secret_key))
+		bitcoin::key::PublicKey::new(PublicKey::from_secret_key(&secp_ctx, &secret_key))
 	}
 
-	fn redeem_script() -> Script {
+	fn redeem_script() -> ScriptBuf {
 		let pubkey = pubkey();
 		Builder::new()
 			.push_opcode(opcodes::all::OP_PUSHNUM_2)
@@ -210,7 +206,7 @@ mod shutdown_script_tests {
 	fn generates_p2wpkh_from_pubkey() {
 		let pubkey = pubkey();
 		let pubkey_hash = pubkey.wpubkey_hash().unwrap();
-		let p2wpkh_script = Script::new_v0_p2wpkh(&pubkey_hash);
+		let p2wpkh_script = ScriptBuf::new_v0_p2wpkh(&pubkey_hash);
 
 		let shutdown_script = ShutdownScript::new_p2wpkh_from_pubkey(pubkey.inner);
 		assert!(shutdown_script.is_compatible(&any_segwit_features()));
@@ -221,7 +217,7 @@ mod shutdown_script_tests {
 	#[test]
 	fn generates_p2wpkh_from_pubkey_hash() {
 		let pubkey_hash = pubkey().wpubkey_hash().unwrap();
-		let p2wpkh_script = Script::new_v0_p2wpkh(&pubkey_hash);
+		let p2wpkh_script = ScriptBuf::new_v0_p2wpkh(&pubkey_hash);
 
 		let shutdown_script = ShutdownScript::new_p2wpkh(&pubkey_hash);
 		assert!(shutdown_script.is_compatible(&any_segwit_features()));
@@ -233,7 +229,7 @@ mod shutdown_script_tests {
 	#[test]
 	fn generates_p2wsh_from_script_hash() {
 		let script_hash = redeem_script().wscript_hash();
-		let p2wsh_script = Script::new_v0_p2wsh(&script_hash);
+		let p2wsh_script = ScriptBuf::new_v0_p2wsh(&script_hash);
 
 		let shutdown_script = ShutdownScript::new_p2wsh(&script_hash);
 		assert!(shutdown_script.is_compatible(&any_segwit_features()));
@@ -244,30 +240,17 @@ mod shutdown_script_tests {
 
 	#[test]
 	fn generates_segwit_from_non_v0_witness_program() {
-		let witness_program = Script::new_witness_program(WitnessVersion::V16, &[0; 40]);
-		let shutdown_script = ShutdownScript::new_witness_program(WitnessVersion::V16, &[0; 40]).unwrap();
+		let witness_program = WitnessProgram::new(WitnessVersion::V16, &[0; 40]).unwrap();
+		let script = ScriptBuf::new_witness_program(&witness_program);
+		let shutdown_script = ShutdownScript::new_witness_program(&witness_program).unwrap();
 		assert!(shutdown_script.is_compatible(&any_segwit_features()));
 		assert!(!shutdown_script.is_compatible(&InitFeatures::empty()));
-		assert_eq!(shutdown_script.into_inner(), witness_program);
+		assert_eq!(shutdown_script.into_inner(), script);
 	}
 
 	#[test]
 	fn fails_from_unsupported_script() {
-		let op_return = Script::new_op_return(&[0; 42]);
+		let op_return = ScriptBuf::new_op_return(&[0; 42]);
 		assert!(ShutdownScript::try_from(op_return).is_err());
 	}
-
-	#[test]
-	fn fails_from_invalid_segwit_v0_witness_program() {
-		let witness_program = Script::new_witness_program(WitnessVersion::V0, &[0; 2]);
-		assert!(ShutdownScript::try_from(witness_program).is_err());
-	}
-
-	#[test]
-	fn fails_from_invalid_segwit_non_v0_witness_program() {
-		let witness_program = Script::new_witness_program(WitnessVersion::V16, &[0; 42]);
-		assert!(ShutdownScript::try_from(witness_program).is_err());
-
-		assert!(ShutdownScript::new_witness_program(WitnessVersion::V16, &[0; 42]).is_err());
-	}
 }