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

Create Signer interface and use it

Browse source
This commit is contained in:
junderw 2019-06-14 15:25:07 +09:00
parent 1cc7205e9c
commit 691e4d15d1
No known key found for this signature in database
GPG key ID: B256185D3A971908
7 changed files with 42 additions and 20 deletions

13
ts_src/transaction_builder.ts
View file

@ -2,7 +2,7 @@ import * as baddress from './address';
import { reverseBuffer } from './bufferutils';
import * as classify from './classify';
import * as bcrypto from './crypto';
import { ECPairInterface } from './ecpair';
import { Signer } from './ecpair';
import * as ECPair from './ecpair';
import { Network } from './networks';
import * as networks from './networks';
@ -74,7 +74,7 @@ interface TxbOutput {
interface TxbSignArg {
prevOutScriptType: string;
vin: number;
keyPair: ECPairInterface;
keyPair: Signer;
redeemScript?: Buffer;
hashType?: number;
witnessValue?: number;
@ -237,7 +237,7 @@ export class TransactionBuilder {
sign(
signParams: number | TxbSignArg,
keyPair?: ECPairInterface,
keyPair?: Signer,
redeemScript?: Buffer,
hashType?: number,
witnessValue?: number,
@ -1186,7 +1186,7 @@ function trySign({
interface SigningData {
input: TxbInput;
ourPubKey: Buffer;
keyPair: ECPairInterface;
keyPair: Signer;
signatureHash: Buffer;
hashType: number;
useLowR: boolean;
@ -1200,7 +1200,7 @@ function getSigningData(
needsOutputs: HashTypeCheck,
tx: Transaction,
signParams: number | TxbSignArg,
keyPair?: ECPairInterface,
keyPair?: Signer,
redeemScript?: Buffer,
hashType?: number,
witnessValue?: number,
@ -1251,7 +1251,8 @@ function getSigningData(
throw new Error('Inconsistent redeemScript');
}
const ourPubKey = keyPair.publicKey || keyPair.getPublicKey!();
const ourPubKey =
keyPair.publicKey || (keyPair.getPublicKey && keyPair.getPublicKey());
if (!canSign(input)) {
if (witnessValue !== undefined) {
if (input.value !== undefined && input.value !== witnessValue)