Include PUSHDATA opcode in Script.toString(). Also, smallNums are pri…

…nted in their decoded form.
bitcoinj · May 22, 2014 · ff8d76c · ff8d76c
1 parent c236ae4
commit ff8d76c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/core/src/main/java/com/google/bitcoin/script/Script.java b/core/src/main/java/com/google/bitcoin/script/Script.java
@@ -111,11 +111,15 @@ public String toString() {
             if (chunk.isOpCode()) {
                 buf.append(getOpCodeName(chunk.opcode));
                 buf.append(" ");
-            } else {
+            } else if (chunk.data != null) {
                 // Data chunk
+                buf.append(getPushDataName(chunk.opcode));
                 buf.append("[");
-                buf.append(chunk.data != null ? bytesToHexString(chunk.data) : "null");
+                buf.append(bytesToHexString(chunk.data));
                 buf.append("] ");
+            } else {
+                // Small num
+                buf.append(decodeFromOpN(chunk.opcode));
             }
         }
         return buf.toString().trim();

diff --git a/core/src/main/java/com/google/bitcoin/script/ScriptOpCodes.java b/core/src/main/java/com/google/bitcoin/script/ScriptOpCodes.java
@@ -392,6 +392,16 @@ public static String getOpCodeName(int opcode) {
         return "NON_OP(" + opcode + ")";
     }
 
+    /**
+     * Converts the given pushdata OpCode into a string (eg "PUSHDATA2", or "PUSHDATA(23)")
+     */
+    public static String getPushDataName(int opcode) {
+        if (opCodeMap.containsKey(opcode))
+            return opCodeMap.get(opcode);
+
+        return "PUSHDATA(" + opcode + ")";
+    }
+
     /**
      * Converts the given OpCodeName into an int
      */

diff --git a/core/src/test/java/com/google/bitcoin/script/ScriptTest.java b/core/src/test/java/com/google/bitcoin/script/ScriptTest.java
@@ -69,7 +69,7 @@ public void testScriptPubKey() throws Exception {
         // Check we can extract the to address
         byte[] pubkeyBytes = Hex.decode(pubkeyProg);
         Script pubkey = new Script(pubkeyBytes);
-        assertEquals("DUP HASH160 [33e81a941e64cda12c6a299ed322ddbdd03f8d0e] EQUALVERIFY CHECKSIG", pubkey.toString());
+        assertEquals("DUP HASH160 PUSHDATA(20)[33e81a941e64cda12c6a299ed322ddbdd03f8d0e] EQUALVERIFY CHECKSIG", pubkey.toString());
         Address toAddr = new Address(params, pubkey.getPubKeyHash());
         assertEquals("mkFQohBpy2HDXrCwyMrYL5RtfrmeiuuPY2", toAddr.toString());
     }