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

address: avoid unnecessary unchunking

Browse source
This commit is contained in:
Daniel Cousens 2015-09-30 10:32:46 +10:00
parent f60cb2e491
commit d48a7ab682
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/address.js
View file

@ -18,11 +18,10 @@ function fromBase58Check (address) {
function fromOutputScript (scriptPubKey, network) { function fromOutputScript (scriptPubKey, network) {
network = network || networks.bitcoin network = network || networks.bitcoin
var chunks = bscript.decompile(scriptPubKey) if (bscript.isPubKeyHashOutput(scriptPubKey)) return toBase58Check(scriptPubKey.slice(3, 23), network.pubKeyHash)
if (bscript.isPubKeyHashOutput(chunks)) return toBase58Check(chunks[2], network.pubKeyHash) if (bscript.isScriptHashOutput(scriptPubKey)) return toBase58Check(scriptPubKey.slice(2, 22), network.scriptHash)
if (bscript.isScriptHashOutput(chunks)) return toBase58Check(chunks[1], network.scriptHash)
throw new Error(bscript.toASM(chunks) + ' has no matching Address') throw new Error(bscript.toASM(scriptPubKey) + ' has no matching Address')
} }
function toBase58Check (hash, version) { function toBase58Check (hash, version) {