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
14 changes: 14 additions & 0 deletions modules/utxo-bin/src/Parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ export type ParserNode = {

export class Parser {
parseError: 'throw' | 'continue';

constructor(params: { parseError?: 'throw' | 'continue' } = {}) {
this.parseError = params.parseError ?? 'continue';
}

node(label: string | number, value: ParserNodeValue, nodes: ParserNode[] = []): ParserNode {
if (!isParserNodeValue(value)) {
throw new Error(`invalid node value ${typeof value}`);
Expand All @@ -38,6 +40,18 @@ export class Parser {
};
}

nodeCatchError(
label: string | number,
buildValue: () => ParserNodeValue | undefined,
buildNodes: () => ParserNode[] = () => []
): ParserNode {
try {
return this.node(label, buildValue?.(), buildNodes());
} catch (e) {
return this.handleParseError(e);
}
}

handleParseError(e: unknown): ParserNode {
if (this.parseError === 'throw') {
throw e;
Expand Down
14 changes: 14 additions & 0 deletions modules/utxo-bin/src/ScriptParser.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as utxolib from '@bitgo/utxo-lib';
import { Miniscript } from '@bitgo/wasm-miniscript';

import { Parser, ParserNode } from './Parser';
import { parseUnknown } from './parseUnknown';
Expand All @@ -21,6 +22,18 @@ function parsePaymentWithType(script: Buffer, type: PaymentType, network?: utxol
}
}

function asMiniscript(script: Buffer): Miniscript | undefined {
const contexts = ['tap', 'segwitv0', 'legacy'] as const;
for (const ctx of contexts) {
try {
return Miniscript.fromBitcoinScript(script, ctx);
} catch (e) {
continue;
}
}
throw new Error('failed to parse as miniscript');
}

export class ScriptParser extends Parser {
network?: utxolib.Network;
constructor({ network }: { network?: utxolib.Network } = {}) {
Expand Down Expand Up @@ -76,6 +89,7 @@ export class ScriptParser extends Parser {
const classification = ScriptParser.classify(script, undefined);
const decompiled = utxolib.script.decompile(script);
return this.node('script', `length ${script.length} bytes`, [
this.nodeCatchError('miniscript', () => asMiniscript(script)?.toString()),
this.node('classification', undefined, [
this.node('input', classification.input),
this.node('output', classification.output),
Expand Down
1 change: 1 addition & 0 deletions modules/utxo-bin/test/fixtures/formatScript/p2sh.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
inputScripts
└─┬ redeemScript
└─┬ script: length 105 bytes
├── miniscript: multi(2,03f6f40764bd5d63f200a2778883acf75e96f15095c998263c087270d0c97e7e7f,035ffb7abc70159e0469f4b989a6d5e1785a2904169ff050b2f468fe5d3d5dbbf2,03e1524d7f6fc57ab3eacbb659b787106780a475d1db483952c2310b7e9a38975b)
├─┬ classification
│ ├── input: nonstandard
│ ├── output: multisig
Expand Down
2 changes: 2 additions & 0 deletions modules/utxo-bin/test/fixtures/formatScript/p2shP2wsh.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
inputScripts
├─┬ redeemScript
│ └─┬ script: length 34 bytes
│ ├── error: Error: failed to parse as miniscript
│ ├─┬ classification
│ │ ├── input: nonstandard
│ │ ├── output: witnessscripthash
Expand All @@ -20,6 +21,7 @@ inputScripts
│ └── witness: undefined
└─┬ witnessScript
└─┬ script: length 105 bytes
├── miniscript: multi(2,03393e3c784cf42a09c32b33b3ee2879ab092fd381c2187deafe6b69e0dc5bee4e,02089e4bad05bf0f0a67f5055c6518d5ae05de86db8081e9d5d2e654c710280507,03c154061b8a77902eeebf5c39429515b572161af576610f66f0d4269940f0f81b)
├─┬ classification
│ ├── input: nonstandard
│ ├── output: multisig
Expand Down
1 change: 1 addition & 0 deletions modules/utxo-bin/test/fixtures/formatScript/p2wsh.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
inputScripts
└─┬ witnessScript
└─┬ script: length 105 bytes
├── miniscript: multi(2,03199dc3912467b37ff890cc1740c8ef4ac7a50bf3741d99590e905ca3a79c7670,02396d5d0c79d779f9cf019cea9e81d2576bad476ea87ed634416205605a55ce8f,0286de50435e3680740715bfa3f7d41c9620d80d93b2c02672f53efa0c6e68d182)
├─┬ classification
│ ├── input: nonstandard
│ ├── output: multisig
Expand Down