Merge pull request #105 from sanket1729/misc_fixes

Decode 65 bytes pubkey

Author: apoelstra

src/lib.rs

@@ -333,7 +333,7 @@ pub enum Error {
     IncorrectScriptHash,
     /// Recursion depth exceeded when parsing policy/miniscript from string
     MaxRecursiveDepthExceeded,
-    /// Recursion depth exceeded when parsing policy/miniscript from string
+    /// Script size too large
     ScriptSizeTooLarge,
 }
 

src/miniscript/lex.rs

@@ -224,7 +224,7 @@ pub fn lex(script: &script::Script) -> Result<Vec<Token>, Error> {
                         x.copy_from_slice(bytes);
                         ret.push(Token::Hash32(x))
                     }
-                    33 => {
+                    33 | 65 => {
                         ret.push(Token::Pubkey(
                             PublicKey::from_slice(bytes).map_err(Error::BadPubkey)?,
                         ));

src/miniscript/mod.rs

@@ -129,7 +129,9 @@ impl Miniscript<bitcoin::PublicKey> {
     /// Attempt to parse a script into a Miniscript representation
     pub fn parse(script: &script::Script) -> Result<Miniscript<bitcoin::PublicKey>, Error> {
         // Transactions more than 100Kb are non-standard
-        if script.len() > 10000 {}
+        if script.len() > 100_000 {
+            return Err(Error::ScriptSizeTooLarge);
+        }
         let tokens = lex(script)?;
         let mut iter = TokenIter::new(tokens);