Обновление архитектуры ключей и кошельков

This commit is contained in:
AidarKC
2026-10-01 17:11:38 +03:00
parent f452ce1f1e
commit 8d22602761
51 changed files with 565 additions and 898 deletions
@@ -7,7 +7,7 @@ package blockchain.body;
* - external target: login + forkNumber + blockNumber + blockHash;
* - own EDIT target: blockNumber + blockHash only;
* - logical identity NEVER includes forkNumber: login + blockNumber + blockHash;
* - forkNumber is informational/historical only (0 = unknown/reserved).
* - forkNumber is informational/historical only and must be in 1..999.
*/
public interface BodyHasTarget {
/** Target login; null for own-chain compact EDIT targets. */
@@ -24,6 +24,7 @@ final class BodyTargetSupport {
if (login.isBlank()) throw new IllegalArgumentException(ctx + " toLogin is blank");
int forkNumber = Short.toUnsignedInt(bb.getShort());
validateForkNumber(forkNumber, ctx);
int blockNumber = bb.getInt();
if (blockNumber < 0) throw new IllegalArgumentException(ctx + " toBlockGlobalNumber < 0");
@@ -81,8 +82,8 @@ final class BodyTargetSupport {
}
static void validateForkNumber(int forkNumber, String ctx) {
if (forkNumber < 0 || forkNumber > 999) {
throw new IllegalArgumentException(ctx + " toForkNumber must be 0..999");
if (forkNumber < 1 || forkNumber > 999) {
throw new IllegalArgumentException(ctx + " toForkNumber must be 1..999");
}
}
@@ -84,10 +84,16 @@ final class TargetLoginFormatTest {
}
@Test
void forkZeroIsReservedButStillDecodableAsHistoricalUnknown() {
ReactionBody source = new ReactionBody(MsgSubType.REACTION_LIKE, "alice", 0, 42, HASH);
ReactionBody parsed = new ReactionBody(MsgSubType.REACTION_LIKE, ReactionBody.VER, source.toBytes()).check();
assertEquals(0, parsed.toForkNumber());
void forkZeroIsRejectedForNewProtocol() {
assertThrows(IllegalArgumentException.class,
() -> new ReactionBody(MsgSubType.REACTION_LIKE, "alice", 0, 42, HASH));
byte[] encoded = new ReactionBody(MsgSubType.REACTION_LIKE, "alice", 1, 42, HASH).toBytes();
int forkOffset = 1 + "alice".getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
encoded[forkOffset] = 0;
encoded[forkOffset + 1] = 0;
assertThrows(IllegalArgumentException.class,
() -> new ReactionBody(MsgSubType.REACTION_LIKE, ReactionBody.VER, encoded));
}
@Test
@@ -86,7 +86,7 @@ public class BlockEntry {
}
public Integer getToForkNumber() { return toForkNumber; }
public void setToForkNumber(Integer toForkNumber) { if (toForkNumber != null && (toForkNumber < 0 || toForkNumber > 999)) throw new IllegalArgumentException("toForkNumber must be 0..999"); this.toForkNumber = toForkNumber; }
public void setToForkNumber(Integer toForkNumber) { if (toForkNumber != null && (toForkNumber < 1 || toForkNumber > 999)) throw new IllegalArgumentException("toForkNumber must be 1..999"); this.toForkNumber = toForkNumber; }
public Integer getToBlockNumber() { return toBlockNumber; }
public void setToBlockNumber(Integer toBlockNumber) { this.toBlockNumber = toBlockNumber; }
@@ -523,7 +523,7 @@ CREATE TABLE IF NOT EXISTS blocks (
block_bytes BYTEA NOT NULL,
to_login TEXT,
to_bch_name TEXT,
to_fork_number INTEGER CHECK (to_fork_number IS NULL OR (to_fork_number >= 0 AND to_fork_number <= 999)),
to_fork_number INTEGER CHECK (to_fork_number IS NULL OR (to_fork_number >= 1 AND to_fork_number <= 999)),
to_block_number INTEGER CHECK (to_block_number IS NULL OR to_block_number >= 0),
to_block_hash BYTEA,
block_hash BYTEA NOT NULL,
@@ -540,11 +540,6 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
return new AddBlockResult(WireCodes.Status.BAD_REQUEST, "bad_blockchain_key_len", serverLastNum, serverLastHashHex);
}
if (serverLastNum == -1 && block.body instanceof HeaderBody headerBody
&& !Arrays.equals(headerBody.initialBlockchainKey32, pubKey32)) {
return new AddBlockResult(WireCodes.Status.BAD_REQUEST, "header_initial_key_mismatch", serverLastNum, serverLastHashHex);
}
// 6) ANS-104 Ed25519 подпись и owner
boolean sigOk;
try {