diff --git a/package.json b/package.json index afcac40..f09265a 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,6 @@ "mocha": "^2.2.0", "proxyquire": "^1.4.0", "sinon": "^1.12.2", - "standard": "^4.0.0" + "standard": "^5.0.0" } } diff --git a/src/hdnode.js b/src/hdnode.js index d70fbf4..3c41d9e 100644 --- a/src/hdnode.js +++ b/src/hdnode.js @@ -74,7 +74,7 @@ HDNode.fromBase58 = function (string, networks) { } if (version !== network.bip32.private && - version !== network.bip32.public) throw new Error('Invalid network') + version !== network.bip32.public) throw new Error('Invalid network') // 1 byte: depth: 0x00 for master nodes, 0x01 for level-1 descendants, ... var depth = buffer.readUInt8(4) diff --git a/src/transaction_builder.js b/src/transaction_builder.js index 654b885..69d4397 100644 --- a/src/transaction_builder.js +++ b/src/transaction_builder.js @@ -33,7 +33,7 @@ function extractInput (txIn) { var hashType, parsed, pubKeys, signatures switch (scriptType) { - case 'pubkeyhash': { + case 'pubkeyhash': parsed = ECSignature.parseScriptSignature(scriptSig.chunks[0]) hashType = parsed.hashType pubKeys = scriptSig.chunks.slice(1) @@ -41,9 +41,8 @@ function extractInput (txIn) { prevOutScript = scripts.pubKeyHashOutput(bcrypto.hash160(pubKeys[0])) break - } - case 'pubkey': { + case 'pubkey': parsed = ECSignature.parseScriptSignature(scriptSig.chunks[0]) hashType = parsed.hashType signatures = [parsed.signature] @@ -53,9 +52,8 @@ function extractInput (txIn) { } break - } - case 'multisig': { + case 'multisig': signatures = scriptSig.chunks.slice(1).map(function (chunk) { if (chunk === ops.OP_0) return chunk @@ -70,7 +68,6 @@ function extractInput (txIn) { } break - } } return { @@ -146,15 +143,13 @@ TransactionBuilder.prototype.addInput = function (txHash, vout, sequence, prevOu // if we can, extract pubKey information switch (prevOutType) { - case 'multisig': { + case 'multisig': input.pubKeys = prevOutScript.chunks.slice(1, -2) break - } - case 'pubkey': { + case 'pubkey': input.pubKeys = prevOutScript.chunks.slice(0, 1) break - } } if (prevOutType !== 'scripthash') { @@ -230,13 +225,12 @@ TransactionBuilder.prototype.__build = function (allowIncomplete) { if (input.signatures) { switch (scriptType) { - case 'pubkeyhash': { + case 'pubkeyhash': var pkhSignature = input.signatures[0].toScriptSignature(input.hashType) scriptSig = scripts.pubKeyHashInput(pkhSignature, input.pubKeys[0]) break - } - case 'multisig': { + case 'multisig': // Array.prototype.map is sparse-compatible var msSignatures = input.signatures.map(function (signature) { return signature && signature.toScriptSignature(input.hashType) @@ -257,13 +251,11 @@ TransactionBuilder.prototype.__build = function (allowIncomplete) { var redeemScript = allowIncomplete ? undefined : input.redeemScript scriptSig = scripts.multisigInput(msSignatures, redeemScript) break - } - case 'pubkey': { + case 'pubkey': var pkSignature = input.signatures[0].toScriptSignature(input.hashType) scriptSig = scripts.pubKeyInput(pkSignature) break - } } } @@ -322,24 +314,21 @@ TransactionBuilder.prototype.sign = function (index, keyPair, redeemScript, hash var pubKeys = [] switch (scriptType) { - case 'multisig': { + case 'multisig': pubKeys = redeemScript.chunks.slice(1, -2) break - } - case 'pubkeyhash': { + case 'pubkeyhash': var pkh1 = redeemScript.chunks[2] var pkh2 = bcrypto.hash160(keyPair.getPublicKeyBuffer()) assert.deepEqual(pkh1, pkh2, 'privateKey cannot sign for this input') pubKeys = [kpPubKey] break - } - case 'pubkey': { + case 'pubkey': pubKeys = redeemScript.chunks.slice(0, 1) break - } } if (!input.prevOutScript) {