Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 23:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Script: some minor tweaks and use the ScriptOpCodes parsing in ScriptTest.

Browse Source
This commit is contained in:
Mike Hearn 2013-04-29 14:10:36 +02:00
parent 95b7b90d4a
commit 69537c0bf0
2 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/com/google/bitcoin/script/Script.java
View File

@ -347,23 +347,24 @@ public class Script {
}
static int decodeFromOpN(byte opcode) {
return decodeFromOpN(0xFF & opcode);
return decodeFromOpN((int)opcode);
}
static int decodeFromOpN(int opcode) {
checkArgument(opcode >= 0 && opcode <= OP_16, "decodeFromOpN called on non OP_N opcode");
checkArgument(opcode >= -1 && opcode <= OP_16, "decodeFromOpN called on non OP_N opcode");
if (opcode == OP_0)
return 0;
else if (opcode == OP_1NEGATE)
return -1;
else
return opcode + 1 - OP_1;
}
static int encodeToOpN(byte value) {
return encodeToOpN(0xFF & value);
}
static int encodeToOpN(int value) {
checkArgument(value >= 0 && value <= 16, "encodeToOpN called for a value we cannot encode in an opcode.");
checkArgument(value >= -1 && value <= 16, "encodeToOpN called for " + value + " which we cannot encode in an opcode.");
if (value == 0)
return OP_0;
else if (value == -1)
return OP_1NEGATE;
else
return value - 1 + OP_1;
}

54
core/src/test/java/com/google/bitcoin/script/ScriptTest.java
View File

@ -17,8 +17,6 @@
package com.google.bitcoin.script;
import com.google.bitcoin.core.*;
import com.google.bitcoin.script.Script;
import com.google.bitcoin.script.ScriptOpCodes;
import com.google.common.collect.Lists;
import org.junit.Test;
import org.spongycastle.util.encoders.Hex;
@ -32,6 +30,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import static com.google.bitcoin.script.ScriptOpCodes.OP_INVALIDOPCODE;
import static org.junit.Assert.*;
public class ScriptTest {
@ -92,23 +91,7 @@ public class ScriptTest {
assertTrue(s.isSentToRawPubKey());
}
private static HashMap<String, Integer> mapOpNames;
private synchronized static void initMapOpNames() {
if (mapOpNames == null) {
mapOpNames = new HashMap<String, Integer>();
for (int op = ScriptOpCodes.OP_NOP; op <= ScriptOpCodes.OP_NOP10; op++) {
String name = ScriptOpCodes.getOpCodeName((byte) op);
if (name.startsWith("NON_OP("))
continue;
// The reference client's implementation supports OP_*, but we only support *
mapOpNames.put(name, op);
}
}
}
private Script parseScriptString(NetworkParameters params, String string) throws Exception {
initMapOpNames();
private Script parseScriptString(String string) throws Exception {
String[] words = string.split("[ \\t\\n]");
UnsafeByteArrayOutputStream out = new UnsafeByteArrayOutputStream();
@ -119,8 +102,8 @@ public class ScriptTest {
if (w.matches("^-?[0-9]*$")) {
// Number
long val = Long.parseLong(w);
if (val == -1 || (val >= 1 && val <= 16))
out.write((int)val + ScriptOpCodes.OP_1 - 1);
if (val >= -1 && val <= 16)
out.write(Script.encodeToOpN((int)val));
else
Script.writeBytes(out, Utils.reverseBytes(Utils.encodeMPI(BigInteger.valueOf(val), false)));
} else if (w.matches("^0x[0-9a-fA-F]*$")) {
@ -130,12 +113,12 @@ public class ScriptTest {
// Single-quoted string, pushed as data. NOTE: this is poor-man's
// parsing, spaces/tabs/newlines in single-quoted strings won't work.
Script.writeBytes(out, w.substring(1, w.length() - 1).getBytes(Charset.forName("UTF-8")));
} else if (mapOpNames.containsKey(w)) {
} else if (ScriptOpCodes.getOpCode(w) != OP_INVALIDOPCODE) {
// opcode, e.g. OP_ADD or OP_1:
out.write(mapOpNames.get(w));
} else if (w.startsWith("OP_") && mapOpNames.containsKey(w.substring(3))) {
out.write(ScriptOpCodes.getOpCode(w));
} else if (w.startsWith("OP_") && ScriptOpCodes.getOpCode(w.substring(3)) != OP_INVALIDOPCODE) {
// opcode, e.g. OP_ADD or OP_1:
out.write(mapOpNames.get(w.substring(3)));
out.write(ScriptOpCodes.getOpCode(w.substring(3)));
} else {
throw new RuntimeException("Invalid Data");
}
@ -162,10 +145,19 @@ public class ScriptTest {
if (line.trim().endsWith("],") || line.trim().endsWith("]")) {
String[] scripts = script.split(",");
Script scriptSig = parseScriptString(params, scripts[0].replaceAll("[\"\\[\\]]", "").trim());
Script scriptPubKey = parseScriptString(params, scripts[1].replaceAll("[\"\\[\\]]", "").trim());
scripts[0] = scripts[0].replaceAll("[\"\\[\\]]", "").trim();
scripts[1] = scripts[1].replaceAll("[\"\\[\\]]", "").trim();
Script scriptSig = parseScriptString(scripts[0]);
Script scriptPubKey = parseScriptString(scripts[1]);
try {
scriptSig.correctlySpends(new Transaction(params), 0, scriptPubKey, true);
} catch (ScriptException e) {
System.err.println("scriptSig: " + scripts[0]);
System.err.println("scriptPubKey: " + scripts[1]);
System.err.flush();
throw e;
}
script = "";
}
}
@ -190,8 +182,8 @@ public class ScriptTest {
if (line.trim().endsWith("],") || line.trim().equals("]")) {
String[] scripts = script.split(",");
try {
Script scriptSig = parseScriptString(params, scripts[0].replaceAll("[\"\\[\\]]", "").trim());
Script scriptPubKey = parseScriptString(params, scripts[1].replaceAll("[\"\\[\\]]", "").trim());
Script scriptSig = parseScriptString(scripts[0].replaceAll("[\"\\[\\]]", "").trim());
Script scriptPubKey = parseScriptString(scripts[1].replaceAll("[\"\\[\\]]", "").trim());
scriptSig.correctlySpends(new Transaction(params), 0, scriptPubKey, true);
fail();
@ -321,7 +313,7 @@ public class ScriptTest {
int index = input.list.get(1).integer;
String script = input.list.get(2).string;
Sha256Hash sha256Hash = new Sha256Hash(Hex.decode(hash.getBytes(Charset.forName("UTF-8"))));
scriptPubKeys.put(new TransactionOutPoint(params, index, sha256Hash), parseScriptString(params, script));
scriptPubKeys.put(new TransactionOutPoint(params, index, sha256Hash), parseScriptString(script));
}
byte[] bytes = tx.get(0).list.get(1).string.getBytes(Charset.forName("UTF-8"));
@ -372,7 +364,7 @@ public class ScriptTest {
int index = input.list.get(1).integer;
String script = input.list.get(2).string;
Sha256Hash sha256Hash = new Sha256Hash(Hex.decode(hash.getBytes(Charset.forName("UTF-8"))));
scriptPubKeys.put(new TransactionOutPoint(params, index, sha256Hash), parseScriptString(params, script));
scriptPubKeys.put(new TransactionOutPoint(params, index, sha256Hash), parseScriptString(script));
}
byte[] bytes = tx.get(0).list.get(1).string.getBytes(Charset.forName("UTF-8"));