From e8f68f8fc4064e46a607e57889da9f4bdcc953ccda19b8414493e6399a7992c7 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sun, 8 Nov 2026 13:34:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B1=D0=BB=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=20free-=D1=86=D0=B5=D0=BF=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Net_AddBlock_Handler_utils/BlockchainWriter.java | 8 ++++++-- VERSION.properties | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler_utils/BlockchainWriter.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler_utils/BlockchainWriter.java index 6d8f13c3..3387d01d 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler_utils/BlockchainWriter.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler_utils/BlockchainWriter.java @@ -66,14 +66,18 @@ public final class BlockchainWriter { try (Connection c = shine.db.DbController.getInstance().getConnection()) { c.setAutoCommit(false); try { - blocksDAO.insert(c, be); - + // blocks_store имеет внешний ключ (login, fork_number) на + // blockchain_state_store. Сначала создаём/обновляем runtime-state: + // это позволяет без отдельной предварительной записи принять + // самый первый HEADER ранее импортированной цепочки. st.setLastBlockNumber(block.blockNumber); st.setLastBlockHash(block.getHash32()); st.setFileSizeBytes(st.getFileSizeBytes() + rawDataItem.length); st.setUpdatedAtMs(nowMs); stateDAO.upsert(c, st); + blocksDAO.insert(c, be); + if (userParamEntry != null) userParamsDAO.upsertIfNewer(c, userParamEntry); if (channelNameStateEntry != null) channelNameStateDAO.insert(c, channelNameStateEntry); if (channelMetaUpdateEntry != null) channelNameStateDAO.updateMeta(c, channelMetaUpdateEntry); diff --git a/VERSION.properties b/VERSION.properties index 5a973e50..06a13a23 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ client.version=1.20.20 -server.version=1.16.16 +server.version=1.16.17