Browse Source

Use signature encode

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

13
src/psbt.js

@ -2,6 +2,7 @@
Object.defineProperty(exports, '__esModule', { value: true }); Object.defineProperty(exports, '__esModule', { value: true });
const bip174_1 = require('bip174'); const bip174_1 = require('bip174');
const payments = require('./payments'); const payments = require('./payments');
const script = require('./script');
const transaction_1 = require('./transaction'); const transaction_1 = require('./transaction');
const checkRedeemScript = (inputIndex, scriptPubKey, redeemScript) => { const checkRedeemScript = (inputIndex, scriptPubKey, redeemScript) => {
const redeemScriptOutput = payments.p2sh({ const redeemScriptOutput = payments.p2sh({
@ -78,15 +79,11 @@ class Psbt extends bip174_1.Psbt {
const hash = Buffer.alloc(32); const hash = Buffer.alloc(32);
const partialSig = { const partialSig = {
pubkey: keyPair.publicKey, pubkey: keyPair.publicKey,
signature: keyPair.sign(hash), signature: script.signature.encode(
keyPair.sign(hash),
input.sighashType || 0x01,
),
}; };
// Just hardcode this for now to satisfy the stricter sig type checks
partialSig.signature = Buffer.from(
'304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6' +
'771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa9' +
'4b99bdf86151db9a9a01',
'hex',
);
return this.addPartialSigToInput(inputIndex, partialSig); return this.addPartialSigToInput(inputIndex, partialSig);
} }
} }

14
ts_src/psbt.ts

@ -1,6 +1,7 @@
import { Psbt as PsbtBase } from 'bip174'; import { Psbt as PsbtBase } from 'bip174';
import { Signer } from './ecpair'; import { Signer } from './ecpair';
import * as payments from './payments'; import * as payments from './payments';
import * as script from './script';
import { Transaction } from './transaction'; import { Transaction } from './transaction';
const checkRedeemScript = ( const checkRedeemScript = (
@ -89,17 +90,12 @@ export class Psbt extends PsbtBase {
const partialSig = { const partialSig = {
pubkey: keyPair.publicKey, pubkey: keyPair.publicKey,
signature: keyPair.sign(hash), signature: script.signature.encode(
keyPair.sign(hash),
input.sighashType || 0x01,
),
}; };
// Just hardcode this for now to satisfy the stricter sig type checks
partialSig.signature = Buffer.from(
'304302200424b58effaaa694e1559ea5c93bbfd4a89064224055cdf070b6' +
'771469442d07021f5c8eb0fea6516d60b8acb33ad64ede60e8785bfb3aa9' +
'4b99bdf86151db9a9a01',
'hex',
);
return this.addPartialSigToInput(inputIndex, partialSig); return this.addPartialSigToInput(inputIndex, partialSig);
} }
} }

Loading…
Cancel
Save