AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issue preventing blocks from being served from the archive.

Browse Source 
Now prefixing the byte buffer with the block height to mimic a cached block message.
This commit is contained in:
CalDescent 2021-10-08 12:22:21 +01:00
parent 33b715eb4e
commit abab2d1cde
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/api/resource/BlocksResource.java
View File

@ -140,7 +140,7 @@ public class BlocksResource {
} }
// Not found, so try the block archive // Not found, so try the block archive
byte[] bytes = BlockArchiveReader.getInstance().fetchSerializedBlockBytesForSignature(signature, repository); byte[] bytes = BlockArchiveReader.getInstance().fetchSerializedBlockBytesForSignature(signature, false, repository);
if (bytes != null) { if (bytes != null) {
return Base58.encode(bytes); return Base58.encode(bytes);
} }

2
src/main/java/org/qortal/controller/Controller.java
View File

@ -1393,7 +1393,7 @@ public class Controller extends Thread {
// If we have no block data, we should check the archive in case it's there // If we have no block data, we should check the archive in case it's there
if (blockData == null) { if (blockData == null) {
if (Settings.getInstance().isArchiveEnabled()) { if (Settings.getInstance().isArchiveEnabled()) {
byte[] bytes = BlockArchiveReader.getInstance().fetchSerializedBlockBytesForSignature(signature, repository); byte[] bytes = BlockArchiveReader.getInstance().fetchSerializedBlockBytesForSignature(signature, true, repository);
if (bytes != null) { if (bytes != null) {
CachedBlockMessage blockMessage = new CachedBlockMessage(bytes); CachedBlockMessage blockMessage = new CachedBlockMessage(bytes);
blockMessage.setId(message.getId()); blockMessage.setId(message.getId());

25
src/main/java/org/qortal/repository/BlockArchiveReader.java
View File

@ -1,5 +1,6 @@
package org.qortal.repository; package org.qortal.repository;
import com.google.common.primitives.Ints;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.qortal.data.at.ATStateData; import org.qortal.data.at.ATStateData;
@ -13,10 +14,7 @@ import org.qortal.utils.Triple;
import static org.qortal.transform.Transformer.INT_LENGTH; import static org.qortal.transform.Transformer.INT_LENGTH;
import java.io.File; import java.io.*;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -167,7 +165,7 @@ public class BlockArchiveReader {
return null; return null;
} }
public byte[] fetchSerializedBlockBytesForSignature(byte[] signature, Repository repository) { public byte[] fetchSerializedBlockBytesForSignature(byte[] signature, boolean includeHeightPrefix, Repository repository) {
if (this.fileListCache.isEmpty()) { if (this.fileListCache.isEmpty()) {
this.fetchFileList(); this.fetchFileList();
@ -175,7 +173,22 @@ public class BlockArchiveReader {
Integer height = this.fetchHeightForSignature(signature, repository); Integer height = this.fetchHeightForSignature(signature, repository);
if (height != null) { if (height != null) {
return this.fetchSerializedBlockBytesForHeight(height); byte[] blockBytes = this.fetchSerializedBlockBytesForHeight(height);
// When responding to a peer with a BLOCK message, we must prefix the byte array with the block height
// This mimics the toData() method in BlockMessage and CachedBlockMessage
if (includeHeightPrefix) {
ByteArrayOutputStream bytes = new ByteArrayOutputStream(blockBytes.length + INT_LENGTH);
try {
bytes.write(Ints.toByteArray(height));
bytes.write(blockBytes);
return bytes.toByteArray();
} catch (IOException e) {
return null;
}
}
return blockBytes;
} }
return null; return null;
} }