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

31
src/psbt.js
View file

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