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

Promise fixes for async

Browse source
This commit is contained in:
junderw 2019-07-04 13:52:48 +09:00
parent 539c88596a
commit b98761a283
No known key found for this signature in database
GPG key ID: B256185D3A971908
2 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/psbt.js
View file

@ -175,20 +175,23 @@ class Psbt extends bip174_1.Psbt {
return this.addPartialSigToInput(inputIndex, partialSig);
}
signInputAsync(inputIndex, keyPair) {
if (!keyPair || !keyPair.publicKey)
throw new Error('Need Signer to sign input');
const { hash, sighashType } = getHashAndSighashType(
this.inputs,
inputIndex,
keyPair.publicKey,
this.globalMap.unsignedTx,
);
return keyPair.sign(hash).then(signature => {
const partialSig = {
pubkey: keyPair.publicKey,
signature: bscript.signature.encode(signature, sighashType),
};
this.addPartialSigToInput(inputIndex, partialSig);
return new Promise((resolve, reject) => {
if (!keyPair || !keyPair.publicKey)
return reject(new Error('Need Signer to sign input'));
const { hash, sighashType } = getHashAndSighashType(
this.inputs,
inputIndex,
keyPair.publicKey,
this.globalMap.unsignedTx,
);
Promise.resolve(keyPair.sign(hash)).then(signature => {
const partialSig = {
pubkey: keyPair.publicKey,
signature: bscript.signature.encode(signature, sighashType),
};
this.addPartialSigToInput(inputIndex, partialSig);
resolve();
});
});
}
}

37
ts_src/psbt.ts
View file

@ -214,23 +214,28 @@ export class Psbt extends PsbtBase {
}
signInputAsync(inputIndex: number, keyPair: SignerAsync): Promise<void> {
if (!keyPair || !keyPair.publicKey)
throw new Error('Need Signer to sign input');
const { hash, sighashType } = getHashAndSighashType(
this.inputs,
inputIndex,
keyPair.publicKey,
this.globalMap.unsignedTx!,
return new Promise(
(resolve, reject): void => {
if (!keyPair || !keyPair.publicKey)
return reject(new Error('Need Signer to sign input'));
const { hash, sighashType } = getHashAndSighashType(
this.inputs,
inputIndex,
keyPair.publicKey,
this.globalMap.unsignedTx!,
);
Promise.resolve(keyPair.sign(hash)).then(signature => {
const partialSig = {
pubkey: keyPair.publicKey,
signature: bscript.signature.encode(signature, sighashType),
};
this.addPartialSigToInput(inputIndex, partialSig);
resolve();
});
},
);
return keyPair.sign(hash).then(signature => {
const partialSig = {
pubkey: keyPair.publicKey,
signature: bscript.signature.encode(signature, sighashType),
};
this.addPartialSigToInput(inputIndex, partialSig);
});
}
}