From 9405f285256a3d33db5367d3cc6c1a561aee1e4e48c073b171304202161b2152 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sun, 8 Nov 2026 15:25:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D0=B9=D0=BD=20=D0=B8=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=B0=D0=BD=D0=B0=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/postgres/migration_v40.sql | 8 ++ .../channels/ChannelsReadSupport.java | 24 ++--- .../Net_ListSubscriptionsFeed_Handler.java | 7 +- VERSION.properties | 4 +- docs/API/06_Channels_Read_API.md | 2 + docs/Personal_Messages/README.md | 4 + shine-UI/js/pages/chat-view.js | 9 ++ shine-UI/js/pages/register-view.js | 4 +- shine-UI/js/services/dm-composer-keys.js | 11 +++ .../tests/channel-free-and-dm-enter.test.mjs | 39 ++++++++ .../tests/namespace-price-contract.test.mjs | 26 ++++++ .../update-namespace-price.mjs | 90 +++++++++++++++++++ .../shine/tests/namespace-price.test.mjs | 31 +++++++ 13 files changed, 240 insertions(+), 19 deletions(-) create mode 100644 SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v40.sql create mode 100644 shine-UI/js/services/dm-composer-keys.js create mode 100644 shine-UI/tests/channel-free-and-dm-enter.test.mjs create mode 100644 shine-UI/tests/namespace-price-contract.test.mjs create mode 100644 shine-solana/shine/scripts/registration-v2/update-namespace-price.mjs create mode 100644 shine-solana/shine/tests/namespace-price.test.mjs diff --git a/SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v40.sql b/SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v40.sql new file mode 100644 index 00000000..432161a8 --- /dev/null +++ b/SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v40.sql @@ -0,0 +1,8 @@ +-- SHiNE DB v40: код валюты и актуализация стоимости namespace. +-- Исторический namespace 1.0 не содержит currency_code и означает SOL (код 1). +BEGIN; +ALTER TABLE shine_namespace_current + ADD COLUMN currency_code SMALLINT NOT NULL DEFAULT 1 + CHECK (currency_code = 1); +UPDATE db_schema_version SET schema_version = 40 WHERE id = 1; +COMMIT; diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java index 7df01038..6360a2e8 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java @@ -101,7 +101,7 @@ final class ChannelsReadSupport { String sql = """ SELECT block_bytes FROM blocks WHERE LOWER(login)=LOWER(?) AND block_number=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) LIMIT 1 """; try (PreparedStatement ps = c.prepareStatement(sql)) { @@ -156,7 +156,7 @@ final class ChannelsReadSupport { String sql = """ SELECT COUNT(*) AS cnt FROM blocks WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) """; try (PreparedStatement ps = c.prepareStatement(sql)) { String login=loginFromChainName(ownerBch); ps.setString(1,login); ps.setInt(2,MSG_TYPE_TEXT); ps.setInt(3,MsgSubType.TEXT_POST); ps.setInt(4,MsgSubType.TEXT_REPOST); ps.setInt(5,MsgSubType.TEXT_ENTRYPOINT); ps.setInt(6,MsgSubType.TEXT_EXERCISE); ps.setInt(7,MsgSubType.TEXT_SERVICE); ps.setInt(8,MsgSubType.TEXT_COURSE); ps.setInt(9,lineCode); ps.setString(10,login); @@ -176,7 +176,7 @@ final class ChannelsReadSupport { String sql=""" SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number FROM blocks WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) ORDER BY block_number DESC LIMIT 1 """; try(PreparedStatement ps=c.prepareStatement(sql)){String login=loginFromChainName(ownerBch);ps.setString(1,login);ps.setInt(2,MSG_TYPE_TEXT);ps.setInt(3,MsgSubType.TEXT_POST);ps.setInt(4,MsgSubType.TEXT_REPOST);ps.setInt(5,MsgSubType.TEXT_ENTRYPOINT);ps.setInt(6,MsgSubType.TEXT_EXERCISE);ps.setInt(7,MsgSubType.TEXT_SERVICE);ps.setInt(8,MsgSubType.TEXT_COURSE);ps.setInt(9,lineCode);ps.setString(10,login);try(ResultSet rs=ps.executeQuery()){if(!rs.next())return null;PostBlock pb=new PostBlock();pb.login=rs.getString("login");pb.bchName=rs.getString("bch_name");pb.blockNumber=rs.getInt("block_number");pb.blockHash=rs.getBytes("block_hash");pb.blockBytes=rs.getBytes("block_bytes");return pb;}} @@ -188,7 +188,7 @@ final class ChannelsReadSupport { FROM blocks WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=? AND to_block_number=? AND to_block_hash=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) ORDER BY block_number DESC LIMIT 1 """; @@ -239,7 +239,7 @@ final class ChannelsReadSupport { SELECT login,bch_name,block_number,block_hash,block_bytes,to_bch_name,to_block_number,to_block_hash,msg_sub_type,this_line_number FROM blocks WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) ORDER BY block_number """ + order + (bounded ? " LIMIT ?" : ""); try (PreparedStatement ps = c.prepareStatement(sql)) { @@ -290,7 +290,7 @@ final class ChannelsReadSupport { FROM blocks WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=? AND to_block_number=? AND to_block_hash=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) ORDER BY block_number ASC """; try (PreparedStatement ps = c.prepareStatement(sql)) { @@ -343,7 +343,7 @@ final class ChannelsReadSupport { AND LOWER(to_login) = LOWER(?) AND to_block_number = ? AND to_block_hash = ? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(blocks.login) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(blocks.login) LIMIT 1),block_number) """; int ratingsCount = 0; try (PreparedStatement ps = c.prepareStatement(ratingsSql)) { @@ -390,7 +390,7 @@ final class ChannelsReadSupport { String sql = """ SELECT block_bytes FROM blocks WHERE LOWER(login)=LOWER(?) AND block_number=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) LIMIT 1 """; try (PreparedStatement ps = c.prepareStatement(sql)) { @@ -467,7 +467,7 @@ final class ChannelsReadSupport { SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number FROM blocks WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=? AND block_number=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) LIMIT 1 """; try (PreparedStatement ps = c.prepareStatement(rootSql)) { @@ -519,7 +519,7 @@ final class ChannelsReadSupport { SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number FROM blocks WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=? AND line_code=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) ORDER BY block_number ASC """; try (PreparedStatement ps = c.prepareStatement(sql)) { @@ -559,7 +559,7 @@ final class ChannelsReadSupport { SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number FROM blocks WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=? AND line_code=? - AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) + AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number) ORDER BY block_number ASC """; try (PreparedStatement ps = c.prepareStatement(deleteSql)) { @@ -595,7 +595,7 @@ final class ChannelsReadSupport { String partnerBchSql = """ SELECT blockchain_name - FROM solana_user_pda_current + FROM user_identity_current WHERE LOWER(login) = LOWER(?) LIMIT 1 """; diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_ListSubscriptionsFeed_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_ListSubscriptionsFeed_Handler.java index 1471ee14..5a8a0ed3 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_ListSubscriptionsFeed_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_ListSubscriptionsFeed_Handler.java @@ -121,10 +121,11 @@ public class Net_ListSubscriptionsFeed_Handler implements JsonMessageHandler { return out; } + // Общий реестр включает FREE_CERT и пользователей, зарегистрированных через Solana. private List loadOwnChannels(Connection c, String canonicalLogin) throws Exception { List out = new ArrayList<>(); String activeBch = null; - try (PreparedStatement ps=c.prepareStatement("SELECT blockchain_name FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1")){ + try (PreparedStatement ps=c.prepareStatement("SELECT blockchain_name FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1")){ ps.setString(1,canonicalLogin);try(ResultSet rs=ps.executeQuery()){if(rs.next())activeBch=rs.getString(1);} } if(activeBch==null||activeBch.isBlank())return out; @@ -139,11 +140,11 @@ public class Net_ListSubscriptionsFeed_Handler implements JsonMessageHandler { List out = new ArrayList<>(); String sql = """ SELECT cs.to_login, - COALESCE(cn.owner_bch_name,(SELECT su.blockchain_name FROM solana_user_pda_current su WHERE LOWER(su.login)=LOWER(cs.to_login) LIMIT 1)) AS to_bch_name, + COALESCE(cn.owner_bch_name,(SELECT su.blockchain_name FROM user_identity_current su WHERE LOWER(su.login)=LOWER(cs.to_login) LIMIT 1)) AS to_bch_name, COALESCE(cs.to_block_number,0) AS root_number, cs.to_block_hash FROM connections_state cs LEFT JOIN channel_names_state cn ON LOWER(cn.owner_login)=LOWER(cs.to_login) AND cn.channel_root_block_number=cs.to_block_number AND cn.channel_root_block_hash=cs.to_block_hash - WHERE cs.login=? AND cs.rel_type=? + WHERE LOWER(cs.login)=LOWER(?) AND cs.rel_type=? ORDER BY cs.to_login, root_number """; try (PreparedStatement ps = c.prepareStatement(sql)) { diff --git a/VERSION.properties b/VERSION.properties index 28ea752a..a4f32b7f 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.20.21 -server.version=1.16.17 +client.version=1.20.22 +server.version=1.16.18 diff --git a/docs/API/06_Channels_Read_API.md b/docs/API/06_Channels_Read_API.md index af47470b..b6b0798b 100644 --- a/docs/API/06_Channels_Read_API.md +++ b/docs/API/06_Channels_Read_API.md @@ -33,6 +33,8 @@ > Для собственных каналов владельцу всегда возвращается `unreadCount = 0`, чтобы его собственные публикации не становились «новыми» для него самого. > Если для пары `ownerBlockchainName/channelName` ещё нет записи, канал временно считается полностью прочитанным. После появления записи новые публикации увеличивают `unreadCount` до продвижения курсора чтения. > +> Для `FREE_CERT` и платных пользователей `ListSubscriptionsFeed` использует единый реестр `user_identity_current`. Собственные каналы и личный корневой канал определяются по `blockchain_name` из этого реестра, без обязательного PDA в Solana. Подписки (`connections_state`) сопоставляются с логином без учёта регистра (в таблице связи нормализованы к нижнему регистру). Это обеспечивает одинаковую загрузку вкладок «Мои» и «Подписки» для бесплатных и платных аккаунтов. Сведения о публикациях в этих каналах также читаются с учётом активной цепочки из общего реестра. + > `ListSubscriptionsFeed` технически может возвращать soft-deleted каналы с `channel.deleted=true`, чтобы старые ссылки и selector канала продолжали разрешаться. Обычный UI скрывает такие строки. Для deleted-канала общий unread/counters не учитываются; сама подписка сохраняется. --- diff --git a/docs/Personal_Messages/README.md b/docs/Personal_Messages/README.md index 1a69fad1..7f5a970f 100644 --- a/docs/Personal_Messages/README.md +++ b/docs/Personal_Messages/README.md @@ -35,3 +35,7 @@ ### Key rotation и локальный архив DM При смене client key старые `type=1/2` локальные копии перешифровываются клиентом пакетами. Критерий незавершённой миграции — локальная копия была сохранена до cutoff входа в `MESSAGE_MIGRATION` и имеет `reencryptedAtMs < cutoff`. Повторная отправка на сервер собеседника не выполняется. Для перешифрованного входящего `type=1` подпись принадлежит получателю; это локальная мигрированная копия, а не сохранённая подпись первоначального отправителя. + +### Клавиатура личной переписки + +Обычный `Enter` в поле ввода личного сообщения отправляет непустой текст через существующий обработчик формы (включая ответы и редактирование); `Shift+Enter`, `Ctrl+Enter`, `Alt+Enter` и `Meta+Enter` вставляют перенос строки. Во время композиции IME отправка по Enter отключена. Это изменение относится только к UI; формат контейнера `SHiNE_DM` и серверный API не изменяются. diff --git a/shine-UI/js/pages/chat-view.js b/shine-UI/js/pages/chat-view.js index 66a59df8..01228f1d 100644 --- a/shine-UI/js/pages/chat-view.js +++ b/shine-UI/js/pages/chat-view.js @@ -57,6 +57,7 @@ import { scrollNodeIntoContainer } from '../services/scroll-utils.js'; import { loadProfileSnapshot } from '../services/user-profile-params.js'; import { makeProfileLinksRoute, makeProfileRoute } from '../services/shine-routes.js'; import { openHistoryLayer } from '../router.js'; +import { isDmSendEnter } from '../services/dm-composer-keys.js'; export const pageMeta = { id: 'chat-view', @@ -2950,6 +2951,14 @@ export function render({ navigate, route, chrome }) { } }); + // Только обычный Enter отправляет текст. С модификаторами Enter остаётся переносом строки. + // IME-композиция не должна случайно отправлять незавершённый ввод. + input.addEventListener('keydown', (event) => { + if (!isDmSendEnter(event)) return; + event.preventDefault(); + if (String(input.value || '').trim()) form.requestSubmit(); + }); + form.addEventListener('submit', async (event) => { event.preventDefault(); const text = String(input.value || '').trim(); diff --git a/shine-UI/js/pages/register-view.js b/shine-UI/js/pages/register-view.js index b8052c49..cbb86be1 100644 --- a/shine-UI/js/pages/register-view.js +++ b/shine-UI/js/pages/register-view.js @@ -69,7 +69,7 @@ export function render({ navigate }) { labelText.textContent = 'Ваш логин'; const input = document.createElement('input'); input.className = 'input'; - input.placeholder = 'Например, Alex'; + input.placeholder = 'Например, Alice'; input.autocomplete = 'off'; input.autocapitalize = 'off'; input.spellcheck = false; @@ -79,7 +79,7 @@ export function render({ navigate }) { fullLogin.className = 'signup-full-login'; const caseInfo = document.createElement('p'); caseInfo.className = 'meta-muted'; - caseInfo.textContent = 'Регистр сохраняется: Alex и alex при проверке считаются одним логином, но отображаться будет выбранное написание всегда.'; + caseInfo.textContent = 'Регистр сохраняется: Alice и alice при проверке считаются одним логином, но отображаться будет выбранное написание всегда.'; const status = statusLine(); const next = document.createElement('button'); next.className = 'primary-btn signup-next'; diff --git a/shine-UI/js/services/dm-composer-keys.js b/shine-UI/js/services/dm-composer-keys.js new file mode 100644 index 00000000..00513d03 --- /dev/null +++ b/shine-UI/js/services/dm-composer-keys.js @@ -0,0 +1,11 @@ +// Используется только в текстовом composer личной переписки. +// Shift/Ctrl/Alt/Meta + Enter — перенос строки, а не отправка. +export function isDmSendEnter(event) { + return event?.key === 'Enter' + && !event.shiftKey + && !event.ctrlKey + && !event.altKey + && !event.metaKey + && !event.isComposing + && event.keyCode !== 229; +} diff --git a/shine-UI/tests/channel-free-and-dm-enter.test.mjs b/shine-UI/tests/channel-free-and-dm-enter.test.mjs new file mode 100644 index 00000000..be9567f7 --- /dev/null +++ b/shine-UI/tests/channel-free-and-dm-enter.test.mjs @@ -0,0 +1,39 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import fs from 'node:fs'; +import { isDmSendEnter } from '../js/services/dm-composer-keys.js'; + +const read = (relative) => fs.readFileSync(new URL(relative, import.meta.url), 'utf8'); + +test('обычный Enter отправляет, модификаторы и IME не отправляют', () => { + const normal = { key: 'Enter', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false, isComposing: false }; + assert.equal(isDmSendEnter(normal), true); + for (const modifier of ['shiftKey', 'ctrlKey', 'altKey', 'metaKey', 'isComposing']) { + assert.equal(isDmSendEnter({ ...normal, [modifier]: true }), false, modifier); + } + assert.equal(isDmSendEnter({ ...normal, keyCode: 229 }), false); + assert.equal(isDmSendEnter({ ...normal, key: 'a' }), false); +}); + +test('Enter использует существующий submit, кнопка продолжает использовать его же', () => { + const chat = read('../js/pages/chat-view.js'); + assert.match(chat, /input\.addEventListener\('keydown', \(event\) => \{[\s\S]*?isDmSendEnter\(event\)[\s\S]*?event\.preventDefault\(\)[\s\S]*?form\.requestSubmit\(\)/); + assert.match(chat, /form\.addEventListener\('submit', async \(event\) =>/); +}); + +test('регистрация использует Alice из пяти символов', () => { + const registration = read('../js/pages/register-view.js'); + assert.match(registration, /Например, Alice/); + assert.match(registration, /Alice и alice/); + assert.doesNotMatch(registration, /Например, Alex/); +}); + +test('список каналов учитывает бесплатные идентичности и нормализованный регистр подписок', () => { + const handler = read('../../SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_ListSubscriptionsFeed_Handler.java'); + const support = read('../../SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java'); + assert.match(handler, /SELECT blockchain_name FROM user_identity_current WHERE LOWER\(login\)=LOWER\(\?\)/); + assert.match(handler, /WHERE LOWER\(cs\.login\)=LOWER\(\?\) AND cs\.rel_type=\?/); + assert.match(handler, /FROM user_identity_current su WHERE LOWER\(su\.login\)=LOWER\(cs\.to_login\)/); + assert.doesNotMatch(handler, /FROM solana_user_pda_current/); + assert.doesNotMatch(support, /FROM solana_user_pda_current/); +}); diff --git a/shine-UI/tests/namespace-price-contract.test.mjs b/shine-UI/tests/namespace-price-contract.test.mjs new file mode 100644 index 00000000..d1747ab6 --- /dev/null +++ b/shine-UI/tests/namespace-price-contract.test.mjs @@ -0,0 +1,26 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFileSync } from 'node:fs'; +const text = path => readFileSync(new URL(path, import.meta.url), 'utf8'); + +test('opcode 8 требует upgrade authority, строго один код SOL и индексируемую economy PDA', () => { + const rust = text('../../shine-solana/shine/programs/shine_users/src/lib.rs'); + const body = rust.split('fn process_update_namespace_price')[1].split('fn validate_upgrade_authority')[0]; + assert.match(rust, /const IX_UPDATE_NAMESPACE_PRICE: u8 = 8;/); + assert.match(body, /validate_upgrade_authority\(program_id, signer, program_ai, programdata_ai\)/); + assert.match(body, /read_namespace\(program_id, namespace_pda, name\)/); + assert.match(body, /validate_users_economy_config_pda\(program_id, economy_pda\)/); + assert.match(body, /ensure_pda_size_and_rent/); + assert.match(rust, /state\.currency_code == NAMESPACE_CURRENCY_SOL/); +}); +test('server sync узнаёт update цены, а UPSERT сохраняет новые fee/currency, не старые', () => { + const codec = text('../../SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/codec/ShineUsersCodec.java'); + const repo = text('../../SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/storage/postgres/PostgresStorageRepository.java'); + const migrations = text('../../SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v40.sql'); + assert.match(codec, /case IX_UPDATE_NAMESPACE_PRICE ->/); + assert.match(codec, /TxKind\.UPDATE_NAMESPACE_PRICE/); + assert.match(repo, /registration_fee_lamports=EXCLUDED.registration_fee_lamports/); + assert.match(repo, /currency_code=EXCLUDED.currency_code/); + assert.doesNotMatch(repo, /shine_namespace_current\.raw_data_base64=EXCLUDED\.raw_data_base64/); + assert.match(migrations, /ADD COLUMN currency_code SMALLINT NOT NULL DEFAULT 1/); +}); diff --git a/shine-solana/shine/scripts/registration-v2/update-namespace-price.mjs b/shine-solana/shine/scripts/registration-v2/update-namespace-price.mjs new file mode 100644 index 00000000..dd941fc0 --- /dev/null +++ b/shine-solana/shine/scripts/registration-v2/update-namespace-price.mjs @@ -0,0 +1,90 @@ +#!/usr/bin/env node +// Без --send выполняет проверку и показывает транзакцию, но ничего не записывает. +// Работа только localnet/devnet; ключ upgrade authority не выводится в консоль. +import { readFileSync } from 'node:fs'; +import { createHash } from 'node:crypto'; +import { createRequire } from 'node:module'; +import { decodeNamespace } from './decode-namespace.mjs'; +const require = createRequire(import.meta.url); +const { Connection, PublicKey, Keypair, Transaction, TransactionInstruction, SystemProgram, sendAndConfirmTransaction } = require('@solana/web3.js'); +const PROGRAM_ID = new PublicKey('SHiNEPr1APdAgNBteUyBXcNovaHctpSjUu8oH2ZJdN6'); +const [ECONOMY] = PublicKey.findProgramAddressSync([Buffer.from('shine_users_economy_config')], PROGRAM_ID); + +function parseArgs(argv) { + const args = {}; + for (let i = 0; i < argv.length; i++) { + if (!argv[i].startsWith('--')) throw Error(`Неизвестный аргумент: ${argv[i]}`); + const key = argv[i].slice(2); + if (key === 'send') { args.send = true; continue; } + if (args[key] !== undefined || !argv[i + 1]) throw Error(`Отсутствует либо повторён параметр --${key}`); + args[key] = argv[++i]; + } + return args; +} +function solToLamports(text) { + if (!/^(0|[1-9][0-9]*)(?:\.[0-9]{1,9})?$/.test(text || '')) throw Error('Ожидается сумма SOL с точностью не более 9 знаков'); + const [whole, part = ''] = text.split('.'); + return BigInt(whole) * 1_000_000_000n + BigInt((part + '000000000').slice(0, 9)); +} +async function main() { + const args = parseArgs(process.argv.slice(2)); + if (!args.rpc || !args.keypair || !args.namespace) throw Error('Нужны --rpc --keypair --namespace и --fee-sol либо --fee-lamports'); + if (!/^[a-z0-9_]{1,29}$/.test(args.namespace)) throw Error('Недопустимое имя namespace'); + if (args['fee-sol'] === undefined && args['fee-lamports'] === undefined) throw Error('Укажите стоимость'); + if (args['fee-sol'] !== undefined && args['fee-lamports'] !== undefined) throw Error('Укажите только один формат цены'); + const currencyCode = Number(args.currency ?? '1'); + if (currencyCode !== 1) throw Error('Валюта 2 (USDT) зарезервирована; сейчас разрешена только 1 (SOL)'); + const fee = args['fee-sol'] !== undefined ? solToLamports(args['fee-sol']) : BigInt(args['fee-lamports']); + if (fee < 0n || fee > 0xffff_ffff_ffff_ffffn) throw Error('Стоимость вне диапазона u64'); + const uri = new URL(args.rpc); + if (!(uri.protocol === 'https:' || uri.protocol === 'http:')) throw Error('Требуется RPC URL http/https'); + if (!(['localhost', '127.0.0.1'].includes(uri.hostname) || uri.hostname.endsWith('.devnet.solana.com'))) + throw Error('Для админского скрипта разрешены только localhost и публичный RPC *.devnet.solana.com'); + const wallet = Keypair.fromSecretKey(Uint8Array.from(JSON.parse(readFileSync(args.keypair, 'utf8')))); + const connection = new Connection(args.rpc, 'confirmed'); + const executable = await connection.getAccountInfo(PROGRAM_ID, 'confirmed'); + const upgradeableLoader = new PublicKey('BPFLoaderUpgradeab1e11111111111111111111111'); + if (!executable || !executable.executable || !executable.owner.equals(upgradeableLoader) || executable.data.length < 36 || executable.data.readUInt32LE(0) !== 2) + throw Error('shine_users не является валидной upgradeable программой'); + const programdata = new PublicKey(executable.data.subarray(4, 36)); + const pd = await connection.getAccountInfo(programdata, 'confirmed'); + if (!pd || !pd.owner.equals(upgradeableLoader) || pd.data.length < 45 || pd.data.readUInt32LE(0) !== 3 || pd.data[12] !== 1 || !new PublicKey(pd.data.subarray(13, 45)).equals(wallet.publicKey)) + throw Error('Подписант не является текущей upgrade authority shine_users'); + const economy = await connection.getAccountInfo(ECONOMY, 'confirmed'); + if (!economy || !economy.owner.equals(PROGRAM_ID)) throw Error('Economy PDA не инициализирована'); + const [namespacePda] = PublicKey.findProgramAddressSync([createHash('sha256').update(`namespace=${args.namespace}`).digest()], PROGRAM_ID); + const oldAccount = await connection.getAccountInfo(namespacePda, 'confirmed'); + if (!oldAccount || !oldAccount.owner.equals(PROGRAM_ID)) throw Error('Namespace не найден'); + const oldPrice = decodeNamespace(oldAccount.data); + if (oldPrice.name !== args.namespace) throw Error('Состояние namespace не соответствует PDA'); + const name = Buffer.from(args.namespace); + const data = Buffer.alloc(1 + 1 + name.length + 1 + 8); + let offset = 0; + data[offset++] = 8; // IX_UPDATE_NAMESPACE_PRICE + data[offset++] = name.length; + name.copy(data, offset); offset += name.length; + data[offset++] = currencyCode; + data.writeBigUInt64LE(fee, offset); + const ix = new TransactionInstruction({ programId: PROGRAM_ID, keys: [ + {pubkey: wallet.publicKey, isSigner: true, isWritable: true}, + {pubkey: namespacePda, isSigner: false, isWritable: true}, + {pubkey: SystemProgram.programId, isSigner: false, isWritable: false}, + {pubkey: ECONOMY, isSigner: false, isWritable: false}, + {pubkey: PROGRAM_ID, isSigner: false, isWritable: false}, + {pubkey: programdata, isSigner: false, isWritable: false}, + ], data }); + console.log(JSON.stringify({ namespace: args.namespace, currencyCode, + previousPriceLamports: oldPrice.registrationFeeLamports, newPriceLamports: fee.toString(), + newPriceSol: `${fee / 1_000_000_000n}.${(fee % 1_000_000_000n).toString().padStart(9, '0')}`, + namespacePda: namespacePda.toBase58(), versionBefore: `${oldPrice.major}.${oldPrice.minor}`, + mode: args.send ? 'SEND' : 'DRY-RUN' }, null, 2)); + if (!args.send) return; + const signature = await sendAndConfirmTransaction(connection, new Transaction().add(ix), [wallet], {commitment: 'confirmed'}); + const updated = await connection.getAccountInfo(namespacePda, 'confirmed'); + if (!updated) throw Error('После транзакции namespace отсутствует'); + const after = decodeNamespace(updated.data); + if (after.registrationFeeLamports !== fee.toString() || after.currencyCode !== 1 || after.minor !== 1) + throw Error('Изменение цены не подтверждено чтением namespace PDA'); + console.log(`Цена изменена. Signature: ${signature}; namespace PDA подтверждена.`); +} +main().catch(error => { console.error('Ошибка:', error.message); process.exitCode = 1; }); diff --git a/shine-solana/shine/tests/namespace-price.test.mjs b/shine-solana/shine/tests/namespace-price.test.mjs new file mode 100644 index 00000000..82086a33 --- /dev/null +++ b/shine-solana/shine/tests/namespace-price.test.mjs @@ -0,0 +1,31 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import {readFileSync} from 'node:fs'; +import {decodeNamespace} from '../scripts/registration-v2/decode-namespace.mjs'; +const vectors=JSON.parse(readFileSync(new URL('fixtures/registration-v2.json', import.meta.url))); + +test('старые namespace 1.0 читаются как SOL', () => { + for (const entry of vectors.namespace) { + const parsed=decodeNamespace(Buffer.from(entry.bytes_hex,'hex')); + assert.equal(parsed.minor,0); + assert.equal(parsed.currencyCode,1); + } +}); +test('namespace 1.1 содержит отдельный байт валюты без потери регистратора', () => { + for (const entry of vectors.namespace) { + const legacy=Buffer.from(entry.bytes_hex,'hex'); + const offset=5+legacy[4]+8; + const current=Buffer.concat([legacy.subarray(0,offset),Buffer.from([1]),legacy.subarray(offset)]); + current[1]=1; + const old=decodeNamespace(legacy); + const parsed=decodeNamespace(current); + assert.equal(parsed.minor,1); + assert.equal(parsed.currencyCode,1); + assert.equal(parsed.registrationFeeLamports,old.registrationFeeLamports); + assert.equal(parsed.serverLogin,old.serverLogin); + assert.equal(parsed.name,old.name); + const unsupported=Buffer.from(current);unsupported[offset]=2; + assert.throws(()=>decodeNamespace(unsupported),/неподдерживаемый код валюты/); + assert.throws(()=>decodeNamespace(current.subarray(0,-1))); + } +});