RanchiMall/bitcoinjs-lib
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove SIGNABLE_TYPES and P2SH_scripts

Browse Source
This commit is contained in:
Thomas Kerin 2016-11-10 10:12:18 +01:00
parent ffca5afcff
commit 78faaddf4d
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/templates/index.js
View File

@ -17,9 +17,6 @@ var types = {
P2WSH: 'witnessscripthash' P2WSH: 'witnessscripthash'
} }
var SIGNABLE_SCRIPTS = [types.MULTISIG, types.P2PKH, types.P2PK]
var P2SH_SCRIPTS = SIGNABLE_SCRIPTS.concat([types.P2WPKH, types.P2WSH])
function classifyOutput (script) { function classifyOutput (script) {
if (witnessPubKeyHash.output.check(script)) return types.P2WPKH if (witnessPubKeyHash.output.check(script)) return types.P2WPKH
if (witnessScriptHash.output.check(script)) return types.P2WSH if (witnessScriptHash.output.check(script)) return types.P2WSH
@ -102,7 +99,6 @@ function solveOutput (scriptCode) {
type: outputType, type: outputType,
script: scriptCode, script: scriptCode,
solvedBy: solvedBy, solvedBy: solvedBy,
canSign: SIGNABLE_SCRIPTS.indexOf(outputType) !== -1,
requiredSigs: requiredSigs requiredSigs: requiredSigs
} }
} }
@ -119,7 +115,5 @@ module.exports = {
scriptHash: scriptHash, scriptHash: scriptHash,
witnessPubKeyHash: witnessPubKeyHash, witnessPubKeyHash: witnessPubKeyHash,
witnessScriptHash: witnessScriptHash, witnessScriptHash: witnessScriptHash,
types: types, types: types
SIGNABLE_SCRIPTS: SIGNABLE_SCRIPTS,
P2SH_SCRIPTS: P2SH_SCRIPTS
} }

2
test/script.js
View File

@ -119,7 +119,7 @@ describe('script', function () {
it('solves ' + bscript.toASM(script) + ' as ' + f.type, function () { it('solves ' + bscript.toASM(script) + ' as ' + f.type, function () {
var solution = bscript.solveOutput(script) var solution = bscript.solveOutput(script)
assert.equal(solution.type, f.type) assert.equal(solution.type, f.type)
if ([bscript.types.P2SH].concat(bscript.P2SH_SCRIPTS).indexOf(f.type) === -1) { if ([bscript.types.P2SH, bscript.types.P2WSH, bscript.types.P2WPKH, bscript.types.P2PKH, bscript.types.P2PK, bscript.types.MULTISIG].indexOf(f.type) === -1) {
assert.equal(solution.solvedBy, null) assert.equal(solution.solvedBy, null)
} }
if (solution.canSign) { if (solution.canSign) {