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

Use for loop instead of some to allow for future await usage

Browse source
This commit is contained in:
junderw 2019-06-14 12:20:12 +09:00
parent 4bed585f6a
commit 84d5e67e38
No known key found for this signature in database
GPG key ID: B256185D3A971908
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/transaction_builder.js
View file

@ -936,8 +936,9 @@ function checkSignArgs(txb, signParams) {
} }
function trySign(input, ourPubKey, keyPair, signatureHash, hashType, useLowR) { function trySign(input, ourPubKey, keyPair, signatureHash, hashType, useLowR) {
// enforce in order signing of public keys // enforce in order signing of public keys
const signed = input.pubkeys.some((pubKey, i) => { let signed = false;
if (!ourPubKey.equals(pubKey)) return false; for (const [i, pubKey] of input.pubkeys.entries()) {
if (!ourPubKey.equals(pubKey)) continue;
if (input.signatures[i]) throw new Error('Signature already exists'); if (input.signatures[i]) throw new Error('Signature already exists');
// TODO: add tests // TODO: add tests
if (ourPubKey.length !== 33 && input.hasWitness) { if (ourPubKey.length !== 33 && input.hasWitness) {
@ -947,8 +948,8 @@ function trySign(input, ourPubKey, keyPair, signatureHash, hashType, useLowR) {
} }
const signature = keyPair.sign(signatureHash, useLowR); const signature = keyPair.sign(signatureHash, useLowR);
input.signatures[i] = bscript.signature.encode(signature, hashType); input.signatures[i] = bscript.signature.encode(signature, hashType);
return true; signed = true;
}); }
if (!signed) throw new Error('Key pair cannot sign for this input'); if (!signed) throw new Error('Key pair cannot sign for this input');
} }
function getSigningData( function getSigningData(

9
ts_src/transaction_builder.ts
View file

@ -1170,8 +1170,9 @@ function trySign(
useLowR: boolean, useLowR: boolean,
): void { ): void {
// enforce in order signing of public keys // enforce in order signing of public keys
const signed = input.pubkeys!.some((pubKey, i) => { let signed = false;
if (!ourPubKey.equals(pubKey!)) return false; for (const [i, pubKey] of input.pubkeys!.entries()) {
if (!ourPubKey.equals(pubKey!)) continue;
if (input.signatures![i]) throw new Error('Signature already exists'); if (input.signatures![i]) throw new Error('Signature already exists');
// TODO: add tests // TODO: add tests
@ -1183,8 +1184,8 @@ function trySign(
const signature = keyPair.sign(signatureHash, useLowR); const signature = keyPair.sign(signatureHash, useLowR);
input.signatures![i] = bscript.signature.encode(signature, hashType); input.signatures![i] = bscript.signature.encode(signature, hashType);
return true; signed = true;
}); }
if (!signed) throw new Error('Key pair cannot sign for this input'); if (!signed) throw new Error('Key pair cannot sign for this input');
} }