fix scripthash > multisig input classification prioritization

Author: Arik Sosman

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitcoinjs-lib",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Client-side Bitcoin JavaScript library",
   "main": "./src/index.js",
   "engines": {

src/templates/index.js

@@ -41,8 +41,8 @@ function classifyInput (script, allowIncomplete) {
   var chunks = decompile(script)
 
   if (pubKeyHash.input.check(chunks)) return types.P2PKH
-  if (scriptHash.input.check(chunks, allowIncomplete)) return types.P2SH
   if (multisig.input.check(chunks, allowIncomplete)) return types.MULTISIG
+  if (scriptHash.input.check(chunks, allowIncomplete)) return types.P2SH
   if (pubKey.input.check(chunks)) return types.P2PK
 
   return types.NONSTANDARD