Aidar/SHiNE-server
SHA256
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

23 12 25

Browse Source 
Дорабатываю добавление блоков! Вроде всё.  (но ещё не проверял и тестов нету)
This commit is contained in:
AidarKC 2025-12-23 16:14:25 +03:00
parent 26afcb892a
commit bba4b7fb41
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shine-server-blockchain/src/main/java/blockchain/BchBlockEntry.java
View File

@ -9,14 +9,14 @@ import java.util.Objects;
* BchBlockEntry_new — универсальный блок нового формата. * BchBlockEntry_new — универсальный блок нового формата.
* *
* RAW (BigEndian): * RAW (BigEndian):
* [4] recordSize (int) = RAW + signature + hash * [4] recordSize (int) = размер RAW (включая этот заголовок), БЕЗ signature+hash
* [4] recordNumber (int) глобальный номер блока * [4] recordNumber (int) глобальный номер блока
* [8] timestamp (long) unix seconds * [8] timestamp (long) unix seconds
* [2] line (short) * [2] line (short)
* [4] lineNumber (int) * [4] lineNumber (int)
* [N] bodyBytes (body, начинается с [type][version]) * [N] bodyBytes (body, начинается с [type][version])
* *
* TAIL: * TAIL (НЕ входит в recordSize):
* [64] signature64 (Ed25519) * [64] signature64 (Ed25519)
* [32] hash32 (SHA-256) * [32] hash32 (SHA-256)
*/ */
@ -29,7 +29,7 @@ public final class BchBlockEntry {
public static final int RAW_HEADER_SIZE = 4 + 4 + 8 + 2 + 4; public static final int RAW_HEADER_SIZE = 4 + 4 + 8 + 2 + 4;
// --- RAW --- // --- RAW ---
public final int recordSize; public final int recordSize; // только RAW, без signature+hash
public final int recordNumber; public final int recordNumber;
public final long timestamp; public final long timestamp;
public final short line; public final short line;
@ -55,7 +55,7 @@ public final class BchBlockEntry {
ByteBuffer bb = ByteBuffer.wrap(fullBytes).order(ByteOrder.BIG_ENDIAN); ByteBuffer bb = ByteBuffer.wrap(fullBytes).order(ByteOrder.BIG_ENDIAN);
this.recordSize = bb.getInt(); this.recordSize = bb.getInt();
if (recordSize != fullBytes.length) if (recordSize + SIGNATURE_LEN + HASH_LEN != fullBytes.length)
throw new IllegalArgumentException("recordSize mismatch"); throw new IllegalArgumentException("recordSize mismatch");
this.recordNumber = bb.getInt(); this.recordNumber = bb.getInt();
@ -63,7 +63,7 @@ public final class BchBlockEntry {
this.line = bb.getShort(); this.line = bb.getShort();
this.lineNumber = bb.getInt(); this.lineNumber = bb.getInt();
int bodyLen = recordSize - RAW_HEADER_SIZE - SIGNATURE_LEN - HASH_LEN; int bodyLen = recordSize - RAW_HEADER_SIZE;
if (bodyLen <= 0) if (bodyLen <= 0)
throw new IllegalArgumentException("Invalid body length"); throw new IllegalArgumentException("Invalid body length");
@ -108,14 +108,13 @@ public final class BchBlockEntry {
this.signature64 = Arrays.copyOf(signature64, SIGNATURE_LEN); this.signature64 = Arrays.copyOf(signature64, SIGNATURE_LEN);
this.hash32 = Arrays.copyOf(hash32, HASH_LEN); this.hash32 = Arrays.copyOf(hash32, HASH_LEN);
this.recordSize = // recordSize теперь только RAW (header + body), без signature+hash
RAW_HEADER_SIZE + this.recordSize = RAW_HEADER_SIZE + bodyBytes.length;
bodyBytes.length +
SIGNATURE_LEN +
HASH_LEN;
ByteBuffer bb = ByteBuffer.allocate(recordSize).order(ByteOrder.BIG_ENDIAN); int fullLen = this.recordSize + SIGNATURE_LEN + HASH_LEN;
bb.putInt(recordSize);
ByteBuffer bb = ByteBuffer.allocate(fullLen).order(ByteOrder.BIG_ENDIAN);
bb.putInt(this.recordSize);
bb.putInt(recordNumber); bb.putInt(recordNumber);
bb.putLong(timestamp); bb.putLong(timestamp);
bb.putShort(line); bb.putShort(line);
@ -127,9 +126,8 @@ public final class BchBlockEntry {
this.fullBytes = bb.array(); this.fullBytes = bb.array();
} }
public byte[] getRawBytes() { public byte[] getRawBytes() {
int rawLen = recordSize - SIGNATURE_LEN - HASH_LEN; int rawLen = recordSize; // теперь это ровно RAW, без signature+hash
byte[] raw = new byte[rawLen]; byte[] raw = new byte[rawLen];
System.arraycopy(fullBytes, 0, raw, 0, rawLen); System.arraycopy(fullBytes, 0, raw, 0, rawLen);
return raw; return raw;