s/scriptPubKey/outputScript

dcousens · dcousens · commit 3635a9f07896 · 2016-12-23T13:55:15.000+11:00
diff --git a/src/address.js b/src/address.js
@@ -25,13 +25,13 @@ function toBase58Check (hash, version) {
   return bs58check.encode(payload)
 }
 
-function fromOutputScript (scriptPubKey, network) {
+function fromOutputScript (outputScript, network) {
   network = network || networks.bitcoin
 
-  if (bscript.pubKeyHash.output.check(scriptPubKey)) return toBase58Check(bscript.compile(scriptPubKey).slice(3, 23), network.pubKeyHash)
-  if (bscript.scriptHash.output.check(scriptPubKey)) return toBase58Check(bscript.compile(scriptPubKey).slice(2, 22), network.scriptHash)
+  if (bscript.pubKeyHash.output.check(outputScript)) return toBase58Check(bscript.compile(outputScript).slice(3, 23), network.pubKeyHash)
+  if (bscript.scriptHash.output.check(outputScript)) return toBase58Check(bscript.compile(outputScript).slice(2, 22), network.scriptHash)
 
-  throw new Error(bscript.toASM(scriptPubKey) + ' has no matching Address')
+  throw new Error(bscript.toASM(outputScript) + ' has no matching Address')
 }
 
 function toOutputScript (address, network) {

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@ function toBase58Check (hash, version) {`
`25`	`25`	`return bs58check.encode(payload)`
`26`	`26`	`}`
`27`	`27`
`28`		`-function fromOutputScript (scriptPubKey, network) {`
	`28`	`+function fromOutputScript (outputScript, network) {`
`29`	`29`	`network = network \|\| networks.bitcoin`
`30`	`30`
`31`		`- if (bscript.pubKeyHash.output.check(scriptPubKey)) return toBase58Check(bscript.compile(scriptPubKey).slice(3, 23), network.pubKeyHash)`
`32`		`- if (bscript.scriptHash.output.check(scriptPubKey)) return toBase58Check(bscript.compile(scriptPubKey).slice(2, 22), network.scriptHash)`
	`31`	`+ if (bscript.pubKeyHash.output.check(outputScript)) return toBase58Check(bscript.compile(outputScript).slice(3, 23), network.pubKeyHash)`
	`32`	`+ if (bscript.scriptHash.output.check(outputScript)) return toBase58Check(bscript.compile(outputScript).slice(2, 22), network.scriptHash)`
`33`	`33`
`34`		`- throw new Error(bscript.toASM(scriptPubKey) + ' has no matching Address')`
	`34`	`+ throw new Error(bscript.toASM(outputScript) + ' has no matching Address')`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`function toOutputScript (address, network) {`