Drop the duplicate p2sh branch in _parse_outputs
What the developer wrote
Authored by kdmukai
Drop the duplicate p2sh branch in _parse_outputs
The change-detection block tested for a p2sh policy twice and built the
same script both times: a standalone if ahead of the policy chain, and
an elif inside it. For a p2sh policy neither p2wsh nor p2sh-p2wsh
matches, so control always reached the elif and reassigned an identical
script.p2sh over the first one, from the same redeem_script.
Removing the standalone if leaves a single if/elif chain covering every
policy type, and keeps the comment recording that this branch also
carries pre-segwit multisig (m/45').
Parse output is unchanged. Verified with the full test suite and by
diffing the complete parser state -- policy, amounts, destinations,
change_data, op_return_data -- across 112 scenarios: all seven wallet
script types against all seven recipient types, as spend-with-change,
full spend, self-transfer, and multi-recipient.
What changed, and why it matters
This commit removes a duplicated code branch that did the exact same thing twice in a row. The behavior of the program is unchanged; it is a minor cleanup with no security effect.
No action needed; this is a non-functional refactor.
Security signals we found
No strong security signals were identified.
Evidence from the diff
In _parse_outputs(), a standalone if self.policy["type"] == "p2sh": sc = script.p2sh(out.redeem_script) block was removed because an equivalent elif later in the same chain already handled p2sh. Since p2wsh and p2sh-p2wsh conditions do not match for a p2sh policy, execution always fell through to the elif and reassigned the identical script. The commit author verified parser output is byte-for-byte identical across 112 scenarios and the full test suite passes. No functional or security change.
Changed components
src/seedsigner/models/psbt_parser.pyInspect captured patch +0 / −4
### src/seedsigner/models/psbt_parser.py
@@ -172,10 +172,6 @@ def _parse_outputs(self):
# empty script by default
sc = script.Script(b"")
- # if older multisig, just use existing script
- if self.policy["type"] == "p2sh":
- sc = script.p2sh(out.redeem_script)
-
# multisig, we know witness script
if self.policy["type"] == "p2wsh":
sc = script.p2wsh(out.witness_script)Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.