mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2024-11-19 01:40:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

ScriptChunk: deprecate write(OutputStream)

Browse Source 
Deprecate write(OutputStream) and replace with existing
toByteArray() method. Internally implement a write(ByteBuffer) method.

Update Script to use chunk.toByteArray().
This commit is contained in:
Sean Gilligan 2024-09-14 14:43:09 -07:00 committed by Andreas Schildbach
parent 40a7cefe82
commit 87f4114774
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/org/bitcoinj/script/Script.java
View File

@ -362,14 +362,13 @@ public class Script {
if (program != null)
// Don't round-trip as Bitcoin Core doesn't and it would introduce a mismatch.
return Arrays.copyOf(program, program.length);
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
for (ScriptChunk chunk : chunks) {
chunk.write(bos);
}
return bos.toByteArray();
} catch (IOException e) {
throw new RuntimeException(e); // Cannot happen.
else {
int size = chunks.stream().mapToInt(ScriptChunk::size).sum();
ByteBuffer buf = ByteBuffer.allocate(size);
chunks.forEach(chunk ->
buf.put(chunk.toByteArray())
);
return buf.array();
}
}

41
core/src/main/java/org/bitcoinj/script/ScriptChunk.java
View File

@ -20,9 +20,9 @@ package org.bitcoinj.script;
import org.bitcoinj.base.internal.ByteUtils;
import javax.annotation.Nullable;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Objects;
@ -105,44 +105,47 @@ public class ScriptChunk {
return opcode == OP_PUSHDATA4;
}
/**
* @deprecated Use {@link #toByteArray()}
*/
@Deprecated
public void write(OutputStream stream) throws IOException {
stream.write(toByteArray());
}
private void write(ByteBuffer buf) {
if (isOpCode()) {
checkState(data == null);
stream.write(opcode);
buf.put((byte) opcode);
} else if (data != null) {
if (opcode < OP_PUSHDATA1) {
checkState(data.length == opcode);
stream.write(opcode);
buf.put((byte) opcode);
} else if (opcode == OP_PUSHDATA1) {
checkState(data.length <= 0xFF);
stream.write(OP_PUSHDATA1);
stream.write(data.length);
buf.put((byte) OP_PUSHDATA1);
buf.put((byte) data.length);
} else if (opcode == OP_PUSHDATA2) {
checkState(data.length <= 0xFFFF);
stream.write(OP_PUSHDATA2);
ByteUtils.writeInt16LE(data.length, stream);
buf.put((byte) OP_PUSHDATA2);
ByteUtils.writeInt16LE(data.length, buf);
} else if (opcode == OP_PUSHDATA4) {
checkState(data.length <= Script.MAX_SCRIPT_ELEMENT_SIZE);
stream.write(OP_PUSHDATA4);
ByteUtils.writeInt32LE(data.length, stream);
buf.put((byte) OP_PUSHDATA4);
ByteUtils.writeInt32LE(data.length, buf);
} else {
throw new RuntimeException("Unimplemented");
}
stream.write(data);
buf.put(data);
} else {
stream.write(opcode); // smallNum
buf.put((byte) opcode); // smallNum
}
}
public byte[] toByteArray() {
ByteArrayOutputStream stream = new ByteArrayOutputStream();
try {
write(stream);
} catch (IOException e) {
// Should not happen as ByteArrayOutputStream does not throw IOException on write
throw new RuntimeException(e);
}
return stream.toByteArray();
ByteBuffer buf = ByteBuffer.allocate(size());
write(buf);
return buf.array();
}
/*