From 5db3ad8a3ed0e667d76c03216bb43d6861c6dd358d3383ecaa67a725b4a47aa9 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sat, 21 Nov 2026 20:48:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B8=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=20=D0=BA=D0=B0=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20replay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shine/db/dao/ChannelNameStateDAO.java | 67 +++++++++++++++---- .../blockchain/Net_AddBlock_Handler.java | 2 +- .../BlockchainWriter.java | 5 +- VERSION.properties | 2 +- docs/API/04_Add_Block_to_Blockchain_API.md | 1 + 5 files changed, 60 insertions(+), 17 deletions(-) diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelNameStateDAO.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelNameStateDAO.java index 802a19af..189757bf 100644 --- a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelNameStateDAO.java +++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelNameStateDAO.java @@ -73,24 +73,63 @@ public final class ChannelNameStateDAO { ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) """; try (PreparedStatement ps = c.prepareStatement(sql)) { - ps.setString(1, entry.getSlug()); - ps.setString(2, entry.getDisplayName()); - ps.setString(3, entry.getChannelDescription() == null ? "" : entry.getChannelDescription()); - ps.setString(4, entry.getOwnerLogin()); - ps.setString(5, entry.getOwnerBlockchainName()); - ps.setInt(6, entry.getChannelTypeCode()); - ps.setInt(7, entry.getChannelTypeVersion()); - ps.setInt(8, entry.getChannelRootBlockNumber()); - ps.setBytes(9, entry.getChannelRootBlockHash()); - ps.setLong(10, entry.getCreatedAtMs()); - ps.setString(11, entry.getAvaAr() == null ? "" : entry.getAvaAr()); - ps.setString(12, entry.getAvaPr() == null ? "" : entry.getAvaPr()); - ps.setLong(13, Math.max(0L, entry.getAvaSize())); - ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs())); + bindInsert(ps, entry); ps.executeUpdate(); } } + /** + * Используется только при воспроизведении уже подписанной истории. В live AddBlock + * дубликат имени запрещён; при replay блок всё же нужно сохранить, иначе цепочка + * после него останется разорванной. + */ + public void insertOrReplaceWithNewerRoot(Connection c, ChannelNameStateEntry entry) throws SQLException { + String sql = """ + INSERT INTO channel_names_state ( + slug, display_name, channel_description, owner_login, owner_bch_name, + channel_type_code, channel_type_version, channel_root_block_number, + channel_root_block_hash, created_at_ms, ava_ar, ava_pr, ava_size, meta_updated_at_ms + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT (owner_bch_name, channel_type_code, slug) DO UPDATE SET + display_name = EXCLUDED.display_name, + channel_description = EXCLUDED.channel_description, + owner_login = EXCLUDED.owner_login, + channel_type_version = EXCLUDED.channel_type_version, + channel_root_block_number = EXCLUDED.channel_root_block_number, + channel_root_block_hash = EXCLUDED.channel_root_block_hash, + created_at_ms = EXCLUDED.created_at_ms, + ava_ar = EXCLUDED.ava_ar, + ava_pr = EXCLUDED.ava_pr, + ava_size = EXCLUDED.ava_size, + meta_updated_at_ms = EXCLUDED.meta_updated_at_ms, + is_deleted = FALSE, + deleted_at_ms = 0, + deleted_block_number = NULL + WHERE EXCLUDED.channel_root_block_number > channel_names_state.channel_root_block_number + """; + try (PreparedStatement ps = c.prepareStatement(sql)) { + bindInsert(ps, entry); + ps.executeUpdate(); + } + } + + private static void bindInsert(PreparedStatement ps, ChannelNameStateEntry entry) throws SQLException { + ps.setString(1, entry.getSlug()); + ps.setString(2, entry.getDisplayName()); + ps.setString(3, entry.getChannelDescription() == null ? "" : entry.getChannelDescription()); + ps.setString(4, entry.getOwnerLogin()); + ps.setString(5, entry.getOwnerBlockchainName()); + ps.setInt(6, entry.getChannelTypeCode()); + ps.setInt(7, entry.getChannelTypeVersion()); + ps.setInt(8, entry.getChannelRootBlockNumber()); + ps.setBytes(9, entry.getChannelRootBlockHash()); + ps.setLong(10, entry.getCreatedAtMs()); + ps.setString(11, entry.getAvaAr() == null ? "" : entry.getAvaAr()); + ps.setString(12, entry.getAvaPr() == null ? "" : entry.getAvaPr()); + ps.setLong(13, Math.max(0L, entry.getAvaSize())); + ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs())); + } + public void updateMeta(Connection c, ChannelNameStateEntry entry) throws SQLException { String sql = """ UPDATE channel_names_state diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java index 233f7bba..a417d67f 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java @@ -453,7 +453,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler { } try { - if (channelNameStateDAO.existsByOwnerTypeAndSlug(blockchainName, channelTypeCode, slug)) { + if (!replayMode && channelNameStateDAO.existsByOwnerTypeAndSlug(blockchainName, channelTypeCode, slug)) { return new AddBlockResult(409, "channel_name_already_exists", serverLastNum, serverLastHashHex); } } catch (Exception e) { 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 3387d01d..06892a58 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 @@ -79,7 +79,10 @@ public final class BlockchainWriter { blocksDAO.insert(c, be); if (userParamEntry != null) userParamsDAO.upsertIfNewer(c, userParamEntry); - if (channelNameStateEntry != null) channelNameStateDAO.insert(c, channelNameStateEntry); + if (channelNameStateEntry != null) { + if (replayMode) channelNameStateDAO.insertOrReplaceWithNewerRoot(c, channelNameStateEntry); + else channelNameStateDAO.insert(c, channelNameStateEntry); + } if (channelMetaUpdateEntry != null) channelNameStateDAO.updateMeta(c, channelMetaUpdateEntry); if (notificationEntry != null) userNotificationsStateDAO.upsert(c, notificationEntry); diff --git a/VERSION.properties b/VERSION.properties index dc3ad01a..d4bad3aa 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ client.version=1.20.67 -server.version=1.16.37 +server.version=1.16.38 diff --git a/docs/API/04_Add_Block_to_Blockchain_API.md b/docs/API/04_Add_Block_to_Blockchain_API.md index 93f97231..55ef72ce 100644 --- a/docs/API/04_Add_Block_to_Blockchain_API.md +++ b/docs/API/04_Add_Block_to_Blockchain_API.md @@ -35,6 +35,7 @@ - обязательный тестовый tag `App=test5592`; - для channel block — `c=`; - новый `CreateChannelBody`: техническое имя `channelName` должно быть длиной 4–32 символа (`A-Z`, `a-z`, `0-9`, `_`, `-`); для длины 1–3 возвращается `bad_channel_name`. Проверка выполняется на уровне body (`checkForCreate`) и бизнес-валидации `AddBlock`. Ранее подписанные блоки с именами короче 4 символов по-прежнему читаются и могут быть воспроизведены в архивном `replayMode` (но обычный `AddBlock` их отклоняет); бинарный формат v1 не изменён; +- новый `CreateChannelBody` с тем же владельцем, типом и canonical slug отклоняется обычным `AddBlock` с `409 channel_name_already_exists`. При архивном `replayMode` исторический дубликат сохраняется только для непрерывности уже подписанной цепочки, а проекция выбирает корень с большим номером; - `TEXT_CHANNEL_DELETE (type=1/subType=92/version=1)` является обычным line-based channel block с пустым text и тем же обязательным `c=`; отдельной операции API для удаления канала нет; - `data` содержит SHiNE Frame v1 (`frameCode=1`).