Browse Source

Promise fixes for async

psbt
junderw 6 years ago
parent
commit
b98761a283
No known key found for this signature in database GPG Key ID: B256185D3A971908
  1. 7
      src/psbt.js
  2. 9
      ts_src/psbt.ts

7
src/psbt.js

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

9
ts_src/psbt.ts

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

Loading…
Cancel
Save