LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check signatures for finalized inputs too

Browse source
This commit is contained in:
junderw 2019-07-23 14:59:54 +09:00
parent 1803b64f61
commit e4844828de
No known key found for this signature in database
GPG key ID: B256185D3A971908
3 changed files with 45 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/psbt.js
View file

@ -626,8 +626,27 @@ function checkFees(psbt, cache, opts) {
function checkInputsForPartialSig(inputs, action) {
inputs.forEach(input => {
let throws = false;
if ((input.partialSig || []).length === 0) return;
input.partialSig.forEach(pSig => {
let pSigs = [];
if ((input.partialSig || []).length === 0) {
if (!input.finalScriptSig && !input.finalScriptWitness) return;
const scriptItems = !input.finalScriptSig
? []
: bscript.decompile(input.finalScriptSig) || [];
const witnessItems = !input.finalScriptWitness
? []
: bscript.decompile(input.finalScriptWitness) || [];
pSigs = scriptItems
.concat(witnessItems)
.filter(item => {
return (
Buffer.isBuffer(item) && bscript.isCanonicalScriptSignature(item)
);
})
.map(sig => ({ signature: sig }));
} else {
pSigs = input.partialSig;
}
pSigs.forEach(pSig => {
const { hashType } = bscript.signature.decode(pSig.signature);
const whitelist = [];
const isAnyoneCanPay =

3
test/psbt.js
View file

@ -625,6 +625,9 @@ describe(`Psbt`, () => {
}, new RegExp('Can not modify transaction, signatures exist.'))
psbt.validateSignaturesOfInput(0)
psbt.finalizeAllInputs()
assert.throws(() => {
psbt.setVersion(3)
}, new RegExp('Can not modify transaction, signatures exist.'))
assert.strictEqual(
psbt.extractTransaction().toHex(),
'02000000013ebc8203037dda39d482bf41ff3be955996c50d9d4f7cfc3d2097a694a7' +

23
ts_src/psbt.ts
View file

@ -795,8 +795,27 @@ function checkFees(psbt: Psbt, cache: PsbtCache, opts: PsbtOpts): void {
function checkInputsForPartialSig(inputs: PsbtInput[], action: string): void {
inputs.forEach(input => {
let throws = false;
if ((input.partialSig || []).length === 0) return;
input.partialSig!.forEach(pSig => {
let pSigs: PartialSig[] = [];
if ((input.partialSig || []).length === 0) {
if (!input.finalScriptSig && !input.finalScriptWitness) return;
const scriptItems = !input.finalScriptSig
? []
: bscript.decompile(input.finalScriptSig) || [];
const witnessItems = !input.finalScriptWitness
? []
: bscript.decompile(input.finalScriptWitness) || [];
pSigs = scriptItems
.concat(witnessItems)
.filter(item => {
return (
Buffer.isBuffer(item) && bscript.isCanonicalScriptSignature(item)
);
})
.map(sig => ({ signature: sig })) as PartialSig[];
} else {
pSigs = input.partialSig!;
}
pSigs.forEach(pSig => {
const { hashType } = bscript.signature.decode(pSig.signature);
const whitelist: string[] = [];
const isAnyoneCanPay = hashType & Transaction.SIGHASH_ANYONECANPAY;