mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-25 07:07:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Breaks dependency cycle between Script.<clinit>, Script.<init> and NetworkParamenters.<init>. Resolves issue #549.

Browse source 
Script.<clinit> depended both on Script.<init> and NetworkParameters.<init> to prepare ScriptChunk cache.

At the same time NetworkParameters.<init> depended on Script.<clinit> by using Script.writeBytes().

The fix frees Script.<clinit> from both the NetworkParameters and Script objects.

This should remove the root cause behind NetworkParameters construction not being thread safe.
This commit is contained in:
Piotr Włodarek 2014-06-02 18:16:06 +02:00
parent 60e70bd79e
commit 21b3c06878
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/src/main/java/com/google/bitcoin/script/Script.java
View file

@ -20,7 +20,6 @@ package com.google.bitcoin.script;
import com.google.bitcoin.core.*;
import com.google.bitcoin.crypto.TransactionSignature;
import com.google.bitcoin.params.MainNetParams;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -136,16 +135,14 @@ public class Script {
return Collections.unmodifiableList(chunks);
}
private static final ScriptChunk INTERN_TABLE[];
private static final ScriptChunk STANDARD_TRANSACTION_SCRIPT_CHUNKS[];
static {
Script examplePayToAddress = ScriptBuilder.createOutputScript(new Address(MainNetParams.get(), new byte[20]));
examplePayToAddress = new Script(examplePayToAddress.getProgram());
INTERN_TABLE = new ScriptChunk[] {
examplePayToAddress.chunks.get(0), // DUP
examplePayToAddress.chunks.get(1), // HASH160
examplePayToAddress.chunks.get(3), // EQUALVERIFY
examplePayToAddress.chunks.get(4), // CHECKSIG
STANDARD_TRANSACTION_SCRIPT_CHUNKS = new ScriptChunk[] {
new ScriptChunk(ScriptOpCodes.OP_DUP, null, 0),
new ScriptChunk(ScriptOpCodes.OP_HASH160, null, 1),
new ScriptChunk(ScriptOpCodes.OP_EQUALVERIFY, null, 23),
new ScriptChunk(ScriptOpCodes.OP_CHECKSIG, null, 24),
};
}
@ -194,12 +191,9 @@ public class Script {
checkState(dataToRead == 0 || bis.read(data, 0, (int)dataToRead) == dataToRead);
chunk = new ScriptChunk(opcode, data, startLocationInProgram);
}
// Save some memory by eliminating redundant copies of the same chunk objects. INTERN_TABLE can be null
// here because this method is called whilst setting it up.
if (INTERN_TABLE != null) {
for (ScriptChunk c : INTERN_TABLE) {
if (c.equals(chunk)) chunk = c;
}
// Save some memory by eliminating redundant copies of the same chunk objects.
for (ScriptChunk c : STANDARD_TRANSACTION_SCRIPT_CHUNKS) {
if (c.equals(chunk)) chunk = c;
}
chunks.add(chunk);
}