Browse Source
Fix default assignment of validate key for payments
Fixes problems with p2ms experienced in issue below.
Related: #1194
v4
junderw
7 years ago
No known key found for this signature in database
GPG Key ID: B256185D3A971908
7 changed files with
7 additions and
7 deletions
-
src/payments/embed.js
-
src/payments/p2ms.js
-
src/payments/p2pk.js
-
src/payments/p2pkh.js
-
src/payments/p2sh.js
-
src/payments/p2wpkh.js
-
src/payments/p2wsh.js
|
|
@ -19,7 +19,7 @@ function p2data (a, opts) { |
|
|
|
!a.data && |
|
|
|
!a.output |
|
|
|
) throw new TypeError('Not enough data') |
|
|
|
opts = opts || { validate: true } |
|
|
|
opts = Object.assign({ validate: true }, opts || {}) |
|
|
|
|
|
|
|
typef({ |
|
|
|
network: typef.maybe(typef.Object), |
|
|
|
|
|
@ -24,7 +24,7 @@ function p2ms (a, opts) { |
|
|
|
!(a.pubkeys && a.m !== undefined) && |
|
|
|
!a.signatures |
|
|
|
) throw new TypeError('Not enough data') |
|
|
|
opts = opts || { validate: true } |
|
|
|
opts = Object.assign({ validate: true }, opts || {}) |
|
|
|
|
|
|
|
function isAcceptableSignature (x) { |
|
|
|
return bscript.isCanonicalScriptSignature(x) || (opts.allowIncomplete && (x === OPS.OP_0)) |
|
|
|
|
|
@ -16,7 +16,7 @@ function p2pk (a, opts) { |
|
|
|
!a.input && |
|
|
|
!a.signature |
|
|
|
) throw new TypeError('Not enough data') |
|
|
|
opts = opts || { validate: true } |
|
|
|
opts = Object.assign({ validate: true }, opts || {}) |
|
|
|
|
|
|
|
typef({ |
|
|
|
network: typef.maybe(typef.Object), |
|
|
|
|
|
@ -18,7 +18,7 @@ function p2pkh (a, opts) { |
|
|
|
!a.pubkey && |
|
|
|
!a.input |
|
|
|
) throw new TypeError('Not enough data') |
|
|
|
opts = opts || { validate: true } |
|
|
|
opts = Object.assign({ validate: true }, opts || {}) |
|
|
|
|
|
|
|
typef({ |
|
|
|
network: typef.maybe(typef.Object), |
|
|
|
|
|
@ -26,7 +26,7 @@ function p2sh (a, opts) { |
|
|
|
!a.redeem && |
|
|
|
!a.input |
|
|
|
) throw new TypeError('Not enough data') |
|
|
|
opts = opts || { validate: true } |
|
|
|
opts = Object.assign({ validate: true }, opts || {}) |
|
|
|
|
|
|
|
typef({ |
|
|
|
network: typef.maybe(typef.Object), |
|
|
|
|
|
@ -21,7 +21,7 @@ function p2wpkh (a, opts) { |
|
|
|
!a.pubkey && |
|
|
|
!a.witness |
|
|
|
) throw new TypeError('Not enough data') |
|
|
|
opts = opts || { validate: true } |
|
|
|
opts = Object.assign({ validate: true }, opts || {}) |
|
|
|
|
|
|
|
typef({ |
|
|
|
address: typef.maybe(typef.String), |
|
|
|
|
|
@ -28,7 +28,7 @@ function p2wsh (a, opts) { |
|
|
|
!a.redeem && |
|
|
|
!a.witness |
|
|
|
) throw new TypeError('Not enough data') |
|
|
|
opts = opts || { validate: true } |
|
|
|
opts = Object.assign({ validate: true }, opts || {}) |
|
|
|
|
|
|
|
typef({ |
|
|
|
network: typef.maybe(typef.Object), |
|
|
|