Skip to content

refactor(abstract-utxo): narrow descriptor PSBT type unions to wasm-only #8860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OttoAllmendinger merged 1 commit into from
May 26, 2026
+9 −8
Merged

refactor(abstract-utxo): narrow descriptor PSBT type unions to wasm-only #8860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions modules/abstract-utxo/src/offlineVault/descriptor/transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import { explainPsbt, signPsbt } from '../../transaction/descriptor';
import { TransactionExplanation } from '../TransactionExplanation';
import { UtxoCoinName } from '../../names';
import { toWasmPsbt } from '../../wasmUtil';

export const DescriptorTransaction = t.intersection(
[OfflineVaultSignable, t.type({ descriptors: t.array(NamedDescriptor) })],
Expand All @@ -34,7 +33,7 @@ export function getDescriptorsFromDescriptorTransaction(tx: DescriptorTransactio
}

export function getHalfSignedPsbt(tx: DescriptorTransaction, prv: bip32.BIP32Interface, coinName: UtxoCoinName): Psbt {
const psbt = toWasmPsbt(Buffer.from(tx.coinSpecific.txHex, 'hex'));
const psbt = Psbt.deserialize(Buffer.from(tx.coinSpecific.txHex, 'hex'));
const descriptorMap = getDescriptorsFromDescriptorTransaction(tx);
signPsbt(psbt, descriptorMap, prv, { onUnknownInput: 'throw' });
return psbt;
Expand All @@ -44,7 +43,7 @@ export function getTransactionExplanationFromPsbt(
tx: DescriptorTransaction,
coinName: UtxoCoinName
): TransactionExplanation<string> {
const psbt = toWasmPsbt(Buffer.from(tx.coinSpecific.txHex, 'hex'));
const psbt = Psbt.deserialize(Buffer.from(tx.coinSpecific.txHex, 'hex'));
const descriptorMap = getDescriptorsFromDescriptorTransaction(tx);
const { outputs, changeOutputs, fee } = explainPsbt(psbt, descriptorMap, coinName);
return {
Expand Down
9 changes: 6 additions & 3 deletions modules/abstract-utxo/src/transaction/descriptor/parse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ import { IDescriptorWallet } from '../../descriptor/descriptorWallet';
import { fromExtendedAddressFormatToScript, toExtendedAddressFormat } from '../recipient';
import { outputDifferencesWithExpected, OutputDifferenceWithExpected } from '../outputDifference';
import { UtxoCoinName } from '../../names';
import { sumValues, toWasmPsbt, UtxoLibPsbt } from '../../wasmUtil';
import { decodeDescriptorPsbt } from '../decode';

function sumValues(arr: { value: bigint }[]): bigint {
return arr.reduce((sum, e) => sum + e.value, 0n);
}

type ParsedOutput = Omit<descriptorWallet.ParsedOutput, 'script'> & { script: Buffer };

export type RecipientOutput = Omit<ParsedOutput, 'value'> & {
Expand Down Expand Up @@ -88,12 +91,12 @@ function toBaseParsedTransactionOutputs(
}

export function toBaseParsedTransactionOutputsFromPsbt(
psbt: Psbt | UtxoLibPsbt | Uint8Array,
psbt: Psbt | Uint8Array,
descriptorMap: descriptorWallet.DescriptorMap,
recipients: ITransactionRecipient[],
coinName: UtxoCoinName
): ParsedOutputsBigInt {
const wasmPsbt = toWasmPsbt(psbt);
const wasmPsbt = psbt instanceof Psbt ? psbt : Psbt.deserialize(psbt);
return toBaseParsedTransactionOutputs(
parseOutputsWithPsbt(
wasmPsbt,
Expand Down
3 changes: 1 addition & 2 deletions modules/abstract-utxo/src/transaction/descriptor/verifyTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import type { Psbt, descriptorWallet } from '@bitgo/wasm-utxo';
import { AbstractUtxoCoin, VerifyTransactionOptions } from '../../abstractUtxoCoin';
import { BaseOutput, BaseParsedTransactionOutputs } from '../types';
import { UtxoCoinName } from '../../names';
import { UtxoLibPsbt } from '../../wasmUtil';
import { decodeDescriptorPsbt } from '../decode';

import { toBaseParsedTransactionOutputsFromPsbt } from './parse';
Expand Down Expand Up @@ -52,7 +51,7 @@ export function assertExpectedOutputDifference(
}

export function assertValidTransaction(
psbt: Psbt | UtxoLibPsbt | Uint8Array,
psbt: Psbt | Uint8Array,
descriptors: descriptorWallet.DescriptorMap,
recipients: ITransactionRecipient[],
coinName: UtxoCoinName
Expand Down
Loading