Skip to content

[Issue 228] [fix] Extension- Handle FinalizeInput Psbt when sign psbt #253

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

Open
Thiendekaco wants to merge 1 commit into
base: openbit-dev
Choose a base branch
from
Open

[Issue 228] [fix] Extension- Handle FinalizeInput Psbt when sign psbt #253

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
23 changes: 8 additions & 15 deletions packages/extension-base/src/services/request-service/handler/BitcoinRequestHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,14 @@ export default class BitcoinRequestHandler {
// Sign the Psbt using the pair's bitcoin object
try {
psptSignedTransaction = pair.bitcoin.signTransaction(psbt, signAtIndexGenerate, allowedSighash);

if (!psptSignedTransaction) {
throw new Error('Unable to sign');
}

for (const index of signAtIndexGenerate) {
psptSignedTransaction.finalizeInput(index);
}
} catch (e) {
if (transaction) {
transaction.emitterTransaction?.emit('error', { ...eventData, errors: [new TransactionError(BasicTxErrorType.INVALID_PARAMS, (e as Error).message)], id: transaction.id, extrinsicHash: transaction.id });
Expand All @@ -320,15 +328,7 @@ export default class BitcoinRequestHandler {
throw new Error((e as Error).message);
}

if (!psptSignedTransaction) {
throw new Error('Unable to sign');
}

if (!broadcast) {
for (const index of signAtIndexGenerate) {
psptSignedTransaction.finalizeInput(index);
}

return {
psbt: psptSignedTransaction.toHex()
};
Expand All @@ -353,13 +353,6 @@ export default class BitcoinRequestHandler {

const chainInfo = this.#chainService.getChainInfoByKey(chain);

try {
psptSignedTransaction.finalizeAllInputs();
} catch (e) {
emitterTransaction.emit('error', { ...eventData, errors: [new TransactionError(BasicTxErrorType.INVALID_PARAMS, (e as Error).message)] });
throw new Error((e as Error).message);
}

const hexTransaction = psptSignedTransaction.extractTransaction().toHex();

this.#transactionService.emitterEventTransaction(emitterTransaction, eventData, chainInfo.slug, hexTransaction);
Expand Down