Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down
2 changes: 1 addition & 1 deletion src/miniscript/lex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)?,
));
Expand Down
4 changes: 3 additions & 1 deletion src/miniscript/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down